-
Notifications
You must be signed in to change notification settings - Fork 301
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
Znb20 new driver with channel support #643
Merged
jenshnielsen
merged 58 commits into
microsoft:master
from
jenshnielsen:znb_with_channels_2
Jul 17, 2017
Merged
Znb20 new driver with channel support #643
jenshnielsen
merged 58 commits into
microsoft:master
from
jenshnielsen:znb_with_channels_2
Jul 17, 2017
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
Needs:
|
7 tasks
jenshnielsen
commented
Jun 19, 2017
get_cmd='SENS{}:FREQ:SPAN?'.format(n), | ||
set_cmd=self._set_span, | ||
get_parser=float, | ||
vals=vals.Numbers(1, self._parent._max_freq - self._parent._min_freq)) | ||
self.add_parameter(name='npts', | ||
get_cmd='SENS:SWE:POIN?', | ||
set_cmd=self._set_npts, | ||
get_parser=int) |
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.
This should probably be on the instrument of have the channel number inside?
That way you can access the names on the channellist via names as soon as they are locked
many instruments have hardware channels that are indexed and start at 1
jenshnielsen
force-pushed
the
znb_with_channels_2
branch
from
June 22, 2017 13:22
b345e4e
to
5e12210
Compare
…_work' into znb_with_channels_2
and ensure that we are waiting on the right channel for avg
Autoscale all is redundant since it can now be done with channels the setpoints need to be different for different channels since we may not use the same freq axis for all
Make it possible to get channels by name even when not locked
giulioungaretti
pushed a commit
that referenced
this pull request
Jul 17, 2017
Author: Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Znb20 new driver with channel support (#643)
Dominik-Vogel
pushed a commit
to Dominik-Vogel/Qcodes
that referenced
this pull request
Aug 9, 2017
* fix: refactor Instrument to avoid removing methods from channels * Include channels in print_readable_snaphoot * Fix: make locked channels a named tuple That way you can access the names on the channellist via names as soon as they are locked * Fix: channels add support for indexing from 1 many instruments have hardware channels that are indexed and start at 1 * Fix linting errors in channel * fix typo * Move print readable snapshot to instrument class where it belongs * Fix: more channel annotation * Improve error message * pprint limit line lenght of header to max char * pep8 line lenght * Fix: channel remove support for oneindexed channels * improve type annotation * Optional -> Union * add channels to api docs * fix: make submodules nested * add submodule attributes to base * Docs strings * Fix: add option to set span and center * Int -> float * Fix: wip towards more channels in znb20 * Update znb notebook * Znb 20 add setpoint unit * Working snm for ZNB * refresh znb noteboo * Add autosacle and display to vna * Add validators for freq settings * Init for all channels * Ensure that start<stop * Add warnings if start and stop cannot be set exactly * Znb20 small improvements * Update Znb20 notebook * Add option to get db traces * update to example notebook * Correct initial values * Fix: ZNB20 use channels * Fix: znb simplify string formatting * znb20 less redundant passing of parameters * znb call save_val in znb20 parameters * ZNB20 remove usage of 1 indexed * Set number of points per channel * first pass at updating notebook to channels * Ensure the right parameter is measured * Add support for instruments with variable number of ports * Handle different max/min freqs * Rename driver and ensure that we are waiting on the right channel for avg * fix: remove autoscale all and name freq axis Autoscale all is redundant since it can now be done with channels the setpoints need to be different for different channels since we may not use the same freq axis for all * Update example notebook * add benchmark * Replace namedtuple by dict Make it possible to get channels by name even when not locked * make it possible to init znb without channels * Fix change init order * add option to clear channels and traces * update example notebook * Add support for changing format and rename trace paramters * update example notebook
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.
Replaces #623
@nataliejpg of possible interest