refactor: remove redshift_file parameter and use catalog config

Eliminate redundant redshift_file parameter and load n(z) directly from
catalog configuration. Added get_redshift() method as single source of truth.

- Renamed shear.redshift_distr → shear.redshift_path in cat_config.yaml
- Added get_redshift(version) method for catalog-aware n(z) loading
- Updated calculate_pure_eb(), plot_pure_eb(), calculate_pseudo_cl_eb_cov()
  to use get_redshift()
- Removed redshift_file parameter from __init__, calculate_pure_eb(),
  plot_pure_eb() signatures and docstrings

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: cailmdaley

cosmo_inference/cosmosis_config/cosmosis_pipeline_SP_v1.4.5_A_minsep=1_maxsep=250_nbins=20_npatch=1.ini

@@ -0,0 +1,124 @@
+#parameters used elsewhere in this file
+[DEFAULT]
+FITS_FILE = data/SP_v1.4.5_A_minsep=1_maxsep=250_nbins=20_npatch=1/cosmosis_SP_v1.4.5_A_minsep=1_maxsep=250_nbins=20_npatch=1.fits
+SCRATCH = /n09data/guerrini/output_chains/SP_v1.4.5_A_minsep=1_maxsep=250_nbins=20_npatch=1
+COSMOSIS_DIR = /home/guerrini/cosmosis-standard-library
+
+
+[pipeline]
+priors = cosmosis_config/priors_psf.ini
+values = cosmosis_config/values_psf.ini
+modules = consistency sample_S8 camb load_nz_fits photoz_bias linear_alignment projection add_intrinsic 2pt_shear add_xi_sys tau_from_rho 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
+
+[test]
+save_dir = %(SCRATCH)s/test_new_pipeline
+
+[polychord]
+polychord_outfile_root = SP_v1.4.5_A_minsep=1_maxsep=250_nbins=20_npatch=1
+live_points = 192
+feedback = 3
+resume = T
+base_dir = %(SCRATCH)s/polychord
+
+[output]
+filename = %(SCRATCH)s/SP_v1.4.5_A_minsep=1_maxsep=250_nbins=20_npatch=1/samples_SP_v1.4.5_A_minsep=1_maxsep=250_nbins=20_npatch=1.txt
+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.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 = 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
+
+[add_xi_sys]
+file = %(COSMOSIS_DIR)s/shear/xi_sys/xi_sys_psf.py
+data_file=%(FITS_FILE)s
+rho_stats_name=RHO_STATS
+
+[tau_from_rho]
+file = %(COSMOSIS_DIR)s/shear/xi_sys/tau_from_rho.py
+data_file=%(FITS_FILE)s
+
+[2pt_like]
+add_xi_sys=T
+data_sets=XI_PLUS XI_MINUS TAU_0_PLUS TAU_2_PLUS
+file = %(COSMOSIS_DIR)s/likelihood/2pt/2pt_like_xi_sys.py
+data_file=%(FITS_FILE)s
+gaussian_covariance=F
+covmat_name=COVMAT
+cut_zeros=F
+like_name=2pt_like
+angle_range_XI_PLUS_1_1= 3.0 150.0
+angle_range_XI_MINUS_1_1= 10.0 200.0

cosmo_inference/cosmosis_config/cosmosis_pipeline_SP_v1.4.5_leak_corr_A_minsep=1_maxsep=250_nbins=20_npatch=1.ini

@@ -0,0 +1,124 @@
+#parameters used elsewhere in this file
+[DEFAULT]
+FITS_FILE = data/SP_v1.4.5_leak_corr_A_minsep=1_maxsep=250_nbins=20_npatch=1/cosmosis_SP_v1.4.5_leak_corr_A_minsep=1_maxsep=250_nbins=20_npatch=1.fits
+SCRATCH = /n09data/guerrini/output_chains/SP_v1.4.5_leak_corr_A_minsep=1_maxsep=250_nbins=20_npatch=1
+COSMOSIS_DIR = /home/guerrini/cosmosis-standard-library
+
+
+[pipeline]
+priors = cosmosis_config/priors_psf.ini
+values = cosmosis_config/values_psf.ini
+modules = consistency sample_S8 camb load_nz_fits photoz_bias linear_alignment projection add_intrinsic 2pt_shear add_xi_sys tau_from_rho 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
+
+[test]
+save_dir = %(SCRATCH)s/test_new_pipeline
+
+[polychord]
+polychord_outfile_root = SP_v1.4.5_leak_corr_A_minsep=1_maxsep=250_nbins=20_npatch=1
+live_points = 192
+feedback = 3
+resume = T
+base_dir = %(SCRATCH)s/polychord
+
+[output]
+filename = %(SCRATCH)s/SP_v1.4.5_leak_corr_A_minsep=1_maxsep=250_nbins=20_npatch=1/samples_SP_v1.4.5_leak_corr_A_minsep=1_maxsep=250_nbins=20_npatch=1.txt
+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.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 = 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
+
+[add_xi_sys]
+file = %(COSMOSIS_DIR)s/shear/xi_sys/xi_sys_psf.py
+data_file=%(FITS_FILE)s
+rho_stats_name=RHO_STATS
+
+[tau_from_rho]
+file = %(COSMOSIS_DIR)s/shear/xi_sys/tau_from_rho.py
+data_file=%(FITS_FILE)s
+
+[2pt_like]
+add_xi_sys=T
+data_sets=XI_PLUS XI_MINUS TAU_0_PLUS TAU_2_PLUS
+file = %(COSMOSIS_DIR)s/likelihood/2pt/2pt_like_xi_sys.py
+data_file=%(FITS_FILE)s
+gaussian_covariance=F
+covmat_name=COVMAT
+cut_zeros=F
+like_name=2pt_like
+angle_range_XI_PLUS_1_1= 3.0 150.0
+angle_range_XI_MINUS_1_1= 10.0 200.0

notebooks/cosmo_val/cat_config.yaml

@@ -211,7 +211,7 @@ SP_test:
     R: 1.0
     covmat_file: ./covs/shapepipe_A/cov_shapepipe_A.txt
     path: v1.4.x/v1.4.5/unions_shapepipe_cut_struc_2024_v1.4.5.fits
-    redshift_distr: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
+    redshift_path: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
     w_col: w_iv
     e1_col: e1
     e1_PSF_col: e1_PSF
@@ -883,7 +883,7 @@ SP_v1.4.5:
     R: 1.0
     covmat_file: ./covs/shapepipe_A/cov_shapepipe_A.txt
     path: v1.4.5/unions_shapepipe_cut_struc_2024_v1.4.5.fits
-    redshift_distr: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
+    redshift_path: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
     w_col: w_des
     e1_col: e1
     e1_col_corrected: e1_leak_corrected
@@ -928,7 +928,7 @@ SP_v1.4.5.A:
     R: 1.0
     covmat_file: ./covs/shapepipe_A/cov_shapepipe_A.txt
     path: shapepipe_SPv1.fits
-    redshift_distr: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
+    redshift_path: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
     w_col: w
     e1_col: g1
     e1_PSF_col: e1_PSF
@@ -971,7 +971,7 @@ SP_v1.4.5_bright:
     R: 1.0
     covmat_file: ./covs/shapepipe_A/cov_shapepipe_A.txt
     path: unions_shapepipe_cut_struc_2024_v1.4.5_bright.fits
-    redshift_distr: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
+    redshift_path: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
     w_col: w_des
     e1_col: e1
     e1_PSF_col: e1_PSF
@@ -1014,7 +1014,7 @@ SP_v1.4.5_faint:
     R: 1.0
     covmat_file: ./covs/shapepipe_A/cov_shapepipe_A.txt
     path: unions_shapepipe_cut_struc_2024_v1.4.5_faint.fits
-    redshift_distr: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
+    redshift_path: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
     w_col: w_des
     e1_col: e1
     e1_PSF_col: e1_PSF
@@ -1057,7 +1057,7 @@ SP_v1.4.5_glass_mock:
     R: 1.0
     covmat_file: ./covs/shapepipe_A/cov_shapepipe_A.txt
     path: /n09data/guerrini/glass_mock/results/unions_glass_sim_00000_4096.fits
-    redshift_distr: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
+    redshift_path: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
     w_col: w
     e1_col: e1
     e1_PSF_col: e1_PSF
@@ -1100,7 +1100,7 @@ SP_v1.4.5_intermediate:
     R: 1.0
     covmat_file: ./covs/shapepipe_A/cov_shapepipe_A.txt
     path: unions_shapepipe_cut_struc_2024_v1.4.5_intermediate.fits
-    redshift_distr: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
+    redshift_path: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
     w_col: w_des
     e1_col: e1
     e1_PSF_col: e1_PSF
@@ -1144,7 +1144,7 @@ SP_v1.4.6:
     R: 1.0
     covmat_file: ./covs/shapepipe_A/cov_shapepipe_A.txt
     path: v1.4.6/unions_shapepipe_cut_struc_2024_v1.4.6.fits
-    redshift_distr: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
+    redshift_path: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
     w_col: w_des
     e1_col: e1
     e1_col_corrected: e1_leak_corrected
@@ -1190,7 +1190,7 @@ SP_v1.4.7:
     R: 1.0
     covmat_file: ./covs/shapepipe_A/cov_shapepipe_A.txt
     path: v1.4.7/unions_shapepipe_cut_struc_2024_v1.4.7.fits
-    redshift_distr: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
+    redshift_path: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
     w_col: w_des
     e1_col: e1
     e1_col_corrected: e1_leak_corrected
@@ -1236,7 +1236,7 @@ SP_v1.4.8:
     R: 1.0
     covmat_file: ./covs/shapepipe_A/cov_shapepipe_A.txt
     path: v1.4.8/unions_shapepipe_cut_struc_2024_v1.4.8.fits
-    redshift_distr: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
+    redshift_path: /n17data/mkilbing/astro/data/CFIS/v1.0/nz/dndz_SP_A.txt
     w_col: w_des
     e1_col: e1
     e1_col_corrected: e1_leak_corrected