Skip to content

Commit cf9a721

Browse files
authored
Merge pull request #7344 from jjmartinezQT/Operation-modes-for-SGS100a
operation mode for SGS100A instrument
2 parents 5a95275 + 846e3ed commit cf9a721

File tree

5 files changed

+35
-0
lines changed

5 files changed

+35
-0
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Added operation mode in the SGS100A instrument to be able to change between NORMal and BBBYpass operation modes. Defaults to NORMal.

docs/examples/driver_examples/Qcodes example with Rohde Schwarz SGS100A.ipynb

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,16 @@
101101
"# stop RF outout\n",
102102
"sgsa.status(False)"
103103
]
104+
},
105+
{
106+
"cell_type": "code",
107+
"execution_count": null,
108+
"metadata": {},
109+
"outputs": [],
110+
"source": [
111+
"# set bypass operation mode\n",
112+
"sgsa.operation_mode(\"BBBYpass\")"
113+
]
104114
}
105115
],
106116
"metadata": {

src/qcodes/instrument/sims/RSSGS100A.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,14 @@ devices:
201201
setter:
202202
q: "SOUR:IQ:IMP:QUAD {:.2f}"
203203

204+
operation_mode:
205+
default: "NORMal"
206+
getter:
207+
q: ":SOUR:OPMode?"
208+
r: "{}"
209+
setter:
210+
q: ":SOUR:OPMode {}"
211+
204212
resources:
205213
GPIB::1::INSTR:
206214
device: SGS100A

src/qcodes/instrument_drivers/rohde_schwarz/SGS100A.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,17 @@ def __init__(
322322
vals=vals.Numbers(20e-9, 100),
323323
)
324324
"""Parameter pulsemod_width"""
325+
self.operation_mode: Parameter = self.add_parameter(
326+
"operation_mode",
327+
label="Operation Mode",
328+
get_cmd=":SOUR:OPMode?",
329+
set_cmd=":SOUR:OPMode {}",
330+
vals=vals.Enum(
331+
"NORMal", # Normal - Normal Mode
332+
"BBBYpass", # Bypass - Bypass Mode
333+
),
334+
)
335+
"""Parameter operation_mode"""
325336
self.add_function("reset", call_cmd="*RST")
326337
self.add_function("run_self_tests", call_cmd="*TST?")
327338

tests/drivers/test_RS_SGS100A.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,8 @@ def test_IQ_gain_imbalance(sg) -> None:
9898

9999
def test_IQ_angle(sg) -> None:
100100
verify_property(sg, "IQ_angle", [-8, -4, 0, 4, 8])
101+
102+
103+
def test_operation_mode(sg) -> None:
104+
print(f"operation mode is set to {sg.operation_mode()}")
105+
verify_property(sg, "operation_mode", ["NORMal", "BBBYpass"])

0 commit comments

Comments
 (0)