replaced start ramp or id_set

iexcode/instruments/IEX_VPU.py

@@ -211,18 +211,15 @@ def ID_power_status():
     """
     gets if the ID power supplies are On or Off
     """
-    ID_OnOff=caget(ID_pvs()['main_power'])
-    if ID_OnOff == 1: 
-        return 'Off'
-    elif ID_OnOff == 0:
-        return 'On' 
+    ID_OnOff=caget(ID_pvs()['main_power'],as_string=True)
+    return ID_OnOff
 
 def ID_off(verbose=True):
     """
     waits for permission then turns on the main coils OFF    
     """
     ID_wait_for_permission(verbose=False)
-    caput(ID_pvs()['main_power'],1,wait=True,timeout=18000)
+    caput(ID_pvs()['main_power'],'Off',wait=True,timeout=18000)
     sleep(5)
     if verbose:
         print("ID is now off")
@@ -238,7 +235,7 @@ def ID_on(verbose=True):
         print("Starting ID  -  "+dateandtime())
     
     #caput(ID_pvs()['energy_sp'],3.8)
-    caput(ID_pvs()['main_power'],0,wait=True,timeout=18000)
+    caput(ID_pvs()['main_power'],'On',wait=True,timeout=18000)
     sleep(5)
 
 def ID_start(ID_mode='RCP',QP_ratio=None, verbose=True):
@@ -308,10 +305,14 @@ def ID_get_eV(verbose=False):
     return ID_RBV 
 
 def _ID_write_SP_proc(keV):
-    ramp_delay=5
-    caput(ID_pvs()['energy_sp'],keV,wait=True,timeout=18000)
-    sleep(ramp_delay)
-    caput(ID_pvs()['start_ramp'],1,wait=True,timeout=18000)
+    # pressing ramp button doesn't work
+    # ramp_delay=5
+    # caput(ID_pvs()['energy_sp'],keV,wait=True,timeout=18000)
+    # sleep(ramp_delay)
+    # caput(ID_pvs()['start_ramp'],1,wait=True,timeout=18000)
+    caput(ID_pvs()['energy_eV_sp'],keV,wait=True,timeout=18000)
+    sleep(1)
+
 
 def _ID_bw_ok(keV):
     ID_SP = caget(ID_pvs()['energy_sp'])
@@ -355,7 +356,7 @@ def ID_set(keV,verbose=True):
             ID_ready(verbose=False)
 
             #check if ID within some bandwidth
-            if _ID_bw_ok(ID_SP):
+            if _ID_bw_ok(keV):
                 if verbose:
                     ID_SP = caget(ID_pvs()['energy_sp'])
                     ID_RBV = ID_get()