nearly finished

Author: daquinteroflex

tidy3d/plugins/smatrix/component_modelers/terminal.py

@@ -291,15 +291,24 @@ 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 (
+            MicrowavePortSimulationData,
             MicrowaveSMatrixData,
             TerminalComponentModelerData,
         )
 
         _ = self.get_path_dir(path_dir)
         # _ = self._upload_terminal_modeler()
-        batch_data = self._construct_smatrix()
-        smatrix_data = MicrowaveSMatrixData(batch_data=batch_data)
-        return TerminalComponentModelerData(simulation=self, data=smatrix_data)
+        terminal_port_data = self._construct_smatrix()
+
+        port_to_sim_data_map = {
+            port: self.simulation.batch_data[self.simulation._task_name(port=port)]
+            for port in self.simulation.ports
+        }
+        port_simulation_data = MicrowavePortSimulationData(data=port_to_sim_data_map)
+        smatrix_data = MicrowaveSMatrixData(data=terminal_port_data)
+        return TerminalComponentModelerData(
+            simulation=self, smatrix_data=smatrix_data, port_simulation_data=port_simulation_data
+        )
 
     ##### Backwards compatibility methods #####
     @staticmethod
@@ -342,7 +351,7 @@ def _monitor_data_at_port_amplitude(
 
         smatrix_data = MicrowaveSMatrixData(data=self._construct_smatrix())
         data = TerminalComponentModelerData(
-            simulation=self, data=smatrix_data
+            simulation=self, smatrix_data=smatrix_data
         )._monitor_data_at_port_amplitude(
             port=port, sim_data=sim_data, monitor_data=monitor_data, a_port=a_port
         )
@@ -356,7 +365,7 @@ def _port_reference_impedances(self, batch_data) -> PortDataArray:
 
         smatrix_data = MicrowaveSMatrixData(data=self._construct_smatrix())
         data = TerminalComponentModelerData(
-            simulation=self, data=smatrix_data
+            simulation=self, smatrix_data=smatrix_data
         ).port_reference_impedances
         return data
 
@@ -498,7 +507,7 @@ def get_antenna_metrics_data(
 
         smatrix_data = MicrowaveSMatrixData(data=self._construct_smatrix())
         data = TerminalComponentModelerData(
-            simulation=self, data=smatrix_data
+            simulation=self, smatrix_data=smatrix_data
         ).get_antenna_metrics_data(port_amplitudes=port_amplitudes, monitor_name=monitor_name)
         return data
 
@@ -514,7 +523,7 @@ def port_reference_impedances(self) -> PortDataArray:
 
         smatrix_data = MicrowaveSMatrixData(data=self._construct_smatrix())
         data = TerminalComponentModelerData(
-            simulation=self, data=smatrix_data
+            simulation=self, smatrix_data=smatrix_data
         ).port_reference_impedances
         return data
 

tidy3d/plugins/smatrix/data/data.py

@@ -65,12 +65,16 @@ class TerminalComponentModelerData(Tidy3dBaseModel):
         "and from which this data was generated.",
     )
 
-    data: Union[MicrowaveSMatrixData, MicrowavePortSimulationData] = pd.Field(
+    smatrix_data: MicrowaveSMatrixData = pd.Field(
         ...,
-        title="Microwave Data",
-        description="The primary data output of the simulation. This can either be the computed "
-        ":class:`MicrowaveSMatrixData` containing the final S-parameters, or the "
-        "raw :class:`MicrowavePortSimulationData` if the S-matrix computation was not performed.",
+        title="S-Matrix Data",
+        description="Stores the computed S-matrix and reference impedances for the terminal ports",
+    )
+
+    port_simulation_data: MicrowavePortSimulationData = pd.Field(
+        ...,
+        title="Port-Simulation Data",
+        description="Stores raw simulation data from each microwave port-specific simulation.",
     )
 
     log: str = pd.Field(
@@ -162,7 +166,7 @@ def get_antenna_metrics_data(
         # Retrieve associated simulation data
         combined_directivity_data = None
         for port, amplitude in port_dict.items():
-            sim_data_port = self.simulation.batch_data[self.simulation._task_name(port=port)]
+            sim_data_port = self.port_simulation_data.data[port]
             radiation_data = sim_data_port[rad_mon.name]
 
             a, b = compute_power_wave_amplitudes_at_each_port(