Add tomographic and 3x2pt covariance realspace measurement

scratch/lgoh/cov_config_test.yaml

@@ -0,0 +1,27 @@
+fiducial:
+  version: SP_v1.4.6
+  blind: A
+  min_sep: 1.0
+  max_sep: 100.0
+  nbins: 20
+  npatch: 30
+  mock_version: SP_v1.4.6
+  gaussian: g
+
+probe: wl
+glass_mocks:
+  version: "v0"
+  seed_range: [1, 350]
+
+covariance:
+  default_masked: True
+
+tools:
+  python_executable: /n23data1/n06data/lgoh/scratch/my_env_new/bin/python
+  onecov_executable: /n23data1/n06data/lgoh/scratch/UNIONS/OneCovariance/covariance.py
+
+SP_v1.4.6:
+  cov_th:
+    sigma_e: 0.28, 0.28
+    n_e: 5.0, 5.0
+    A: 1000

workflow/common.py

@@ -7,17 +7,13 @@
 
 # Output roots are env-overridable so a reproduction run can write into a
 # fresh tree without clobbering (or silently reusing) prior products.
-COSMO_VAL = Path(
-    os.environ.get(
-        "COSMO_VAL", "/n17data/cdaley/unions/code/sp_validation/cosmo_val/output"
-    )
-)
+SP_VALIDATION = Path(__file__).resolve().parents[1]
+COSMO_VAL = Path(os.environ.get("COSMO_VAL", SP_VALIDATION / "results/cosmo_val"))
 COSMO_INFERENCE = Path(
-    os.environ.get(
-        "COSMO_INFERENCE", "/n17data/cdaley/unions/code/sp_validation/cosmo_inference"
-    )
+    os.environ.get("COSMO_INFERENCE", SP_VALIDATION / "cosmo_inference")
 )
-CAT_CONFIG = "/n17data/cdaley/unions/code/sp_validation/cosmo_val/cat_config.yaml"
+CAT_CONFIG = SP_VALIDATION / "cosmo_val/cat_config.yaml"
+
 BLINDS = ["A", "B", "C"]
 BLOCK_PAIRS = [("++", "1"), ("--", "2"), ("+-", "3")]
 
@@ -37,6 +33,7 @@
     "min_sep": r"[0-9.]+",
     "max_sep": r"[0-9.]+",
     "gaussian": r"(g|ng)",
+    "probe": r"(wl|ggl|3x2pt)",
     "block_pm": r"(\+\+|--|\+-)",
     "block_i": r"[123]",
     "mask_suffix": r"(_masked)?",
@@ -46,15 +43,17 @@
 
 FIDUCIAL = None
 DEFAULT_MASK_SUFFIX = ""
+DEFAULT_PROBE = "wl"
 CATALOG_CONFIG = None
 PLANCK18 = None
 
 
 def configure(workflow_config):
     """Install config-derived values after Snakemake has loaded configfiles."""
-    global CATALOG_CONFIG, DEFAULT_MASK_SUFFIX, FIDUCIAL, PLANCK18
+    global CATALOG_CONFIG, DEFAULT_MASK_SUFFIX, DEFAULT_PROBE, FIDUCIAL, PLANCK18
     CATALOG_CONFIG = workflow_config
     FIDUCIAL = workflow_config["fiducial"]
+    DEFAULT_PROBE = workflow_config.get("probe") or "wl"
     DEFAULT_MASK_SUFFIX = (
         "_masked" if workflow_config["covariance"].get("default_masked", False) else ""
     )
@@ -76,44 +75,78 @@ def resolve_covariance_version(version):
     return version
 
 
+# Single source of truth for the covariance naming scheme. Rule outputs use
+# this with wildcards left in braces; covariance_base() fills concrete values.
+# Keep the two in sync by construction: covariance_base() formats this string.
+COV_BASE_TEMPLATE = (
+    "covariance_{version}_{blind}_{gaussian}"
+    "_minsep={min_sep}_maxsep={max_sep}_nbins={nbins}_{probe}{mask_suffix}"
+)
+
+
+def cov_output(suffix):
+    """Wildcard-bearing output path under the covariance tree.
+
+    E.g. cov_output(".ini") ->
+      <COSMO_INFERENCE>/data/covariance/<BASE>/<BASE>.ini
+    with {version}, {blind}, ... left as Snakemake wildcards.
+    """
+    return str(
+        COSMO_INFERENCE
+        / f"data/covariance/{COV_BASE_TEMPLATE}/{COV_BASE_TEMPLATE}{suffix}"
+    )
+
+
+def cov_output_dirfile(filename):
+    """Wildcard-bearing path to a fixed-name file inside the covariance dir."""
+    return str(COSMO_INFERENCE / f"data/covariance/{COV_BASE_TEMPLATE}/{filename}")
+
+
 def covariance_base(
     version,
     blind,
-    gaussian="ng",
+    gaussian=None,
     min_sep=None,
     max_sep=None,
     nbins=None,
+    probe=None,
     mask_suffix=None,
     resolve_version=True,
     fiducial=None,
     default_mask_suffix=None,
 ):
-    """Construct covariance base name."""
+    """Construct covariance base name (concrete values, no wildcards)."""
     fiducial = fiducial or FIDUCIAL
+    gaussian = gaussian if gaussian is not None else fiducial["gaussian"]
     min_sep = min_sep if min_sep is not None else fiducial["min_sep"]
     max_sep = max_sep if max_sep is not None else fiducial["max_sep"]
     nbins = nbins if nbins is not None else fiducial["nbins"]
-    mask_suffix = (
-        mask_suffix
-        if mask_suffix is not None
-        else (
+    probe = probe if probe is not None else DEFAULT_PROBE
+    if mask_suffix is None:
+        mask_suffix = (
             DEFAULT_MASK_SUFFIX if default_mask_suffix is None else default_mask_suffix
         )
-    )
     cov_version = resolve_covariance_version(version) if resolve_version else version
-    return (
-        f"covariance_{cov_version}_{blind}_{gaussian}"
-        f"_minsep={min_sep}_maxsep={max_sep}_nbins={nbins}{mask_suffix}"
+    return COV_BASE_TEMPLATE.format(
+        version=cov_version,
+        blind=blind,
+        gaussian=gaussian,
+        min_sep=min_sep,
+        max_sep=max_sep,
+        nbins=nbins,
+        probe=probe,
+        mask_suffix=mask_suffix,
     )
 
 
 def covariance_dir(
     version,
     blind,
-    gaussian="ng",
+    gaussian=None,
     min_sep=None,
     max_sep=None,
     nbins=None,
+    probe=None,
     mask_suffix=None,
     resolve_version=True,
 ):
@@ -125,6 +158,7 @@ def covariance_dir(
         min_sep,
         max_sep,
         nbins,
+        probe,
         mask_suffix,
         resolve_version=resolve_version,
     )
@@ -134,12 +168,13 @@ def covariance_dir(
 def covariance_path(
     version,
     blind,
-    gaussian="ng",
+    gaussian=None,
     min_sep=None,
     max_sep=None,
     nbins=None,
+    probe=None,
     mask_suffix=None,
-    suffix="_processed.txt",
+    suffix=".dat",
     resolve_version=True,
 ):
     """Construct covariance file path."""
@@ -150,22 +185,39 @@ def covariance_path(
         min_sep,
         max_sep,
         nbins,
+        probe,
         mask_suffix,
         resolve_version=resolve_version,
     )
     return str(COSMO_INFERENCE / f"data/covariance/{base}/{base}{suffix}")
 
 
-def build_redshift_path(version, blind):
+def build_redshift_dir(version):
     """Construct n(z) filepath for given catalog version and blind."""
     base_version = re.sub(r"_leak_corr$", "", version)
     base_version = re.sub(r"_ecut\d+", "", base_version)
     if "v1.4.11" in base_version:
         base_version = "SP_v1.4.6"
     version_dir = base_version.replace("SP_", "")
-    return (
-        f"/n17data/sguerrini/UNIONS/WL/nz/{version_dir}/nz_{base_version}_{blind}.txt"
-    )
+    return f"/n17data/sguerrini/UNIONS/WL/nz/{version_dir}/"
+
+
+def build_redshift_path_lens(version, blind):
+    """Construct n(z) filepath for given catalog version and blind."""
+    base_version = re.sub(r"_leak_corr$", "", version)
+    base_version = re.sub(r"_ecut\d+", "", base_version)
+    if "v1.4.11" in base_version:
+        base_version = "SP_v1.4.6"
+    return f"nz_{base_version}_{blind}_lens.txt"
+
+
+def build_redshift_path_source(version, blind):
+    """Construct n(z) filepath for given catalog version and blind."""
+    base_version = re.sub(r"_leak_corr$", "", version)
+    base_version = re.sub(r"_ecut\d+", "", base_version)
+    if "v1.4.11" in base_version:
+        base_version = "SP_v1.4.6"
+    return f"nz_{base_version}_{blind}_clust.txt"  # TO DO: check lens and source file format
 
 
 def get_shear_catalog(wildcards):