Merge remote-tracking branch 'origin/master' into median-distance-bor…

…ders
owid · Dec 4, 2024 · bf9c151 · bf9c151
2 parents 1ed1cee + 1018780
commit bf9c151
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/etl/steps/data/garden/who/2022-09-30/ghe.meta.yml b/etl/steps/data/garden/who/2022-09-30/ghe.meta.yml
@@ -113,7 +113,7 @@ definitions:
     Estimated number of [DALYs](#dod:dalys) from << cause.lower() >> among {definitions.sex} aged {definitions.age}, per 100,000 people.
     <%- endif -%>
   footnote: |-
-    <%- if age == "Age-standardized" -%>To allow for comparisons between countries and over time, this metric is [age-standardized](#dod:age_standardized).<%- endif -%>
+    <%- if age_group is defined and age_group == "Age-standardized" -%>To allow for comparisons between countries and over time, this metric is [age-standardized](#dod:age_standardized).<%- endif -%>
 tables:
   ghe:
     variables:

diff --git a/etl/steps/data/garden/who/2024-07-30/ghe.meta.yml b/etl/steps/data/garden/who/2024-07-30/ghe.meta.yml
@@ -113,7 +113,7 @@ definitions:
     Estimated number of [DALYs](#dod:dalys) from << cause.lower() >> among {definitions.sex} aged {definitions.age}, per 100,000 people.
     <%- endif %>
   footnote: |-
-    <% if age_group == "Age-standardized" %>To allow for comparisons between countries and over time, this metric is [age-standardized](#dod:age_standardized).<% endif %>
+    <% if age_group is defined and age_group == "Age-standardized" %>To allow for comparisons between countries and over time, this metric is [age-standardized](#dod:age_standardized).<% endif %>
 tables:
   ghe:
     variables:

diff --git a/etl/steps/data/garden/who/2024-07-30/ghe.py b/etl/steps/data/garden/who/2024-07-30/ghe.py
@@ -77,7 +77,7 @@ def run(dest_dir: str) -> None:
     tb = rename_table_for_compatibility(tb)
 
     if SUBSET:
-        required_causes = ["Drug use disorders", "Alcohol use disorders"]
+        required_causes = ["Drug use disorders", "Alcohol use disorders", "Self-harm"]
         tb = tb[tb.cause.isin(SUBSET.split(",") + required_causes)]
 
     # Load countries regions

diff --git a/etl/steps/data/grapher/who/2024-07-30/ghe.py b/etl/steps/data/grapher/who/2024-07-30/ghe.py
@@ -20,8 +20,8 @@ def run(dest_dir: str) -> None:
     # Save outputs.
     #
     tables = [
-        tb_garden,
         tb_garden_ratio,
+        tb_garden,
     ]
 
     # Create a new grapher dataset with the same metadata as the garden dataset.