energy debug

build/lib/iexcode/instruments/IEX_VPU.py

@@ -400,10 +400,10 @@ def ID_energy_set(keV,verbose=True):
 
     Previously: SetID
     """
-    ID_mode = ID_mode_list()[ID_state_get()]
+    ID_mode = ID_mode_get(verbose=False)
     mono_grating = mono_grating_get()
-    QP_ratio = ID_QP_ratio_get()[0]
-    eV = keV/1000.0
+    QP_ratio = ID_QP_ratio_get(verbose=False)[0]
+    eV = keV*1000.0
     keV = ID_calc_eV(mono_grating,ID_mode,eV,QP_ratio)/1000.0
     ID_set(keV,verbose=verbose) 
 
@@ -417,6 +417,7 @@ def ID_energy_set_eV(eV,verbose=True):
     Previously: SetID
     """
     keV = eV/1000.0
+    print("setting ID = "+str(eV)+" ("+str(keV)+" keV)")
     ID_energy_set(keV,verbose=verbose)
 
 def ID_set_eV(eV,verbose=True):

build/lib/iexcode/instruments/xrays.py

@@ -238,11 +238,11 @@ def energy(hv_eV,slit_coeff=1,m3r=True,verbose=True):
     Previously: Set_BL, energy
     """
     if hv_eV != _energy_range_check(hv_eV):
-        message_string = 'request photon energy '+str(hv_eV)+' not with the allowed range'
+        message_string = 'Requested photon energy '+str(hv_eV)+' not with the allowed range'
         message_string = '\n closest allowed energy is '+str(_energy_range_check(hv_eV))
         print_warning_message(message_string)
 
-
+    print(hv_eV)
     ID_energy_set_eV(hv_eV,verbose=verbose)
     mono_energy_set(hv_eV,verbose=verbose)
     apertures_set(c_2B=slit_coeff,c_1A=1,verbose=verbose)

iexcode/instruments/IEX_VPU.py

@@ -400,10 +400,10 @@ def ID_energy_set(keV,verbose=True):
 
     Previously: SetID
     """
-    ID_mode = ID_mode_list()[ID_state_get()]
+    ID_mode = ID_mode_get(verbose=False)
     mono_grating = mono_grating_get()
-    QP_ratio = ID_QP_ratio_get()[0]
-    eV = keV/1000.0
+    QP_ratio = ID_QP_ratio_get(verbose=False)[0]
+    eV = keV*1000.0
     keV = ID_calc_eV(mono_grating,ID_mode,eV,QP_ratio)/1000.0
     ID_set(keV,verbose=verbose) 
 
@@ -417,6 +417,7 @@ def ID_energy_set_eV(eV,verbose=True):
     Previously: SetID
     """
     keV = eV/1000.0
+    print("setting ID = "+str(eV)+" ("+str(keV)+" keV)")
     ID_energy_set(keV,verbose=verbose)
 
 def ID_set_eV(eV,verbose=True):

iexcode/instruments/xrays.py

@@ -238,11 +238,10 @@ def energy(hv_eV,slit_coeff=1,m3r=True,verbose=True):
     Previously: Set_BL, energy
     """
     if hv_eV != _energy_range_check(hv_eV):
-        message_string = 'request photon energy '+str(hv_eV)+' not with the allowed range'
+        message_string = 'Requested photon energy '+str(hv_eV)+' not with the allowed range'
         message_string = '\n closest allowed energy is '+str(_energy_range_check(hv_eV))
         print_warning_message(message_string)
 
-
     ID_energy_set_eV(hv_eV,verbose=verbose)
     mono_energy_set(hv_eV,verbose=verbose)
     apertures_set(c_2B=slit_coeff,c_1A=1,verbose=verbose)