refactor: resonator flux with new calibration model

Author: andrea-pasquale

src/qibocal/calibration/calibration.py

@@ -128,3 +128,12 @@ def qubits(self) -> list:
     @property
     def nqubits(self) -> int:
         return len(self.qubits)
+
+    # TODO: add crosstalk object where I can do this
+    def get_crosstalk_element(self, qubit1: QubitId, qubit2: QubitId):
+        a, b = self.qubits.index(qubit1), self.qubits.index(qubit2)
+        return self.flux_crosstalk_matrix[a, b]
+
+    def set_crosstalk_element(self, qubit1: QubitId, qubit2: QubitId, value: float):
+        a, b = self.qubits.index(qubit1), self.qubits.index(qubit2)
+        self.flux_crosstalk_matrix[a, b] = value

src/qibocal/protocols/flux_dependence/resonator_flux_dependence.py

@@ -13,10 +13,11 @@
 )
 from scipy.optimize import curve_fit
 
-from ... import update
 from ...auto.operation import Data, Parameters, QubitId, Results, Routine
 from ...config import log
 from ...result import magnitude, phase
+
+from ... import update
 from ..utils import GHZ_TO_HZ, HZ_TO_GHZ, extract_feature, table_dict, table_html
 from . import utils
 
@@ -130,10 +131,12 @@ def _acquisition(
         )
 
         qubit_frequency[q] = platform.config(qubit.drive).frequency
-        bare_resonator_frequency[q] = 0  # qubit.bare_resonator_frequency
-        matrix_element[q] = 1  # qubit.crosstalk_matrix[q]
+        bare_resonator_frequency[q] = platform.calibration.single_qubits[
+            q
+        ].resonator.bare_frequency
+        matrix_element[q] = platform.calibration.get_crosstalk_element(q, q)
         offset[q] = -offset0 * matrix_element[q]
-        charging_energy[q] = 0  # -qubit.anharmonicity
+        charging_energy[q] = platform.calibration.single_qubits[q].qubit.charging_energy
 
     data = ResonatorFluxData(
         resonator_type=platform.resonator_type,
@@ -294,9 +297,9 @@ def _plot(data: ResonatorFluxData, fit: ResonatorFluxResults, target: QubitId):
 
 
 def _update(results: ResonatorFluxResults, platform: Platform, qubit: QubitId):
-    pass
-    # update.bare_resonator_frequency(results.bare_resonator_freq[qubit], platform, qubit)
+    update.bare_resonator_frequency(results.bare_resonator_freq[qubit], platform, qubit)
     # update.readout_frequency(results.resonator_freq[qubit], platform, qubit)
+    # TODO: add coupling somewhere
     # update.coupling(results.coupling[qubit], platform, qubit)
 
 

src/qibocal/update.py

@@ -83,11 +83,7 @@ def crosstalk_matrix(
         platform.calibration.flux_crosstalk_matrix = np.zeros(
             (platform.calibration.nqubits, platform.calibration.nqubits)
         )
-
-    a, b = platform.calibration.qubits.index(qubit), platform.calibration.qubits.index(
-        flux_qubit
-    )
-    platform.calibration.flux_crosstalk_matrix[a, b] = float(matrix_element)
+    platform.calibration.set_crosstalk_element(qubit, flux_qubit, matrix_element)
 
 
 def iq_angle(angle: float, platform: Platform, qubit: QubitId):