update vaccine names
@@ -335,11 +335,11 @@ def get_vaccine_choices():
# List of choices currently available: new ones can be added to the list along with their aliases
choices = {
'default': ['default', None],
- 'pfizer': ['pfizer', 'biontech', 'pfizer-biontech'],
- 'moderna': ['moderna'],
- 'novavax': ['nvx', 'novavax', 'nova'],
- 'az': ['az', 'astrazeneca'],
- 'jj': ['jj', 'jnj', 'johnson & johnson', 'janssen'],
+ 'pfizer': ['pfizer', 'biontech', 'pfizer-biontech', 'pf', 'pfz', 'pz'],
+ 'moderna': ['moderna', 'md'],
+ 'novavax': ['novavax', 'nova', 'covovax', 'nvx', 'nv'],
+ 'az': ['astrazeneca', 'oxford', 'vaxzevria', 'az'],
+ 'jj': ['jnj', 'johnson & johnson', 'janssen', 'jj'],
}
mapping = {name:key for key,synonyms in choices.items() for name in synonyms} # Flip from key:value to value:key
return choices, mapping
@@ -462,13 +462,6 @@ def get_vaccine_strain_pars(default=False):
p1 = 1/8.6,
),
- novavax = dict( # https://ir.novavax.com/news-releases/news-release-details/novavax-covid-19-vaccine-demonstrates-893-efficacy-uk-phase-3
- wild = 1.0,
- b117 = 1/1.12,
- b1351 = 1/4.7,
- p1 = 1/8.6, # assumption, no data available yet
- ),
-
az = dict(
wild = 1.0,
b117 = 1/2.3,
@@ -482,6 +475,13 @@ def get_vaccine_strain_pars(default=False):
b1351 = 1/6.7,
p1 = 1/8.6,
),
+
+ novavax = dict( # https://ir.novavax.com/news-releases/news-release-details/novavax-covid-19-vaccine-demonstrates-893-efficacy-uk-phase-3
+ wild = 1.0,
+ b117 = 1/1.12,
+ b1351 = 1/4.7,
+ p1 = 1/8.6, # assumption, no data available yet
+ ),
)
if default:
@@ -520,14 +520,6 @@ def get_vaccine_dose_pars(default=False):
interval = 28,
),
- novavax = dict(
- nab_eff = dict(sus=dict(slope=1.6, n_50=0.05)),
- nab_init = dict(dist='normal', par1=-0.9, par2=2),
- nab_boost = 3,
- doses = 2,
- interval = 21,
- ),
-
az = dict(
nab_eff = dict(sus=dict(slope=1.6, n_50=0.05)),
nab_init = dict(dist='normal', par1=-0.85, par2=2),
@@ -543,6 +535,14 @@ def get_vaccine_dose_pars(default=False):
doses = 1,
interval = None,
),
+
+ novavax = dict(
+ nab_eff = dict(sus=dict(slope=1.6, n_50=0.05)),
+ nab_init = dict(dist='normal', par1=-0.9, par2=2),
+ nab_boost = 3,
+ doses = 2,
+ interval = 21,
+ ),
)
if default:
