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

Use unified_merge for datasets merging

Browse Source
This commit is contained in:
usov_i 2020-11-18 13:40:38 +01:00
parent e15f9c9c3e
commit b08f3c27db
2 changed files with 2 additions and 4 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.fit2 import fitccl
from pyzebra.h5 import *
from pyzebra.ccl_io import load_1D, parse_1D, export_comm
from pyzebra.param_study_moduls import add_dict, auto, merge, scan_dict
from pyzebra.merge_function import unified_merge
from pyzebra.xtal import *
__version__ = "0.1.3"

4
pyzebra/app/panel_ccl_integrate.py
View File

@ -126,9 +126,7 @@ def create():
_, ext = os.path.splitext(append_upload_button.filename)
append_data = pyzebra.parse_1D(file, ext)
added = pyzebra.add_dict(det_data, append_data)
scan_result = pyzebra.auto(pyzebra.scan_dict(added))
det_data = pyzebra.merge(added, added, scan_result)
pyzebra.unified_merge(det_data, append_data)
_init_datatable()