diff --git a/cara/mc-output.py b/cara/mc-output.py index f7a1f5c5..9651e468 100644 --- a/cara/mc-output.py +++ b/cara/mc-output.py @@ -15,7 +15,8 @@ from cara.model_scenarios import * composite_plot_pi_vs_viral_load([shared_office_worst_model[1], shared_office_model[1],shared_office_better_model[1]], labels=['No mask &\nwindows closed', 'Baseline', 'Baseline +\nHEPA filter'], colors=['tomato', '#1f77b4', 'limegreen'], - title='$P(I|qID)$ vs $vl$ - Shared office scenario') + title='$P(I|qID)$ vs $vl$ - Shared office scenario', + vl_points=200) #plot_pi_vs_viral_load([shared_office_model[1]], labels=['Baseline, qID=60', 'HEPA, qID=60', 'No mask + windows closed, qID=60'],title='$P(I|qID)$ - Shared office scenario') diff --git a/cara/montecarlo.py b/cara/montecarlo.py index 9f1a74da..7f72b870 100644 --- a/cara/montecarlo.py +++ b/cara/montecarlo.py @@ -687,15 +687,21 @@ def composite_plot_pi_vs_viral_load(baselines: typing.List[MCExposureModel], lab #axs[0, 2].text(axs[0, 2].get_xlim()[1] * 0.1, -0.05, '$(iii)$') axs[0, 2].set_title('$(iii)$', fontsize=10) - axs[0, 0].text(2.5, 0.4, '$vl_{crit2}=$', fontsize=10, color='tomato') - axs[0, 0].text(2.5, 0.3, '$vl_{crit2}=$', fontsize=10, color='#1f77b4') - axs[0, 0].text(2.5, 0.2, '$vl_{crit2}=$', fontsize=10, color='limegreen') + crits = [] + for line in lines: + for i, point in enumerate(line): + if point >= 0.95: + crits.append(viral_loads[i]) + break + + for i, (crit, color) in enumerate(zip(crits, colors)): + axs[0, 0].text(2.5, 0.4 - i * 0.1, f'$vl_{"{crit2}"}=' + '10^{' + str(np.round(crits[i], 1)) + '}$', fontsize=10, color=color) if show_lines: middle_positions = [] for line in lines: for i, point in enumerate(line): - if point > 0.5: + if point >= 0.5: middle_positions.append(viral_loads[i]) break