IOfile refactor

spice/spice_common.py

@@ -6,6 +6,7 @@
 Mix-in class of common properties and methods for spice simulator classes
 
 """
+
 import os
 import sys
 import subprocess
@@ -15,7 +16,8 @@
 from spice.spice_methods import spice_methods
 import pdb
 
-class spice_common(spice_methods,thesdk):
+
+class spice_common(spice_methods, thesdk):
     """
     Common properties and methods for spice simulator tool classes.
     Most of these are overloaded in __init__.py
@@ -24,47 +26,14 @@ class spice_common(spice_methods,thesdk):
 
     @property
     def extracts(self):
-        """ Bundle
+        """Bundle
 
         A thesdk.Bundle containing extracted quantities.
         """
-        if not hasattr(self,'_extracts'):
-            self._extracts=Bundle()
+        if not hasattr(self, "_extracts"):
+            self._extracts = Bundle()
         return self._extracts
-    @extracts.setter
-    def extracts(self,value):
-        self._extracts=value
-
-    #### [TODO] To be relocated
-    # Strobing related stuff should not be in this class. Maybe spice_iofile or 
-    # testbench also suposedly these are spectre specific
-    @property
-    def strobe_indices(self):
-        """
-        Internally set list of indices corresponding to time,amplitude pairs
-        whose time value of is a multiple of the strobeperiod (see spice_simcmd).
-        """
-        if not hasattr(self,'_strobe_indices'):
-            self._strobe_indices=[]
-        return self._strobe_indices
-
-    @strobe_indices.setter
-    def strobe_indices(self,val):
-        if isinstance(val, list) or isinstance(val, np.ndarray):
-            self._strobe_indices=val
-        else:
-            self.print_log(type='W', msg='Cannot set strobe_indices to be of type: %s' % type(val))
-
-    @property
-    def is_strobed(self):
-        '''
-        Check if simulation was strobed or not
-        '''
-        if not hasattr(self, '_is_strobed'):
-            self._is_strobed=False
-            for simtype, simcmd in self.simcmd_bundle.Members.items():
-                if simtype=='tran':
-                    if simcmd.strobeperiod:
-                        self._is_strobed=True
-        return self._is_strobed
 
+    @extracts.setter
+    def extracts(self, value):
+        self._extracts = value

spice/spice_dcsource.py

@@ -12,12 +12,13 @@
 
 import os
 import sys
-from abc import * 
+from abc import *
 from thesdk import *
 from thesdk.iofile import iofile
 import numpy as np
 import pandas as pd
 
+
 class spice_dcsource(thesdk):
     """
     Class to provide DC source definitions to spice testbench.  When
@@ -26,7 +27,7 @@ class spice_dcsource(thesdk):
 
     Attributes
     ----------
-    parent : object 
+    parent : object
         The parent object initializing the spice_dcsource instance. Default
         None.
     name : str
@@ -77,32 +78,34 @@ class spice_dcsource(thesdk):
 
     @property
     def _classfile(self):
-        return os.path.dirname(os.path.realpath(__file__)) + "/"+__name__
+        return os.path.dirname(os.path.realpath(__file__)) + "/" + __name__
 
-    def __init__(self,parent,**kwargs):
-        try:  
+    def __init__(self, parent, **kwargs):
+        try:
             self.parent = parent
-            self.sourcetype=kwargs.get('sourcetype','V')
-            self.name=kwargs.get('name','sourcename')
-            self.pos=kwargs.get('pos','POSNODE')
-            self.neg=kwargs.get('neg','NEGNODE')
-            self.value=kwargs.get('value',0)
-            self.paramname=kwargs.get('paramname', None)
-            self.extract=kwargs.get('extract',False)
-            self.ext_start=kwargs.get('ext_start',None)
-            self.ext_stop=kwargs.get('ext_stop',None)
-            self.noise=kwargs.get('noise',True)
-            self.ramp=kwargs.get('ramp',0)
+            self.sourcetype = kwargs.get("sourcetype", "V")
+            self.name = kwargs.get("name", "sourcename")
+            self.pos = kwargs.get("pos", "POSNODE")
+            self.neg = kwargs.get("neg", "NEGNODE")
+            self.value = kwargs.get("value", 0)
+            self.paramname = kwargs.get("paramname", None)
+            self.extract = kwargs.get("extract", False)
+            self.ext_start = kwargs.get("ext_start", None)
+            self.ext_stop = kwargs.get("ext_stop", None)
+            self.noise = kwargs.get("noise", True)
+            self.ramp = kwargs.get("ramp", 0)
         except:
-            self.print_log(type='F', msg="Spice DC source definition failed.")
+            self.print_log(type="F", msg="Spice DC source definition failed.")
         # This enables e.g. DC sweeps
-        if isinstance(self.paramname, str): # Parameterized source
-            if isinstance(self.paramname, str): # Cannot use string as default value, parameter value set by sweep
-                self.parent.spiceparameters.update({self.paramname: '0'})
+        if isinstance(self.paramname, str):  # Parameterized source
+            if isinstance(
+                self.paramname, str
+            ):  # Cannot use string as default value, parameter value set by sweep
+                self.parent.spiceparameters.update({self.paramname: "0"})
             else:
-                self.parent.spiceparameters.update({self.paramname:self.value})
-        if hasattr(self.parent,'dcsource_bundle'):
-            self.parent.dcsource_bundle.new(name=self.name,val=self)
+                self.parent.spiceparameters.update({self.paramname: self.value})
+        if hasattr(self.parent, "dcsource_bundle"):
+            self.parent.dcsource_bundle.new(name=self.name, val=self)
 
     @property
     def ext_file(self):
@@ -111,10 +114,14 @@ def ext_file(self):
         Optional filepath for extracted transient current when
         self.extract=True.
         """
-        if not hasattr(self,'_ext_file'):
-            self._ext_file = '%s/tb_%s.print' % (self.parent.simpath,self.parent.name)
+        if not hasattr(self, "_ext_file"):
+            self._ext_file = "%s/tb_%s.print" % (
+                self.parent.simpath,
+                self.parent.name,
+            )
         return self._ext_file
+
     @ext_file.setter
-    def ext_file(self,val):
-        self._ext_file=val
+    def ext_file(self, val):
+        self._ext_file = val
         return self._ext_file