Skip to content
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

Options to enum #21

Merged
merged 3 commits into from
Feb 3, 2016
Merged

Options to enum #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51e12c1
Strings(options=[...]) to Enum(...) in AWG driver
alexcjohnson Feb 3, 2016
0d48c6c
take out Strings validator options param
alexcjohnson Feb 3, 2016
782854f
Enum for numbers too in AWG driver
alexcjohnson Feb 3, 2016
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
22 changes: 10 additions & 12 deletions qcodes/instrument_drivers/tektronix/AWG5014.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,22 +162,20 @@ def __init__(self, name, setup_folder, address, reset=False,
self.add_parameter('run_mode',
get_cmd='AWGC:RMOD?',
set_cmd='AWGC:RMOD ' + '{}',
vals=vals.Strings(
options=['CONT', 'TRIG', 'SEQ', 'GAT']))
vals=vals.Enum('CONT', 'TRIG', 'SEQ', 'GAT'))
# Trigger parameters #
# ! Warning this is the same as run mode, do not use! exists
# Solely for legacy purposes
self.add_parameter('trigger_mode',
get_cmd='AWGC:RMOD?',
set_cmd='AWGC:RMOD ' + '{}',
vals=vals.Strings(
options=['CONT', 'TRIG', 'SEQ', 'GAT']))
vals=vals.Enum('CONT', 'TRIG', 'SEQ', 'GAT'))
self.add_parameter('trigger_impedance',
label='Trigger impedance (Ohm)',
get_cmd='TRIG:IMP?',
set_cmd='TRIG:IMP '+'{}',
vals=vals.Ints(),
parse_function=float) # options 50 and 1000 val not implemented
vals=vals.Enum(50, 1000),
parse_function=float)
self.add_parameter('trigger_level',
label='Trigger level (V)',
get_cmd='TRIG:LEV?',
Expand All @@ -187,23 +185,23 @@ def __init__(self, name, setup_folder, address, reset=False,
self.add_parameter('trigger_slope',
get_cmd='TRIG:SLOP?',
set_cmd='TRIG:SLOP '+'{}',
vals=vals.Strings(options=['POS', 'NEG']))#,
vals=vals.Enum('POS', 'NEG'))#,
# parse_function=self.parse_int_pos_neg)
self.add_parameter('trigger_source',
get_cmd='TRIG:source?',
set_cmd='TRIG:source '+'{}',
vals=vals.Strings(options=['INT', 'EXT']))
vals=vals.Enum('INT', 'EXT'))
# Event parameters #
self.add_parameter('event_polarity',
get_cmd='EVEN:POL?',
set_cmd='EVEN:POL '+'{}',
vals=vals.Strings(options=['POS', 'NEG']))
vals=vals.Enum('POS', 'NEG'))
self.add_parameter('event_impedance',
label='Event impedance (Ohm)',
get_cmd='EVEN:IMP?',
set_cmd='EVEN:IMP '+'{}',
vals=vals.Ints(),
parse_function=float) # options 50 and 1000 val not implemented
vals=vals.Enum(50, 1000),
parse_function=float)
self.add_parameter('event_level',
label='Event level (V)',
get_cmd='EVEN:LEV?',
Expand All @@ -213,7 +211,7 @@ def __init__(self, name, setup_folder, address, reset=False,
self.add_parameter('event_jump_timing',
get_cmd='EVEN:JTIM?',
set_cmd='EVEN:JTIM {}',
vals=vals.Strings(options=['SYNC', 'ASYNC']))
vals=vals.Enum('SYNC', 'ASYNC'))

self.add_parameter('clock_freq',
label='Clock frequency (Hz)',
Expand Down
19 changes: 5 additions & 14 deletions qcodes/utils/validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,11 @@ def __repr_(self):
class Strings(Validator):
'''
requires a string
optional parameters
min_length and max_length limit the allowed length
to min_length <= len(value) <= max_length
options: list of allowed strings returns True if value in options

optional parameters min_length and max_length limit the allowed length
to min_length <= len(value) <= max_length
'''

def __init__(self, min_length=0, max_length=BIGSTRING, options=None):
def __init__(self, min_length=0, max_length=BIGSTRING):
if isinstance(min_length, int) and min_length >= 0:
self._min_length = min_length
else:
Expand All @@ -84,16 +81,10 @@ def __init__(self, min_length=0, max_length=BIGSTRING, options=None):
else:
raise TypeError('max_length must be a positive integer '
'no smaller than min_length')
self.options = options

def is_valid(self, value):
if self.options is not None:
return (isinstance(value, str) and
(self._min_length <= len(value) <= self._max_length) and
value in self.options)
else:
return (isinstance(value, str) and
self._min_length <= len(value) <= self._max_length)
return (isinstance(value, str) and
self._min_length <= len(value) <= self._max_length)

def __repr__(self):
minv = self._min_length or None
Expand Down