From 7b70d3057836b11eae4c982d38b28a7dbc20311e Mon Sep 17 00:00:00 2001 From: Ivan Usov Date: Thu, 21 Apr 2022 17:43:31 +0200 Subject: [PATCH] Use uploaded cfl filename as a default for outputs --- pyzebra/app/panel_ccl_prepare.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pyzebra/app/panel_ccl_prepare.py b/pyzebra/app/panel_ccl_prepare.py index 12ff889..d84a46b 100644 --- a/pyzebra/app/panel_ccl_prepare.py +++ b/pyzebra/app/panel_ccl_prepare.py @@ -211,8 +211,12 @@ def create(): # run sxtal_refgen for each kvect provided for i, kvect in enumerate(kvects, start=1): params["kvect"] = kvect + if open_cfl.filename: + base_fname = f"{os.path.splitext(open_cfl.filename)[0]}_{i}" + else: + base_fname = f"zebra_{i}" - cfl_path = os.path.join(temp_dir, f"zebra_{i}.cfl") + cfl_path = os.path.join(temp_dir, base_fname + ".cfl") if open_cfl.value: cfl_template = io.StringIO(base64.b64decode(open_cfl.value).decode()) else: @@ -235,11 +239,11 @@ def create(): print(comp_proc.stdout) if i == 1: # all hkl files are identical, so keep only one - hkl_fname = f"zebra_{i}.hkl" + hkl_fname = base_fname + ".hkl" with open(os.path.join(temp_dir, hkl_fname)) as f: res_files[hkl_fname] = f.read() - mhkl_fname = f"zebra_{i}.mhkl" + mhkl_fname = base_fname + ".mhkl" with open(os.path.join(temp_dir, mhkl_fname)) as f: res_files[mhkl_fname] = f.read()