proper upper limit for Vlimit and increased dwell timev0.2

1 files changed, 5 insertions, 1 deletions

diff --git a/qolab/hardware/power_supply/keysight_e3612a.py b/qolab/hardware/power_supply/keysight_e3612a.py
index 5977e91..7b1dee2 100644
--- a/qolab/hardware/power_supply/keysight_e3612a.py
+++ b/qolab/hardware/power_supply/keysight_e3612a.py
@@ -71,6 +71,10 @@ class KeysightE3612A(PowerSupplySCPI):
 
     @BasicInstrument.tsdb_append
     def setChanVlimit(self, chNum, val):
+        if chNum == 1 and val > 6.180:
+            val = 6.180
+        if (chNum == 2 or chNum == 3) and val > 25.750:
+            val = 25.750
         cmnd = f'SOURCe:VOLT {val},(@{chNum})'
         rstr = self.write(cmnd)
 
@@ -81,7 +85,7 @@ class KeysightE3612A(PowerSupplySCPI):
         return( float(rstr) )
 
     @BasicInstrument.tsdb_append
-    def setChanIout(self, chNum, val, currentPrecision=5e-6, currentHeadRoom=1e-3, dwellTime=0.1):
+    def setChanIout(self, chNum, val, currentPrecision=5e-6, currentHeadRoom=1e-3, dwellTime=0.3):
         """
         Tuning Vout to achieve desired Iout.
         Generally setting current limit will maintain current near but not exact to desired.