Tree routines

runcards/actions_qm.yml

@@ -1,17 +1,17 @@
-platform: qw5q_gold
+platform: dummy
 
 qubits: [0, 1, 2, 3, 4]
 
 format: csv
 
 actions:
 
-  resonator_spectroscopy:
-    freq_width: 40_000_000
-    freq_step: 100_000
-    nshots: 1000
-    relaxation_time: 50
-    software_averages: 1
+  # resonator_spectroscopy:
+  #   freq_width: 40_000_000
+  #   freq_step: 100_000
+  #   nshots: 1000
+  #   relaxation_time: 0
+  #   software_averages: 1
 
   #resonator_punchout:
   #  freq_width: 10_000_000
@@ -33,14 +33,14 @@ actions:
   #  relaxation_time: 50
   #  software_averages: 1
 
-  qubit_spectroscopy:
-    drive_amplitude: 0.005
-    drive_duration: 2000
-    freq_width: 100_000_000
-    freq_step: 100_000
-    nshots: 1000
-    relaxation_time: 20
-    software_averages: 1
+  # qubit_spectroscopy:
+  #   drive_amplitude: 0.005
+  #   drive_duration: 2000
+  #   freq_width: 100_000_000
+  #   freq_step: 100_000
+  #   nshots: 1000
+  #   relaxation_time: 0
+  #   software_averages: 1
 
   #qubit_spectroscopy_flux:
   #  drive_amplitude: 0.005
@@ -53,13 +53,13 @@ actions:
   #  relaxation_time: 20
   #  software_averages: 1
 
-  rabi_pulse_amplitude:
-    pulse_amplitude_start: 0.01
-    pulse_amplitude_end: 2.0
-    pulse_amplitude_step: 0.01
-    software_averages: 1
-    relaxation_time: 50000
-    nshots: 1000
+  # rabi_pulse_amplitude:
+  #   pulse_amplitude_start: 0.01
+  #   pulse_amplitude_end: 2.0
+  #   pulse_amplitude_step: 0.01
+  #   software_averages: 1
+  #   relaxation_time: 0
+  #   nshots: 1000
 
   #rabi_pulse_length:
   #  pulse_duration_start: 16 # minimum 4ns
@@ -108,8 +108,8 @@ actions:
   #   software_averages: 1
   #   points: 10
 
-  #calibrate_qubit_states:
-  #  nshots: 5000
+  # calibrate_qubit_states:
+  #  nshots: 100
 
   #allXY_drag_pulse_tuning:
   #  beta_start: -1

runcards/auto_spectroscopy.yml

@@ -1,40 +1,183 @@
-platform: dummy
+platform: dummy #qw5q_gold_qblox
 
-qubits: [0, 1, 2 ,3 ,4]
+qubits: [0, 1, 2, 3, 4]
 
 format: csv
 
 actions:
-  - id: resonator_spectroscopy
+
+  - id: resonator_spectroscopy high power
     priority: 0
     operation: resonator_spectroscopy
-    next: resonator_punchout
+    main: resonator punchout
     parameters:
-      freq_width: 30_000_000
-      freq_step: 1_000_000
-      amplitude: 0.01
+      freq_width: 10_000_000
+      freq_step: 500_000
+      amplitude: 0.4
+      power_level: high
       nshots: 1024
       relaxation_time: 0
-      software_averages : 1
 
-  - id: resonator_punchout
+  - id: resonator punchout
     priority: 10
     operation: resonator_punchout
+    #main: resonator_spectroscopy low power
     parameters:
-      freq_width: 1_000_000
-      freq_step: 100_000
-      min_amp_factor: 0.01
-      max_amp_factor: 0.9
-      step_amp_factor: 0.02
-      nshots: 1000
+      freq_width: 5_000_000
+      freq_step: 1_000_000
+      min_amp_factor: 0.02
+      max_amp_factor: 2.4
+      step_amp_factor: 0.1
+      nshots: 1
       relaxation_time: 0
-      software_averages: 1
-
-  #   main: first
-  # - id: first
-  #   priority: 100
-  #   main: second
-  # - id: second
-  #   main: third
-  # - id: third
-  #   priority: 50
+
+  # - id: resonator_punchout_attenuation
+  #   priority: 0
+  #   operation: resonator_punchout_attenuation
+  #   # main: resonator_spectroscopy low power
+  #   next: resonator_punchout
+  #   parameters:
+  #     freq_width: 10_000_000
+  #     freq_step: 500_000
+  #     min_att: 4
+  #     max_att: 60
+  #     step_att: 4
+  #     nshots: 1000
+  #     relaxation_time: 0
+
+  # - id: resonator spectroscopy low power
+  #   priority: 0
+  #   operation: resonator_spectroscopy
+  #   #main: qubit_spectroscopy
+  #   parameters:
+  #     freq_width: 10_000_000
+  #     freq_step: 1_000_000
+  #     amplitude: 0.4
+  #     power_level: low
+  #     nshots: 1024
+  #     relaxation_time: 0 #50
+
+  # # - id: resonator flux dependence
+  # #   priority: 10
+  # #   operation: resonator_flux
+  # #   main: qubit spectroscopy
+  # #   parameters:
+  # #     freq_width: 10_000_000
+  # #     freq_step: 500_000
+  # #     bias_width: 0.15
+  # #     bias_step:  0.01
+  # #     fluxlines: qubits
+  # #     nshots: 1000
+  # #     relaxation_time: 0
+
+  # - id: qubit spectroscopy
+  #   priority: 30
+  #   operation: qubit_spectroscopy
+  #   next: rabi
+  #   parameters:
+  #     drive_amplitude: 0.005
+  #     drive_duration: 2000
+  #     freq_width: 100_000_000
+  #     freq_step: 100_000
+  #     nshots: 1000
+  #     relaxation_time: 0
+
+  # # - id: qubit flux dependence
+  # #   priority: 10
+  # #   main: t1
+  # #   operation: qubit_flux
+  # #   parameters:
+  # #     freq_width: 10_000_000
+  # #     freq_step: 500_000
+  # #     bias_width: 0.03 #0.1
+  # #     bias_step:  0.003 # 0.001
+  # #     drive_amplitude: 0.005
+  # #     fluxlines: qubits
+  # #     nshots: 1000
+  # #     relaxation_time: 0
+
+  # - id: rabi
+  #   priority: 0
+  #   operation: rabi_amplitude
+  #   #main: ramsey
+  #   parameters:
+  #     pulse_amplitude_start: 0.01
+  #     pulse_amplitude_end: 2.0
+  #     pulse_amplitude_step: 0.01
+  #     software_averages: 1
+  #     relaxation_time: 0
+  #     nshots: 1000
+
+  # - id: t1
+  #   priority: 0
+  #   operation: t1
+  #   #main: ramsey
+  #   parameters:
+  #     delay_before_readout_start: 16
+  #     delay_before_readout_end: 500
+  #     delay_before_readout_step: 20
+
+  # - id: ramsey
+  #   priority: 0
+  #   operation: ramsey
+  #   # main: ramsey detuned
+  #   parameters:
+  #     delay_between_pulses_start: 16 # must be a multiple of 4 incl 0
+  #     delay_between_pulses_end: 100
+  #     delay_between_pulses_step: 4 # must be a multiple of 4
+
+  # - id: ramsey detuned
+  #   priority: 0
+  #   operation: ramsey
+  #   #main: single shot classification
+  #   parameters:
+  #     n_osc: 10
+  #     delay_between_pulses_start: 16 # must be a multiple of 4 incl 0
+  #     delay_between_pulses_end: 100
+  #     delay_between_pulses_step: 4 # must be a multiple of 4
+
+  # - id: single shot classification
+  #   priority: 0
+  #   # main: allXY
+  #   operation: single_shot_classification
+  #   parameters:
+  #     nshots: 1024
+
+  # - id: allXY
+  #   priority: 0
+  #   operation: allxy
+  #   #main: drag_pulse_tuning
+  #   parameters:
+  #     beta_param: null
+
+  # - id: drag_pulse_tuning
+  #   priority: 0
+  #   operation: drag_pulse_tuning
+  #   #main: spin_echo
+  #   parameters:
+  #     beta_start: -0.1
+  #     beta_end: 0.1
+  #     beta_step: 0.05
+
+  # # - id: allXY 2 #Ideally this should be repeated with the correct beta
+  # #   priority: 10
+  # #   operation: allxy
+  # #   main: drag_pulse_tuning
+  # #   parameters:
+  # #     beta_param: null
+
+  # - id: spin_echo
+  #   priority: 0
+  #   operation: spin_echo
+  #   # main: flipping
+  #   parameters:
+  #     delay_between_pulses_start: 4
+  #     delay_between_pulses_end: 10000
+  #     delay_between_pulses_step: 200
+
+  # - id: flipping
+  #   priority: 10
+  #   operation: flipping
+  #   parameters:
+  #     nflips_max: 2
+  #     nflips_step: 1

runcards/dummy.yml

@@ -6,10 +6,10 @@ format: csv
 
 actions:
 
-  resonator_spectroscopy: # wide
-    qubits: [0,1,2]
-    freq_width: 30_000_000
-    freq_step: 1_000_000
+  # resonator_spectroscopy: # wide
+  #   qubits: [0,1,2]
+  #   freq_width: 30_000_000
+  #   freq_step: 1_000_000
 
 
   # resonator_spectroscopy: # narrow
@@ -157,9 +157,9 @@ actions:
   #   software_averages: 2
   #   points: 5
 
-  # calibrate_qubit_states:
-  #   nshots: 2048
-  #   points: 1
+  calibrate_qubit_states:
+    nshots: 2048
+    points: 1
 
   # allXY:
   #   beta_param: Null

src/qibocal/fitting/methods.py

@@ -1053,8 +1053,8 @@ def calibrate_qubit_states_fit(data, x, y, nshots, qubits):
         iq_state1_translated = iq_state1 - origin
         rotation_angle = np.angle(np.mean(iq_state1_translated))
 
-        iq_state1_rotated = iq_state1 * np.exp(-1j * rotation_angle)
-        iq_state0_rotated = iq_state0 * np.exp(-1j * rotation_angle)
+        iq_state1_rotated = iq_state1_translated * np.exp(-1j * rotation_angle)
+        iq_state0_rotated = iq_state0_translated * np.exp(-1j * rotation_angle)
 
         real_values_state1 = iq_state1_rotated.real
         real_values_state0 = iq_state0_rotated.real
@@ -1076,20 +1076,9 @@ def calibrate_qubit_states_fit(data, x, y, nshots, qubits):
         )
         argmax = np.argmax(cum_distribution_diff)
         threshold = real_values_combined[argmax]
-        errors_state1 = nshots - cum_distribution_state1[argmax]
-        errors_state0 = cum_distribution_state0[argmax]
-        fidelity = cum_distribution_diff[argmax] / nshots
-        assignment_fidelity = 1 - (errors_state1 + errors_state0) / nshots / 2
-        # assignment_fidelity = 1/2 + (cum_distribution_state1[argmax] - cum_distribution_state0[argmax])/nshots/2
 
         results = {
             "rotation_angle": (-rotation_angle * 360 / (2 * np.pi)) % 360,  # in degrees
             "threshold": threshold,
-            "fidelity": fidelity,
-            "assignment_fidelity": assignment_fidelity,
-            "average_state0": iq_mean_state0,
-            "average_state1": iq_mean_state1,
-            "qubit": qubit,
         }
-        parameters.add(results)
     return parameters

src/qibocal/protocols/characterization/__init__.py

@@ -1,9 +1,37 @@
 from enum import Enum
 
+from .allxy.allxy import allxy
+from .allxy.allxy_drag_pulse_tuning import allxy_drag_pulse_tuning
+from .allxy.drag_pulse_tuning import drag_pulse_tuning
+from .classification import single_shot_classification
+from .flipping import flipping
+from .flux_depedence.qubit_flux_dependence import qubit_flux
+from .flux_depedence.resonator_flux_dependence import resonator_flux
+from .qubit_spectroscopy import qubit_spectroscopy
+from .rabi.amplitude import rabi_amplitude
+from .rabi.length import rabi_length
+from .ramsey import ramsey
 from .resonator_punchout import resonator_punchout
+from .resonator_punchout_attenuation import resonator_punchout_attenuation
 from .resonator_spectroscopy import resonator_spectroscopy
+from .spin_echo import spin_echo
+from .t1 import t1
 
 
 class Operation(Enum):
     resonator_spectroscopy = resonator_spectroscopy
     resonator_punchout = resonator_punchout
+    resonator_punchout_attenuation = resonator_punchout_attenuation
+    resonator_flux = resonator_flux
+    qubit_spectroscopy = qubit_spectroscopy
+    qubit_flux = qubit_flux
+    rabi_amplitude = rabi_amplitude
+    rabi_length = rabi_length
+    ramsey = ramsey
+    t1 = t1
+    single_shot_classification = single_shot_classification
+    spin_echo = spin_echo
+    allxy = allxy
+    allxy_drag_pulse_tuning = allxy_drag_pulse_tuning
+    drag_pulse_tuning = drag_pulse_tuning
+    flipping = flipping