Use state 0 frequency for signal experiments

src/qibocal/calibration/calibration.py

@@ -38,6 +38,8 @@ class Resonator(Model):
     """Dressed resonator frequency [Hz]."""
     depletion_time: Optional[int] = None
     """Depletion time [ns]."""
+    bare_frequency_amplitude: Optional[float] = None
+    """Readout amplitude at high frequency."""
 
     @property
     def dispersive_shift(self):

src/qibocal/protocols/coherence/spin_echo_signal.py

@@ -10,7 +10,7 @@
 from qibocal.result import magnitude, phase
 
 from ... import update
-from ..utils import table_dict, table_html
+from ..utils import readout_frequency, table_dict, table_html
 from .t1_signal import T1SignalData
 from .utils import (
     CoherenceType,
@@ -89,6 +89,10 @@ def _acquisition(
     results = platform.execute(
         [sequence],
         [[sweeper]],
+        updates=[
+            {platform.qubits[q].probe: {"frequency": readout_frequency(q, platform)}}
+            for q in targets
+        ],
         nshots=params.nshots,
         relaxation_time=params.relaxation_time,
         acquisition_type=AcquisitionType.INTEGRATION,

src/qibocal/protocols/coherence/t1_signal.py

@@ -18,7 +18,7 @@
 from qibocal.result import magnitude, phase
 
 from ... import update
-from ..utils import table_dict, table_html
+from ..utils import readout_frequency, table_dict, table_html
 from . import utils
 
 
@@ -111,6 +111,10 @@ def _acquisition(
     results = platform.execute(
         [sequence],
         [[sweeper]],
+        updates=[
+            {platform.qubits[q].probe: {"frequency": readout_frequency(q, platform)}}
+            for q in targets
+        ],
         nshots=params.nshots,
         relaxation_time=params.relaxation_time,
         acquisition_type=AcquisitionType.INTEGRATION,

src/qibocal/protocols/coherence/t2_signal.py

@@ -11,7 +11,7 @@
 
 from ...result import magnitude, phase
 from ..ramsey.utils import ramsey_sequence
-from ..utils import table_dict, table_html
+from ..utils import readout_frequency, table_dict, table_html
 from . import t1_signal, t2, utils
 
 
@@ -80,6 +80,10 @@ def _acquisition(
     results = platform.execute(
         [sequence],
         [[sweeper]],
+        updates=[
+            {platform.qubits[q].probe: {"frequency": readout_frequency(q, platform)}}
+            for q in targets
+        ],
         nshots=params.nshots,
         relaxation_time=params.relaxation_time,
         acquisition_type=AcquisitionType.INTEGRATION,

src/qibocal/protocols/dispersive_shift.py

@@ -13,6 +13,7 @@
     HZ_TO_GHZ,
     lorentzian,
     lorentzian_fit,
+    readout_frequency,
     table_dict,
     table_html,
 )
@@ -104,8 +105,7 @@ def _acquisition(
     sweepers = [
         Sweeper(
             parameter=Parameter.frequency,
-            values=platform.config(platform.qubits[q].probe).frequency
-            + delta_frequency_range,
+            values=readout_frequency(q, platform) + delta_frequency_range,
             channels=[platform.qubits[q].probe],
         )
         for q in targets
@@ -121,7 +121,6 @@ def _acquisition(
     )
 
     for qubit in targets:
-        ro_frequency = platform.config(platform.qubits[qubit].probe).frequency
         for state, sequence in enumerate([sequence_0, sequence_1]):
             ro_pulse = list(sequence.channel(platform.qubits[qubit].acquisition))[-1]
             result = results[ro_pulse.id]
@@ -130,7 +129,7 @@ def _acquisition(
                 DispersiveShiftType,
                 (qubit, state),
                 dict(
-                    freq=ro_frequency + delta_frequency_range,
+                    freq=readout_frequency(qubit, platform) + delta_frequency_range,
                     signal=magnitude(result),
                     phase=phase(result),
                     i=i,

src/qibocal/protocols/dispersive_shift_qutrit.py

@@ -12,6 +12,7 @@
     HZ_TO_GHZ,
     lorentzian,
     lorentzian_fit,
+    readout_frequency,
     table_dict,
     table_html,
 )
@@ -107,8 +108,7 @@ def _acquisition(
     sweepers = [
         Sweeper(
             parameter=Parameter.frequency,
-            values=platform.config(platform.qubits[q].probe).frequency
-            + delta_frequency_range,
+            values=readout_frequency(q, platform, state=1) + delta_frequency_range,
             channels=[platform.qubits[q].probe],
         )
         for q in targets
@@ -124,15 +124,15 @@ def _acquisition(
     )
 
     for qubit in targets:
-        ro_frequency = platform.config(platform.qubits[qubit].probe).frequency
         for state, sequence in enumerate([sequence_0, sequence_1, sequence_2]):
             ro_pulse = list(sequence.channel(platform.qubits[qubit].acquisition))[-1]
             result = results[ro_pulse.id]
             data.register_qubit(
                 ResSpecType,
                 (qubit, state),
                 dict(
-                    freq=ro_frequency + delta_frequency_range,
+                    freq=readout_frequency(qubit, platform, state=1)
+                    + delta_frequency_range,
                     signal=magnitude(result),
                     phase=phase(result),
                 ),

src/qibocal/protocols/flux_dependence/qubit_crosstalk.py

@@ -20,7 +20,14 @@
 
 from ...result import magnitude, phase
 from ...update import replace
-from ..utils import GHZ_TO_HZ, HZ_TO_GHZ, extract_feature, table_dict, table_html
+from ..utils import (
+    GHZ_TO_HZ,
+    HZ_TO_GHZ,
+    extract_feature,
+    readout_frequency,
+    table_dict,
+    table_html,
+)
 from . import utils
 from .qubit_flux_dependence import (
     QubitFluxData,
@@ -191,6 +198,11 @@ def _acquisition(
             channel = platform.qubits[qubit].flux
             updates.append({channel: {"offset": params.bias_point[qubit]}})
 
+    updates += [
+        {platform.qubits[q].probe: {"frequency": readout_frequency(q, platform)}}
+        for q in targets
+    ]
+
     for flux_qubit, offset_sweeper in zip(params.flux_qubits, offset_sweepers):
         results = platform.execute(
             [sequence], [[offset_sweeper], freq_sweepers], **options, updates=updates

src/qibocal/protocols/flux_dependence/qubit_flux_dependence.py

@@ -20,7 +20,14 @@
 from qibocal.update import replace
 
 from ... import update
-from ..utils import GHZ_TO_HZ, HZ_TO_GHZ, extract_feature, table_dict, table_html
+from ..utils import (
+    GHZ_TO_HZ,
+    HZ_TO_GHZ,
+    extract_feature,
+    readout_frequency,
+    table_dict,
+    table_html,
+)
 from . import utils
 from .resonator_flux_dependence import ResonatorFluxParameters
 
@@ -148,6 +155,10 @@ def _acquisition(
     results = platform.execute(
         [sequence],
         [offset_sweepers, freq_sweepers],
+        updates=[
+            {platform.qubits[q].probe: {"frequency": readout_frequency(q, platform)}}
+            for q in targets
+        ],
         nshots=params.nshots,
         relaxation_time=params.relaxation_time,
         acquisition_type=AcquisitionType.INTEGRATION,

src/qibocal/protocols/flux_dependence/resonator_flux_dependence.py

@@ -12,7 +12,14 @@
 from ...auto.operation import Data, Parameters, QubitId, Results, Routine
 from ...config import log
 from ...result import magnitude, phase
-from ..utils import GHZ_TO_HZ, HZ_TO_GHZ, extract_feature, table_dict, table_html
+from ..utils import (
+    GHZ_TO_HZ,
+    HZ_TO_GHZ,
+    extract_feature,
+    readout_frequency,
+    table_dict,
+    table_html,
+)
 from . import utils
 
 
@@ -111,12 +118,11 @@ def _acquisition(
 
         qubit = platform.qubits[q]
         offset0 = platform.config(qubit.flux).offset
-        freq0 = platform.config(qubit.probe).frequency
 
         freq_sweepers.append(
             Sweeper(
                 parameter=Parameter.frequency,
-                values=freq0 + delta_frequency_range,
+                values=readout_frequency(q, platform) + delta_frequency_range,
                 channels=[qubit.probe],
             )
         )

src/qibocal/protocols/qubit_power_spectroscopy.py

@@ -20,7 +20,7 @@
 from ..update import replace
 from .qubit_spectroscopy import QubitSpectroscopyResults
 from .resonator_punchout import ResonatorPunchoutData
-from .utils import HZ_TO_GHZ
+from .utils import HZ_TO_GHZ, readout_frequency
 
 
 @dataclass
@@ -101,6 +101,10 @@ def _acquisition(
     results = platform.execute(
         [sequence],
         [[amp_sweeper], [freq_sweepers[q] for q in targets]],
+        updates=[
+            {platform.qubits[q].probe: {"frequency": readout_frequency(q, platform)}}
+            for q in targets
+        ],
         nshots=params.nshots,
         relaxation_time=params.relaxation_time,
         acquisition_type=AcquisitionType.INTEGRATION,

src/qibocal/protocols/qubit_spectroscopy.py

@@ -11,7 +11,13 @@
 
 from .. import update
 from .resonator_spectroscopy import ResonatorSpectroscopyData, ResSpecType
-from .utils import chi2_reduced, lorentzian, lorentzian_fit, spectroscopy_plot
+from .utils import (
+    chi2_reduced,
+    lorentzian,
+    lorentzian_fit,
+    readout_frequency,
+    spectroscopy_plot,
+)
 
 
 @dataclass
@@ -105,6 +111,10 @@ def _acquisition(
     results = platform.execute(
         [sequence],
         [sweepers],
+        updates=[
+            {platform.qubits[q].probe: {"frequency": readout_frequency(q, platform)}}
+            for q in targets
+        ],
         **params.execution_parameters,
     )
 

src/qibocal/protocols/qubit_spectroscopy_ef.py

@@ -16,7 +16,7 @@
     _fit,
 )
 from .resonator_spectroscopy import ResSpecType
-from .utils import spectroscopy_plot, table_dict, table_html
+from .utils import readout_frequency, spectroscopy_plot, table_dict, table_html
 
 
 @dataclass
@@ -117,6 +117,10 @@ def _acquisition(
     results = platform.execute(
         [sequence],
         [sweepers],
+        updates=[
+            {platform.qubits[q].probe: {"frequency": readout_frequency(q, platform)}}
+            for q in targets
+        ],
         **params.execution_parameters,
     )
 

src/qibocal/protocols/qutrit_classification.py

@@ -10,10 +10,9 @@
     SingleShotClassificationData,
     SingleShotClassificationParameters,
 )
-from qibocal.protocols.utils import plot_results
+from qibocal.protocols.utils import plot_results, readout_frequency
 
 from ..auto.operation import Results
-from ..config import log
 
 COLUMNWIDTH = 600
 LEGEND_FONT_SIZE = 20
@@ -67,22 +66,6 @@ def _acquisition(
     sequences, all_ro_pulses = [], []
     native = platform.natives.single_qubit
 
-    updates = []
-    for qubit in targets:
-        channel = platform.qubits[qubit].probe
-        try:
-            updates.append(
-                {
-                    channel: {
-                        "frequency": platform.calibration.single_qubits[
-                            qubit
-                        ].readout.qudits_frequency[1]
-                    }
-                }
-            )
-        except KeyError:
-            log.warning(f"No readout frequency for state 1 for qubit {qubit}.")
-
     for state in states:
         ro_pulses = {}
         sequence = PulseSequence()
@@ -117,24 +100,14 @@ def _acquisition(
         relaxation_time=params.relaxation_time,
         acquisition_type=AcquisitionType.INTEGRATION,
     )
-
-    updates = []
-    for qubit in targets:
-        channel = platform.qubits[qubit].probe
-        try:
-            # we readout at the readout frequency of |1> for better discrimination
-            updates.append(
-                {
-                    channel: {
-                        "frequency": platform.calibration.single_qubits[
-                            qubit
-                        ].readout.qudits_frequency[1]
-                    }
-                }
-            )
-        except KeyError:
-            log.warning(f"No readout frequency for state 1 for qubit {qubit}.")
-
+    updates = [
+        {
+            platform.qubits[q].probe: {
+                "frequency": readout_frequency(q, platform, state=1)
+            }
+        }
+        for q in targets
+    ]
     if params.unrolling:
         results = platform.execute(sequences, **options, updates=updates)
     else:

src/qibocal/protocols/rabi/amplitude_frequency_signal.py

@@ -17,6 +17,7 @@
     HZ_TO_GHZ,
     fallback_period,
     guess_period,
+    readout_frequency,
     table_dict,
     table_html,
 )
@@ -137,6 +138,10 @@ def _acquisition(
     results = platform.execute(
         [sequence],
         [[amp_sweeper], [freq_sweepers[q] for q in targets]],
+        updates=[
+            {platform.qubits[q].probe: {"frequency": readout_frequency(q, platform)}}
+            for q in targets
+        ],
         nshots=params.nshots,
         relaxation_time=params.relaxation_time,
         acquisition_type=AcquisitionType.INTEGRATION,

src/qibocal/protocols/rabi/amplitude_signal.py

@@ -9,7 +9,7 @@
 from qibocal.auto.operation import Data, Parameters, QubitId, Results, Routine
 from qibocal.calibration import CalibrationPlatform
 from qibocal.config import log
-from qibocal.protocols.utils import fallback_period, guess_period
+from qibocal.protocols.utils import fallback_period, guess_period, readout_frequency
 from qibocal.result import magnitude, phase
 
 from . import utils
@@ -91,6 +91,10 @@ def _acquisition(
     results = platform.execute(
         [sequence],
         [[sweeper]],
+        updates=[
+            {platform.qubits[q].probe: {"frequency": readout_frequency(q, platform)}}
+            for q in targets
+        ],
         nshots=params.nshots,
         relaxation_time=params.relaxation_time,
         acquisition_type=AcquisitionType.INTEGRATION,