Skip to content

Commit

Permalink
fix: only export hidden parameters in developer mode
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmueller committed Jan 8, 2022
1 parent 91f92f2 commit ce55c81
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
@@ -1,5 +1,6 @@
0.13.2
- fix: model parameters defined via expressions were not exported
- fix: only export hidden parameters in developer mode
- enh: export ancillary parameters in autosave
0.13.1
- fix: make sure fit parameters are identified by their label
Expand Down
2 changes: 2 additions & 0 deletions docs/sec_interface.rst
Expand Up @@ -276,3 +276,5 @@ mode.
(it is excluded by default, because it is virtually identical to the
:ref:`sneddon_spher_approx <nanite:sec_ref_model_sneddon_spher_approx>`
model which is much faster).
- Displays and exports hidden model parameters (parameters whose name
starts with an underscore ``_``).
11 changes: 11 additions & 0 deletions pyjibe/fd/export.py
Expand Up @@ -6,6 +6,7 @@

from afmformats import meta
import nanite.model as nmodel
from PyQt5 import QtCore

from .. import units

Expand All @@ -32,6 +33,10 @@ def save_tsv_metadata_results(filename, fdist_list, which=EXPORT_CHOICES):
if np.sum([k not in EXPORT_CHOICES for k in which]):
raise ValueError("Found invalid export choices.")

settings = QtCore.QSettings()
settings.setIniCodec("utf-8")
dev_mode = bool(int(settings.value("advanced/developer mode", "0")))

size = len(fdist_list)
columns = OrderedDict()
# Metadata
Expand Down Expand Up @@ -63,6 +68,9 @@ def save_tsv_metadata_results(filename, fdist_list, which=EXPORT_CHOICES):
if "params_initial" in fdist.fit_properties:
fp = fdist.fit_properties["params_initial"]
for ki in fp:
if ki.startswith("_") and not dev_mode:
# ignore hidden parameters in normal mode
continue
if not (fp[ki].vary or fp[ki].expr):
label, hrvalue = get_unitname_value(
name=nmodel.get_parm_name(model_key, ki),
Expand All @@ -76,6 +84,9 @@ def save_tsv_metadata_results(filename, fdist_list, which=EXPORT_CHOICES):
if "params_fitted" in fdist.fit_properties:
fp = fdist.fit_properties["params_fitted"]
for ki in fp:
if ki.startswith("_") and not dev_mode:
# ignore hidden parameters in normal mode
continue
if fp[ki].vary or fp[ki].expr:
label, hrvalue = get_unitname_value(
name=nmodel.get_parm_name(model_key, ki),
Expand Down

0 comments on commit ce55c81

Please sign in to comment.