Lakeshore Model 336: make runnable, add minimal test, and fixes along the way #1526
Conversation
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
... becasue it is parametrized correctly in the BaseOutput class Lakeshore Model 336 driver
It has to be a group parameter, but other kwargs like val_mapping and/or vals and others can be now specified in the subclasses to allow aproprivate variations between models. in Lakeshore Model 336, Model 372, and their base class
Add map between BaseOutput's input_channel values and sensor channel object names. Model 336 uses letters for sensor channel names, hence the values of the BaseOutput's input_channel parameter naturally become strings. Model 372 uses numbers (it has 16 channels, while 366 has 4) for sensor channels, hence the values of the BaseOutput's input_channel parameter naturally become integers. To bridge this difference, and make wait_until_set_point_reached work for any Lakeshore model driver, a new mapping with a long ugly name input_channel_parameter_values_to_channel_name_on_instrument is introduced. This will be refactored later perhaps.
If the given temperature is from the highest range, the logic in the function would throw an exception because the index that bisect returns is +1 relative to what it should be. Now it's fixed, and a test is added. For Lakeshore drivers, all models
It is mostly copy-paste of Lakeshore Model 372 test. The test infrastructure will be improved in later commits.
jenshnielsen
approved these changes
Apr 1, 2019
Codecov Report
@@ Coverage Diff @@
## master #1526 +/- ##
=======================================
Coverage 70.66% 70.66%
=======================================
Files 102 102
Lines 11585 11585
=======================================
Hits 8186 8186
Misses 3399 3399 |
active_channel_name_on_instrument
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR is a result of a wish of using Lakeshore Model 336 driver in Delft, which turned into fixing some bugs in the drivers.
Most notable:
is +1 relative to what it should be. Now it's fixed, and a test is added. For Lakeshore drivers, all models
@QCoDeS/core This PR "as is" does not act on the fact that the driver and test infrastructure for it is quite a bit convoluted and difficult to wrap ones head around. Hence, this PR only makes fixes, so that Model 336 driver works. Would you insist on reworking the structure of the driver and the test infrastructure in this PR or shall we leave it for "later"?