update ramp code for python 3 exceptions

tcaduser · tcaduser · commit 9794fa6d49df · 2021-08-04T20:21:31.000-05:00
diff --git a/python_packages/ramp.py b/python_packages/ramp.py
@@ -13,23 +13,23 @@
 # limitations under the License.
 
 import sys
-sys.path.append('../../python_packages')
-from devsim import *
-import devsim
+import devsim as ds
 from .simple_physics import *
 
 def rampbias(device, contact, end_bias, step_size, min_step, max_iter, rel_error, abs_error, callback):
     '''
       Ramps bias with assignable callback function
     '''
-    start_bias=get_parameter(device=device, name=GetContactBiasName(contact))
+    start_bias = ds.get_parameter(device=device, name=GetContactBiasName(contact))
     if (start_bias < end_bias):
         step_sign=1
     else:
         step_sign=-1
+    step_size=abs(step_size)
+
     last_bias=start_bias
     while(abs(last_bias - end_bias) > min_step):
-        print(("last end %e %e") % (last_bias, end_bias))
+        print(("%s last end %e %e") % (contact, last_bias, end_bias))
         next_bias=last_bias + step_sign * step_size
         if next_bias < end_bias:
             next_step_sign=1
@@ -40,17 +40,17 @@ def rampbias(device, contact, end_bias, step_size, min_step, max_iter, rel_error
             next_bias=end_bias
             print("setting to last bias %e" % (end_bias))
             print("setting next bias %e" % (next_bias))
-        set_parameter(device=device, name=GetContactBiasName(contact), value=next_bias)
+        ds.set_parameter(device=device, name=GetContactBiasName(contact), value=next_bias)
         try:
-            solve(type="dc", absolute_error=abs_error, relative_error=rel_error, maximum_iterations=max_iter)
-        except devsim.error as msg:
-            if msg[0].find("Convergence failure") != 0:
+            ds.solve(type="dc", absolute_error=abs_error, relative_error=rel_error, maximum_iterations=max_iter)
+        except ds.error as msg:
+            if str(msg).find("Convergence failure") != 0:
                 raise
-            set_parameter(device=device, name=GetContactBiasName(contact), value=last_bias)
+            ds.set_parameter(device=device, name=GetContactBiasName(contact), value=last_bias)
             step_size *= 0.5
             print("setting new step size %e" % (step_size))
             if step_size < min_step:
-                raise "Min step size too small"
+                raise RuntimeError("Minimum step size too small")
             continue
         print("Succeeded")
         last_bias=next_bias
@@ -60,6 +60,6 @@ def printAllCurrents(device):
     '''
       Prints all contact currents on device
     '''
-    for c in get_contact_list(device=device):
+    for c in ds.get_contact_list(device=device):
         PrintCurrents(device, c)
 
