From b65ca5cc79f030be4b0469612a199e5c608fd17b Mon Sep 17 00:00:00 2001 From: Jens Peter Secher Date: Wed, 4 Oct 2023 10:15:53 +0200 Subject: [PATCH] QDAC2: start_once_on triggers - Additional init is not needed anymore --- .../drivers/QDevil/QDAC2.py | 136 +++++++++++++++++- .../tests/QDevil/test_sim_qdac2_array.py | 4 +- .../tests/QDevil/test_sim_qdac2_awg.py | 33 ++++- .../tests/QDevil/test_sim_qdac2_current.py | 28 +++- .../tests/QDevil/test_sim_qdac2_sine.py | 6 - .../QDevil/test_sim_qdac2_source_list.py | 7 - .../QDevil/test_sim_qdac2_source_sweep.py | 6 - .../tests/QDevil/test_sim_qdac2_square.py | 8 -- .../tests/QDevil/test_sim_qdac2_triangle.py | 7 - .../QDevil/test_sim_qdac2_virtual_gates.py | 18 --- 10 files changed, 187 insertions(+), 66 deletions(-) diff --git a/qcodes_contrib_drivers/drivers/QDevil/QDAC2.py b/qcodes_contrib_drivers/drivers/QDevil/QDAC2.py index 9c9ef2fe8..4540af719 100644 --- a/qcodes_contrib_drivers/drivers/QDevil/QDAC2.py +++ b/qcodes_contrib_drivers/drivers/QDevil/QDAC2.py @@ -10,7 +10,7 @@ from packaging.version import Version, parse import abc -# Version 1.4.0 +# Version 1.6.0 # # Guiding principles for this driver for QDevil QDAC-II # ----------------------------------------------------- @@ -198,10 +198,18 @@ def allocate_trigger(self) -> QDac2Trigger_Context: def start_on(self, trigger: QDac2Trigger_Context) -> None: pass + @abc.abstractmethod + def start_once_on(self, trigger: QDac2Trigger_Context) -> None: + pass + @abc.abstractmethod def start_on_external(self, trigger: ExternalInput) -> None: pass + @abc.abstractmethod + def start_once_on_external(self, trigger: ExternalInput) -> None: + pass + @abc.abstractmethod def abort(self) -> None: pass @@ -265,6 +273,17 @@ def start_on(self, trigger: QDac2Trigger_Context) -> None: self._write_channel(f'sour{"{0}"}:dc:trig:sour int{internal}') self._make_ready_to_start() + def start_once_on(self, trigger: QDac2Trigger_Context) -> None: + """Attach internal one-shot trigger to DC generator + + Args: + trigger (QDac2Trigger_Context): trigger that will start DC + """ + self._trigger = trigger + internal = _trigger_context_to_value(trigger) + self._write_channel(f'sour{"{0}"}:dc:trig:sour int{internal}') + self._make_ready_to_start_once() + def start_on_external(self, trigger: ExternalInput) -> None: """Attach external trigger to DC generator @@ -275,6 +294,16 @@ def start_on_external(self, trigger: ExternalInput) -> None: self._write_channel(f'sour{"{0}"}:dc:trig:sour ext{trigger}') self._make_ready_to_start() + def start_once_on_external(self, trigger: ExternalInput) -> None: + """Attach external one-shot trigger to DC generator + + Args: + trigger (ExternalInput): trigger that will start DC generator + """ + self._trigger = None + self._write_channel(f'sour{"{0}"}:dc:trig:sour ext{trigger}') + self._make_ready_to_start_once() + def abort(self) -> None: """Abort any DC running generator on the channel """ @@ -348,7 +377,9 @@ def _start(self, description: str) -> None: def _make_ready_to_start(self) -> None: self._write_channel('sour{0}:dc:init:cont on') - self._write_channel('sour{0}:dc:init') + + def _make_ready_to_start_once(self) -> None: + self._write_channel('sour{0}:dc:init:cont off') def _switch_to_immediate_trigger(self) -> None: self._write_channel('sour{0}:dc:init:cont off') @@ -558,11 +589,22 @@ def _start_on(self, trigger: QDac2Trigger_Context, wave_kind: str) -> None: self._write_channel(f'sour{"{0}"}:{wave_kind}:trig:sour int{internal}') self._make_ready_to_start(wave_kind) + def _start_once_on(self, trigger: QDac2Trigger_Context, wave_kind: str) -> None: + self._trigger = trigger + internal = _trigger_context_to_value(trigger) + self._write_channel(f'sour{"{0}"}:{wave_kind}:trig:sour int{internal}') + self._make_ready_to_start_once(wave_kind) + def _start_on_external(self, trigger: ExternalInput, wave_kind: str) -> None: self._trigger = None self._write_channel(f'sour{"{0}"}:{wave_kind}:trig:sour ext{trigger}') self._make_ready_to_start(wave_kind) + def _start_once_on_external(self, trigger: ExternalInput, wave_kind: str) -> None: + self._trigger = None + self._write_channel(f'sour{"{0}"}:{wave_kind}:trig:sour ext{trigger}') + self._make_ready_to_start_once(wave_kind) + def _end_marker(self, wave_kind: str) -> QDac2Trigger_Context: if not self._marker_end: self._marker_end = self.allocate_trigger() @@ -589,7 +631,9 @@ def _period_start_marker(self, wave_kind: str) -> QDac2Trigger_Context: def _make_ready_to_start(self, wave_kind: str) -> None: self._write_channel(f'sour{"{0}"}:{wave_kind}:init:cont on') - self._write_channel(f'sour{"{0}"}:{wave_kind}:init') + + def _make_ready_to_start_once(self, wave_kind: str) -> None: + self._write_channel(f'sour{"{0}"}:{wave_kind}:init:cont off') def _switch_to_immediate_trigger(self, wave_kind: str): self._write_channel(f'sour{"{0}"}:{wave_kind}:init:cont off') @@ -723,6 +767,14 @@ def start_on(self, trigger: QDac2Trigger_Context) -> None: """ return super()._start_on(trigger, 'squ') + def start_once_on(self, trigger: QDac2Trigger_Context) -> None: + """Attach internal one-shot trigger to start the square wave generator + + Args: + trigger (QDac2Trigger_Context): trigger that will start square wave + """ + return super()._start_once_on(trigger, 'squ') + def start_on_external(self, trigger: ExternalInput) -> None: """Attach external trigger to start the square wave generator @@ -731,6 +783,14 @@ def start_on_external(self, trigger: ExternalInput) -> None: """ return super()._start_on_external(trigger, 'squ') + def start_once_on_external(self, trigger: ExternalInput) -> None: + """Attach external one-shot trigger to start the square wave generator + + Args: + trigger (ExternalInput): external trigger that will start square wave + """ + return super()._start_once_on_external(trigger, 'squ') + class Sine_Context(_Waveform_Context): @@ -838,6 +898,14 @@ def start_on(self, trigger: QDac2Trigger_Context) -> None: """ return super()._start_on(trigger, 'sine') + def start_once_on(self, trigger: QDac2Trigger_Context) -> None: + """Attach internal one-shot trigger to start the sine wave generator + + Args: + trigger (QDac2Trigger_Context): trigger that will start sine wave + """ + return super()._start_once_on(trigger, 'sin') + def start_on_external(self, trigger: ExternalInput) -> None: """Attach external trigger to start the sine wave generator @@ -846,6 +914,14 @@ def start_on_external(self, trigger: ExternalInput) -> None: """ return super()._start_on_external(trigger, 'sine') + def start_once_on_external(self, trigger: ExternalInput) -> None: + """Attach external one-shot trigger to start the sine wave generator + + Args: + trigger (ExternalInput): external trigger that will start sine wave + """ + return super()._start_once_on_external(trigger, 'sin') + class Triangle_Context(_Waveform_Context): @@ -962,6 +1038,14 @@ def start_on(self, trigger: QDac2Trigger_Context) -> None: """ return super()._start_on(trigger, 'tri') + def start_once_on(self, trigger: QDac2Trigger_Context) -> None: + """Attach internal one-shot trigger to start the triangle wave generator + + Args: + trigger (QDac2Trigger_Context): trigger that will start triangle wave + """ + return super()._start_once_on(trigger, 'tri') + def start_on_external(self, trigger: ExternalInput) -> None: """Attach external trigger to start the triangle wave generator @@ -970,6 +1054,14 @@ def start_on_external(self, trigger: ExternalInput) -> None: """ return super()._start_on_external(trigger, 'tri') + def start_once_on_external(self, trigger: ExternalInput) -> None: + """Attach external one-shot trigger to start the triangle wave generator + + Args: + trigger (ExternalInput): external trigger that will start triangle wave + """ + return super()._start_once_on_external(trigger, 'tri') + class Awg_Context(_Waveform_Context): @@ -1061,6 +1153,14 @@ def start_on(self, trigger: QDac2Trigger_Context) -> None: """ return super()._start_on(trigger, 'awg') + def start_once_on(self, trigger: QDac2Trigger_Context) -> None: + """Attach internal one-shot trigger to start the AWG + + Args: + trigger (QDac2Trigger_Context): trigger that will start AWG + """ + return super()._start_once_on(trigger, 'awg') + def start_on_external(self, trigger: ExternalInput) -> None: """Attach external trigger to start the AWG @@ -1069,6 +1169,14 @@ def start_on_external(self, trigger: ExternalInput) -> None: """ return super()._start_on_external(trigger, 'awg') + def start_once_on_external(self, trigger: ExternalInput) -> None: + """Attach external one-shot trigger to start the AWG + + Args: + trigger (ExternalInput): external trigger that will start AWG + """ + return super()._start_once_on_external(trigger, 'awg') + class Measurement_Context(_Channel_Context): @@ -1105,7 +1213,17 @@ def start_on(self, trigger: QDac2Trigger_Context) -> None: internal = _trigger_context_to_value(trigger) self._write_channel(f'sens{"{0}"}:trig:sour int{internal}') self._write_channel(f'sens{"{0}"}:init:cont on') - self._write_channel(f'sens{"{0}"}:init') + + def start_once_on(self, trigger: QDac2Trigger_Context) -> None: + """Attach internal once-shot trigger to start the current measurement + + Args: + trigger (QDac2Trigger_Context): trigger that will start measurement + """ + self._trigger = trigger + internal = _trigger_context_to_value(trigger) + self._write_channel(f'sens{"{0}"}:trig:sour int{internal}') + self._write_channel(f'sens{"{0}"}:init:cont off') def start_on_external(self, trigger: ExternalInput) -> None: """Attach external trigger to start the current measurement @@ -1115,7 +1233,15 @@ def start_on_external(self, trigger: ExternalInput) -> None: """ self._write_channel(f'sens{"{0}"}:trig:sour ext{trigger}') self._write_channel(f'sens{"{0}"}:init:cont on') - self._write_channel(f'sens{"{0}"}:init') + + def start_once_on_external(self, trigger: ExternalInput) -> None: + """Attach external one-shot trigger to start the current measurement + + Args: + trigger (ExternalInput): trigger that will start measurement + """ + self._write_channel(f'sens{"{0}"}:trig:sour ext{trigger}') + self._write_channel(f'sens{"{0}"}:init:cont off') def abort(self) -> None: """Abort current measurement diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_array.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_array.py index 0de0513ee..45fbe4080 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_array.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_array.py @@ -142,13 +142,13 @@ def test_sync_square_waves(qdac, qdac2): # noqa assert 'sour1:squ:per 1e-05' in controller_commands assert 'sour1:squ:span 1' in controller_commands assert 'sour1:squ:trig:sour ext3' in controller_commands - assert 'sour1:squ:init' in controller_commands + assert 'sour1:squ:init:cont on' in controller_commands assert 'outp:trig4:sour int1' in controller_commands listener_commands = qdac2.get_recorded_scpi_commands() assert 'sour1:squ:per 1e-05' in listener_commands assert 'sour1:squ:span 1' in listener_commands assert 'sour1:squ:trig:sour ext3' in listener_commands - assert 'sour1:squ:init' in listener_commands + assert 'sour1:squ:init:cont on' in listener_commands # ----------------------------------------------------------------------- qdacs.trigger(start_trigger) # ----------------------------------------------------------------------- diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_awg.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_awg.py index b08d0d1ae..bf53840aa 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_awg.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_awg.py @@ -91,7 +91,6 @@ def test_awg_default_values(qdac): # noqa 'sour5:awg:coun 1', 'sour5:awg:trig:sour bus', 'sour5:awg:init:cont on', - 'sour5:awg:init', ] @@ -117,7 +116,6 @@ def test_awg_parameters(qdac): # noqa 'sour5:awg:coun 10', 'sour5:awg:trig:sour bus', 'sour5:awg:init:cont on', - 'sour5:awg:init', ] @@ -224,7 +222,6 @@ def test_awg_start_trigger_fires(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ 'sour5:awg:init:cont on', - 'sour5:awg:init', f'tint {trigger.value}' ] @@ -296,7 +293,20 @@ def test_awg_trigger_on_internal(qdac): # noqa assert qdac.get_recorded_scpi_commands() == [ f'sour5:awg:trig:sour int{trigger.value}', f'sour5:awg:init:cont on', - 'sour5:awg:init' + ] + + +def test_awg_trigger_once_on_internal(qdac): # noqa + trace = qdac.allocate_trace('my-trace', 6) + awg = qdac.ch05.arbitrary_wave(trace.name) + trigger = qdac.allocate_trigger() + qdac.start_recording_scpi() + # ----------------------------------------------------------------------- + awg.start_once_on(trigger) + # ----------------------------------------------------------------------- + assert qdac.get_recorded_scpi_commands() == [ + f'sour5:awg:trig:sour int{trigger.value}', + f'sour5:awg:init:cont off', ] @@ -311,5 +321,18 @@ def test_awg_trigger_on_external(qdac): # noqa assert qdac.get_recorded_scpi_commands() == [ f'sour5:awg:trig:sour ext{trigger}', f'sour5:awg:init:cont on', - 'sour5:awg:init' + ] + + +def test_awg_trigger_once_on_external(qdac): # noqa + trace = qdac.allocate_trace('my-trace', 6) + awg = qdac.ch05.arbitrary_wave(trace.name) + trigger = ExternalInput(1) + qdac.start_recording_scpi() + # ----------------------------------------------------------------------- + awg.start_once_on_external(trigger) + # ----------------------------------------------------------------------- + assert qdac.get_recorded_scpi_commands() == [ + f'sour5:awg:trig:sour ext{trigger}', + f'sour5:awg:init:cont off', ] diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_current.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_current.py index a29b141d1..0d81d4734 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_current.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_current.py @@ -69,7 +69,19 @@ def test_measurement_trigger_on_internal(qdac): # noqa assert qdac.get_recorded_scpi_commands() == [ f'sens2:trig:sour int{trigger.value}', f'sens2:init:cont on', - 'sens2:init' + ] + + +def test_measurement_trigger_once_on_internal(qdac): # noqa + measurement = qdac.ch02.measurement() + trigger = qdac.allocate_trigger() + qdac.start_recording_scpi() + # ----------------------------------------------------------------------- + measurement.start_once_on(trigger) + # ----------------------------------------------------------------------- + assert qdac.get_recorded_scpi_commands() == [ + f'sens2:trig:sour int{trigger.value}', + f'sens2:init:cont off', ] @@ -96,7 +108,19 @@ def test_measurement_trigger_on_external(qdac): # noqa assert qdac.get_recorded_scpi_commands() == [ f'sens2:trig:sour ext{trigger}', f'sens2:init:cont on', - 'sens2:init' + ] + + +def test_measurement_trigger_once_on_external(qdac): # noqa + measurement = qdac.ch02.measurement() + trigger = ExternalInput(1) + qdac.start_recording_scpi() + # ----------------------------------------------------------------------- + measurement.start_once_on_external(trigger) + # ----------------------------------------------------------------------- + assert qdac.get_recorded_scpi_commands() == [ + f'sens2:trig:sour ext{trigger}', + f'sens2:init:cont off', ] diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_sine.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_sine.py index 642111084..a65a7c6ae 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_sine.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_sine.py @@ -26,7 +26,6 @@ def test_sine_default_values(qdac): # noqa 'sour1:sine:coun -1', 'sour1:sine:trig:sour bus', 'sour1:sine:init:cont on', - 'sour1:sine:init', ] @@ -53,7 +52,6 @@ def test_sine_period(qdac): # noqa 'sour1:sine:coun 10', 'sour1:sine:trig:sour bus', 'sour1:sine:init:cont on', - 'sour1:sine:init', ] @@ -72,7 +70,6 @@ def test_sine_frequency(qdac): # noqa 'sour1:sine:coun -1', 'sour1:sine:trig:sour bus', 'sour1:sine:init:cont on', - 'sour1:sine:init', ] @@ -171,7 +168,6 @@ def test_sine_start_trigger_fires(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ 'sour1:sine:init:cont on', - 'sour1:sine:init', f'tint {trigger.value}' ] @@ -238,7 +234,6 @@ def test_sine_trigger_on_internal(qdac): # noqa assert qdac.get_recorded_scpi_commands() == [ f'sour1:sine:trig:sour int{trigger.value}', f'sour1:sine:init:cont on', - 'sour1:sine:init' ] @@ -252,5 +247,4 @@ def test_sine_trigger_on_external(qdac): # noqa assert qdac.get_recorded_scpi_commands() == [ f'sour1:sine:trig:sour ext{trigger}', f'sour1:sine:init:cont on', - 'sour1:sine:init' ] diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_list.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_list.py index 57a7c633f..2a99eaaf6 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_list.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_list.py @@ -25,7 +25,6 @@ def test_list_explicit(qdac): # noqa 'sour1:list:coun 10', 'sour1:dc:trig:sour bus', 'sour1:dc:init:cont on', - 'sour1:dc:init', ] @@ -44,7 +43,6 @@ def test_list_implicit(qdac): # noqa 'sour1:list:coun 1', 'sour1:dc:trig:sour bus', 'sour1:dc:init:cont on', - 'sour1:dc:init', ] @@ -78,7 +76,6 @@ def test_list_append(qdac): # noqa assert qdac.get_recorded_scpi_commands() == [ 'sour1:list:volt:app 5,6', 'sour1:dc:init:cont on', - 'sour1:dc:init', ] @@ -119,7 +116,6 @@ def test_list_infinite(qdac): # noqa 'sour1:list:coun -1', 'sour1:dc:trig:sour bus', 'sour1:dc:init:cont on', - 'sour1:dc:init', ] @@ -177,7 +173,6 @@ def test_list_start_trigger_fires(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ 'sour1:dc:init:cont on', - 'sour1:dc:init', f'tint {trigger.value}' ] @@ -236,7 +231,6 @@ def test_list_trigger_on_internal(qdac): # noqa assert qdac.get_recorded_scpi_commands() == [ f'sour1:dc:trig:sour int{trigger.value}', f'sour1:dc:init:cont on', - 'sour1:dc:init' ] @@ -250,7 +244,6 @@ def test_list_trigger_on_external(qdac): # noqa assert qdac.get_recorded_scpi_commands() == [ f'sour1:dc:trig:sour ext{trigger}', f'sour1:dc:init:cont on', - 'sour1:dc:init' ] diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_sweep.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_sweep.py index 16cfec28c..bb5971a9c 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_sweep.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_sweep.py @@ -29,7 +29,6 @@ def test_sweep_explicit(qdac): # noqa 'sour10:swe:coun 10', 'sour10:dc:trig:sour bus', 'sour10:dc:init:cont on', - 'sour10:dc:init', ] @@ -50,7 +49,6 @@ def test_sweep_implicit(qdac): # noqa 'sour10:swe:coun 1', 'sour10:dc:trig:sour bus', 'sour10:dc:init:cont on', - 'sour10:dc:init', ] @@ -113,7 +111,6 @@ def test_sweep_infinite(qdac): # noqa 'sour1:swe:coun -1', 'sour1:dc:trig:sour bus', 'sour1:dc:init:cont on', - 'sour1:dc:init', ] @@ -181,7 +178,6 @@ def test_sweep_start_trigger_fires(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ 'sour1:dc:init:cont on', - 'sour1:dc:init', f'tint {trigger.value}' ] @@ -240,7 +236,6 @@ def test_sweep_trigger_on_internal(qdac): # noqa assert qdac.get_recorded_scpi_commands() == [ f'sour1:dc:trig:sour int{trigger.value}', f'sour1:dc:init:cont on', - 'sour1:dc:init' ] @@ -254,7 +249,6 @@ def test_sweep_trigger_on_external(qdac): # noqa assert qdac.get_recorded_scpi_commands() == [ f'sour1:dc:trig:sour ext{trigger}', f'sour1:dc:init:cont on', - 'sour1:dc:init' ] diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_square.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_square.py index 8687fe27f..a685224c1 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_square.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_square.py @@ -28,7 +28,6 @@ def test_square_default_values(qdac): # noqa 'sour24:squ:coun -1', 'sour24:squ:trig:sour bus', 'sour24:squ:init:cont on', - 'sour24:squ:init', ] @@ -58,7 +57,6 @@ def test_square_period(qdac): # noqa 'sour24:squ:coun -1', 'sour24:squ:trig:sour bus', 'sour24:squ:init:cont on', - 'sour24:squ:init', ] @@ -79,7 +77,6 @@ def test_square_slew(qdac): # noqa 'sour24:squ:coun -1', 'sour24:squ:trig:sour bus', 'sour24:squ:init:cont on', - 'sour24:squ:init', ] @@ -106,7 +103,6 @@ def test_square_negative(qdac): # noqa 'sour24:squ:coun 10', 'sour24:squ:trig:sour bus', 'sour24:squ:init:cont on', - 'sour24:squ:init', ] @@ -127,7 +123,6 @@ def test_square_frequency(qdac): # noqa 'sour24:squ:coun -1', 'sour24:squ:trig:sour bus', 'sour24:squ:init:cont on', - 'sour24:squ:init', ] @@ -226,7 +221,6 @@ def test_square_start_trigger_fires(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ 'sour1:squ:init:cont on', - 'sour1:squ:init', f'tint {trigger.value}' ] @@ -293,7 +287,6 @@ def test_square_trigger_on_internal(qdac): # noqa assert qdac.get_recorded_scpi_commands() == [ f'sour1:squ:trig:sour int{trigger.value}', f'sour1:squ:init:cont on', - 'sour1:squ:init' ] @@ -307,7 +300,6 @@ def test_square_trigger_on_external(qdac): # noqa assert qdac.get_recorded_scpi_commands() == [ f'sour1:squ:trig:sour ext{trigger}', f'sour1:squ:init:cont on', - 'sour1:squ:init' ] diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_triangle.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_triangle.py index 88f86f46e..86a29a065 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_triangle.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_triangle.py @@ -27,7 +27,6 @@ def test_triangle_default_values(qdac): # noqa 'sour24:tri:coun -1', 'sour24:tri:trig:sour bus', 'sour24:tri:init:cont on', - 'sour24:tri:init', ] @@ -55,7 +54,6 @@ def test_triangle_period(qdac): # noqa 'sour24:tri:coun -1', 'sour24:tri:trig:sour bus', 'sour24:tri:init:cont on', - 'sour24:tri:init', ] @@ -80,7 +78,6 @@ def test_triangle_negative(qdac): # noqa 'sour24:tri:coun 10', 'sour24:tri:trig:sour bus', 'sour24:tri:init:cont on', - 'sour24:tri:init', ] @@ -100,7 +97,6 @@ def test_triangle_frequency(qdac): # noqa 'sour24:tri:coun -1', 'sour24:tri:trig:sour bus', 'sour24:tri:init:cont on', - 'sour24:tri:init', ] @@ -199,7 +195,6 @@ def test_triangle_start_trigger_fires(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ 'sour1:tri:init:cont on', - 'sour1:tri:init', f'tint {trigger.value}' ] @@ -266,7 +261,6 @@ def test_triangle_trigger_on_internal(qdac): # noqa assert qdac.get_recorded_scpi_commands() == [ f'sour1:tri:trig:sour int{trigger.value}', f'sour1:tri:init:cont on', - 'sour1:tri:init' ] @@ -280,5 +274,4 @@ def test_triangle_trigger_on_external(qdac): # noqa assert qdac.get_recorded_scpi_commands() == [ f'sour1:tri:trig:sour ext{trigger}', f'sour1:tri:init:cont on', - 'sour1:tri:init' ] diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_virtual_gates.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_virtual_gates.py index b97596554..775409ae3 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_virtual_gates.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_virtual_gates.py @@ -60,10 +60,8 @@ def test_arrangement_sweep(qdac): # noqa 'sour1:list:coun 1', 'sour1:dc:trig:sour bus', 'sour1:dc:init:cont on', - 'sour1:dc:init', 'sour1:dc:trig:sour int1', 'sour1:dc:init:cont on', - 'sour1:dc:init', # Plunger 2 'sour2:dc:trig:sour hold', 'sour2:volt:mode list', @@ -75,10 +73,8 @@ def test_arrangement_sweep(qdac): # noqa 'sour2:list:coun 1', 'sour2:dc:trig:sour bus', 'sour2:dc:init:cont on', - 'sour2:dc:init', 'sour2:dc:trig:sour int1', 'sour2:dc:init:cont on', - 'sour2:dc:init', # Plunger 3 'sour3:dc:trig:sour hold', 'sour3:volt:mode list', @@ -90,10 +86,8 @@ def test_arrangement_sweep(qdac): # noqa 'sour3:list:coun 1', 'sour3:dc:trig:sour bus', 'sour3:dc:init:cont on', - 'sour3:dc:init', 'sour3:dc:trig:sour int1', 'sour3:dc:init:cont on', - 'sour3:dc:init', # Start sweep 'tint 1' ] @@ -215,10 +209,8 @@ def test_stability_diagram_external(qdac): # noqa 'sour3:list:coun 1', 'sour3:dc:trig:sour bus', 'sour3:dc:init:cont on', - 'sour3:dc:init', 'sour3:dc:trig:sour int2', 'sour3:dc:init:cont on', - 'sour3:dc:init', # Plunger 2 'sour6:dc:trig:sour hold', 'sour6:volt:mode list', @@ -230,10 +222,8 @@ def test_stability_diagram_external(qdac): # noqa 'sour6:list:coun 1', 'sour6:dc:trig:sour bus', 'sour6:dc:init:cont on', - 'sour6:dc:init', 'sour6:dc:trig:sour int2', 'sour6:dc:init:cont on', - 'sour6:dc:init', # Plunger 3 'sour7:dc:trig:sour hold', 'sour7:volt:mode list', @@ -245,10 +235,8 @@ def test_stability_diagram_external(qdac): # noqa 'sour7:list:coun 1', 'sour7:dc:trig:sour bus', 'sour7:dc:init:cont on', - 'sour7:dc:init', 'sour7:dc:trig:sour int2', 'sour7:dc:init:cont on', - 'sour7:dc:init', # Plunger 4 'sour8:dc:trig:sour hold', 'sour8:volt:mode list', @@ -260,10 +248,8 @@ def test_stability_diagram_external(qdac): # noqa 'sour8:list:coun 1', 'sour8:dc:trig:sour bus', 'sour8:dc:init:cont on', - 'sour8:dc:init', 'sour8:dc:trig:sour int2', 'sour8:dc:init:cont on', - 'sour8:dc:init', # Start sweep 'tint 2' ] @@ -309,10 +295,8 @@ def test_arrangement_detune(qdac): # noqa 'sour1:list:coun 2', 'sour1:dc:trig:sour bus', 'sour1:dc:init:cont on', - 'sour1:dc:init', 'sour1:dc:trig:sour int1', 'sour1:dc:init:cont on', - 'sour1:dc:init', # Plunger 2 'sour2:dc:trig:sour hold', 'sour2:volt:mode list', @@ -324,10 +308,8 @@ def test_arrangement_detune(qdac): # noqa 'sour2:list:coun 2', 'sour2:dc:trig:sour bus', 'sour2:dc:init:cont on', - 'sour2:dc:init', 'sour2:dc:trig:sour int1', 'sour2:dc:init:cont on', - 'sour2:dc:init', # Start sweep 'tint 1' ]