From dba2dc614954547971cdcf13686ad0a9a2cad782 Mon Sep 17 00:00:00 2001 From: Ivan Usov Date: Mon, 26 Oct 2020 15:54:49 +0100 Subject: [PATCH] Add bin size widget --- pyzebra/app/panel_ccl_integrate.py | 6 ++++++ pyzebra/fit2.py | 1 + 2 files changed, 7 insertions(+) diff --git a/pyzebra/app/panel_ccl_integrate.py b/pyzebra/app/panel_ccl_integrate.py index 248434a..fa2f8ba 100644 --- a/pyzebra/app/panel_ccl_integrate.py +++ b/pyzebra/app/panel_ccl_integrate.py @@ -148,6 +148,7 @@ def create(): fit = scan.get("fit") if fit is not None: + x = scan["fit"]["x_fit"] plot_gauss_source.data.update(x=x, y=scan["fit"]["comps"]["gaussian"]) plot_bkg_source.data.update(x=x, y=scan["fit"]["comps"]["background"]) params = fit["result"].params @@ -398,6 +399,7 @@ def create(): ], numfit_min=integ_from.value, numfit_max=integ_to.value, + binning=bin_size_spinner.value, ) sel_ind = scan_table_source.selected.indices[-1] @@ -443,6 +445,7 @@ def create(): ], numfit_min=integ_from.value, numfit_max=integ_to.value, + binning=bin_size_spinner.value, ) _update_plot(scan) @@ -459,6 +462,8 @@ def create(): ) area_method_radiobutton.on_change("active", area_method_radiobutton_callback) + bin_size_spinner = Spinner(title="Bin size:", value=1, low=1, step=1, default_size=145) + preview_output_textinput = TextAreaInput(title="Export file preview:", width=450, height=400) def preview_output_button_callback(): @@ -535,6 +540,7 @@ def create(): Spacer(width=20), column( row(integ_from, integ_to), + row(bin_size_spinner), row(fitparam_reset_button, area_method_radiobutton), row(fit_button, fit_all_button), ), diff --git a/pyzebra/fit2.py b/pyzebra/fit2.py index c4132e6..6b84720 100644 --- a/pyzebra/fit2.py +++ b/pyzebra/fit2.py @@ -224,4 +224,5 @@ def fitccl( d["result"] = result d["comps"] = comps d["numfit"] = [numfit_min, numfit_max] + d["x_fit"] = x scan["fit"] = d