added s11!

python_app/gui/controllers/app_window_pipeline_mixin.py

@@ -9,6 +9,7 @@ from python_app.gui.runtime.history import build_run_history_signature, record_r
 from python_app.hardware_full.librevna_service import LibreVnaService
 from python_app.models.dataset_model import ComboKey, ResultCollection, SweepCollection
 from python_app.models.run_config_model import RunConfigModel
+from python_app.orchestration.preprocess_assets import PREPROCESS_ASSET_KEYS, PREPROCESS_ASSET_SPECS, preprocess_asset_model
 from python_app.orchestration.shm_reader import ShmRingReader
 
 
@@ -38,28 +39,26 @@ class AppWindowPipelineMixin:
             run_signature = self._build_run_history_signature(config)
             radar_key = self._radar_key(config)
 
-            if not config.preprocess.s21_calibration_set or not config.preprocess.s21_reference_set:
-                raise RuntimeError("Select calibration and reference sets in Preprocessing Panel before Start")
+            missing_assets = [
+                PREPROCESS_ASSET_SPECS[key].display_name
+                for key in PREPROCESS_ASSET_KEYS
+                if not preprocess_asset_model(config, key).set_name
+            ]
+            if missing_assets:
+                raise RuntimeError(
+                    "Select all required preprocess sets in Preprocessing Panel before Start: "
+                    + ", ".join(missing_assets)
+                )
 
             combo_keys = [ComboKey(input_pos=combo.input, output_pos=combo.output) for combo in config.combos]
 
-            if not self._store.has_combo_coverage(
-                "calibration", radar_key, config.preprocess.s21_calibration_set, combo_keys
-            ):
-                raise RuntimeError("Selected calibration set does not cover requested run combos")
-            if not self._store.has_combo_coverage(
-                "reference", radar_key, config.preprocess.s21_reference_set, combo_keys
-            ):
-                raise RuntimeError("Selected reference set does not cover requested run combos")
+            for key in PREPROCESS_ASSET_KEYS:
+                spec = PREPROCESS_ASSET_SPECS[key]
+                asset = preprocess_asset_model(config, key)
+                if not self._store.has_combo_coverage(spec.set_kind, radar_key, asset.set_name, combo_keys):
+                    raise RuntimeError(f"Selected {spec.display_name} set does not cover requested run combos")
 
-            calibration_bundle, reference_bundle = self._config_writer.prepare_s21_bundles(
-                self._store,
-                radar_key,
-                config.preprocess.s21_calibration_set,
-                config.preprocess.s21_reference_set,
-            )
-            config.preprocess.s21_calibration_bundle_path = str(calibration_bundle)
-            config.preprocess.s21_reference_bundle_path = str(reference_bundle)
+            self._config_writer.prepare_preprocess_bundles(self._store, radar_key, config)
             config.runtime.continuous = not single_capture
 
             if not single_capture: