From dd89cd5b26d17be1f65efee826491c7917ad5951 Mon Sep 17 00:00:00 2001
From: "martin.kilbinger" <martin.kilbinger@cea.fr>
Date: Mon, 2 Feb 2026 14:36:27 +0100
Subject: [PATCH 1/2] conflict solved

---
 notebooks/cosmo_val/cat_config.yaml | 94 -----------------------------
 1 file changed, 94 deletions(-)

diff --git a/notebooks/cosmo_val/cat_config.yaml b/notebooks/cosmo_val/cat_config.yaml
index 44e2cea..50ac383 100644
--- a/notebooks/cosmo_val/cat_config.yaml
+++ b/notebooks/cosmo_val/cat_config.yaml
@@ -790,100 +790,6 @@ SP_v1.4.8_uncal:
       path: unions_shapepipe_psf_2024_v1.4.a.fits
       hdu: 1
    patch_number: 100
-   
-SP_v1.4_LFmask_8k:
->>>>>>> upstream/develop
-  subdir: /n17data/mkilbing/astro/data/CFIS/v1.0/SP_LFmask
-  pipeline: SP
-  colour: black
-  getdist_colour: 0.0, 0.5, 1.0
-  ls: solid
-  marker: d
-  cov_th:
-    A: 2137.7977618140676
-    n_e: 7.976462506484096
-    n_psf: 0.5434016250405327
-    sigma_e: 0.31509572849714534
-    path_rho: rho_stats_SP_v1.4.fits
-    path_tau: tau_stats_SP_v1.4.fits
-    path_xi_plus: xi_plus_SP_v1.4.fits
-    path_xi_minus: xi_minus_SP_v1.4.fits
-  psf:
-    PSF_flag: FLAG_PSF_HSM
-    PSF_size: SIGMA_PSF_HSM
-    square_size: true
-    star_flag: FLAG_STAR_HSM
-    star_size: SIGMA_STAR_HSM
-    hdu: 1
-    path: unions_shapepipe_psf_conv_2022_v1.4.0_mtheli8k.fits
-    ra_col: RA
-    dec_col: Dec
-    e1_PSF_col: E1_PSF_HSM
-    e1_star_col: E1_STAR_HSM
-    e2_PSF_col: E2_PSF_HSM
-    e2_star_col: E2_STAR_HSM
-    label: SP_LFmask_psf
-  shear:
-    R: 1.0
-    covmat_file: ./covs/shapepipe_A/cov_shapepipe_A.txt
-    path: unions_shapepipe_extended_2022_v1.4.0_mtheli8k.fits
-    w_col: w
-    e1_col: e1
-    e1_PSF_col: e1_PSF
-    e2_col: e2
-    e2_PSF_col: e2_PSF
-  star:
-    ra_col: RA
-    dec_col: Dec
-    e1_col: e1
-    e2_col: e2
-    path: unions_shapepipe_star_2022_v1.4.0_mtheli8k.fits
-SP_v1.4_LFmask_8k_noalpha:
-  subdir: /n17data/mkilbing/astro/data/CFIS/v1.0/SP_LFmask
-  pipeline: SP
-  colour: brown
-  getdist_colour: 0.0, 0.5, 1.0
-  ls: solid
-  marker: d
-  cov_th:
-    A: 2137.7977618140676
-    n_e: 7.976462506484096
-    n_psf: 0.5434016250405327
-    sigma_e: 0.31509572849714534
-    path_rho: rho_stats_SP_v1.4.fits
-    path_tau: tau_stats_SP_v1.4.fits
-    path_xi_plus: xi_plus_SP_v1.4.fits
-    path_xi_minus: xi_minus_SP_v1.4.fits
-  psf:
-    PSF_flag: FLAG_PSF_HSM
-    PSF_size: SIGMA_PSF_HSM
-    square_size: true
-    star_flag: FLAG_STAR_HSM
-    star_size: SIGMA_STAR_HSM
-    hdu: 1
-    path: unions_shapepipe_psf_conv_2022_v1.4.0_mtheli8k.fits
-    ra_col: RA
-    dec_col: Dec
-    e1_PSF_col: E1_PSF_HSM
-    e1_star_col: E1_STAR_HSM
-    e2_PSF_col: E2_PSF_HSM
-    e2_star_col: E2_STAR_HSM
-    label: SP_LFmask_psf
-  shear:
-    R: 1.0
-    covmat_file: ./covs/shapepipe_A/cov_shapepipe_A.txt
-    path: unions_shapepipe_extended_rmalpha_2022_v1.4.0_mtheli8k.fits
-    w_col: w
-    e1_col: e1_cor
-    e1_PSF_col: e1_PSF
-    e2_col: e2_cor
-    e2_PSF_col: e2_PSF
-  star:
-    ra_col: RA
-    dec_col: Dec
-    e1_col: e1
-    e2_col: e2
-    path: unions_shapepipe_star_2022_v1.4.0_mtheli8k.fits
 SP_v1.5.4:
   subdir: /n17data/UNIONS/WL/v1.5.x
   pipeline: SP

From b33879bc28e4c191b820f24527b24d651a374ac6 Mon Sep 17 00:00:00 2001
From: martinkilbinger <martinkilbinger@cea.fr>
Date: Mon, 9 Feb 2026 16:47:52 +0100
Subject: [PATCH 2/2] Upgraded to numpy 2.0

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index fd9704c..7fc190e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -37,7 +37,7 @@ dependencies = [
     "lenspack",
     "lmfit",
     "numexpr",
-    "numpy>=1.14",
+    "numpy>=2.0",
     "opencv-python-headless",
     "pyccl",
     "pyarrow",