fix: Propagate changes in punchout/qubit_power_spectroscopy

Author: andrea-pasquale

src/qibocal/protocols/flux_dependence/qubit_crosstalk.py

@@ -18,7 +18,7 @@
 from qibocal.calibration import CalibrationPlatform
 from qibocal.config import log
 
-from ...result import magnitude, phase
+from ...result import magnitude
 from ...update import replace
 from ..utils import (
     GHZ_TO_HZ,
@@ -166,7 +166,7 @@ def _acquisition(
         offset_sweepers.append(
             Sweeper(
                 parameter=Parameter.offset,
-                values=offset0 + params.bais_range,
+                values=offset0 + params.bias_range,
                 channels=[flux_channel],
             )
         )
@@ -210,7 +210,6 @@ def _acquisition(
                 qubit,
                 flux_qubit,
                 signal=magnitude(result),
-                phase=phase(result),
                 freq=freq_sweepers[i].values,
                 bias=offset_sweeper.values,
             )

src/qibocal/protocols/qubit_spectroscopies/qubit_power_spectroscopy.py

@@ -3,7 +3,6 @@
 
 import numpy as np
 import plotly.graph_objects as go
-from plotly.subplots import make_subplots
 from qibolab import (
     AcquisitionType,
     AveragingMode,
@@ -16,7 +15,7 @@
 from qibocal.auto.operation import Parameters, QubitId, Results, Routine
 from qibocal.calibration import CalibrationPlatform
 
-from ...result import magnitude, phase
+from ...result import magnitude
 from ...update import replace
 from ..resonator_spectroscopies.resonator_punchout import ResonatorPunchoutData
 from ..utils import HZ_TO_GHZ, readout_frequency
@@ -120,7 +119,6 @@ def _acquisition(
         data.register_qubit(
             qubit,
             signal=magnitude(result),
-            phase=phase(result),
             freq=freq_sweepers[qubit].values,
             amp=amp_sweeper.values,
         )
@@ -141,16 +139,7 @@ def _plot(
     """Plot QubitPunchout."""
     figures = []
     fitting_report = ""
-    fig = make_subplots(
-        rows=1,
-        cols=2,
-        horizontal_spacing=0.1,
-        vertical_spacing=0.2,
-        subplot_titles=(
-            "Signal [a.u.]",
-            "phase [rad]",
-        ),
-    )
+    fig = go.Figure()
     qubit_data = data[target]
     frequencies = qubit_data.freq * HZ_TO_GHZ
     amplitudes = qubit_data.amp
@@ -161,30 +150,16 @@ def _plot(
             y=amplitudes,
             z=qubit_data.signal,
             colorbar_x=0.46,
-        ),
-        row=1,
-        col=1,
-    )
-
-    fig.add_trace(
-        go.Heatmap(
-            x=frequencies,
-            y=amplitudes,
-            z=qubit_data.phase,
-            colorbar_x=1.01,
-        ),
-        row=1,
-        col=2,
+        )
     )
 
     fig.update_layout(
         showlegend=True,
         legend=dict(orientation="h"),
     )
 
-    fig.update_xaxes(title_text="Drive frequency [GHz]", row=1, col=1)
-    fig.update_xaxes(title_text="Drive frequency [GHz]", row=1, col=2)
-    fig.update_yaxes(title_text="Drive amplitude [a.u.]", row=1, col=1)
+    fig.update_xaxes(title_text="Drive frequency [GHz]")
+    fig.update_yaxes(title_text="Drive amplitude [a.u.]")
 
     figures.append(fig)
 

src/qibocal/protocols/resonator_spectroscopies/resonator_punchout.py

@@ -4,13 +4,12 @@
 import numpy as np
 import numpy.typing as npt
 import plotly.graph_objects as go
-from plotly.subplots import make_subplots
 from qibolab import AcquisitionType, AveragingMode, Parameter, PulseSequence, Sweeper
 
 from qibocal import update
 from qibocal.auto.operation import Data, Parameters, QubitId, Results, Routine
 from qibocal.calibration import CalibrationPlatform
-from qibocal.result import magnitude, phase
+from qibocal.result import magnitude
 
 from ..utils import HZ_TO_GHZ, fit_punchout, norm, table_dict, table_html
 
@@ -50,7 +49,6 @@ class ResonatorPunchoutResults(Results):
         ("freq", np.float64),
         ("amp", np.float64),
         ("signal", np.float64),
-        ("phase", np.float64),
     ]
 )
 """Custom dtype for resonator punchout."""
@@ -67,15 +65,18 @@ class ResonatorPunchoutData(Data):
     data: dict[QubitId, npt.NDArray[ResPunchoutType]] = field(default_factory=dict)
     """Raw data acquired."""
 
-    def register_qubit(self, qubit, freq, amp, signal, phase):
+    @property
+    def find_min(self):
+        return self.resonator_type != "2D"
+
+    def register_qubit(self, qubit, freq, amp, signal):
         """Store output for single qubit."""
         size = len(freq) * len(amp)
         frequency, amplitude = np.meshgrid(freq, amp)
         ar = np.empty(size, dtype=ResPunchoutType)
         ar["freq"] = frequency.ravel()
         ar["amp"] = amplitude.ravel()
         ar["signal"] = signal.ravel()
-        ar["phase"] = phase.ravel()
         self.data[qubit] = np.rec.array(ar)
 
 
@@ -142,7 +143,6 @@ def _acquisition(
         data.register_qubit(
             qubit,
             signal=magnitude(result),
-            phase=phase(result),
             freq=freq_sweepers[qubit].values,
             amp=amp_sweeper.values,
         )
@@ -152,7 +152,6 @@ def _acquisition(
 
 def _fit(data: ResonatorPunchoutData, fit_type="amp") -> ResonatorPunchoutResults:
     """Fit frequency and attenuation at high and low power for a given resonator."""
-
     return ResonatorPunchoutResults(*fit_punchout(data, fit_type))
 
 
@@ -162,16 +161,7 @@ def _plot(
     """Plotting function for ResonatorPunchout."""
     figures = []
     fitting_report = ""
-    fig = make_subplots(
-        rows=1,
-        cols=2,
-        horizontal_spacing=0.1,
-        vertical_spacing=0.2,
-        subplot_titles=(
-            "Normalised Signal [a.u.]",
-            "phase [rad]",
-        ),
-    )
+    fig = go.Figure()
     qubit_data = data[target]
     frequencies = qubit_data.freq * HZ_TO_GHZ
     amplitudes = qubit_data.amp
@@ -188,21 +178,9 @@ def _plot(
             y=amplitudes,
             z=qubit_data.signal,
             colorbar_x=0.46,
-        ),
-        row=1,
-        col=1,
+        )
     )
 
-    fig.add_trace(
-        go.Heatmap(
-            x=frequencies,
-            y=amplitudes,
-            z=qubit_data.phase,
-            colorbar_x=1.01,
-        ),
-        row=1,
-        col=2,
-    )
     if fit is not None:
         fig.add_trace(
             go.Scatter(
@@ -243,9 +221,8 @@ def _plot(
         legend=dict(orientation="h"),
     )
 
-    fig.update_xaxes(title_text="Frequency [GHz]", row=1, col=1)
-    fig.update_xaxes(title_text="Frequency [GHz]", row=1, col=2)
-    fig.update_yaxes(title_text="Amplitude [a.u.]", row=1, col=1)
+    fig.update_xaxes(title_text="Frequency [GHz]")
+    fig.update_yaxes(title_text="Amplitude [a.u.]")
 
     figures.append(fig)
 

src/qibocal/protocols/utils.py

@@ -226,14 +226,7 @@ def fit_punchout(data: Data, fit_type: str):
         freqs = qubit_data.freq
         amps = getattr(qubit_data, fit_type)
         signal = qubit_data.signal
-        if data.resonator_type == "3D":
-            mask_freq, mask_amps = extract_feature(
-                freqs, amps, signal, "max", ci_first_mask=90
-            )
-        else:
-            mask_freq, mask_amps = extract_feature(
-                freqs, amps, signal, "min", ci_first_mask=90
-            )
+        mask_freq, mask_amps = extract_feature(freqs, amps, signal, data.find_min)
         if fit_type == "amp":
             best_freq = np.max(mask_freq)
             bare_freq = np.min(mask_freq)