From 46d7b77346aec5e7ccccd7ed6218d6c5097087e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Le=20Guyader?= <loic.le.guyader@xfel.eu>
Date: Fri, 20 May 2022 16:14:09 +0200
Subject: [PATCH] Flat field mean regularization computed on ratio
---
src/toolbox_scs/routines/boz.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/toolbox_scs/routines/boz.py b/src/toolbox_scs/routines/boz.py
index aaeb08d..bcdc92c 100644
--- a/src/toolbox_scs/routines/boz.py
+++ b/src/toolbox_scs/routines/boz.py
@@ -1054,16 +1054,17 @@ def ff_refine_crit(p, alpha, params, arr_dark, arr, tid, rois,
# drop saturated shots
d = data.where(data['sat_sat'] == False, drop=True)
- rn = xas(d, 40, Iokey='0', Itkey='n', nrjkey='0')
- rp = xas(d, 40, Iokey='0', Itkey='p', nrjkey='0')
- rd = xas(d, 40, Iokey='p', Itkey='n', nrjkey='0')
+ rn = xas(d, 40, Iokey='0', Itkey='n', nrjkey='0', fluorescence=True)
+ rp = xas(d, 40, Iokey='0', Itkey='p', nrjkey='0', fluorescence=True)
+ rd = xas(d, 40, Iokey='p', Itkey='n', nrjkey='0', fluorescence=True)
- err = np.nansum(rn['sigmaA']) + np.nansum(rp['sigmaA']) + np.nansum(rd['sigmaA'])
- mean = ((1.0 - np.nanmean(rn['muA']))**2 +
- (1.0 - np.nanmean(rp['muA']))**2 +
- (1.0 - np.nanmean(rd['muA']))**2)
+ err_sigma = (np.nansum(rn['sigmaA']) + np.nansum(rp['sigmaA'])
+ + np.nansum(rd['sigmaA']))
+ err_mean = ((1.0 - np.nanmean(rn['muA']))**2 +
+ (1.0 - np.nanmean(rp['muA']))**2 +
+ (1.0 - np.nanmean(rd['muA']))**2)
- return 1e3*(err*alpha + (1-alpha)*mean)
+ return 1e3*(alpha*err_sigma + (1-alpha)*err_mean)
def ff_refine_fit(params):
--
GitLab