Skip to content

Add Tektronix AWG70000A enhancements #7837

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.

Sign up for GitHub

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

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

Add Tektronix AWG70000A enhancements #7837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4449852
Add Tektronix AWG70000A enhancements
benn-thomsen Feb 3, 2026
3c634dd
Add newsfragment for PR #7837
benn-thomsen Feb 3, 2026
163f94e
Merge branch 'microsoft:main' into feature/tektronix-awg
bennthomsen Feb 5, 2026
a2d1ce0
Merge branch 'microsoft:main' into feature/tektronix-awg
bennthomsen Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/changes/newsfragments/7837.improved_driver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add hold parameter, force_jump parameter, and set_event_jump method to the Tektronix AWG70000A driver for improved sequence control.
40 changes: 39 additions & 1 deletion src/qcodes/instrument_drivers/tektronix/AWG70000A.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,21 @@ def __init__(
vals=vals.Ints(0, 1),
get_parser=int,
)
"""Parameter state"""
"""Channel State: (OFF: 0, ON: 1)"""

self.hold: Parameter = self.add_parameter(
"hold",
label=f"Channel {channel} hold value",
get_cmd=f"OUTPut{channel}:WVALUE:ANALOG:STATE?",
set_cmd=f"OUTPut{channel}:WVALUE:ANALOG:STATE {{}}",
val_mapping={
"FIRST": "FIRST",
"ZERO": "ZERO",
},
Copy link
Collaborator

@jenshnielsen jenshnielsen Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this mapping needed? It seems the keys and values are the same

Copy link
Author

@bennthomsen bennthomsen Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed to:

        self.hold: Parameter = self.add_parameter(
            "hold",
            label=f"Channel {channel} hold value",
            get_cmd=f"OUTPut{channel}:WVALUE:ANALOG:STATE?",
            set_cmd=f"OUTPut{channel}:WVALUE:ANALOG:STATE {{}}",
            vals=vals.Enum("FIRST", "ZERO"),
        )

)
""" the output condition of a waveform of the specified
channel to hold while the instrument is in the waiting-for-trigger state.
ZERO = 0V, FIRST = first value of next sequence"""

##################################################
# FGEN PARAMETERS
Expand Down Expand Up @@ -587,6 +601,14 @@ def __init__(
)
"""Parameter all_output_off"""

self.force_jump: Parameter = self.add_parameter(
Copy link
Collaborator

@jenshnielsen jenshnielsen Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have just landed a pr to make parameters generic so I would like to make use of that.

Suggested change
self.force_jump: Parameter = self.add_parameter(
self.force_jump: Parameter[int, Self] = self.add_parameter(

This means the parameter data type is integer and the instrument the parameter is bound to is this class.

Similar for the other parameter

Copy link
Author

@bennthomsen bennthomsen Feb 5, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the correct signature here
self.force_jump: Parameter[int] = self.add_parameter(

"force_jump",
label="Force Jump",
set_cmd="SOURCE1:JUMP:FORCE {}",
vals=vals.Ints(1, 16383),
)
"""Parameter force_jump"""

add_channel_list = self.num_channels > 2
# We deem 2 channels too few for a channel list
if add_channel_list:
Expand Down Expand Up @@ -619,6 +641,22 @@ def __init__(

self.connect_message()

def set_event_jump(
self, sequence_name: str, current_step: int, next_step: int
) -> None:
"""
Set event jump for a given step in the sequence

Args:
sequence_name: The name of the sequence
current_step: The step number in the sequence (1-indexed)
next_step: The step number to jump to (1-indexed)
"""

self.write(
f"SLISt:SEQuence:STEP{current_step}:EJUMp {sequence_name}, {next_step}"
)

def force_triggerA(self) -> None:
"""
Force a trigger A event
Expand Down