PR catalog-based estimator of pseudo-cls + Notebooks

cosmo_inference/cosmocov_config/cosmocov.ini

@@ -44,18 +44,16 @@ h0 : 0.7
 ; source_n_gal : 7.92
 
 #FOR SHAPEPIPE v1.3/v1.4
-area : 2138
+area : 2782
 sourcephotoz : multihisto
 lensphotoz : multihisto
 source_tomobins : 1
 lens_tomobins : 1
-sigma_e : 0.4485457
+sigma_e : 0.4370966656902571
 ; source_n_gal: 7.6   #v1.3
-source_n_gal : 12.63  # v1.4.1
-lens_n_gal : 12.63
+source_n_gal : 7.18  # v1.4.1
+lens_n_gal : 7.18
 
-shear_REDSHIFT_FILE : /n23data1/n06data/lgoh/scratch/CFIS-UNIONS/CFIS-UNIONS_dev/cosmo_inference/data/nz/nz_shapepipe_A.txt
-clustering_REDSHIFT_FILE : /n23data1/n06data/lgoh/scratch/CFIS-UNIONS/CFIS-UNIONS_dev/cosmo_inference/data/nz/nz_shapepipe_A.txt
 c_footprint_file: 
 
 
@@ -68,15 +66,14 @@ eta_ia : 0.0
 # Covariance paramters
 #
 # tmin,tmax in arcminutes
-tmin : 1
-tmax : 200
+tmin : 0.1
+tmax : 250
 ntheta : 20
 ng : 1
 cng : 1
 
 
 #mkdir before running!
-outdir : /n23data1/n06data/lgoh/scratch/CFIS-UNIONS/CFIS-UNIONS_dev/cosmo_inference/data/SP_v1.4/covs/
 filename : out_cov
 ss : true
 ls : false

cosmo_inference/cosmosis_config/cosmosis_pipeline_A_ia.ini

@@ -1,14 +1,10 @@
 #parameters used elsewhere in this file
 [DEFAULT]
 COSMOSIS_DIR = /n23data1/n06data/lgoh/scratch/cosmosis-standard-library
-SCRATCH = /n23data1/n06data/lgoh/scratch/CFIS-UNIONS/chains/SP_v1.4_A_ia
-FITS_FILE = /n23data1/n06data/lgoh/scratch/CFIS-UNIONS/CFIS-UNIONS_dev/cosmo_inference/data/SP_v1.4_A/cosmosis_SP_v1.4_A.fits
 
 
 [pipeline]
-modules = consistency sample_S8 camb load_nz_fits linear_alignment projection add_intrinsic 2pt_shear 2pt_like 
-values = /n23data1/n06data/lgoh/scratch/CFIS-UNIONS/CFIS-UNIONS_dev/cosmo_inference/cosmosis_config/values_ia.ini
-priors = /n23data1/n06data/lgoh/scratch/CFIS-UNIONS/CFIS-UNIONS_dev/cosmo_inference/cosmosis_config/priors.ini
+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
 timing = T
@@ -23,10 +19,10 @@ live_points = 192
 feedback = 3
 resume = T
 base_dir = %(SCRATCH)s/polychord
-polychord_outfile_root = SP_v1.4_A_ia
+
+[test]
 
 [output]
-filename = %(SCRATCH)s/SP_v1.4_A_ia.txt
 format = text
 lock = F
 
@@ -59,9 +55,17 @@ 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 = znla
+method = bk_corrected
 
 [projection]
 file = %(COSMOSIS_DIR)s/structure/projection/project_2d.py
@@ -84,6 +88,13 @@ perbin=F
 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

cosmo_inference/cosmosis_config/cosmosis_pipeline_A_ia_cell.ini

@@ -0,0 +1,106 @@
+#parameters used elsewhere in this file
+[DEFAULT]
+COSMOSIS_DIR = /home/guerrini/cosmosis-standard-library
+
+
+[pipeline]
+modules = consistency sample_S8 camb load_nz_fits photoz_bias linear_alignment projection add_intrinsic shear_m_bias 2pt_like 
+likelihoods = 2pt_like 
+extra_output = cosmological_parameters/omega_lambda cosmological_parameters/S_8 cosmological_parameters/sigma_8
+timing = T
+debug = T
+
+[runtime]
+sampler = polychord
+verbosity = debug
+
+[test]
+
+
+[polychord]
+live_points = 192
+feedback = 3
+resume = T
+base_dir = %(SCRATCH)s/polychord
+
+[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
+
+[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_cl
+verbose = F
+
+[2pt_shear]
+file = %(COSMOSIS_DIR)s/shear/cl_to_xi_nicaea/nicaea_interface.so
+corr_type = 0  ; shear_cl -> shear_xi
+
+[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=CELL_EE
+like_name=2pt_like

cosmo_inference/cosmosis_config/cosmosis_pipeline_A_psf.ini

@@ -4,9 +4,9 @@ COSMOSIS_DIR = /home/guerrini/cosmosis-standard-library
 
 
 [pipeline]
-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 
+modules = consistency sample_S8 camb load_nz_fits photoz_bias linear_alignment projection add_intrinsic 2pt_shear shear_m_bias 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
+extra_output = cosmological_parameters/omega_lambda cosmological_parameters/S_8 cosmological_parameters/sigma_8
 timing = T
 debug = T
 
@@ -15,7 +15,6 @@ sampler = polychord
 verbosity = debug
 
 [test]
-save_dir = %(SCRATCH)s/test_new_pipeline
 
 [polychord]
 live_points = 192
@@ -90,7 +89,7 @@ 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
+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

cosmo_inference/cosmosis_config/priors.ini

@@ -1,5 +1,11 @@
+[intrinsic_alignment_parameters]
+A = gaussian 0.83 0.7
+
 [cosmological_parameters]
-ombh2 = gaussian 0.023 0.00038
+ombh2 = gaussian 0.0244 0.00038
+
+[shear_calibration_parameters]
+m1 = gaussian 0.0 0.01
 
 [nofz_shifts]
-bias_1 = gaussian 0.0 0.05
+bias_1 = gaussian -0.030 0.016

cosmo_inference/cosmosis_config/priors_psf.ini

@@ -1,12 +1,15 @@
 [psf_leakage_parameters]
-alpha = gaussian 0.0026 0.002
-beta = gaussian 1.07 0.091
+alpha = gaussian 0.0028 0.022
+beta = gaussian 1.1077 0.0923
+
+[intrinsic_alignment_parameters]
+A = gaussian 0.83 0.7
 
 [cosmological_parameters]
-ombh2 = gaussian 0.023 0.00038
+ombh2 = gaussian 0.0244 0.00038
 
 [shear_calibration_parameters]
-m1 = gaussian 0.02 0.01
+m1 = gaussian 0.0 0.01
 
 [nofz_shifts]
-bias_1 = gaussian 0.0 0.05
+bias_1 = gaussian -0.030 0.016

cosmo_inference/cosmosis_config/values.ini

@@ -1,32 +1,28 @@
 [cosmological_parameters]
-omch2        =  0.051 0.120 0.255
-h0           =  0.64 0.7 0.82
-ombh2        =  0.019 0.023 0.026
-n_s          =  0.84 0.96 1.1
-S_8_input = 0.1 0.8 1.3
-
-tau          =  0.0544
-w            = -1.0
-massive_nu   =  1
-massless_nu  =  2.046
-omega_k      =  0.0
-wa           =  0.0
+tau = 0.0544
+w = -1.0
+massive_nu = 1
+massless_nu = 2.046
+omega_k = 0.0
+wa = 0.0
+omch2 = 0.10496564589028712
+h0 = 0.7703672811295145
+ombh2 = 0.024364520846452055
+n_s = 1.0378056660322685
+s_8_input = 0.867063981537897
 
+[halo_model_parameters]
 
 [intrinsic_alignment_parameters]
-A = -3.0 1.0 3.0
+a = 1.2105355520872163
 
-[psf_leakage_parameters]
-alpha = -0.1 0.0 0.1
-beta = 0.0 1.0 2.0
+[shear_calibration_parameters]
+m1 = -0.0019669717507113187
 
-# [shear_calibration_parameters]
-; #m0 = -0.8 0.012 0.8
-[halo_model_parameters]
-logT_AGN = 7.3 7.5 8.0
+[nofz_shifts]
+bias_1 = -0.05240296008081707
 
-[intrinsic_alignment_parameters]
-A = -3.0 1.0 3.0
+[psf_leakage_parameters]
+alpha = 0.017313482956287624
+beta = 1.0863942321436328
 
-# [shear_calibration_parameters]
-; #m0 = -0.8 0.012 0.8

cosmo_inference/cosmosis_config/values_ia.ini

@@ -17,6 +17,11 @@ logT_AGN = 7.3 7.5 8.0
 
 [intrinsic_alignment_parameters]
 A = -5.0 1.0 5.0
-eta = -5.0 0.0 5.0
+
+[shear_calibration_parameters]
+m1 = -0.1 0.0 0.1 
+
+[nofz_shifts]
+bias_1 = -0.1 0.0 0.1
 
 

cosmo_inference/cosmosis_config/values_psf.ini

@@ -1,9 +1,10 @@
 [cosmological_parameters]
-omch2        =  0.051 0.120 0.255
-h0           =  0.64 0.7 0.82
-ombh2        =  0.019 0.023 0.026
+#omega_m     =  0.05 0.25 0.6
+omch2        =  0.051 0.12249999999999998 0.255
+h0           =  0.64 0.70 0.82
+ombh2        =  0.019 0.024499999999999997 0.026
 n_s          =  0.84 0.96 1.1
-S_8_input = 0.1 0.8 1.3
+S_8_input = 0.1 0.79563645 1.3
 
 tau          =  0.0544
 w            = -1.0
@@ -13,11 +14,10 @@ omega_k      =  0.0
 wa           =  0.0
 
 [halo_model_parameters]
-logT_AGN = 7.3 7.5 8.0
+logT_AGN = 7.3 7.4755796676459387 8.0
 
 [intrinsic_alignment_parameters]
-A = -5.0 1.0 5.0
-eta = -5.0 0.0 5.0
+A = -5.0 0 5.0
 
 [shear_calibration_parameters]
 m1 = -0.1 0.0 0.1 
@@ -27,5 +27,5 @@ bias_1 = -0.1 0.0 0.1
 
 [psf_leakage_parameters]
 alpha = -0.1 0.0 0.1
-beta = 0.0 1.0 2.0
+beta = -2.0 0.0 2.0