From b92f065a373a696957459e27126c99d79c5c449b Mon Sep 17 00:00:00 2001
From: Andrejh <andre.henriques@cern.ch>
Date: Thu, 17 Feb 2022 11:03:10 +0100
Subject: [PATCH] add new plot in figure 2 (b and c) + change hl for winter
 scenarios

---
 cara/model_scenarios_IGH_paper.py | 796 +++++++++++++++++-------------
 1 file changed, 441 insertions(+), 355 deletions(-)

diff --git a/cara/model_scenarios_IGH_paper.py b/cara/model_scenarios_IGH_paper.py
index 906b6a7a..dcded637 100644
--- a/cara/model_scenarios_IGH_paper.py
+++ b/cara/model_scenarios_IGH_paper.py
@@ -123,7 +123,7 @@ classroom_model_IGH_no_mask_windows_open_breaks_winter = [MCExposureModel(
             number=1,
             presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
             masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
+            virus=MCVirus(halflife=6.43, qID=qid),
             expiratory_activity=2,
             samples=200000,
             breathing_category=3,
@@ -150,7 +150,7 @@ classroom_model_IGH_no_mask_windows_open_alltimes_winter = [MCExposureModel(
             number=1,
             presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
             masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
+            virus=MCVirus(halflife=6.43, qID=qid),
             expiratory_activity=2,
             samples=200000,
             breathing_category=3,
@@ -177,7 +177,7 @@ classroom_model_IGH_no_mask_windows_fully_open_alltimes_winter = [MCExposureMode
             number=1,
             presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
             masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
+            virus=MCVirus(halflife=6.43, qID=qid),
             expiratory_activity=2,
             samples=200000,
             breathing_category=3,
@@ -260,7 +260,7 @@ classroom_model_IGH_no_mask_2windows_open_breaks_winter = [MCExposureModel(
             number=1,
             presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
             masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
+            virus=MCVirus(halflife=6.43, qID=qid),
             expiratory_activity=2,
             samples=200000,
             breathing_category=3,
@@ -287,7 +287,7 @@ classroom_model_IGH_no_mask_2windows_open_alltimes_winter = [MCExposureModel(
             number=1,
             presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
             masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
+            virus=MCVirus(halflife=6.43, qID=qid),
             expiratory_activity=2,
             samples=200000,
             breathing_category=3,
@@ -314,7 +314,7 @@ classroom_model_IGH_no_mask_2windows_fully_open_alltimes_winter = [MCExposureMod
             number=1,
             presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
             masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
+            virus=MCVirus(halflife=6.43, qID=qid),
             expiratory_activity=2,
             samples=200000,
             breathing_category=3,
@@ -397,7 +397,7 @@ classroom_model_IGH_no_mask_6windows_open_breaks_winter = [MCExposureModel(
             number=1,
             presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
             masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
+            virus=MCVirus(halflife=6.43, qID=qid),
             expiratory_activity=2,
             samples=200000,
             breathing_category=3,
@@ -424,7 +424,7 @@ classroom_model_IGH_no_mask_6windows_open_alltimes_winter = [MCExposureModel(
             number=1,
             presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
             masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
+            virus=MCVirus(halflife=6.43, qID=qid),
             expiratory_activity=2,
             samples=200000,
             breathing_category=3,
@@ -451,7 +451,7 @@ classroom_model_IGH_no_mask_6windows_fully_open_alltimes_winter = [MCExposureMod
             number=1,
             presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
             masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
+            virus=MCVirus(halflife=6.43, qID=qid),
             expiratory_activity=2,
             samples=200000,
             breathing_category=3,
@@ -507,7 +507,7 @@ classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter = [MCExposure
             number=1,
             presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
             masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
+            virus=MCVirus(halflife=6.43, qID=qid),
             expiratory_activity=2,
             samples=200000,
             breathing_category=3,
@@ -522,9 +522,7 @@ classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter = [MCExposure
 )for qid in (100, 60)]
 
 
-
-
-#Fig 2
+#Fig 2a
 classroom_model_IGH_no_mask_windows_closed_1HEPA = [MCExposureModel(
     concentration_model=MCConcentrationModel(
         room=models.Room(volume=160),
@@ -587,7 +585,70 @@ classroom_model_IGH_no_mask_windows_closed_2HEPA = [MCExposureModel(
     )
 )for qid in (100, 60)]
 
-#Fig 3
+#Fig 2b
+classroom_model_IGH_no_mask_windows_closed_1HEPA_winter = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.MultipleVentilation(
+            ventilations=(
+                models.AirChange(
+                        active=models.PeriodicInterval(period=120, duration=120),
+                        air_exch=0.25,
+                         ),
+                models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120),
+                                 q_air_mech=430)
+            )
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=False,
+            virus=MCVirus(halflife=6.43, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['No mask']
+    )
+)for qid in (100, 60)]
+
+classroom_model_IGH_no_mask_windows_closed_2HEPA_winter = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.MultipleVentilation(
+            ventilations=(
+                models.AirChange(
+                        active=models.PeriodicInterval(period=120, duration=120),
+                        air_exch=0.25,
+                         ),
+                models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120),
+                                 q_air_mech=860)
+            )
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=False,
+            virus=MCVirus(halflife=6.43, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['No mask']
+    )
+)for qid in (100, 60)]
+
+#Fig 2c
 classroom_model_IGH_with_mask_windows_closed = [MCExposureModel(
     concentration_model=MCConcentrationModel(
         room=models.Room(volume=160),
@@ -613,48 +674,19 @@ classroom_model_IGH_with_mask_windows_closed = [MCExposureModel(
     )
 )for qid in (100, 60)]
 
-#Fig 4a
-classroom_model_IGH_no_mask_2windows_open_breaks_winter_bis = [MCExposureModel(
+#Fig 2d
+classroom_model_IGH_with_mask_windows_closed_winter = [MCExposureModel(
     concentration_model=MCConcentrationModel(
         room=models.Room(volume=160),
-        ventilation=models.SlidingWindow(
-            active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))),
-            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
-            outside_temp=models.PiecewiseConstant((0, 24), (278,)),
-            window_height=1.6, opening_length=2*0.6,
-        ),
-        infected=MCInfectedPopulation(
-            number=1,
-            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-            masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
-            expiratory_activity=2,
-            samples=200000,
-            breathing_category=3,
-        )
-    ),
-    exposed=models.Population(
-        number=19,
-        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-        activity=models.Activity.types['Seated'],
-        mask=models.Mask.types['No mask']
-    )
-)for qid in (100, 60)]
-
-classroom_model_IGH_with_mask_2windows_open_breaks_winter = [MCExposureModel(
-    concentration_model=MCConcentrationModel(
-        room=models.Room(volume=160),
-        ventilation=models.SlidingWindow(
-            active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))),
-            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
-            outside_temp=models.PiecewiseConstant((0, 24), (278,)),
-            window_height=1.6, opening_length=2 * 0.6,
+        ventilation=models.AirChange(
+            active=models.PeriodicInterval(period=120, duration=120),
+            air_exch=0.25,
         ),
         infected=MCInfectedPopulation(
             number=1,
             presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
             masked=True,
-            virus=MCVirus(halflife=1.1, qID=qid),
+            virus=MCVirus(halflife=6.43, qID=qid),
             expiratory_activity=2,
             samples=200000,
             breathing_category=3,
@@ -668,74 +700,7 @@ classroom_model_IGH_with_mask_2windows_open_breaks_winter = [MCExposureModel(
     )
 )for qid in (100, 60)]
 
-#Fig 4b
-classroom_model_IGH_with_mask_2windows_open_breaks_winter_1HEPA = [MCExposureModel(
-    concentration_model=MCConcentrationModel(
-        room=models.Room(volume=160),
-        ventilation=models.MultipleVentilation(
-            ventilations=(
-                models.SlidingWindow(
-                    active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))),
-                    inside_temp=models.PiecewiseConstant((0, 24), (295,)),
-                    outside_temp=models.PiecewiseConstant((0, 24), (278,)),
-                    window_height=1.6, opening_length=2 * 0.6,
-                        ),
-                models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120),
-                                 q_air_mech=430)
-            )
-        ),
-        infected=MCInfectedPopulation(
-            number=1,
-            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-            masked=True,
-            virus=MCVirus(halflife=1.1, qID=qid),
-            expiratory_activity=2,
-            samples=200000,
-            breathing_category=3,
-        )
-    ),
-    exposed=models.Population(
-        number=19,
-        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-        activity=models.Activity.types['Seated'],
-        mask=models.Mask.types['Type I']
-    )
-)for qid in (100, 60)]
-
-classroom_model_IGH_with_mask_2windows_open_breaks_winter_2HEPA = [MCExposureModel(
-    concentration_model=MCConcentrationModel(
-        room=models.Room(volume=160),
-        ventilation=models.MultipleVentilation(
-            ventilations=(
-                models.SlidingWindow(
-                    active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))),
-                    inside_temp=models.PiecewiseConstant((0, 24), (295,)),
-                    outside_temp=models.PiecewiseConstant((0, 24), (278,)),
-                    window_height=1.6, opening_length=2 * 0.6,
-                        ),
-                models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120),
-                                 q_air_mech=2*430)
-            )
-        ),
-        infected=MCInfectedPopulation(
-            number=1,
-            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-            masked=True,
-            virus=MCVirus(halflife=1.1, qID=qid),
-            expiratory_activity=2,
-            samples=200000,
-            breathing_category=3,
-        )
-    ),
-    exposed=models.Population(
-        number=19,
-        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-        activity=models.Activity.types['Seated'],
-        mask=models.Mask.types['Type I']
-    )
-)for qid in (100, 60)]
-
-#Fig 4c
+#Fig 3b
 classroom_model_IGH_no_mask_2windows_open_alltimes_winter_bis = [MCExposureModel(
     concentration_model=MCConcentrationModel(
         room=models.Room(volume=160),
@@ -749,7 +714,7 @@ classroom_model_IGH_no_mask_2windows_open_alltimes_winter_bis = [MCExposureModel
             number=1,
             presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
             masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
+            virus=MCVirus(halflife=6.43, qID=qid),
             expiratory_activity=2,
             samples=200000,
             breathing_category=3,
@@ -776,242 +741,7 @@ classroom_model_IGH_with_mask_2windows_open_alltimes_winter = [MCExposureModel(
             number=1,
             presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
             masked=True,
-            virus=MCVirus(halflife=1.1, qID=qid),
-            expiratory_activity=2,
-            samples=200000,
-            breathing_category=3,
-        )
-    ),
-    exposed=models.Population(
-        number=19,
-        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-        activity=models.Activity.types['Seated'],
-        mask=models.Mask.types['Type I']
-    )
-)for qid in (100, 60)]
-
-#Fig 4d
-classroom_model_IGH_with_mask_2windows_open_alltimes_winter_1HEPA = [MCExposureModel(
-    concentration_model=MCConcentrationModel(
-        room=models.Room(volume=160),
-        ventilation=models.MultipleVentilation(
-            ventilations=(
-                models.SlidingWindow(
-                    active=models.PeriodicInterval(period=120, duration=120),
-                    inside_temp=models.PiecewiseConstant((0, 24), (295,)),
-                    outside_temp=models.PiecewiseConstant((0, 24), (278,)),
-                    window_height=1.6, opening_length=2 * 0.2,
-                        ),
-                models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120),
-                                 q_air_mech=430)
-            )
-        ),
-        infected=MCInfectedPopulation(
-            number=1,
-            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-            masked=True,
-            virus=MCVirus(halflife=1.1, qID=qid),
-            expiratory_activity=2,
-            samples=200000,
-            breathing_category=3,
-        )
-    ),
-    exposed=models.Population(
-        number=19,
-        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-        activity=models.Activity.types['Seated'],
-        mask=models.Mask.types['Type I']
-    )
-)for qid in (100, 60)]
-
-classroom_model_IGH_with_mask_2windows_open_alltimes_winter_2HEPA = [MCExposureModel(
-    concentration_model=MCConcentrationModel(
-        room=models.Room(volume=160),
-        ventilation=models.MultipleVentilation(
-            ventilations=(
-                models.SlidingWindow(
-                    active=models.PeriodicInterval(period=120, duration=120),
-                    inside_temp=models.PiecewiseConstant((0, 24), (295,)),
-                    outside_temp=models.PiecewiseConstant((0, 24), (278,)),
-                    window_height=1.6, opening_length=2 * 0.2,
-                        ),
-                models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120),
-                                 q_air_mech=2*430)
-            )
-        ),
-        infected=MCInfectedPopulation(
-            number=1,
-            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-            masked=True,
-            virus=MCVirus(halflife=1.1, qID=qid),
-            expiratory_activity=2,
-            samples=200000,
-            breathing_category=3,
-        )
-    ),
-    exposed=models.Population(
-        number=19,
-        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-        activity=models.Activity.types['Seated'],
-        mask=models.Mask.types['Type I']
-    )
-)for qid in (100, 60)]
-
-######
-
-
-classroom_model_IGH_no_mask_windows_open_breaks_endOfClass = [MCExposureModel(
-    concentration_model=MCConcentrationModel(
-        room=models.Room(volume=160),
-        ventilation=models.SlidingWindow(
-            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
-            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
-            outside_temp=models.PiecewiseConstant((0, 24), (291,)),
-            window_height=1.6, opening_length=0.6,
-        ),
-        infected=MCInfectedPopulation(
-            number=1,
-            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-            masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
-            expiratory_activity=2,
-            samples=200000,
-            breathing_category=3,
-        )
-    ),
-    exposed=models.Population(
-        number=19,
-        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-        activity=models.Activity.types['Seated'],
-        mask=models.Mask.types['No mask']
-    )
-)for qid in (100, 60)]
-
-classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass = [MCExposureModel(
-    concentration_model=MCConcentrationModel(
-        room=models.Room(volume=160),
-        ventilation=models.SlidingWindow(
-            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
-            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
-            outside_temp=models.PiecewiseConstant((0, 24), (291,)),
-            window_height=1.6, opening_length=2*0.6,
-        ),
-        infected=MCInfectedPopulation(
-            number=1,
-            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-            masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
-            expiratory_activity=2,
-            samples=200000,
-            breathing_category=3,
-        )
-    ),
-    exposed=models.Population(
-        number=19,
-        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-        activity=models.Activity.types['Seated'],
-        mask=models.Mask.types['No mask']
-    )
-)for qid in (100, 60)]
-
-
-classroom_model_IGH_no_mask_windows_open_breaks_endOfClass_winter = [MCExposureModel(
-    concentration_model=MCConcentrationModel(
-        room=models.Room(volume=160),
-        ventilation=models.SlidingWindow(
-            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
-            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
-            outside_temp=models.PiecewiseConstant((0, 24), (278,)),
-            window_height=1.6, opening_length=0.6,
-        ),
-        infected=MCInfectedPopulation(
-            number=1,
-            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-            masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
-            expiratory_activity=2,
-            samples=200000,
-            breathing_category=3,
-        )
-    ),
-    exposed=models.Population(
-        number=19,
-        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-        activity=models.Activity.types['Seated'],
-        mask=models.Mask.types['No mask']
-    )
-)for qid in (100, 60)]
-
-classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass_winter = [MCExposureModel(
-    concentration_model=MCConcentrationModel(
-        room=models.Room(volume=160),
-        ventilation=models.SlidingWindow(
-            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
-            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
-            outside_temp=models.PiecewiseConstant((0, 24), (278,)),
-            window_height=1.6, opening_length=2*0.6,
-        ),
-        infected=MCInfectedPopulation(
-            number=1,
-            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-            masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
-            expiratory_activity=2,
-            samples=200000,
-            breathing_category=3,
-        )
-    ),
-    exposed=models.Population(
-        number=19,
-        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-        activity=models.Activity.types['Seated'],
-        mask=models.Mask.types['No mask']
-    )
-)for qid in (100, 60)]
-
-
-
-classroom_model_IGH_with_mask_windows_open_breaks_endOfClass = [MCExposureModel(
-    concentration_model=MCConcentrationModel(
-        room=models.Room(volume=160),
-        ventilation=models.SlidingWindow(
-            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
-            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
-            outside_temp=models.PiecewiseConstant((0, 24), (291,)),
-            window_height=1.6, opening_length=0.6,
-        ),
-        infected=MCInfectedPopulation(
-            number=1,
-            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-            masked=True,
-            virus=MCVirus(halflife=1.1, qID=qid),
-            expiratory_activity=2,
-            samples=200000,
-            breathing_category=3,
-        )
-    ),
-    exposed=models.Population(
-        number=19,
-        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-        activity=models.Activity.types['Seated'],
-        mask=models.Mask.types['Type I']
-    )
-)for qid in (100, 60)]
-
-classroom_model_IGH_with_mask_windows_open_alltimes = [MCExposureModel(
-    concentration_model=MCConcentrationModel(
-        room=models.Room(volume=160),
-        ventilation=models.SlidingWindow(
-            active=models.PeriodicInterval(period=120, duration=120),
-            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
-            outside_temp=models.PiecewiseConstant((0, 24), (291,)),
-            window_height=1.6, opening_length=0.6,
-        ),
-        infected=MCInfectedPopulation(
-            number=1,
-            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-            masked=True,
-            virus=MCVirus(halflife=1.1, qID=qid),
+            virus=MCVirus(halflife=6.43, qID=qid),
             expiratory_activity=2,
             samples=200000,
             breathing_category=3,
@@ -1025,6 +755,7 @@ classroom_model_IGH_with_mask_windows_open_alltimes = [MCExposureModel(
     )
 )for qid in (100, 60)]
 
+#Fig 3c
 classroom_model_IGH_with_mask_windows_closed_1HEPA = [MCExposureModel(
     concentration_model=MCConcentrationModel(
         room=models.Room(volume=160),
@@ -1085,4 +816,359 @@ classroom_model_IGH_with_mask_windows_closed_2HEPA = [MCExposureModel(
         activity=models.Activity.types['Seated'],
         mask=models.Mask.types['Type I']
     )
-)for qid in (100, 60)]
\ No newline at end of file
+)for qid in (100, 60)]
+
+#Fig 3d
+classroom_model_IGH_with_mask_2windows_open_alltimes_winter_1HEPA = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.MultipleVentilation(
+            ventilations=(
+                models.SlidingWindow(
+                    active=models.PeriodicInterval(period=120, duration=120),
+                    inside_temp=models.PiecewiseConstant((0, 24), (295,)),
+                    outside_temp=models.PiecewiseConstant((0, 24), (278,)),
+                    window_height=1.6, opening_length=2 * 0.2,
+                        ),
+                models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120),
+                                 q_air_mech=430)
+            )
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=True,
+            virus=MCVirus(halflife=6.43, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['Type I']
+    )
+)for qid in (100, 60)]
+
+classroom_model_IGH_with_mask_2windows_open_alltimes_winter_2HEPA = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.MultipleVentilation(
+            ventilations=(
+                models.SlidingWindow(
+                    active=models.PeriodicInterval(period=120, duration=120),
+                    inside_temp=models.PiecewiseConstant((0, 24), (295,)),
+                    outside_temp=models.PiecewiseConstant((0, 24), (278,)),
+                    window_height=1.6, opening_length=2 * 0.2,
+                        ),
+                models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120),
+                                 q_air_mech=2*430)
+            )
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=True,
+            virus=MCVirus(halflife=6.43, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['Type I']
+    )
+)for qid in (100, 60)]
+
+
+######
+
+classroom_model_IGH_no_mask_2windows_open_breaks_winter_bis = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.SlidingWindow(
+            active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))),
+            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
+            outside_temp=models.PiecewiseConstant((0, 24), (278,)),
+            window_height=1.6, opening_length=2*0.6,
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=False,
+            virus=MCVirus(halflife=6.43, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['No mask']
+    )
+)for qid in (100, 60)]
+
+classroom_model_IGH_with_mask_2windows_open_breaks_winter = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.SlidingWindow(
+            active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))),
+            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
+            outside_temp=models.PiecewiseConstant((0, 24), (278,)),
+            window_height=1.6, opening_length=2 * 0.6,
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=True,
+            virus=MCVirus(halflife=6.43, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['Type I']
+    )
+)for qid in (100, 60)]
+
+classroom_model_IGH_with_mask_2windows_open_breaks_winter_1HEPA = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.MultipleVentilation(
+            ventilations=(
+                models.SlidingWindow(
+                    active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))),
+                    inside_temp=models.PiecewiseConstant((0, 24), (295,)),
+                    outside_temp=models.PiecewiseConstant((0, 24), (278,)),
+                    window_height=1.6, opening_length=2 * 0.6,
+                        ),
+                models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120),
+                                 q_air_mech=430)
+            )
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=True,
+            virus=MCVirus(halflife=6.43, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['Type I']
+    )
+)for qid in (100, 60)]
+
+classroom_model_IGH_with_mask_2windows_open_breaks_winter_2HEPA = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.MultipleVentilation(
+            ventilations=(
+                models.SlidingWindow(
+                    active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))),
+                    inside_temp=models.PiecewiseConstant((0, 24), (295,)),
+                    outside_temp=models.PiecewiseConstant((0, 24), (278,)),
+                    window_height=1.6, opening_length=2 * 0.6,
+                        ),
+                models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120),
+                                 q_air_mech=2*430)
+            )
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=True,
+            virus=MCVirus(halflife=6.43, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['Type I']
+    )
+)for qid in (100, 60)]
+
+classroom_model_IGH_no_mask_windows_open_breaks_endOfClass = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.SlidingWindow(
+            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
+            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
+            outside_temp=models.PiecewiseConstant((0, 24), (291,)),
+            window_height=1.6, opening_length=0.6,
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=False,
+            virus=MCVirus(halflife=1.1, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['No mask']
+    )
+)for qid in (100, 60)]
+
+classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.SlidingWindow(
+            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
+            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
+            outside_temp=models.PiecewiseConstant((0, 24), (291,)),
+            window_height=1.6, opening_length=2*0.6,
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=False,
+            virus=MCVirus(halflife=1.1, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['No mask']
+    )
+)for qid in (100, 60)]
+
+classroom_model_IGH_no_mask_windows_open_breaks_endOfClass_winter = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.SlidingWindow(
+            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
+            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
+            outside_temp=models.PiecewiseConstant((0, 24), (278,)),
+            window_height=1.6, opening_length=0.6,
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=False,
+            virus=MCVirus(halflife=6.43, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['No mask']
+    )
+)for qid in (100, 60)]
+
+classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass_winter = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.SlidingWindow(
+            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
+            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
+            outside_temp=models.PiecewiseConstant((0, 24), (278,)),
+            window_height=1.6, opening_length=2*0.6,
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=False,
+            virus=MCVirus(halflife=6.43, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['No mask']
+    )
+)for qid in (100, 60)]
+
+classroom_model_IGH_with_mask_windows_open_breaks_endOfClass = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.SlidingWindow(
+            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
+            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
+            outside_temp=models.PiecewiseConstant((0, 24), (291,)),
+            window_height=1.6, opening_length=0.6,
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=True,
+            virus=MCVirus(halflife=1.1, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['Type I']
+    )
+)for qid in (100, 60)]
+
+classroom_model_IGH_with_mask_windows_open_alltimes = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.SlidingWindow(
+            active=models.PeriodicInterval(period=120, duration=120),
+            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
+            outside_temp=models.PiecewiseConstant((0, 24), (291,)),
+            window_height=1.6, opening_length=0.6,
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=True,
+            virus=MCVirus(halflife=1.1, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['Type I']
+    )
+)for qid in (100, 60)]
+
+
+