boulder-opal-scale-up-sdk 1.0.3__py3-none-any.whl → 1.0.4__py3-none-any.whl

boulderopalscaleupsdk/experiments/power_rabi.py

@@ -14,14 +14,13 @@
 from pydantic import PrivateAttr
 
 from .common import (
-    ConstantWaveform,
     CWSIterable,
     Experiment,
-    GaussianWaveform,
     HypIterable,
     LinspaceIterable,
     RangeIterable,
 )
+from .waveforms import ConstantWaveform, Waveform
 
 DEFAULT_SHOT_COUNT = 400
 
@@ -33,29 +32,33 @@ class PowerRabi(Experiment):
     Parameters
     ----------
     transmon : str
-        The reference for the transmon to target in the experiment.
+        The reference for the transmon to target.
     scales : list[float] or LinspaceIterable or RangeIterable
             or CWSIterable or HypIterable or None, optional
-        The scaling factors for the drive pulse amplitude. If None, a default scan will be used.
-    drive_waveform : GaussianWaveform
+        The scaling factors for the drive pulse amplitude.
+        If None, a default scan will be used.
+    drive_waveform : Waveform
         The waveform to use for the drive pulse.
     recycle_delay_ns : int
-        The delay time between consecutive shots of the experiment, in nanoseconds.
+        The delay between consecutive shots, in nanoseconds.
     shot_count : int, optional
-        The number of shots to be taken in the experiment. Defaults to 400.
+        The number of shots to take. Defaults to 400.
     pulse_vp : float, optional
-        The voltage per pulse. If None, a default value will be used.
+        The voltage per pulse, in Volts. Defaults to the amplitude of the X gate.
     measure_waveform : ConstantWaveform or None, optional
         The waveform to use for the measurement pulse.
-        If not provided, the measurement defcal will be used.
+        Defaults to the measurement defcal.
+    run_mixer_calibration: bool
+        Whether to run mixer calibrations before running a program. Defaults to False.
     """
 
     _experiment_name: str = PrivateAttr("power_rabi")
 
     transmon: str
     scales: list[float] | LinspaceIterable | RangeIterable | CWSIterable | HypIterable | None = None
-    drive_waveform: GaussianWaveform
+    drive_waveform: Waveform
     recycle_delay_ns: int
     shot_count: int = DEFAULT_SHOT_COUNT
     pulse_vp: float | None = None
     measure_waveform: ConstantWaveform | None = None
+    run_mixer_calibration: bool = False

boulderopalscaleupsdk/experiments/power_rabi_ef.py

@@ -0,0 +1,66 @@
+# Copyright 2025 Q-CTRL. All rights reserved.
+#
+# Licensed under the Q-CTRL Terms of service (the "License"). Unauthorized
+# copying or use of this file, via any medium, is strictly prohibited.
+# Proprietary and confidential. You may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#    https://q-ctrl.com/terms
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS. See the
+# License for the specific language.
+
+from pydantic import PrivateAttr
+
+from .common import (
+    CWSIterable,
+    Experiment,
+    HypIterable,
+    LinspaceIterable,
+    RangeIterable,
+)
+from .waveforms import ConstantWaveform, Waveform
+
+DEFAULT_RECYCLE_DELAY_NS = 200_000
+DEFAULT_SHOT_COUNT = 400
+DEFAULT_DURATION_NS = 2_000
+
+
+class PowerRabiEF(Experiment):
+    """
+    Parameters for running a Power Rabi EF experiment.
+
+    Parameters
+    ----------
+    transmon : str
+        The reference for the transmon to target.
+    scales : list[float] or LinspaceIterable or RangeIterable
+            or CWSIterable or HypIterable or None, optional
+        The scaling factors for the drive pulse amplitude.
+        If None, a default scan will be used.
+    drive_waveform : Waveform
+        The waveform to use for the drive pulse.
+    recycle_delay_ns : int
+        The delay between consecutive shots, in nanoseconds.
+    shot_count : int, optional
+        The number of shots to take. Defaults to 400.
+    pulse_vp : float, optional
+        The voltage per pulse, in Volts. Defaults to the amplitude of the X gate.
+    measure_waveform : ConstantWaveform or None, optional
+        The waveform to use for the measurement pulse.
+        Defaults to the measurement defcal.
+    run_mixer_calibration: bool
+        Whether to run mixer calibrations before running a program. Defaults to False.
+    """
+
+    _experiment_name: str = PrivateAttr("power_rabi_ef")
+
+    transmon: str
+    scales: list[float] | LinspaceIterable | RangeIterable | CWSIterable | HypIterable | None = None
+    drive_waveform: Waveform
+    recycle_delay_ns: int = DEFAULT_RECYCLE_DELAY_NS
+    shot_count: int = DEFAULT_SHOT_COUNT
+    pulse_vp: float | None = None
+    measure_waveform: ConstantWaveform | None = None
+    run_mixer_calibration: bool = False

boulderopalscaleupsdk/experiments/ramsey.py

@@ -13,11 +13,11 @@
 
 from pydantic import PrivateAttr
 
-from .common import ConstantWaveform, Experiment
+from .common import Experiment
+from .waveforms import ConstantWaveform
 
 DEFAULT_RECYCLE_DELAY_NS = 10_000
 DEFAULT_SHOT_COUNT = 400
-DEFAULT_DURATION_NS = 2_000
 
 
 class Ramsey(Experiment):
@@ -27,33 +27,34 @@ class Ramsey(Experiment):
     Parameters
     ----------
     transmon : str
-        The reference for the transmon to target in the experiment.
-    max_delay_ns : int
-        The maximum delay time, in nanoseconds.
+        The reference for the transmon to target.
     min_delay_ns : int
         The minimum delay time, in nanoseconds.
+    max_delay_ns : int
+        The maximum delay time, in nanoseconds.
     delay_step_ns : int
         The step for generating the list of delays, in nanoseconds.
     virtual_detuning : float
-        The difference between the drive signal frequency and the qubit frequency, in Hz.
+        The virtual detuning added between SX pulses, in Hz.
     recycle_delay_ns : int, optional
-        The delay time between consecutive shots of the experiment, in nanoseconds.
-        Defaults to 10000 ns.
+        The delay between consecutive shots, in nanoseconds. Defaults to 10,000 ns.
     shot_count : int, optional
-        The number of shots to be taken in the experiment.
-        Defaults to 400.
+        The number of shots to take. Defaults to 400.
     measure_waveform : ConstantWaveform or None, optional
         The waveform to use for the measurement pulse.
-        If not provided, the measurement defcal will be used.
+        Defaults to the measurement defcal.
+    run_mixer_calibration: bool
+        Whether to run mixer calibrations before running a program. Defaults to False.
     """
 
     _experiment_name: str = PrivateAttr("ramsey")
 
     transmon: str
-    max_delay_ns: int
     min_delay_ns: int
+    max_delay_ns: int
     delay_step_ns: int
     virtual_detuning: float
     recycle_delay_ns: int = DEFAULT_RECYCLE_DELAY_NS
     shot_count: int = DEFAULT_SHOT_COUNT
     measure_waveform: ConstantWaveform | None = None
+    run_mixer_calibration: bool = False

boulderopalscaleupsdk/experiments/readout_classifier_calibration.py

@@ -1,6 +1,20 @@
+# Copyright 2025 Q-CTRL. All rights reserved.
+#
+# Licensed under the Q-CTRL Terms of service (the "License"). Unauthorized
+# copying or use of this file, via any medium, is strictly prohibited.
+# Proprietary and confidential. You may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#    https://q-ctrl.com/terms
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS. See the
+# License for the specific language.
+
 from pydantic import PrivateAttr
 
-from .common import ConstantWaveform, Experiment
+from .common import Experiment
+from .waveforms import ConstantWaveform
 
 
 class ReadoutClassifierCalibration(Experiment):
@@ -10,15 +24,16 @@ class ReadoutClassifierCalibration(Experiment):
     Parameters
     ----------
     transmon : str
-        The reference for the transmon to target in the experiment.
+        The reference for the transmon to target.
     recycle_delay_ns : int
-        The delay time between consecutive shots of the experiment, in nanoseconds.
+        The delay between consecutive shots, in nanoseconds.
     shot_count : int, optional
-        The number of shots to be taken in the experiment.
-        Defaults to 5000.
+        The number of shots to take. Defaults to 5,000.
     measure_waveform : ConstantWaveform or None, optional
         The waveform to use for the measurement pulse.
-        If not provided, the measurement defcal will be used.
+        Defaults to the measurement defcal.
+    run_mixer_calibration: bool
+        Whether to run mixer calibrations before running a program. Defaults to False.
     """
 
     _experiment_name: str = PrivateAttr("readout_classifier_calibration")
@@ -26,3 +41,4 @@ class ReadoutClassifierCalibration(Experiment):
     recycle_delay_ns: int
     shot_count: int = 5000
     measure_waveform: ConstantWaveform | None = None
+    run_mixer_calibration: bool = False

boulderopalscaleupsdk/experiments/resonator_spectroscopy.py

@@ -14,15 +14,14 @@
 from pydantic import PrivateAttr
 
 from .common import (
-    ConstantWaveform,
     CWSIterable,
     Experiment,
     HypIterable,
     LinspaceIterable,
     RangeIterable,
 )
+from .waveforms import ConstantWaveform
 
-DEFAULT_DURATION_NS = 2000  # ns
 DEFAULT_RECYCLE_DELAY_NS = 1000  # ns
 DEFAULT_SHOT_COUNT = 100
 
@@ -34,20 +33,20 @@ class ResonatorSpectroscopy(Experiment):
     Parameters
     ----------
     resonator : str
-        The reference for the resonator to target in the experiment.
+        The reference for the resonator to target.
     frequencies : list[int] or LinspaceIterable or RangeIterable or CWSIterable
                   or HypIterable or None, optional
-        The frequencies at which to scan.
-        If None, frequencies around the readout frequency will be used.
-    recycle_delay_ns :int, optional
-        The delay time between consecutive shots of the experiment, in nanoseconds.
-        Defaults to 1000 ns.
+        The frequencies at which to scan, in Hz.
+        Defaults to a scan around the readout frequency.
+    recycle_delay_ns : int, optional
+        The delay between consecutive shots, in nanoseconds. Defaults to 1,000 ns.
     shot_count : int, optional
-        The number of shots to be taken in the experiment.
-        Defaults to 100.
+        The number of shots to take. Defaults to 100.
     measure_waveform : ConstantWaveform or None, optional
         The waveform to use for the measurement pulse.
-        If not provided, the measurement defcal will be used.
+        Defaults to the measurement defcal.
+    run_mixer_calibration: bool
+        Whether to run mixer calibrations before running a program. Defaults to False.
     """
 
     _experiment_name: str = PrivateAttr("resonator_spectroscopy")
@@ -59,3 +58,4 @@ class ResonatorSpectroscopy(Experiment):
     recycle_delay_ns: int = DEFAULT_RECYCLE_DELAY_NS
     shot_count: int = DEFAULT_SHOT_COUNT
     measure_waveform: ConstantWaveform | None = None
+    run_mixer_calibration: bool = False

boulderopalscaleupsdk/experiments/resonator_spectroscopy_by_bias.py

@@ -14,15 +14,14 @@
 from pydantic import PrivateAttr
 
 from .common import (
-    ConstantWaveform,
     CWSIterable,
     Experiment,
     HypIterable,
     LinspaceIterable,
     RangeIterable,
 )
+from .waveforms import ConstantWaveform
 
-DEFAULT_DURATION_NS = 2000
 DEFAULT_SHOT_COUNT = 100
 DEFAULT_RECYCLE_DELAY_NS = 10_000
 DEFAULT_BIASES = LinspaceIterable(start=-0.49, stop=0.49, count=21)
@@ -35,27 +34,27 @@ class ResonatorSpectroscopyByBias(Experiment):
     Parameters
     ----------
     resonator : str
-        The reference for the resonator to target in the experiment.
+        The reference for the resonator to target.
     bias_transmons : list[str] or None, optional
         The references for the transmons to bias.
-        If None, it defaults to transmon coupled to the resonator.
+        Defaults to transmon coupled to the resonator.
     frequencies : list[int] or LinspaceIterable or RangeIterable or CWSIterable
                   or HypIterable or None, optional
-        The frequencies at which to scan.
-        If None, frequencies around the readout frequency will be used.
+        The frequencies at which to scan, in Hz.
+        Defaults to a scan around the readout frequency.
     biases : list[int] or LinspaceIterable or RangeIterable or CWSIterable
              or HypIterable, optional
-        The biases at which to scan.
-        If None, defaults to 21 points between -0.49 and 0.49.
+        The biases at which to scan, in Volts.
+        Defaults to 21 points between -0.49 and 0.49.
     recycle_delay_ns : int, optional
-        The delay time between consecutive shots of the experiment, in nanoseconds.
-        Defaults to 10000 ns.
+        The delay between consecutive shots, in nanoseconds. Defaults to 10,000 ns.
     shot_count : int, optional
-        The number of shots to be taken in the experiment.
-        Defaults to 100.
+        The number of shots to take. Defaults to 100.
     measure_waveform : ConstantWaveform or None, optional
         The waveform to use for the measurement pulse.
-        If not provided, the measurement defcal will be used.
+        Defaults to the measurement defcal.
+    run_mixer_calibration: bool
+        Whether to run mixer calibrations before running a program. Defaults to False.
     """
 
     _experiment_name: str = PrivateAttr("resonator_spectroscopy_by_bias")
@@ -71,3 +70,4 @@ class ResonatorSpectroscopyByBias(Experiment):
     recycle_delay_ns: int = DEFAULT_RECYCLE_DELAY_NS
     shot_count: int = DEFAULT_SHOT_COUNT
     measure_waveform: ConstantWaveform | None = None
+    run_mixer_calibration: bool = False

boulderopalscaleupsdk/experiments/resonator_spectroscopy_by_power.py

@@ -33,23 +33,22 @@ class ResonatorSpectroscopyByPower(Experiment):
     Parameters
     ----------
     resonator : str
-        The reference for the resonator to target in the experiment.
+        The reference for the resonator to target.
     frequencies : list[int] or LinspaceIterable or RangeIterable or CWSIterable
                   or HypIterable or None, optional
-        The frequencies at which to scan.
-        If None, frequencies around the readout frequency will be used.
-    powers : list[int] or None, optional
-        The powers at which to scan the readout pulse.
+        The frequencies at which to scan, in Hz.
+        Defaults to a scan around the readout frequency.
+    powers_dbm : list[float] or None, optional
+        The powers at which to scan the readout pulse, in dBm.
         If None, a default power scan will be used.
     duration_ns : int, optional
-        The duration of the readout pulse, in nanoseconds.
-        Defaults to 2000 ns.
+        The duration of the readout pulse, in nanoseconds. Defaults to 2,000 ns.
     recycle_delay_ns : int, optional
-        The delay time between consecutive shots of the experiment, in nanoseconds.
-        Defaults to 1000 ns.
+        The delay between consecutive shots, in nanoseconds. Defaults to 1,000 ns.
     shot_count : int, optional
-        The number of shots to be taken in the experiment.
-        Defaults to 100.
+        The number of shots to take. Defaults to 100.
+    run_mixer_calibration: bool
+        Whether to run mixer calibrations before running a program. Defaults to False.
     """
 
     _experiment_name: str = PrivateAttr("resonator_spectroscopy_by_power")
@@ -58,7 +57,8 @@ class ResonatorSpectroscopyByPower(Experiment):
     frequencies: list[int] | LinspaceIterable | RangeIterable | CWSIterable | HypIterable | None = (
         None
     )
-    powers: list[float] | None = None
+    powers_dbm: list[float] | None = None
     duration_ns: int = DEFAULT_DURATION_NS
     recycle_delay_ns: int = DEFAULT_RECYCLE_DELAY_NS
     shot_count: int = DEFAULT_SHOT_COUNT
+    run_mixer_calibration: bool = False

boulderopalscaleupsdk/experiments/t1.py

@@ -17,7 +17,6 @@ from .common import Experiment, LogspaceIterable
 
 DEFAULT_RECYCLE_DELAY_NS = 200_000
 DEFAULT_SHOT_COUNT = 400
-DEFAULT_DURATION_NS = 2_000
 
 
 class T1(Experiment):
@@ -27,28 +26,21 @@ class T1(Experiment):
     Parameters
     ----------
     transmon : str
-        The transmon to target in the experiment.
-    delays_ns : list[int] | RangeIterable
-        The delay time, in nanoseconds.
-    readout_amplitude : float, optional
-        The amplitude of the readout pulse.
-        If None, a default amplitude will be used.
-    duration_ns : int, optional
-        The duration of the readout pulse, in nanoseconds.
-        Defaults to 2000 ns.
+        The reference for the transmon to target.
+    delays_ns : LogspaceIterable
+        The delay times, in nanoseconds.
     recycle_delay_ns : int, optional
-        The delay time between consecutive shots of the experiment, in nanoseconds.
-        Defaults to 200_000 ns.
+        The delay between consecutive shots, in nanoseconds. Defaults to 200,000 ns.
     shot_count : int, optional
-        The number of shots to be taken in the experiment.
-        Defaults to 400.
+        The number of shots to take. Defaults to 400.
+    run_mixer_calibration: bool
+        Whether to run mixer calibrations before running a program. Defaults to False.
     """
 
     _experiment_name: str = PrivateAttr("t1")
 
     transmon: str
     delays_ns: LogspaceIterable
-    readout_amplitude: float
-    duration_ns: int = DEFAULT_DURATION_NS
     recycle_delay_ns: int = DEFAULT_RECYCLE_DELAY_NS
     shot_count: int = DEFAULT_SHOT_COUNT
+    run_mixer_calibration: bool = False

boulderopalscaleupsdk/experiments/t2.py

@@ -26,17 +26,17 @@ class T2(Experiment):
     Parameters
     ----------
     transmon : str
-        The reference for the transmon to target in the experiment.
-    delays_ns : list[int] | RangeIterable
-        The delay time, in nanoseconds.
+        The reference for the transmon to target.
+    delays_ns : list[int] or RangeIterable
+        The delay times, in nanoseconds.
     virtual_detuning : float
-        The difference between the drive signal frequency and the qubit frequency, in Hz.
+        The virtual detuning added between SX pulses, in Hz.
     recycle_delay_ns : int, optional
-        The delay time between consecutive shots of the experiment, in nanoseconds.
-        Defaults to 100_000 ns.
+        The delay between consecutive shots, in nanoseconds. Defaults to 100,000 ns.
     shot_count : int, optional
-        The number of shots to be taken in the experiment.
-        Defaults to 400.
+        The number of shots to take. Defaults to 400.
+    run_mixer_calibration: bool
+        Whether to run mixer calibrations before running a program. Defaults to False.
     """
 
     _experiment_name: str = PrivateAttr("t2")
@@ -46,3 +46,4 @@ class T2(Experiment):
     virtual_detuning: float
     recycle_delay_ns: int = DEFAULT_RECYCLE_DELAY_NS
     shot_count: int = DEFAULT_SHOT_COUNT
+    run_mixer_calibration: bool = False

boulderopalscaleupsdk/experiments/t2_echo.py

@@ -0,0 +1,49 @@
+# Copyright 2025 Q-CTRL. All rights reserved.
+#
+# Licensed under the Q-CTRL Terms of service (the "License"). Unauthorized
+# copying or use of this file, via any medium, is strictly prohibited.
+# Proprietary and confidential. You may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#    https://q-ctrl.com/terms
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS. See the
+# License for the specific language.
+
+from pydantic import PrivateAttr
+
+from .common import Experiment, RangeIterable
+
+DEFAULT_RECYCLE_DELAY_NS = 100_000
+DEFAULT_SHOT_COUNT = 400
+
+
+class T2Echo(Experiment):
+    """
+    Parameters for running a T2 echo experiment.
+
+    Parameters
+    ----------
+    transmon : str
+        The reference for the transmon to target.
+    delays_ns : list[int] or RangeIterable
+        The delay times, in nanoseconds.
+    virtual_detuning : float
+        The virtual detuning added between SX pulses, in Hz.
+    recycle_delay_ns : int, optional
+        The delay between consecutive shots, in nanoseconds. Defaults to 100,000 ns.
+    shot_count : int, optional
+        The number of shots to take. Defaults to 400.
+    run_mixer_calibration: bool
+        Whether to run mixer calibrations before running a program. Defaults to False.
+    """
+
+    _experiment_name: str = PrivateAttr("t2_echo")
+
+    transmon: str
+    delays_ns: list[int] | RangeIterable
+    virtual_detuning: float
+    recycle_delay_ns: int = DEFAULT_RECYCLE_DELAY_NS
+    shot_count: int = DEFAULT_SHOT_COUNT
+    run_mixer_calibration: bool = False

boulderopalscaleupsdk/experiments/transmon_anharmonicity.py

@@ -14,15 +14,14 @@
 from pydantic import PrivateAttr
 
 from .common import (
-    ConstantWaveform,
     CWSIterable,
     Experiment,
     HypIterable,
     LinspaceIterable,
     RangeIterable,
 )
+from .waveforms import ConstantWaveform
 
-DEFAULT_DURATION_NS = 2_000  # ns
 DEFAULT_RECYCLE_DELAY_NS = 1_000  # ns
 DEFAULT_SHOT_COUNT = 100
 DEFAULT_ANHARMONICITY_GUESS = -200e6  # Hz, typical anharmonicity for transmons
@@ -35,28 +34,27 @@ class TransmonAnharmonicity(Experiment):
     Parameters
     ----------
     transmon : str
-        The transmon that is the target of the experiment.
+        The reference for the transmon to target.
     frequencies : list[int] or LinspaceIterable or RangeIterable or CWSIterable
                   or HypIterable or None, optional
-        The drive frequencies to be scanned in the experiment.
-        If None, a default scan will be used based on the transmon's frequency
-        and anharmonicity.
-    anharmonicity_guess_hz : float
-        The guessed anharmonicity of the qubit, in Hz. This is used to determine the
-        range of frequencies to scan if `frequencies` is not provided.
-        Defaults to -200 MHz.
+        The frequencies at which to scan, in Hz.
+        Defaults to a scan based on the transmon's frequency and anharmonicity.
+    anharmonicity : float, optional
+        The guessed anharmonicity of the transmon, in Hz.
+        Used to determine the scan frequencies if not provided. Defaults to -200 MHz.
     recycle_delay_ns : int, optional
-        The delay time between consecutive shots of the experiment, in nanoseconds.
-        Defaults to 1000 ns.
+        The delay between consecutive shots, in nanoseconds. Defaults to 1,000 ns.
     shot_count : int, optional
-        The number of shots to be taken in the experiment. Defaults to 100.
+        The number of shots to take. Defaults to 100.
     spectroscopy_waveform : ConstantWaveform or None, optional
         The waveform to use in the spectroscopy pulse.
-        If not provided, a waveform with a duration of 2000 ns
-        and an amplitude of 1.5 times the transmon's x_vp will be used.
+        Defaults to a constant waveform with a duration of 2,000 ns
+        and an amplitude of 1.5 times the transmon's x_vp.
     measure_waveform : ConstantWaveform or None, optional
         The waveform to use for the measurement pulse.
-        If not provided, the measurement defcal will be used.
+        Defaults to the measurement defcal.
+    run_mixer_calibration: bool
+        Whether to run mixer calibrations before running a program. Defaults to False.
     """
 
     _experiment_name: str = PrivateAttr("transmon_anharmonicity")
@@ -65,8 +63,9 @@ class TransmonAnharmonicity(Experiment):
     frequencies: list[int] | LinspaceIterable | RangeIterable | CWSIterable | HypIterable | None = (
         None
     )
-    anharmonicity_guess_hz: float = DEFAULT_ANHARMONICITY_GUESS
+    anharmonicity: float = DEFAULT_ANHARMONICITY_GUESS
     recycle_delay_ns: int = DEFAULT_RECYCLE_DELAY_NS
     shot_count: int = DEFAULT_SHOT_COUNT
     spectroscopy_waveform: ConstantWaveform | None = None
     measure_waveform: ConstantWaveform | None = None
+    run_mixer_calibration: bool = False

boulderopalscaleupsdk/experiments/transmon_spectroscopy.py

@@ -14,15 +14,14 @@
 from pydantic import PrivateAttr
 
 from .common import (
-    ConstantWaveform,
     CWSIterable,
     Experiment,
     HypIterable,
     LinspaceIterable,
     RangeIterable,
 )
+from .waveforms import ConstantWaveform
 
-DEFAULT_DURATION_NS = 2000  # ns
 DEFAULT_RECYCLE_DELAY_NS = 1000  # ns
 DEFAULT_SHOT_COUNT = 100
 
@@ -34,22 +33,22 @@ class TransmonSpectroscopy(Experiment):
     Parameters
     ----------
     transmon : str
-        The reference for the transmon to target in the experiment.
+        The reference for the transmon to target.
     frequencies : list[int] or LinspaceIterable or RangeIterable or CWSIterable
                   or HypIterable or None, optional
-        The frequencies at which to scan.
-        If None, frequencies around the readout frequency will be used.
+        The frequencies at which to scan, in Hz.
+        Default to a scan around the transmon frequency.
     recycle_delay_ns : int, optional
-        The delay time between consecutive shots of the experiment, in nanoseconds.
-        Defaults to 1000 ns.
+        The delay between consecutive shots, in nanoseconds. Defaults to 1,000 ns.
     shot_count : int, optional
-        The number of shots to be taken in the experiment.
-        Defaults to 100.
+        The number of shots to take. Defaults to 100.
     spectroscopy_waveform : ConstantWaveform
         The waveform to use in the spectroscopy pulse.
     measure_waveform : ConstantWaveform or None, optional
         The waveform to use for the measurement pulse.
-        If not provided, the measurement defcal will be used.
+        Defaults to the measurement defcal.
+    run_mixer_calibration: bool
+        Whether to run mixer calibrations before running a program. Defaults to False.
     """
 
     _experiment_name: str = PrivateAttr("transmon_spectroscopy")
@@ -62,3 +61,4 @@ class TransmonSpectroscopy(Experiment):
     shot_count: int = DEFAULT_SHOT_COUNT
     spectroscopy_waveform: ConstantWaveform
     measure_waveform: ConstantWaveform | None = None
+    run_mixer_calibration: bool = False