diff --git a/src/qibocal/auto/operation.py b/src/qibocal/auto/operation.py index 2f3c8502e..83e192acd 100644 --- a/src/qibocal/auto/operation.py +++ b/src/qibocal/auto/operation.py @@ -9,7 +9,7 @@ import numpy as np import numpy.typing as npt -from qibolab import AcquisitionType, AveragingMode, ExecutionParameters, Platform, Qubit +from qibolab import AcquisitionType, AveragingMode, Platform, Qubit from qibocal.config import log diff --git a/src/qibocal/protocols/allxy/allxy.py b/src/qibocal/protocols/allxy/allxy.py index 15527bd6f..d2c89b935 100644 --- a/src/qibocal/protocols/allxy/allxy.py +++ b/src/qibocal/protocols/allxy/allxy.py @@ -3,7 +3,7 @@ import numpy as np import numpy.typing as npt import plotly.graph_objects as go -from qibolab import AveragingMode, ExecutionParameters, Platform, PulseSequence +from qibolab import AveragingMode, Platform, PulseSequence from qibocal.auto.operation import Data, Parameters, QubitId, 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 d15487991..deb4ee6b7 100644 --- a/src/qibocal/protocols/allxy/allxy_drag_pulse_tuning.py +++ b/src/qibocal/protocols/allxy/allxy_drag_pulse_tuning.py @@ -4,7 +4,7 @@ import numpy as np import numpy.typing as npt import plotly.graph_objects as go -from qibolab import AveragingMode, ExecutionParameters, Platform, PulseSequence +from qibolab import AveragingMode, Platform, PulseSequence from qibocal.auto.operation import Data, Parameters, QubitId, 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 a5b70be6e..11de25b95 100644 --- a/src/qibocal/protocols/allxy/allxy_resonator_depletion_tuning.py +++ b/src/qibocal/protocols/allxy/allxy_resonator_depletion_tuning.py @@ -4,7 +4,7 @@ import numpy as np import numpy.typing as npt import plotly.graph_objects as go -from qibolab import AveragingMode, ExecutionParameters, Platform, PulseSequence +from qibolab import AveragingMode, Platform, PulseSequence from qibocal.auto.operation import Data, Parameters, QubitId, Results, Routine diff --git a/src/qibocal/protocols/classification.py b/src/qibocal/protocols/classification.py index 0ccb0e049..59eb3dc9a 100644 --- a/src/qibocal/protocols/classification.py +++ b/src/qibocal/protocols/classification.py @@ -7,7 +7,7 @@ import numpy.typing as npt import pandas as pd import plotly.graph_objects as go -from qibolab import AcquisitionType, ExecutionParameters, Platform, PulseSequence +from qibolab import AcquisitionType, Platform, PulseSequence from sklearn.metrics import roc_auc_score, roc_curve from qibocal import update @@ -217,18 +217,18 @@ def _acquisition( savedir=params.savedir, ) - options = ExecutionParameters( + options = dict( nshots=params.nshots, relaxation_time=params.relaxation_time, acquisition_type=AcquisitionType.INTEGRATION, ) if params.unrolling: - results = platform.execute(sequences, options) + results = platform.execute(sequences, **options) else: results = {} for sequence in sequences: - results.update(platform.execute([sequence], options)) + results.update(platform.execute([sequence], **options)) for state, ro_pulses in zip([0, 1], all_ro_pulses): for qubit in targets: diff --git a/src/qibocal/protocols/coherence/spin_echo.py b/src/qibocal/protocols/coherence/spin_echo.py index c359cf7d2..8193a6866 100644 --- a/src/qibocal/protocols/coherence/spin_echo.py +++ b/src/qibocal/protocols/coherence/spin_echo.py @@ -4,13 +4,7 @@ import numpy as np import plotly.graph_objects as go -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Platform, - PulseSequence, -) +from qibolab import AcquisitionType, AveragingMode, Platform, PulseSequence from qibocal.auto.operation import QubitId, Routine diff --git a/src/qibocal/protocols/coherence/spin_echo_signal.py b/src/qibocal/protocols/coherence/spin_echo_signal.py index f5966aba6..e8a7d93bd 100644 --- a/src/qibocal/protocols/coherence/spin_echo_signal.py +++ b/src/qibocal/protocols/coherence/spin_echo_signal.py @@ -4,13 +4,7 @@ import numpy as np import plotly.graph_objects as go -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Platform, - PulseSequence, -) +from qibolab import AcquisitionType, AveragingMode, Platform, PulseSequence from qibocal import update from qibocal.auto.operation import Parameters, QubitId, Results, Routine diff --git a/src/qibocal/protocols/coherence/t1.py b/src/qibocal/protocols/coherence/t1.py index 99e4aeaa7..147261ce5 100644 --- a/src/qibocal/protocols/coherence/t1.py +++ b/src/qibocal/protocols/coherence/t1.py @@ -7,7 +7,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/coherence/t1_sequences.py b/src/qibocal/protocols/coherence/t1_sequences.py index 9992d966e..631684ddb 100644 --- a/src/qibocal/protocols/coherence/t1_sequences.py +++ b/src/qibocal/protocols/coherence/t1_sequences.py @@ -1,11 +1,5 @@ import numpy as np -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Platform, - PulseSequence, -) +from qibolab import AcquisitionType, AveragingMode, Platform, PulseSequence from qibocal.auto.operation import QubitId, Routine diff --git a/src/qibocal/protocols/coherence/t1_signal.py b/src/qibocal/protocols/coherence/t1_signal.py index 57fad160e..a51c098ad 100644 --- a/src/qibocal/protocols/coherence/t1_signal.py +++ b/src/qibocal/protocols/coherence/t1_signal.py @@ -8,7 +8,6 @@ AcquisitionType, AveragingMode, Delay, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/coherence/t2.py b/src/qibocal/protocols/coherence/t2.py index 5ca3c1337..5877a66c3 100644 --- a/src/qibocal/protocols/coherence/t2.py +++ b/src/qibocal/protocols/coherence/t2.py @@ -6,7 +6,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/coherence/t2_sequences.py b/src/qibocal/protocols/coherence/t2_sequences.py index 5d56bc35d..02cf54d40 100644 --- a/src/qibocal/protocols/coherence/t2_sequences.py +++ b/src/qibocal/protocols/coherence/t2_sequences.py @@ -1,11 +1,5 @@ import numpy as np -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Platform, - PulseSequence, -) +from qibolab import AcquisitionType, AveragingMode, Platform, PulseSequence from qibocal.auto.operation import QubitId, Routine diff --git a/src/qibocal/protocols/coherence/t2_signal.py b/src/qibocal/protocols/coherence/t2_signal.py index bc39e8361..1a40649ee 100644 --- a/src/qibocal/protocols/coherence/t2_signal.py +++ b/src/qibocal/protocols/coherence/t2_signal.py @@ -7,7 +7,6 @@ AcquisitionType, AveragingMode, Delay, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/coherence/zeno.py b/src/qibocal/protocols/coherence/zeno.py index c3873d66d..8ae0e8f58 100644 --- a/src/qibocal/protocols/coherence/zeno.py +++ b/src/qibocal/protocols/coherence/zeno.py @@ -3,13 +3,7 @@ import numpy as np import plotly.graph_objects as go -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Platform, - PulseSequence, -) +from qibolab import AcquisitionType, AveragingMode, Platform, PulseSequence from qibocal.auto.operation import QubitId, Routine diff --git a/src/qibocal/protocols/coherence/zeno_signal.py b/src/qibocal/protocols/coherence/zeno_signal.py index 19a24bb4e..126b24e4e 100644 --- a/src/qibocal/protocols/coherence/zeno_signal.py +++ b/src/qibocal/protocols/coherence/zeno_signal.py @@ -3,13 +3,7 @@ import numpy as np import numpy.typing as npt import plotly.graph_objects as go -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Platform, - PulseSequence, -) +from qibolab import AcquisitionType, AveragingMode, Platform, PulseSequence from qibocal import update from qibocal.auto.operation import Data, Parameters, QubitId, Results, Routine diff --git a/src/qibocal/protocols/couplers/coupler_chevron.py b/src/qibocal/protocols/couplers/coupler_chevron.py index b2691f2e6..2ea9dd2d7 100644 --- a/src/qibocal/protocols/couplers/coupler_chevron.py +++ b/src/qibocal/protocols/couplers/coupler_chevron.py @@ -5,7 +5,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/couplers/coupler_qubit_spectroscopy.py b/src/qibocal/protocols/couplers/coupler_qubit_spectroscopy.py index f028ab707..a49217324 100644 --- a/src/qibocal/protocols/couplers/coupler_qubit_spectroscopy.py +++ b/src/qibocal/protocols/couplers/coupler_qubit_spectroscopy.py @@ -4,7 +4,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/couplers/coupler_resonator_spectroscopy.py b/src/qibocal/protocols/couplers/coupler_resonator_spectroscopy.py index 034a0b74a..a1eb18bff 100644 --- a/src/qibocal/protocols/couplers/coupler_resonator_spectroscopy.py +++ b/src/qibocal/protocols/couplers/coupler_resonator_spectroscopy.py @@ -2,7 +2,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/dispersive_shift.py b/src/qibocal/protocols/dispersive_shift.py index 0d20fdaf2..0847e3407 100644 --- a/src/qibocal/protocols/dispersive_shift.py +++ b/src/qibocal/protocols/dispersive_shift.py @@ -7,7 +7,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/dispersive_shift_qutrit.py b/src/qibocal/protocols/dispersive_shift_qutrit.py index 520d80488..d000df6ff 100644 --- a/src/qibocal/protocols/dispersive_shift_qutrit.py +++ b/src/qibocal/protocols/dispersive_shift_qutrit.py @@ -7,7 +7,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/drag.py b/src/qibocal/protocols/drag.py index bbbb21065..e892863d6 100644 --- a/src/qibocal/protocols/drag.py +++ b/src/qibocal/protocols/drag.py @@ -4,13 +4,7 @@ import numpy as np import numpy.typing as npt import plotly.graph_objects as go -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Platform, - PulseSequence, -) +from qibolab import AcquisitionType, AveragingMode, Platform, 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 216457e78..a46354332 100644 --- a/src/qibocal/protocols/fast_reset/fast_reset.py +++ b/src/qibocal/protocols/fast_reset/fast_reset.py @@ -4,7 +4,7 @@ import numpy.typing as npt import plotly.graph_objects as go from plotly.subplots import make_subplots -from qibolab import ExecutionParameters, Platform, PulseSequence +from qibolab import Platform, PulseSequence from qibocal.auto.operation import Data, Parameters, QubitId, 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 c9efef4be..01e43de6e 100644 --- a/src/qibocal/protocols/flipping.py +++ b/src/qibocal/protocols/flipping.py @@ -3,13 +3,7 @@ import numpy as np import numpy.typing as npt import plotly.graph_objects as go -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Platform, - PulseSequence, -) +from qibolab import AcquisitionType, AveragingMode, Platform, PulseSequence from scipy.optimize import curve_fit from qibocal.auto.operation import QubitId, Routine diff --git a/src/qibocal/protocols/flipping_signal.py b/src/qibocal/protocols/flipping_signal.py index 1cb5b15df..aac719761 100644 --- a/src/qibocal/protocols/flipping_signal.py +++ b/src/qibocal/protocols/flipping_signal.py @@ -4,13 +4,7 @@ import numpy as np import numpy.typing as npt import plotly.graph_objects as go -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Platform, - PulseSequence, -) +from qibolab import AcquisitionType, AveragingMode, Platform, 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 1f3eee4f0..2c999ecff 100644 --- a/src/qibocal/protocols/flux_dependence/qubit_crosstalk.py +++ b/src/qibocal/protocols/flux_dependence/qubit_crosstalk.py @@ -6,7 +6,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/flux_dependence/qubit_flux_dependence.py b/src/qibocal/protocols/flux_dependence/qubit_flux_dependence.py index 6c354066f..b9a704d4b 100644 --- a/src/qibocal/protocols/flux_dependence/qubit_flux_dependence.py +++ b/src/qibocal/protocols/flux_dependence/qubit_flux_dependence.py @@ -6,7 +6,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/flux_dependence/qubit_flux_tracking.py b/src/qibocal/protocols/flux_dependence/qubit_flux_tracking.py index a2a75c197..3abad5040 100644 --- a/src/qibocal/protocols/flux_dependence/qubit_flux_tracking.py +++ b/src/qibocal/protocols/flux_dependence/qubit_flux_tracking.py @@ -4,7 +4,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/flux_dependence/resonator_crosstalk.py b/src/qibocal/protocols/flux_dependence/resonator_crosstalk.py index 8858b6512..4eb905990 100644 --- a/src/qibocal/protocols/flux_dependence/resonator_crosstalk.py +++ b/src/qibocal/protocols/flux_dependence/resonator_crosstalk.py @@ -6,7 +6,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/flux_dependence/resonator_flux_dependence.py b/src/qibocal/protocols/flux_dependence/resonator_flux_dependence.py index 92e4264ca..0e225ae4c 100644 --- a/src/qibocal/protocols/flux_dependence/resonator_flux_dependence.py +++ b/src/qibocal/protocols/flux_dependence/resonator_flux_dependence.py @@ -6,7 +6,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/qubit_power_spectroscopy.py b/src/qibocal/protocols/qubit_power_spectroscopy.py index 4860eeb8a..ba83bcc81 100644 --- a/src/qibocal/protocols/qubit_power_spectroscopy.py +++ b/src/qibocal/protocols/qubit_power_spectroscopy.py @@ -7,7 +7,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/qutrit_classification.py b/src/qibocal/protocols/qutrit_classification.py index 210433dce..c2bca7dc6 100644 --- a/src/qibocal/protocols/qutrit_classification.py +++ b/src/qibocal/protocols/qutrit_classification.py @@ -2,7 +2,7 @@ from typing import Optional import numpy as np -from qibolab import AcquisitionType, ExecutionParameters, Platform, PulseSequence +from qibolab import AcquisitionType, Platform, PulseSequence from qibocal.auto.operation import QubitId, Routine from qibocal.fitting.classifier import run diff --git a/src/qibocal/protocols/rabi/amplitude.py b/src/qibocal/protocols/rabi/amplitude.py index 941e94630..1cd6ddda0 100644 --- a/src/qibocal/protocols/rabi/amplitude.py +++ b/src/qibocal/protocols/rabi/amplitude.py @@ -2,14 +2,7 @@ import numpy as np import numpy.typing as npt -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Parameter, - Platform, - Sweeper, -) +from qibolab import AcquisitionType, AveragingMode, Parameter, Platform, Sweeper from qibocal import update from qibocal.auto.operation import Data, QubitId, Routine @@ -73,13 +66,11 @@ def _acquisition( # sweep the parameter results = platform.execute( [sequence], - ExecutionParameters( - nshots=params.nshots, - relaxation_time=params.relaxation_time, - acquisition_type=AcquisitionType.DISCRIMINATION, - averaging_mode=AveragingMode.SINGLESHOT, - ), [[sweeper]], + nshots=params.nshots, + relaxation_time=params.relaxation_time, + acquisition_type=AcquisitionType.DISCRIMINATION, + averaging_mode=AveragingMode.SINGLESHOT, ) for qubit in targets: prob = probability(results[ro_pulses[qubit].id], state=1) diff --git a/src/qibocal/protocols/rabi/amplitude_frequency.py b/src/qibocal/protocols/rabi/amplitude_frequency.py index 253a71d11..ee6dd8bd5 100644 --- a/src/qibocal/protocols/rabi/amplitude_frequency.py +++ b/src/qibocal/protocols/rabi/amplitude_frequency.py @@ -6,14 +6,7 @@ import numpy.typing as npt import plotly.graph_objects as go from plotly.subplots import make_subplots -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Parameter, - Platform, - Sweeper, -) +from qibolab import AcquisitionType, AveragingMode, Parameter, Platform, Sweeper from qibocal.auto.operation import QubitId, Routine from qibocal.config import log diff --git a/src/qibocal/protocols/rabi/amplitude_frequency_signal.py b/src/qibocal/protocols/rabi/amplitude_frequency_signal.py index d4741f273..e19d360c6 100644 --- a/src/qibocal/protocols/rabi/amplitude_frequency_signal.py +++ b/src/qibocal/protocols/rabi/amplitude_frequency_signal.py @@ -7,14 +7,7 @@ import numpy.typing as npt import plotly.graph_objects as go from plotly.subplots import make_subplots -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Parameter, - Platform, - Sweeper, -) +from qibolab import AcquisitionType, AveragingMode, Parameter, Platform, Sweeper from qibocal import update from qibocal.auto.operation import Data, Parameters, QubitId, Routine diff --git a/src/qibocal/protocols/rabi/amplitude_signal.py b/src/qibocal/protocols/rabi/amplitude_signal.py index 173797575..76bbbeab6 100644 --- a/src/qibocal/protocols/rabi/amplitude_signal.py +++ b/src/qibocal/protocols/rabi/amplitude_signal.py @@ -3,14 +3,7 @@ import numpy as np import numpy.typing as npt -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Parameter, - Platform, - Sweeper, -) +from qibolab import AcquisitionType, AveragingMode, Parameter, Platform, Sweeper from qibocal import update from qibocal.auto.operation import Data, Parameters, QubitId, Results, Routine @@ -88,13 +81,11 @@ def _acquisition( # sweep the parameter results = platform.execute( [sequence], - ExecutionParameters( - nshots=params.nshots, - relaxation_time=params.relaxation_time, - acquisition_type=AcquisitionType.INTEGRATION, - averaging_mode=AveragingMode.CYCLIC, - ), [[sweeper]], + nshots=params.nshots, + relaxation_time=params.relaxation_time, + acquisition_type=AcquisitionType.INTEGRATION, + averaging_mode=AveragingMode.CYCLIC, ) for qubit in targets: result = results[ro_pulses[qubit].id] diff --git a/src/qibocal/protocols/rabi/ef.py b/src/qibocal/protocols/rabi/ef.py index a583eaade..3cb64506b 100644 --- a/src/qibocal/protocols/rabi/ef.py +++ b/src/qibocal/protocols/rabi/ef.py @@ -4,7 +4,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/rabi/length.py b/src/qibocal/protocols/rabi/length.py index d1b5f03a3..e116153bd 100644 --- a/src/qibocal/protocols/rabi/length.py +++ b/src/qibocal/protocols/rabi/length.py @@ -3,14 +3,7 @@ import numpy as np import numpy.typing as npt -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Parameter, - Platform, - Sweeper, -) +from qibolab import AcquisitionType, AveragingMode, Parameter, Platform, Sweeper from qibocal import update from qibocal.auto.operation import Parameters, QubitId, Routine @@ -97,13 +90,11 @@ def _acquisition( # execute the sweep results = platform.execute( [sequence], - ExecutionParameters( - nshots=params.nshots, - relaxation_time=params.relaxation_time, - acquisition_type=AcquisitionType.DISCRIMINATION, - averaging_mode=AveragingMode.SINGLESHOT, - ), [[sweeper]], + nshots=params.nshots, + relaxation_time=params.relaxation_time, + acquisition_type=AcquisitionType.DISCRIMINATION, + averaging_mode=AveragingMode.SINGLESHOT, ) for q in targets: diff --git a/src/qibocal/protocols/rabi/length_frequency.py b/src/qibocal/protocols/rabi/length_frequency.py index efc342b71..02e70ebd9 100644 --- a/src/qibocal/protocols/rabi/length_frequency.py +++ b/src/qibocal/protocols/rabi/length_frequency.py @@ -6,14 +6,7 @@ import numpy.typing as npt import plotly.graph_objects as go from plotly.subplots import make_subplots -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Parameter, - Platform, - Sweeper, -) +from qibolab import AcquisitionType, AveragingMode, Parameter, Platform, Sweeper from qibocal.auto.operation import QubitId, Routine from qibocal.config import log diff --git a/src/qibocal/protocols/rabi/length_frequency_signal.py b/src/qibocal/protocols/rabi/length_frequency_signal.py index 1d1b42df6..9a74fca7e 100644 --- a/src/qibocal/protocols/rabi/length_frequency_signal.py +++ b/src/qibocal/protocols/rabi/length_frequency_signal.py @@ -7,14 +7,7 @@ import numpy.typing as npt import plotly.graph_objects as go from plotly.subplots import make_subplots -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Parameter, - Platform, - Sweeper, -) +from qibolab import AcquisitionType, AveragingMode, Parameter, Platform, Sweeper from qibocal import update from qibocal.auto.operation import Data, Parameters, QubitId, Routine diff --git a/src/qibocal/protocols/rabi/length_sequences.py b/src/qibocal/protocols/rabi/length_sequences.py index 3c97b9cf3..105d15bca 100644 --- a/src/qibocal/protocols/rabi/length_sequences.py +++ b/src/qibocal/protocols/rabi/length_sequences.py @@ -1,5 +1,5 @@ import numpy as np -from qibolab import AcquisitionType, AveragingMode, ExecutionParameters, Platform +from qibolab import AcquisitionType, AveragingMode, Platform from qibocal.auto.operation import QubitId, Routine diff --git a/src/qibocal/protocols/rabi/length_signal.py b/src/qibocal/protocols/rabi/length_signal.py index 8067483c0..8a6107341 100644 --- a/src/qibocal/protocols/rabi/length_signal.py +++ b/src/qibocal/protocols/rabi/length_signal.py @@ -3,14 +3,7 @@ import numpy as np import numpy.typing as npt -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Parameter, - Platform, - Sweeper, -) +from qibolab import AcquisitionType, AveragingMode, Parameter, Platform, Sweeper from qibocal import update from qibocal.auto.operation import Data, Parameters, QubitId, Results, Routine @@ -100,13 +93,11 @@ def _acquisition( # execute the sweep results = platform.execute( [sequence], - ExecutionParameters( - nshots=params.nshots, - relaxation_time=params.relaxation_time, - acquisition_type=AcquisitionType.INTEGRATION, - averaging_mode=AveragingMode.CYCLIC, - ), [[sweeper]], + nshots=params.nshots, + relaxation_time=params.relaxation_time, + acquisition_type=AcquisitionType.INTEGRATION, + averaging_mode=AveragingMode.CYCLIC, ) for q in targets: diff --git a/src/qibocal/protocols/ramsey/ramsey.py b/src/qibocal/protocols/ramsey/ramsey.py index 50eb6bb18..d3b252239 100644 --- a/src/qibocal/protocols/ramsey/ramsey.py +++ b/src/qibocal/protocols/ramsey/ramsey.py @@ -7,7 +7,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/ramsey/ramsey_signal.py b/src/qibocal/protocols/ramsey/ramsey_signal.py index d65e5db99..8b8df2f98 100644 --- a/src/qibocal/protocols/ramsey/ramsey_signal.py +++ b/src/qibocal/protocols/ramsey/ramsey_signal.py @@ -7,7 +7,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/readout_characterization.py b/src/qibocal/protocols/readout_characterization.py index ace630a24..223e5393c 100644 --- a/src/qibocal/protocols/readout_characterization.py +++ b/src/qibocal/protocols/readout_characterization.py @@ -4,7 +4,7 @@ import numpy.typing as npt import plotly.graph_objects as go from plotly.subplots import make_subplots -from qibolab import AcquisitionType, ExecutionParameters, Platform, PulseSequence +from qibolab import AcquisitionType, Platform, PulseSequence from qibocal import update from qibocal.auto.operation import Data, Parameters, QubitId, Results, Routine diff --git a/src/qibocal/protocols/readout_mitigation_matrix.py b/src/qibocal/protocols/readout_mitigation_matrix.py index cb1e67d2a..29d002f62 100644 --- a/src/qibocal/protocols/readout_mitigation_matrix.py +++ b/src/qibocal/protocols/readout_mitigation_matrix.py @@ -7,7 +7,7 @@ from qibo import gates from qibo.backends import GlobalBackend from qibo.models import Circuit -from qibolab import ExecutionParameters, Platform, PulseSequence +from qibolab import Platform, PulseSequence from qibocal.auto.operation import Data, Parameters, QubitId, 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 a22cda889..6abd43ac7 100644 --- a/src/qibocal/protocols/readout_optimization/resonator_amplitude.py +++ b/src/qibocal/protocols/readout_optimization/resonator_amplitude.py @@ -5,7 +5,7 @@ import numpy.typing as npt import plotly.graph_objects as go from plotly.subplots import make_subplots -from qibolab import AcquisitionType, ExecutionParameters, Platform, PulseSequence +from qibolab import AcquisitionType, Platform, PulseSequence from qibocal import update from qibocal.auto.operation import Data, Parameters, QubitId, Results, Routine diff --git a/src/qibocal/protocols/readout_optimization/resonator_frequency.py b/src/qibocal/protocols/readout_optimization/resonator_frequency.py index 4ad18a32a..9bac21344 100644 --- a/src/qibocal/protocols/readout_optimization/resonator_frequency.py +++ b/src/qibocal/protocols/readout_optimization/resonator_frequency.py @@ -4,14 +4,7 @@ import numpy.typing as npt import plotly.graph_objects as go from plotly.subplots import make_subplots -from qibolab import ( - AcquisitionType, - ExecutionParameters, - Parameter, - Platform, - PulseSequence, - Sweeper, -) +from qibolab import AcquisitionType, Parameter, Platform, PulseSequence, Sweeper from qibocal import update from qibocal.auto.operation import Data, Parameters, QubitId, Results, Routine diff --git a/src/qibocal/protocols/resonator_punchout.py b/src/qibocal/protocols/resonator_punchout.py index 8f399c7e9..e7b5c7090 100644 --- a/src/qibocal/protocols/resonator_punchout.py +++ b/src/qibocal/protocols/resonator_punchout.py @@ -8,7 +8,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/resonator_punchout_attenuation.py b/src/qibocal/protocols/resonator_punchout_attenuation.py index c048fe678..7a070b4b3 100644 --- a/src/qibocal/protocols/resonator_punchout_attenuation.py +++ b/src/qibocal/protocols/resonator_punchout_attenuation.py @@ -8,7 +8,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, PulseSequence, diff --git a/src/qibocal/protocols/signal_experiments/calibrate_state_discrimination.py b/src/qibocal/protocols/signal_experiments/calibrate_state_discrimination.py index 4021148ed..9e7966a73 100644 --- a/src/qibocal/protocols/signal_experiments/calibrate_state_discrimination.py +++ b/src/qibocal/protocols/signal_experiments/calibrate_state_discrimination.py @@ -5,13 +5,7 @@ import numpy.typing as npt import plotly.graph_objects as go from plotly.subplots import make_subplots -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Platform, - PulseSequence, -) +from qibolab import AcquisitionType, AveragingMode, Platform, PulseSequence from qibocal import update from qibocal.auto.operation import Data, Parameters, QubitId, 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 3fe1cbcdf..1b35cf34a 100644 --- a/src/qibocal/protocols/signal_experiments/time_of_flight_readout.py +++ b/src/qibocal/protocols/signal_experiments/time_of_flight_readout.py @@ -4,13 +4,7 @@ import numpy as np import numpy.typing as npt import plotly.graph_objects as go -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Platform, - PulseSequence, -) +from qibolab import AcquisitionType, AveragingMode, Platform, PulseSequence from qibocal.auto.operation import Data, Parameters, QubitId, Results, Routine from qibocal.protocols.utils import S_TO_NS, table_dict, table_html diff --git a/src/qibocal/protocols/two_qubit_interaction/chevron/chevron.py b/src/qibocal/protocols/two_qubit_interaction/chevron/chevron.py index e700b2f59..67cbff669 100644 --- a/src/qibocal/protocols/two_qubit_interaction/chevron/chevron.py +++ b/src/qibocal/protocols/two_qubit_interaction/chevron/chevron.py @@ -7,14 +7,7 @@ import numpy.typing as npt import plotly.graph_objects as go from plotly.subplots import make_subplots -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Parameter, - Platform, - Sweeper, -) +from qibolab import AcquisitionType, AveragingMode, Parameter, Platform, Sweeper from scipy.optimize import curve_fit from qibocal import update diff --git a/src/qibocal/protocols/two_qubit_interaction/chevron/chevron_signal.py b/src/qibocal/protocols/two_qubit_interaction/chevron/chevron_signal.py index 5a1e53d3b..11b5baa6e 100644 --- a/src/qibocal/protocols/two_qubit_interaction/chevron/chevron_signal.py +++ b/src/qibocal/protocols/two_qubit_interaction/chevron/chevron_signal.py @@ -4,14 +4,7 @@ import numpy as np import numpy.typing as npt -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Parameter, - Platform, - Sweeper, -) +from qibolab import AcquisitionType, AveragingMode, Parameter, Platform, Sweeper from qibocal.auto.operation import QubitPairId, Routine diff --git a/src/qibocal/protocols/two_qubit_interaction/chsh/protocol.py b/src/qibocal/protocols/two_qubit_interaction/chsh/protocol.py index 0d1e9b157..10a57b763 100644 --- a/src/qibocal/protocols/two_qubit_interaction/chsh/protocol.py +++ b/src/qibocal/protocols/two_qubit_interaction/chsh/protocol.py @@ -9,7 +9,7 @@ import numpy.typing as npt import plotly.graph_objects as go from qibo.backends import GlobalBackend -from qibolab import ExecutionParameters, Platform +from qibolab import Platform from qibocal.auto.operation import ( Data, diff --git a/src/qibocal/protocols/two_qubit_interaction/optimize.py b/src/qibocal/protocols/two_qubit_interaction/optimize.py index 82ef00fbd..ac7167f80 100644 --- a/src/qibocal/protocols/two_qubit_interaction/optimize.py +++ b/src/qibocal/protocols/two_qubit_interaction/optimize.py @@ -7,14 +7,7 @@ import numpy.typing as npt import plotly.graph_objects as go from plotly.subplots import make_subplots -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Parameter, - Platform, - Sweeper, -) +from qibolab import AcquisitionType, AveragingMode, Parameter, Platform, Sweeper from scipy.optimize import curve_fit from qibocal import update 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 92635aaab..e5d34ca9b 100644 --- a/src/qibocal/protocols/two_qubit_interaction/virtual_z_phases.py +++ b/src/qibocal/protocols/two_qubit_interaction/virtual_z_phases.py @@ -10,7 +10,6 @@ from qibolab import ( AcquisitionType, AveragingMode, - ExecutionParameters, Parameter, Platform, Pulse, diff --git a/src/qibocal/protocols/two_qubit_interaction/virtual_z_phases_signal.py b/src/qibocal/protocols/two_qubit_interaction/virtual_z_phases_signal.py index cf89d1be4..b2a610d50 100644 --- a/src/qibocal/protocols/two_qubit_interaction/virtual_z_phases_signal.py +++ b/src/qibocal/protocols/two_qubit_interaction/virtual_z_phases_signal.py @@ -3,14 +3,7 @@ from dataclasses import dataclass import numpy as np -from qibolab import ( - AcquisitionType, - AveragingMode, - ExecutionParameters, - Parameter, - Platform, - Sweeper, -) +from qibolab import AcquisitionType, AveragingMode, Parameter, Platform, Sweeper from qibocal.auto.operation import QubitPairId, Routine