Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update with 2024 options #26

Merged
merged 5 commits into from
Nov 18, 2024
Merged

Update with 2024 options #26

merged 5 commits into from
Nov 18, 2024

Conversation

rtesra
Copy link
Collaborator

@rtesra rtesra commented Nov 15, 2024

Model options updated:

  • Using country specific options from approved 2023/2024 Naomi outputs with the following updates/ defaults:
    • Calendar quarters T2 - T5 updated to 2024 - 2027

    • ANC T2 options set to 2025

      • include_art_t1: blank (force select)
      • include_art_t2: TRUE
      • artattend: TRUE
      • artattend_t2: TRUE
    • Calibration method set to logistic

Note: For 2023 CAF, CMR and STP did not submit approved Naomi files. MWI and ZAF used bespoke model options. Default options from prior year were used in these cases.

@rtesra rtesra requested review from jeffeaton and r-ash November 15, 2024 12:27
rtesra and others added 2 commits November 15, 2024 12:52
Update model options for countries with no 2023 results
Copy link

codecov bot commented Nov 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 100.00%. Comparing base (84de9cd) to head (18ca4eb).
Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##              main       #26   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files            7         7           
  Lines          711       710    -1     
=========================================
- Hits           711       710    -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@r-ash
Copy link
Contributor

r-ash commented Nov 15, 2024

Testing with Naomi here mrc-ide/naomi#447

Copy link
Contributor

@r-ash r-ash left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, passing Naomi tests nicely

Copy link
Collaborator

@jeffeaton jeffeaton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Many thanks for this.

MWI and ZAF used bespoke model options. Default options from prior year were used in these cases.

To confirm, for these cases, you still updated the years to one year forward, correct?

@@ -1,3 +1,7 @@
# naomi.options 1.3.0

* Update default for 2024/2025 HIV estimates
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add to this the details of specific updates that you put in the PR notes? That may be helpful to refer back to next year.

MLI,MLI,1,CY2024Q4,CY2025Q3,CY2013Q1,MLI2012DHS,,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,1
MOZ,MOZ,3,CY2024Q4,CY2025Q3,CY2021Q3,MOZ2021PHIA,MOZ2021PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,,2024,2021,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,TRUE,TRUE,CY2026Q3,CY2027Q3,3
MWI,MWI,5,CY2024Q4,CY2025Q3,CY2020Q3,MWI2020PHIA,MWI2020PHIA,,FALSE,,TRUE,TRUE,TRUE,2024,12,2020,2024,2020,2024,national,TRUE,250,1000,1000,TRUE,-4,TRUE,1,TRUE,1,TRUE,1,national,sex_age_group,national,sex_age_group,national,sex_age_group,national,sex_age_group,logistic,1,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,CY2026Q3,CY2027Q3,3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be 4 for the area level?

Test data is coming through with

  • Country - level 0
  • Region - level 1
  • Zone - level 2
  • District - level 3
  • District + Metro - level 4

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, we don't want to do this. The actual Malawi data does have 6 levels. So 5 is right

@r-ash r-ash merged commit f440f84 into main Nov 18, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants