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

Normalize data on import

Browse Source
This commit is contained in:
usov_i 2021-02-02 15:35:37 +01:00
parent 5e979eb9e3
commit 2c727d34bd
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyzebra/__init__.py
View File

@ -3,7 +3,7 @@ from pyzebra.ccl_findpeaks import ccl_findpeaks
from pyzebra.ccl_io import export_1D, load_1D, parse_1D from pyzebra.ccl_io import export_1D, load_1D, parse_1D
from pyzebra.fit2 import fitccl from pyzebra.fit2 import fitccl
from pyzebra.h5 import * 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 * from pyzebra.xtal import *
__version__ = "0.2.2" __version__ = "0.2.2"

4
pyzebra/app/panel_ccl_integrate.py
View File

@ -110,6 +110,7 @@ def create():
with open(file_select.value) as file: with open(file_select.value) as file:
_, ext = os.path.splitext(file_select.value) _, ext = os.path.splitext(file_select.value)
det_data = pyzebra.parse_1D(file, ext) det_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_all(det_data)
_init_datatable() _init_datatable()
@ -120,6 +121,7 @@ def create():
with open(file_select.value) as file: with open(file_select.value) as file:
_, ext = os.path.splitext(file_select.value) _, ext = os.path.splitext(file_select.value)
append_data = pyzebra.parse_1D(file, ext) append_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_all(det_data)
pyzebra.unified_merge(det_data, append_data) pyzebra.unified_merge(det_data, append_data)
@ -133,6 +135,7 @@ def create():
with io.StringIO(base64.b64decode(new).decode()) as file: with io.StringIO(base64.b64decode(new).decode()) as file:
_, ext = os.path.splitext(upload_button.filename) _, ext = os.path.splitext(upload_button.filename)
det_data = pyzebra.parse_1D(file, ext) det_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_all(det_data)
_init_datatable() _init_datatable()
@ -145,6 +148,7 @@ def create():
with io.StringIO(base64.b64decode(new).decode()) as file: with io.StringIO(base64.b64decode(new).decode()) as file:
_, ext = os.path.splitext(append_upload_button.filename) _, ext = os.path.splitext(append_upload_button.filename)
append_data = pyzebra.parse_1D(file, ext) append_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_all(det_data)
pyzebra.unified_merge(det_data, append_data) pyzebra.unified_merge(det_data, append_data)

5
pyzebra/app/panel_param_study.py
View File

@ -130,6 +130,7 @@ def create():
with open(file_select.value) as file: with open(file_select.value) as file:
_, ext = os.path.splitext(file_select.value) _, ext = os.path.splitext(file_select.value)
det_data = pyzebra.parse_1D(file, ext) det_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_all(det_data)
_init_datatable() _init_datatable()
@ -140,6 +141,7 @@ def create():
with open(file_select.value) as file: with open(file_select.value) as file:
_, ext = os.path.splitext(file_select.value) _, ext = os.path.splitext(file_select.value)
append_data = pyzebra.parse_1D(file, ext) append_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_all(det_data)
pyzebra.add_dict(det_data, append_data) pyzebra.add_dict(det_data, append_data)
_init_datatable() _init_datatable()
@ -155,9 +157,11 @@ def create():
_, ext = os.path.splitext(f_name) _, ext = os.path.splitext(f_name)
if det_data: if det_data:
append_data = pyzebra.parse_1D(file, ext) append_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_all(det_data)
pyzebra.add_dict(det_data, append_data) pyzebra.add_dict(det_data, append_data)
else: else:
det_data = pyzebra.parse_1D(file, ext) det_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_all(det_data)
_init_datatable() _init_datatable()
@ -170,6 +174,7 @@ def create():
with io.StringIO(base64.b64decode(f_str).decode()) as file: with io.StringIO(base64.b64decode(f_str).decode()) as file:
_, ext = os.path.splitext(f_name) _, ext = os.path.splitext(f_name)
append_data = pyzebra.parse_1D(file, ext) append_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_all(det_data)
pyzebra.add_dict(det_data, append_data) pyzebra.add_dict(det_data, append_data)
_init_datatable() _init_datatable()