From 0d2eaa99f8262367368300a29346e69d1959fbc6 Mon Sep 17 00:00:00 2001 From: lrdossan Date: Mon, 10 Jun 2024 12:09:23 +0200 Subject: [PATCH] added f_inf to the normalization factor of short-range --- caimira/models.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/caimira/models.py b/caimira/models.py index fb30aa48..374ba6a8 100644 --- a/caimira/models.py +++ b/caimira/models.py @@ -1441,10 +1441,11 @@ class ShortRangeModel: def _long_range_normed_concentration(self, concentration_model: ConcentrationModel, time: float) -> _VectorisedFloat: """ Virus long-range exposure concentration normalized by the - virus viral load, as function of time. + virus viral load and fraction of infectious virus, as function of time. """ - return (concentration_model.concentration(time) / - concentration_model.virus.viral_load_in_sputum) + return (concentration_model.concentration(time) / ( + concentration_model.virus.viral_load_in_sputum * + concentration_model.infected.fraction_of_infectious_virus())) def _normed_concentration(self, concentration_model: ConcentrationModel, time: float) -> _VectorisedFloat: """