From 390bb153a281f9e16e5fb291e52b2cbd7d28d3e1 Mon Sep 17 00:00:00 2001 From: Daniel Weindl Date: Fri, 13 Feb 2026 15:11:23 +0100 Subject: [PATCH] Fix PetabSimulator._aggregate_s2llh Only try to aggregate ReturnData.FIM if we can expect it to be computed. --- python/sdist/amici/sim/sundials/petab/_v2.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/python/sdist/amici/sim/sundials/petab/_v2.py b/python/sdist/amici/sim/sundials/petab/_v2.py index 40b8d782b8..3194c8143f 100644 --- a/python/sdist/amici/sim/sundials/petab/_v2.py +++ b/python/sdist/amici/sim/sundials/petab/_v2.py @@ -15,7 +15,11 @@ import amici from amici.logging import get_logger -from amici.sim.sundials import SensitivityOrder +from amici.sim.sundials import ( + RDataReporting, + SensitivityMethod, + SensitivityOrder, +) logger = get_logger(__name__, log_level=logging.INFO) @@ -719,7 +723,13 @@ def _aggregate_s2llh( or `None` if sensitivities were not computed. """ # TODO: add tests - if self._solver.get_sensitivity_order() < SensitivityOrder.first: + if ( + self._solver.get_sensitivity_order() < SensitivityOrder.first + or self._solver.get_sensitivity_method() + != SensitivityMethod.forward + or self._solver.get_return_data_reporting_mode() + == RDataReporting.residuals + ): return None if not use_fim: