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

Average counts per scan position upon scan merging

Browse Source 
Fix #42
This commit is contained in:
usov_i 2021-11-08 16:00:52 +01:00
parent 7dcd20198f
commit 6557b2f3a4
1 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pyzebra/ccl_process.py
View File

@ -99,30 +99,39 @@ def merge_scans(scan_into, scan_from):
scan_motor = scan_into["scan_motor"] # the same as scan_from["scan_motor"] scan_motor = scan_into["scan_motor"] # the same as scan_from["scan_motor"]
if ( pos_all = np.array([])
scan_into[scan_motor].shape == scan_from[scan_motor].shape val_all = np.array([])
and np.max(np.abs(scan_into[scan_motor] - scan_from[scan_motor])) < 0.0005 err_all = np.array([])
):
counts_tmp = 0
counts_err_tmp = 0
for scan in [scan_into["init_scan"], *scan_into["merged_scans"]]: for scan in [scan_into["init_scan"], *scan_into["merged_scans"]]:
counts_tmp += scan["counts"] pos_all = np.append(pos_all, scan[scan_motor])
counts_err_tmp += scan["counts_err"] ** 2 val_all = np.append(val_all, scan["counts"])
err_all = np.append(err_all, scan["counts_err"] ** 2)
scan_into["counts"] = counts_tmp / (1 + len(scan_into["merged_scans"])) sort_index = np.argsort(pos_all)
scan_into["counts_err"] = np.sqrt(counts_err_tmp) pos_all = pos_all[sort_index]
val_all = val_all[sort_index]
err_all = err_all[sort_index]
pos_tmp = pos_all[:1]
val_tmp = val_all[:1]
err_tmp = err_all[:1]
num_tmp = np.array([1])
for pos, val, err in zip(pos_all[1:], val_all[1:], err_all[1:]):
if pos - pos_tmp[-1] < 0.0005:
# the repeated motor position
val_tmp[-1] += val
err_tmp[-1] += err
num_tmp[-1] += 1
else: else:
motor_pos = np.concatenate((scan_into[scan_motor], scan_from[scan_motor])) # a new motor position
counts = np.concatenate((scan_into["counts"], scan_from["counts"])) pos_tmp = np.append(pos_tmp, pos)
counts_err = np.concatenate((scan_into["counts_err"], scan_from["counts_err"])) val_tmp = np.append(val_tmp, val)
err_tmp = np.append(err_tmp, err)
num_tmp = np.append(num_tmp, 1)
index = np.argsort(motor_pos) scan_into[scan_motor] = pos_tmp
scan_into["counts"] = val_tmp / num_tmp
scan_into[scan_motor] = motor_pos[index] scan_into["counts_err"] = np.sqrt(err_tmp)
scan_into["counts"] = counts[index]
scan_into["counts_err"] = counts_err[index]
scan_from["export"] = False scan_from["export"] = False