Skip to content
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

Jump to bottom

KeysightB1500: Add CMU phase compensation, open/short/load correction, and self calibration #1704

Merged
merged 96 commits into from
Oct 1, 2019
Merged

KeysightB1500: Add CMU phase compensation, open/short/load correction, and self calibration #1704

merged 96 commits into from
Oct 1, 2019

Conversation

lakhotiaharshit
Copy link
Contributor

@lakhotiaharshit lakhotiaharshit commented Sep 10, 2019 •
edited

Add parameter to CMU unit to perform:

  • phase compensation
  • open compensation
  • clear frequency list
  • abort measurement

Things to do:

  • Add tests
  • Run example notebook to update the output

@mention one core developer
@astafan8

@lakhotiaharshit
Add PhaseCompensationMode
8eebe57
@lakhotiaharshit
Add parameter for phase_compensation_mode
d46e9e3
@lakhotiaharshit
Add contants for Clear frequency list mode
3267c95
@lakhotiaharshit
Delete the added constants as they already exist with another name
2288a2d
@lakhotiaharshit
Add docstring to clcorr
415c4a6
@lakhotiaharshit
Add parameter clear_fre_list and perform_correction_data_measurement
d6da4cb
@lakhotiaharshit
Add data correction parameters
e3bd826
@lakhotiaharshit
Merge branch 'b1500-sampling' into b1500-add_parameter
2c8921b
@lakhotiaharshit
Merge branch 'b1500-sampling' into b1500-add_parameter
cd2dfbe
@lakhotiaharshit
Edit CLCORR mode
9cb5f47
@lakhotiaharshit
Fix typo
80eadbc
@lakhotiaharshit
Fix typo: double underscore
f70d50a
@lakhotiaharshit
Merge branch 'b1500-sampling' into b1500-add_parameter
298c2c6
@lakhotiaharshit
Merge branch 'b1500-sampling' into b1500-add_parameter
cf82c38
@lakhotiaharshit
Set integration time to 1 in sampling measurement
d0aaa22
@lakhotiaharshit
Merge branch 'master' into b1500-add_parameter
ab22cc9 
# Conflicts:
#	docs/examples/driver_examples/Qcodes example with Keysight B1500 Parameter Analyzer.ipynb
@lakhotiaharshit
Add parameter to set adc type and mode and averaging
d784b3b
@lakhotiaharshit
Add test for the adc type mode and averaging
7c8b72f
@lakhotiaharshit
Edit example notebook to contain the parameter
d208ad5
@lakhotiaharshit
Remove the short-test version of code
0c6f414
@lakhotiaharshit
Add parameter phase compensation and abort
680127a
@lakhotiaharshit
Add response of phase compensation in constants
be889e6
@lakhotiaharshit
Edit example notebook for phase compensation
2783541
@lakhotiaharshit
Run phase compensation with higher timeout
081bf64
@lakhotiaharshit
Change arguments
29d4468
@lakhotiaharshit
Edit example notebook to have all parameters related to phase compens…
f0bbb94 
…ation
@lakhotiaharshit
Get the response of the phase compensation
d1e7fea
@lakhotiaharshit
Edit example notebook for explanation of commands
89da9b4
@lakhotiaharshit
Run example notebook and save output
a46aecb
@lakhotiaharshit
Merge branch 'b1500-sampling-inttime' into b1500-add_parameter
bfd3998
@lakhotiaharshit
Add empty frequency list submodule for correction submodule of CMU
fad1ec3
@lakhotiaharshit
Add frequency list methods to frequency list submodule
0e4b3c4
@lakhotiaharshit
Rename clear_frequency_for_correction to clear
7c44e24
@lakhotiaharshit
Rename add_frequency_for_correction to add, make frequency argument f…
9b7a0a7 
…loat
@lakhotiaharshit
Make frequency argument of CORRL command a float
c116f0d
@lakhotiaharshit
Rename get_frequency_list_for_correction to query + test + docstring
fdccd0d
@lakhotiaharshit
Change query return type to float + test
17cdd85
@lakhotiaharshit
Split clear correction method into clear and clear_and_set_default
1d3a63d
@lakhotiaharshit
Fix and test perform_and_enable_correction method
616dcac
@lakhotiaharshit
Add test for self_calibration
be0fb86
@lakhotiaharshit
Make CALResponse an IntFlag, make self_calibration return it + tests
b62a868
@lakhotiaharshit
Rename time_out_phase_compensation to phase_compensation_timeout
b2445eb
@lakhotiaharshit
Document default argument for self_calibration
833efb2
@lakhotiaharshit
Add NOT_PERFORMED ADJQuery.Response item
e978d46
@lakhotiaharshit
Add docstring for phase_compensation method
1b25ad5
@lakhotiaharshit
Note calibration_time_out in self_calibration method's docstring
0b0959f
@lakhotiaharshit
Add extra tests for message builder methods
38bd2d1
@lakhotiaharshit
Clarify docstrings
9cf4710
@lakhotiaharshit
Refactor parsing get_reference_values response, prettify + tests
8de7350
@lakhotiaharshit
Rename perform_correction to perform
669e2bf 
also perform_and_enable_correction to perform_and_enable
@lakhotiaharshit
Numerous improvements to the notebook (wasn't run on actual instrument)
76d362d
@lakhotiaharshit lakhotiaharshit changed the title [WIP] KeysightB1500: Add parameter for CMU phase calibration KeysightB1500: Add CMU phase compensation, open/short/load correction, and self calibration Sep 30, 2019
@lakhotiaharshit
Merge branch 'master' into b1500-add_parameter
1fad3ec
@lakhotiaharshit
Remove get_parser as get_cmd is None. Fixes snapshotability.
d340fa4 
At the init the mode is not set to any value. The get_cmd gets None
which can not be parsed by the get_parser. This gives the warning which
is fixed now.
@lakhotiaharshit
Fix response of perform_and_enable to output the name of Enum.
2cf2ec8 
As a string Enum automatically outputs its value(0/1) which does not
make any sense.
@lakhotiaharshit
Run example notebook.
2acf05d
@lakhotiaharshit
Fix test_perform_and_enable_correction
01dba3e
@astafan8 astafan8 merged commit 1bb7d75 into microsoft:master Oct 1, 2019
@lakhotiaharshit lakhotiaharshit deleted the b1500-add_parameter branch January 22, 2020 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@astafan8 astafan8 astafan8 approved these changes

Assignees
No one assigned
Labels
driver
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@lakhotiaharshit @astafan8