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

Add fit model name to tag

Browse Source
This commit is contained in:
usov_i 2021-02-24 15:02:15 +01:00
parent 747b008d5e
commit 55f3198f9d
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pyzebra/app/panel_ccl_integrate.py
View File

@ -376,7 +376,8 @@ def create():
fitparam_reset_button.on_click(fitparam_reset_button_callback) fitparam_reset_button.on_click(fitparam_reset_button_callback)
def fitparams_add_dropdown_callback(click): def fitparams_add_dropdown_callback(click):
new_tag = str(fitparams_select.tags[0]) # bokeh requires (str, str) for MultiSelect options # bokeh requires (str, str) for MultiSelect options
new_tag = f"{click.item}-{fitparams_select.tags[0]}"
fitparams_select.options.append((new_tag, click.item)) fitparams_select.options.append((new_tag, click.item))
fit_params[new_tag] = fitparams_factory(click.item) fit_params[new_tag] = fitparams_factory(click.item)
fitparams_select.tags[0] += 1 fitparams_select.tags[0] += 1
@ -470,7 +471,7 @@ def create():
# start with `background` and `gauss` fit functions added # start with `background` and `gauss` fit functions added
fitparams_add_dropdown_callback(types.SimpleNamespace(item="background")) fitparams_add_dropdown_callback(types.SimpleNamespace(item="background"))
fitparams_add_dropdown_callback(types.SimpleNamespace(item="gauss")) fitparams_add_dropdown_callback(types.SimpleNamespace(item="gauss"))
fitparams_select.value = ["1"] # add selection to gauss fitparams_select.value = ["gauss-1"] # add selection to gauss
fit_output_textinput = TextAreaInput(title="Fit results:", width=450, height=200) fit_output_textinput = TextAreaInput(title="Fit results:", width=450, height=200)
@ -506,10 +507,10 @@ def create():
def _get_fit_params(): def _get_fit_params():
return dict( return dict(
guess=fit_params["1"]["guess"] + fit_params["0"]["guess"], guess=fit_params["gauss-1"]["guess"] + fit_params["background-0"]["guess"],
vary=fit_params["1"]["vary"] + fit_params["0"]["vary"], vary=fit_params["gauss-1"]["vary"] + fit_params["background-0"]["vary"],
constraints_min=fit_params["1"]["min"] + fit_params["0"]["min"], constraints_min=fit_params["gauss-1"]["min"] + fit_params["background-0"]["min"],
constraints_max=fit_params["1"]["max"] + fit_params["0"]["max"], constraints_max=fit_params["gauss-1"]["max"] + fit_params["background-0"]["max"],
numfit_min=integ_from.value, numfit_min=integ_from.value,
numfit_max=integ_to.value, numfit_max=integ_to.value,
binning=bin_size_spinner.value, binning=bin_size_spinner.value,

13
pyzebra/app/panel_param_study.py
View File

@ -457,7 +457,8 @@ def create():
fitparam_reset_button.on_click(fitparam_reset_button_callback) fitparam_reset_button.on_click(fitparam_reset_button_callback)
def fitparams_add_dropdown_callback(click): def fitparams_add_dropdown_callback(click):
new_tag = str(fitparams_select.tags[0]) # bokeh requires (str, str) for MultiSelect options # bokeh requires (str, str) for MultiSelect options
new_tag = f"{click.item}-{fitparams_select.tags[0]}"
fitparams_select.options.append((new_tag, click.item)) fitparams_select.options.append((new_tag, click.item))
fit_params[new_tag] = fitparams_factory(click.item) fit_params[new_tag] = fitparams_factory(click.item)
fitparams_select.tags[0] += 1 fitparams_select.tags[0] += 1
@ -551,7 +552,7 @@ def create():
# start with `background` and `gauss` fit functions added # start with `background` and `gauss` fit functions added
fitparams_add_dropdown_callback(types.SimpleNamespace(item="background")) fitparams_add_dropdown_callback(types.SimpleNamespace(item="background"))
fitparams_add_dropdown_callback(types.SimpleNamespace(item="gauss")) fitparams_add_dropdown_callback(types.SimpleNamespace(item="gauss"))
fitparams_select.value = ["1"] # add selection to gauss fitparams_select.value = ["gauss-1"] # add selection to gauss
fit_output_textinput = TextAreaInput(title="Fit results:", width=450, height=200) fit_output_textinput = TextAreaInput(title="Fit results:", width=450, height=200)
@ -587,10 +588,10 @@ def create():
def _get_fit_params(): def _get_fit_params():
return dict( return dict(
guess=fit_params["1"]["guess"] + fit_params["0"]["guess"], guess=fit_params["gauss-1"]["guess"] + fit_params["background-0"]["guess"],
vary=fit_params["1"]["vary"] + fit_params["0"]["vary"], vary=fit_params["gauss-1"]["vary"] + fit_params["background-0"]["vary"],
constraints_min=fit_params["1"]["min"] + fit_params["0"]["min"], constraints_min=fit_params["gauss-1"]["min"] + fit_params["background-0"]["min"],
constraints_max=fit_params["1"]["max"] + fit_params["0"]["max"], constraints_max=fit_params["gauss-1"]["max"] + fit_params["background-0"]["max"],
numfit_min=integ_from.value, numfit_min=integ_from.value,
numfit_max=integ_to.value, numfit_max=integ_to.value,
binning=bin_size_spinner.value, binning=bin_size_spinner.value,