debug

iexcode/instruments/IEX_VPU.py

@@ -411,8 +411,9 @@ def ID_energy_set(keV,verbose=True):
     mono_grating = mono_grating_get()
     QP_ratio = ID_QP_ratio_get(verbose=False)
     if QP_ratio[1] == None:
-        ID_off()
-        ID_on()
+        #ID_off() #JM look here
+        #ID_on()
+        print_warning_message('check QP')
     eV = keV*1000.0
     keV = ID_calc_eV(mono_grating,ID_mode,eV,QP_ratio[0])/1000.0
     ID_set(keV,verbose=verbose) 

iexcode/instruments/shutters.py

@@ -110,6 +110,7 @@ def branch_shutter_close(branch=None,verbose=False):
         branch = iex.BL.branch
     caput("PC:29ID:S"+branch.upper()+"S_CLOSE_REQUEST.VAL",1,wait=True,timeout=18000)
     print("Closing "+branch.upper()+"-Shutter...")
+    sleep(10)
 
 
 def branch_shutter_open(branch=None,verbose=False):

iexcode/instruments/xrays.py

@@ -408,6 +408,7 @@ def scanXAS(hv_list,ID_tracking=False, **kwargs):
         Note duplicates are removed and the resulting array is sorted in ascending order
 
     **kwargs:
+        ID_offset: used to fix ID calibration ID_setpoing = ID_setpoint + ID_offset
         scan_dim = 1 (default)
         average_pnts: if using Keithlys this set the averaging; None for no averaging
         m3r: if True the mirror is optimized before the start of the scan
@@ -423,12 +424,17 @@ def scanXAS(hv_list,ID_tracking=False, **kwargs):
     kwargs.setdefault("m3r",True)
     kwargs.setdefault("mcp",True)    
     kwargs.setdefault('execute',True)   
+    kwargs.setdefault('ID_offset',0)  
     
     #Setting up the ScanRecord for Mono and ID in Table mode
     mono_array,ID_array = BL_energy_tables(hv_list,**kwargs)
     #break is mono_array has no points
     if len(list(mono_array)) == 0:
+        print_warning_message('hv_list as no points' )
         return
+    #adding offset to ID values
+    ID_array = ID_array + kwargs['ID_offset']
+
     kwargs.update({'positioner_num':1})
     mono_scan_table(mono_array,execute=False)
     if ID_tracking == True: