From 388d3c61323983b8dcb380653334b1b38bb28486 Mon Sep 17 00:00:00 2001 From: markus Date: Wed, 3 Feb 2021 14:56:36 +0100 Subject: [PATCH] move calculate_qr into emission_rate_when_present --- cara/montecarlo.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/cara/montecarlo.py b/cara/montecarlo.py index 0e669dda..ac7cfc84 100644 --- a/cara/montecarlo.py +++ b/cara/montecarlo.py @@ -154,18 +154,9 @@ class MCInfectedPopulation(MCPopulation): breathing_rates = self._generate_breathing_rates() - return qr_func(viral_loads, emission_concentration, mask_efficiency, self.qid, breathing_rates) + viral_loads = 10 ** viral_loads - @staticmethod - def _calculate_qr(viral_load: float, emission_concentration: float, mask_efficiency: float, - copies_per_quantum: float, breathing_rate: float) -> float: - """ - Calculates the quantum generation rate given a set of parameters. - """ - # Unit conversions - viral_load = 10 ** viral_load - - return viral_load * emission_concentration * (1 - mask_efficiency) * breathing_rate / copies_per_quantum + return viral_loads * emission_concentration * (1 - mask_efficiency) * breathing_rates / self.qid def individual_emission_rate(self, time) -> np.ndarray: """