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.

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

Tektronix AWG hardware file update to include the B series of AWGs #180

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

michaelOlney-Fraser
Copy link

@michaelOlney-Fraser michaelOlney-Fraser commented Jan 13, 2025

Tektronix produces the AWG70K series. The old ones are labeled 'A', and there is a newer series labelled 'B'. The current hardware file only allows for the A series. This pull request contains changes to the tektronix_awg70k hardware file to include the B series. Importantly, the new series is basically the same from a hardware standpoint, and the only real difference is the maximum length of loaded waveforms. This is handled by querying the hardware so no changes are necessary to handle the hardware change.

Description

In the hardware file, there are a few if statements which read:

if self.awg_model == 'AWG7000#A' :

I simply changed these if statements to be:

if self.awg_model in ['AWG7000#A', 'AWG7000#B'] :

(where # can be either 1, for the single channel AWGs, or 2 for the 2 channel AWGs).

I also changed the function _has_sequence_mode() to handle the B series of AWGs.

Motivation and Context

This change is required because using the new tektronix AWGs breaks the pulsed gui.

How Has This Been Tested?

This change is relatively minor and so has undergone minimal testing. It should be tested on a setup using the A series AWG before it is released. I have successfully loaded all modules that connect to this hardware without issue.

Types of changes

  • Bug fix
  • [ x ] New feature
  • Breaking change (Causes existing functionality to not work as expected)

Checklist:

  • [ x ] My code follows the code style of this project.
  • [ x ] I have documented my changes in /docs/changelog.md.
  • My change requires additional/updated documentation.
  • I have updated the documentation accordingly.
  • [ x ] I have added/updated the config example for any module docstrings as necessary.
  • [ x ] I have checked that the change does not contain obvious errors
    (syntax, indentation, mutable default values, etc.).
  • [ x ] I have tested my changes using 'Load all modules' on the default dummy configuration.
  • [ x ] All changed Jupyter notebooks have been stripped of their output cells.

@michaelOlney-Fraser michaelOlney-Fraser self-assigned this Jan 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant