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

rename units to unit; remove commented out code #526

Merged
merged 1 commit into from
Mar 14, 2017
Merged

rename units to unit; remove commented out code #526

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
40 changes: 2 additions & 38 deletions qcodes/instrument_drivers/tektronix/Keithley_2700.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,50 +163,14 @@ def __init__(self, name, address, reset=False, **kwargs):
'To get the integrationtime as a Number '
'of PowerLine Cycles, use get_nplc().'))

'''
self.add_parameter('trigger_source',
flags=Instrument.FLAG_GETSET,
units='')
self.add_parameter('trigger_timer',
flags=Instrument.FLAG_GETSET,
units='s', minval=0.001, maxval=99999.999, type=float)
self.add_parameter('readval', flags=Instrument.FLAG_GET,
units='arb.unit',
type=float,
tags=['measure'])
self.add_parameter('readlastval', flags=Instrument.FLAG_GET,
units='arb.unit',
type=float,
tags=['measure'])
self.add_parameter('readnextval', flags=Instrument.FLAG_GET,
units='arb.unit',
type=float,
tags=['measure'])
self.add_parameter('autozero', flags=Instrument.FLAG_GETSET,
type=bool)
self.add_parameter('averaging_window',
flags=Instrument.FLAG_GETSET,
units='%', type=float, minval=0, maxval=10)
self.add_parameter('averaging_count',
flags=Instrument.FLAG_GETSET,
units='#', type=int, minval=1, maxval=100)
self.add_parameter('averaging_type',
flags=Instrument.FLAG_GETSET,
type=bytes, units='')
self.add_parameter('autorange',
flags=Instrument.FLAG_GETSET,
units='',
type=bool)
'''

# add functions
self.add_parameter('amplitude',
units='arb.unit',
unit='arb.unit',
label=name,
get_cmd=':DATA:FRESH?',
get_parser=float)
self.add_parameter('readnext',
units='arb.unit',
unit='arb.unit',
label=name,
get_cmd=':DATA:FRESH?',
get_parser=float)
Expand Down