From 2c727d34bdae073d1f84af2df33c79a65940bebf Mon Sep 17 00:00:00 2001 From: Ivan Usov Date: Tue, 2 Feb 2021 15:35:37 +0100 Subject: [PATCH] Normalize data on import --- pyzebra/__init__.py | 2 +- pyzebra/app/panel_ccl_integrate.py | 4 ++++ pyzebra/app/panel_param_study.py | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pyzebra/__init__.py b/pyzebra/__init__.py index 8d32c51..3fdb57a 100644 --- a/pyzebra/__init__.py +++ b/pyzebra/__init__.py @@ -3,7 +3,7 @@ from pyzebra.ccl_findpeaks import ccl_findpeaks from pyzebra.ccl_io import export_1D, load_1D, parse_1D from pyzebra.fit2 import fitccl from pyzebra.h5 import * -from pyzebra.merge_function import add_dict, unified_merge +from pyzebra.merge_function import add_dict, normalize_all, unified_merge from pyzebra.xtal import * __version__ = "0.2.2" diff --git a/pyzebra/app/panel_ccl_integrate.py b/pyzebra/app/panel_ccl_integrate.py index 31d0c93..0809352 100644 --- a/pyzebra/app/panel_ccl_integrate.py +++ b/pyzebra/app/panel_ccl_integrate.py @@ -110,6 +110,7 @@ def create(): with open(file_select.value) as file: _, ext = os.path.splitext(file_select.value) det_data = pyzebra.parse_1D(file, ext) + pyzebra.normalize_all(det_data) _init_datatable() @@ -120,6 +121,7 @@ def create(): with open(file_select.value) as file: _, ext = os.path.splitext(file_select.value) append_data = pyzebra.parse_1D(file, ext) + pyzebra.normalize_all(det_data) pyzebra.unified_merge(det_data, append_data) @@ -133,6 +135,7 @@ def create(): with io.StringIO(base64.b64decode(new).decode()) as file: _, ext = os.path.splitext(upload_button.filename) det_data = pyzebra.parse_1D(file, ext) + pyzebra.normalize_all(det_data) _init_datatable() @@ -145,6 +148,7 @@ def create(): with io.StringIO(base64.b64decode(new).decode()) as file: _, ext = os.path.splitext(append_upload_button.filename) append_data = pyzebra.parse_1D(file, ext) + pyzebra.normalize_all(det_data) pyzebra.unified_merge(det_data, append_data) diff --git a/pyzebra/app/panel_param_study.py b/pyzebra/app/panel_param_study.py index 92457aa..1c3b1d3 100644 --- a/pyzebra/app/panel_param_study.py +++ b/pyzebra/app/panel_param_study.py @@ -130,6 +130,7 @@ def create(): with open(file_select.value) as file: _, ext = os.path.splitext(file_select.value) det_data = pyzebra.parse_1D(file, ext) + pyzebra.normalize_all(det_data) _init_datatable() @@ -140,6 +141,7 @@ def create(): with open(file_select.value) as file: _, ext = os.path.splitext(file_select.value) append_data = pyzebra.parse_1D(file, ext) + pyzebra.normalize_all(det_data) pyzebra.add_dict(det_data, append_data) _init_datatable() @@ -155,9 +157,11 @@ def create(): _, ext = os.path.splitext(f_name) if det_data: append_data = pyzebra.parse_1D(file, ext) + pyzebra.normalize_all(det_data) pyzebra.add_dict(det_data, append_data) else: det_data = pyzebra.parse_1D(file, ext) + pyzebra.normalize_all(det_data) _init_datatable() @@ -170,6 +174,7 @@ def create(): with io.StringIO(base64.b64decode(f_str).decode()) as file: _, ext = os.path.splitext(f_name) append_data = pyzebra.parse_1D(file, ext) + pyzebra.normalize_all(det_data) pyzebra.add_dict(det_data, append_data) _init_datatable()