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

fix arguments of IVVI driver #803

Merged
merged 2 commits into from
Oct 23, 2017
Merged

fix arguments of IVVI driver #803

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b56b58f
fix arguments of IVVI driver
eendebakpt Oct 19, 2017
f94614d
Merge branch 'master' into fix/IVVIargs
jenshnielsen Oct 23, 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
4 changes: 1 addition & 3 deletions qcodes/instrument_drivers/QuTech/IVVI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class IVVI(VisaInstrument):
Halfrange = Fullrange / 2

def __init__(self, name, address, reset=False, numdacs=16, dac_step=10,
dac_delay=.1, dac_max_delay=0.2, safe_version=True,
dac_delay=.1, safe_version=True,
polarity=['BIP', 'BIP', 'BIP', 'BIP'],
use_locks=False, **kwargs):
'''
Expand All @@ -45,7 +45,6 @@ def __init__(self, name, address, reset=False, numdacs=16, dac_step=10,
default=['BIP', 'BIP', 'BIP', 'BIP']
dac_step (float) : max step size for dac parameter
dac_delay (float) : delay (in seconds) for dac
dac_max_delay (float) : maximum delay before emitting a warning
safe_version (bool) : if True then do not send version commands
to the IVVI controller
use_locks (bool) : if True then locks are used in the `ask`
Expand Down Expand Up @@ -137,7 +136,6 @@ def __init__(self, name, address, reset=False, numdacs=16, dac_step=10,
self.pol_num[i - 1] + self.Fullrange),
step=dac_step,
delay=dac_delay,
max_delay=dac_max_delay,
max_val_age=10)

self._update_time = 5 # seconds
Expand Down