chore: drop usage of ExecutionParameters

qiboteam · Sep 20, 2024 · 4ff947a · 4ff947a
1 parent f378a45
commit 4ff947a
Show file tree

Hide file tree

Showing 57 changed files with 55 additions and 241 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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