refactor(cosmology): move cosmology into cs_util.cosmo; delete local module

papers/bmodes/config/config.yaml

@@ -63,7 +63,7 @@ covariance:
   use_semianalytic: true
   # Number of Monte Carlo samples for covariance propagation (used by pure E/B mode analysis)
   n_samples: 2000
-  # Cosmology: imported from sp_validation.cosmology.PLANCK18 (astropy Planck18)
+  # Cosmology: imported from cs_util.cosmo.PLANCK18 (astropy Planck18)
   # Mask Cl paths: defined in covariance.smk (MASK_CLS_FILES)
 
 # Harmonic-space (C_l) analysis parameters

papers/bmodes/config/covariance.md

@@ -20,7 +20,7 @@ Gaussian-only approximation: non-Gaussian contributions computationally prohibit
 |-----------|--------|-------------|
 | Samples | `config.yaml: covariance.n_samples` | MC samples for propagation (default 2000) |
 | Use masked | `config.yaml: covariance.default_masked` | Whether to use masked covariance |
-| Cosmology | `Snakefile: PLANCK18` | astropy Planck18 via sp_validation.cosmology |
+| Cosmology | `Snakefile: PLANCK18` | astropy Planck18 via cs_util.cosmo |
 | Mask Cls | `covariance.smk: MASK_CLS_FILES` | Per-version mask power spectra |
 
 ## Survey Properties

papers/bmodes/scripts/precompute_pure_eb_chunk.py

@@ -79,9 +79,9 @@ def compute_chunk(
     cosmo_params=None,
 ):
     from cosmo_numba.B_modes.schneider2022 import get_pure_EB_modes
+    from cs_util.cosmo import PLANCK18, get_theo_xi
 
     from sp_validation.cosmo_val import CosmologyValidation
-    from sp_validation.cosmology import PLANCK18, get_theo_xi
 
     if cosmo_params is None:
         cosmo_params = dict(PLANCK18)

pyproject.toml

@@ -25,7 +25,12 @@ dependencies = [
     "camb>=1.6",
     "clmm",
     "colorama",
-    "cs_util>=0.2.1",
+    # Track cs_util's develop branch directly (git dependency) rather than a
+    # PyPI pin: the two repos are iterating together heavily and cs_util
+    # releases are infrequent. This PR's cosmology repoint needs get_cosmo /
+    # get_theo_c_ell / get_theo_xi / PLANCK18 in cs_util.cosmo, which land via
+    # CosmoStat/cs_util#76 — so this goes green once #76 merges into develop.
+    "cs_util @ git+https://github.com/CosmoStat/cs_util.git@develop",
     "emcee",
     # SHA-pinned snapshot of getdist branch `upper_triangle_whisker`.
     "getdist @ git+https://github.com/benabed/getdist.git@113cd22a9a0d013b6f72fe734be81f260f3d3be5",

scratch/guerrini/namaster_utils.py

@@ -23,10 +23,10 @@
 import pymaster as nmt
 import seaborn as sns
 from astropy.io import fits
+from cs_util.cosmo import get_cosmo, get_theo_c_ell
 from matplotlib import scale as mscale
 from tqdm import tqdm
 
-from sp_validation.cosmology import get_cosmo, get_theo_c_ell
 from sp_validation.rho_tau import SquareRootScale
 
 mscale.register_scale(SquareRootScale)

src/sp_validation/__init__.py

@@ -6,7 +6,6 @@
     "calibration",
     "catalog",
     "catalog_builders",
-    "cosmology",
     "format",
     "galaxy",
     "glass_mock",

src/sp_validation/b_modes.py

@@ -12,11 +12,10 @@
 import seaborn as sns
 import tqdm
 import treecorr
+from cs_util.cosmo import get_theo_xi
 from mpl_toolkits.axes_grid1 import make_axes_locatable
 from scipy import sparse, stats
 
-from .cosmology import get_theo_xi
-
 _EB_KEYS = ("xip_E", "xim_E", "xip_B", "xim_B", "xip_amb", "xim_amb")
 
 

src/sp_validation/cosmo_val/core.py

@@ -7,13 +7,13 @@
 import colorama
 import numpy as np
 import yaml
+from cs_util.cosmo import get_cosmo
 from shear_psf_leakage import run_object, run_scale
 
 from ..b_modes import (
     _get_pte_from_scale_cut,
     find_conservative_scale_cut_key,
 )
-from ..cosmology import get_cosmo
 from ..statistics import chi2_and_pte
 from .catalog_characterization import CatalogCharacterizationMixin
 from .cosebis import CosebisMixin

src/sp_validation/cosmo_val/pseudo_cl.py

@@ -15,8 +15,8 @@
 import numpy as np
 import pymaster as nmt
 from astropy.io import fits
+from cs_util.cosmo import get_theo_c_ell
 
-from ..cosmology import get_theo_c_ell
 from ..pseudo_cl import (
     apply_random_rotation,
     get_n_gal_map,