Feat/channelization with small cleanup #640
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
* feat: Add a Keysight_34465A driver Add a first file for a driver for the Keysight 34465A DMM and a benchmarking notebook * Add trigger parameters to driver Add four trigger parameters to the driver. * refactor: Remove 'READ?' as volt get_cmd Make a more general get_cmd for the volt parameter. Using simply 'READ?' is wrong in many cases. * feat: Add sampling parameters Add four parameters for sampling. * fix: Fix wrong volt parameter get_cmd * WIP: Add Array parameter * feat: Add functioning data buffer parameter * Move notebook * Respond to review
Initial commit of two new classes to allow for channelization of instruments. This includes ChannelList, a container for channels in an instrument, and InstrumentChannel which implements a base class for an instance of a channel.
Add a driver for the Lakeshore Model 336 temperature controller using new channelization implementation.
Commits a channelized version of the Harvard DecaDAC driver using the new channelization implementation. Note that this driver at the present time also fixes a number of open bugs in the previous driver, including occasional crashes (#546), incorrectly reading DAC voltages (#563), reset (#478). This commit also adds a number of new features to the driver including: - Feature and version detection - Access to calibrated high-resolution mode of DAC - Parameter read from memory - Validation of writes
Fix bug in slicing/adding code, not correctly passing along channel list name.
- Removed useless methods - Whitespace
Allows certain channel lists to be excluded from snapshots. This is helpful when, for example, there are multiple ways to access the same channel.
This feature is implemented by creating the idea of a submodule in the
instrument class. This is just a class which implements the Instrument
class, and may be a channel list or may just implement a logical
collection of parameters within a parent instrument.
For example, looking at the Lakeshore Model_336 driver, each channel can
either be accessed as a member of a channel list, or by using the name
of the channel:
```python3
therm = Model_336("therm", "...")
# These two accesses are equivalent
therm.A.temperature()
therm.channels[0].temperature()
```
Should think about the best way to implement this change.
Submodule objects must be Metadatables at minimum, instrument is too restrictive for channels.
This reverts commit 2dbacc0.
Add a QDac driver using the new channelisation feature
…array Feat/channelization with array
Make the paramclass returned by __getattr__ be customisable.
Add a channelised driver for the QDac. This requires changing the base code for channels a bit to allow for custom MultiChannelInstrumentParameter subclasses.
…array Driver/QDac_channels
Add support for array parameters to MultiChannelInstrumentParameter
2 tasks
giulioungaretti
pushed a commit
that referenced
this pull request
Jun 16, 2017
Author: Jens Hedegaard Nielsen <jenshnielsen@gmail.com>
Feat/channelization with small cleanup (#640)
giulioungaretti
pushed a commit
that referenced
this pull request
Jun 16, 2017
Author: Jens Hedegaard Nielsen <jenshnielsen@gmail.com>
Feat/channelization with small cleanup (#640)
Dominik-Vogel
pushed a commit
to Dominik-Vogel/Qcodes
that referenced
this pull request
Aug 9, 2017
* Driver/Keysight DMM (microsoft#556) * feat: Add a Keysight_34465A driver Add a first file for a driver for the Keysight 34465A DMM and a benchmarking notebook * Add trigger parameters to driver Add four trigger parameters to the driver. * refactor: Remove 'READ?' as volt get_cmd Make a more general get_cmd for the volt parameter. Using simply 'READ?' is wrong in many cases. * feat: Add sampling parameters Add four parameters for sampling. * fix: Fix wrong volt parameter get_cmd * WIP: Add Array parameter * feat: Add functioning data buffer parameter * Move notebook * Respond to review * feat: Add channelization Initial commit of two new classes to allow for channelization of instruments. This includes ChannelList, a container for channels in an instrument, and InstrumentChannel which implements a base class for an instance of a channel. * feat: Add channelized Lakeshore Model336 Driver Add a driver for the Lakeshore Model 336 temperature controller using new channelization implementation. * feat: Add a channelized driver for the Harvard DAC Commits a channelized version of the Harvard DecaDAC driver using the new channelization implementation. Note that this driver at the present time also fixes a number of open bugs in the previous driver, including occasional crashes (microsoft#546), incorrectly reading DAC voltages (microsoft#563), reset (microsoft#478). This commit also adds a number of new features to the driver including: - Feature and version detection - Access to calibrated high-resolution mode of DAC - Parameter read from memory - Validation of writes * fix: bug in slicing and adding code Fix bug in slicing/adding code, not correctly passing along channel list name. * style: fix formatting and make codacy fixes * style: fix more code style issues - Removed useless methods - Whitespace * fix: flush is now handled correctly in instrument base class * feat: Allow channellists to be excluded from snapshots Allows certain channel lists to be excluded from snapshots. This is helpful when, for example, there are multiple ways to access the same channel. * fix: Allow snapshots of ChannelLists This feature is implemented by creating the idea of a submodule in the instrument class. This is just a class which implements the Instrument class, and may be a channel list or may just implement a logical collection of parameters within a parent instrument. For example, looking at the Lakeshore Model_336 driver, each channel can either be accessed as a member of a channel list, or by using the name of the channel: ```python3 therm = Model_336("therm", "...") # These two accesses are equivalent therm.A.temperature() therm.channels[0].temperature() ``` * style: remove force arg in snapshot_base Should think about the best way to implement this change. * style: remove unessecary import * fix: error in type check. * fix: submodules should be Metadatable Submodule objects must be Metadatables at minimum, instrument is too restrictive for channels. * Start adding tests for channels * Extend tests * Fix: ensure consistent dataset names regardless of chan[] or chanA reading * More work on channels testing * Make sure that instument is closed in tests * Depend on hypothesis for test * fix improve testing of channels * test more: * fix: channels pep8 * fix: ensure that channels can be extended from generator * More tests of adding channels * Add missing functions and parameters to channellist * fix: function testS * assert to unittest style * Revert "fix: function testS" This reverts commit ff8a316. * Revert "Add missing functions and parameters to channellist" This reverts commit 347c0b2. * Remove docs of non existing attributes * Docs: decadac quote *IDN to remove warning * Add some channel notebooks * fix: test_channels small tweeks * Add support to array parameters in channels And error clearly if you try to measure multiple multiparameters * Mock parameters add instruments to fix names in tests * refactor tests to reduce code duplication * Revert "Add some channel notebooks" This reverts commit 2dbacc0. * feat: Add channelised QDac driver Add a QDac driver using the new channelisation feature * feat: Add a set method to MultiChannelInstrumentParameter * docs: Add a driver example for the channelised Qdac * feat: Make ChannelList take default paramclass Make the paramclass returned by __getattr__ be customisable. * feat: Add a channelised QDac driver Add a channelised driver for the QDac. This requires changing the base code for channels a bit to allow for custom MultiChannelInstrumentParameter subclasses. * docs: Add notebook for QDac w. channels * style: Remove unnecessary comment * Fix syntax/spelling errors in DAC driver * Fix: qdac_channels remove magic number * Doc: clarify doc string * Fix: rename paramclass to be more specific * Lakeshore tab to space * pep8 lakeshore driver * Pep8 decadac driver * Fix warnings in qdac driver * Annotate parameters that linter has problems with
peendebak
pushed a commit
to VandersypenQutech/Qcodes
that referenced
this pull request
Aug 11, 2017
* Driver/Keysight DMM (microsoft#556) * feat: Add a Keysight_34465A driver Add a first file for a driver for the Keysight 34465A DMM and a benchmarking notebook * Add trigger parameters to driver Add four trigger parameters to the driver. * refactor: Remove 'READ?' as volt get_cmd Make a more general get_cmd for the volt parameter. Using simply 'READ?' is wrong in many cases. * feat: Add sampling parameters Add four parameters for sampling. * fix: Fix wrong volt parameter get_cmd * WIP: Add Array parameter * feat: Add functioning data buffer parameter * Move notebook * Respond to review * feat: Add channelization Initial commit of two new classes to allow for channelization of instruments. This includes ChannelList, a container for channels in an instrument, and InstrumentChannel which implements a base class for an instance of a channel. * feat: Add channelized Lakeshore Model336 Driver Add a driver for the Lakeshore Model 336 temperature controller using new channelization implementation. * feat: Add a channelized driver for the Harvard DAC Commits a channelized version of the Harvard DecaDAC driver using the new channelization implementation. Note that this driver at the present time also fixes a number of open bugs in the previous driver, including occasional crashes (microsoft#546), incorrectly reading DAC voltages (microsoft#563), reset (microsoft#478). This commit also adds a number of new features to the driver including: - Feature and version detection - Access to calibrated high-resolution mode of DAC - Parameter read from memory - Validation of writes * fix: bug in slicing and adding code Fix bug in slicing/adding code, not correctly passing along channel list name. * style: fix formatting and make codacy fixes * style: fix more code style issues - Removed useless methods - Whitespace * fix: flush is now handled correctly in instrument base class * feat: Allow channellists to be excluded from snapshots Allows certain channel lists to be excluded from snapshots. This is helpful when, for example, there are multiple ways to access the same channel. * fix: Allow snapshots of ChannelLists This feature is implemented by creating the idea of a submodule in the instrument class. This is just a class which implements the Instrument class, and may be a channel list or may just implement a logical collection of parameters within a parent instrument. For example, looking at the Lakeshore Model_336 driver, each channel can either be accessed as a member of a channel list, or by using the name of the channel: ```python3 therm = Model_336("therm", "...") # These two accesses are equivalent therm.A.temperature() therm.channels[0].temperature() ``` * style: remove force arg in snapshot_base Should think about the best way to implement this change. * style: remove unessecary import * fix: error in type check. * fix: submodules should be Metadatable Submodule objects must be Metadatables at minimum, instrument is too restrictive for channels. * Start adding tests for channels * Extend tests * Fix: ensure consistent dataset names regardless of chan[] or chanA reading * More work on channels testing * Make sure that instument is closed in tests * Depend on hypothesis for test * fix improve testing of channels * test more: * fix: channels pep8 * fix: ensure that channels can be extended from generator * More tests of adding channels * Add missing functions and parameters to channellist * fix: function testS * assert to unittest style * Revert "fix: function testS" This reverts commit ff8a316. * Revert "Add missing functions and parameters to channellist" This reverts commit 347c0b2. * Remove docs of non existing attributes * Docs: decadac quote *IDN to remove warning * Add some channel notebooks * fix: test_channels small tweeks * Add support to array parameters in channels And error clearly if you try to measure multiple multiparameters * Mock parameters add instruments to fix names in tests * refactor tests to reduce code duplication * Revert "Add some channel notebooks" This reverts commit 2dbacc0. * feat: Add channelised QDac driver Add a QDac driver using the new channelisation feature * feat: Add a set method to MultiChannelInstrumentParameter * docs: Add a driver example for the channelised Qdac * feat: Make ChannelList take default paramclass Make the paramclass returned by __getattr__ be customisable. * feat: Add a channelised QDac driver Add a channelised driver for the QDac. This requires changing the base code for channels a bit to allow for custom MultiChannelInstrumentParameter subclasses. * docs: Add notebook for QDac w. channels * style: Remove unnecessary comment * Fix syntax/spelling errors in DAC driver * Fix: qdac_channels remove magic number * Doc: clarify doc string * Fix: rename paramclass to be more specific * Lakeshore tab to space * pep8 lakeshore driver * Pep8 decadac driver * Fix warnings in qdac driver * Annotate parameters that linter has problems with
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.
A version of #568 with some very minor cleanups
@WilliamHPNielsen @spauka