From da1c6ad6fde6430a8be964e2de5af24bd379be17 Mon Sep 17 00:00:00 2001 From: Stavros Efthymiou <35475381+stavros11@users.noreply.github.com> Date: Sun, 18 Aug 2024 13:36:58 +0300 Subject: [PATCH] chore: change PulseSequence import to qibolab.sequence --- src/qibocal/protocols/allxy/allxy.py | 2 +- src/qibocal/protocols/allxy/allxy_drag_pulse_tuning.py | 2 +- .../protocols/allxy/allxy_resonator_depletion_tuning.py | 2 +- src/qibocal/protocols/classification.py | 3 ++- src/qibocal/protocols/coherence/spin_echo.py | 2 +- src/qibocal/protocols/coherence/spin_echo_signal.py | 2 +- src/qibocal/protocols/coherence/t1.py | 2 +- src/qibocal/protocols/coherence/t1_sequences.py | 2 +- src/qibocal/protocols/coherence/t1_signal.py | 3 ++- src/qibocal/protocols/coherence/t2.py | 2 +- src/qibocal/protocols/coherence/t2_sequences.py | 2 +- src/qibocal/protocols/coherence/t2_signal.py | 3 ++- src/qibocal/protocols/coherence/zeno.py | 2 +- src/qibocal/protocols/coherence/zeno_signal.py | 2 +- src/qibocal/protocols/couplers/coupler_chevron.py | 2 +- src/qibocal/protocols/couplers/coupler_qubit_spectroscopy.py | 2 +- .../protocols/couplers/coupler_resonator_spectroscopy.py | 2 +- src/qibocal/protocols/dispersive_shift.py | 2 +- src/qibocal/protocols/dispersive_shift_qutrit.py | 2 +- src/qibocal/protocols/drag.py | 2 +- src/qibocal/protocols/fast_reset/fast_reset.py | 2 +- src/qibocal/protocols/flipping.py | 2 +- src/qibocal/protocols/flipping_signal.py | 2 +- src/qibocal/protocols/flux_dependence/qubit_crosstalk.py | 2 +- src/qibocal/protocols/flux_dependence/qubit_flux_dependence.py | 2 +- src/qibocal/protocols/flux_dependence/qubit_flux_tracking.py | 2 +- src/qibocal/protocols/flux_dependence/resonator_crosstalk.py | 2 +- .../protocols/flux_dependence/resonator_flux_dependence.py | 2 +- src/qibocal/protocols/qubit_power_spectroscopy.py | 2 +- src/qibocal/protocols/qubit_spectroscopy.py | 2 +- src/qibocal/protocols/qubit_spectroscopy_ef.py | 2 +- src/qibocal/protocols/qutrit_classification.py | 2 +- src/qibocal/protocols/rabi/ef.py | 2 +- src/qibocal/protocols/rabi/utils.py | 3 ++- src/qibocal/protocols/ramsey/ramsey.py | 2 +- src/qibocal/protocols/ramsey/ramsey_signal.py | 2 +- src/qibocal/protocols/ramsey/utils.py | 2 +- src/qibocal/protocols/readout_characterization.py | 2 +- src/qibocal/protocols/readout_mitigation_matrix.py | 2 +- .../protocols/readout_optimization/resonator_amplitude.py | 2 +- .../protocols/readout_optimization/resonator_frequency.py | 2 +- src/qibocal/protocols/resonator_punchout.py | 2 +- src/qibocal/protocols/resonator_punchout_attenuation.py | 2 +- src/qibocal/protocols/resonator_spectroscopy.py | 2 +- .../signal_experiments/calibrate_state_discrimination.py | 2 +- .../protocols/signal_experiments/time_of_flight_readout.py | 2 +- src/qibocal/protocols/two_qubit_interaction/chevron/utils.py | 2 +- src/qibocal/protocols/two_qubit_interaction/chsh/pulses.py | 2 +- .../protocols/two_qubit_interaction/virtual_z_phases.py | 3 ++- 49 files changed, 54 insertions(+), 49 deletions(-) diff --git a/src/qibocal/protocols/allxy/allxy.py b/src/qibocal/protocols/allxy/allxy.py index 3c52b4f72..3e824f20c 100644 --- a/src/qibocal/protocols/allxy/allxy.py +++ b/src/qibocal/protocols/allxy/allxy.py @@ -5,8 +5,8 @@ import plotly.graph_objects as go from qibolab import AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibocal.auto.operation import Data, Parameters, Results, Routine diff --git a/src/qibocal/protocols/allxy/allxy_drag_pulse_tuning.py b/src/qibocal/protocols/allxy/allxy_drag_pulse_tuning.py index df76e1ca1..7b294bf2f 100644 --- a/src/qibocal/protocols/allxy/allxy_drag_pulse_tuning.py +++ b/src/qibocal/protocols/allxy/allxy_drag_pulse_tuning.py @@ -6,8 +6,8 @@ import plotly.graph_objects as go from qibolab import AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibocal.auto.operation import Data, Parameters, Results, Routine diff --git a/src/qibocal/protocols/allxy/allxy_resonator_depletion_tuning.py b/src/qibocal/protocols/allxy/allxy_resonator_depletion_tuning.py index 6807ab993..5baace6e5 100644 --- a/src/qibocal/protocols/allxy/allxy_resonator_depletion_tuning.py +++ b/src/qibocal/protocols/allxy/allxy_resonator_depletion_tuning.py @@ -6,8 +6,8 @@ import plotly.graph_objects as go from qibolab import AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibocal.auto.operation import Data, Parameters, Results, Routine diff --git a/src/qibocal/protocols/classification.py b/src/qibocal/protocols/classification.py index 285e84436..4f56bc772 100644 --- a/src/qibocal/protocols/classification.py +++ b/src/qibocal/protocols/classification.py @@ -9,8 +9,9 @@ import plotly.graph_objects as go from qibolab import AcquisitionType, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import Delay, PulseSequence +from qibolab.pulses import Delay from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from sklearn.metrics import roc_auc_score, roc_curve from qibocal import update diff --git a/src/qibocal/protocols/coherence/spin_echo.py b/src/qibocal/protocols/coherence/spin_echo.py index 20e8fb042..0de75b494 100644 --- a/src/qibocal/protocols/coherence/spin_echo.py +++ b/src/qibocal/protocols/coherence/spin_echo.py @@ -6,8 +6,8 @@ import plotly.graph_objects as go from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibocal.auto.operation import Routine diff --git a/src/qibocal/protocols/coherence/spin_echo_signal.py b/src/qibocal/protocols/coherence/spin_echo_signal.py index 94a852f01..218a8987e 100644 --- a/src/qibocal/protocols/coherence/spin_echo_signal.py +++ b/src/qibocal/protocols/coherence/spin_echo_signal.py @@ -6,8 +6,8 @@ import plotly.graph_objects as go from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibocal import update from qibocal.auto.operation import Parameters, Results, Routine diff --git a/src/qibocal/protocols/coherence/t1.py b/src/qibocal/protocols/coherence/t1.py index 54b99ee93..342610dde 100644 --- a/src/qibocal/protocols/coherence/t1.py +++ b/src/qibocal/protocols/coherence/t1.py @@ -6,8 +6,8 @@ import plotly.graph_objects as go from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal.auto.operation import Data, Routine diff --git a/src/qibocal/protocols/coherence/t1_sequences.py b/src/qibocal/protocols/coherence/t1_sequences.py index d932e3acb..1945fcce7 100644 --- a/src/qibocal/protocols/coherence/t1_sequences.py +++ b/src/qibocal/protocols/coherence/t1_sequences.py @@ -1,8 +1,8 @@ import numpy as np from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibocal.auto.operation import Routine diff --git a/src/qibocal/protocols/coherence/t1_signal.py b/src/qibocal/protocols/coherence/t1_signal.py index 569dee6f6..5e99d4e7c 100644 --- a/src/qibocal/protocols/coherence/t1_signal.py +++ b/src/qibocal/protocols/coherence/t1_signal.py @@ -6,8 +6,9 @@ import plotly.graph_objects as go from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import Delay, PulseSequence +from qibolab.pulses import Delay from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal import update diff --git a/src/qibocal/protocols/coherence/t2.py b/src/qibocal/protocols/coherence/t2.py index 0b2be1f16..dc494b506 100644 --- a/src/qibocal/protocols/coherence/t2.py +++ b/src/qibocal/protocols/coherence/t2.py @@ -5,8 +5,8 @@ import plotly.graph_objects as go from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal.auto.operation import Routine diff --git a/src/qibocal/protocols/coherence/t2_sequences.py b/src/qibocal/protocols/coherence/t2_sequences.py index 85a38159a..6461f3bef 100644 --- a/src/qibocal/protocols/coherence/t2_sequences.py +++ b/src/qibocal/protocols/coherence/t2_sequences.py @@ -1,8 +1,8 @@ import numpy as np from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibocal.auto.operation import Routine diff --git a/src/qibocal/protocols/coherence/t2_signal.py b/src/qibocal/protocols/coherence/t2_signal.py index 17127a817..5c1486239 100644 --- a/src/qibocal/protocols/coherence/t2_signal.py +++ b/src/qibocal/protocols/coherence/t2_signal.py @@ -5,8 +5,9 @@ import plotly.graph_objects as go from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import Delay, PulseSequence +from qibolab.pulses import Delay from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal import update diff --git a/src/qibocal/protocols/coherence/zeno.py b/src/qibocal/protocols/coherence/zeno.py index 42561b60c..9d440a72e 100644 --- a/src/qibocal/protocols/coherence/zeno.py +++ b/src/qibocal/protocols/coherence/zeno.py @@ -5,8 +5,8 @@ import plotly.graph_objects as go from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibocal.auto.operation import Routine diff --git a/src/qibocal/protocols/coherence/zeno_signal.py b/src/qibocal/protocols/coherence/zeno_signal.py index 1d0240eeb..fc232204f 100644 --- a/src/qibocal/protocols/coherence/zeno_signal.py +++ b/src/qibocal/protocols/coherence/zeno_signal.py @@ -5,8 +5,8 @@ import plotly.graph_objects as go from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibocal import update from qibocal.auto.operation import Data, Parameters, Results, Routine diff --git a/src/qibocal/protocols/couplers/coupler_chevron.py b/src/qibocal/protocols/couplers/coupler_chevron.py index 2a5195dd2..e4037438f 100644 --- a/src/qibocal/protocols/couplers/coupler_chevron.py +++ b/src/qibocal/protocols/couplers/coupler_chevron.py @@ -4,8 +4,8 @@ import numpy as np from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitPairId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal.auto.operation import Results, Routine diff --git a/src/qibocal/protocols/couplers/coupler_qubit_spectroscopy.py b/src/qibocal/protocols/couplers/coupler_qubit_spectroscopy.py index 8b5cb1c15..ad46dad4a 100644 --- a/src/qibocal/protocols/couplers/coupler_qubit_spectroscopy.py +++ b/src/qibocal/protocols/couplers/coupler_qubit_spectroscopy.py @@ -3,8 +3,8 @@ import numpy as np from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitPairId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal.auto.operation import Routine diff --git a/src/qibocal/protocols/couplers/coupler_resonator_spectroscopy.py b/src/qibocal/protocols/couplers/coupler_resonator_spectroscopy.py index 9848a2a8c..1e899ec2c 100644 --- a/src/qibocal/protocols/couplers/coupler_resonator_spectroscopy.py +++ b/src/qibocal/protocols/couplers/coupler_resonator_spectroscopy.py @@ -1,8 +1,8 @@ import numpy as np from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitPairId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal.auto.operation import Routine diff --git a/src/qibocal/protocols/dispersive_shift.py b/src/qibocal/protocols/dispersive_shift.py index 19d6ff05f..9c9dabf3b 100644 --- a/src/qibocal/protocols/dispersive_shift.py +++ b/src/qibocal/protocols/dispersive_shift.py @@ -6,8 +6,8 @@ from plotly.subplots import make_subplots from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal import update diff --git a/src/qibocal/protocols/dispersive_shift_qutrit.py b/src/qibocal/protocols/dispersive_shift_qutrit.py index 79545826c..75aa04ea5 100644 --- a/src/qibocal/protocols/dispersive_shift_qutrit.py +++ b/src/qibocal/protocols/dispersive_shift_qutrit.py @@ -6,8 +6,8 @@ from plotly.subplots import make_subplots from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal.auto.operation import Results, Routine diff --git a/src/qibocal/protocols/drag.py b/src/qibocal/protocols/drag.py index d915d78bd..efc6dd9e5 100644 --- a/src/qibocal/protocols/drag.py +++ b/src/qibocal/protocols/drag.py @@ -6,8 +6,8 @@ import plotly.graph_objects as go from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from scipy.optimize import curve_fit from qibocal import update diff --git a/src/qibocal/protocols/fast_reset/fast_reset.py b/src/qibocal/protocols/fast_reset/fast_reset.py index a6081b424..853d11933 100644 --- a/src/qibocal/protocols/fast_reset/fast_reset.py +++ b/src/qibocal/protocols/fast_reset/fast_reset.py @@ -6,8 +6,8 @@ from plotly.subplots import make_subplots from qibolab import ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibocal.auto.operation import Data, Parameters, Results, Routine from qibocal.protocols.utils import table_dict, table_html diff --git a/src/qibocal/protocols/flipping.py b/src/qibocal/protocols/flipping.py index 981be1b08..44f19484b 100644 --- a/src/qibocal/protocols/flipping.py +++ b/src/qibocal/protocols/flipping.py @@ -5,8 +5,8 @@ import plotly.graph_objects as go from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from scipy.optimize import curve_fit from qibocal.auto.operation import Routine diff --git a/src/qibocal/protocols/flipping_signal.py b/src/qibocal/protocols/flipping_signal.py index 33e7900c4..4030bf285 100644 --- a/src/qibocal/protocols/flipping_signal.py +++ b/src/qibocal/protocols/flipping_signal.py @@ -6,8 +6,8 @@ import plotly.graph_objects as go from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from scipy.optimize import curve_fit from qibocal import update diff --git a/src/qibocal/protocols/flux_dependence/qubit_crosstalk.py b/src/qibocal/protocols/flux_dependence/qubit_crosstalk.py index dac8d8c8c..ffdbf18aa 100644 --- a/src/qibocal/protocols/flux_dependence/qubit_crosstalk.py +++ b/src/qibocal/protocols/flux_dependence/qubit_crosstalk.py @@ -5,8 +5,8 @@ import numpy.typing as npt from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from scipy.optimize import curve_fit diff --git a/src/qibocal/protocols/flux_dependence/qubit_flux_dependence.py b/src/qibocal/protocols/flux_dependence/qubit_flux_dependence.py index e87983f05..560e7ee95 100644 --- a/src/qibocal/protocols/flux_dependence/qubit_flux_dependence.py +++ b/src/qibocal/protocols/flux_dependence/qubit_flux_dependence.py @@ -5,8 +5,8 @@ import numpy.typing as npt from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from scipy.optimize import curve_fit diff --git a/src/qibocal/protocols/flux_dependence/qubit_flux_tracking.py b/src/qibocal/protocols/flux_dependence/qubit_flux_tracking.py index a4f2ef407..bf325be3f 100644 --- a/src/qibocal/protocols/flux_dependence/qubit_flux_tracking.py +++ b/src/qibocal/protocols/flux_dependence/qubit_flux_tracking.py @@ -3,8 +3,8 @@ import numpy as np from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal.auto.operation import Routine diff --git a/src/qibocal/protocols/flux_dependence/resonator_crosstalk.py b/src/qibocal/protocols/flux_dependence/resonator_crosstalk.py index 8933f796b..3c2d1b9b1 100644 --- a/src/qibocal/protocols/flux_dependence/resonator_crosstalk.py +++ b/src/qibocal/protocols/flux_dependence/resonator_crosstalk.py @@ -5,8 +5,8 @@ import numpy.typing as npt from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from scipy.optimize import curve_fit diff --git a/src/qibocal/protocols/flux_dependence/resonator_flux_dependence.py b/src/qibocal/protocols/flux_dependence/resonator_flux_dependence.py index 415a15238..f16118036 100644 --- a/src/qibocal/protocols/flux_dependence/resonator_flux_dependence.py +++ b/src/qibocal/protocols/flux_dependence/resonator_flux_dependence.py @@ -5,8 +5,8 @@ import numpy.typing as npt from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from scipy.optimize import curve_fit diff --git a/src/qibocal/protocols/qubit_power_spectroscopy.py b/src/qibocal/protocols/qubit_power_spectroscopy.py index 5b77172bb..2fe470cb4 100644 --- a/src/qibocal/protocols/qubit_power_spectroscopy.py +++ b/src/qibocal/protocols/qubit_power_spectroscopy.py @@ -6,8 +6,8 @@ from plotly.subplots import make_subplots from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal.auto.operation import Parameters, Results, Routine diff --git a/src/qibocal/protocols/qubit_spectroscopy.py b/src/qibocal/protocols/qubit_spectroscopy.py index ae60f93f7..9f632f56e 100644 --- a/src/qibocal/protocols/qubit_spectroscopy.py +++ b/src/qibocal/protocols/qubit_spectroscopy.py @@ -3,8 +3,8 @@ import numpy as np from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal import update diff --git a/src/qibocal/protocols/qubit_spectroscopy_ef.py b/src/qibocal/protocols/qubit_spectroscopy_ef.py index 72ac82f86..16df927e1 100644 --- a/src/qibocal/protocols/qubit_spectroscopy_ef.py +++ b/src/qibocal/protocols/qubit_spectroscopy_ef.py @@ -2,8 +2,8 @@ import numpy as np from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal import update diff --git a/src/qibocal/protocols/qutrit_classification.py b/src/qibocal/protocols/qutrit_classification.py index c7a450667..ec9d85c22 100644 --- a/src/qibocal/protocols/qutrit_classification.py +++ b/src/qibocal/protocols/qutrit_classification.py @@ -4,8 +4,8 @@ import numpy as np from qibolab import AcquisitionType, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibocal.auto.operation import Routine from qibocal.fitting.classifier import run diff --git a/src/qibocal/protocols/rabi/ef.py b/src/qibocal/protocols/rabi/ef.py index 5797daf7c..b1dcb281f 100644 --- a/src/qibocal/protocols/rabi/ef.py +++ b/src/qibocal/protocols/rabi/ef.py @@ -3,8 +3,8 @@ import numpy as np from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal import update diff --git a/src/qibocal/protocols/rabi/utils.py b/src/qibocal/protocols/rabi/utils.py index 4e41164ca..0edbe88e7 100644 --- a/src/qibocal/protocols/rabi/utils.py +++ b/src/qibocal/protocols/rabi/utils.py @@ -2,8 +2,9 @@ import plotly.graph_objects as go from plotly.subplots import make_subplots from qibolab.platform import Platform -from qibolab.pulses import Delay, PulseSequence +from qibolab.pulses import Delay from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from scipy.optimize import curve_fit from qibocal.auto.operation import Parameters diff --git a/src/qibocal/protocols/ramsey/ramsey.py b/src/qibocal/protocols/ramsey/ramsey.py index f85244e77..b03e687b6 100644 --- a/src/qibocal/protocols/ramsey/ramsey.py +++ b/src/qibocal/protocols/ramsey/ramsey.py @@ -6,8 +6,8 @@ import plotly.graph_objects as go from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal.auto.operation import Routine diff --git a/src/qibocal/protocols/ramsey/ramsey_signal.py b/src/qibocal/protocols/ramsey/ramsey_signal.py index b6f3aa6d3..dfc5b7f6e 100644 --- a/src/qibocal/protocols/ramsey/ramsey_signal.py +++ b/src/qibocal/protocols/ramsey/ramsey_signal.py @@ -6,8 +6,8 @@ import plotly.graph_objects as go from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal import update diff --git a/src/qibocal/protocols/ramsey/utils.py b/src/qibocal/protocols/ramsey/utils.py index d3c3e95e3..a9a0206af 100644 --- a/src/qibocal/protocols/ramsey/utils.py +++ b/src/qibocal/protocols/ramsey/utils.py @@ -2,8 +2,8 @@ import numpy as np from qibolab import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from scipy.optimize import curve_fit from qibocal.protocols.utils import fallback_period, guess_period diff --git a/src/qibocal/protocols/readout_characterization.py b/src/qibocal/protocols/readout_characterization.py index 04b5928eb..d22469a19 100644 --- a/src/qibocal/protocols/readout_characterization.py +++ b/src/qibocal/protocols/readout_characterization.py @@ -6,8 +6,8 @@ from plotly.subplots import make_subplots from qibolab import AcquisitionType, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibocal import update from qibocal.auto.operation import Data, Parameters, Results, Routine diff --git a/src/qibocal/protocols/readout_mitigation_matrix.py b/src/qibocal/protocols/readout_mitigation_matrix.py index 61397e4f5..e9098dc94 100644 --- a/src/qibocal/protocols/readout_mitigation_matrix.py +++ b/src/qibocal/protocols/readout_mitigation_matrix.py @@ -9,8 +9,8 @@ from qibo.models import Circuit from qibolab import ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibocal.auto.operation import Data, Parameters, Results, Routine from qibocal.auto.transpile import dummy_transpiler, execute_transpiled_circuit diff --git a/src/qibocal/protocols/readout_optimization/resonator_amplitude.py b/src/qibocal/protocols/readout_optimization/resonator_amplitude.py index 6826d2757..67c955884 100644 --- a/src/qibocal/protocols/readout_optimization/resonator_amplitude.py +++ b/src/qibocal/protocols/readout_optimization/resonator_amplitude.py @@ -7,8 +7,8 @@ from plotly.subplots import make_subplots from qibolab import AcquisitionType, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibocal import update from qibocal.auto.operation import Data, Parameters, Results, Routine diff --git a/src/qibocal/protocols/readout_optimization/resonator_frequency.py b/src/qibocal/protocols/readout_optimization/resonator_frequency.py index b31daf1d1..f7e20ac03 100644 --- a/src/qibocal/protocols/readout_optimization/resonator_frequency.py +++ b/src/qibocal/protocols/readout_optimization/resonator_frequency.py @@ -6,8 +6,8 @@ from plotly.subplots import make_subplots from qibolab import AcquisitionType, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal import update diff --git a/src/qibocal/protocols/resonator_punchout.py b/src/qibocal/protocols/resonator_punchout.py index 58ad1dbf6..a54b22fc7 100644 --- a/src/qibocal/protocols/resonator_punchout.py +++ b/src/qibocal/protocols/resonator_punchout.py @@ -7,8 +7,8 @@ from plotly.subplots import make_subplots from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal import update diff --git a/src/qibocal/protocols/resonator_punchout_attenuation.py b/src/qibocal/protocols/resonator_punchout_attenuation.py index 0ff28b693..909c9b783 100644 --- a/src/qibocal/protocols/resonator_punchout_attenuation.py +++ b/src/qibocal/protocols/resonator_punchout_attenuation.py @@ -7,8 +7,8 @@ from plotly.subplots import make_subplots from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal import update diff --git a/src/qibocal/protocols/resonator_spectroscopy.py b/src/qibocal/protocols/resonator_spectroscopy.py index 0bc4f8463..71937b0b8 100644 --- a/src/qibocal/protocols/resonator_spectroscopy.py +++ b/src/qibocal/protocols/resonator_spectroscopy.py @@ -6,9 +6,9 @@ import numpy.typing as npt from _collections_abc import Callable from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId from qibolab.result import magnitude, phase +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from qibocal import update diff --git a/src/qibocal/protocols/signal_experiments/calibrate_state_discrimination.py b/src/qibocal/protocols/signal_experiments/calibrate_state_discrimination.py index 89c02242d..e1d014317 100644 --- a/src/qibocal/protocols/signal_experiments/calibrate_state_discrimination.py +++ b/src/qibocal/protocols/signal_experiments/calibrate_state_discrimination.py @@ -7,8 +7,8 @@ from plotly.subplots import make_subplots from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibocal import update from qibocal.auto.operation import Data, Parameters, Results, Routine diff --git a/src/qibocal/protocols/signal_experiments/time_of_flight_readout.py b/src/qibocal/protocols/signal_experiments/time_of_flight_readout.py index 94356618a..7722d3baa 100644 --- a/src/qibocal/protocols/signal_experiments/time_of_flight_readout.py +++ b/src/qibocal/protocols/signal_experiments/time_of_flight_readout.py @@ -6,8 +6,8 @@ import plotly.graph_objects as go from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitId +from qibolab.sequence import PulseSequence from qibocal.auto.operation import Data, Parameters, Results, Routine from qibocal.protocols.utils import S_TO_NS, table_dict, table_html diff --git a/src/qibocal/protocols/two_qubit_interaction/chevron/utils.py b/src/qibocal/protocols/two_qubit_interaction/chevron/utils.py index 40ea08213..0e6382ae1 100644 --- a/src/qibocal/protocols/two_qubit_interaction/chevron/utils.py +++ b/src/qibocal/protocols/two_qubit_interaction/chevron/utils.py @@ -1,7 +1,7 @@ import numpy as np from qibolab.platform import Platform -from qibolab.pulses import PulseSequence from qibolab.qubits import QubitPairId +from qibolab.sequence import PulseSequence from ..utils import order_pair diff --git a/src/qibocal/protocols/two_qubit_interaction/chsh/pulses.py b/src/qibocal/protocols/two_qubit_interaction/chsh/pulses.py index 3602d88bd..8beabcbc6 100644 --- a/src/qibocal/protocols/two_qubit_interaction/chsh/pulses.py +++ b/src/qibocal/protocols/two_qubit_interaction/chsh/pulses.py @@ -3,7 +3,7 @@ from collections import defaultdict import numpy as np -from qibolab.pulses import PulseSequence +from qibolab.sequence import PulseSequence from .utils import READOUT_BASIS diff --git a/src/qibocal/protocols/two_qubit_interaction/virtual_z_phases.py b/src/qibocal/protocols/two_qubit_interaction/virtual_z_phases.py index 01adbc5d1..8c49bb97a 100644 --- a/src/qibocal/protocols/two_qubit_interaction/virtual_z_phases.py +++ b/src/qibocal/protocols/two_qubit_interaction/virtual_z_phases.py @@ -9,8 +9,9 @@ from plotly.subplots import make_subplots from qibolab import AcquisitionType, AveragingMode, ExecutionParameters from qibolab.platform import Platform -from qibolab.pulses import Pulse, PulseSequence +from qibolab.pulses import Pulse from qibolab.qubits import QubitId, QubitPairId +from qibolab.sequence import PulseSequence from qibolab.sweeper import Parameter, Sweeper, SweeperType from scipy.optimize import curve_fit