From 01c2454e0d55bb9d64612cca67bcd15bbd3dd5e6 Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Mon, 3 Oct 2022 11:12:56 +0100
Subject: [PATCH] new vaccination data with VE < 0 as 0 and "  or  " entries
 counting on both vaccines

---
 .../templates/base/calculator.form.html.j2    | 75 ++++++---------
 caimira/data/__init__.py                      | 91 +++++++------------
 2 files changed, 62 insertions(+), 104 deletions(-)

diff --git a/caimira/apps/templates/base/calculator.form.html.j2 b/caimira/apps/templates/base/calculator.form.html.j2
index 215eef2d..298735bb 100644
--- a/caimira/apps/templates/base/calculator.form.html.j2
+++ b/caimira/apps/templates/base/calculator.form.html.j2
@@ -374,19 +374,21 @@
       <div class="col-sm-4"><label class="col-form-label">Primary vaccine:</label></div>
       <div class="col-sm-6 align-self-center">
         <select id="vaccine_type" name="vaccine_type" class="form-control form-control-sm">
+          <option value='AZD1222_(AstraZeneca)'>AZD1222 (AstraZeneca)</option>
+          <option value='AZD1222_(AstraZeneca)_and_BNT162b2_(Pfizer)'>AZD1222 (AstraZeneca) & BNT162b2 (Pfizer)</option>
+          <option value='AZD1222_(AstraZeneca)_and_any_mRNA_-_heterologous'>AZD1222 (AstraZeneca) & any mRNA - heterologous</option>
           <option value='Ad26.COV2.S_(Janssen)'>Ad26.COV2.S (Janssen)</option>
           <option value='Any_mRNA_-_heterologous'>Any mRNA - heterologous</option>
-          <option value='AZD1222_(AstraZeneca)_and_any_mRNA_-_heterologous'>AZD1222 (AstraZeneca) and any mRNA - heterologous</option>
-          <option value='AZD1222_(AstraZeneca)_and_BNT162b2_(Pfizer)'>AZD1222 (AstraZeneca) and BNT162b2 (Pfizer)</option>
           <option value='BBIBP-CorV_(Beijing_CNBG)'>BBIBP-CorV (Beijing CNBG)</option>
           <option value='BNT162b2_(Pfizer)'>BNT162b2 (Pfizer)</option>
-          <option value='BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)'>BNT162b2 (Pfizer) and mRNA-1273 (Moderna)</option>
+          <option value='BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)'>BNT162b2 (Pfizer) & mRNA-1273 (Moderna)</option>
           <option value='CoronaVac_(Sinovac)'>CoronaVac (Sinovac)</option>
-          <option value='CoronaVac_(Sinovac)_and_AZD1222_(AstraZeneca)'>CoronaVac (Sinovac) and AZD1222 (AstraZeneca)</option>
+          <option value='CoronaVac_(Sinovac)_and_AZD1222_(AstraZeneca)'>CoronaVac (Sinovac) & AZD1222 (AstraZeneca)</option>
+          <option value='CoronaVac_(Sinovac)_and_AZD1222_(AstraZeneca)_-_heterologous'>CoronaVac (Sinovac) & AZD1222 (AstraZeneca) - heterologous</option>
+          <option value='CoronaVac_(Sinovac)_and_BNT162b2_(Pfizer)'>CoronaVac (Sinovac) & BNT162b2 (Pfizer)</option>
           <option value='Covishield'>Covishield</option>
-          <option value='mRNA-1273_(Moderna)'>mRNA-1273 (Moderna)</option>
           <option value='Sputnik_V_(Gamaleya)'>Sputnik V (Gamaleya)</option>
-          <option value='CoronaVac_(Sinovac)_and_BNT162b2_(Pfizer)'>CoronaVac (Sinovac) and BNT162b2 (Pfizer)</option>
+          <option value='mRNA-1273_(Moderna)'>mRNA-1273 (Moderna)</option>
         </select>
       </div>
       </div>
@@ -406,48 +408,25 @@
         <div class="col-sm-4"><label class="col-form-label">Booster:</label></div>
         <div class="col-sm-6 align-self-center">
           <select id="vaccine_booster_type" name="vaccine_booster_type" class="form-control form-control-sm">
-            <option value="AZD1222_(AstraZeneca)" data-primary-vaccine="AZD1222_(AstraZeneca)">AZD1222 (AstraZeneca)</option>
-            <option value="BNT162b2_(Pfizer)" data-primary-vaccine="AZD1222_(AstraZeneca)">BNT162b2 (Pfizer)</option>
-            <option value="BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)" data-primary-vaccine="AZD1222_(AstraZeneca)">BNT162b2 (Pfizer) and mRNA-1273 (Moderna)</option>
-            <option value="BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)" data-primary-vaccine="AZD1222_(AstraZeneca)">BNT162b2 (Pfizer) or mRNA-1273 (Moderna)</option>
-            <option value="Sinopharm" data-primary-vaccine="AZD1222_(AstraZeneca)">Sinopharm</option>
-            <option value="mRNA-1273_(Moderna)" data-primary-vaccine="AZD1222_(AstraZeneca)">mRNA-1273 (Moderna)</option>
-            <option value="Ad26.COV2.S_(Janssen)" data-primary-vaccine="Ad26.COV2.S_(Janssen)">Ad26.COV2.S (Janssen)</option>
-            <option value="BNT162b2_(Pfizer)" data-primary-vaccine="Ad26.COV2.S_(Janssen)">BNT162b2 (Pfizer)</option>
-            <option value="BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)" data-primary-vaccine="Ad26.COV2.S_(Janssen)">BNT162b2 (Pfizer) or mRNA-1273 (Moderna)</option>
-            <option value="Ad26.COV2.S_(Janssen)" data-primary-vaccine="BBIBP-CorV_(Beijing_CNBG)">Ad26.COV2.S (Janssen)</option>
-            <option value="BNT162b2_(Pfizer)" data-primary-vaccine="BBIBP-CorV_(Beijing CNBG)">BNT162b2 (Pfizer)</option>
-            <option value="Sinopharm" data-primary-vaccine="BBIBP-CorV_(Beijing_CNBG)">Sinopharm</option>
-            <option value="mRNA-1273_(Moderna)" data-primary-vaccine="BBIBP-CorV_(Beijing_CNBG)">mRNA-1273 (Moderna)</option>
-            <option value="AZD1222_(AstraZeneca)" data-primary-vaccine="BNT162b2_(Pfizer)">AZD1222 (AstraZeneca)</option>
-            <option value="Ad26.COV2.S_(Janssen)" data-primary-vaccine="BNT162b2_(Pfizer)">Ad26.COV2.S (Janssen)</option>
-            <option value="BNT162b2_(Pfizer)" data-primary-vaccine="BNT162b2_(Pfizer)">BNT162b2 (Pfizer)</option>
-            <option value="BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)" data-primary-vaccine="BNT162b2_(Pfizer)">BNT162b2 (Pfizer) or mRNA-1273 (Moderna)</option>
-            <option value="CoronaVac_(Sinovac)" data-primary-vaccine="BNT162b2_(Pfizer)">CoronaVac (Sinovac)</option>
-            <option value="Sinopharm" data-primary-vaccine="BNT162b2_(Pfizer)">Sinopharm</option>
-            <option value="mRNA-1273_(Moderna)" data-primary-vaccine="BNT162b2_(Pfizer)">mRNA-1273 (Moderna)</option>
-            <option value="BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)" data-primary-vaccine="BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)">BNT162b2 (Pfizer) and mRNA-1273 (Moderna)</option>
-            <option value="mRNA-1273_(Moderna)_(4th_dose)" data-primary-vaccine="BNT162b2_(Pfizer)_(2_doses)_+_mRNA-1273_(Moderna)_(3rd_dose)">mRNA-1273 (Moderna) (4th dose)</option>
-            <option value="BNT162b2_(Pfizer)_(4th_dose)" data-primary-vaccine="BNT162b2_(Pfizer)_(3_doses)">BNT162b2 (Pfizer) (4th dose)</option>
-            <option value="mRNA-1273_(Moderna)_(4th_dose)" data-primary-vaccine="BNT162b2_(Pfizer)_(3_doses)">mRNA-1273 (Moderna) (4th dose)</option>
-            <option value="BNT162b2_(Pfizer)" data-primary-vaccine="BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)">BNT162b2 (Pfizer)</option>
-            <option value="BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)" data-primary-vaccine="BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)">BNT162b2 (Pfizer) or mRNA-1273 (Moderna)</option>
-            <option value="mRNA-1273_(Moderna)" data-primary-vaccine="BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)">mRNA-1273 (Moderna)</option>
-            <option value="BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)_(4th_dose)" data-primary-vaccine="BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)_(3_doses)">BNT162b2 (Pfizer) or mRNA-1273 (Moderna) (4th dose)</option>
-            <option value="AZD1222_(AstraZeneca)" data-primary-vaccine="CoronaVac_(Sinovac)">AZD1222 (AstraZeneca)</option>
-            <option value="BNT162b2_(Pfizer)" data-primary-vaccine="CoronaVac_(Sinovac)">BNT162b2 (Pfizer)</option>
-            <option value="CoronaVac_(Sinovac)" data-primary-vaccine="CoronaVac_(Sinovac)">CoronaVac (Sinovac)</option>
-            <option value="Coronavac_(Sinovac)" data-primary-vaccine="CoronaVac_(Sinovac)">Coronavac (Sinovac)</option>
-            <option value="Ad26.COV2.S_(Janssen)" data-primary-vaccine="Sputnik_V_(Gamaleya)">Ad26.COV2.S (Janssen)</option>
-            <option value="BNT162b2_(Pfizer)" data-primary-vaccine="Sputnik_V_(Gamaleya)">BNT162b2 (Pfizer)</option>
-            <option value="Sinopharm" data-primary-vaccine="Sputnik_V_(Gamaleya)">Sinopharm</option>
-            <option value="mRNA-1273_(Moderna)" data-primary-vaccine="Sputnik_V_(Gamaleya)">mRNA-1273 (Moderna)</option>
-            <option value="Ad26.COV2.S_(Janssen)" data-primary-vaccine="mRNA-1273_(Moderna)">Ad26.COV2.S (Janssen)</option>
-            <option value="BNT162b2_(Pfizer)" data-primary-vaccine="mRNA-1273_(Moderna)">BNT162b2 (Pfizer)</option>
-            <option value="BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)" data-primary-vaccine="mRNA-1273_(Moderna)">BNT162b2 (Pfizer) or mRNA-1273 (Moderna)</option>
-            <option value="Sinopharm" data-primary-vaccine="mRNA-1273_(Moderna)">Sinopharm</option>
-            <option value="mRNA-1273_(Moderna)" data-primary-vaccine="mRNA-1273_(Moderna)">mRNA-1273 (Moderna)</option>
-            <option value="mRNA-1273_(Moderna)_(4th_dose)" data-primary-vaccine="mRNA-1273_(Moderna)_(3 doses)">mRNA-1273 (Moderna) (4th dose)</option>
+            <option value='AZD1222_(AstraZeneca)' data-primary-vaccine='AZD1222_(AstraZeneca)'>AZD1222 (AstraZeneca)</option>
+            <option value='BNT162b2_(Pfizer)' data-primary-vaccine='AZD1222_(AstraZeneca)'>BNT162b2 (Pfizer)</option>
+            <option value='BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)' data-primary-vaccine='AZD1222_(AstraZeneca)'>BNT162b2 (Pfizer) or mRNA-1273 (Moderna)</option>
+            <option value='mRNA-1273_(Moderna)' data-primary-vaccine='AZD1222_(AstraZeneca)'>mRNA-1273 (Moderna)</option>
+            <option value='Ad26.COV2.S_(Janssen)' data-primary-vaccine='Ad26.COV2.S_(Janssen)'>Ad26.COV2.S (Janssen)</option>
+            <option value='BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)' data-primary-vaccine='Ad26.COV2.S_(Janssen)'>BNT162b2 (Pfizer) or mRNA-1273 (Moderna)</option>
+            <option value='AZD1222_(AstraZeneca)' data-primary-vaccine='BNT162b2_(Pfizer)'>AZD1222 (AstraZeneca)</option>
+            <option value='BNT162b2_(Pfizer)' data-primary-vaccine='BNT162b2_(Pfizer)'>BNT162b2 (Pfizer)</option>
+            <option value='BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)' data-primary-vaccine='BNT162b2_(Pfizer)'>BNT162b2 (Pfizer) or mRNA-1273 (Moderna)</option>
+            <option value='mRNA-1273_(Moderna)' data-primary-vaccine='BNT162b2_(Pfizer)'>mRNA-1273 (Moderna)</option>
+            <option value='BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)' data-primary-vaccine='BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)'>BNT162b2 (Pfizer) & mRNA-1273 (Moderna)</option>
+            <option value='BNT162b2_(Pfizer)_(4th_dose)' data-primary-vaccine='BNT162b2_(Pfizer)_(3_doses)'>BNT162b2 (Pfizer) (4th dose)</option>
+            <option value='AZD1222_(AstraZeneca)' data-primary-vaccine='CoronaVac_(Sinovac)'>AZD1222 (AstraZeneca)</option>
+            <option value='BNT162b2_(Pfizer)' data-primary-vaccine='CoronaVac_(Sinovac)'>BNT162b2 (Pfizer)</option>
+            <option value='CoronaVac_(Sinovac)' data-primary-vaccine='CoronaVac_(Sinovac)'>CoronaVac (Sinovac)</option>
+            <option value='CoronaVac_(Sinovac)' data-primary-vaccine='CoronaVac_(Sinovac)'>CoronaVac (Sinovac)</option>
+            <option value='BNT162b2_(Pfizer)' data-primary-vaccine='mRNA-1273_(Moderna)'>BNT162b2 (Pfizer)</option>
+            <option value='BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)' data-primary-vaccine='mRNA-1273_(Moderna)'>BNT162b2 (Pfizer) or mRNA-1273 (Moderna)</option>
+            <option value='mRNA-1273_(Moderna)' data-primary-vaccine='mRNA-1273_(Moderna)'>mRNA-1273 (Moderna)</option>
             <option value="Other" data-primary-vaccine="Other">Other</option>
           </select> 
         </div>
diff --git a/caimira/data/__init__.py b/caimira/data/__init__.py
index 7ca7fb70..7ed3a76b 100644
--- a/caimira/data/__init__.py
+++ b/caimira/data/__init__.py
@@ -48,62 +48,41 @@ GenevaTemperatures = {
 # Studies: An Ongoing Systematic Review - Updated September 8, 2022.
 # https://view-hub.org/resources
 vaccine_primary_host_immunity = {
-  'Ad26.COV2.S_(Janssen)': 0.551277778,
-  'Any_mRNA_-_heterologous': 0.93875,
-  'AZD1222_(AstraZeneca)': 0.55921875,
-  'AZD1222_(AstraZeneca)_and_any_mRNA_-_heterologous': 0.718571429,
-  'AZD1222_(AstraZeneca)_and_BNT162b2_(Pfizer)': 0.7865,
-  'BBIBP-CorV_(Beijing_CNBG)': 0.4325,
-  'BNT162b2_(Pfizer)': 0.62503012,
-  'BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)': 0.567126761,
-  'CoronaVac_(Sinovac)': 0.286884615,
-  'CoronaVac_(Sinovac)_and_AZD1222_(AstraZeneca)': 0.561333333,
-  'Covishield': 0.98,
-  'mRNA-1273_(Moderna)': 0.683255814,
-  'Sputnik_V_(Gamaleya)': 0.696,
-  'CoronaVac_(Sinovac)_and_BNT162b2_(Pfizer)': 0.7965,
+    'AZD1222_(AstraZeneca)': 0.56474,
+    'AZD1222_(AstraZeneca)_and_BNT162b2_(Pfizer)': 0.7865,
+    'AZD1222_(AstraZeneca)_and_any_mRNA_-_heterologous': 0.752143,
+    'Ad26.COV2.S_(Janssen)': 0.551278,
+    'Any_mRNA_-_heterologous': 0.93875,
+    'BBIBP-CorV_(Beijing_CNBG)': 0.4325,
+    'BNT162b2_(Pfizer)': 0.628452,
+    'BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)': 0.569803,
+    'CoronaVac_(Sinovac)': 0.292923,
+    'CoronaVac_(Sinovac)_and_AZD1222_(AstraZeneca)': 0.472,
+    'CoronaVac_(Sinovac)_and_AZD1222_(AstraZeneca)_-_heterologous': 0.74,
+    'CoronaVac_(Sinovac)_and_BNT162b2_(Pfizer)': 0.7965,
+    'Covishield': 0.98,
+    'Sputnik_V_(Gamaleya)': 0.696,
+    'mRNA-1273_(Moderna)': 0.690527,
 }
 
 vaccine_booster_host_immunity = [
-  {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'AZD1222_(AstraZeneca)', 'VE': 0.6353636363636364},
-  {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.7389019607843137},
-  {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)', 'VE': 0.26}, 
-  {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)', 'VE': 0.3846666666666667}, 
-  {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'Sinopharm', 'VE': 0.7346666666666666}, 
-  {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'mRNA-1273_(Moderna)', 'VE': 0.8642399999999999}, 
-  {'primary series vaccine': 'Ad26.COV2.S_(Janssen)', 'booster vaccine': 'Ad26.COV2.S_(Janssen)', 'VE': 0.615}, 
-  {'primary series vaccine': 'Ad26.COV2.S_(Janssen)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.9155000000000001}, 
-  {'primary series vaccine': 'Ad26.COV2.S_(Janssen)', 'booster vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)', 'VE': 0.6725}, 
-  {'primary series vaccine': 'BBIBP-CorV_(Beijing_CNBG)', 'booster vaccine': 'Ad26.COV2.S_(Janssen)', 'VE': 0.8973333333333333}, 
-  {'primary series vaccine': 'BBIBP-CorV_(Beijing_CNBG)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.9283333333333332}, 
-  {'primary series vaccine': 'BBIBP-CorV_(Beijing_CNBG)', 'booster vaccine': 'Sinopharm', 'VE': 0.7639999999999999}, 
-  {'primary series vaccine': 'BBIBP-CorV_(Beijing_CNBG)', 'booster vaccine': 'mRNA-1273_(Moderna)', 'VE': 0.9526666666666667}, 
-  {'primary series vaccine': 'BNT162b2_(Pfizer)', 'booster vaccine': 'AZD1222_(AstraZeneca)', 'VE': 0.8960000000000001}, 
-  {'primary series vaccine': 'BNT162b2_(Pfizer)', 'booster vaccine': 'Ad26.COV2.S_(Janssen)', 'VE': 0.9306666666666666}, 
-  {'primary series vaccine': 'BNT162b2_(Pfizer)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.7413183520599251}, 
-  {'primary series vaccine': 'BNT162b2_(Pfizer)', 'booster vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)', 'VE': 0.6004285714285714}, 
-  {'primary series vaccine': 'BNT162b2_(Pfizer)', 'booster vaccine': 'CoronaVac_(Sinovac)', 'VE': 0.121}, 
-  {'primary series vaccine': 'BNT162b2_(Pfizer)', 'booster vaccine': 'Sinopharm', 'VE': 0.6683333333333333}, 
-  {'primary series vaccine': 'BNT162b2_(Pfizer)', 'booster vaccine': 'mRNA-1273_(Moderna)', 'VE': 0.7530214285714285}, 
-  {'primary series vaccine': 'BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)', 'booster vaccine': 'BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)', 'VE': 0.645}, 
-  {'primary series vaccine': 'BNT162b2_(Pfizer)_(2_doses)_+_mRNA-1273_(Moderna)_(3rd_dose)', 'booster vaccine': 'mRNA-1273_(Moderna)_(4th_dose)', 'VE': 0.6466666666666667}, 
-  {'primary series vaccine': 'BNT162b2_(Pfizer)_(3_doses)', 'booster vaccine': 'BNT162b2_(Pfizer)_(4th_dose)', 'VE': 0.6068333333333333}, 
-  {'primary series vaccine': 'BNT162b2_(Pfizer)_(3_doses)', 'booster vaccine': 'mRNA-1273_(Moderna)_(4th_dose)', 'VE': 0.498}, 
-  {'primary series vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.7564285714285713}, 
-  {'primary series vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)', 'booster vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)', 'VE': 0.7541721854304636}, 
-  {'primary series vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)', 'booster vaccine': 'mRNA-1273_(Moderna)', 'VE': 0.7538571428571429}, 
-  {'primary series vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)_(3_doses)', 'booster vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)_(4th_dose)', 'VE': 0.5788888888888889}, 
-  {'primary series vaccine': 'CoronaVac_(Sinovac)', 'booster vaccine': 'AZD1222_(AstraZeneca)', 'VE': 0.9584285714285714}, 
-  {'primary series vaccine': 'CoronaVac_(Sinovac)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.7631960784313726}, 
-  {'primary series vaccine': 'CoronaVac_(Sinovac)', 'booster vaccine': 'CoronaVac_(Sinovac)', 'VE': 0.7141851851851851}, 
-  {'primary series vaccine': 'CoronaVac_(Sinovac)', 'booster vaccine': 'Coronavac_(Sinovac)', 'VE': 0.5107647058823529}, 
-  {'primary series vaccine': 'Sputnik_V_(Gamaleya)', 'booster vaccine': 'Ad26.COV2.S_(Janssen)', 'VE': 0.8076666666666666}, 
-  {'primary series vaccine': 'Sputnik_V_(Gamaleya)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.936}, 
-  {'primary series vaccine': 'Sputnik_V_(Gamaleya)', 'booster vaccine': 'Sinopharm', 'VE': 0.5285}, 
-  {'primary series vaccine': 'Sputnik_V_(Gamaleya)', 'booster vaccine': 'mRNA-1273_(Moderna)', 'VE': 0.9366666666666668}, 
-  {'primary series vaccine': 'mRNA-1273_(Moderna)', 'booster vaccine': 'Ad26.COV2.S_(Janssen)', 'VE': 0.8873333333333333}, 
-  {'primary series vaccine': 'mRNA-1273_(Moderna)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.8068636363636363}, 
-  {'primary series vaccine': 'mRNA-1273_(Moderna)', 'booster vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)', 'VE': 0.5692499999999999}, 
-  {'primary series vaccine': 'mRNA-1273_(Moderna)', 'booster vaccine': 'Sinopharm', 'VE': 0.7739999999999999}, 
-  {'primary series vaccine': 'mRNA-1273_(Moderna)', 'booster vaccine': 'mRNA-1273_(Moderna)', 'VE': 0.7141650485436892}, 
-  {'primary series vaccine': 'mRNA-1273_(Moderna)_(3_doses)', 'booster vaccine': 'mRNA-1273_(Moderna)_(4th_dose)', 'VE': 0.7066666666666667}]
\ No newline at end of file
+    {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'AZD1222_(AstraZeneca)', 'VE': 0.500429},
+    {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.537818},
+    {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)', 'VE': 0.284},
+    {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'mRNA-1273_(Moderna)', 'VE': 0.709143},
+    {'primary series vaccine': 'Ad26.COV2.S_(Janssen)', 'booster vaccine': 'Ad26.COV2.S_(Janssen)', 'VE': 0.492667},
+    {'primary series vaccine': 'Ad26.COV2.S_(Janssen)', 'booster vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)', 'VE': 0.79},
+    {'primary series vaccine': 'BNT162b2_(Pfizer)', 'booster vaccine': 'AZD1222_(AstraZeneca)', 'VE': 0.801},
+    {'primary series vaccine': 'BNT162b2_(Pfizer)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.599132},
+    {'primary series vaccine': 'BNT162b2_(Pfizer)', 'booster vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)', 'VE': 0.632633},
+    {'primary series vaccine': 'BNT162b2_(Pfizer)', 'booster vaccine': 'mRNA-1273_(Moderna)', 'VE': 0.716786},
+    {'primary series vaccine': 'BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)', 'booster vaccine': 'BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)', 'VE': 0.645},
+    {'primary series vaccine': 'BNT162b2_(Pfizer)_(3_doses)', 'booster vaccine': 'BNT162b2_(Pfizer)_(4th_dose)', 'VE': 0.962},
+    {'primary series vaccine': 'CoronaVac_(Sinovac)', 'booster vaccine': 'AZD1222_(AstraZeneca)', 'VE': 0.9405},
+    {'primary series vaccine': 'CoronaVac_(Sinovac)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.649941},
+    {'primary series vaccine': 'CoronaVac_(Sinovac)', 'booster vaccine': 'CoronaVac_(Sinovac)', 'VE': 0.605429},
+    {'primary series vaccine': 'CoronaVac_(Sinovac)', 'booster vaccine': 'CoronaVac_(Sinovac)', 'VE': 0.289857},
+    {'primary series vaccine': 'mRNA-1273_(Moderna)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.842143},
+    {'primary series vaccine': 'mRNA-1273_(Moderna)', 'booster vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)', 'VE': 0.632633},
+    {'primary series vaccine': 'mRNA-1273_(Moderna)', 'booster vaccine': 'mRNA-1273_(Moderna)', 'VE': 0.618512}
+]