Fix data typs

Author: daquinteroflex

tidy3d/plugins/smatrix/data/data.py

@@ -113,19 +113,19 @@ def get_antenna_metrics_data(
         """
         # Use the first port as default if none specified
         if port_amplitudes is None:
-            port_amplitudes = {self.ports[0].name: None}
-        port_names = [port.name for port in self.ports]
+            port_amplitudes = {self.simulation.ports[0].name: None}
+        port_names = [port.name for port in self.simulation.ports]
         # Check port names, and create map from port to amplitude
         port_dict = {}
         for key in port_amplitudes.keys():
-            port = self.get_port_by_name(port_name=key)
+            port = self.simulation.get_port_by_name(port_name=key)
             port_dict[port] = port_amplitudes[key]
         # Get the radiation monitor, use first as default
         # if none specified
         if monitor_name is None:
-            rad_mon = self.radiation_monitors[0]
+            rad_mon = self.simulation.radiation_monitors[0]
         else:
-            rad_mon = self.get_radiation_monitor_by_name(monitor_name)
+            rad_mon = self.simulation.get_radiation_monitor_by_name(monitor_name)
 
         # Create data arrays for holding the superposition of all port power wave amplitudes
         f = list(rad_mon.freqs)
@@ -135,7 +135,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.batch_data[self._task_name(port=port)]
+            sim_data_port = self.simulation.batch_data[self.simulation._task_name(port=port)]
             radiation_data = sim_data_port[rad_mon.name]
 
             a, b = self.compute_power_wave_amplitudes_at_each_port(
@@ -176,35 +176,37 @@ def get_antenna_metrics_data(
     @cached_property
     def port_reference_impedances(self) -> PortDataArray:
         """The reference impedance used at each port for definining power wave amplitudes."""
-        return self._port_reference_impedances(self.batch_data)
+        return self._port_reference_impedances(self.simulation.batch_data)
 
     def _port_reference_impedances(self, batch_data) -> PortDataArray:
         """Tabulates the reference impedance of each port at each frequency using the
         supplied :class:`.BatchData`.
         """
         # TODO properly refactor, plugins data types should not have web methods.
 
-        port_names = [port.name for port in self.ports]
+        port_names = [port.name for port in self.simulation.ports]
 
         values = np.zeros(
-            (len(self.freqs), len(port_names)),
+            (len(self.simulation.freqs), len(port_names)),
             dtype=complex,
         )
-        coords = {"f": np.array(self.freqs), "port": port_names}
+        coords = {"f": np.array(self.simulation.freqs), "port": port_names}
         port_impedances = PortDataArray(values, coords=coords)
-        for port in self.ports:
+        for port in self.simulation.ports:
             if isinstance(port, WavePort):
                 # Mode solver data for each wave port is stored in its associated SimulationData
-                sim_data_port = batch_data[self._task_name(port=port)]
+                sim_data_port = batch_data[self.simulation._task_name(port=port)]
                 # WavePorts have a port impedance calculated from its associated modal field distribution
                 # and is frequency dependent.
                 impedances = port.compute_port_impedance(sim_data_port).values
                 port_impedances.loc[{"port": port.name}] = impedances.squeeze()
             else:
                 # LumpedPorts have a constant reference impedance
-                port_impedances.loc[{"port": port.name}] = np.full(len(self.freqs), port.impedance)
+                port_impedances.loc[{"port": port.name}] = np.full(
+                    len(self.simulation.freqs), port.impedance
+                )
 
-        port_impedances = TerminalComponentModeler._set_port_data_array_attributes(port_impedances)
+        port_impedances = self.simulation._set_port_data_array_attributes(port_impedances)
         return port_impedances
 
     def compute_power_wave_amplitudes_at_each_port(
@@ -225,13 +227,13 @@ def compute_power_wave_amplitudes_at_each_port(
         tuple[:class:`.PortDataArray`, :class:`.PortDataArray`]
             Incident (a) and reflected (b) power wave amplitudes at each port.
         """
-        port_names = [port.name for port in self.ports]
+        port_names = [port.name for port in self.simulation.ports]
         values = np.zeros(
-            (len(self.freqs), len(port_names)),
+            (len(self.simulation.freqs), len(port_names)),
             dtype=complex,
         )
         coords = {
-            "f": np.array(self.freqs),
+            "f": np.array(self.simulation.freqs),
             "port": port_names,
         }
 
@@ -240,7 +242,7 @@ def compute_power_wave_amplitudes_at_each_port(
         a = V_matrix.copy(deep=True)
         b = V_matrix.copy(deep=True)
 
-        for port_out in self.ports:
+        for port_out in self.simulation.ports:
             V_out, I_out = compute_port_VI(port_out, sim_data)
             indexer = {"port": port_out.name}
             V_matrix.loc[indexer] = V_out