Skip to content

Commit 2b3e1ac

Browse files
committed
Copilot generated upgrades to add_submodule
1 parent 2112003 commit 2b3e1ac

6 files changed

Lines changed: 34 additions & 24 deletions

File tree

src/qcodes/instrument_drivers/Keysight/keysightb1500/KeysightB1517A.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,9 @@ def __init__(
462462
0.001 to 100 for UHVU
463463
"""
464464

465+
self.iv_sweep: KeysightB1500IVSweeper = self.add_submodule("iv_sweep", KeysightB1500IVSweeper(self, "iv_sweep"))
466+
"""Instrument module iv_sweep"""
467+
465468
def _set_sweep_mode(self, value: constants.SweepMode) -> None:
466469
self._sweep_step_parameters["sweep_mode"] = value
467470
self._set_from_sweep_step_parameters()
@@ -857,7 +860,9 @@ def __init__(
857860
# We want to snapshot these configuration dictionaries
858861
self._meta_attrs += ["_measure_config", "_source_config", "_timing_parameters"]
859862

860-
self.add_submodule("iv_sweep", KeysightB1500IVSweeper(self, "iv_sweep"))
863+
self.iv_sweep: KeysightB1500IVSweeper = self.add_submodule("iv_sweep", KeysightB1500IVSweeper(self, "iv_sweep"))
864+
"""Instrument module iv_sweep"""
865+
861866
self.setup_fnc_already_run: bool = False
862867
self.power_line_frequency: int = 50
863868
self._average_coefficient: int = 1

src/qcodes/instrument_drivers/Keysight/keysightb1500/KeysightB1520A.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,8 @@ def __init__(
519519
)
520520
"""Parameter capacitance"""
521521

522-
self.add_submodule("correction", KeysightB1500Correction(self, "correction"))
522+
self.correction: KeysightB1500Correction = self.add_submodule("correction", KeysightB1500Correction(self, "correction"))
523+
"""Instrument module correction"""
523524

524525
self.phase_compensation_mode: Parameter = self.add_parameter(
525526
name="phase_compensation_mode",
@@ -563,7 +564,8 @@ def __init__(
563564
fluctuations by changing the bias and so on.
564565
"""
565566

566-
self.add_submodule("cv_sweep", KeysightB1500CVSweeper(self, "cv_sweep"))
567+
self.cv_sweep: KeysightB1500CVSweeper = self.add_submodule("cv_sweep", KeysightB1500CVSweeper(self, "cv_sweep"))
568+
"""Instrument module cv_sweep"""
567569

568570
self.adc_coef: GroupParameter = self.add_parameter(
569571
name="adc_coef",

src/qcodes/instrument_drivers/Keysight/private/Keysight_344xxA_submodules.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -983,9 +983,12 @@ def __init__(
983983
####################################
984984
# Submodules
985985

986-
self.add_submodule("display", Keysight344xxADisplay(self, "display"))
987-
self.add_submodule("trigger", Keysight344xxATrigger(self, "trigger"))
988-
self.add_submodule("sample", Keysight344xxASample(self, "sample"))
986+
self.display: Keysight344xxADisplay = self.add_submodule("display", Keysight344xxADisplay(self, "display"))
987+
"""Instrument module display"""
988+
self.trigger: Keysight344xxATrigger = self.add_submodule("trigger", Keysight344xxATrigger(self, "trigger"))
989+
"""Instrument module trigger"""
990+
self.sample: Keysight344xxASample = self.add_submodule("sample", Keysight344xxASample(self, "sample"))
991+
"""Instrument module sample"""
989992

990993
####################################
991994
# Measurement Parameters

src/qcodes/instrument_drivers/tektronix/DPO7200xx.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,16 @@ def __init__(
7474
) -> None:
7575
super().__init__(name, address, **kwargs)
7676

77-
self.add_submodule("horizontal", TektronixDPOHorizontal(self, "horizontal"))
78-
79-
self.add_submodule("data", TektronixDPOData(self, "data"))
80-
81-
self.add_submodule("waveform", TektronixDPOWaveformFormat(self, "waveform"))
77+
self.horizontal: TektronixDPOHorizontal = self.add_submodule("horizontal", TektronixDPOHorizontal(self, "horizontal"))
78+
"""Instrument module horizontal"""
79+
self.data: TektronixDPOData = self.add_submodule("data", TektronixDPOData(self, "data"))
80+
"""Instrument module data"""
81+
self.waveform: TektronixDPOWaveformFormat = self.add_submodule("waveform", TektronixDPOWaveformFormat(self, "waveform"))
82+
"""Instrument module waveform"""
83+
self.trigger: TektronixDPOTrigger = self.add_submodule("trigger", TektronixDPOTrigger(self, "trigger"))
84+
"""Instrument module trigger"""
85+
self.delayed_trigger: TektronixDPOTrigger = self.add_submodule("delayed_trigger", TektronixDPOTrigger(self, "delayed_trigger", delayed_trigger=True))
86+
"""Instrument module delayed_trigger"""
8287

8388
measurement_list = ChannelList(self, "measurement", TektronixDPOMeasurement)
8489
for measurement_number in range(1, self.number_of_measurements):
@@ -109,13 +114,6 @@ def __init__(
109114

110115
self.add_submodule("channel", channel_list)
111116

112-
self.add_submodule("trigger", TektronixDPOTrigger(self, "trigger"))
113-
114-
self.add_submodule(
115-
"delayed_trigger",
116-
TektronixDPOTrigger(self, "delayed_trigger", delayed_trigger=True),
117-
)
118-
119117
self.connect_message()
120118

121119
def ask_raw(self, cmd: str) -> str:

src/qcodes/instrument_drivers/yokogawa/GS200.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,13 +479,14 @@ def __init__(
479479

480480
# Check if monitor is present, and if so enable measurement
481481
monitor_present = "/MON" in self.ask("*OPT?")
482-
measure = GS200_Monitor(self, "measure", monitor_present)
483-
self.add_submodule("measure", measure)
482+
self.measure: GS200_Monitor = self.add_submodule("measure", GS200_Monitor(self, "measure", monitor_present))
483+
"""Instrument module measure"""
484484

485485
# Reset function
486486
self.add_function("reset", call_cmd="*RST")
487487

488-
self.add_submodule("program", GS200Program(self, "program"))
488+
self.program: GS200Program = self.add_submodule("program", GS200Program(self, "program"))
489+
"""Instrument module program"""
489490

490491
self.BNC_out: Parameter = self.add_parameter(
491492
"BNC_out",

src/qcodes/instrument_drivers/yokogawa/Yokogawa_GS200.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -474,13 +474,14 @@ def __init__(
474474

475475
# Check if monitor is present, and if so enable measurement
476476
monitor_present = "/MON" in self.ask("*OPT?")
477-
measure = YokogawaGS200Monitor(self, "measure", monitor_present)
478-
self.add_submodule("measure", measure)
477+
self.measure: YokogawaGS200Monitor = self.add_submodule("measure", YokogawaGS200Monitor(self, "measure", monitor_present))
478+
"""Instrument module measure"""
479479

480480
# Reset function
481481
self.add_function("reset", call_cmd="*RST")
482482

483-
self.add_submodule("program", YokogawaGS200Program(self, "program"))
483+
self.program: YokogawaGS200Program = self.add_submodule("program", YokogawaGS200Program(self, "program"))
484+
"""Instrument module program"""
484485

485486
self.BNC_out: Parameter = self.add_parameter(
486487
"BNC_out",

0 commit comments

Comments
 (0)