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

Correctly merge multiple scans in one

Browse Source
This commit is contained in:
usov_i 2021-09-30 20:12:19 +02:00
parent c2be907113
commit eaa6c4a2ad
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pyzebra/ccl_process.py
View File

@ -81,23 +81,30 @@ def merge_datasets(dataset_into, dataset_from):
def merge_scans(scan_into, scan_from): def merge_scans(scan_into, scan_from):
# TODO: does it need to be "scan_motor" instead of omega for a generalized solution? # TODO: does it need to be "scan_motor" instead of omega for a generalized solution?
if "init_omega" not in scan_into: if "init_scan" not in scan_into:
scan_into["init_omega"] = scan_into["omega"] scan_into["init_scan"] = scan_into.copy()
scan_into["init_counts"] = scan_into["counts"]
scan_into["init_counts_err"] = scan_into["counts_err"]
if "merged_scans" not in scan_into: if "merged_scans" not in scan_into:
scan_into["merged_scans"] = [] scan_into["merged_scans"] = []
if scan_from in scan_into["merged_scans"]:
return
scan_into["merged_scans"].append(scan_from) scan_into["merged_scans"].append(scan_from)
if ( if (
scan_into["omega"].shape == scan_from["omega"].shape scan_into["omega"].shape == scan_from["omega"].shape
and np.max(np.abs(scan_into["omega"] - scan_from["omega"])) < 0.0005 and np.max(np.abs(scan_into["omega"] - scan_from["omega"])) < 0.0005
): ):
scan_into["counts"] = (scan_into["counts"] + scan_from["counts"]) / 2 counts_tmp = 0
scan_into["counts_err"] = np.sqrt( counts_err_tmp = 0
scan_into["counts_err"] ** 2 + scan_from["counts_err"] ** 2
) for scan in [scan_into["init_scan"], *scan_into["merged_scans"]]:
counts_tmp += scan["counts"]
counts_err_tmp += scan["counts_err"] ** 2
scan_into["counts"] = counts_tmp / (1 + len(scan_into["merged_scans"]))
scan_into["counts_err"] = np.sqrt(counts_err_tmp)
else: else:
omega = np.concatenate((scan_into["omega"], scan_from["omega"])) omega = np.concatenate((scan_into["omega"], scan_from["omega"]))
@ -118,18 +125,14 @@ def merge_scans(scan_into, scan_from):
def restore_scan(scan): def restore_scan(scan):
if "init_omega" in scan:
scan["omega"] = scan["init_omega"]
scan["counts"] = scan["init_counts"]
scan["counts_err"] = scan["init_counts_err"]
del scan["init_omega"]
del scan["init_counts"]
del scan["init_counts_err"]
if "merged_scans" in scan: if "merged_scans" in scan:
for merged_scan in scan["merged_scans"]: for merged_scan in scan["merged_scans"]:
merged_scan["active"] = True merged_scan["active"] = True
del scan["merged_scans"]
if "init_scan" in scan:
tmp = scan["init_scan"]
scan.clear()
scan.update(tmp)
def fit_scan(scan, model_dict, fit_from=None, fit_to=None): def fit_scan(scan, model_dict, fit_from=None, fit_to=None):