pyedb 0.13.dev0__py3-none-any.whl → 0.14.1__py3-none-any.whl

pyedb/dotnet/edb_core/{edb_data/siwave_simulation_setup_data.py → sim_setup_data/io/siwave.py}

@@ -20,18 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import warnings
-
-from pyedb.dotnet.edb_core.general import (
-    convert_netdict_to_pydict,
-    convert_pydict_to_netdict,
-)
-from pyedb.dotnet.edb_core.sim_setup_data.data.siw_dc_ir_settings import (
-    SiwaveDCIRSettings,
-)
-from pyedb.dotnet.edb_core.utilities.simulation_setup import BaseSimulationSetup
-from pyedb.generic.general_methods import is_linux, pyedb_function_handler
-
 
 def _parse_value(v):
     """Parse value in C sharp format."""
@@ -67,7 +55,6 @@ class SettingsBase(object):
         """EDB internal simulation setup object."""
         return self._parent.get_sim_setup_info
 
-    @pyedb_function_handler
     def get_configurations(self):
         """Get all attributes.
 
@@ -96,7 +83,6 @@ class SettingsBase(object):
             temp[i] = self.__getattribute__(i)
         return temp
 
-    @pyedb_function_handler
     def restore_default(self):
         for k, val in self.defaults.items():
             self.__setattr__(k, val)
@@ -144,12 +130,10 @@ class AdvancedSettings(SettingsBase):
             "max_coupled_lines": [12, 12, 40],
         }
 
-    @pyedb_function_handler
     def set_si_slider(self, value):
         for k, val in self.si_defaults.items():
             self.__setattr__(k, val[value])
 
-    @pyedb_function_handler
     def set_pi_slider(self, value):
         for k, val in self.pi_defaults.items():
             self.__setattr__(k, val[value])
@@ -656,7 +640,6 @@ class DCAdvancedSettings(SettingsBase):
             "refine_vias": [False, False, True],
         }
 
-    @pyedb_function_handler
     def set_dc_slider(self, value):
         for k, val in self.dc_defaults.items():
             self.__setattr__(k, val[value])
@@ -909,327 +892,3 @@ class DCAdvancedSettings(SettingsBase):
         edb_setup_info.SimulationSettings.DCAdvancedSettings.RefineVias = value
         self._parent._edb_object = self._parent._set_edb_setup_info(edb_setup_info)
         self._parent._update_setup()
-
-
-class SiwaveSYZSimulationSetup(BaseSimulationSetup):
-    """Manages EDB methods for SIwave simulation setup.
-
-    Parameters
-    ----------
-    pedb : :class:`pyedb.dotnet.edb.Edb`
-        Inherited AEDT object.
-    edb_setup : :class:`Ansys.Ansoft.Edb.Utility.SIWaveSimulationSetup`
-        Edb object.
-    """
-
-    def __init__(self, pedb, edb_setup=None):
-        super().__init__(pedb, edb_setup)
-        self._edb = self._pedb
-        self._setup_type = "kSIwave"
-        self._sim_setup_info = None
-
-    @pyedb_function_handler()
-    def create(self, name=None):
-        """Create a SIwave SYZ setup.
-
-        Returns
-        -------
-        :class:`SiwaveDCSimulationSetup`
-        """
-        self._name = name
-        self._create(name)
-        self.si_slider_position = 1
-
-        return self
-
-    @pyedb_function_handler
-    def get_configurations(self):
-        """Get SIwave SYZ simulation settings.
-
-        Returns
-        -------
-        dict
-            Dictionary of SIwave SYZ simulation settings.
-        """
-        return {
-            "pi_slider_position": self.pi_slider_position,
-            "si_slider_position": self.si_slider_position,
-            "use_custom_settings": self.use_si_settings,
-            "use_si_settings": self.use_si_settings,
-            "advanced_settings": self.advanced_settings.get_configurations(),
-        }
-
-    @property
-    def advanced_settings(self):
-        """SIwave advanced settings."""
-        return AdvancedSettings(self)
-
-    @property
-    def get_sim_setup_info(self):
-        """Get simulation information from the setup."""
-        if self._sim_setup_info:
-            return self._sim_setup_info
-
-        edb_setup = self._edb_object
-        edb_sim_setup_info = self._pedb.simsetupdata.SimSetupInfo[self._setup_type_mapping[self._setup_type]]()
-        edb_sim_setup_info.Name = edb_setup.GetName()
-
-        string = edb_setup.ToString().replace("\t", "").split("\r\n")
-
-        if is_linux:
-            string = string[0].split("\n")
-        keys = [i.split("=")[0] for i in string if len(i.split("=")) == 2 and "SourceTermsToGround" not in i]
-        values = [i.split("=")[1] for i in string if len(i.split("=")) == 2 and "SourceTermsToGround" not in i]
-        for val in string:
-            if "SourceTermsToGround()" in val:
-                break
-            elif "SourceTermsToGround" in val:
-                sources = {}
-                val = val.replace("SourceTermsToGround(", "").replace(")", "").split(",")
-                for v in val:
-                    source = v.split("=")
-                    sources[source[0]] = int(source[1].replace("'", ""))
-                edb_sim_setup_info.SimulationSettings.DCIRSettings.SourceTermsToGround = convert_pydict_to_netdict(
-                    sources
-                )
-                break
-        for k in keys:
-            value = _parse_value(values[keys.index(k)])
-            setter = None
-            if k in dir(edb_sim_setup_info.SimulationSettings):
-                setter = edb_sim_setup_info.SimulationSettings
-            elif k in dir(edb_sim_setup_info.SimulationSettings.AdvancedSettings):
-                setter = edb_sim_setup_info.SimulationSettings.AdvancedSettings
-
-            elif k in dir(edb_sim_setup_info.SimulationSettings.DCAdvancedSettings):
-                setter = edb_sim_setup_info.SimulationSettings.DCAdvancedSettings
-            elif "DCIRSettings" in dir(edb_sim_setup_info.SimulationSettings) and k in dir(
-                edb_sim_setup_info.SimulationSettings.DCIRSettings
-            ):
-                setter = edb_sim_setup_info.SimulationSettings.DCIRSettings
-            elif k in dir(edb_sim_setup_info.SimulationSettings.DCSettings):
-                setter = edb_sim_setup_info.SimulationSettings.DCSettings
-            elif k in dir(edb_sim_setup_info.SimulationSettings.AdvancedSettings):
-                setter = edb_sim_setup_info.SimulationSettings.AdvancedSettings
-            if setter:
-                try:
-                    setter.__setattr__(k, value)
-                except TypeError:
-                    try:
-                        setter.__setattr__(k, str(value))
-                    except:
-                        pass
-
-        return edb_sim_setup_info
-
-    @pyedb_function_handler
-    def set_pi_slider(self, value):
-        """Set SIwave PI simulation accuracy level.
-        Options are:
-        - ``0``: Optimal speed
-        - ``1``:  Balanced
-        - ``2``: Optimal accuracy
-
-        .. deprecated:: 0.7.5
-           Use :property:`pi_slider_position` property instead.
-
-        """
-        warnings.warn("`set_pi_slider` is deprecated. Use `pi_slider_position` property instead.", DeprecationWarning)
-        self.pi_slider_position = value
-
-    @pyedb_function_handler
-    def set_si_slider(self, value):
-        """Set SIwave SI simulation accuracy level.
-
-        Options are:
-        - ``0``: Optimal speed;
-        - ``1``:  Balanced;
-        - ``2``: Optimal accuracy```.
-        """
-        self.use_si_settings = True
-        self.use_custom_settings = False
-        self.si_slider_position = value
-        self.advanced_settings.set_si_slider(value)
-
-    @property
-    def pi_slider_position(self):
-        """PI solider position. Values are from ``1`` to ``3``."""
-        return self.get_sim_setup_info.SimulationSettings.PISliderPos
-
-    @pi_slider_position.setter
-    def pi_slider_position(self, value):
-        edb_setup_info = self.get_sim_setup_info
-        edb_setup_info.SimulationSettings.PISliderPos = value
-        self._edb_object = self._set_edb_setup_info(edb_setup_info)
-        self._update_setup()
-
-        self.use_si_settings = False
-        self.use_custom_settings = False
-        self.advanced_settings.set_pi_slider(value)
-
-    @property
-    def si_slider_position(self):
-        """SI slider position. Values are from ``1`` to ``3``."""
-        return self.get_sim_setup_info.SimulationSettings.SISliderPos
-
-    @si_slider_position.setter
-    def si_slider_position(self, value):
-        edb_setup_info = self.get_sim_setup_info
-        edb_setup_info.SimulationSettings.SISliderPos = value
-        self._edb_object = self._set_edb_setup_info(edb_setup_info)
-        self._update_setup()
-
-        self.use_si_settings = True
-        self.use_custom_settings = False
-        self.advanced_settings.set_si_slider(value)
-
-    @property
-    def use_custom_settings(self):
-        """Custom settings to use.
-
-        Returns
-        -------
-        bool
-        """
-        return self.get_sim_setup_info.SimulationSettings.UseCustomSettings
-
-    @use_custom_settings.setter
-    def use_custom_settings(self, value):
-        edb_setup_info = self.get_sim_setup_info
-        edb_setup_info.SimulationSettings.UseCustomSettings = value
-        self._edb_object = self._set_edb_setup_info(edb_setup_info)
-        self._update_setup()
-
-    @property
-    def use_si_settings(self):
-        """Whether to use SI Settings.
-
-        Returns
-        -------
-        bool
-        """
-        return self.get_sim_setup_info.SimulationSettings.UseSISettings
-
-    @use_si_settings.setter
-    def use_si_settings(self, value):
-        edb_setup_info = self.get_sim_setup_info
-        edb_setup_info.SimulationSettings.UseSISettings = value
-        self._edb_object = self._set_edb_setup_info(edb_setup_info)
-        self._update_setup()
-
-
-class SiwaveDCSimulationSetup(SiwaveSYZSimulationSetup):
-    """Manages EDB methods for SIwave DC simulation setup.
-
-    Parameters
-    ----------
-    pedb : :class:`pyedb.dotnet.edb.Edb`
-        Inherited AEDT object.
-    edb_setup : Ansys.Ansoft.Edb.Utility.SIWDCIRSimulationSettings
-        EDB object. The default is ``None``.
-    """
-
-    def __init__(self, pedb, edb_object=None):
-        super().__init__(pedb, edb_object)
-        self._setup_type = "kSIwaveDCIR"
-        self._edb = pedb
-        self._mesh_operations = {}
-
-    def create(self, name=None):
-        """Create a SIwave DCIR setup.
-
-        Returns
-        -------
-        :class:`SiwaveDCSimulationSetup`
-        """
-        self._name = name
-        self._create(name)
-        self.set_dc_slider(1)
-        return self
-
-    @property
-    def dc_ir_settings(self):
-        """DC IR settings."""
-        return SiwaveDCIRSettings(self)
-
-    @pyedb_function_handler
-    def get_configurations(self):
-        """Get SIwave DC simulation settings.
-
-        Returns
-        -------
-        dict
-            Dictionary of SIwave DC simulation settings.
-        """
-        return {
-            "dc_settings": self.dc_settings.get_configurations(),
-            "dc_advanced_settings": self.dc_advanced_settings.get_configurations(),
-        }
-
-    @pyedb_function_handler
-    def set_dc_slider(self, value):
-        """Set DC simulation accuracy level.
-
-        Options are:
-
-        - ``0``: Optimal speed
-        - ``1``: Balanced
-        - ``2``: Optimal accuracy
-        """
-        self.use_custom_settings = False
-        self.dc_settings.dc_slider_position = value
-        self.dc_advanced_settings.set_dc_slider(value)
-
-    @property
-    def dc_settings(self):
-        """SIwave DC setting."""
-        return DCSettings(self)
-
-    @property
-    def dc_advanced_settings(self):
-        """Siwave DC advanced settings.
-
-        Returns
-        -------
-        :class:`pyedb.dotnet.edb_core.edb_data.siwave_simulation_setup_data.SiwaveDCAdvancedSettings`
-        """
-        return DCAdvancedSettings(self)
-
-    @property
-    def source_terms_to_ground(self):
-        """Dictionary of grounded terminals.
-
-        Returns
-        -------
-        Dictionary
-            {str, int}, keys is source name, value int 0 unspecified, 1 negative node, 2 positive one.
-
-        """
-        return convert_netdict_to_pydict(self.get_sim_setup_info.SimulationSettings.DCIRSettings.SourceTermsToGround)
-
-    @pyedb_function_handler()
-    def add_source_terminal_to_ground(self, source_name, terminal=0):
-        """Add a source terminal to ground.
-
-        Parameters
-        ----------
-        source_name : str,
-            Source name.
-        terminal : int, optional
-            Terminal to assign. Options are:
-
-             - 0=Unspecified
-             - 1=Negative node
-             - 2=Positive none
-
-        Returns
-        -------
-        bool
-
-        """
-        terminals = self.source_terms_to_ground
-        terminals[source_name] = terminal
-        self.get_sim_setup_info.SimulationSettings.DCIRSettings.SourceTermsToGround = convert_pydict_to_netdict(
-            terminals
-        )
-        return self._update_setup()

pyedb/dotnet/edb_core/siwave.py

@@ -42,11 +42,7 @@ from pyedb.dotnet.edb_core.edb_data.sources import (
 )
 from pyedb.dotnet.edb_core.general import convert_py_list_to_net_list
 from pyedb.generic.constants import SolverType, SweepType
-from pyedb.generic.general_methods import (
-    _retry_ntimes,
-    generate_unique_name,
-    pyedb_function_handler,
-)
+from pyedb.generic.general_methods import _retry_ntimes, generate_unique_name
 from pyedb.modeler.geometry_operators import GeometryOperators
 
 
@@ -131,7 +127,6 @@ class EdbSiwave(object):
             _pingroups[el.GetName()] = PinGroup(el.GetName(), el, self._pedb)
         return _pingroups
 
-    @pyedb_function_handler()
     def _create_terminal_on_pins(self, source):
         """Create a terminal on pins.
 
@@ -233,7 +228,6 @@ class EdbSiwave(object):
             pass
         return pos_pingroup_terminal.GetName()
 
-    @pyedb_function_handler()
     def create_circuit_port_on_pin(self, pos_pin, neg_pin, impedance=50, port_name=None):
         """Create a circuit port on a pin.
 
@@ -356,7 +350,6 @@ class EdbSiwave(object):
                         return positive_terminal
             return False
 
-    @pyedb_function_handler()
     def create_voltage_source_on_pin(self, pos_pin, neg_pin, voltage_value=3.3, phase_value=0, source_name=""):
         """Create a voltage source.
 
@@ -406,7 +399,6 @@ class EdbSiwave(object):
         voltage_source.negative_node.node_pins = pos_pin
         return self._create_terminal_on_pins(voltage_source)
 
-    @pyedb_function_handler()
     def create_current_source_on_pin(self, pos_pin, neg_pin, current_value=0.1, phase_value=0, source_name=""):
         """Create a current source.
 
@@ -455,7 +447,6 @@ class EdbSiwave(object):
         current_source.negative_node.node_pins = neg_pin
         return self._create_terminal_on_pins(current_source)
 
-    @pyedb_function_handler()
     def create_resistor_on_pin(self, pos_pin, neg_pin, rvalue=1, resistor_name=""):
         """Create a Resistor boundary between two given pins..
 
@@ -501,7 +492,6 @@ class EdbSiwave(object):
         resistor.negative_node.node_pins = neg_pin
         return self._create_terminal_on_pins(resistor)
 
-    @pyedb_function_handler()
     def _check_gnd(self, component_name):
         negative_net_name = None
         if self._pedb.nets.is_net_in_component(component_name, "GND"):
@@ -516,7 +506,6 @@ class EdbSiwave(object):
             raise ValueError("No GND, PGND, AGND, DGND found. Please setup the negative net name manually.")
         return negative_net_name
 
-    @pyedb_function_handler()
     def create_circuit_port_on_net(
         self,
         positive_component_name,
@@ -584,7 +573,6 @@ class EdbSiwave(object):
         circuit_port.negative_node.node_pins = neg_node_pins
         return self.create_pin_group_terminal(circuit_port)
 
-    @pyedb_function_handler()
     def create_voltage_source_on_net(
         self,
         positive_component_name,
@@ -655,7 +643,6 @@ class EdbSiwave(object):
         voltage_source.negative_node.node_pins = neg_node_pins
         return self.create_pin_group_terminal(voltage_source)
 
-    @pyedb_function_handler()
     def create_current_source_on_net(
         self,
         positive_component_name,
@@ -726,7 +713,6 @@ class EdbSiwave(object):
         current_source.negative_node.node_pins = neg_node_pins
         return self.create_pin_group_terminal(current_source)
 
-    @pyedb_function_handler()
     def create_dc_terminal(
         self,
         component_name,
@@ -773,7 +759,6 @@ class EdbSiwave(object):
         dc_source.positive_node.node_pins = pos_node_pins
         return self.create_pin_group_terminal(dc_source)
 
-    @pyedb_function_handler()
     def create_exec_file(
         self, add_dc=False, add_ac=False, add_syz=False, export_touchstone=False, touchstone_file_path=""
     ):
@@ -819,7 +804,6 @@ class EdbSiwave(object):
 
         return True if os.path.exists(file_name) else False
 
-    @pyedb_function_handler()
     def add_siwave_syz_analysis(
         self,
         accuracy_level=1,
@@ -883,7 +867,6 @@ class EdbSiwave(object):
         self.create_exec_file(add_ac=True)
         return setup
 
-    @pyedb_function_handler()
     def add_siwave_dc_analysis(self, name=None):
         """Add a Siwave DC analysis in EDB.
 
@@ -915,7 +898,6 @@ class EdbSiwave(object):
         self.create_exec_file(add_dc=True)
         return setup
 
-    @pyedb_function_handler()
     def create_pin_group_terminal(self, source):
         """Create a pin group terminal.
 
@@ -1014,7 +996,6 @@ class EdbSiwave(object):
             pass
         return pos_pingroup_terminal.GetName()
 
-    @pyedb_function_handler()
     def configure_siw_analysis_setup(self, simulation_setup=None, delete_existing_setup=True):
         """Configure Siwave analysis setup.
 
@@ -1163,7 +1144,6 @@ class EdbSiwave(object):
                 self._logger.warning("Setup {} has been delete".format(setup.GetName()))
             return self._cell.AddSimulationSetup(sim_setup)
 
-    @pyedb_function_handler()
     def _setup_decade_count_sweep(self, sweep, start_freq, stop_freq, decade_count):
         import math
 
@@ -1182,7 +1162,6 @@ class EdbSiwave(object):
             freq = freq * math.pow(10, 1.0 / decade_cnt)
             sweep.Frequencies.Add(str(freq))
 
-    @pyedb_function_handler()
     def create_rlc_component(
         self,
         pins,
@@ -1230,7 +1209,6 @@ class EdbSiwave(object):
             is_parallel=is_parallel,
         )  # pragma no cover
 
-    @pyedb_function_handler()
     def create_pin_group(self, reference_designator, pin_numbers, group_name=None):
         """Create pin group on the component.
 
@@ -1266,7 +1244,6 @@ class EdbSiwave(object):
             edb_pingroup.SetNet(names[0].GetNet())
             return group_name, self.pin_groups[group_name]
 
-    @pyedb_function_handler()
     def create_pin_group_on_net(self, reference_designator, net_name, group_name=None):
         """Create pin group on component by net name.
 
@@ -1287,7 +1264,6 @@ class EdbSiwave(object):
         pin_names = [p.GetName() for p in pins]
         return self.create_pin_group(reference_designator, pin_names, group_name)
 
-    @pyedb_function_handler()
     def create_current_source_on_pin_group(
         self, pos_pin_group_name, neg_pin_group_name, magnitude=1, phase=0, name=None
     ):
@@ -1322,7 +1298,6 @@ class EdbSiwave(object):
         pos_terminal.SetReferenceTerminal(neg_terminal)
         return True
 
-    @pyedb_function_handler()
     def create_voltage_source_on_pin_group(
         self, pos_pin_group_name, neg_pin_group_name, magnitude=1, phase=0, name=None, impedance=0.001
     ):
@@ -1357,7 +1332,6 @@ class EdbSiwave(object):
         pos_terminal.SetReferenceTerminal(neg_terminal)
         return True
 
-    @pyedb_function_handler()
     def create_voltage_probe_on_pin_group(self, probe_name, pos_pin_group_name, neg_pin_group_name, impedance=1000000):
         """Create voltage probe between two pin groups.
 
@@ -1384,13 +1358,12 @@ class EdbSiwave(object):
         else:
             probe_name = generate_unique_name("vprobe")
             pos_terminal.SetName(probe_name)
-        neg_pin_group_name = self.pin_groups[neg_pin_group_name]
-        neg_terminal = neg_pin_group_name.create_voltage_probe_terminal()
+        neg_pin_group = self.pin_groups[neg_pin_group_name]
+        neg_terminal = neg_pin_group.create_voltage_probe_terminal()
         neg_terminal.SetName(probe_name + "_ref")
         pos_terminal.SetReferenceTerminal(neg_terminal)
         return not pos_terminal.IsNull()
 
-    @pyedb_function_handler()
     def create_circuit_port_on_pin_group(self, pos_pin_group_name, neg_pin_group_name, impedance=50, name=None):
         """Create a port between two pin groups.
 
@@ -1417,13 +1390,12 @@ class EdbSiwave(object):
         else:
             name = generate_unique_name("port")
             pos_terminal.SetName(name)
-        neg_pin_group_name = self.pin_groups[neg_pin_group_name]
-        neg_terminal = neg_pin_group_name.create_port_terminal(impedance)
+        neg_pin_group = self.pin_groups[neg_pin_group_name]
+        neg_terminal = neg_pin_group.create_port_terminal(impedance)
         neg_terminal.SetName(name + "_ref")
         pos_terminal.SetReferenceTerminal(neg_terminal)
         return True
 
-    @pyedb_function_handler
     def place_voltage_probe(
         self,
         name,