From 959b5f575b75d811d9ec01c66d625d9d003be550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Fr=C3=B6hlich?= <fabian@schaluck.com>
Date: Tue, 5 Mar 2024 10:55:36 +0000
Subject: [PATCH] Update pandas.py

---
 python/sdist/amici/pandas.py | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/python/sdist/amici/pandas.py b/python/sdist/amici/pandas.py
index 745cbfb767..aac0018b32 100644
--- a/python/sdist/amici/pandas.py
+++ b/python/sdist/amici/pandas.py
@@ -410,6 +410,20 @@ def _fill_conditions_dict(
             ]
         else:
             datadict[par + "_presim"] = np.nan
+
+    for i_par, par in enumerate(
+        _get_names_or_ids(model, "Parameter", by_id=by_id)
+    ):
+        if len(edata.parameters):
+            datadict[par] = edata.parameters[i_par]
+        else:
+            datadict[par] = model.getParameters()[i_par]
+
+        if len(edata.pscale):
+            datadict[par + "_scale"] = edata.pscale[i_par]
+        else:
+            datadict[par + "_scale"] = model.getParameterScale()[i_par]
+
     return datadict
 
 
@@ -641,7 +655,7 @@ def constructEdataFromDataFrame(
         Model instance.
 
     :param condition:
-        pd.Series with FixedParameter Names/Ids as columns.
+        pd.Series with (Fixed)Parameter Names/Ids as columns.
         Preequilibration conditions may be specified by appending
         '_preeq' as suffix. Presimulation conditions may be specified by
         appending '_presim' as suffix.
@@ -681,6 +695,19 @@ def constructEdataFromDataFrame(
         .values
     )
 
+    # fill in parameters
+    edata.parameters = (
+        condition[_get_names_or_ids(model, "Parameter", by_id=by_id)]
+        .astype(float)
+        .values
+    )
+
+    edata.pscale = (
+        condition[_get_names_or_ids(model, "ParameterScale", by_id=by_id)]
+        .astype(int)
+        .values
+    )
+
     # fill in preequilibration parameters
     if any(
         [overwrite_preeq[key] != condition[key] for key in overwrite_preeq]