Merge branch 'master' of github.com:monash-emu/AuTuMN

monash-emu · Sep 1, 2021 · 910fd4e · 910fd4e
2 parents 1d5e4bb + 246d154
commit 910fd4e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/scripts/csv_data_output.py b/scripts/csv_data_output.py
@@ -16,6 +16,7 @@
     "infection_deaths",
 ]
 
+AGE_GROUPS = list(range(0, 80, 5))
 
 phl = {
     "region": [
@@ -34,10 +35,11 @@
 }
 
 lka = {"region": ["sri_lanka"], "columns": STANDARD_COL}
-npl = {"region": ["nepal"], "columns": STANDARD_COL + ["notificationsXagegroup_50","notificationsXagegroup_55"]}
 
-os.chdir(DATA_PATH)
+npl_incidence_col = [f"incidenceXagegroup_{each_age}" for each_age in AGE_GROUPS]
+npl = {"region": ["nepal"], "columns": STANDARD_COL + npl_incidence_col}
 
+os.chdir(DATA_PATH)
 
 list_of_files = os.listdir(DATA_PATH)
 
@@ -56,7 +58,7 @@ def get_files(country):
 lka["region"] = get_files(lka)
 npl["region"] = get_files(npl)
 
-country = {"lka": lka,"phl": phl, "mys": mys, "npl": npl }
+country = {"lka": lka, "phl": phl, "mys": mys, "npl": npl}
 
 for ctry in country: