debug

build/lib/iexcode/instruments/IEX_VPU.py

@@ -413,9 +413,7 @@ def ID_set_eV(eV,verbose=True):
     """
     keV=eV/1000.0
     ID_set(keV,verbose=verbose)
-
-
-    
+   
 def ID_QP_ratio_get(verbose=True):
     """
     gets the read back for the QP ratio
@@ -524,17 +522,17 @@ def ID_scan_pvs():
     """
     val_pv=ID_pvs()['scan_val_eV']
     rbv_pv=""
-    return rbv_pv, val_pv
+    return val_pv, rbv_pv 
 
-def ID_scan_fillin(mda,scan_dim,start,stop,step,**kwargs):
+def ID_scan_fillin(start,stop,step,**kwargs):
     """
     fills in the scanRecord for scanning the ID set point
 
     **kwargs => scanRecord.fillin kwargs
     """
     #Setting up the ScanRecord for ID in Table mode
-    rbv_pv, val_pv  = ID_scan_pvs()
-    iex.BL.mda.fillin(scan_dim,rbv_pv,val_pv,start,stop,step,**kwargs)
+    val_pv, rbv_pv  = ID_scan_pvs()
+    iex.BL.mda.fillin(val_pv,rbv_pv,start,stop,step,**kwargs)
 
 
 def ID_scan_fillin_table(ID_array,**kwargs):
@@ -544,8 +542,8 @@ def ID_scan_fillin_table(ID_array,**kwargs):
     **kwargs => scanRecord.fillin kwargs
     """
     #Setting up the ScanRecord for ID in Table mode
-    rbv_pv, val_pv = ID_scan_pvs()
-    iex.BL.mda.fillin_table(rbv_pv,val_pv,ID_array,**kwargs)
+    val_pv, rbv_pv  = ID_scan_pvs()
+    iex.BL.mda.fillin_table(val_pv,rbv_pv,ID_array,**kwargs)
 
 ##############################################################################################################
 ##############################             ID direction table        ##############################

build/lib/iexcode/instruments/utilities.py

@@ -138,7 +138,7 @@ def make_table(start_stop_step_lists):
     Previously: Scan_MakeTable           
     """
     table_array=np.array([])
-    if type(start_stop_step_lists) is not list:
+    if type(start_stop_step_lists[0]) is not list:
         start = start_stop_step_lists[0]
         stop = start_stop_step_lists[1]
         step = start_stop_step_lists[2]
@@ -148,9 +148,13 @@ def make_table(start_stop_step_lists):
             j+=step
     else:
         for i in range(0,len(start_stop_step_lists)):
+            if type(start_stop_step_lists[i]) != list:
+                print_warning_message("start_stop_step_lists must be a list of list")
             start=start_stop_step_lists[i][0]
             stop=start_stop_step_lists[i][1]
             step=start_stop_step_lists[i][2]
+            if stop <= start:
+                print_warning_message('start_stop_step_lists needs to be in assending order')
             j=start
             while j<=stop:
                 table_array=np.append(table_array, j)

build/lib/iexcode/instruments/xrays.py

@@ -415,6 +415,9 @@ def scanXAS(start_stop_step_lists,ID_eV=None,ID_tracking=False, **kwargs):
     
     #Setting up the ScanRecord for Mono and ID in Table mode
     mono_array,ID_array = BL_energy_tables(start_stop_step_lists,**kwargs)
+    #break is mono_array has no points
+    if len(list(mono_array)) == 0:
+        return
     kwargs.update({'positioner_num':1})
     mono_scan_table(mono_array,execute=False)
     if ID_tracking == True:
@@ -462,6 +465,8 @@ def BL_energy_tables(start_stop_step_lists,**kwargs):
     """
     kwargs.setdefault('QP_ratio', 100)
     mono_array = make_table(start_stop_step_lists)
+    if len(list(mono_array)) == 0:
+        print_warning_message('mono_array is length 0, check start_stop_step_lists')
     ID_array=np.array([])
     ID_mode,ID_QP_ratio,ID_sp,ID_rbv,hv,grt = energy_get_all(verbose=False)
     for hv_eV in mono_array:

iexcode/launch_ARPES.py

-import iexcode.instruments.cfg as iex
-
-from iexcode.instruments.ARPES import *
-from iexcode.instruments.bakeout import * #not tested
-from iexcode.instruments.conversions_constants import *
-from iexcode.instruments.current_amplifiers import * #need to test SRS
-from iexcode.instruments.diagnostics import *
-from iexcode.instruments.electron_analyzer import * #didn't test, but not much changed
-from iexcode.instruments.encoders import * #didn't test encoder reset
-from iexcode.instruments.files_and_folders import *
-from iexcode.instruments.FMB_mirrors import *
-#from iexcode.instruments.hxp_mirrors import *
-from iexcode.instruments.IEX_cameras import *
-from iexcode.instruments.IEX_VPU import * #need to test with ID
-#from iexcode.instruments.kappa_angle_calcs import *
-#from iexcode.instruments.Kappa_det import *
-#from iexcode.instruments.Kappa import *
-from iexcode.instruments.Lakeshore_335 import *#didnt' test mostly hardcoded
-from iexcode.instruments.Logfile import * #
-from iexcode.instruments.m3r import *
-from iexcode.instruments.Motors import *
-#from iexcode.instruments.MPA import *
-from iexcode.instruments.Octupole import *
-#from iexcode.instruments.remote_controlers import *
-#from iexcode.instruments.resolution import *
-#from iexcode.instruments.s29_temp_cntl import *
-from iexcode.instruments.scalers import *
-from iexcode.instruments.scanRecord import *
-from iexcode.instruments.Scienta import *
-from iexcode.instruments.shutters import * #didn't do main shutter
-from iexcode.instruments.slits import *
-#from iexcode.instruments.spec_stuff import *
-from iexcode.instruments.staff import *
-from iexcode.instruments.storage_ring import *
-from iexcode.instruments.userCalcs import *
-from iexcode.instruments.utilities import *
-from iexcode.instruments.valves import *
-from iexcode.instruments.VLS_PGM import *
-from iexcode.instruments.utilities import *
-#from iexcode.instruments.vortex import *
-from iexcode.instruments.xrays import *
-
-
-

iexcode/launch_Kappa.py

-from iexcode.instruments.diagnostics import diode_d, mesh_d, mesh_d_read
-
-
-
-from iexcode.instruments.kappa_angle_calcs import * 
-from iexcode.instruments.kappa_det import * 
-from iexcode.instruments.kappa import * 
-
-from iexcode.instruments.MPA import * 
-from iexcode.instruments.vortex import * 
-from iexcode.instruments.spec_stuff import * 
-

iexcode/launch_all.py

-import iexcode.instruments.cfg as iex
-
-from iexcode.instruments.ARPES import *
-from iexcode.instruments.bakeout import * #not tested
-from iexcode.instruments.conversions_constants import *
-from iexcode.instruments.current_amplifiers import * #need to test SRS
-from iexcode.instruments.diagnostics import *
-from iexcode.instruments.electron_analyzer import * #didn't test, but not much changed
-from iexcode.instruments.encoders import * #didn't test encoder reset
-from iexcode.instruments.files_and_folders import *
-from iexcode.instruments.FMB_mirrors import *
-#from iexcode.instruments.hxp_mirrors import *
-from iexcode.instruments.IEX_cameras import *
-from iexcode.instruments.IEX_VPU import * #need to test with ID
-#from iexcode.instruments.kappa_angle_calcs import *
-#from iexcode.instruments.Kappa_det import *
-#from iexcode.instruments.Kappa import *
-from iexcode.instruments.Lakeshore_335 import *#didnt' test mostly hardcoded
-from iexcode.instruments.Logfile import * #
-from iexcode.instruments.m3r import *
-from iexcode.instruments.Motors import *
-#from iexcode.instruments.MPA import *
-from iexcode.instruments.Octupole import *
-#from iexcode.instruments.remote_controlers import *
-#from iexcode.instruments.resolution import *
-#from iexcode.instruments.s29_temp_cntl import *
-from iexcode.instruments.scalers import *
-from iexcode.instruments.scanRecord import *
-from iexcode.instruments.Scienta import *
-from iexcode.instruments.shutters import * #didn't do main shutter
-from iexcode.instruments.slits import *
-#from iexcode.instruments.spec_stuff import *
-from iexcode.instruments.staff import *
-from iexcode.instruments.storage_ring import *
-from iexcode.instruments.userCalcs import *
-from iexcode.instruments.utilities import *
-from iexcode.instruments.valves import *
-from iexcode.instruments.VLS_PGM import *
-from iexcode.instruments.utilities import *
-#from iexcode.instruments.vortex import *
-from iexcode.instruments.xrays import *
-
-from iexplot import *
-

iexcode/launch_staff.py

-from iexcode.instruments.bakeout import * 
-from iexcode.instruments.diagnostics import mesh_W
-from iexcode.instruments.encoders import *
-from iexcode.instruments.files_and_folders import *
-from iexcode.instruments.hxp_mirrors import *
-from iexcode.instruments.IEX_BL_config import *
-from iexcode.instruments.m3r import *
-from iexcode.instruments.slits import *
-from iexcode.instruments.staff import *
-from iexcode.instruments.userCalcs import *
-from iexcode.instruments.valves import *
-from iexcode.instruments.VLS_PGM import *
-
-
-
-

iexcode/launch_xrays.py

-from iexcode.instruments.IEX_VPU import ID_get_all,ID_off,ID_start,ID_restart
-from iexcode.instruments.m3r import m3r_centroid,m3r_align,m3r_tweak_pitch 
-from iexcode.instruments.xrays import * 
-from iexcode.instruments.slits import exit_slit
-from iexcode.instruments.storage_ring import wait_for_beam
-from iexcode.instruments.valves import branch_valve_open, branch_valve_close
-from iexcode.instruments.xrays import *
\ No newline at end of file