From b63ef90e11517e29a4b48efc0c1f41a964d8c194 Mon Sep 17 00:00:00 2001 From: Ivan Usov Date: Fri, 12 Feb 2021 13:53:51 +0100 Subject: [PATCH] Keep all merged scans, but disable export for them --- pyzebra/app/panel_ccl_integrate.py | 3 ++- pyzebra/ccl_process.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pyzebra/app/panel_ccl_integrate.py b/pyzebra/app/panel_ccl_integrate.py index 77b81cc..e45edfc 100644 --- a/pyzebra/app/panel_ccl_integrate.py +++ b/pyzebra/app/panel_ccl_integrate.py @@ -89,12 +89,13 @@ def create(): def _init_datatable(): scan_list = [s["idx"] for s in det_data] hkl = [f'{s["h"]} {s["k"]} {s["l"]}' for s in det_data] + export = [s.get("active", True) for s in det_data] scan_table_source.data.update( scan=scan_list, hkl=hkl, peaks=[0] * len(scan_list), fit=[0] * len(scan_list), - export=[True] * len(scan_list), + export=export, ) scan_table_source.selected.indices = [] scan_table_source.selected.indices = [0] diff --git a/pyzebra/ccl_process.py b/pyzebra/ccl_process.py index 695b0de..c92be2d 100644 --- a/pyzebra/ccl_process.py +++ b/pyzebra/ccl_process.py @@ -65,8 +65,8 @@ def merge_datasets(dataset1, dataset2): if _parameters_match(scan_i, scan_j): merge_scans(scan_i, scan_j) break - else: - dataset1.append(scan_j) + + dataset1.append(scan_j) def merge_scans(scan1, scan2): @@ -78,4 +78,5 @@ def merge_scans(scan1, scan2): scan1["omega"] = omega[index] scan1["Counts"] = counts[index] + scan2["active"] = False print(f'Merging scans: {scan1["idx"]} <-- {scan2["idx"]}')