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

Refactor file reads

Browse Source
This commit is contained in:
usov_i 2021-08-25 17:16:01 +02:00
parent 20e99c35ba
commit 5b502b31eb
2 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pyzebra/app/panel_ccl_integrate.py
View File

@ -126,19 +126,19 @@ def create():
def file_open_button_callback(): def file_open_button_callback():
nonlocal det_data nonlocal det_data
det_data = [] for f_ind, f_path in enumerate(file_select.value):
for f_path in file_select.value:
with open(f_path) as file: with open(f_path) as file:
base, ext = os.path.splitext(os.path.basename(f_path)) base, ext = os.path.splitext(os.path.basename(f_path))
if det_data: file_data = pyzebra.parse_1D(file, ext)
append_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_dataset(append_data, monitor_spinner.value) pyzebra.normalize_dataset(file_data, monitor_spinner.value)
pyzebra.merge_datasets(det_data, append_data)
else: if f_ind == 0: # first file
det_data = pyzebra.parse_1D(file, ext) det_data = file_data
pyzebra.normalize_dataset(det_data, monitor_spinner.value) pyzebra.merge_duplicates(det_data)
pyzebra.merge_duplicates(det_data) js_data.data.update(fname=[base, base])
js_data.data.update(fname=[base, base]) else:
pyzebra.merge_datasets(det_data, file_data)
_init_datatable() _init_datatable()
append_upload_button.disabled = False append_upload_button.disabled = False
@ -150,10 +150,10 @@ def create():
for f_path in file_select.value: for f_path in file_select.value:
with open(f_path) as file: with open(f_path) as file:
_, ext = os.path.splitext(f_path) _, ext = os.path.splitext(f_path)
append_data = pyzebra.parse_1D(file, ext) file_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_dataset(append_data, monitor_spinner.value) pyzebra.normalize_dataset(file_data, monitor_spinner.value)
pyzebra.merge_datasets(det_data, append_data) pyzebra.merge_datasets(det_data, file_data)
_init_datatable() _init_datatable()
@ -162,19 +162,19 @@ def create():
def upload_button_callback(_attr, _old, new): def upload_button_callback(_attr, _old, new):
nonlocal det_data nonlocal det_data
det_data = [] for f_ind, f_str, f_name in enumerate(zip(new, upload_button.filename)):
for f_str, f_name in zip(new, upload_button.filename):
with io.StringIO(base64.b64decode(f_str).decode()) as file: with io.StringIO(base64.b64decode(f_str).decode()) as file:
base, ext = os.path.splitext(f_name) base, ext = os.path.splitext(f_name)
if det_data: file_data = pyzebra.parse_1D(file, ext)
append_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_dataset(append_data, monitor_spinner.value) pyzebra.normalize_dataset(file_data, monitor_spinner.value)
pyzebra.merge_datasets(det_data, append_data)
else: if f_ind == 0: # first file
det_data = pyzebra.parse_1D(file, ext) det_data = file_data
pyzebra.normalize_dataset(det_data, monitor_spinner.value) pyzebra.merge_duplicates(det_data)
pyzebra.merge_duplicates(det_data) js_data.data.update(fname=[base, base])
js_data.data.update(fname=[base, base]) else:
pyzebra.merge_datasets(det_data, file_data)
_init_datatable() _init_datatable()
append_upload_button.disabled = False append_upload_button.disabled = False
@ -187,10 +187,10 @@ def create():
for f_str, f_name in zip(new, append_upload_button.filename): for f_str, f_name in zip(new, append_upload_button.filename):
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) file_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_dataset(append_data, monitor_spinner.value) pyzebra.normalize_dataset(file_data, monitor_spinner.value)
pyzebra.merge_datasets(det_data, append_data) pyzebra.merge_datasets(det_data, file_data)
_init_datatable() _init_datatable()

51
pyzebra/app/panel_param_study.py
View File

@ -142,18 +142,18 @@ def create():
def file_open_button_callback(): def file_open_button_callback():
nonlocal det_data nonlocal det_data
det_data = [] for f_ind, f_path in enumerate(file_select.value):
for f_path in file_select.value:
with open(f_path) as file: with open(f_path) as file:
base, ext = os.path.splitext(os.path.basename(f_path)) base, ext = os.path.splitext(os.path.basename(f_path))
if det_data: file_data = pyzebra.parse_1D(file, ext)
append_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_dataset(append_data, monitor_spinner.value) pyzebra.normalize_dataset(file_data, monitor_spinner.value)
det_data.extend(append_data)
else: if f_ind == 0: # first file
det_data = pyzebra.parse_1D(file, ext) det_data = file_data
pyzebra.normalize_dataset(det_data, monitor_spinner.value) js_data.data.update(fname=[base])
js_data.data.update(fname=[base]) else:
det_data.extend(file_data)
_init_datatable() _init_datatable()
append_upload_button.disabled = False append_upload_button.disabled = False
@ -165,10 +165,10 @@ def create():
for f_path in file_select.value: for f_path in file_select.value:
with open(f_path) as file: with open(f_path) as file:
_, ext = os.path.splitext(f_path) _, ext = os.path.splitext(f_path)
append_data = pyzebra.parse_1D(file, ext) file_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_dataset(append_data, monitor_spinner.value) pyzebra.normalize_dataset(file_data, monitor_spinner.value)
det_data.extend(append_data) det_data.extend(file_data)
_init_datatable() _init_datatable()
@ -178,17 +178,18 @@ def create():
def upload_button_callback(_attr, _old, new): def upload_button_callback(_attr, _old, new):
nonlocal det_data nonlocal det_data
det_data = [] det_data = []
for f_str, f_name in zip(new, upload_button.filename): for f_ind, f_str, f_name in enumerate(zip(new, upload_button.filename)):
with io.StringIO(base64.b64decode(f_str).decode()) as file: with io.StringIO(base64.b64decode(f_str).decode()) as file:
base, ext = os.path.splitext(f_name) base, ext = os.path.splitext(f_name)
if det_data: file_data = pyzebra.parse_1D(file, ext)
append_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_dataset(append_data, monitor_spinner.value) pyzebra.normalize_dataset(file_data, monitor_spinner.value)
det_data.extend(append_data)
else: if f_ind == 0: # first file
det_data = pyzebra.parse_1D(file, ext) det_data = file_data
pyzebra.normalize_dataset(det_data, monitor_spinner.value) js_data.data.update(fname=[base])
js_data.data.update(fname=[base]) else:
det_data.extend(file_data)
_init_datatable() _init_datatable()
append_upload_button.disabled = False append_upload_button.disabled = False
@ -201,10 +202,10 @@ def create():
for f_str, f_name in zip(new, append_upload_button.filename): for f_str, f_name in zip(new, append_upload_button.filename):
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) file_data = pyzebra.parse_1D(file, ext)
pyzebra.normalize_dataset(append_data, monitor_spinner.value) pyzebra.normalize_dataset(file_data, monitor_spinner.value)
det_data.extend(append_data) det_data.extend(file_data)
_init_datatable() _init_datatable()