Driver/Mercury iPS with VISA #897

WilliamHPNielsen · 2017-12-04T13:01:31Z

Add a VISA driver for the MercuryiPS using the FieldVector setpoint technology already in use in our AMI430 driver.

Fixes #543

Changes proposed in this pull request:

Rewrite the MercuryiPS driver to use VISA
Make the driver use the FieldVector to deal with singularities

Work items:

Add all relevant parameters
Use FieldVector
(once Feature/simulated instruments #859 is merged) Add a simulated instrument and a thorough test

@jenshnielsen

Add a working VISA driver with a single non-trivial parameter

…Qcodes into driver/MercuryiPS_VISA

codecov · 2017-12-19T12:55:53Z

Codecov Report

Merging #897 into master will increase coverage by 0.09%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master     #897      +/-   ##
==========================================
+ Coverage   80.38%   80.48%   +0.09%     
==========================================
  Files          49       49              
  Lines        6801     6804       +3     
==========================================
+ Hits         5467     5476       +9     
+ Misses       1334     1328       -6

WilliamHPNielsen · 2017-12-19T13:06:18Z

Note: development of this driver is paused until an agreement on the desired magnet ramping behaviour has been reached.

WilliamHPNielsen · 2018-05-09T14:49:27Z

From talking to scientists, it seems that

Using the "first-down-then-up" approach of the AMI430 driver
Adding an optional ramp_resolution parameter for staircasing non-cartesian ramps

will suit the needs of everyone.

Development resumed!

…iPS_VISA

…Qcodes into driver/MercuryiPS_VISA

jenshnielsen · 2018-07-19T14:12:42Z

qcodes/tests/drivers/test_MercuryiPS.py

+lh.setFormatter(formatter)
+
+
+def get_messages(iostream: io.StringIO) -> List[str]:


Could we use pytests capture log for this i.e. https://docs.pytest.org/en/latest/logging.html#caplog-fixture ?

WilliamHPNielsen · 2018-07-20T09:27:30Z

There are many extra features we can think of adding (one example: rotated coordinate systems to account for sample misalignment), but I think the driver is now in a functional state.

@QCoDeS/core

astafan8 · 2018-07-20T09:41:01Z

qcodes/instrument/sims/MercuryiPS.yaml

+        default: 0
+        getter:
+          q: "READ:DEV:GRPX:PSU:SIG:FSET"
+          r: "{}"  # should there be a unit appended? How does the instrument do it?


is the answer to this question known now?

Good point. It is known.

astafan8 · 2018-07-20T09:43:28Z

qcodes/instrument_drivers/oxford/MercuryiPS_VISA.py

@@ -190,14 +243,73 @@ def __init__(self, name: str, address: str, visalib=None,
        # to ensure a correct snapshot, we must wrap the get function
        self.IDN.get = self.IDN._wrap_get(self._idn_getter)

-        # TODO: Query instrument to ensure which PSUs we have
+        # TODO: Query instrument to ensure which PSUs are actually present


is this an "issue" or "nice-to-have"? in other words, will it be done in this PR? If not, perhaps, make an issue out of it?

astafan8 · 2018-07-20T09:46:44Z

qcodes/instrument_drivers/oxford/MercuryiPS_VISA.py

+                                          y=self.GRPY.field(),
+                                          z=self.GRPZ.field())
+
+        for coord in ['x', 'y', 'z', 'r', 'theta', 'phi', 'rho']:


can this list be referred to from FieldVector class or similar?

Not so easily. Also, I do not suspect that list to change very much in the near future, so it's prolly not worth the effort.

WilliamHPNielsen · 2018-07-20T12:10:23Z

Status: I am currently waiting for feedback from a scientist who kindly volunteered to try out this new driver.

WilliamHPNielsen · 2018-07-30T09:39:44Z

@QCoDeS/core, this driver version has now been tested at a real lab station and allegedly worked fine and solved two problems with the older driver (the problem described in #543 and a problem with wrong metadata, both basically solved by using FieldVector).

So I'd say we merge and actually also deprecate the older driver.

WilliamHPNielsen · 2018-08-03T14:42:42Z

I'll merge this now, but not deprecate the old driver just yet. The reason is that someone is using the old driver with two axes being MercuryPS Slaves and the third one being a less noisy power supply. I will add that functionality to the MercuryiPS VISA driver in a separate PR and then we can finally get rid of the old, untrusted IPInstrument driver (and maybe IPInstrument altogether?).

Merge: b2344b7 658e591 Author: William H.P. Nielsen <[email protected]> Merge pull request #897 from WilliamHPNielsen/driver/MercuryiPS_VISA

Add VISA driver file

1398113

Add a working VISA driver with a single non-trivial parameter

WilliamHPNielsen added the driver label Dec 4, 2017

WilliamHPNielsen and others added 12 commits December 4, 2017 16:43

Add more PSU parameters

d90038f

fix indentation

963022a

Merge branch 'master' into driver/MercuryiPS_VISA

79ec0cf

add setter function for PSU parameters

e674763

Merge branch 'driver/MercuryiPS_VISA' of github.com:WilliamHPNielsen/…

39a2d6c

…Qcodes into driver/MercuryiPS_VISA

pep8 field_vector

c5cbb08

Merge branch 'master' into driver/MercuryiPS_VISA

cb1cb1f

don't assign an unused variable

309cdb6

add initialisation logging to visa.py

779e987

pass visalib argument to super().__init__

8dee7b8

Merge branch 'driver/MercuryiPS_VISA' of github.com:WilliamHPNielsen/…

38a70a4

…Qcodes into driver/MercuryiPS_VISA

add a simple PyVISA-sim test

b2742d0

WilliamHPNielsen and others added 6 commits May 9, 2018 16:56

Merge branch 'master' into driver/MercuryiPS_VISA

64f9074

Merge branch 'master' of github.com:QCoDeS/Qcodes into driver/Mercury…

3113b6b

…iPS_VISA

Handle unitless responses

76b798f

Merge branch 'driver/MercuryiPS_VISA' of github.com:WilliamHPNielsen/…

b927c2c

…Qcodes into driver/MercuryiPS_VISA

Merge branch 'master' into driver/MercuryiPS_VISA

fcf0ec1

Fix wrong indentation

efe91da

WilliamHPNielsen changed the title ~~Driver/Mercury iPS with VISA~~ [WIP] Driver/Mercury iPS with VISA Jun 11, 2018

WilliamHPNielsen added 6 commits June 13, 2018 16:37

Add set command to field_target

3335590

Update test to use parameters

8125d27

Convince mypy that a variable is a float

f9ba777

Add a FieldVector to hold the target field

fdfb537

Apply a lambda for great justice

4b2c915

Add ramp status parameter

bb617aa

WilliamHPNielsen added 5 commits July 19, 2018 14:10

Add two ramp methods (safe and fast)

99e4c1d

Log communication like a proper VISA instrument

8630ae9

Log VISA communication with the VISA logger

8c24822

Test (and correct) _ramp_safely

d10c1d1

Add high-level ramp function

8de7aa7

jenshnielsen reviewed Jul 19, 2018

View reviewed changes

WilliamHPNielsen added 10 commits July 20, 2018 09:10

Refactor test to use pytest's caplog

3417df2

Merge branch 'master' into driver/MercuryiPS_VISA

f4ead14

Fix typo in ramp

b02f21a

Remove unused function in test

805d264

Add method to update field limits

78046db

Remove unused imports in test

f7d32dd

Send target vector to slaves

c437b9f

Cast a variable as a list (when it is a list)

85cedf0

Add example notebook

eb1aed6

Delete old (very obsolete) notebook

fb98237

WilliamHPNielsen changed the title ~~[WIP] Driver/Mercury iPS with VISA~~ Driver/Mercury iPS with VISA Jul 20, 2018

astafan8 reviewed Jul 20, 2018

View reviewed changes

astafan8 approved these changes Jul 20, 2018

View reviewed changes

WilliamHPNielsen added 2 commits July 20, 2018 12:21

Remove confusing comment from yaml file

d0338b4

Merge branch 'master' into driver/MercuryiPS_VISA

f374558

Merge branch 'master' into driver/MercuryiPS_VISA

658e591

WilliamHPNielsen merged commit 36a75ea into microsoft:master Aug 3, 2018

giulioungaretti pushed a commit that referenced this pull request Aug 3, 2018

Generated gh-pages for commit 36a75ea

feb7b7c

Merge: b2344b7 658e591 Author: William H.P. Nielsen <[email protected]> Merge pull request #897 from WilliamHPNielsen/driver/MercuryiPS_VISA

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Driver/Mercury iPS with VISA #897

Driver/Mercury iPS with VISA #897

WilliamHPNielsen commented Dec 4, 2017 •

edited

Loading

codecov bot commented Dec 19, 2017 •

edited

Loading

WilliamHPNielsen commented Dec 19, 2017

WilliamHPNielsen commented May 9, 2018 •

edited

Loading

jenshnielsen Jul 19, 2018

WilliamHPNielsen Jul 20, 2018

WilliamHPNielsen commented Jul 20, 2018

astafan8 Jul 20, 2018

WilliamHPNielsen Jul 20, 2018 •

edited

Loading

astafan8 Jul 20, 2018

astafan8 Jul 20, 2018

WilliamHPNielsen Jul 20, 2018

astafan8 Jul 20, 2018

WilliamHPNielsen commented Jul 20, 2018

WilliamHPNielsen commented Jul 30, 2018

WilliamHPNielsen commented Aug 3, 2018 •

edited

Loading

		lh.setFormatter(formatter)


		def get_messages(iostream: io.StringIO) -> List[str]:

Driver/Mercury iPS with VISA #897

Driver/Mercury iPS with VISA #897

Conversation

WilliamHPNielsen commented Dec 4, 2017 • edited Loading

codecov bot commented Dec 19, 2017 • edited Loading

Codecov Report

WilliamHPNielsen commented Dec 19, 2017

WilliamHPNielsen commented May 9, 2018 • edited Loading

jenshnielsen Jul 19, 2018

Choose a reason for hiding this comment

WilliamHPNielsen Jul 20, 2018

Choose a reason for hiding this comment

WilliamHPNielsen commented Jul 20, 2018

astafan8 Jul 20, 2018

Choose a reason for hiding this comment

WilliamHPNielsen Jul 20, 2018 • edited Loading

Choose a reason for hiding this comment

astafan8 Jul 20, 2018

Choose a reason for hiding this comment

astafan8 Jul 20, 2018

Choose a reason for hiding this comment

WilliamHPNielsen Jul 20, 2018

Choose a reason for hiding this comment

astafan8 Jul 20, 2018

Choose a reason for hiding this comment

WilliamHPNielsen commented Jul 20, 2018

WilliamHPNielsen commented Jul 30, 2018

WilliamHPNielsen commented Aug 3, 2018 • edited Loading

WilliamHPNielsen commented Dec 4, 2017 •

edited

Loading

codecov bot commented Dec 19, 2017 •

edited

Loading

WilliamHPNielsen commented May 9, 2018 •

edited

Loading

WilliamHPNielsen Jul 20, 2018 •

edited

Loading

WilliamHPNielsen commented Aug 3, 2018 •

edited

Loading