added timing

python_app/workflows/sequential_capture_workflow.py

@@ -15,7 +15,7 @@ from python_app.models.dataset_model import ComboKey, SweepCollection, TraceData
 from python_app.models.run_config_model import ComboModel, RunConfigModel
 from python_app.storage.npz_store import NpzStore, radar_key_from_config
 
-MULTI_DEVICE_MANUAL_CAPTURE_KINDS = frozenset({"s21_calibration", "s11_open", "s11_short", "s11_load"})
+MATRIX_RADAR_MANUAL_CAPTURE_KINDS = frozenset({"s21_calibration", "s11_open", "s11_short", "s11_load"})
 DEFAULT_CALIBRATION_MEDIAN_SWEEP_COUNT = 5
 
 
@@ -58,8 +58,9 @@ class SequentialCaptureSession:
         self._set_name = set_name
         self._median_sweep_count = int(median_sweep_count)
         self._is_matrix_radar = config.is_matrix_radar
-        self._is_multi_device = config.is_multi_device
-        self._manual_multi_device_capture = self._is_multi_device and kind in MULTI_DEVICE_MANUAL_CAPTURE_KINDS
+        self._manual_matrix_radar_capture = (
+            self._is_matrix_radar and kind in MATRIX_RADAR_MANUAL_CAPTURE_KINDS
+        )
         self._combos = (
             RunConfigModel.build_matrix_radar_virtual_combos()
             if self._is_matrix_radar
@@ -148,7 +149,7 @@ class SequentialCaptureSession:
             current_combo=current_combo,
             can_undo=bool(self._traces),
             is_complete=self.is_complete(),
-            supports_batch_capture=not self._manual_multi_device_capture,
+            supports_batch_capture=not self._manual_matrix_radar_capture,
         )
 
     def capture_current_combo(self) -> TraceData:
@@ -166,7 +167,7 @@ class SequentialCaptureSession:
                 if not collection.traces:
                     raise RuntimeError("Matrix radar capture returned no traces")
                 collections.append(collection)
-            if self._manual_multi_device_capture:
+            if self._manual_matrix_radar_capture:
                 per_sweep_traces = [select_trace_for_combo(collection, combo) for collection in collections]
                 trace = combine_traces_via_median(per_sweep_traces)
                 self._traces.append(trace)
@@ -208,7 +209,7 @@ class SequentialCaptureSession:
         if not self._traces or self._next_index <= 0:
             raise RuntimeError("No captured combo is available to undo")
 
-        if self._is_matrix_radar and not self._manual_multi_device_capture:
+        if self._is_matrix_radar and not self._manual_matrix_radar_capture:
             if len(self._traces) != len(self._combos):
                 raise RuntimeError("Capture session state is inconsistent; matrix radar trace matrix is incomplete")
             removed_trace = self._traces[-1]