diff --git a/pyzebra/app/panel_param_study.py b/pyzebra/app/panel_param_study.py index 29040aa..39ccc01 100644 --- a/pyzebra/app/panel_param_study.py +++ b/pyzebra/app/panel_param_study.py @@ -98,8 +98,7 @@ def create(): scan_list = [s["idx"] for s in det_data] file_list = [] for scan in det_data: - _, f_name = os.path.split(scan["original_filename"]) - file_list.append(f_name) + file_list.append(os.path.basename(scan["original_filename"])) scan_table_source.data.update( file=file_list, diff --git a/pyzebra/ccl_process.py b/pyzebra/ccl_process.py index fe54a75..99cf94e 100644 --- a/pyzebra/ccl_process.py +++ b/pyzebra/ccl_process.py @@ -1,4 +1,5 @@ import itertools +import os import numpy as np from lmfit.models import GaussianModel, LinearModel, PseudoVoigtModel, VoigtModel @@ -80,7 +81,10 @@ def merge_scans(scan1, scan2): scan1["Counts"] = counts[index] 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):