use labRemote's isOn() function for iviscan

libDCS/iviscan.py

@@ -79,8 +79,8 @@ def ramp(varName, pschannel, target, step = None, tsleep = None):
     # Get current values of V and I
     xmeas = measXvar()
     ymeas = measYvar()
-    #isOn = pschannel.getPowerSupply().isOn(pschannel.getChannel())
-    isOn = (measXvar() != 0 or measYvar() != 0)
+    isOn = pschannel.getPowerSupply().isOn(pschannel.getChannel())
+    # isOn = (measXvar() != 0 or measYvar() != 0)
     
     diff = target - xmeas
     logging.debug(varName + " difference (target - meas): " + str(diff) + " " + xUnit)
@@ -180,8 +180,8 @@ def doivi(config, w, dbSink=""):
     step = ch["step_size"]
 
     startX = measXvar()
-    #wasOn = ps.isOn()
-    wasOn = (measXvar() != 0 or measYvar() != 0)
+    wasOn = ps.isOn()
+    # wasOn = (measXvar() != 0 or measYvar() != 0)
 
 
     # Ramp to the starting point if PSU is already on