Add channeled version of TPS #642
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
|
Should probably have a notebook. We may want to just delete the old version? |
|
@jenshnielsen Yes, I think that noone ever used this driver, so we may just replace the un-channelised version with this one. |
WilliamHPNielsen
suggested changes
Jun 19, 2017
| self._instrument = instrument | ||
|
|
||
| def calc_set_points(self): | ||
| message = self._instrument.ask('WFMPre?') |
There was a problem hiding this comment.
There are some conditions under which this call does not return the full expected response. We should ensure that these conditions are not met. (Sorry, I don't remember the details, but it's something like an enabling of the channels)
|
|
||
| class TPS2012WithChannels(VisaInstrument): | ||
| """ | ||
| This is the QCoDeS driver for the Tektronix 2012B oscilloscope. |
There was a problem hiding this comment.
The class name and docstring should agree; either this is THE QCoDeS driver for TPS2012 or it's the channelised version.
| print(message) | ||
| except VisaIOError: | ||
| gotexception = True | ||
| self.visa_handle.timeout = original_timeout |
jenshnielsen
force-pushed
the
tps_with_channels
branch
from
22f1904
to
79ebcfb
Compare
|
Removed the old one and fixed som pep8 issues, We still need to fix the preamble issue |
if not indented the linter thinks DATa and Note are parameters
Otherwise name will be inconsistent with/without channel access
giulioungaretti
pushed a commit
that referenced
this pull request
Jul 12, 2017
Author: Jens Hedegaard Nielsen <jenshnielsen@gmail.com>
Add channeled version of TPS (#642)
giulioungaretti
pushed a commit
that referenced
this pull request
Jul 12, 2017
Author: Jens Hedegaard Nielsen <jenshnielsen@gmail.com>
Add channeled version of TPS (#642)
Dominik-Vogel
pushed a commit
to Dominik-Vogel/Qcodes
that referenced
this pull request
Aug 9, 2017
* Add channeled version of TPS * Remove old non channel version of TPS2012 driver * Docs: deconfuse linter if not indented the linter thinks DATa and Note are parameters * use propagated name in scopearray Otherwise name will be inconsistent with/without channel access
peendebak
pushed a commit
to VandersypenQutech/Qcodes
that referenced
this pull request
Aug 11, 2017
* Add channeled version of TPS * Remove old non channel version of TPS2012 driver * Docs: deconfuse linter if not indented the linter thinks DATa and Note are parameters * use propagated name in scopearray Otherwise name will be inconsistent with/without channel access
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.
@WilliamHPNielsen