From 241c2a9779a11e226753b761cff57fb9208c4a94 Mon Sep 17 00:00:00 2001 From: JakHolzer <53743814+JakHolzer@users.noreply.github.com> Date: Fri, 18 Dec 2020 16:23:14 +0100 Subject: [PATCH] Correction of normalization suggested by Dr. Zolliker --- pyzebra/merge_function.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyzebra/merge_function.py b/pyzebra/merge_function.py index 5524390..9b02a39 100644 --- a/pyzebra/merge_function.py +++ b/pyzebra/merge_function.py @@ -22,7 +22,7 @@ def normalize(scan, monitor): counts = np.array(scan["Counts"]) sigma = np.sqrt(counts) if "sigma" not in scan else scan["sigma"] - monitor_ratio = monitor / scan["monitor"] + monitor_ratio = scan["monitor"] / monitor scaled_counts = counts * monitor_ratio scaled_sigma = np.array(sigma) * monitor_ratio @@ -68,7 +68,7 @@ def merge(scan1, scan2, keep=True, monitor=100000): sigma1, sigma2 = sorted_t[i][2], sorted_t[i + 1][2] count_err1 = u.ufloat(counts1, sigma1) count_err2 = u.ufloat(counts2, sigma2) - avg = (count_err1 + count_err2) / 2 + avg = (count_err1 + count_err2) / ((scan1["monitor"] + scan2["monitor"])/monitor) Counts = np.append(Counts, avg.n) sigma = np.append(sigma, avg.s) seen.append(sorted_t[i][0])