From ee17e9f937e79a9896df2893e4c69bcdc945a800 Mon Sep 17 00:00:00 2001 From: markus Date: Tue, 2 Feb 2021 13:31:24 +0100 Subject: [PATCH] move buonanno model into function --- cara/montecarlo.py | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/cara/montecarlo.py b/cara/montecarlo.py index 25b13e6d..75fe8f76 100644 --- a/cara/montecarlo.py +++ b/cara/montecarlo.py @@ -338,6 +338,24 @@ def print_qr_info(qr_values: np.ndarray) -> None: print(f"qR_{quantile} = {np.quantile(qr_values, quantile)}") +def buaonanno_exposure_model(): + return MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=800), + ventilation=models.AirChange(active=models.PeriodicInterval(period=120, duration=120), + air_exch=0.5), + infected=BuonannoSpecificInfectedPopulation(virus=MCVirus(halflife=1.1), + samples=1) + ), + exposed=models.Population( + number=1, + presence=models.SpecificInterval(((0, 2),)), + activity=models.Activity.types['Light activity'], + mask=models.Mask.types['No mask'] + ) + ) + + baseline_mc_exposure_model = MCExposureModel( concentration_model=MCConcentrationModel( room=models.Room(volume=75), @@ -366,23 +384,6 @@ baseline_mc_exposure_model = MCExposureModel( ) ) - -buonanno_exposure_model = MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=800), - ventilation=models.AirChange(active=models.PeriodicInterval(period=120, duration=120), - air_exch=0.5), - infected=BuonannoSpecificInfectedPopulation(virus=MCVirus(halflife=1.1), - samples=1) - ), - exposed=models.Population( - number=1, - presence=models.SpecificInterval(((0, 2),)), - activity=models.Activity.types['Light activity'], - mask=models.Mask.types['No mask'] - ) -) - durations = tuple(np.linspace(0, 120, 10)) models = [