From c7b05d252f18fd3554ec6f11a0fba9222b924e6d Mon Sep 17 00:00:00 2001 From: Ivan Usov Date: Mon, 1 Mar 2021 11:48:13 +0100 Subject: [PATCH] Enable export function --- pyzebra/app/panel_ccl_integrate.py | 6 ++---- pyzebra/app/panel_param_study.py | 6 ++---- pyzebra/ccl_io.py | 14 ++++++++++++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/pyzebra/app/panel_ccl_integrate.py b/pyzebra/app/panel_ccl_integrate.py index a29c26e..785c1f7 100644 --- a/pyzebra/app/panel_ccl_integrate.py +++ b/pyzebra/app/panel_ccl_integrate.py @@ -477,7 +477,7 @@ def create(): preview_output_textinput.value = exported_content - preview_output_button = Button(label="Preview file", default_size=200, disabled=True) + preview_output_button = Button(label="Preview file", default_size=200) preview_output_button.on_click(preview_output_button_callback) hkl_precision_select = Select( @@ -509,9 +509,7 @@ def create(): cont = "" js_data[ext].data.update(cont=[cont], ext=[ext]) - save_button = Button( - label="Download file", button_type="success", default_size=200, disabled=True - ) + save_button = Button(label="Download file", button_type="success", default_size=200) save_button.on_click(save_button_callback) save_button.js_on_click(CustomJS(args={"js_data": js_data[".comm"]}, code=javaScript)) save_button.js_on_click(CustomJS(args={"js_data": js_data[".incomm"]}, code=javaScript)) diff --git a/pyzebra/app/panel_param_study.py b/pyzebra/app/panel_param_study.py index 39ccc01..4197f85 100644 --- a/pyzebra/app/panel_param_study.py +++ b/pyzebra/app/panel_param_study.py @@ -552,7 +552,7 @@ def create(): preview_output_textinput.value = exported_content - preview_output_button = Button(label="Preview file", default_size=220, disabled=True) + preview_output_button = Button(label="Preview file", default_size=220) preview_output_button.on_click(preview_output_button_callback) def save_button_callback(): @@ -580,9 +580,7 @@ def create(): cont = "" js_data[ext].data.update(cont=[cont], ext=[ext]) - save_button = Button( - label="Download file", button_type="success", default_size=220, disabled=True - ) + save_button = Button(label="Download file", button_type="success", default_size=220) save_button.on_click(save_button_callback) save_button.js_on_click(CustomJS(args={"js_data": js_data[".comm"]}, code=javaScript)) save_button.js_on_click(CustomJS(args={"js_data": js_data[".incomm"]}, code=javaScript)) diff --git a/pyzebra/ccl_io.py b/pyzebra/ccl_io.py index 233dd3b..18cbeeb 100644 --- a/pyzebra/ccl_io.py +++ b/pyzebra/ccl_io.py @@ -259,8 +259,18 @@ def export_1D(data, path, area_method=AREA_METHODS[0], lorentz=False, hkl_precis else: hkl_str = f"{h:8.{hkl_precision}f}{k:8.{hkl_precision}f}{l:8.{hkl_precision}f}" - area_n = scan["fit"][area_method].n - area_s = scan["fit"][area_method].s + for name, param in scan["fit"].params.items(): + if "amplitude" in name: + area_n = param.value + area_s = param.stderr + break + else: + area_n = 0 + area_s = 0 + + if area_n is None or area_s is None: + print(f"Couldn't export scan: {scan['idx']}") + continue # apply lorentz correction to area if lorentz: