-
Notifications
You must be signed in to change notification settings - Fork 4
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
New tag: Colbourn_etal2023_contraception_v2.0 #1166
Open
EvaJanouskova
wants to merge
28
commits into
contraception/Colbourn_etal2023_submitted
Choose a base branch
from
contraception/Colbourn_etal2023_revision02
base: contraception/Colbourn_etal2023_submitted
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
New tag: Colbourn_etal2023_contraception_v2.0 #1166
EvaJanouskova
wants to merge
28
commits into
contraception/Colbourn_etal2023_submitted
from
contraception/Colbourn_etal2023_revision02
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…long with incorrect description in comment)
…nclude totals in plot of costs by periods; warn if cost fig requested, but cost table not; print info about consumables list saved
… RF_Pop_Annual_sex_WPP19; *some names changed to distinguish from the new RF; *TODO: fix spotted issue with RF_Under_Five_Mortality_DHS
…et al. 2023 paper
…os moved for pop size (Colbourn et al. 2023)
…e by age and sex - both WPP 2019 & 2022
…added to WPP variants names, wpp19 marking added to variable names, updated to work with pandas 2.0 (append->concat, split fixed); *WPP 2022: new RF created
…r WPP 2019 updated to use new version of RF); WPP 2022 commented for future use
…lbourn et al., 2023)
…sum fixed not to sum category types values); WPP 2022 commented for future use; RF_Pop_Annual_age_sex_WPP2019 used only later => load there and add wpp19 marking
…Colbourn et al., 2023)
…ead of 2022); Age_Grp in wpp(19|22)_ann specified
…r 5-years periods
…ty added when possible
…for requested WPP year
…Colbourn et al., 2023)
EvaJanouskova
force-pushed
the
contraception/Colbourn_etal2023_revision02
branch
from
October 23, 2023 22:04
4a80145
to
77f5242
Compare
@tbhallett, While reading the TLO Model: Overview paper, I noticed that the figure of proportion of females using contraceptive methods is not as nice as what we used for the contraception paper: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose of this draft PR
master
as well (my suggestions: see the marks below -- (y)/(n) = yes/no answer to the question whether to add that change to themaster
branch), (?) = not sure what we want for themaster
branchThe main changes:
src/scripts/data_file_processing
formatting_demography_data.py
(y) Working files updated to use
workingfolder
to set the folder with original data just once in the script, making it easier for everyone to set that to the folder in their computer.(y) Demography RFs names changed to indicate year of WPP, i.e. suffix WPP -> now WPP2019 or WPP2022
!!! note: The names are updated in all scripts & methods files where these RFs are called.
(y) Some variable names changed to indicate year of WPP, e.g. tot_births -> tot_births_wpp19.
(y)
ResourceFile_Pop_WPP
renamed to specify details of what data it contains ->ResourceFile_Pop_Every5years_age_sex_WPP2019
.(y)
ResourceFile_Pop_Annual_WPP
renamed to specify details of what data it contains ->ResourceFile_Pop_Annual_age_sex_WPP2019
and script updated to prepare two RFs, for WPP 2019 & WPP 2022 data. Also, the male/female data concatenated using theconcat_excel_sheets
fnc (to ensure consistency across both datasets if some changes are made).(y) New
ResourceFile_Pop_Annual_sex_WPP2019
created.(y) Duplicates for year 2020 have been removed from
ResourceFile_Pop_Annual_age_sex_WPP2019
, leaving only Estimates.(y)
ResourceFile_TotalBirths_WPP
updated so two RFs are prepared, for WPP 2019 & WPP 2022 data.(?, if y, it makes it a bit more complicated to prepare and use RFs for both WPP data as these have to be distinguished then; if n, there's higher risk that incorrect data will be used) The prefix used with variants in the RFs updated to reflect the year of WPP data, e.g. WPP_Low variant -> WPP2019_Low variant. And the missing prefix added in
ResourceFile_TotalBirths_WPP2019
. (note: I haven't check if it's missing in any of the RFs I didn't need to work with for the paper revision.)src/scripts/calibration_analyses/analysis_scripts
analysis_all_calibration.py
master
version.analysis_demography_calibrations.py
Pop_Over_Time.. figures:
ResourceFile_Pop_Annual_sex_WPP2019
used).Pop_Size_.. figures (the population pyramids):
ResourceFile_Pop_Every5years_age_sex_WPP2019
the WPP uncertainty added; for all other years still without uncertainty. For pyramids using WPP 2022 the WPP uncertainty always shown.Births_Over_Time_.. figures:
src/scripts/contraception
analysis_contraception_plot_table.py & bar_chart_costs.py
Consumables and Interventions Costs figure (bars with consumables + Pop intervention implementation + PPFP intervention implementation costs per decades Without X With interventions):
example if ON:
example if OFF:
fnc_analyse_contraception
Contraception Use By Method & Prop Fem1549 Using Method figures:
The minor changes
(n/a) A few changes made to be able to run the needed parts of scripts after the update to Pandas 2.0.
(y, may open issue for this, or mention it in the PR where they are fixing the demography calibrations script that uses these RFs) Some
TODO: fix
added where I noticed the script is not working, but I didn't need it, so didn't bother to fix it right away. (note: I didn't check all the parts I didn't use, so there may be more to be fixed in theformatting_demography_data
script.)TODO:
(Who would do that?)