Add support for Keysight 34411A #2927
Merged
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
According to the Data Sheet of Keysight 34410A and 34411A, page 5
According to the Data Sheet of Keysight 34410A and 34411A, page 5 There were to many resolution factors in the list. 34410A only has eight possible NPLC values.
According to the Data Sheets of both generations (3441x and 3446x/3447x) the range for the DC voltages is 100mV to 1kV (in steps of x10). The values in the attribute 'ranges' were stating the resistance measurement ranges. The attribute was however used for the DC voltage range.
According to the Data Sheet of Keysight 34410A and 34411A, page 6
I'm really not sure about the upper limits for the 60Hz line frequency. For 50Hz the limits correspond to the values given in the Programming Reference.
The name was initially changed in 45e41e9. Since DC Voltage is implemented as the default case, I decided to change it back. Otherwise, the methods 'increase_range()' and 'decrease_range()' would've needed to be changed to use the new attribute name.
In 45e41e9 the 'ranges' attribute was changed to a list with fewer elements. The function 'test_increase_decrease_range()' therefore failed.
Codecov Report
@@ Coverage Diff @@
## master #2927 +/- ##
=======================================
Coverage 65.31% 65.31%
=======================================
Files 208 209 +1
Lines 28031 28038 +7
=======================================
+ Hits 18308 18313 +5
- Misses 9723 9725 +2 |
qcodes/instrument_drivers/Keysight/private/Keysight_344xxA_submodules.py
Show resolved
Hide resolved
|
@astafan8 I think this looks fine to merge what do you think? |
astafan8
approved these changes
Apr 20, 2021
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.
Changes proposed in this pull request:
-Correctly implement the Keysight 3441XA series. A few settings for the 34410A were wrong/missing and the 34411A was not considered at all
-Set the correct DC voltage ranges for all models supported by the _Keysight_344xxA class