zebra/pyzebra
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correction of normalization

Browse Source 
suggested by Dr. Zolliker
This commit is contained in:
JakHolzer 2020-12-18 16:23:14 +01:00 committed by GitHub
parent 8c265027bf
commit 241c2a9779
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pyzebra/merge_function.py
View File

@ -22,7 +22,7 @@ def normalize(scan, monitor):
counts = np.array(scan["Counts"]) counts = np.array(scan["Counts"])
sigma = np.sqrt(counts) if "sigma" not in scan else scan["sigma"] 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_counts = counts * monitor_ratio
scaled_sigma = np.array(sigma) * 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] sigma1, sigma2 = sorted_t[i][2], sorted_t[i + 1][2]
count_err1 = u.ufloat(counts1, sigma1) count_err1 = u.ufloat(counts1, sigma1)
count_err2 = u.ufloat(counts2, sigma2) 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) Counts = np.append(Counts, avg.n)
sigma = np.append(sigma, avg.s) sigma = np.append(sigma, avg.s)
seen.append(sorted_t[i][0]) seen.append(sorted_t[i][0])