iqm-pulse 9.12.0__py3-none-any.whl → 9.14.0__py3-none-any.whl

iqm/pulse/gates/__init__.py

@@ -47,7 +47,7 @@ from iqm.pulse.gates.cz import (
 from iqm.pulse.gates.default_gates import _quantum_ops_library
 from iqm.pulse.gates.delay import Delay
 from iqm.pulse.gates.flux_multiplexer import FluxMultiplexer_SampleLinear
-from iqm.pulse.gates.measure import Measure_Constant, Measure_Constant_Qnd
+from iqm.pulse.gates.measure import Measure_Constant, Measure_Constant_Qnd, Shelved_Measure_Constant
 from iqm.pulse.gates.move import MOVE_CRF_CRF, MOVE_TGSS_CRF
 from iqm.pulse.gates.prx import (
     Constant_PRX_with_smooth_rise_fall,
@@ -102,6 +102,7 @@ _exposed_implementations: dict[str, type[GateImplementation]] = {
         FluxPulseGate_CRF_CRF,
         Measure_Constant,
         Measure_Constant_Qnd,
+        Shelved_Measure_Constant,
         PRX_ModulatedDRAGCosineRiseFall,
         MOVE_CRF_CRF,
         MOVE_TGSS_CRF,

iqm/pulse/gates/default_gates.py

@@ -34,7 +34,7 @@ from iqm.pulse.gates.cz import (
 )
 from iqm.pulse.gates.delay import Delay
 from iqm.pulse.gates.flux_multiplexer import FluxMultiplexer_SampleLinear
-from iqm.pulse.gates.measure import Measure_Constant
+from iqm.pulse.gates.measure import Measure_Constant, Shelved_Measure_Constant
 from iqm.pulse.gates.move import MOVE_CRF_CRF, MOVE_TGSS_CRF
 from iqm.pulse.gates.prx import (
     PRX_DRAGCosineRiseFall,
@@ -60,7 +60,11 @@ for different gates."""
 _default_implementations = {
     "barrier": {"": Barrier},
     "delay": {"wait": Delay},
-    "measure": {"constant": Measure_Constant, "constant_qnd": Measure_Constant},
+    "measure": {
+        "constant": Measure_Constant,
+        "constant_qnd": Measure_Constant,
+        "shelved_constant": Shelved_Measure_Constant,
+    },
     "prx": {
         "drag_gaussian": PRX_DRAGGaussian,
         "drag_crf": PRX_DRAGCosineRiseFall,

iqm/pulse/gates/measure.py

@@ -214,7 +214,7 @@ class Measure_CustomWaveforms(CustomIQWaveforms):
         return probe_pulse, acquisition_method
 
     def probe_timebox(
-        self, key: str = "", feedback_key: str = "", do_acquisition: bool = True
+        self, key: str = "", feedback_key: str = "", do_acquisition: bool = True, **kwargs
     ) -> MultiplexedProbeTimeBox:
         """Returns a "naked" probe timebox that supports convenient multiplexing through
         ``MultiplexedProbeTimeBox.__add__``.
@@ -286,10 +286,12 @@ class Measure_CustomWaveforms(CustomIQWaveforms):
                         label=f"{self.__class__.__name__} on {self.locus}",
                     )
             else:
+                # _skip_override used for child classes build on `Measure_CustomWaveforms` to not call `.probe_timebox`
+                # from the parent class, but from this class instead.
                 probe_timeboxes = [
                     self.builder.get_implementation(
                         self.parent.name, (c,), impl_name=self.name, priority_calibration=self._prio_calibration
-                    ).probe_timebox(key, feedback_key, do_acquisition)
+                    ).probe_timebox(key, feedback_key, do_acquisition, _skip_override=True)
                     for c in self.locus
                 ]
                 probe_timebox = functools.reduce(lambda x, y: x + y, probe_timeboxes)
@@ -377,7 +379,7 @@ class Measure_CustomWaveforms(CustomIQWaveforms):
         args = (key, acquisition_delay, acquisition_duration, feedback_key)
         # additional caching for time traces since the acquisitions differ from the ones in _call
         if args not in self._time_traces:
-            probe_timebox = deepcopy(self.probe_timebox(key=key, feedback_key=feedback_key))
+            probe_timebox = deepcopy(self.probe_timebox(key=key, feedback_key=feedback_key, _skip_override=True))
             for probe_channel, segment in probe_timebox.atom.items():
                 readout_trigger = segment[0]
                 # TODO instead of editing the probe_timebox output contents, we should make the function itself do this
@@ -785,3 +787,68 @@ class Probe_Constant(ProbePulse_CustomWaveforms_noIntegration, wave_i=Constant,
 
     Uses a constant probe pulse.
     """
+
+
+class Shelved_Measure_CustomWaveforms(Measure_CustomWaveforms):
+    """Base class for shelved readout.
+
+    Shelved readout applies a ``prx_12(pi)`` gate before and after a standard dispersive readout on each qubit measured.
+    The first ``prx_12(pi)`` swaps the amplitudes of the |1> and |2> states, and the second one swaps them back after
+    the measurement has (roughtly) collapsed the state. If the discriminator of the readout is calibrated such that
+    the |0> state is on one side and the |1> and |2> states are on the other, the end result is equivalent to the
+    standard readout operation but with the advantage that the population in the |2> state is less susceptible to
+    :math:`T_1` decay during the readout than the population in the |1> state.
+
+    .. note:: Mixed implementation multiplexing is not supported.
+    """
+
+    # Copied from `CompositeGate` to refresh caching after any calibration changes (in particular for the `prx_12`
+    # calibration)
+    def __call__(self, *args, **kwargs):
+        default_cache_key = tuple(args) + tuple(kwargs.items())
+        try:
+            hash(default_cache_key)
+            key_is_hashable = True
+        except TypeError:
+            key_is_hashable = False
+        if key_is_hashable:
+            if box := self.builder.composite_cache.get(self, default_cache_key):
+                return box
+        box = self._call(*args, **kwargs)
+        if key_is_hashable:
+            self.builder.composite_cache.set(self, default_cache_key, box)
+        return box
+
+    # `probe_timebox` is needed for making certain experiments work (e.g. `MeasurementQNDness`), since they call this
+    # function explicitly. However, the main functionality of this method will not work: Enabling mixed
+    # implementation multiplexing. This is because the method has to return time boxes due to the `prx_12` pulses,
+    # instead of `MultiplexedProbeTimeBox`
+    # TODO: Enable mixed implementation multiplexing for shelved readout
+    def probe_timebox(
+        self, key: str = "", feedback_key: str = "", do_acquisition: bool = True, _skip_override: bool = False
+    ) -> TimeBox:
+        # type: ignore[override]
+        if _skip_override:
+            return super().probe_timebox(key, feedback_key, do_acquisition)
+        multiplexed_timeboxes = super().probe_timebox(key, feedback_key)
+        prx_12_impl = [self.builder.get_implementation("prx_12", [q])(np.pi) for q in self.locus]
+
+        boxes = prx_12_impl + multiplexed_timeboxes + prx_12_impl
+        return boxes
+
+    def _call(self, key: str = "", feedback_key: str = "") -> TimeBox:  # type: ignore[override]
+        shelved_measure_box = TimeBox.composite(
+            self.probe_timebox(key=key, feedback_key=feedback_key), label=f"Readout on {self.locus}"
+        )
+        shelved_measure_box.neighborhood_components[0] = shelved_measure_box.children[
+            len(self.locus)
+        ].neighborhood_components[0]
+
+        return shelved_measure_box
+
+
+class Shelved_Measure_Constant(Shelved_Measure_CustomWaveforms, wave_i=Constant, wave_q=Constant):
+    """Implementation of a shelved readout.
+
+    A measure gate implemented as a constant waveform is surrounded by two `prx_12` gates.
+    """

{iqm_pulse-9.12.0.dist-info → iqm_pulse-9.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-pulse
-Version: 9.12.0
+Version: 9.14.0
 Summary: A Python-based project for providing interface and implementations for control pulses.
 Author-email: IQM Finland Oy <info@meetiqm.com>
 License: Apache License
@@ -214,7 +214,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: iqm-exa-common <27,>=26
-Requires-Dist: iqm-data-definitions <3.0,>=2.6
+Requires-Dist: iqm-data-definitions <3.0,>=2.13
 Requires-Dist: python-rapidjson ==1.20
 Requires-Dist: jinja2 ==3.0.3
 Requires-Dist: numpy <3.0,>=1.26.4

{iqm_pulse-9.12.0.dist-info → iqm_pulse-9.14.0.dist-info}/RECORD

@@ -8,15 +8,15 @@ iqm/pulse/scheduler.py,sha256=jBi68_Y1RVNe3aDmP4wmudDs5vXCHZm-UXl3IpgNDDM,22738
 iqm/pulse/timebox.py,sha256=w3R6VafBXx_cGWrcvI_6x1e6JII_9v1vxQoRSGIjtXE,16591
 iqm/pulse/utils.py,sha256=HyTkMD0er_rZnvDZWM1WscOFxaxGMyRAW_Aw36b0Hdc,7998
 iqm/pulse/validation.py,sha256=-tZWrW201t4nbTQWeZ8M9DixzoN8B0Q63IP57BfDAz0,10733
-iqm/pulse/gates/__init__.py,sha256=zMz1jDQg6EFsTreNu0NyhOWpecWnbAntrvSlJQa7Xoo,12926
+iqm/pulse/gates/__init__.py,sha256=UI6kx0MrXw4Fqz8OFkVo8rZirNbSfT1dlWpnnG8ELwQ,12986
 iqm/pulse/gates/barrier.py,sha256=WhYV70lf4lh4Wa9UZuMk2lp9JbUQIu8lzewRC2P7pNE,2546
 iqm/pulse/gates/conditional.py,sha256=3tW5kVt2M2xaTJxaixTErU5DTe91F0uE9BN9kopBEkQ,6242
 iqm/pulse/gates/cz.py,sha256=QgV-mn2aPDbfNplwEi18Lll4Zle-IELpn43IPM6Q_w8,20141
-iqm/pulse/gates/default_gates.py,sha256=kLNYjt-ZXYPvfBS1p8pi7e3gZz2UnMSWS4S2Xmj6omg,9413
+iqm/pulse/gates/default_gates.py,sha256=choy57ODXqXvpqY7rFMsZDHqxbDaIosu5Zy70sVbRL8,9516
 iqm/pulse/gates/delay.py,sha256=nST9dY2JFp_mpKhiSfsYa5yL4hFKcNJSAyCzXjhauQg,3767
 iqm/pulse/gates/enums.py,sha256=ATwb6vZYpfgQ1gQyFPW53JyIKrdAP3FPHm6jV-t9OAk,2532
 iqm/pulse/gates/flux_multiplexer.py,sha256=5psam8_3z796z2nL-A2RKzDGTRDE-7GJ4F0aYCgaPUY,9691
-iqm/pulse/gates/measure.py,sha256=izqaO4Pxxb7THJhs6tx3QT_YCFDpdt8Mi30E-gwvM7g,40429
+iqm/pulse/gates/measure.py,sha256=jUofgAZENB9pNXuChD4wzxvRYJ_LlfOnn12-M-N3hJw,43892
 iqm/pulse/gates/move.py,sha256=yKY-Et4YJV0KmcDwN0yE3oHgDtLL-Xfgy1G_InsJN0U,17182
 iqm/pulse/gates/prx.py,sha256=SaJHcVu-NURUBTF5LtmTwwK1qcCtXA89NA5VwJXBM1o,24504
 iqm/pulse/gates/reset.py,sha256=vYbzaA0pg3r5Oh6Edpu6NPlYoq1M7_tEWnf-7SHig4o,7589
@@ -38,8 +38,8 @@ iqm/pulse/playlist/visualisation/templates/static/logo.png,sha256=rbfQZ6_UEaztpY
 iqm/pulse/playlist/visualisation/templates/static/moment.min.js,sha256=4iQZ6BVL4qNKlQ27TExEhBN1HFPvAvAMbFavKKosSWQ,53324
 iqm/pulse/playlist/visualisation/templates/static/vis-timeline-graph2d.min.css,sha256=svzNasPg1yR5gvEaRei2jg-n4Pc3sVyMUWeS6xRAh6U,19837
 iqm/pulse/playlist/visualisation/templates/static/vis-timeline-graph2d.min.js,sha256=OqCqCyA6JnxPz3PGXq_P_9VuSqWptgNt5Ev3T-xjefQ,570288
-iqm_pulse-9.12.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
-iqm_pulse-9.12.0.dist-info/METADATA,sha256=1p7ml90Petlk05mvVYIuJFhZuIrsxb5y3d23PBwGUgs,14523
-iqm_pulse-9.12.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-iqm_pulse-9.12.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
-iqm_pulse-9.12.0.dist-info/RECORD,,
+iqm_pulse-9.14.0.dist-info/LICENSE.txt,sha256=R6Q7eUrLyoCQgWYorQ8WJmVmWKYU3dxA3jYUp0wwQAw,11332
+iqm_pulse-9.14.0.dist-info/METADATA,sha256=TqnEuz_4eFndGLja-YbC8wNkP-nZNk2O_PQvbItwuZc,14524
+iqm_pulse-9.14.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+iqm_pulse-9.14.0.dist-info/top_level.txt,sha256=NB4XRfyDS6_wG9gMsyX-9LTU7kWnTQxNvkbzIxGv3-c,4
+iqm_pulse-9.14.0.dist-info/RECORD,,