Agreed data with Damian

Author: daquinteroflex

tidy3d/plugins/smatrix/component_modelers/terminal.py

@@ -290,12 +290,15 @@ def get_radiation_monitor_by_name(self, monitor_name: str) -> DirectivityMonitor
 
     def run(self, path_dir: str = DEFAULT_DATA_DIR):
         """Solves for the scattering matrix of the system."""
-        from tidy3d.plugins.smatrix.data.data import SMatrixData, TerminalComponentModelerData
+        from tidy3d.plugins.smatrix.data.data import (
+            MicrowaveSMatrixData,
+            TerminalComponentModelerData,
+        )
 
         _ = self.get_path_dir(path_dir)
         # _ = self._upload_terminal_modeler()
         batch_data = self._construct_smatrix()
-        smatrix_data = SMatrixData(batch_data=batch_data)
+        smatrix_data = MicrowaveSMatrixData(batch_data=batch_data)
         return TerminalComponentModelerData(simulation=self, data=(smatrix_data,))
 
     ##### Backwards compatibility methods #####
@@ -317,9 +320,12 @@ def _monitor_data_at_port_amplitude(
         monitor_data: MonitorData,
         a_port: Union[FreqDataArray, complex],
     ) -> MonitorData:
-        from tidy3d.plugins.smatrix.data.data import SMatrixData, TerminalComponentModelerData
+        from tidy3d.plugins.smatrix.data.data import (
+            MicrowaveSMatrixData,
+            TerminalComponentModelerData,
+        )
 
-        a = SMatrixData(a=self._construct_smatrix())
+        a = MicrowaveSMatrixData(a=self._construct_smatrix())
         data = TerminalComponentModelerData(
             simulation=self, data=(a,)
         )._monitor_data_at_port_amplitude(
@@ -332,9 +338,12 @@ def get_antenna_metrics_data(
         port_amplitudes: Optional[dict[str, complex]] = None,
         monitor_name: Optional[str] = None,
     ) -> AntennaMetricsData:
-        from tidy3d.plugins.smatrix.data.data import SMatrixData, TerminalComponentModelerData
+        from tidy3d.plugins.smatrix.data.data import (
+            MicrowaveSMatrixData,
+            TerminalComponentModelerData,
+        )
 
-        a = SMatrixData(a=self._construct_smatrix())
+        a = MicrowaveSMatrixData(a=self._construct_smatrix())
         data = TerminalComponentModelerData(simulation=self, data=(a,)).get_antenna_metrics_data(
             port_amplitudes=port_amplitudes, monitor_name=monitor_name
         )
@@ -356,16 +365,22 @@ def _compute_F(Z_numpy: np.array):
 
     @cached_property
     def port_reference_impedances(self) -> PortDataArray:
-        from tidy3d.plugins.smatrix.data.data import SMatrixData, TerminalComponentModelerData
+        from tidy3d.plugins.smatrix.data.data import (
+            MicrowaveSMatrixData,
+            TerminalComponentModelerData,
+        )
 
-        a = SMatrixData(a=self._construct_smatrix())
+        a = MicrowaveSMatrixData(a=self._construct_smatrix())
         data = TerminalComponentModelerData(simulation=self, data=(a,)).port_reference_impedances
         return data
 
     def _port_reference_impedances(self, batch_data) -> PortDataArray:
-        from tidy3d.plugins.smatrix.data.data import SMatrixData, TerminalComponentModelerData
+        from tidy3d.plugins.smatrix.data.data import (
+            MicrowaveSMatrixData,
+            TerminalComponentModelerData,
+        )
 
-        a = SMatrixData(a=self._construct_smatrix())
+        a = MicrowaveSMatrixData(a=self._construct_smatrix())
         data = TerminalComponentModelerData(simulation=self, data=(a,)).port_reference_impedances
         return data
 

tidy3d/plugins/smatrix/data/data.py

@@ -20,8 +20,13 @@
 from tidy3d.plugins.smatrix.data.terminal import PortDataArray, TerminalPortDataArray
 
 
-class SMatrixData(Tidy3dBaseModel):
-    a: TerminalPortDataArray
+class MicrowavePortSimulationData(Tidy3dBaseModel):
+    data: dict[str, SimulationData]
+
+
+class MicrowaveSMatrixData(Tidy3dBaseModel):
+    port_reference_impedances: PortDataArray
+    data: TerminalPortDataArray
 
 
 class TerminalComponentModelerData(Tidy3dBaseModel):
@@ -35,9 +40,9 @@ class TerminalComponentModelerData(Tidy3dBaseModel):
         description="Original :class:`TerminalComponentModeler` associated with the data.",
     )
 
-    data: tuple[SMatrixData, ...] = pd.Field(
+    data: Union[MicrowaveSMatrixData, MicrowavePortSimulationData] = pd.Field(
         ...,
-        title="SMatrixData",
+        title="MicrowaveSMatrixData",
         description="List of :class:`AbstractMonitorData` instances "
         "associated with the monitors of the original :class:`AbstractSimulation`.",
     )