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

Check for scan motors upon dataset merging

Browse Source
This commit is contained in:
usov_i 2021-10-22 16:11:24 +02:00
parent 09b6e4fdcf
commit 13a6ff285a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pyzebra/ccl_process.py
View File

@ -68,6 +68,12 @@ def _parameters_match(scan1, scan2):
def merge_datasets(dataset_into, dataset_from): def merge_datasets(dataset_into, dataset_from):
scan_motors_into = dataset_into[0]["scan_motors"]
scan_motors_from = dataset_from[0]["scan_motors"]
if scan_motors_into != scan_motors_from:
print(f"Scan motors mismatch between datasets: {scan_motors_into} vs {scan_motors_from}")
return
merged = np.zeros(len(dataset_from), dtype=np.bool) merged = np.zeros(len(dataset_from), dtype=np.bool)
for scan_into in dataset_into: for scan_into in dataset_into:
for ind, scan_from in enumerate(dataset_from): for ind, scan_from in enumerate(dataset_from):