parent
49a6bd22ae
commit
9f56921072
@ -89,6 +89,13 @@ def merge_scans(scan_into, scan_from):
|
|||||||
scan_into["merged_scans"] = []
|
scan_into["merged_scans"] = []
|
||||||
scan_into["merged_scans"].append(scan_from)
|
scan_into["merged_scans"].append(scan_from)
|
||||||
|
|
||||||
|
if (
|
||||||
|
scan_into["omega"].shape == scan_from["omega"].shape
|
||||||
|
and np.max(np.abs(scan_into["omega"] - scan_from["omega"])) < 0.0005
|
||||||
|
):
|
||||||
|
scan_into["counts"] = (scan_into["counts"] + scan_from["counts"]) / 2
|
||||||
|
|
||||||
|
else:
|
||||||
omega = np.concatenate((scan_into["omega"], scan_from["omega"]))
|
omega = np.concatenate((scan_into["omega"], scan_from["omega"]))
|
||||||
counts = np.concatenate((scan_into["counts"], scan_from["counts"]))
|
counts = np.concatenate((scan_into["counts"], scan_from["counts"]))
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user