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

Jump to bottom

[WIP] Zi fixes #550

Merged
merged 3 commits into from
Mar 30, 2017
Merged

[WIP] Zi fixes #550

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86d58e3
fix: correct typo zidriver
jenshnielsen Mar 30, 2017
dfa54bf
fix: remove unused lines
jenshnielsen Mar 30, 2017
2c9e197
fix: add Demod units
jenshnielsen Mar 30, 2017
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
36 changes: 33 additions & 3 deletions qcodes/instrument_drivers/ZI/ZIUHFLI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,38 @@ def prepare_scope(self):
'AU Cartesian 2': 'arb. un',
'AU Polar 1': 'arb. un.',
'AU Polar 2': 'arb. un.',
'Demod 1 X': 'V',
'Demod 1 Y': 'V',
'Demod 1 R': 'V',
'Demod 1 Phase': '°',
'Demod 2 X': 'V',
'Demod 2 Y': 'V',
'Demod 2 R': 'V',
'Demod 2 Phase': '°',
'Demod 3 X': 'V',
'Demod 3 Y': 'V',
'Demod 3 R': 'V',
'Demod 3 Phase': '°',
'Demod 4 X': 'V',
'Demod 4 Y': 'V',
'Demod 4 R': 'V',
'Demod 4 Phase': '°',
'Demod 5 X': 'V',
'Demod 5 Y': 'V',
'Demod 5 R': 'V',
'Demod 5 Phase': '°',
'Demod 6 X': 'V',
'Demod 6 Y': 'V',
'Demod 6 R': 'V',
'Demod 6 Phase': '°',
'Demod 7 X': 'V',
'Demod 7 Y': 'V',
'Demod 7 R': 'V',
'Demod 7 Phase': '°',
'Demod 8 X': 'V',
'Demod 8 Y': 'V',
'Demod 8 R': 'V',
'Demod 8 Phase': '°',
}

#TODO: what are good names?
Expand Down Expand Up @@ -1448,11 +1480,9 @@ def offset_valid():
nonlocal value
nonlocal number
range_val = params['signal_output{}_range'.format(number+1)].get()
range_val = round(val, 3)
range_val = round(range_val, 3)
amp_val = params['signal_output{}_amplitude'.format(number+1)].get()
amp_val = round(amp_val, 3)
toget = params['signal_output{}_autorange'.format(number+1)]
autorange_val = toget.get()
if -range_val< value+amp_val > range_val:
raise ValueError('Signal Output: Offset too high for '
'chosen range.')
Expand Down