From 4b41684176db04b4c8caf3aa4da36a2cf39d9812 Mon Sep 17 00:00:00 2001
From: GabrielePalazzo <73099233+GabrielePalazzo@users.noreply.github.com>
Date: Mon, 13 Nov 2023 16:16:23 +0400
Subject: [PATCH 1/2] msr->signal in runcards

---
 runcards/monitor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runcards/monitor.yml b/runcards/monitor.yml
index 30c1aafb7..08d6f91e0 100644
--- a/runcards/monitor.yml
+++ b/runcards/monitor.yml
@@ -3,7 +3,7 @@ actions:
 
   - id: t1
     priority: 00
-    operation: t1_msr
+    operation: t1_signal
     main: t2
     parameters:
       delay_before_readout_start: 50
@@ -13,7 +13,7 @@ actions:
 
   - id: t2
     priority: 10
-    operation: t2_msr
+    operation: t2_signal
     main: readout characterization
     parameters:
       delay_between_pulses_start: 50

From 27f92f38fdefad0365aed234610bc85549054660 Mon Sep 17 00:00:00 2001
From: GabrielePalazzo <73099233+GabrielePalazzo@users.noreply.github.com>
Date: Mon, 13 Nov 2023 16:39:12 +0400
Subject: [PATCH 2/2] Updated refactoring in qubit_flux_tracking

---
 .../flux_dependence/qubit_flux_tracking.py         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/qibocal/protocols/characterization/flux_dependence/qubit_flux_tracking.py b/src/qibocal/protocols/characterization/flux_dependence/qubit_flux_tracking.py
index aea13388c..54a33fa92 100644
--- a/src/qibocal/protocols/characterization/flux_dependence/qubit_flux_tracking.py
+++ b/src/qibocal/protocols/characterization/flux_dependence/qubit_flux_tracking.py
@@ -63,7 +63,7 @@ class QubitFluxResults(Results):
     [
         ("freq", np.float64),
         ("bias", np.float64),
-        ("msr", np.float64),
+        ("signal", np.float64),
         ("phase", np.float64),
     ]
 )
@@ -87,14 +87,14 @@ class QubitFluxData(Data):
     data: dict[QubitId, npt.NDArray[QubitFluxType]] = field(default_factory=dict)
     """Raw data acquired."""
 
-    def register_qubit_track(self, qubit, freq, bias, msr, phase):
+    def register_qubit_track(self, qubit, freq, bias, signal, phase):
         """Store output for single qubit."""
         # to be able to handle the 1D sweeper case
         size = len(freq)
         ar = np.empty(size, dtype=QubitFluxType)
         ar["freq"] = freq
         ar["bias"] = [bias] * size
-        ar["msr"] = msr
+        ar["signal"] = signal
         ar["phase"] = phase
         if qubit in self.data:
             self.data[qubit] = np.rec.array(np.concatenate((self.data[qubit], ar)))
@@ -201,7 +201,7 @@ def _acquisition(
             result = results[ro_pulses[qubit].serial]
             data.register_qubit_track(
                 qubit,
-                msr=result.magnitude,
+                signal=result.magnitude,
                 phase=result.phase,
                 freq=delta_frequency_range + qd_pulses[qubit].frequency,
                 bias=bias + qubits[qubit].sweetspot,
@@ -240,13 +240,13 @@ def _fit(data: QubitFluxData) -> QubitFluxResults:
 
         biases = qubit_data.bias
         frequencies = qubit_data.freq
-        msr = qubit_data.msr
+        signal = qubit_data.signal
 
         if data.resonator_type == "2D":
-            msr = -msr
+            signal = -signal
 
         frequencies, biases = utils.image_to_curve(
-            frequencies, biases, msr, msr_mask=0.3
+            frequencies, biases, signal, signal_mask=0.3
         )
         max_c = biases[np.argmax(frequencies)]
         min_c = biases[np.argmin(frequencies)]