Skip to content

Commit 80d88a4

Browse files
committed
Fix PetabSimulator._aggregate_s2llh
Only try to aggregate ReturnData.FIM if we can expect it to be computed.
1 parent 126e936 commit 80d88a4

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

  • python/sdist/amici/sim/sundials/petab

python/sdist/amici/sim/sundials/petab/_v2.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515

1616
import amici
1717
from amici.logging import get_logger
18-
from amici.sim.sundials import SensitivityOrder
18+
from amici.sim.sundials import (
19+
RDataReporting,
20+
SensitivityMethod,
21+
SensitivityOrder,
22+
)
1923

2024
logger = get_logger(__name__, log_level=logging.INFO)
2125

@@ -719,7 +723,13 @@ def _aggregate_s2llh(
719723
or `None` if sensitivities were not computed.
720724
"""
721725
# TODO: add tests
722-
if self._solver.get_sensitivity_order() < SensitivityOrder.first:
726+
if (
727+
self._solver.get_sensitivity_order() < SensitivityOrder.first
728+
or self._solver.get_sensitivity_method()
729+
!= SensitivityMethod.forward
730+
or self._solver.get_return_data_reporting_mode()
731+
== RDataReporting.residuals
732+
):
723733
return None
724734

725735
if not use_fim:

0 commit comments

Comments
 (0)