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

Provide filename in merging info

Browse Source
This commit is contained in:
usov_i 2021-02-26 18:14:06 +01:00
parent af1336df78
commit a65708004b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pyzebra/app/panel_param_study.py
View File

@ -98,8 +98,7 @@ def create():
scan_list = [s["idx"] for s in det_data] scan_list = [s["idx"] for s in det_data]
file_list = [] file_list = []
for scan in det_data: for scan in det_data:
_, f_name = os.path.split(scan["original_filename"]) file_list.append(os.path.basename(scan["original_filename"]))
file_list.append(f_name)
scan_table_source.data.update( scan_table_source.data.update(
file=file_list, file=file_list,

6
pyzebra/ccl_process.py
View File

@ -1,4 +1,5 @@
import itertools import itertools
import os
import numpy as np import numpy as np
from lmfit.models import GaussianModel, LinearModel, PseudoVoigtModel, VoigtModel from lmfit.models import GaussianModel, LinearModel, PseudoVoigtModel, VoigtModel
@ -80,7 +81,10 @@ def merge_scans(scan1, scan2):
scan1["Counts"] = counts[index] scan1["Counts"] = counts[index]
scan2["active"] = False scan2["active"] = False
print(f'Merging scans: {scan1["idx"]} <-- {scan2["idx"]}')
fname1 = os.path.basename(scan1["original_filename"])
fname2 = os.path.basename(scan2["original_filename"])
print(f'Merging scans: {scan1["idx"]} ({fname1}) <-- {scan2["idx"]} ({fname2})')
def fit_scan(scan, model_dict): def fit_scan(scan, model_dict):