Merge branch 'develop' into fix_stau_w_sub

python/amici/petab_objective.py

@@ -154,8 +154,11 @@ def simulate_petab(
     # Log results
     sim_cond = petab_problem.get_simulation_conditions_from_measurement_df()
     for i, rdata in enumerate(rdatas):
-        logger.debug(f"Condition: {sim_cond.iloc[i, :].values}, status: "
-                     f"{rdata['status']}, llh: {rdata['llh']}")
+        sim_cond_id = "N/A" if sim_cond.empty else sim_cond.iloc[i, :].values
+        logger.debug(
+            f"Condition: {sim_cond_id}, status: {rdata['status']}, "
+            f"llh: {rdata['llh']}"
+        )
 
     return {
         LLH: llh,
@@ -230,7 +233,7 @@ def create_parameterized_edatas(
 
 def create_parameter_mapping(
         petab_problem: petab.Problem,
-        simulation_conditions: Union[pd.DataFrame, Dict],
+        simulation_conditions: Union[pd.DataFrame, List[Dict]],
         scaled_parameters: bool,
         amici_model: AmiciModel,
 ) -> ParameterMapping:
@@ -254,6 +257,8 @@ def create_parameter_mapping(
     if simulation_conditions is None:
         simulation_conditions = \
             petab_problem.get_simulation_conditions_from_measurement_df()
+    if isinstance(simulation_conditions, list):
+        simulation_conditions = pd.DataFrame(data=simulation_conditions)
 
     # Because AMICI globalizes all local parameters during model import,
     # we need to do that here as well to prevent parameter mapping errors