-
Notifications
You must be signed in to change notification settings - Fork 315
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.
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
Driver/Mercury iPS with VISA #897
Merged
WilliamHPNielsen
merged 59 commits into
microsoft:master
from
WilliamHPNielsen:driver/MercuryiPS_VISA
Aug 3, 2018
Merged
Changes from 56 commits
Commits
Show all changes
59 commits
Select commit
Hold shift + click to select a range
1398113
Add VISA driver file
WilliamHPNielsen d90038f
Add more PSU parameters
WilliamHPNielsen 963022a
fix indentation
WilliamHPNielsen 79ec0cf
Merge branch 'master' into driver/MercuryiPS_VISA
WilliamHPNielsen e674763
add setter function for PSU parameters
WilliamHPNielsen 39a2d6c
Merge branch 'driver/MercuryiPS_VISA' of github.com:WilliamHPNielsen/…
WilliamHPNielsen c5cbb08
pep8 field_vector
WilliamHPNielsen cb1cb1f
Merge branch 'master' into driver/MercuryiPS_VISA
jenshnielsen 309cdb6
don't assign an unused variable
WilliamHPNielsen 779e987
add initialisation logging to visa.py
WilliamHPNielsen 8dee7b8
pass visalib argument to super().__init__
WilliamHPNielsen 38a70a4
Merge branch 'driver/MercuryiPS_VISA' of github.com:WilliamHPNielsen/…
WilliamHPNielsen b2742d0
add a simple PyVISA-sim test
WilliamHPNielsen 64f9074
Merge branch 'master' into driver/MercuryiPS_VISA
WilliamHPNielsen 3113b6b
Merge branch 'master' of github.com:QCoDeS/Qcodes into driver/Mercury…
WilliamHPNielsen 76b798f
Handle unitless responses
WilliamHPNielsen b927c2c
Merge branch 'driver/MercuryiPS_VISA' of github.com:WilliamHPNielsen/…
WilliamHPNielsen fcf0ec1
Merge branch 'master' into driver/MercuryiPS_VISA
WilliamHPNielsen efe91da
Fix wrong indentation
WilliamHPNielsen 3335590
Add set command to field_target
WilliamHPNielsen 8125d27
Update test to use parameters
WilliamHPNielsen f9ba777
Convince mypy that a variable is a float
WilliamHPNielsen fdfb537
Add a FieldVector to hold the target field
WilliamHPNielsen 4b2c915
Apply a lambda for great justice
WilliamHPNielsen bb617aa
Add ramp status parameter
WilliamHPNielsen 4ce2289
Refactor response parsing slightly
WilliamHPNielsen b8f62bd
Add logic for ramp status setting
WilliamHPNielsen 7c8d390
Fix typo
WilliamHPNielsen ab38fcb
Fix another typo
WilliamHPNielsen c496827
Add all target field params as read-only
WilliamHPNielsen 0acd4cc
Add missing value for ramp status
WilliamHPNielsen 7f3375d
Unuse lambdas for even greater justice
WilliamHPNielsen 2f3ec46
Remove unused variable
WilliamHPNielsen 71d3b9f
Add missing rho
WilliamHPNielsen 07cedc3
Make targets settable
WilliamHPNielsen dfe5d53
Add trivial field limits if not user provided
WilliamHPNielsen 051006b
Add ramp_to_target to PS Slave
WilliamHPNielsen e849c3f
Add measured field parameters
WilliamHPNielsen 717e68e
Fix typo
WilliamHPNielsen 693bedc
Update the way measured coordinates are gotten
WilliamHPNielsen 21e3872
Fix typo
WilliamHPNielsen 99e4c1d
Add two ramp methods (safe and fast)
WilliamHPNielsen 8630ae9
Log communication like a proper VISA instrument
WilliamHPNielsen 8c24822
Log VISA communication with the VISA logger
WilliamHPNielsen d10c1d1
Test (and correct) _ramp_safely
WilliamHPNielsen 8de7aa7
Add high-level ramp function
WilliamHPNielsen 3417df2
Refactor test to use pytest's caplog
WilliamHPNielsen f4ead14
Merge branch 'master' into driver/MercuryiPS_VISA
WilliamHPNielsen b02f21a
Fix typo in ramp
WilliamHPNielsen 805d264
Remove unused function in test
WilliamHPNielsen 78046db
Add method to update field limits
WilliamHPNielsen f7d32dd
Remove unused imports in test
WilliamHPNielsen c437b9f
Send target vector to slaves
WilliamHPNielsen 85cedf0
Cast a variable as a list (when it is a list)
WilliamHPNielsen eb1aed6
Add example notebook
WilliamHPNielsen fb98237
Delete old (very obsolete) notebook
WilliamHPNielsen d0338b4
Remove confusing comment from yaml file
WilliamHPNielsen f374558
Merge branch 'master' into driver/MercuryiPS_VISA
WilliamHPNielsen 658e591
Merge branch 'master' into driver/MercuryiPS_VISA
WilliamHPNielsen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
424 changes: 0 additions & 424 deletions
424
docs/examples/driver_examples/Qcodes example with Mercury IPS (Magnet).ipynb
This file was deleted.
Oops, something went wrong.
456 changes: 456 additions & 0 deletions
456
docs/examples/driver_examples/Qcodes example with Mercury iPS.ipynb
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
spec: "1.0" | ||
devices: | ||
device 1: | ||
eom: | ||
GPIB INSTR: # It seems that pyvisa-sim cannot find a TCPIP instrument unless it's actually there..? | ||
q: "\n" | ||
r: "\n" | ||
error: ERROR | ||
dialogues: | ||
- q: "*IDN?" | ||
r: "IDN:OXFORD INSTRUMENTS:SIMULATED MERCURY iPS:000:000" | ||
|
||
properties: | ||
|
||
x field target: | ||
default: 0 | ||
getter: | ||
q: "READ:DEV:GRPX:PSU:SIG:FSET" | ||
r: "{}" # should there be a unit appended? How does the instrument do it? | ||
setter: | ||
q: "SET:DEV:GRPX:PSU:SIG:FSET:{}" | ||
r: "" # response is needed, since the instrument actually responds to sets | ||
|
||
x field: | ||
default: 0 | ||
getter: | ||
q: "READ:DEV:GRPX:PSU:SIG:FLD" | ||
r: "{}" | ||
|
||
y field target: | ||
default: 0 | ||
getter: | ||
q: "READ:DEV:GRPY:PSU:SIG:FSET" | ||
r: "{}" # should there be a unit appended? How does the instrument do it? | ||
setter: | ||
q: "SET:DEV:GRPY:PSU:SIG:FSET:{}" | ||
r: "" # response is needed, since the instrument actually responds to sets | ||
|
||
y field: | ||
default: 0 | ||
getter: | ||
q: "READ:DEV:GRPY:PSU:SIG:FLD" | ||
r: "{}" | ||
|
||
z field target: | ||
default: 0 | ||
getter: | ||
q: "READ:DEV:GRPZ:PSU:SIG:FSET" | ||
r: "{}" # should there be a unit appended? How does the instrument do it? | ||
setter: | ||
q: "SET:DEV:GRPZ:PSU:SIG:FSET:{}" | ||
r: "" # response is needed, since the instrument actually responds to sets | ||
|
||
z field: | ||
default: 0 | ||
getter: | ||
q: "READ:DEV:GRPZ:PSU:SIG:FLD" | ||
r: "{}" | ||
|
||
x ramp status: | ||
default: "HOLD" | ||
getter: | ||
q: "READ:DEV:GRPX:PSU:ACTN" | ||
r: "{}" | ||
setter: | ||
q: "SET:DEV:GRPX:PSU:ACTN:{}" | ||
r: "" | ||
|
||
y ramp status: | ||
default: "HOLD" | ||
getter: | ||
q: "READ:DEV:GRPY:PSU:ACTN" | ||
r: "{}" | ||
setter: | ||
q: "SET:DEV:GRPY:PSU:ACTN:{}" | ||
r: "" | ||
|
||
z ramp status: | ||
default: "HOLD" | ||
getter: | ||
q: "READ:DEV:GRPZ:PSU:ACTN" | ||
r: "{}" | ||
setter: | ||
q: "SET:DEV:GRPZ:PSU:ACTN:{}" | ||
r: "" | ||
|
||
|
||
resources: | ||
GPIB::1::INSTR: | ||
device: device 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is the answer to this question known now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point. It is known.