From 9cf837021f34108c3ae68ae36d4b3c20a0a9fed3 Mon Sep 17 00:00:00 2001
From: "FR@29iduser" <rodolakis@anl.gov>
Date: Sat, 17 Sep 2022 20:11:28 -0500
Subject: [PATCH] energy debug
---
build/lib/iexcode/instruments/IEX_VPU.py | 7 ++++---
build/lib/iexcode/instruments/xrays.py | 4 ++--
iexcode/instruments/IEX_VPU.py | 7 ++++---
iexcode/instruments/xrays.py | 3 +--
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/build/lib/iexcode/instruments/IEX_VPU.py b/build/lib/iexcode/instruments/IEX_VPU.py
index 20d0c89..c30f5af 100644
--- a/build/lib/iexcode/instruments/IEX_VPU.py
+++ b/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):
diff --git a/build/lib/iexcode/instruments/xrays.py b/build/lib/iexcode/instruments/xrays.py
index 561d76a..0e6b7bd 100644
--- a/build/lib/iexcode/instruments/xrays.py
+++ b/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)
diff --git a/iexcode/instruments/IEX_VPU.py b/iexcode/instruments/IEX_VPU.py
index 20d0c89..c30f5af 100644
--- a/iexcode/instruments/IEX_VPU.py
+++ b/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):
diff --git a/iexcode/instruments/xrays.py b/iexcode/instruments/xrays.py
index 561d76a..f34ee53 100644
--- a/iexcode/instruments/xrays.py
+++ b/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)
--
GitLab