From 13a6ff285a09ed1ebdc12c60efedcec095af20c3 Mon Sep 17 00:00:00 2001 From: Ivan Usov Date: Fri, 22 Oct 2021 16:11:24 +0200 Subject: [PATCH] Check for scan motors upon dataset merging --- pyzebra/ccl_process.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pyzebra/ccl_process.py b/pyzebra/ccl_process.py index e64dc90..6ab0591 100644 --- a/pyzebra/ccl_process.py +++ b/pyzebra/ccl_process.py @@ -68,6 +68,12 @@ def _parameters_match(scan1, scan2): 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) for scan_into in dataset_into: for ind, scan_from in enumerate(dataset_from):