Rework radar system

python_app/hardware_full/librevna_driver/models.py

@@ -89,7 +89,6 @@ class VNASweepSettings:
     if_bandwidth_hz: float = 1_000.0
     power_start_dbm: float = -10.0
     power_stop_dbm: float = -10.0
-    excited_ports: tuple[int, ...] = (1, 2)
     sweep_scale: SweepScale = SweepScale.LIN
     dwell_s: float = 0.0
     suppress_invalid_peaks: bool = True
@@ -106,12 +105,6 @@ class VNASweepSettings:
             raise ValueError("if_bandwidth_hz must be > 0")
         if self.dwell_s < 0:
             raise ValueError("dwell_s must be >= 0")
-        if not self.excited_ports:
-            raise ValueError("excited_ports must not be empty")
-        if len(set(self.excited_ports)) != len(self.excited_ports):
-            raise ValueError("excited_ports must not contain duplicates")
-        if any(port <= 0 for port in self.excited_ports):
-            raise ValueError("excited_ports must use 1-based positive port numbers")
         if self.f_stop_hz < self.f_start_hz:
             raise ValueError("f_stop_hz must be >= f_start_hz")
         if self.kind == SweepKind.POWER and self.power_stop_dbm < self.power_start_dbm:
@@ -217,60 +210,14 @@ class SweepResult:
             normalized[key.strip().lower()] = arr
         self.traces = normalized
 
-    @property
-    def s11(self) -> np.ndarray | None:
-        """Return `S11` trace when available."""
-        return self.traces.get("s11")
-
     @property
     def s21(self) -> np.ndarray | None:
         """Return `S21` trace when available."""
         return self.traces.get("s21")
 
-    @property
-    def s12(self) -> np.ndarray | None:
-        """Return `S12` trace when available."""
-        return self.traces.get("s12")
-
-    @property
-    def s22(self) -> np.ndarray | None:
-        """Return `S22` trace when available."""
-        return self.traces.get("s22")
-
     def trace(self, parameter: str) -> np.ndarray:
         """Return complex trace by parameter name."""
         key = parameter.strip().lower()
         if key not in self.traces:
             raise KeyError(f"Trace '{parameter}' is not available")
         return self.traces[key]
-
-    def real(self, parameter: str) -> np.ndarray:
-        """Return real part of selected trace."""
-        return self.trace(parameter).real
-
-    def imag(self, parameter: str) -> np.ndarray:
-        """Return imaginary part of selected trace."""
-        return self.trace(parameter).imag
-
-    def to_npz(self, path: str) -> None:
-        """Save the axis and all traces to a NumPy `.npz` archive at ``path``."""
-        data: dict[str, np.ndarray] = {self.x_label: self.x}
-        data.update(self.traces)
-        np.savez(path, **data)
-        logger.debug("Saved SweepResult to NPZ: %s (traces=%d)", path, len(self.traces))
-
-    def to_csv(self, path: str) -> None:
-        """Save the axis and traces to CSV at ``path``, with `<trace>_real`/`<trace>_imag` columns."""
-        columns: list[np.ndarray] = [self.x]
-        headers: list[str] = [self.x_label]
-        for name, values in sorted(self.traces.items()):
-            columns.append(values.real)
-            columns.append(values.imag)
-            headers.append(f"{name}_real")
-            headers.append(f"{name}_imag")
-        matrix = np.column_stack(columns)
-        np.savetxt(path, matrix, delimiter=",", header=",".join(headers), comments="")
-        logger.debug("Saved SweepResult to CSV: %s (traces=%d)", path, len(self.traces))
-
-
-PacketPayload = Any