chore: update routines for the new sequence layout

qiboteam · Aug 11, 2024 · 875166a · 875166a
1 parent 5cec168
commit 875166a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/qibocal/protocols/classification.py b/src/qibocal/protocols/classification.py
@@ -189,9 +189,9 @@ def _acquisition(
             ro_sequence = qubit.native_gates.MZ.create_sequence()
             if state == 1:
                 sequence.extend(rx_sequence)
-            sequence[qubit.probe.name].append(Delay(duration=rx_sequence.duration))
+            sequence.append((qubit.probe.name, Delay(duration=rx_sequence.duration)))
             sequence.extend(ro_sequence)
-            ro_pulses[q] = ro_sequence[qubit.probe.name][0].id
+            ro_pulses[q] = ro_sequence[0][1].id
 
         sequences.append(sequence)
         all_ro_pulses.append(ro_pulses)

diff --git a/src/qibocal/protocols/rabi/utils.py b/src/qibocal/protocols/rabi/utils.py
@@ -236,16 +236,16 @@ def sequence_amplitude(
         qd_sequence = qubit.native_gates.RX.create_sequence(theta=np.pi, phi=0)
         ro_sequence = qubit.native_gates.MZ.create_sequence()
 
-        qd_pulses[q] = qd_sequence[qubit.drive.name][0]
+        qd_pulses[q] = qd_sequence[0][1]
         if params.pulse_length is not None:
             qd_pulses[q].duration = params.pulse_length
         durations[q] = qd_pulses[q].duration
 
-        ro_pulses[q] = ro_sequence[qubit.probe.name][0]
+        ro_pulses[q] = ro_sequence[0][1]
 
-        sequence[qubit.drive.name].append(qd_pulses[q])
-        sequence[qubit.probe.name].append(Delay(duration=durations[q]))
-        sequence[qubit.probe.name].append(ro_pulses[q])
+        sequence.append((qubit.drive.name, qd_pulses[q]))
+        sequence.append((qubit.probe.name, Delay(duration=durations[q])))
+        sequence.append((qubit.probe.name, ro_pulses[q]))
     return sequence, qd_pulses, ro_pulses, durations
 
 

diff --git a/src/qibocal/protocols/resonator_spectroscopy.py b/src/qibocal/protocols/resonator_spectroscopy.py
@@ -133,7 +133,7 @@ def _acquisition(
     for q in targets:
         qubit = platform.qubits[q]
         ro_sequence = qubit.native_gates.MZ.create_sequence()
-        ro_pulses[q] = ro_sequence[qubit.probe.name][0]
+        ro_pulses[q] = ro_sequence[0][1]
 
         if params.amplitude is not None:
             ro_pulses[q].amplitude = params.amplitude
@@ -149,7 +149,7 @@ def _acquisition(
             attenuation = None
 
         attenuations[q] = attenuation
-        sequence[qubit.probe.name].append(ro_pulses[q])
+        sequence.concatenate(ro_sequence)
 
     # define the parameter to sweep and its range:
     delta_frequency_range = np.arange(