still in progress

Author: daquinteroflex

tidy3d/plugins/smatrix/run/terminal.py

@@ -3,7 +3,7 @@
 import numpy as np
 
 from tidy3d.components.data.sim_data import SimulationData
-from tidy3d.plugins.smatrix.component_modelers.terminal import TerminalComponentModeler
+from tidy3d.plugins.smatrix.data.terminal import TerminalComponentModelerData
 from tidy3d.plugins.smatrix.data.data_array import PortDataArray, TerminalPortDataArray
 from tidy3d.plugins.smatrix.utils import (
     ab_to_s,
@@ -14,7 +14,7 @@
 
 
 def terminal_construct_smatrix(
-    modeler: TerminalComponentModeler, batch_data: BatchData = None
+    modeler_data: TerminalComponentModelerData
 ) -> TerminalPortDataArray:
     """
     Constructs the scattering matrix (S-matrix) from raw simulation data.
@@ -26,11 +26,7 @@ def terminal_construct_smatrix(
 
     Parameters
     ----------
-    modeler : TerminalComponentModeler
-        The modeler setup defining the component, ports, and frequencies.
-    batch_data : BatchData, optional
-        Pre-computed simulation results. If None, the function will execute the
-        batch run defined within the `simulation` object.
+    modeler_data
 
     Returns
     -------
@@ -39,22 +35,22 @@ def terminal_construct_smatrix(
         output port, and input port.
     """
 
-    port_names = [port.name for port in modeler.ports]
+    port_names = [port.name for port in modeler_data.modeler.ports]
 
     values = np.zeros(
-        (len(modeler.freqs), len(port_names), len(port_names)),
+        (len(modeler_data.modeler.freqs), len(port_names), len(port_names)),
         dtype=complex,
     )
     coords = {
-        "f": np.array(modeler.freqs),
+        "f": np.array(modeler_data.modeler.freqs),
         "port_out": port_names,
         "port_in": port_names,
     }
     a_matrix = TerminalPortDataArray(values, coords=coords)
     b_matrix = a_matrix.copy(deep=True)
 
     # Tabulate the reference impedances at each port and frequency
-    port_impedances = port_reference_impedances(modeler=modeler)
+    port_impedances = port_reference_impedances(modeler=modeler_data.modeler)
 
     # loop through source ports
     for port_in in modeler.ports:
@@ -69,7 +65,7 @@ def terminal_construct_smatrix(
 
 
 def port_reference_impedances(
-    modeler: TerminalComponentModeler, batch_data: BatchData = None
+    modeler_data: TerminalComponentModelerData
 ) -> PortDataArray:
     """
     Calculates the reference impedance for each port across all frequencies.
@@ -94,13 +90,13 @@ def port_reference_impedances(
     PortDataArray
         A data array containing the complex impedance for each port at each frequency.
     """
-    port_names = [port.name for port in modeler.ports]
+    port_names = [port.name for port in modeler_data.modeler.ports]
 
     values = np.zeros(
-        (len(modeler.freqs), len(port_names)),
+        (len(modeler_data.modeler.freqs), len(port_names)),
         dtype=complex,
     )
-    coords = {"f": np.array(modeler.freqs), "port": port_names}
+    coords = {"f": np.array(modeler_data.modeler.freqs), "port": port_names}
     port_impedances = PortDataArray(values, coords=coords)
     for port in modeler.ports:
         if isinstance(port, WavePort):
@@ -114,7 +110,7 @@ def port_reference_impedances(
             # LumpedPorts have a constant reference impedance
             port_impedances.loc[{"port": port.name}] = np.full(len(modeler.freqs), port.impedance)
 
-    port_impedances = modeler._set_port_data_array_attributes(port_impedances)
+    port_impedances = modeler_data.modeler._set_port_data_array_attributes(port_impedances)
     return port_impedances