Backwards compatibility methods?

Author: daquinteroflex

tidy3d/plugins/smatrix/component_modelers/terminal.py

@@ -198,7 +198,9 @@ def _source_time(self):
 
     def _construct_smatrix(self) -> TerminalPortDataArray:
         """Post process :class:`.BatchData` to generate scattering matrix."""
-        return self._internal_construct_smatrix(batch_data=self.batch_data)
+        return self._internal_construct_smatrix(
+            batch_data=self._internal_construct_smatrix(self.batch_data)
+        )
 
     def _internal_construct_smatrix(self, batch_data) -> TerminalPortDataArray:
         """Post process :class:`.BatchData` to generate scattering matrix, for internal use only."""
@@ -339,7 +341,7 @@ def compute_power_wave_amplitudes_at_each_port(
     ) -> tuple[PortDataArray, PortDataArray]:
         from tidy3d.plugins.smatrix.data.data import SMatrixData, TerminalComponentModelerData
 
-        a = SMatrixData(a=self.batch_data)
+        a = SMatrixData(a=self._construct_smatrix())
         data = TerminalComponentModelerData(
             simulation=self, data=a
         ).compute_power_wave_amplitudes_at_each_port(
@@ -356,7 +358,7 @@ def _monitor_data_at_port_amplitude(
     ) -> MonitorData:
         from tidy3d.plugins.smatrix.data.data import SMatrixData, TerminalComponentModelerData
 
-        a = SMatrixData(a=self.batch_data)
+        a = SMatrixData(a=self._construct_smatrix())
         data = TerminalComponentModelerData(
             simulation=self, data=a
         )._monitor_data_at_port_amplitude(
@@ -371,7 +373,7 @@ def get_antenna_metrics_data(
     ) -> AntennaMetricsData:
         from tidy3d.plugins.smatrix.data.data import SMatrixData, TerminalComponentModelerData
 
-        a = SMatrixData(a=self.batch_data)
+        a = SMatrixData(a=self._construct_smatrix())
         data = TerminalComponentModelerData(simulation=self, data=a).get_antenna_metrics_data(
             port_amplitudes=port_amplitudes, monitor_name=monitor_name
         )
@@ -394,18 +396,18 @@ def _compute_F(Z_numpy: np.array):
     def port_reference_impedances(self) -> PortDataArray:
         from tidy3d.plugins.smatrix.data.data import SMatrixData, TerminalComponentModelerData
 
-        a = SMatrixData(a=self.batch_data)
+        a = SMatrixData(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
-
-        a = SMatrixData(a=self.batch_data)
-        data = TerminalComponentModelerData(simulation=self, data=a)._port_reference_impedances(
-            batch_data=batch_data
-        )
-        return data
+    # def _port_reference_impedances(self, batch_data) -> PortDataArray:
+    #     from tidy3d.plugins.smatrix.data.data import SMatrixData, TerminalComponentModelerData
+    #
+    #     a = SMatrixData(a=self._construct_smatrix())
+    #     data = TerminalComponentModelerData(simulation=self, data=a)._port_reference_impedances(
+    #         batch_data=batch_data
+    #     )
+    #     return data
 
     @staticmethod
     def s_to_z(