Skip to content

Fix: Add validation for the user's choice of sample rate frequencies for SC devices #2328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
santorofer merged 1 commit into from
Jun 22, 2021
Merged

Fix: Add validation for the user's choice of sample rate frequencies for SC devices #2328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion pydevices/HtsDevices/acq2106_435sc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,21 @@ class _ACQ2106_435SC(acq2106_435st._ACQ2106_435ST):

def init(self):
self.slots = super(_ACQ2106_435SC, self).getSlots()

freq = int(self.freq.data())

# Available Clock Plans for the 2106 Signal Conditioning devices (from D-Tacq):
# 10 kSPS (5M12 /512)
# 20 kSPS (10M24 /512)
# 40 kSPS (20M48 /512)
# 80 kSPS (20M48 /256)
# 128kSPS (32M768/256)
allow_freqs = [10000, 20000, 40000, 80000, 128000]

# Frequency innput validation
if freq not in allow_freqs:
raise MDSplus.DevBAD_PARAMETER(
"FREQ must be 10000, 20000, 40000, 80000 or 128000; not %d" % (freq,))

for card in self.slots:
if self.is_global.data() == 1:
# Global controls for GAINS and OFFSETS
Expand Down