fix: reconcile pr7-lineage SACC callers with guarded sacc_io API

The feat/sacc-3 merge brought the guard-era sacc_io whose save() now
requires a keyword-only `type={'data','mock'}` provenance tag (PRD #241
§4) and whose load() refuses unblinded `type='data'`. Application code and
tests from the pr4/pr7 lineage still called the old `save(s, path)` and
referenced a template file the #236 cleanup had relocated, leaving 21 CI
failures outside the merge-conflict set. This adapts the callers to the
reviewed contract (sacc_io is unchanged).

save() type= threading:
- CosmologyValidation gains a `sacc_type` ctor kwarg (default "data"),
  stamped by every part-writer: cosebis/pure_eb/psf_systematics/pseudo_cl
  now `save(..., type=self.sacc_type)`.
- assemble_sacc inherits provenance from its parts: `type=metadata["type"]`.
- run_2pcf uses `cv.sacc_type`; run_2pcf_highres stamps "data" (real-catalogue
  fine covariance).
- Synthetic-data tests adopt the reviewed idiom `type="mock"` (loads freely):
  test_sacc_writers _roundtrip + reload helper, test_assemble_sacc part writer,
  and the test_pseudo_cl fixture (`sacc_type="mock"`).

Relocated FITS engine template:
- The #236 folder cleanup moved cosmosis_pipeline_A_ia.ini into
  cosmosis_config/templates/ (still used by the legacy cosmosis_fitting.py
  path). The new pr7 Snakemake regime — inference.smk's INFERENCE_TEMPLATE_DIR,
  generate_inference_config, and its tests — resolves templates from
  cosmosis_config/ directly, where pr7 placed A_ia_sacc.ini but never copied
  its FITS sibling. Restore A_ia.ini alongside the sacc template.

Fast suite: 254 passed, 1 skipped. Two remaining failures
(test_calculate_pure_eb pinned-value drift; test_configured_paths_exist_on_candide)
are pre-existing and environmental — they fail identically with these changes
stashed, and neither is in the API-drift set.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01766vawzi2XqrgoyHmeHEY9

Author: cailmdaley

cosmo_inference/cosmosis_config/cosmosis_pipeline_A_ia.ini

@@ -0,0 +1,108 @@
+#parameters used elsewhere in this file
+[DEFAULT]
+COSMOSIS_DIR = /n23data1/n06data/lgoh/scratch/cosmosis-standard-library_lisa
+
+
+[pipeline]
+modules = consistency sample_S8 camb load_nz_fits photoz_bias linear_alignment projection add_intrinsic 2pt_shear shear_m_bias 2pt_like 
+likelihoods = 2pt_like 
+extra_output = cosmological_parameters/omega_lambda cosmological_parameters/S_8 cosmological_parameters/sigma_8 cosmological_parameters/omega_m
+timing = T
+debug = T
+
+[runtime]
+sampler = polychord
+verbosity = debug
+
+[polychord]
+live_points = 192
+feedback = 3
+resume = T
+base_dir = %(SCRATCH)s/polychord
+
+[test]
+
+[output]
+format = text
+lock = F
+
+[consistency]
+file = %(COSMOSIS_DIR)s/utility/consistency/consistency_interface.py
+verbose = F
+
+[sample_S8]
+file = %(COSMOSIS_DIR)s/utility/sample_sigma8/sample_S8.py
+
+[camb]
+file = %(COSMOSIS_DIR)s/boltzmann/camb/camb_interface.py
+mode=power
+lmax=2508
+feedback=0
+do_reionization=F
+kmin=1e-5
+kmax=20.0
+nk=200
+zmax=5.0
+zmax_background=5.0
+nz_background=500
+halofit_version=mead2020_feedback
+nonlinear=pk
+neutrino_hierarchy=normal
+kmax_extrapolate = 500.0
+
+[load_nz_fits]
+file = %(COSMOSIS_DIR)s/number_density/load_nz_fits/load_nz_fits.py
+nz_file =%(FITS_FILE)s
+data_sets = SOURCE
+
+[photoz_bias]
+file = %(COSMOSIS_DIR)s/number_density/photoz_bias/photoz_bias.py
+mode = additive
+sample = nz_source
+bias_section = nofz_shifts
+interpolation = cubic
+output_deltaz_section_name = delta_z_out
+
+[linear_alignment]
+file = %(COSMOSIS_DIR)s/intrinsic_alignments/la_model/linear_alignments_interface_znla.py
+method = bk_corrected
+
+[projection]
+file = %(COSMOSIS_DIR)s/structure/projection/project_2d.py
+ell_min_logspaced = 1.0
+ell_max_logspaced = 25000.0
+n_ell_logspaced = 400
+shear-shear = source-source
+shear-intrinsic = source-source
+intrinsic-intrinsic = source-source
+get_kernel_peaks = F
+verbose = F
+
+[add_intrinsic]
+file = %(COSMOSIS_DIR)s/shear/add_intrinsic/add_intrinsic.py
+shear-shear=T
+position-shear=F
+perbin=F
+
+[2pt_shear]
+file = %(COSMOSIS_DIR)s/shear/cl_to_xi_nicaea/nicaea_interface.so
+corr_type = 0  ; shear_cl -> shear_xi
+
+[shear_m_bias]
+file = %(COSMOSIS_DIR)s/shear/shear_bias/shear_m_bias.py
+m_per_bin = True
+; Despite the parameter name, this can operate on xi as well as C_ell.
+cl_section = shear_xi_plus shear_xi_minus
+verbose = F
+
+[2pt_like]
+file = %(COSMOSIS_DIR)s/likelihood/2pt/2pt_like.py
+data_file=%(FITS_FILE)s
+gaussian_covariance=F
+covmat_name=COVMAT
+cut_zeros=F
+data_sets=XI_PLUS XI_MINUS
+like_name=2pt_like
+
+angle_range_XI_PLUS_1_1= 10.0 200.0
+angle_range_XI_MINUS_1_1= 20.0 200.0

src/sp_validation/cosmo_val/core.py

@@ -224,6 +224,7 @@ def __init__(
         path_onecovariance=None,
         cosmo_params=None,
         blind=None,
+        sacc_type="data",
     ):
         self.rho_tau_method = rho_tau_method
         self.cov_estimate_method = cov_estimate_method
@@ -253,6 +254,10 @@ def __init__(
         self.nside_mask = nside_mask
         self.path_onecovariance = path_onecovariance
         self.blind = blind
+        # SACC provenance stamped by every part-writer via sacc_io.save(type=…):
+        # 'data' for real catalogues (load-gated until blinded), 'mock' for
+        # simulations (freely inspectable). PRD #241 §4.
+        self.sacc_type = sacc_type
 
         assert self.cell_method in ["map", "catalog"], (
             "cell_method must be 'map' or 'catalog'"

src/sp_validation/cosmo_val/cosebis.py

@@ -180,7 +180,7 @@ def cosebis_to_sacc_part(self, version, out_path, results, fiducial_scale_cut=No
             result,
             scale_cut,
         )
-        sacc_io.save(s, out_path)
+        sacc_io.save(s, out_path, type=self.sacc_type)
 
     def plot_cosebis(
         self,

src/sp_validation/cosmo_val/pseudo_cl.py

@@ -704,7 +704,7 @@ def pseudo_cl_to_sacc_part(self, version, out_path, ell_eff, cl_all, wsp):
             cl_all,
             wsp,
         )
-        sacc_io.save(s, out_path)
+        sacc_io.save(s, out_path, type=self.sacc_type)
 
     def plot_pseudo_cl(self):
         """

src/sp_validation/cosmo_val/psf_systematics.py

@@ -80,7 +80,7 @@ def rho_tau_to_sacc_part(
             tau_cov_th=tau_cov_th,
         )
         out_path = os.path.join(out_dir, f"rho_tau_{base}.sacc")
-        sacc_io.save(s, out_path)
+        sacc_io.save(s, out_path, type=self.sacc_type)
 
     @property
     def rho_stat_handler(self):

src/sp_validation/cosmo_val/pure_eb.py

@@ -151,7 +151,7 @@ def pure_eb_to_sacc_part(self, version, out_path, results):
             eb,
             covariance=results["cov"],
         )
-        sacc_io.save(s, out_path)
+        sacc_io.save(s, out_path, type=self.sacc_type)
 
     def plot_pure_eb(
         self,

src/sp_validation/tests/test_assemble_sacc.py

@@ -131,7 +131,7 @@ def get_bandpower_windows(self):
     paths = {}
     for name, part in parts.items():
         p = tmp_path / f"{name}.sacc"
-        sio.save(part, str(p))
+        sio.save(part, str(p), type="mock")
         paths[name] = str(p)
     return paths
 

src/sp_validation/tests/test_pseudo_cl.py

@@ -169,6 +169,7 @@ def cv(tmp_path):
         power=0.5,
         n_ell_bins=N_ELL_BINS,
         pol_factor=True,
+        sacc_type="mock",
     )
     cv._test_version = version
     return cv

src/sp_validation/tests/test_sacc_writers.py

@@ -31,7 +31,7 @@ def _theta(n=6):
 
 def _roundtrip(s, tmp_path, name):
     p = tmp_path / f"{name}.sacc"
-    sio.save(s, str(p))
+    sio.save(s, str(p), type="mock")
     return sio.load(str(p))
 
 
@@ -306,7 +306,7 @@ def test_assemble_from_reloaded_parts(tmp_path):
     parts = _make_parts(nz)
     reloaded = []
     for i, part in enumerate(parts):
-        sio.save(part, str(tmp_path / f"part{i}.sacc"))
+        sio.save(part, str(tmp_path / f"part{i}.sacc"), type="mock")
         reloaded.append(sio.load(str(tmp_path / f"part{i}.sacc")))
     s = sw.assemble_analysis_sacc(nz, META, reloaded)
     assert type(s.covariance).__name__ == "FullCovariance"

workflow/scripts/assemble_sacc.py

@@ -167,7 +167,8 @@ def assemble_sacc(
     if not parts:
         raise ValueError(f"no parts found for {version}: {part_paths}")
     s = assemble_analysis_sacc(nz, metadata, parts)
-    sacc_io.save(s, out_path)
+    # Provenance is inherited from the parts (all same version → same type).
+    sacc_io.save(s, out_path, type=metadata["type"])
     print(f"Assembled {len(parts)} parts -> {out_path}")
     return s