Skip to content

fix: Keithley mode and output parser #531

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
giulioungaretti merged 1 commit into from
Mar 16, 2017
Merged

fix: Keithley mode and output parser #531

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
14 changes: 10 additions & 4 deletions qcodes/instrument_drivers/tektronix/Keithley_2600.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,26 @@ def __init__(self, name, address, channel, **kwargs):
super().__init__(name, address, terminator='\n', **kwargs)
self._channel = channel

self.add_parameter('volt', get_cmd='measure.v()',
get_parser=float, set_cmd='source.levelv={:.12f}',
self.add_parameter('volt',
get_cmd='measure.v()',
get_parser=float,
set_cmd='source.levelv={:.12f}',
label='Voltage',
unit='V')
self.add_parameter('curr', get_cmd='measure.i()',
get_parser=float, set_cmd='source.leveli={:.12f}',
self.add_parameter('curr',
get_cmd='measure.i()',
get_parser=float,
set_cmd='source.leveli={:.12f}',
label='Current',
unit='A')
self.add_parameter('mode',
get_cmd='source.func',
get_parser=float,
Copy link
Contributor

@alexcjohnson alexcjohnson Mar 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that fixes it? What's the actual string that comes back from 'source.func'?

Copy link
Contributor Author

@MerlinSmiles MerlinSmiles Mar 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes it does would be a funny commit otherwise.
'1.00000e+00' or '0.00000e+00'is what comes back

Copy link
Contributor

@alexcjohnson alexcjohnson Mar 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hah, that's a bizarre return value for a discrete setting. All makes sense now...

set_cmd='source.func={:d}',
val_mapping={'current': 0, 'voltage': 1})
self.add_parameter('output',
get_cmd='source.output',
get_parser=float,
set_cmd='source.output={:d}',
val_mapping={'on': 1, 'off': 0})
# Source range
Expand Down