Equipment: adding equipment to HIV, TB and malaria (#1710)

* merge in master

* incoming changes from master

* set up scenarios

* add required equipment to HSIs

* add equipment package for inpatient care

* Make all COPD HSI have same treatment_id

* remove unncesary equipment of in-paitent, which is added automatically when bed-days are declared.

---------

Co-authored-by: Tim Hallett <[email protected]>

Author: tdm32

src/tlo/methods/copd.py

@@ -570,7 +570,7 @@ class HSI_Copd_TreatmentOnModerateExacerbation(HSI_Event, IndividualScopeEventMi
     def __init__(self, module, person_id):
         super().__init__(module, person_id=person_id)
 
-        self.TREATMENT_ID = "Copd_Treatment_Moderate"
+        self.TREATMENT_ID = "Copd_Treatment"
         self.ACCEPTED_FACILITY_LEVEL = "1a"
         self.EXPECTED_APPT_FOOTPRINT = self.make_appt_footprint({"Over5OPD": 1})
 

src/tlo/methods/hiv.py

@@ -2908,6 +2908,7 @@ def do_at_continuation(self, person_id):
         if (self.module.rng.random_sample(size=1) <
             p['dispensation_period_months'] / p['interval_for_viral_load_measurement_months']):
             _ = self.get_consumables(item_codes=self.module.item_codes_for_consumables_required['vl_measurement'])
+            self.add_equipment({'Centrifuge'})
 
         # Check if drugs are available, and provide drugs:
         drugs_available = self.get_drugs(age_of_person=person["age_years"])

src/tlo/methods/malaria.py

@@ -1312,8 +1312,10 @@ def apply(self, person_id, squeeze_factor):
                 df.at[person_id, 'ma_tx_counter'] += 1
 
                 # Add used equipment
-                self.add_equipment({'Drip stand', 'Haemoglobinometer',
-                                       'Analyser, Combined Chemistry and Electrolytes'})
+                self.add_equipment({'Drip stand',
+                                    'Haemoglobinometer',
+                                    'Analyser, Combined Chemistry and Electrolytes',
+                                    })
 
                 # rdt is offered as part of the treatment package
                 # Log the test: line-list of summary information about each test

src/tlo/methods/tb.py

@@ -1827,7 +1827,7 @@ def apply(self, person_id, squeeze_factor):
                         )
                 if test_result is not None:
                     # Add used equipment
-                    self.add_equipment({'Sputum Collection box', 'Ordinary Microscope'})
+                    self.add_equipment({'Sputum Collection box', 'Ordinary Microscope', 'Centrifuge'})
 
             elif test == "xpert":