Merge branch 'qickupdate' into fixes

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
       - id: debug-statements
   - repo: https://github.com/psf/black
-    rev: 24.2.0
+    rev: 24.3.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/isort
@@ -18,7 +18,7 @@ repos:
       - id: isort
         args: ["--profile", "black"]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.15.2
     hooks:
       - id: pyupgrade
   - repo: https://github.com/dhruvmanila/remove-print-statements

src/qibosoq/programs/base.py

@@ -73,9 +73,6 @@ def __init__(
         # pylint: disable-next=too-many-function-args
         super().__init__(soc, asdict(qpcfg))
 
-        self.reps = qpcfg.reps  # must be done after QickProgram init
-        self.soft_avgs = qpcfg.soft_avgs
-
     def declare_nqz_zones(self, pulse_sequence: List[Pulse]):
         """Declare nqz zone (1-2) for a given PulseSequence.
 

src/qibosoq/programs/pulse_sequence.py

@@ -1,10 +1,13 @@
 """Program used by qibosoq to execute sequences."""
 
 import logging
+from typing import List
 
-from qick import AveragerProgram
+from qick import AveragerProgram, QickSoc
 
 import qibosoq.configuration as qibosoq_cfg
+from qibosoq.components.base import Config, Qubit
+from qibosoq.components.pulses import Element
 from qibosoq.programs.flux import FluxProgram
 
 logger = logging.getLogger(qibosoq_cfg.MAIN_LOGGER_NAME)
@@ -13,6 +16,19 @@
 class ExecutePulseSequence(FluxProgram, AveragerProgram):
     """Class to execute arbitrary PulseSequences."""
 
+    def __init__(
+        self,
+        soc: QickSoc,
+        qpcfg: Config,
+        sequence: List[Element],
+        qubits: List[Qubit],
+    ):
+        """Init function, call super.__init__."""
+        super().__init__(soc, qpcfg, sequence, qubits)
+
+        self.reps = qpcfg.reps  # must be done after AveragerProgram init
+        self.soft_avgs = qpcfg.soft_avgs
+
     def initialize(self):
         """Declre nyquist zones for all the DACs and all the readout frequencies.
 

src/qibosoq/programs/sweepers.py

@@ -39,6 +39,9 @@ def __init__(
         self.sweepers = reversed_sweepers(sweepers)
         super().__init__(soc, qpcfg, sequence, qubits)
 
+        self.reps = qpcfg.reps  # must be done after NDAveragerProgram init
+        self.soft_avgs = qpcfg.soft_avgs
+
     def validate(self, sweeper: Sweeper):
         """Check if a sweeper is valid.