Merge remote-tracking branch 'origin/cervical_cancer_' into cervical_…

…cancer_

CITATION.cff

@@ -113,6 +113,11 @@ authors:
   family-names: Janoušková
   orcid: https://orcid.org/0000-0002-4104-0119
   affiliation: University College London
+  website: https://profiles.ucl.ac.uk/90260
+- given-names: Rachel
+  family-names: Murray-Watson
+  affiliation: Imperial College London
+  orcid: https://orcid.org/0000-0001-9079-5975
 repository-code: https://github.com/UCL/TLOmodel
 url: https://tlomodel.org
 abstract: Our fundamental aim is to develop the use of epidemiological and economic

README.md

@@ -1,5 +1,5 @@
 <div style="text-align: center" align="center">
-<img src="docs/thanzi-la-onse.png" alt="Thanzi La Onze" />
+<img src="docs/thanzi-la-onse.png" alt="Thanzi la Onse" />
 <br />
 <h1>Thanzi la Onse model</h1>
 </div>
@@ -24,7 +24,7 @@ The __Thanzi la Onse model (TLOmodel)__ is a part of the [Thanzi la Onse][thanzi
 TLOmodel is developed in a collaboration between:
 
 - [Kamuzu University of Health Sciences][kuhes-link]
-- [MRC Centre for Global Infectioous Disease Analysis][mrc-gida-link], [Imperial College London][imperial-link]
+- [MRC Centre for Global Infectious Disease Analysis][mrc-gida-link], [Imperial College London][imperial-link]
 - [Institute for Global Health][igh-link], [University College London][ucl-link]
 - [Centre for Advanced Research Computing][arc-link], [University College London][ucl-link]
 - [Centre for Health Economics][che-link], [University of York][york-link]

contributors.yaml

@@ -4,7 +4,7 @@
   affiliation: "Imperial College London"
   website: "https://www.imperial.ac.uk/people/timothy.hallett"
   github-username: tbhallett
-  role: Joint lead epidemiology
+  role: Project Lead
   contributions:
     - Epidemiology and modelling
     - Software development
@@ -14,7 +14,7 @@
   affiliation: "University College London"
   website: "https://profiles.ucl.ac.uk/5430"
   github-username: andrew-phillips-1
-  role: Joint lead epidemiology
+  role: Lead Epidemiology
   contributions:
     - Epidemiology and modelling
     - Software development
@@ -102,7 +102,6 @@
   website: "https://www.york.ac.uk/che/staff/research/sakshi-mohan/"
   github-username: sakshimohan
   contributions:
-    - Epidemiology and modelling
     - Health economics
     - Software development
 - given-names: Wingston
@@ -196,6 +195,7 @@
   family-names: Janoušková
   orcid: "https://orcid.org/0000-0002-4104-0119"
   affiliation: "University College London"
+  website: "https://profiles.ucl.ac.uk/90260"
   github-username: EvaJanouskova
   contributions:
     - Epidemiology and modelling
@@ -206,15 +206,14 @@
   affiliation: University College London
   website: "https://profiles.ucl.ac.uk/954"
   contributions:
-    - Clinical consultant 
+    - Clinical process modelling
 - given-names: Paul
   family-names: Revill
   orcid: "https://orcid.org/0000-0001-8632-0600"
   affiliation: University of York
   website: "https://www.york.ac.uk/che/staff/research/paul-revill/"
   github-username: paulrevill
-  contributions:
-    - Health economics
+  role: "Lead Health-Economics"
 - given-names: Wiktoria
   family-names: Tafesse
   orcid: "https://orcid.org/0000-0002-0076-8285"
@@ -237,7 +236,7 @@
   website: "https://www.york.ac.uk/che/staff/students/newton-chagoma/"
   github-username: nchagoma503
   contributions:
-    - Health economics  
+    - Health economics
 - given-names: Martin
   family-names: Chalkley
   orcid: "https://orcid.org/0000-0002-1091-8259"
@@ -273,3 +272,31 @@
   family-names: Uwais
   website: "https://uk.linkedin.com/in/leila-uwais-597705142"
   github-username: Leila-Uwais
+- given-names: Dominic
+  family-names: Nkhoma
+  affiliation: "Kamuzu University of Health Sciences"
+  orcid: "https://orcid.org/0000-0001-6125-6630"
+  contributions:
+      - Policy translation
+  website: "https://mw.linkedin.com/in/dominicnkhoma1978"
+- given-names: Gerald
+  family-names: Manthalu
+  affiliation: "Department of Planning and Policy Development, Ministry of Health and Population, Lilongwe, Malawi"
+  orcid: "https://orcid.org/0000-0002-3501-8601"
+  contributions:
+      - Policy translation
+- given-names: Rachel
+  family-names: Murray-Watson
+  affiliation: "Imperial College London"
+  orcid: https://orcid.org/0000-0001-9079-5975
+  github-username: RachelMurray-Watson
+  contributions:
+    - Epidemiology and modelling
+    - Software development
+- given-names: Victor
+  family-names: Mwapasa
+  orcid: "https://orcid.org/0000-0002-2748-8902"
+  affiliation: "Kamuzu University of Health Sciences"
+  website: "https://www.kuhes.ac.mw/prof-victor-mwapasa/"
+  contributions:
+    - Clinical process modelling

docs/conf.py

@@ -105,6 +105,9 @@
     'exclude-members': '__dict__, name, rng, sim'  # , read_parameters',
 }
 
+# Include both class level and __init__ docstring content in class documentation
+autoclass_content = 'both'
+
 # The checker can't see private repos
 linkcheck_ignore = ['^https://github.com/UCL/TLOmodel.*',
                     'https://www.who.int/bulletin/volumes/88/8/09-068213/en/nn']

docs/index.rst

@@ -54,6 +54,7 @@ Contents
    azure_batch
    reference/index
    resources/index
+   parameters
    learning
    case-studies/index
    videos

docs/tlo_contributors.py

@@ -98,11 +98,12 @@ def categorized_contributor_lists_html(
     with open(args.contributors_file_path, "r") as f:
         contributors = yaml.safe_load(f)
     contribution_categories = (
+        "Clinical process modelling",
         "Epidemiology and modelling",
         "Health economics",
-        "Software development",
-        "Clinical consultant",
+        "Policy translation",
         "Project management",
+        "Software development",
     )
     category_predicates = {
         "Scientific leads": lambda c: "lead" in c.get("role", "").lower(),