Qhc 736 bug wrong array output for qbloxresult from qprogram

docs/releases/changelog-dev.md

@@ -12,8 +12,11 @@
 
 ### Bug fixes
 
+- Fixed an issue where having nested loops would output wrong shape in QbloxMeasurementResult.
+  [#853](https://github.com/qilimanjaro-tech/qililab/pull/853)
+
 - Fixed an issue where appending a configuration to an open QM instance left it hanging. The QM now properly closes before reopening with the updated configuration.
   [#851](https://github.com/qilimanjaro-tech/qililab/pull/851)
 
 - Fixed an issue where turning off voltage/current source instruments would set to zero all dacs instead of only the ones specified in the runcard.
-  [#819](https://github.com/qilimanjaro-tech/qililab/pull/819)
+  [#819](https://github.com/qilimanjaro-tech/qililab/pull/819)

src/qililab/instruments/qblox/qblox_qrm.py

@@ -175,7 +175,7 @@ def acquire_qprogram_results(
             list[QbloxQProgramMeasurementResult]: Acquired Qblox results in chronological order.
         """
         results = []
-        for acquisition, acquistion_data in acquisitions.items():
+        for acquisition, acquisition_data in acquisitions.items():
             sequencer = next(
                 (sequencer for sequencer in self.awg_sequencers if sequencer.identifier == channel_id), None
             )
@@ -184,13 +184,15 @@ def acquire_qprogram_results(
                     sequencer=sequencer.identifier,
                     timeout=cast(QbloxADCSequencer, sequencer).acquisition_timeout,
                 )
-                if acquistion_data.save_adc:
+                if acquisition_data.save_adc:
                     self.device.store_scope_acquisition(sequencer=sequencer.identifier, name=acquisition)
                 raw_measurement_data = self.device.get_acquisitions(sequencer=sequencer.identifier)[acquisition][
                     "acquisition"
                 ]
                 measurement_result = QbloxMeasurementResult(
-                    bus=acquisitions[acquisition].bus, raw_measurement_data=raw_measurement_data
+                    bus=acquisitions[acquisition].bus,
+                    raw_measurement_data=raw_measurement_data,
+                    shape=acquisition_data.shape
                 )
                 results.append(measurement_result)
 

src/qililab/qprogram/qblox_compiler.py

@@ -51,6 +51,7 @@ class AcquisitionData:
 
     bus: str
     save_adc: bool
+    shape: tuple
 
 
 Sequences = dict[str, QPy.Sequence]
@@ -531,6 +532,7 @@ def _handle_acquire(self, element: Acquire):
             for i, loop in enumerate(self._buses[element.bus].qpy_block_stack)
             if isinstance(loop, QPyProgram.IterativeLoop) and not loop.name.startswith("avg")
         ]
+        shape = tuple(loop[1].iterations for loop in loops)
         num_bins = math.prod(loop[1].iterations for loop in loops)
         acquisition_name = f"acquisition_{self._buses[element.bus].next_acquisition_index}"
         self._buses[element.bus].qpy_sequence._acquisitions.add(
@@ -539,7 +541,7 @@ def _handle_acquire(self, element: Acquire):
             index=self._buses[element.bus].next_acquisition_index,
         )
         self._buses[element.bus].acquisitions[acquisition_name] = AcquisitionData(
-            bus=element.bus, save_adc=element.save_adc
+            bus=element.bus, save_adc=element.save_adc, shape=shape
         )
 
         index_I, index_Q, integration_length = self._append_to_weights_of_bus(element.bus, weights=element.weights)

src/qililab/result/qprogram/measurement_result.py

@@ -26,8 +26,9 @@ class MeasurementResult(ABC):
 
     name: ResultName
 
-    def __init__(self, bus: str):
+    def __init__(self, bus: str, shape=None):
         self.bus: str = bus
+        self.shape = shape
 
     @property
     @abstractmethod

src/qililab/result/qprogram/qblox_measurement_result.py

@@ -39,9 +39,10 @@ class QbloxMeasurementResult(MeasurementResult):
 
     name = ResultName.QBLOX_QPROGRAM_MEASUREMENT
 
-    def __init__(self, bus: str, raw_measurement_data: dict):
+    def __init__(self, bus: str, raw_measurement_data: dict, shape=None):
         super().__init__(bus=bus)
         self.raw_measurement_data = raw_measurement_data
+        self.shape = shape
 
     @property
     def array(self) -> np.ndarray:
@@ -52,7 +53,8 @@ def array(self) -> np.ndarray:
         """
         path0 = self.raw_measurement_data["bins"]["integration"]["path0"]
         path1 = self.raw_measurement_data["bins"]["integration"]["path1"]
-        return np.array([path0, path1])
+
+        return np.array([path0, path1]) if self.shape is None else np.array([path0, path1]).reshape(*self.shape)
 
     @property
     def threshold(self) -> np.ndarray:
@@ -61,4 +63,4 @@ def threshold(self) -> np.ndarray:
         Returns:
             np.ndarray: The thresholded data.
         """
-        return np.array(self.raw_measurement_data["bins"]["threshold"])
+        return np.array(self.raw_measurement_data["bins"]["threshold"]) if self.shape is None else np.array(self.raw_measurement_data["bins"]["threshold"]).reshape(*self.shape)

tests/instruments/qblox/test_qblox_qrm.py

@@ -2,22 +2,22 @@
 
 import copy
 import re
-from unittest.mock import MagicMock, patch, create_autospec
+from typing import cast
+from unittest.mock import MagicMock, create_autospec, patch
 
 import numpy as np
 import pytest
+from qblox_instruments.qcodes_drivers.module import Module as QcmQrm
+from qblox_instruments.qcodes_drivers.sequencer import Sequencer
 from qpysequence import Acquisitions, Program, Sequence, Waveforms, Weights
 
+from qililab.data_management import build_platform
 from qililab.instrument_controllers.qblox.qblox_cluster_controller import QbloxClusterController
 from qililab.instruments.instrument import ParameterNotFound
 from qililab.instruments.qblox import QbloxQRM
 from qililab.platform import Platform
-from qililab.data_management import build_platform
-from qililab.typings import AcquireTriggerMode, IntegrationMode, Parameter
-from typing import cast
-from qblox_instruments.qcodes_drivers.sequencer import Sequencer
-from qblox_instruments.qcodes_drivers.module import Module as QcmQrm
 from qililab.qprogram.qblox_compiler import AcquisitionData
+from qililab.typings import AcquireTriggerMode, IntegrationMode, Parameter
 
 
 @pytest.fixture(name="platform")
@@ -394,8 +394,8 @@ def test_acquire_qprogram_results(self, qrm: QbloxQRM):
         qrm.upload_qpysequence(qpysequence=sequence, channel_id=0)
 
         qp_acqusitions = {
-            "acquisition_0": AcquisitionData(bus="readout_q0", save_adc=False),
-            "acquisition_1": AcquisitionData(bus="readout_q0", save_adc=True)
+            "acquisition_0": AcquisitionData(bus="readout_q0", save_adc=False, shape=(-1,)),
+            "acquisition_1": AcquisitionData(bus="readout_q0", save_adc=True, shape=(-1,))
         }
 
         qrm.acquire_qprogram_results(acquisitions=qp_acqusitions, channel_id=0)

tests/result/qprogram/test_qblox_measurement_result.py

@@ -37,6 +37,7 @@ def test_array_property(self, raw_measurement_data: dict, qblox_measurement_resu
         path0 = raw_measurement_data["bins"]["integration"]["path0"]
         path1 = raw_measurement_data["bins"]["integration"]["path1"]
         expected_array = np.array([path0, path1])
+        print(f"expected_array shape {expected_array.shape}")
         assert np.allclose(qblox_measurement_result.array, expected_array)
 
     def test_serialization_deserialization(self, qblox_measurement_result: QbloxMeasurementResult):