boulder-opal-scale-up-sdk 1.0.1__tar.gz → 1.0.3__tar.gz

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: boulder-opal-scale-up-sdk
-Version: 1.0.1
+Version: 1.0.3
 Summary: Q-CTRL Boulder Opal Scale Up Python SDK
 License: https://q-ctrl.com/terms
 Keywords: black opal,boulder opal,fire opal,nisq,open controls,q control,q ctrl,q-control,q-ctrl,qcontrol,qctrl,quantum,quantum algorithms,quantum circuits,quantum coding,quantum coding software,quantum computing,quantum control,quantum control software,quantum control theory,quantum engineering,quantum error correction,quantum firmware,quantum fundamentals,quantum sensing,qubit,qudit

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/boulderopalscaleupsdk/agent/worker.py

@@ -27,7 +27,7 @@ from grpc import aio as grpc
 from grpc import ssl_channel_credentials
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
-from boulderopalscaleupsdk.common.dtypes import GrpcMetadata
+from boulderopalscaleupsdk.common.dtypes import GrpcMetadata, JobId
 from boulderopalscaleupsdk.protobuf.v1 import agent_pb2, task_pb2, task_pb2_grpc
 
 LOG = logging.getLogger(__name__)
@@ -178,7 +178,7 @@ class Agent:
         device_name: str,
         routine: str,
         data: Struct | None,
-    ) -> str:
+    ) -> JobId | None:
         if not self._channel:
             raise RuntimeError("Cannot start session: agent is shutdown.")
         _data = any_pb2.Any()
@@ -196,16 +196,18 @@ class Agent:
             metadata=metadata,
         )
         self._state = response.target_state
-        await self._resume(response, metadata)
+        job_id: JobId | None = await self._resume(response, metadata)
         await self.shutdown()
-        return response.session_id
+
+        return job_id
 
     async def _resume(
         self,
         response: task_pb2.AgentTasksResponse,
         metadata: GrpcMetadata,
-    ) -> None:
+    ) -> JobId | None:
         tasks = response.tasks
+        job_id = None
         while self._state not in [
             task_pb2.AGENT_STATE_SHUTDOWN_MANAGER_INITIATED,
             task_pb2.AGENT_STATE_SHUTDOWN_FAULT,
@@ -243,6 +245,9 @@ class Agent:
 
             tasks = _resp.tasks
             self._state = _resp.target_state
+            job_id = _resp.job_id
+
+        return job_id or response.job_id
 
     async def shutdown(
         self,

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/boulderopalscaleupsdk/common/dtypes.py

@@ -13,6 +13,7 @@
 
 from __future__ import annotations
 
+import enum
 from typing import overload
 
 __all__ = [
@@ -23,7 +24,6 @@ __all__ = [
 
 from datetime import datetime, timedelta
 from decimal import Decimal
-from enum import Enum
 from typing import Annotated, Any, Literal, Self
 
 import numpy as np
@@ -33,11 +33,13 @@ from pydantic.dataclasses import dataclass
 
 GrpcMetadata = list[tuple[str, str | bytes]]
 
+JobId = str
+
 
 class BaseType: ...
 
 
-class FrequencyUnit(str, Enum):
+class FrequencyUnit(str, enum.Enum):
     Hz = "Hz"
 
 
@@ -115,7 +117,7 @@ class Frequency:
         return self.__mul__(lhs)
 
 
-class TimeUnit(str, Enum):
+class TimeUnit(str, enum.Enum):
     S = "s"
     MS = "ms"
     US = "us"
@@ -308,3 +310,13 @@ ISO8601DatetimeUTCLike = Annotated[
     BeforeValidator(_validate_iso_datetime),
     PlainSerializer(_serialize_datetime),
 ]
+
+
+class JobHistorySortOrder(enum.Enum):
+    CREATED_AT_DESC = 1
+    CREATED_AT_ASC = 2
+
+
+DEFAULT_JOB_HISTORY_PAGE = 1
+DEFAULT_JOB_HISTORY_PAGE_SIZE = 10
+DEFAULT_JOB_HISTORY_SORT_ORDER = JobHistorySortOrder.CREATED_AT_DESC

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/boulderopalscaleupsdk/common/typeclasses.py

@@ -83,3 +83,25 @@ class Combine(Protocol[T]):
             return destination
 
         return Combine.create(_combine)
+
+
+class Eq(Protocol[T]):
+    @abstractmethod
+    def eq(self, first: T, second: T) -> bool: ...
+
+    def eq_option(self, first: T | None, second: T | None) -> bool:
+        match first, second:
+            case None, None:
+                return True
+            case _ if first is not None and second is not None:
+                return self.eq(first, second)
+            case _:
+                return False
+
+    @classmethod
+    def create(cls, eq_fn: Callable[[T, T], bool]) -> "Eq[T]":
+        class _Eq(Eq):
+            def eq(self, first: T, second: T) -> bool:
+                return eq_fn(first, second)
+
+        return _Eq()

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/boulderopalscaleupsdk/device/__init__.py

@@ -11,10 +11,9 @@
 # distributed under the License is distributed on an "AS IS" BASIS. See the
 # License for the specific language.
 
-__all__ = ["Device", "InvalidDevice", "InvalidDeviceComponent"]
+__all__ = ["InvalidDevice", "InvalidDeviceComponent"]
 
 from boulderopalscaleupsdk.device.device import (
-    Device,
     InvalidDevice,
     InvalidDeviceComponent,
 )

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/boulderopalscaleupsdk/device/common.py

@@ -23,9 +23,6 @@ ExtraType = JsonDict | Callable[[JsonDict], None] | None
 ComponentRef = str
 
 
-class Processor(BaseModel): ...
-
-
 class Component(BaseModel, Generic[TraitT]):
     traits: list[TraitT]
 

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/boulderopalscaleupsdk/device/config_loader.py

@@ -52,9 +52,12 @@ class DeviceConfigLoader:
         layout_file = device_config_data.pop("layout_file", None)
         if layout_file is None:
             raise ValueError("Layout file is missing from device configuration data.")
-        self._validate_file_is_filename(layout_file)
 
-        layout_path = self.config_path.parent / layout_file
+        layout_path = Path(layout_file)
+        if not layout_path.is_absolute():
+            self._validate_file_is_filename(layout_path.name)
+            layout_path = self.config_path.parent / layout_file
+
         device_layout_data = self._load_yaml_file(layout_path)
 
         processed_device_config = {**device_config_data, **device_layout_data}

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/boulderopalscaleupsdk/device/defcal.py

@@ -59,3 +59,4 @@ DataKeyLike = Annotated[
 class DefCalData:
     body: str
     status: Literal["calibrated", "uncalibrated"]
+    scope: Literal["public", "internal"]

boulder_opal_scale_up_sdk-1.0.3/boulderopalscaleupsdk/device/device.py

@@ -0,0 +1,25 @@
+# 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.dataclasses import dataclass
+
+
+@dataclass
+class InvalidDevice:
+    message: str
+
+
+@dataclass
+class InvalidDeviceComponent:
+    message: str

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/boulderopalscaleupsdk/device/processor/common.py

@@ -25,7 +25,7 @@ from boulderopalscaleupsdk.common.dtypes import (
     Frequency,
     ISO8601DatetimeUTCLike,
 )
-from boulderopalscaleupsdk.common.typeclasses import Combine
+from boulderopalscaleupsdk.common.typeclasses import Combine, Eq
 
 T = TypeVar("T")
 T2 = TypeVar("T2")
@@ -97,23 +97,40 @@ class ComponentParameter(Generic[T]):
     @staticmethod
     def combine(
         combine_instance: Combine[T],
+        eq_instance: Eq[T],
     ) -> "Combine[ComponentParameter[T]]":
         def _combine(
             first: ComponentParameter[T],
             other: ComponentParameter[Any],
         ) -> ComponentParameter[T]:
+            _value = combine_instance.combine(first.value, other.value)
+            _err_minus = combine_instance.combine_option(
+                first.err_minus,
+                other.err_minus,
+            )
+            _err_plus = combine_instance.combine_option(
+                first.err_plus,
+                other.err_plus,
+            )
+            _calibration_status = other.calibration_status
+
+            _updated_at: ISO8601DatetimeUTCLike | None
+            if (
+                not eq_instance.eq(_value, first.value)
+                or not eq_instance.eq_option(_err_minus, first.err_minus)
+                or not eq_instance.eq_option(_err_plus, first.err_plus)
+                or _calibration_status != first.calibration_status
+            ):
+                _updated_at = datetime.now(tz=UTC)
+            else:
+                _updated_at = first.updated_at
+
             return ComponentParameter(
-                value=combine_instance.combine(first.value, other.value),
-                err_minus=combine_instance.combine_option(
-                    first.err_minus,
-                    other.err_minus,
-                ),
-                err_plus=combine_instance.combine_option(
-                    first.err_plus,
-                    other.err_plus,
-                ),
-                calibration_status=other.calibration_status,
-                updated_at=datetime.now(tz=UTC),
+                value=_value,
+                err_minus=_err_minus,
+                err_plus=_err_plus,
+                calibration_status=_calibration_status,
+                updated_at=_updated_at,
             )
 
         return Combine[ComponentParameter[T]].create(_combine)
@@ -127,8 +144,13 @@ class ComponentParameter(Generic[T]):
             updated_at=self.updated_at,
         )
 
-    def merge_with(self, other: "ComponentParameter[T]", combine_value: "Combine[T]"):
-        combined = ComponentParameter[T].combine(combine_value).combine(self, other)
+    def merge_with(
+        self,
+        other: "ComponentParameter[T]",
+        combine_value: "Combine[T]",
+        eq_value: Eq[T],
+    ):
+        combined = ComponentParameter[T].combine(combine_value, eq_value).combine(self, other)
         self.value = combined.value
         self.err_minus = combined.err_minus
         self.err_plus = combined.err_plus

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/boulderopalscaleupsdk/device/processor/superconducting_processor.py

@@ -23,7 +23,6 @@ from boulderopalscaleupsdk.common.dtypes import (
 from boulderopalscaleupsdk.device.common import (
     Component,
     ComponentRef,
-    Processor,
 )
 from boulderopalscaleupsdk.device.processor import (
     ComponentParameter,
@@ -37,12 +36,12 @@ 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(
@@ -71,9 +70,9 @@ class Transmon(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),
@@ -81,24 +80,24 @@ class Transmon(Component[Literal["tunable"]]):
     )
 
 
-class Resonator(Component[Literal["dispersive"]]):
+class Resonator(Component[Literal["readout"]]):
     dtype: Literal["resonator"] = "resonator"
-    traits: list[Literal["dispersive"]] = Field(default=["dispersive"])
+    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 +127,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 +181,7 @@ class SuperconductingProcessorTemplate(BaseModel):
     )
 
 
-class SuperconductingProcessor(Processor):
+class SuperconductingProcessor(BaseModel):
     nodes: dict[ComponentRef, SuperconductingComponentType]
     edges: list[Edge]
 

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/boulderopalscaleupsdk/experiments/__init__.py

@@ -14,7 +14,10 @@
 """Experiment library."""
 
 __all__ = [
+    "T1",
+    "T2",
     "CWSIterable",
+    "Chi01Scan",
     "ConstantWaveform",
     "Experiment",
     "GaussianWaveform",
@@ -28,10 +31,10 @@ __all__ = [
     "ResonatorSpectroscopyByBias",
     "ResonatorSpectroscopyByPower",
     "TransmonAnharmonicity",
-    "TransmonResonatorChiScan",
     "TransmonSpectroscopy",
 ]
 
+from .chi01_scan import Chi01Scan
 from .common import (
     ConstantWaveform,
     CWSIterable,
@@ -47,6 +50,7 @@ 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 .transmon_anharmonicity import TransmonAnharmonicity
-from .transmon_resonator_chi_scan import TransmonResonatorChiScan
 from .transmon_spectroscopy import TransmonSpectroscopy

boulder_opal_scale_up_sdk-1.0.1/boulderopalscaleupsdk/experiments/transmon_resonator_chi_scan.py → boulder_opal_scale_up_sdk-1.0.3/boulderopalscaleupsdk/experiments/chi01_scan.py

@@ -13,7 +13,8 @@
 
 from pydantic import PrivateAttr
 
-from boulderopalscaleupsdk.experiments.common import (
+from .common import (
+    ConstantWaveform,
     CWSIterable,
     Experiment,
     HypIterable,
@@ -25,7 +26,7 @@ DEFAULT_RECYCLE_DELAY_NS = 10_000
 DEFAULT_SHOT_COUNT = 100
 
 
-class TransmonResonatorChiScan(Experiment):
+class Chi01Scan(Experiment):
     """
     Parameters for running an experiment to find the dispersive shift for a transmon
     resonator pair.
@@ -44,9 +45,12 @@ class TransmonResonatorChiScan(Experiment):
     shot_count : int, optional
         The number of shots to be taken in the experiment.
         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.
     """
 
-    _experiment_name: str = PrivateAttr("transmon_resonator_chi_scan")
+    _experiment_name: str = PrivateAttr("chi01_scan")
 
     transmon: str
     frequencies: list[int] | LinspaceIterable | RangeIterable | CWSIterable | HypIterable | None = (
@@ -54,3 +58,4 @@ class TransmonResonatorChiScan(Experiment):
     )
     recycle_delay_ns: int = DEFAULT_RECYCLE_DELAY_NS
     shot_count: int = DEFAULT_SHOT_COUNT
+    measure_waveform: ConstantWaveform | None = None

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/boulderopalscaleupsdk/experiments/common.py

@@ -56,6 +56,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."""
 

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/boulderopalscaleupsdk/experiments/power_rabi.py

@@ -39,14 +39,15 @@ class PowerRabi(Experiment):
         The scaling factors for the drive pulse amplitude. If None, a default scan will be used.
     drive_waveform : GaussianWaveform
         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.
     shot_count : int, optional
         The number of shots to be taken in the experiment. Defaults to 400.
     pulse_vp : float, optional
         The voltage per pulse. If None, a default value will be used.
+    measure_waveform : ConstantWaveform or None, optional
+        The waveform to use for the measurement pulse.
+        If not provided, the measurement defcal will be used.
     """
 
     _experiment_name: str = PrivateAttr("power_rabi")
@@ -54,7 +55,7 @@ class PowerRabi(Experiment):
     transmon: str
     scales: list[float] | LinspaceIterable | RangeIterable | CWSIterable | HypIterable | None = None
     drive_waveform: GaussianWaveform
-    measure_waveform: ConstantWaveform
     recycle_delay_ns: int
     shot_count: int = DEFAULT_SHOT_COUNT
     pulse_vp: float | None = None
+    measure_waveform: ConstantWaveform | None = None

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/boulderopalscaleupsdk/experiments/ramsey.py

@@ -13,7 +13,7 @@
 
 from pydantic import PrivateAttr
 
-from .common import Experiment
+from .common import ConstantWaveform, Experiment
 
 DEFAULT_RECYCLE_DELAY_NS = 10_000
 DEFAULT_SHOT_COUNT = 400
@@ -34,19 +34,17 @@ class Ramsey(Experiment):
         The minimum delay time, in nanoseconds.
     delay_step_ns : int
         The step for generating the list of delays, in nanoseconds.
-    detuning : float
+    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.
     recycle_delay_ns : int, optional
         The delay time between consecutive shots of the experiment, in nanoseconds.
         Defaults to 10000 ns.
     shot_count : int, optional
         The number of shots to be taken in the experiment.
         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.
     """
 
     _experiment_name: str = PrivateAttr("ramsey")
@@ -55,8 +53,7 @@ class Ramsey(Experiment):
     max_delay_ns: int
     min_delay_ns: int
     delay_step_ns: int
-    detuning: float
-    readout_amplitude: float
-    duration_ns: int = DEFAULT_DURATION_NS
+    virtual_detuning: float
     recycle_delay_ns: int = DEFAULT_RECYCLE_DELAY_NS
     shot_count: int = DEFAULT_SHOT_COUNT
+    measure_waveform: ConstantWaveform | None = None

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/boulderopalscaleupsdk/experiments/readout_classifier_calibration.py

@@ -1,6 +1,6 @@
 from pydantic import PrivateAttr
 
-from boulderopalscaleupsdk.experiments.common import Experiment
+from .common import ConstantWaveform, Experiment
 
 
 class ReadoutClassifierCalibration(Experiment):
@@ -16,9 +16,13 @@ class ReadoutClassifierCalibration(Experiment):
     shot_count : int, optional
         The number of shots to be taken in the experiment.
         Defaults to 5000.
+    measure_waveform : ConstantWaveform or None, optional
+        The waveform to use for the measurement pulse.
+        If not provided, the measurement defcal will be used.
     """
 
     _experiment_name: str = PrivateAttr("readout_classifier_calibration")
     transmon: str
     recycle_delay_ns: int
     shot_count: int = 5000
+    measure_waveform: ConstantWaveform | None = None

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/boulderopalscaleupsdk/experiments/resonator_spectroscopy.py

@@ -14,6 +14,7 @@
 from pydantic import PrivateAttr
 
 from .common import (
+    ConstantWaveform,
     CWSIterable,
     Experiment,
     HypIterable,
@@ -38,18 +39,15 @@ class ResonatorSpectroscopy(Experiment):
                   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.
     shot_count : int, optional
         The number of shots to be taken in the experiment.
         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.
     """
 
     _experiment_name: str = PrivateAttr("resonator_spectroscopy")
@@ -58,7 +56,6 @@ 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

{boulder_opal_scale_up_sdk-1.0.1 → boulder_opal_scale_up_sdk-1.0.3}/boulderopalscaleupsdk/experiments/resonator_spectroscopy_by_bias.py

@@ -14,6 +14,7 @@
 from pydantic import PrivateAttr
 
 from .common import (
+    ConstantWaveform,
     CWSIterable,
     Experiment,
     HypIterable,
@@ -36,7 +37,7 @@ class ResonatorSpectroscopyByBias(Experiment):
     resonator : str
         The reference for the resonator to target in the experiment.
     bias_transmons : list[str] or None, optional
-        The transmons to bias.
+        The references for the transmons to bias.
         If None, it defaults to transmon coupled to the resonator.
     frequencies : list[int] or LinspaceIterable or RangeIterable or CWSIterable
                   or HypIterable or None, optional
@@ -46,18 +47,15 @@ class ResonatorSpectroscopyByBias(Experiment):
              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.
     recycle_delay_ns : int, optional
         The delay time between consecutive shots of the experiment, in nanoseconds.
         Defaults to 10000 ns.
     shot_count : int, optional
         The number of shots to be taken in the experiment.
         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.
     """
 
     _experiment_name: str = PrivateAttr("resonator_spectroscopy_by_bias")
@@ -70,7 +68,6 @@ 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