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

boulderopalscaleupsdk/device/processor/superconducting_processor.py

@@ -23,11 +23,9 @@ from boulderopalscaleupsdk.common.dtypes import (
 from boulderopalscaleupsdk.device.common import (
     Component,
     ComponentRef,
-    Processor,
 )
 from boulderopalscaleupsdk.device.processor import (
     ComponentParameter,
-    DurationComponentParameter,
     FloatComponentParameter,
 )
 
@@ -37,23 +35,23 @@ class Transmon(Component[Literal["tunable"]]):
     dtype: Literal["transmon"] = "transmon"
     traits: list[Literal["tunable"]] = Field(default=["tunable"])
 
-    freq_01: FloatComponentParameter | None = Field(
-        default=None,
+    freq_01: FloatComponentParameter = Field(
+        default=ComponentParameter(value=(0.0)),
         json_schema_extra={"display": {"label": "freq_01", "unit": "MHz", "scale": 1e-6}},
     )
-    anharm: FloatComponentParameter | None = Field(
-        default=None,
+    anharm: FloatComponentParameter = Field(
+        default=ComponentParameter(value=0.0),
         json_schema_extra={"display": {"label": "anharm", "unit": "MHz", "scale": 1e-6}},
     )
-    t1: DurationComponentParameter = Field(
+    t1: ComponentParameter[Duration] = Field(
         default=ComponentParameter(value=Duration(0, TimeUnit.NS)),
         json_schema_extra={"display": {"label": "t1", "unit": "µs", "scale": 1e6}},
     )
-    t2: DurationComponentParameter = Field(
+    t2: ComponentParameter[Duration] = Field(
         default=ComponentParameter(value=Duration(0, TimeUnit.NS)),
         json_schema_extra={"display": {"label": "t2", "unit": "µs", "scale": 1e6}},
     )
-    t2_echo: DurationComponentParameter = Field(
+    t2_echo: ComponentParameter[Duration] = Field(
         default=ComponentParameter(value=Duration(0, TimeUnit.NS)),
         json_schema_extra={"display": {"label": "t2_echo", "unit": "µs", "scale": 1e6}},
     )
@@ -65,15 +63,23 @@ class Transmon(Component[Literal["tunable"]]):
         default=ComponentParameter(value=0.0),
         json_schema_extra={"display": {"label": "sx_vp", "unit": "V", "scale": 1}},
     )
+    x_ef_vp: FloatComponentParameter = Field(
+        default=ComponentParameter(value=0.0),
+        json_schema_extra={"display": {"label": "x_ef_vp", "unit": "V", "scale": 1}},
+    )
+    sx_ef_vp: FloatComponentParameter = Field(
+        default=ComponentParameter(value=0.0),
+        json_schema_extra={"display": {"label": "sx_ef_vp", "unit": "V", "scale": 1}},
+    )
 
     # Tunable transmon parameters.
     dc_bias: FloatComponentParameter = Field(
         default=ComponentParameter(value=0.0),
         json_schema_extra={"display": {"label": "dc_bias", "unit": "V", "scale": 1}},
     )
-    fmax_bias: FloatComponentParameter = Field(
+    bias_offset: FloatComponentParameter = Field(
         default=ComponentParameter(value=0.0),
-        json_schema_extra={"display": {"label": "fmax_bias", "unit": "V", "scale": 1}},
+        json_schema_extra={"display": {"label": "bias_offset", "unit": "V", "scale": 1}},
     )
     bias_period: FloatComponentParameter = Field(
         default=ComponentParameter(value=0.0),
@@ -85,20 +91,20 @@ class Resonator(Component[Literal["readout"]]):
     dtype: Literal["resonator"] = "resonator"
     traits: list[Literal["readout"]] = Field(default=["readout"])
 
-    frequency_high: FloatComponentParameter | None = Field(
-        default=None,
+    frequency_high: FloatComponentParameter = Field(
+        default=ComponentParameter(value=0.0),
         json_schema_extra={"display": {"label": "frequency_high", "unit": "MHz", "scale": 1e-6}},
     )
-    frequency_low: FloatComponentParameter | None = Field(
-        default=None,
+    frequency_low: FloatComponentParameter = Field(
+        default=ComponentParameter(value=0.0),
         json_schema_extra={"display": {"label": "frequency_low", "unit": "MHz", "scale": 1e-6}},
     )
-    kappa_low: FloatComponentParameter | None = Field(
-        default=None,
+    kappa_low: FloatComponentParameter = Field(
+        default=ComponentParameter(value=0.0),
         json_schema_extra={"display": {"label": "kappa_low", "unit": "MHz", "scale": 1e-6}},
     )
-    kappa_high: FloatComponentParameter | None = Field(
-        default=None,
+    kappa_high: FloatComponentParameter = Field(
+        default=ComponentParameter(value=0.0),
         json_schema_extra={"display": {"label": "kappa_high", "unit": "MHz", "scale": 1e-6}},
     )
     vp_low: FloatComponentParameter = Field(
@@ -128,9 +134,9 @@ class Coupler(Component[Literal["tunable"]]):
         default=ComponentParameter(value=0.0),
         json_schema_extra={"display": {"label": "dc_bias", "unit": "V", "scale": 1}},
     )
-    fmax_bias: FloatComponentParameter = Field(
+    bias_offset: FloatComponentParameter = Field(
         default=ComponentParameter(value=0.0),
-        json_schema_extra={"display": {"label": "fmax_bias", "unit": "V", "scale": 1}},
+        json_schema_extra={"display": {"label": "bias_offset", "unit": "V", "scale": 1}},
     )
     bias_period: FloatComponentParameter = Field(
         default=ComponentParameter(value=0.0),
@@ -182,7 +188,7 @@ class SuperconductingProcessorTemplate(BaseModel):
     )
 
 
-class SuperconductingProcessor(Processor):
+class SuperconductingProcessor(BaseModel):
     nodes: dict[ComponentRef, SuperconductingComponentType]
     edges: list[Edge]
 

boulderopalscaleupsdk/experiments/__init__.py

@@ -14,39 +14,57 @@
 """Experiment library."""
 
 __all__ = [
+    "T1",
+    "T2",
     "CWSIterable",
     "Chi01Scan",
     "ConstantWaveform",
+    "DragCosineWaveform",
     "Experiment",
     "GaussianWaveform",
     "HypIterable",
     "LinspaceIterable",
+    "LogspaceIterable",
     "PowerRabi",
+    "PowerRabiEF",
     "Ramsey",
     "RangeIterable",
     "ReadoutClassifierCalibration",
     "ResonatorSpectroscopy",
     "ResonatorSpectroscopyByBias",
     "ResonatorSpectroscopyByPower",
+    "T2Echo",
     "TransmonAnharmonicity",
     "TransmonSpectroscopy",
+    "Waveform",
+    "update_amplitude",
 ]
 
 from .chi01_scan import Chi01Scan
 from .common import (
-    ConstantWaveform,
     CWSIterable,
     Experiment,
-    GaussianWaveform,
     HypIterable,
     LinspaceIterable,
+    LogspaceIterable,
     RangeIterable,
 )
 from .power_rabi import PowerRabi
+from .power_rabi_ef import PowerRabiEF
 from .ramsey import Ramsey
 from .readout_classifier_calibration import ReadoutClassifierCalibration
 from .resonator_spectroscopy import ResonatorSpectroscopy
 from .resonator_spectroscopy_by_bias import ResonatorSpectroscopyByBias
 from .resonator_spectroscopy_by_power import ResonatorSpectroscopyByPower
+from .t1 import T1
+from .t2 import T2
+from .t2_echo import T2Echo
 from .transmon_anharmonicity import TransmonAnharmonicity
 from .transmon_spectroscopy import TransmonSpectroscopy
+from .waveforms import (
+    ConstantWaveform,
+    DragCosineWaveform,
+    GaussianWaveform,
+    Waveform,
+    update_amplitude,
+)

boulderopalscaleupsdk/experiments/chi01_scan.py

@@ -13,13 +13,14 @@
 
 from pydantic import PrivateAttr
 
-from boulderopalscaleupsdk.experiments.common import (
+from .common import (
     CWSIterable,
     Experiment,
     HypIterable,
     LinspaceIterable,
     RangeIterable,
 )
+from .waveforms import ConstantWaveform
 
 DEFAULT_RECYCLE_DELAY_NS = 10_000
 DEFAULT_SHOT_COUNT = 100
@@ -33,17 +34,20 @@ class Chi01Scan(Experiment):
     Attributes
     ----------
     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.
+        Defaults to a scan around the readout frequency.
     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.
+        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("chi01_scan")
@@ -54,3 +58,5 @@ class Chi01Scan(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/common.py

@@ -14,7 +14,6 @@
 from typing import Literal
 
 from pydantic import BaseModel, ConfigDict, Field
-from pydantic.dataclasses import dataclass
 
 
 class Experiment(BaseModel):
@@ -56,6 +55,21 @@ class RangeIterable(_RangeIterable):
     step: float
 
 
+class LogspaceIterable(_RangeIterable):
+    """A range of values spaced evenly on a log scale."""
+
+    dtype: Literal["logspace"] = "logspace"
+
+    # The starting value.
+    start: float
+    # The final value.
+    stop: float
+    # The number of values. Defaults to 101.
+    count: int = Field(default=101)
+    # Base of the logarithm
+    base: int = Field(default=10)
+
+
 class CWSIterable(_RangeIterable):
     """A range of linearly spaced values in center ± width/2."""
 
@@ -83,18 +97,3 @@ class HypIterable(_RangeIterable):
     width: float
     # The number of values. Defaults to 51.
     count: int = Field(default=51)
-
-
-@dataclass
-class ConstantWaveform:
-    duration_ns: int
-    scale: float
-    waveform_type: Literal["constant"] = "constant"
-
-
-@dataclass
-class GaussianWaveform:
-    duration_ns: int
-    amplitude: float
-    sigma: float
-    waveform_type: Literal["gaussian"] = "gaussian"

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,28 +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.
-    measure_waveform : ConstantWaveform
-        The waveform to use for the measurement 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.
+        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
-    measure_waveform: ConstantWaveform
+    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

@@ -14,10 +14,10 @@
 from pydantic import PrivateAttr
 
 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,36 +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.
-    readout_amplitude : float
-        The amplitude of the readout pulse.
-    duration_ns : int, optional
-        The duration of the pulse, in nanoseconds.
-        Defaults to 2000 ns.
+        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.
+        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
-    readout_amplitude: float
-    duration_ns: int = DEFAULT_DURATION_NS
     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 boulderopalscaleupsdk.experiments.common import Experiment
+from .common import Experiment
+from .waveforms import ConstantWaveform
 
 
 class ReadoutClassifierCalibration(Experiment):
@@ -10,15 +24,21 @@ 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.
+        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")
     transmon: str
     recycle_delay_ns: int
     shot_count: int = 5000
+    measure_waveform: ConstantWaveform | None = None
+    run_mixer_calibration: bool = False

boulderopalscaleupsdk/experiments/resonator_spectroscopy.py

@@ -20,8 +20,8 @@ from .common import (
     LinspaceIterable,
     RangeIterable,
 )
+from .waveforms import ConstantWaveform
 
-DEFAULT_DURATION_NS = 2000  # ns
 DEFAULT_RECYCLE_DELAY_NS = 1000  # ns
 DEFAULT_SHOT_COUNT = 100
 
@@ -33,23 +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.
-    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.
-    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.
+        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")
@@ -58,7 +55,7 @@ class ResonatorSpectroscopy(Experiment):
     frequencies: list[int] | LinspaceIterable | RangeIterable | CWSIterable | HypIterable | None = (
         None
     )
-    readout_amplitude: float | None = None
-    duration_ns: int = DEFAULT_DURATION_NS
     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

@@ -20,8 +20,8 @@ from .common import (
     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)
@@ -34,30 +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 transmons to bias.
-        If None, it defaults to transmon coupled to the resonator.
+        The references for the transmons to bias.
+        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.
-    readout_amplitude : float, optional
-        The amplitude of the readout pulse.
-        Defaults to None.
-    duration_ns : int, optional
-        The duration of the pulse, in nanoseconds.
-        Defaults to 2000 ns.
+        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.
+        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")
@@ -70,7 +67,7 @@ class ResonatorSpectroscopyByBias(Experiment):
     biases: list[float] | LinspaceIterable | RangeIterable | CWSIterable | HypIterable = (
         DEFAULT_BIASES
     )
-    readout_amplitude: float | None = None
-    duration_ns: int = DEFAULT_DURATION_NS
     recycle_delay_ns: int = DEFAULT_RECYCLE_DELAY_NS
     shot_count: int = DEFAULT_SHOT_COUNT
+    measure_waveform: ConstantWaveform | None = None
+    run_mixer_calibration: bool = False