Merge branch 'master' into test-veff-1138

Author: jonbrenas

malariagen_data/ag3.py

@@ -186,6 +186,8 @@ def __init__(
             cohorts_analysis=cohorts_analysis,
             aim_analysis=aim_analysis,
             aim_metadata_dtype=AIM_METADATA_DTYPE,
+            aim_ids=("gambcolu_vs_arab", "gamb_vs_colu"),
+            aim_palettes=AIM_PALETTES,
             site_filters_analysis=site_filters_analysis,
             discordant_read_calls_analysis=discordant_read_calls_analysis,
             default_site_mask="gamb_colu_arab",

malariagen_data/anopheles.py

@@ -14,6 +14,7 @@
 
 
 from .anoph import (
+    aim_params,
     base_params,
     dash_params,
     gplt_params,
@@ -109,6 +110,8 @@ def __init__(
         cohorts_analysis: Optional[str],
         aim_analysis: Optional[str],
         aim_metadata_dtype: Optional[Mapping[str, Any]],
+        aim_ids: Optional[aim_params.aim_ids],
+        aim_palettes: Optional[aim_params.aim_palettes],
         site_filters_analysis: Optional[str],
         discordant_read_calls_analysis: Optional[str],
         default_site_mask: Optional[str],
@@ -152,6 +155,8 @@ def __init__(
             cohorts_analysis=cohorts_analysis,
             aim_analysis=aim_analysis,
             aim_metadata_dtype=aim_metadata_dtype,
+            aim_ids=aim_ids,
+            aim_palettes=aim_palettes,
             site_filters_analysis=site_filters_analysis,
             discordant_read_calls_analysis=discordant_read_calls_analysis,
             default_site_mask=default_site_mask,