Preparing to further refactor

Author: daquinteroflex

tidy3d/plugins/smatrix/__init__.py

@@ -9,8 +9,8 @@
     ComponentModeler,
 )
 from tidy3d.plugins.smatrix.component_modelers.terminal import TerminalComponentModeler
-from tidy3d.plugins.smatrix.data.data import ComponentModelerData, TerminalComponentModelerData
 from tidy3d.plugins.smatrix.data.data_array import PortDataArray, TerminalPortDataArray
+from tidy3d.plugins.smatrix.data.terminal import ComponentModelerData, TerminalComponentModelerData
 from tidy3d.plugins.smatrix.ports.coaxial_lumped import CoaxialLumpedPort
 from tidy3d.plugins.smatrix.ports.modal import ModalPortDataArray, Port
 from tidy3d.plugins.smatrix.ports.rectangular_lumped import LumpedPort

tidy3d/plugins/smatrix/data/modal.py

@@ -0,0 +1,17 @@
+"""Tool for generating an S matrix automatically from a Tidy3d simulation and lumped port definitions."""
+
+from __future__ import annotations
+
+import pydantic.v1 as pd
+
+from tidy3d.components.base import Tidy3dBaseModel
+from tidy3d.plugins.smatrix.component_modelers.modal import ComponentModeler
+
+
+class ComponentModelerData(Tidy3dBaseModel):
+    modeler: ComponentModeler = pd.Field(
+        ...,
+        title="ComponentModeler",
+        description="The original :class:`ComponentModeler` object that defines the simulation setup "
+        "and from which this data was generated.",
+    )

tidy3d/plugins/smatrix/data/data.py renamed to tidy3d/plugins/smatrix/data/terminal.py

@@ -47,10 +47,6 @@ class MicrowaveSMatrixData(Tidy3dBaseModel):
     )
 
 
-class ComponentModelerData(Tidy3dBaseModel):
-    pass
-
-
 class TerminalComponentModelerData(Tidy3dBaseModel):
     """
     Data associated with a :class:`TerminalComponentModeler` simulation run.
@@ -60,7 +56,7 @@ class TerminalComponentModelerData(Tidy3dBaseModel):
     and the solver log.
     """
 
-    simulation: TerminalComponentModeler = pd.Field(
+    modeler: TerminalComponentModeler = pd.Field(
         ...,
         title="TerminalComponentModeler",
         description="The original :class:`TerminalComponentModeler` object that defines the simulation setup "

tidy3d/plugins/smatrix/local_run.py

@@ -11,11 +11,11 @@
     DEFAULT_DATA_DIR,
 )
 from tidy3d.plugins.smatrix.component_modelers.terminal import TerminalComponentModeler
-from tidy3d.plugins.smatrix.data.data import (
+from tidy3d.plugins.smatrix.data.data_array import PortDataArray, TerminalPortDataArray
+from tidy3d.plugins.smatrix.data.terminal import (
     MicrowavePortSimulationData,
     TerminalComponentModelerData,
 )
-from tidy3d.plugins.smatrix.data.data_array import PortDataArray, TerminalPortDataArray
 from tidy3d.plugins.smatrix.ports.wave import WavePort
 from tidy3d.plugins.smatrix.utils import check_port_impedance_sign, compute_F, compute_port_VI
 from tidy3d.web import BatchData