added s11!

python_app/storage/npz/serialize.py

@@ -28,13 +28,12 @@ def serialize_trace_collection(collection: SweepCollection, magic: int) -> bytes
 
     for trace in collection.traces:
         freq = np.asarray(trace.frequency_hz, dtype=np.float32)
+        s11 = np.asarray(trace.s11, dtype=np.complex64)
         s21 = np.asarray(trace.s21, dtype=np.complex64)
+        if freq.size != s11.size:
+            raise ValueError("Trace frequency and S11 sizes must match")
         if freq.size != s21.size:
             raise ValueError("Trace frequency and S21 sizes must match")
-        # Python workflows still operate on S21 only. Emit a zero-filled S11
-        # channel so C++ trace bundles keep the same wire format as runtime
-        # rings while the Python layer remains unchanged.
-        s11 = np.zeros(freq.size, dtype=np.complex64)
 
         buffer.extend(struct.pack("<III", trace.combo.input_pos, trace.combo.output_pos, int(freq.size)))
         buffer.extend(freq.astype("<f4", copy=False).tobytes())

python_app/storage/npz/snapshot_numpy.py

@@ -157,8 +157,10 @@ def save_trace_history_numpy(stage_dir: Path, history: list[SweepCollection]) ->
         for trace in collection.traces:
             tag = f"i{trace.combo.input_pos}_o{trace.combo.output_pos}"
             freq = np.asarray(trace.frequency_hz, dtype=np.float32)
+            s11 = np.asarray(trace.s11, dtype=np.complex64)
             s21 = np.asarray(trace.s21, dtype=np.complex64)
             np.save(collection_dir / f"{tag}_freq.npy", freq)
+            np.save(collection_dir / f"{tag}_s11.npy", s11)
             np.save(collection_dir / f"{tag}_s21.npy", s21)
             traces_meta.append(
                 {
@@ -166,6 +168,7 @@ def save_trace_history_numpy(stage_dir: Path, history: list[SweepCollection]) ->
                     "output": int(trace.combo.output_pos),
                     "points": int(freq.size),
                     "freq_file": f"{tag}_freq.npy",
+                    "s11_file": f"{tag}_s11.npy",
                     "s21_file": f"{tag}_s21.npy",
                 }
             )

python_app/storage/npz/store.py

@@ -24,7 +24,7 @@ from python_app.storage.store_api import StoreApi
 
 
 class NpzStore(StoreApi):
-    """Persist calibration/reference sets and runtime snapshots using NumPy files."""
+    """Persist preprocess sets and runtime snapshots using NumPy files."""
 
     def __init__(self, root_dir: Path) -> None:
         """Create store rooted at `root_dir`."""
@@ -32,7 +32,7 @@ class NpzStore(StoreApi):
         self._root_dir.mkdir(parents=True, exist_ok=True)
 
     def save_set(self, kind: str, radar_key: str, set_name: str, collection: SweepCollection) -> None:
-        """Persist named calibration/reference set as NPZ and metadata JSON."""
+        """Persist named preprocess set as NPZ and metadata JSON."""
         set_dir = self._set_dir(kind, radar_key)
         set_dir.mkdir(parents=True, exist_ok=True)
 
@@ -45,14 +45,17 @@ class NpzStore(StoreApi):
         for trace in collection.traces:
             suffix = f"i{trace.combo.input_pos}_o{trace.combo.output_pos}"
             freq_key = f"freq_{suffix}"
+            s11_key = f"s11_{suffix}"
             s21_key = f"s21_{suffix}"
             payload[freq_key] = np.asarray(trace.frequency_hz, dtype=np.float32)
+            payload[s11_key] = np.asarray(trace.s11, dtype=np.complex64)
             payload[s21_key] = np.asarray(trace.s21, dtype=np.complex64)
             combo_records.append(
                 {
                     "input": trace.combo.input_pos,
                     "output": trace.combo.output_pos,
                     "freq_key": freq_key,
+                    "s11_key": s11_key,
                     "s21_key": s21_key,
                 }
             )
@@ -66,7 +69,7 @@ class NpzStore(StoreApi):
         meta_path.write_text(json.dumps(meta, indent=2), encoding="utf-8")
 
     def load_set(self, kind: str, radar_key: str, set_name: str) -> SweepCollection:
-        """Load named calibration/reference set from NPZ representation."""
+        """Load named preprocess set from NPZ representation."""
         set_dir = self._set_dir(kind, radar_key)
         npz_path = set_dir / f"{set_name}.npz"
         meta_path = set_dir / f"{set_name}.json"
@@ -80,11 +83,13 @@ class NpzStore(StoreApi):
         traces: list[TraceData] = []
         for combo in meta["combos"]:
             freq = np.asarray(arrays[combo["freq_key"]], dtype=np.float32)
+            s11 = np.asarray(arrays[combo["s11_key"]], dtype=np.complex64)
             s21 = np.asarray(arrays[combo["s21_key"]], dtype=np.complex64)
             traces.append(
                 TraceData(
                     combo=ComboKey(input_pos=int(combo["input"]), output_pos=int(combo["output"])),
                     frequency_hz=freq,
+                    s11=s11,
                     s21=s21,
                 )
             )

python_app/storage/store_api.py

@@ -1,4 +1,4 @@
-"""Abstract storage API for calibration/reference sets."""
+"""Abstract storage API for preprocess sets."""
 
 from __future__ import annotations