Skip to content

Add Keysight 33611A driver. #7644

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

Merged
jenshnielsen merged 4 commits into from
Nov 18, 2025
Merged

Add Keysight 33611A driver. #7644

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
6e660dc
Add Keysight 33611A driver.
Nov 14, 2025
ca0a3a0
Add changes for Keysight 33611A driver to new fragments
Nov 14, 2025
76adcca
Add PR number to changes 7644
Nov 14, 2025
94408b2
Add newline to end of file newsfragment
Nov 18, 2025
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/7644.new_driver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added Keysight 33611A driver. (:pr:`7644`)
2 changes: 2 additions & 0 deletions src/qcodes/instrument_drivers/Keysight/KeysightAgilent_33XXX.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ def __init__(
"33511B": 1,
"33512B": 2,
"33522B": 2,
"33611A": 1,
"33622A": 2,
"33510B": 2,
}
Expand All @@ -416,6 +417,7 @@ def __init__(
"33512B": 20e6,
"33250A": 80e6,
"33522B": 30e6,
"33611A": 80e6,
"33622A": 120e6,
"33510B": 20e6,
}
Expand Down
7 changes: 7 additions & 0 deletions src/qcodes/instrument_drivers/Keysight/Keysight_33611a.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from .KeysightAgilent_33XXX import Keysight33xxxSingleChannel


class Keysight33611A(Keysight33xxxSingleChannel):
"""
QCoDeS driver for the Keysight 33611A waveform generator.
"""
2 changes: 2 additions & 0 deletions src/qcodes/instrument_drivers/Keysight/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from .Keysight_33511b import Keysight33511B
from .Keysight_33512b import Keysight33512B
from .Keysight_33522b import Keysight33522B
from .Keysight_33611a import Keysight33611A
from .Keysight_33622a import Keysight33622A
from .Keysight_34410A_submodules import Keysight34410A
from .Keysight_34411A_submodules import Keysight34411A
Expand Down Expand Up @@ -88,6 +89,7 @@
"Keysight33511B",
"Keysight33512B",
"Keysight33522B",
"Keysight33611A",
"Keysight33622A",
"Keysight34410A",
"Keysight34411A",
Expand Down
7 changes: 6 additions & 1 deletion tests/drivers/test_Keysight_33XXX.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
Keysight33511B,
Keysight33512B,
Keysight33522B,
Keysight33611A,
Keysight33622A,
)

Expand Down Expand Up @@ -75,6 +76,7 @@ def test_wrong_model_warns(
request.addfinalizer(caplog.clear)
request.addfinalizer(Keysight33511B.close_all)
request.addfinalizer(Keysight33512B.close_all)
request.addfinalizer(Keysight33611A.close_all)
request.addfinalizer(Keysight33622A.close_all)

_ = Keysight33511B(
Expand All @@ -83,12 +85,15 @@ def test_wrong_model_warns(
_ = Keysight33512B(
"kw_sim_33512b", address="GPIB::1::INSTR", pyvisa_sim_file="Keysight_33xxx.yaml"
)
_ = Keysight33611A(
"kw_sim_33611a", address="GPIB::1::INSTR", pyvisa_sim_file="Keysight_33xxx.yaml"
)
_ = Keysight33622A(
"kw_sim_33622a", address="GPIB::1::INSTR", pyvisa_sim_file="Keysight_33xxx.yaml"
)

warns = [record for record in caplog.records if record.levelname == "WARNING"]
assert len(warns) == 3
assert len(warns) == 4
assert all(
"The driver class name" in record.msg and "does not match the detected model"
for record in warns
Expand Down
Loading