Tektronix DPO7200xx and AWG70000A — Convenience Methods for Waveform Workflows#7865
Open
bennthomsen wants to merge 11 commits intomicrosoft:mainfrom
Open
Tektronix DPO7200xx and AWG70000A — Convenience Methods for Waveform Workflows#7865bennthomsen wants to merge 11 commits intomicrosoft:mainfrom
bennthomsen wants to merge 11 commits intomicrosoft:mainfrom
Conversation
…homsen/Qcodes into feature/tektronix-combined
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #7865 +/- ##
==========================================
- Coverage 59.94% 58.88% -1.06%
==========================================
Files 352 352
Lines 31932 31977 +45
==========================================
- Hits 19142 18831 -311
- Misses 12790 13146 +356 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
| self.visa_log.debug(f"Response: {response}") | ||
| return response | ||
|
|
||
| def single(self): |
Collaborator
There was a problem hiding this comment.
Suggested change
| def single(self): | |
| def single(self) -> None: |
| ) # This will trigger the actual download of the waveform | ||
| return wfms | ||
|
|
||
| def get_timebase(self) -> tuple: |
Collaborator
There was a problem hiding this comment.
Suggested change
| def get_timebase(self) -> tuple: | |
| def get_timebase(self) -> tuple[str,np.ndarray]: |
| break | ||
| time.sleep(0.1) | ||
|
|
||
| def download_waveforms(self) -> tuple: |
Collaborator
There was a problem hiding this comment.
Suggested change
| def download_waveforms(self) -> tuple: | |
| def download_waveforms(self) -> tuple[np.ndarray, ..,]: |
If I understand correctly the tuple contains numpy arrays
| """ | ||
| self.write("AWGControl:STOP") | ||
|
|
||
| def upload_seqx(self, seqx_input, sequence_name="seq") -> None: |
Collaborator
There was a problem hiding this comment.
Suggested change
| def upload_seqx(self, seqx_input, sequence_name="seq") -> None: | |
| def upload_seqx(self, seqx_input: notsurewhatthetypeisherepleascheck, sequence_name: str ="seq") -> None: |
Collaborator
|
@benn-thomsen Thanks, In qcodes we require that the code should contain types for all input and output. I have added comments with most of them but please check that this is correct. |
This file contains hidden or 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
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.
Adds convenience methods to the Tektronix DPO7200xx oscilloscope and AWG70000A waveform generator drivers to
streamline triggered acquisition and sequence upload workflows.
Files changed: 4 files, +133 / −2 lines
##DPO7200xx Oscilloscope
(DPO7200xx.py, +58 lines)
Three new convenience methods on TektronixDPO7000xx:
completes and the trigger is ready (with timeout)
##AWG70000A Waveform Generator
(AWG70000A.py, +26 lines)
One new convenience method on TektronixAWG70000Base:
tracks to channels 1 & 2, enables outputs, and starts playback
Other Changes