Most compatibility again

Author: daquinteroflex

tidy3d/plugins/smatrix/component_modelers/terminal.py

@@ -299,7 +299,7 @@ def run(self, path_dir: str = DEFAULT_DATA_DIR):
         # _ = self._upload_terminal_modeler()
         batch_data = self._construct_smatrix()
         smatrix_data = MicrowaveSMatrixData(batch_data=batch_data)
-        return TerminalComponentModelerData(simulation=self, data=(smatrix_data,))
+        return TerminalComponentModelerData(simulation=self, data=smatrix_data)
 
     ##### Backwards compatibility methods #####
 
@@ -325,9 +325,9 @@ def _monitor_data_at_port_amplitude(
             TerminalComponentModelerData,
         )
 
-        a = MicrowaveSMatrixData(a=self._construct_smatrix())
+        smatrix_data = MicrowaveSMatrixData(data=self._construct_smatrix())
         data = TerminalComponentModelerData(
-            simulation=self, data=(a,)
+            simulation=self, data=smatrix_data
         )._monitor_data_at_port_amplitude(
             port=port, sim_data=sim_data, monitor_data=monitor_data, a_port=a_port
         )
@@ -343,10 +343,10 @@ def get_antenna_metrics_data(
             TerminalComponentModelerData,
         )
 
-        a = MicrowaveSMatrixData(a=self._construct_smatrix())
-        data = TerminalComponentModelerData(simulation=self, data=(a,)).get_antenna_metrics_data(
-            port_amplitudes=port_amplitudes, monitor_name=monitor_name
-        )
+        smatrix_data = MicrowaveSMatrixData(data=self._construct_smatrix())
+        data = TerminalComponentModelerData(
+            simulation=self, data=smatrix_data
+        ).get_antenna_metrics_data(port_amplitudes=port_amplitudes, monitor_name=monitor_name)
         return data
 
     @staticmethod
@@ -370,8 +370,10 @@ def port_reference_impedances(self) -> PortDataArray:
             TerminalComponentModelerData,
         )
 
-        a = MicrowaveSMatrixData(a=self._construct_smatrix())
-        data = TerminalComponentModelerData(simulation=self, data=(a,)).port_reference_impedances
+        smatrix_data = MicrowaveSMatrixData(data=self._construct_smatrix())
+        data = TerminalComponentModelerData(
+            simulation=self, data=smatrix_data
+        ).port_reference_impedances
         return data
 
     def _port_reference_impedances(self, batch_data) -> PortDataArray:
@@ -380,8 +382,10 @@ def _port_reference_impedances(self, batch_data) -> PortDataArray:
             TerminalComponentModelerData,
         )
 
-        a = MicrowaveSMatrixData(a=self._construct_smatrix())
-        data = TerminalComponentModelerData(simulation=self, data=(a,)).port_reference_impedances
+        smatrix_data = MicrowaveSMatrixData(data=self._construct_smatrix())
+        data = TerminalComponentModelerData(
+            simulation=self, data=smatrix_data
+        ).port_reference_impedances
         return data
 
     @staticmethod

tidy3d/plugins/smatrix/data/data.py

@@ -25,7 +25,7 @@ class MicrowavePortSimulationData(Tidy3dBaseModel):
 
 
 class MicrowaveSMatrixData(Tidy3dBaseModel):
-    port_reference_impedances: PortDataArray
+    port_reference_impedances: Optional[PortDataArray]
     data: TerminalPortDataArray