fixed scanXAS

build/lib/iexcode/instruments/IEX_VPU.py

@@ -32,9 +32,8 @@ def ID_pvs():
         'energy_sp':pv+'EnergySet.VAL',
         'start_ramp':pv+'StartRamp.VAL',
         'energy_eV_rbv':pv+'EnergyRBV',
-        'energy_eV_sp':pv+'EnergyScanSeteV.VAL',
-        'scan_val':pv+'EnergyScanSeteV.VAL',
-        'scan_rbv':pv+'EnergyRBV',
+        'energy_eV_sp':pv+'EnergyScanSeteV',
+        'scan_val':pv+'EnergyScanSeteV',
         'table_dir':pv+'TableDirection',
         'By_q':pv+'ByqRdbk',
         'Bx_q':pv+'BxqRdbk',
@@ -537,7 +536,7 @@ def ID_scan_pvs():
     returns the rbv and val for scanning 
     """
     val_pv=ID_pvs()['scan_val']
-    rbv_pv=ID_pvs()['scan_rbv']
+    rbv_pv=""
     return rbv_pv, val_pv
 
 def ID_scan_fillin(mda,scan_dim,start,stop,step,**kwargs):

iexcode/instruments/IEX_VPU.py

@@ -32,9 +32,8 @@ def ID_pvs():
         'energy_sp':pv+'EnergySet.VAL',
         'start_ramp':pv+'StartRamp.VAL',
         'energy_eV_rbv':pv+'EnergyRBV',
-        'energy_eV_sp':pv+'EnergyScanSeteV.VAL',
-        'scan_val':pv+'EnergyScanSeteV.VAL',
-        'scan_rbv':pv+'EnergyRBV',
+        'energy_eV_sp':pv+'EnergyScanSeteV',
+        'scan_val':pv+'EnergyScanSeteV',
         'table_dir':pv+'TableDirection',
         'By_q':pv+'ByqRdbk',
         'Bx_q':pv+'BxqRdbk',
@@ -339,15 +338,6 @@ def _ID_write_SP_proc(keV):
     sleep(1)
 
 
-def _ID_bw_ok(keV):
-    ID_SP = ID_get_sp(verbose=False)
-    ID_bw = ID_SP * 0.095
-    ID_diff = abs(ID_get()-keV)
-    if ID_diff > ID_bw:
-        return False
-    else:
-        return True
-
 def ID_set(keV,verbose=True):
     """
     "Sets the ID set point to a specific value (hv(eV)) which will not likely be optimum"
@@ -537,7 +527,7 @@ def ID_scan_pvs():
     returns the rbv and val for scanning 
     """
     val_pv=ID_pvs()['scan_val']
-    rbv_pv=ID_pvs()['scan_rbv']
+    rbv_pv=""
     return rbv_pv, val_pv
 
 def ID_scan_fillin(mda,scan_dim,start,stop,step,**kwargs):