fix: model parameters defined via expressions were not exported

AFM-analysis · Jan 8, 2022 · aa1cde4 · aa1cde4
1 parent 39496f9
commit aa1cde4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+0.13.2
+ - fix: model parameters defined via expressions were not exported
 0.13.1
  - fix: make sure fit parameters are identified by their label
    instead of by an index (which can be wrong, now that we have

diff --git a/pyjibe/fd/export.py b/pyjibe/fd/export.py
@@ -63,7 +63,7 @@ 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 not fp[ki].vary:
+                        if not (fp[ki].vary or fp[ki].expr):
                             label, hrvalue = get_unitname_value(
                                 name=nmodel.get_parm_name(model_key, ki),
                                 value=fp[ki].value,
@@ -76,7 +76,7 @@ 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 fp[ki].vary:
+                        if fp[ki].vary or fp[ki].expr:
                             label, hrvalue = get_unitname_value(
                                 name=nmodel.get_parm_name(model_key, ki),
                                 value=fp[ki].value,