pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cosmetic changes in models.py

Browse source
This commit is contained in:
Nicolas Mounet 2022-04-06 11:48:26 +02:00
parent ad83e7a127
commit 808c71c266
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cara/models.py
View file

@ -1175,12 +1175,21 @@ class ShortRangeModel:
"""
start_bound, stop_bound = self.presence.boundaries()[0]
jet_origin_integrated = self.expiration.jet_origin_concentration()
jet_origin = self.expiration.jet_origin_concentration()
dilution = self.dilution_factor()
total_normed_concentration = -(concentration_model.integrated_concentration(start_bound, stop_bound)/concentration_model.virus.viral_load_in_sputum/dilution)
total_normed_concentration_interpolated = np.interp(self.expiration.particle.diameter, concentration_model.infected.particle.diameter, total_normed_concentration)
return (jet_origin_integrated/dilution * (stop_bound - start_bound)) + total_normed_concentration_interpolated
total_normed_concentration_diluted = (
concentration_model.integrated_concentration(start_bound,
stop_bound)/dilution/
concentration_model.virus.viral_load_in_sputum
)
total_normed_concentration_interpolated = np.interp(
self.expiration.particle.diameter,
concentration_model.infected.particle.diameter,
total_normed_concentration_diluted
)
return (jet_origin/dilution * (stop_bound - start_bound)
) - total_normed_concentration_interpolated
@dataclass(frozen=True)