Skip to content

Fix the probability of infection with short-range interactions

Nicolas Mounet requested to merge feature/shortrange_MonteCarlo_decoupling into master

The Monte-Carlo integration of the diameter-dependent quantities in the short-range case, is now done properly (taking away the factors - dilution and possibly breathing rate - that contain other Monte-Carlo-sampled parameters, and putting them back only AFTER taking the mean on the resulting diameter-dependent quantities). This is crucial to get the probability of infection right.

Tests have been updated accordingly.

Note that after this MR, the probability of infection with short-range interaction(s), will change significantly.

Also fix a wrong emission rate in test_monte_carlo_full_models.py::test_small_shared_office_Geneva, and a wrong deposited exposure when several short-range interactions are set.

This solves #259 (closed), #260 (closed) and #262 (closed).

In this MR, the mask inhale efficiency factor was also added to the short-range exposure (no change for the calculator, as it explicitly prevents the use of masks with short-range interactions).

Edited by Nicolas Mounet

Merge request reports