From 118bbddf7fb98c459089c04cac39563a26639e17 Mon Sep 17 00:00:00 2001
From: jeffeaton <jeffrey.eaton@imperial.ac.uk>
Date: Mon, 4 Dec 2023 12:06:25 +0000
Subject: [PATCH 1/5] extend calendar quarter option dropdowns to Dec 2027

---
 R/controls.R | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/R/controls.R b/R/controls.R
index 0b42271..fb4df71 100644
--- a/R/controls.R
+++ b/R/controls.R
@@ -256,7 +256,7 @@ get_model_controls <- function(include_art, include_anc) {
       id = "CY2024Q4",
       label = paste(t_("MONTH_DECEMBER"), "2024")
     ),
-        list(
+    list(
       id = "CY2025Q1",
       label = paste(t_("MONTH_MARCH"), "2025")
     ),
@@ -271,6 +271,38 @@ get_model_controls <- function(include_art, include_anc) {
     list(
       id = "CY2025Q4",
       label = paste(t_("MONTH_DECEMBER"), "2025")
+    ),
+    list(
+      id = "CY2026Q1",
+      label = paste(t_("MONTH_MARCH"), "2026")
+    ),
+    list(
+      id = "CY2026Q2",
+      label = paste(t_("MONTH_JUNE"), "2026")
+    ),
+    list(
+      id = "CY2026Q3",
+      label = paste(t_("MONTH_SEPTEMBER"), "2026")
+    ),
+    list(
+      id = "CY2026Q4",
+      label = paste(t_("MONTH_DECEMBER"), "2026")
+    ),
+    list(
+      id = "CY2027Q1",
+      label = paste(t_("MONTH_MARCH"), "2027")
+    ),
+    list(
+      id = "CY2027Q2",
+      label = paste(t_("MONTH_JUNE"), "2027")
+    ),
+    list(
+      id = "CY2027Q3",
+      label = paste(t_("MONTH_SEPTEMBER"), "2027")
+    ),
+    list(
+      id = "CY2027Q4",
+      label = paste(t_("MONTH_DECEMBER"), "2027")
     )
   )
 

From 5edd64435c6534ce2529d0acda3cf4fdad0ae9df Mon Sep 17 00:00:00 2001
From: jeffeaton <jeffrey.eaton@imperial.ac.uk>
Date: Mon, 4 Dec 2023 12:08:28 +0000
Subject: [PATCH 2/5] update current and projection periods one-year ahead

---
 inst/default_options.csv | 78 ++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/inst/default_options.csv b/inst/default_options.csv
index 36a1564..a75d741 100644
--- a/inst/default_options.csv
+++ b/inst/default_options.csv
@@ -1,40 +1,40 @@
 iso3,area_scope,area_level,calendar_quarter_t2,calendar_quarter_t3,calendar_quarter_t1,survey_prevalence,survey_art_coverage,survey_recently_infected,use_survey_aggregate,include_art_t1,include_art_t2,artattend,artattend_t2,anc_clients_year2,anc_clients_year2_num_months,anc_prevalence_year1,anc_prevalence_year2,anc_art_coverage_year1,anc_art_coverage_year2,spectrum_population_calibration,output_aware_plhiv,max_iterations,no_of_samples,rng_seed,permissive,artattend_log_gamma_offset,use_kish_prev,deff_prev,use_kish_artcov,deff_artcov,use_kish_recent,deff_recent,spectrum_plhiv_calibration_level,spectrum_plhiv_calibration_strat,spectrum_artnum_calibration_level,spectrum_artnum_calibration_strat,spectrum_aware_calibration_level,spectrum_aware_calibration_strat,spectrum_infections_calibration_level,spectrum_infections_calibration_strat,calibrate_method,deff_vls,use_kish_vls,rho_paed_x_term,rho_paed_15to49f_ratio,alpha_xst_term,adjust_area_growth,anchor_home_district,calendar_quarter_t4,calendar_quarter_t5,psnu_level
-fallback,NA,NA,CY2022Q4,CY2023Q3,NA,NA,NA,NA,FALSE,,,,,2022,12,NA,2022,NA,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,
-AGO,AGO,1,CY2022Q4,CY2023Q3,CY2015Q4,AGO2015DHS,,,FALSE,FALSE,FALSE,FALSE,FALSE,2022,12,2017,2022,2017,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-BDI,BDI,2,CY2022Q4,CY2023Q3,CY2016Q4,BDI2016DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,12,2017,2022,2017,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-BEN,BEN,2,CY2022Q4,CY2023Q3,CY2012Q1,BEN2012DHS,,,TRUE,FALSE,TRUE,TRUE,FALSE,2022,12,2016,2022,2016,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-BFA,BFA,2,CY2022Q4,CY2023Q3,CY2010Q3,BFA2010DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,12,2016,2022,2016,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-BWA,BWA,3,CY2022Q4,CY2023Q3,CY2021Q1,BWA2013BAIS,BWA2013BAIS,,FALSE,TRUE,TRUE,TRUE,TRUE,2022,12,2021,2022,2021,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,3
-CAF,CAF,3,CY2022Q4,CY2023Q3,CY2010Q4,CAF2010MICS,,,TRUE,FALSE,TRUE,TRUE,FALSE,2022,12,2019,2022,2019,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,
-CMR,CMR,3,CY2022Q4,CY2023Q3,CY2017Q3,CMR2018DHS; CMR2017PHIA,CMR2017PHIA,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,12,2018,2022,2018,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-COD,COD,3,CY2022Q4,CY2023Q3,CY2013Q4,COD2013DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,12,2019,2022,2019,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,3
-COG,COG,2,CY2022Q4,CY2023Q3,CY2009Q2,COG2009AIS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,12,2018,2022,2018,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,
-ETH,ETH,2,CY2022Q4,CY2023Q3,CY2016Q1,ETH2016DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,9,2018,2022,2018,2022,subnational,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,2
-GAB,GAB,1,CY2022Q4,CY2023Q3,CY2012Q1,GAB2012DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,12,2018,2022,2018,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,
-GHA,GHA,2,CY2022Q4,CY2023Q3,CY2014Q4,GHA2014DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,12,2018,2022,2018,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-GIN,GIN,2,CY2022Q4,CY2023Q3,CY2018Q2,GIN2018DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,12,2018,2022,2018,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,
-GMB,GMB,2,CY2022Q4,CY2023Q3,CY2013Q1,GMB2013DHS,,,TRUE,FALSE,TRUE,TRUE,FALSE,2022,12,2017,2022,2017,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,
-KEN,KEN,2,CY2022Q4,CY2023Q3,CY2018Q4,KEN2018PHIA,KEN2018PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2022,12,2019,2022,2019,2022,subnational,TRUE,250,1000,1000,TRUE,-3.5,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,2
-LBR,LBR,1,CY2022Q4,CY2023Q3,CY2013Q2,LBR2013DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,12,2018,2022,2018,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-LSO,LSO,2,CY2022Q4,CY2023Q3,CY2020Q1,LSO2020PHIA,LSO2020PHIA,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,12,2020,2022,2020,2022,national,TRUE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-MLI,MLI,1,CY2022Q4,CY2023Q3,CY2013Q1,MLI2012DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,12,2018,2022,2018,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-MOZ,MOZ,2,CY2022Q4,CY2023Q3,CY2021Q3,MOZ2021PHIA,MOZ2021PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2022,12,2021,2022,2021,2022,subnational,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,2
-MWI,MWI,5,CY2022Q4,CY2023Q3,CY2020Q3,MWI2020PHIA,MWI2020PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2022,12,2020,2022,2020,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,3
-NAM,NAM,2,CY2022Q4,CY2023Q3,CY2017Q3,NAM2017PHIA,NAM2017PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2022,12,2017,2022,2017,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-NER,NER,1,CY2022Q4,CY2023Q3,CY2012Q2,NER2012DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,12,2017,2022,2017,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,
-RWA,RWA,2,CY2022Q4,CY2023Q3,CY2018Q4,RWA2018PHIA,RWA2018PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2022,12,2018,2022,2018,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-SEN,SEN,2,CY2022Q4,CY2023Q3,CY2017Q3,SEN2017DHS,,,TRUE,FALSE,TRUE,TRUE,FALSE,2022,12,2020,2022,2020,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-SLE,SLE,2,CY2022Q4,CY2023Q3,CY2019Q2,SLE2019DHS,,,FALSE,TRUE,TRUE,TRUE,TRUE,2022,12,2019,2022,2019,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,2
-STP,STP,1,CY2022Q4,CY2023Q3,CY2014Q4,STP2014MICS,,,TRUE,FALSE,TRUE,TRUE,FALSE,2022,12,,2022,,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,
-TCD,TCD,1,CY2022Q4,CY2023Q3,CY2015Q1,TCD2014DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,12,2018,2022,2018,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,
-TGO,TGO,2,CY2022Q4,CY2023Q3,CY2014Q1,TGO2013DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,12,2018,2022,2018,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-TZA,TZA,3,CY2022Q4,CY2023Q3,CY2017Q1,TZA2017PHIA,TZA2017PHIA,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,9,2018,2022,2018,2022,national,TRUE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,national,sex_age_coarse,national,sex_age_coarse,national,sex_age_coarse,national,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,3
-UGA,UGA,3,CY2022Q4,CY2023Q3,CY2020Q4,UGA2020PHIA,UGA2020PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2022,12,2020,2022,2020,2022,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,TRUE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-ZMB,ZMB,2,CY2022Q4,CY2023Q3,CY2021Q3,ZMB2018DHS; ZMB2021PHIA,ZMB2021PHIA,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,12,2021,2022,2021,2022,national,TRUE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,2
-ZWE,ZWE,2,CY2022Q4,CY2023Q3,CY2019Q3,ZWE2020PHIA,ZWE2020PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2022,12,2020,2022,2020,2022,subnational,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-NGA,NGA,2,CY2022Q4,CY2023Q3,CY2018Q4,NGA2017AKIS,NGA2018NAIS,,FALSE,TRUE,TRUE,TRUE,TRUE,2022,12,2018,2022,2018,2022,subnational,TRUE,250,1000,1000,FALSE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,2
-SWZ,SWZ,1,CY2022Q4,CY2023Q3,CY2021Q3,SWZ2021PHIA,SWZ2021PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2022,12,2021,2022,2021,2022,national,TRUE,250,1000,1000,FALSE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-CIV,CIV,2,CY2022Q4,CY2023Q3,CY2017Q4,CIV2017PHIA,CIV2017PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2022,12,2017,2022,2017,2022,national,TRUE,250,1000,1000,FALSE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2024Q3,CY2025Q3,1
-XXX,XXX,2,CY2022Q4,CY2023Q3,CY2017Q4,CMR2018DHS; CMR2017PHIA,CIV2017PHIA,,invalid,TRUE,TRUE,TRUE,TRUE,2022,12,2017,2022,2017,2022,national,TRUE,250,1000,1000,FALSE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,invalid,TRUE,CY2024Q3,CY2025Q3,
-HTI,HTI,2,CY2022Q4,CY2023Q3,CY2020Q1,HTI2019PHIA,,,FALSE,FALSE,TRUE,TRUE,FALSE,2022,12,2020,2022,2020,2022,national,TRUE,250,1000,1000,FALSE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE,CY2024Q3,CY2025Q3,1
-ZAF,ZAF,2,CY2022Q3,CY2023Q3,CY2017Q2,ZAF2017HSRC; ZAF2016DHS,ZAF2017HSRC,ZAF2017HSRC,FALSE,TRUE,TRUE,TRUE,TRUE,2022,12,2017,2022,2017,2022,subnational,TRUE,250,1000,17,FALSE,-4,TRUE,1,TRUE,1,FALSE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE,CY2024Q3,CY2025Q3,2
\ No newline at end of file
+fallback,NA,NA,CY2023Q4,CY2024Q3,NA,NA,NA,NA,FALSE,,,,,2023,12,NA,2023,NA,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,
+AGO,AGO,1,CY2023Q4,CY2024Q3,CY2015Q4,AGO2015DHS,,,FALSE,FALSE,FALSE,FALSE,FALSE,2023,12,2017,2023,2017,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+BDI,BDI,2,CY2023Q4,CY2024Q3,CY2016Q4,BDI2016DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2017,2023,2017,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+BEN,BEN,2,CY2023Q4,CY2024Q3,CY2012Q1,BEN2012DHS,,,TRUE,FALSE,TRUE,TRUE,FALSE,2023,12,2016,2023,2016,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+BFA,BFA,2,CY2023Q4,CY2024Q3,CY2010Q3,BFA2010DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2016,2023,2016,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+BWA,BWA,3,CY2023Q4,CY2024Q3,CY2021Q1,BWA2013BAIS,BWA2013BAIS,,FALSE,TRUE,TRUE,TRUE,TRUE,2023,12,2021,2023,2021,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,3
+CAF,CAF,3,CY2023Q4,CY2024Q3,CY2010Q4,CAF2010MICS,,,TRUE,FALSE,TRUE,TRUE,FALSE,2023,12,2019,2023,2019,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,
+CMR,CMR,3,CY2023Q4,CY2024Q3,CY2017Q3,CMR2018DHS; CMR2017PHIA,CMR2017PHIA,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2018,2023,2018,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+COD,COD,3,CY2023Q4,CY2024Q3,CY2013Q4,COD2013DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2019,2023,2019,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,3
+COG,COG,2,CY2023Q4,CY2024Q3,CY2009Q2,COG2009AIS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2018,2023,2018,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,
+ETH,ETH,2,CY2023Q4,CY2024Q3,CY2016Q1,ETH2016DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,9,2018,2023,2018,2023,subnational,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,2
+GAB,GAB,1,CY2023Q4,CY2024Q3,CY2012Q1,GAB2012DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2018,2023,2018,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,
+GHA,GHA,2,CY2023Q4,CY2024Q3,CY2014Q4,GHA2014DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2018,2023,2018,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+GIN,GIN,2,CY2023Q4,CY2024Q3,CY2018Q2,GIN2018DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2018,2023,2018,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,
+GMB,GMB,2,CY2023Q4,CY2024Q3,CY2013Q1,GMB2013DHS,,,TRUE,FALSE,TRUE,TRUE,FALSE,2023,12,2017,2023,2017,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,
+KEN,KEN,2,CY2023Q4,CY2024Q3,CY2018Q4,KEN2018PHIA,KEN2018PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2023,12,2019,2023,2019,2023,subnational,TRUE,250,1000,1000,TRUE,-3.5,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,2
+LBR,LBR,1,CY2023Q4,CY2024Q3,CY2013Q2,LBR2013DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2018,2023,2018,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+LSO,LSO,2,CY2023Q4,CY2024Q3,CY2020Q1,LSO2020PHIA,LSO2020PHIA,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2020,2023,2020,2023,national,TRUE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+MLI,MLI,1,CY2023Q4,CY2024Q3,CY2013Q1,MLI2012DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2018,2023,2018,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+MOZ,MOZ,2,CY2023Q4,CY2024Q3,CY2021Q3,MOZ2021PHIA,MOZ2021PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2023,12,2021,2023,2021,2023,subnational,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,2
+MWI,MWI,5,CY2023Q4,CY2024Q3,CY2020Q3,MWI2020PHIA,MWI2020PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2023,12,2020,2023,2020,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,3
+NAM,NAM,2,CY2023Q4,CY2024Q3,CY2017Q3,NAM2017PHIA,NAM2017PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2023,12,2017,2023,2017,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+NER,NER,1,CY2023Q4,CY2024Q3,CY2012Q2,NER2012DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2017,2023,2017,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,
+RWA,RWA,2,CY2023Q4,CY2024Q3,CY2018Q4,RWA2018PHIA,RWA2018PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2023,12,2018,2023,2018,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+SEN,SEN,2,CY2023Q4,CY2024Q3,CY2017Q3,SEN2017DHS,,,TRUE,FALSE,TRUE,TRUE,FALSE,2023,12,2020,2023,2020,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+SLE,SLE,2,CY2023Q4,CY2024Q3,CY2019Q2,SLE2019DHS,,,FALSE,TRUE,TRUE,TRUE,TRUE,2023,12,2019,2023,2019,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,2
+STP,STP,1,CY2023Q4,CY2024Q3,CY2014Q4,STP2014MICS,,,TRUE,FALSE,TRUE,TRUE,FALSE,2023,12,,2023,,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,
+TCD,TCD,1,CY2023Q4,CY2024Q3,CY2015Q1,TCD2014DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2018,2023,2018,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,
+TGO,TGO,2,CY2023Q4,CY2024Q3,CY2014Q1,TGO2013DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2018,2023,2018,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+TZA,TZA,3,CY2023Q4,CY2024Q3,CY2017Q1,TZA2017PHIA,TZA2017PHIA,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,9,2018,2023,2018,2023,national,TRUE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,national,sex_age_coarse,national,sex_age_coarse,national,sex_age_coarse,national,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,3
+UGA,UGA,3,CY2023Q4,CY2024Q3,CY2020Q4,UGA2020PHIA,UGA2020PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2023,12,2020,2023,2020,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,TRUE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+ZMB,ZMB,2,CY2023Q4,CY2024Q3,CY2021Q3,ZMB2021PHIA,ZMB2021PHIA,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2021,2023,2021,2023,national,TRUE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,2
+ZWE,ZWE,2,CY2023Q4,CY2024Q3,CY2019Q3,ZWE2020PHIA,ZWE2020PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2023,12,2020,2023,2020,2023,subnational,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+NGA,NGA,2,CY2023Q4,CY2024Q3,CY2018Q4,NGA2017AKIS,NGA2018NAIS,,FALSE,TRUE,TRUE,TRUE,TRUE,2023,12,2018,2023,2018,2023,subnational,TRUE,250,1000,1000,FALSE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,2
+SWZ,SWZ,1,CY2023Q4,CY2024Q3,CY2021Q3,SWZ2021PHIA,SWZ2021PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2023,12,2021,2023,2021,2023,national,TRUE,250,1000,1000,FALSE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+CIV,CIV,2,CY2023Q4,CY2024Q3,CY2017Q4,CIV2017PHIA,CIV2017PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2023,12,2017,2023,2017,2023,national,TRUE,250,1000,1000,FALSE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
+XXX,XXX,2,CY2023Q4,CY2024Q3,CY2017Q4,CMR2018DHS; CMR2017PHIA,CIV2017PHIA,,invalid,TRUE,TRUE,TRUE,TRUE,2023,12,2017,2023,2017,2023,national,TRUE,250,1000,1000,FALSE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,invalid,TRUE,CY2025Q3,CY2026Q3,
+HTI,HTI,2,CY2023Q4,CY2024Q3,CY2020Q1,HTI2019PHIA,,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2020,2023,2020,2023,national,TRUE,250,1000,1000,FALSE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE,CY2025Q3,CY2026Q3,1
+ZAF,ZAF,2,CY2023Q4,CY2024Q3,CY2017Q2,ZAF2017HSRC; ZAF2016DHS,ZAF2017HSRC,ZAF2017HSRC,FALSE,TRUE,TRUE,TRUE,TRUE,2023,12,2017,2023,2017,2023,subnational,TRUE,250,1000,17,FALSE,-4,TRUE,1,TRUE,1,FALSE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE,CY2025Q3,CY2026Q3,2
\ No newline at end of file

From d03a47ac5d3734651b44983793db26bd2efe390c Mon Sep 17 00:00:00 2001
From: jeffeaton <jeffrey.eaton@imperial.ac.uk>
Date: Mon, 4 Dec 2023 12:09:13 +0000
Subject: [PATCH 3/5] update TZA defaults to TZA2022PHIA

---
 inst/default_options.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inst/default_options.csv b/inst/default_options.csv
index a75d741..2cbe367 100644
--- a/inst/default_options.csv
+++ b/inst/default_options.csv
@@ -28,7 +28,7 @@ SLE,SLE,2,CY2023Q4,CY2024Q3,CY2019Q2,SLE2019DHS,,,FALSE,TRUE,TRUE,TRUE,TRUE,2023
 STP,STP,1,CY2023Q4,CY2024Q3,CY2014Q4,STP2014MICS,,,TRUE,FALSE,TRUE,TRUE,FALSE,2023,12,,2023,,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,
 TCD,TCD,1,CY2023Q4,CY2024Q3,CY2015Q1,TCD2014DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2018,2023,2018,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,
 TGO,TGO,2,CY2023Q4,CY2024Q3,CY2014Q1,TGO2013DHS,,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2018,2023,2018,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
-TZA,TZA,3,CY2023Q4,CY2024Q3,CY2017Q1,TZA2017PHIA,TZA2017PHIA,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,9,2018,2023,2018,2023,national,TRUE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,national,sex_age_coarse,national,sex_age_coarse,national,sex_age_coarse,national,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,3
+TZA,TZA,3,CY2023Q4,CY2024Q3,CY2017Q1,TZA2022PHIA,TZA2022PHIA,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,9,2022,2023,2022,2023,national,TRUE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,national,sex_age_coarse,national,sex_age_coarse,national,sex_age_coarse,national,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,3
 UGA,UGA,3,CY2023Q4,CY2024Q3,CY2020Q4,UGA2020PHIA,UGA2020PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2023,12,2020,2023,2020,2023,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,TRUE,FALSE,TRUE,CY2025Q3,CY2026Q3,1
 ZMB,ZMB,2,CY2023Q4,CY2024Q3,CY2021Q3,ZMB2021PHIA,ZMB2021PHIA,,FALSE,FALSE,TRUE,TRUE,FALSE,2023,12,2021,2023,2021,2023,national,TRUE,250,1000,1000,TRUE,-3,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,2
 ZWE,ZWE,2,CY2023Q4,CY2024Q3,CY2019Q3,ZWE2020PHIA,ZWE2020PHIA,,FALSE,TRUE,TRUE,TRUE,TRUE,2023,12,2020,2023,2020,2023,subnational,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,none,sex_age_coarse,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2025Q3,CY2026Q3,1

From 92d7621af13adfcdcf866a5fd767bee4013e769e Mon Sep 17 00:00:00 2001
From: jeffeaton <jeffrey.eaton@imperial.ac.uk>
Date: Mon, 4 Dec 2023 12:11:40 +0000
Subject: [PATCH 4/5] update CY tests

---
 tests/testthat/test-options.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/testthat/test-options.R b/tests/testthat/test-options.R
index e02d7ea..54ad29c 100644
--- a/tests/testthat/test-options.R
+++ b/tests/testthat/test-options.R
@@ -205,7 +205,7 @@ describe("when getting controls for unknown country", {
 
   it("has override defaults for non country specific options", {
     calendar_quarter_t2 <- get_control(out, "calendar_quarter_t2")
-    expect_equal(calendar_quarter_t2$value, "CY2022Q4")
+    expect_equal(calendar_quarter_t2$value, "CY2023Q4")
   })
 
   it("has no value for country specific options", {

From 61dfe60c4860e41ba6a6c98cc2a9484ff26dc59f Mon Sep 17 00:00:00 2001
From: jeffeaton <jeffrey.eaton@imperial.ac.uk>
Date: Mon, 4 Dec 2023 12:16:55 +0000
Subject: [PATCH 5/5] bump verison number 1.2.0; edit NEWS

---
 DESCRIPTION | 2 +-
 NEWS.md     | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 16beef5..792bedf 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: naomi.options
 Title: Contains model and calibration options and helper functions for Naomi
-Version: 1.1.0
+Version: 1.2.0
 Authors@R: 
     person(given = "Robert", 
            family = "Ashton", 
diff --git a/NEWS.md b/NEWS.md
index 9080b33..31e13f6 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,12 @@
+# naomi.options 1.2.0
+
+* Update defaults for 2024 HIV estimates
+  - Extends calendar quarter model options drop downs from `December 2025` to `December 2027`
+  - Updates T2, T3, T4, and T5 defaults all 1-year ahead
+  - Updates default 'current' ANC input year to 2023
+  - Updates TZA defaults to 2022 PHIA survey
+
+
 # naomi.options 1.1.0
 
 * Rename `fallback_values` arg to `override_values` in `get_controls_json` as any `override_values` now take precedence over hardcoded values from the defaults csv.