#26 - tests passing with super()

KCL-BMEIS · Jan 8, 2024 · 7ebe269 · 7ebe269
1 parent 303e416
commit 7ebe269
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/example_scripts/continuous_averaging_fifo_mode.py b/src/example_scripts/continuous_averaging_fifo_mode.py
@@ -73,6 +73,7 @@ def continuous_averaging_multi_fifo_example(
         # Retrieve streamed waveform data until desired time has elapsed
         measurements_list = []
         while (monotonic() - start_time) < acquisition_duration_in_seconds:
+            print(f"Asking for waveforms at {monotonic() - start_time}")
             measurements_list += [
                 Measurement(waveforms=frame, timestamp=card.get_timestamp()) for frame in card.get_waveforms()
             ]

diff --git a/src/spectrumdevice/devices/mocks/mock_waveform_source.py b/src/spectrumdevice/devices/mocks/mock_waveform_source.py
@@ -132,9 +132,9 @@ def mock_waveform_source_factory(
     param_dict: Dict[int, int],
     notify_size_in_pages: float = 0,
 ) -> MockWaveformSource:
-    if acquisition_mode == AcquisitionMode.SPC_REC_FIFO_MULTI:
+    if acquisition_mode in (AcquisitionMode.SPC_REC_FIFO_MULTI, AcquisitionMode.SPC_REC_FIFO_AVERAGE):
         return MultiFIFOModeMockWaveformSource(param_dict, notify_size_in_pages)
-    elif AcquisitionMode.SPC_REC_STD_SINGLE:
+    elif acquisition_mode == AcquisitionMode.SPC_REC_STD_SINGLE:
         return SingleModeMockWaveformSource(param_dict)
     else:
         raise NotImplementedError(f"Mock waveform source not yet implemented for {acquisition_mode} acquisition mode.")
diff --git a/src/tests/configuration.py b/src/tests/configuration.py
@@ -12,8 +12,8 @@ class SpectrumTestMode(Enum):
 
 # Set to TestMode.MOCK_HARDWARE for software-only testing, even if Spectrum drivers are found on the system
 # Set to TestMode.REAL_HARDWARE to run tests on a real hardware device as configured below.
-SINGLE_CARD_TEST_MODE = SpectrumTestMode.MOCK_HARDWARE
-STAR_HUB_TEST_MODE = SpectrumTestMode.MOCK_HARDWARE
+SINGLE_CARD_TEST_MODE = SpectrumTestMode.REAL_HARDWARE
+STAR_HUB_TEST_MODE = SpectrumTestMode.REAL_HARDWARE
 
 # Set IP address of real spectrum device (for use if TestMode.REAL_HARDWARE is set above). Set to None to run tests on
 # a local (PCIe) card.

diff --git a/src/tests/test_integration.py b/src/tests/test_integration.py
@@ -43,7 +43,11 @@ def test_standard_single_mode(self) -> None:
         self.assertEqual(len(measurement.waveforms), 1)
         self.assertEqual([wfm.shape for wfm in measurement.waveforms], [(ACQUISITION_LENGTH,)])
         if self._single_card_mock_mode:
-            self.assertAlmostEqual(measurement.waveforms[0].max() - measurement.waveforms[0].min(), 0.4, 1)
+            # mock waveform source generates random values covering full ADC range, which is set to += 0.2 V
+            expected_pk_to_pk_volts = 0.4
+            self.assertAlmostEqual(
+                measurement.waveforms[0].max() - measurement.waveforms[0].min(), expected_pk_to_pk_volts, 1
+            )
             self.assertAlmostEqual(measurement.waveforms[0].mean(), 0.0, 1)
 
         two_seconds_ago = datetime.datetime.now() - datetime.timedelta(seconds=2)