From 6a822c4c85edd1eabb6280cc451aa81b0f033ddb Mon Sep 17 00:00:00 2001 From: Ivan Usov Date: Wed, 10 Feb 2021 16:14:20 +0100 Subject: [PATCH] Allow a small gap between ranges for scans to merge --- pyzebra/ccl_process.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pyzebra/ccl_process.py b/pyzebra/ccl_process.py index 68689af..9891d4c 100644 --- a/pyzebra/ccl_process.py +++ b/pyzebra/ccl_process.py @@ -16,6 +16,10 @@ PARAM_PRECISIONS = { "ub": 0.01, } +MAX_RANGE_GAP = { + "omega": 0.5, +} + def normalize_dataset(dataset, monitor=100_000): for scan in dataset: @@ -40,7 +44,9 @@ def _parameters_match(scan1, scan2): # check if ranges of variable parameter overlap range1 = scan1["variable"] range2 = scan2["variable"] - if range1[0] > range2[-1] or range2[0] > range1[-1]: + # maximum gap between ranges of the scanning parameter (default 0) + max_range_gap = MAX_RANGE_GAP.get(param, 0) + if max(range1[0] - range2[-1], range2[0] - range1[-1]) > max_range_gap: return False elif np.max(np.abs(scan1[param] - scan2[param])) > PARAM_PRECISIONS[param]: