-
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
updates from paper analyses for HIV, TB and malaria #1273
Conversation
@tbhallett I have an error occurring in test_analysis: test_get_parameter_functions I can see it's down to the data contained in ResourceFile_Improved_Healthsystem_And_Healthcare_Seeking but I don't want to edit this without Bingling's input. Let me know what you'd prefer me to do. |
…ty as small population size over 7 days will not schedule VMMC through HIV module. Remove HIV_Prevention_Circumcision in assert statement for HIV services delivered in one week
…x with updated NTP2019 TB data
# Conflicts: # resources/malaria/ResourceFile_malaria.xlsx # src/tlo/methods/hiv.py # src/tlo/methods/malaria.py
# Conflicts: # resources/ResourceFile_Improved_Healthsystem_And_Healthcare_Seeking.xlsx # resources/healthsystem/priority_policies/ResourceFile_PriorityRanking_ALLPOLICIES.xlsx # src/tlo/methods/malaria.py # tests/test_malaria.py
# Conflicts: # resources/ResourceFile_HIV.xlsx # src/tlo/methods/hiv.py
@tbhallett Hi Tim, this error is now occurring but I'm not sure what the correct fix would be:
I had updated the spreadsheet resources/ResourceFile_Improved_Healthsystem_And_Healthcare_Seeking.xlsx Is it possible that the parameter CareOfWomenDuringPregnancy:prob_intervention_delivered_ifa was removed at some point but still exists in ResourceFile_Improved_Healthsystem_And_Healthcare_Seeking.xlsx? Should it still be there? |
@tbhallett one test is failing in test_healthsystem:test_all_treatment_ids_defined_in_priority_policies |
That's ok, we can still go ahead and merge this branch as the fix being developed targets master |
Co-authored-by: Tim Hallett <39991060+tbhallett@users.noreply.github.com>
address comments in PR #1273 review
@tbhallett This is ready for review now |
Updates include:
palliative care HSI for HIV
palliative care HSI for TB
priority ranking spreadsheet updated to include new EndOfLifeCare HSIs
updated TB diagnostic referral pathway, moving all xpert testing to facility level 2 (as consumables for xpert not available at level 1a and 1b)
remove unused parameters
update data in ResourceFiles
remove shorter paediatric treatment for TB as not commonly used in practice
add consistent repeat healthcare seeking behaviour cap for HIV, TB and malaria HSIs
remove parameters and code relating to scenario setting (not required for master, only for analyses)
include data_parameter for TB to match updated data (ending 2022)
new TbDecideDeath feature schedules hospital stay prior to death and determines probability of death via. linear model
HSI_Tb_ScreeningAndRefer accepts argument facility_level
HSI_ClinicaDiagnosis is now separate (was previously just a diagnostic test) meaning we can track the HR requirements
additional properties in HIV: hv_on_cotrimoxazole, hv_date_treated
schedule hospital stay prior to AIDS death
These changes were all implemented for branches used for the analysis in the recent two papers and so outputs have been checked and are all consistent with expectations.