Merge pull request #715 from CosmoStat/refactor/remove-rho-stats

martinkilbinger · web-flow · commit 92844f00089c · 2026-04-23T14:42:12.000+02:00
refactor: remove rho-stats from shapepipe (closes #710)
diff --git a/Dockerfile b/Dockerfile
@@ -85,10 +85,8 @@ RUN pip install --no-cache-dir --upgrade pip && \
     sqlitedict==2.0.0 \
     termcolor==1.1.0 \
     tqdm==4.63.0 \
-    treecorr==5.1.1 \
     vos==3.6.1.1 \
-    git+https://github.com/aguinot/ngmix@stable_version \
-    git+https://github.com/tobias-liaudat/Stile@v0.1
+    git+https://github.com/aguinot/ngmix@stable_version
 
 WORKDIR /app
 COPY . /app/.
diff --git a/environment-dev.yml b/environment-dev.yml
@@ -26,7 +26,6 @@ dependencies:
   - sqlitedict>=2.1
   - termcolor>=2.3
   - tqdm>=4.66.1
-  - treecorr>=4.3.3
   - pip:
     - cs_util==0.0.5
     - mccd==1.2.4
@@ -35,4 +34,3 @@ dependencies:
     - sf_tools==2.0.4
     - git+https://github.com/CEA-COSMIC/pysap@develop
     - git+https://github.com/aguinot/ngmix@stable_version
-    - git+https://github.com/tobias-liaudat/Stile@v0.1
diff --git a/environment.yml b/environment.yml
@@ -34,16 +34,13 @@ dependencies:
     - pyqtgraph
     - python-pysap==0.2.1
     - reproject
-    - shear_psf_leakage
     - skaha
     - sip_tpv
     - sf_tools
     - sqlitedict
     - termcolor
     - tqdm
-    - treecorr
     - vos
     - git+https://github.com/aguinot/ngmix@stable_version
-    - git+https://github.com/tobias-liaudat/Stile@v0.1
     # Optional
     - fitsio
diff --git a/example/cfis/config_MsPl_mccd.ini b/example/cfis/config_MsPl_mccd.ini
@@ -97,10 +97,3 @@ PLOT_HISTOGRAMS = True
 # before drawing the plots.
 REMOVE_OUTLIERS = False
 
-# Options for rho statistics plots                                              
-PLOT_RHO_STATS = True
-
-RHO_STATS_STYLE = HSC
-
-RHO_STATS_YLIM_L = 1e-10, 4e-5
-RHO_STATS_YLIM_R = 1e-8, 4e-5
diff --git a/example/cfis/config_MsPl_psfex.ini b/example/cfis/config_MsPl_psfex.ini
@@ -94,8 +94,3 @@ REMOVE_OUTLIERS = False
 # REMOVE_OUTLIERS: Remove validated stars that are outliers in terms of shape
 # before drawing the plots.
 
-PLOT_RHO_STATS = True
-RHO_STATS_STYLE = HSC
-
-RHO_STATS_YLIM_L = 1e-10, 4e-5
-RHO_STATS_YLIM_R = 1e-8, 4e-5
diff --git a/example/cfis/config_MsPl_stars.ini b/example/cfis/config_MsPl_stars.ini
@@ -94,8 +94,3 @@ REMOVE_OUTLIERS = False
 # REMOVE_OUTLIERS: Remove validated stars that are outliers in terms of shape
 # before drawing the plots.
 
-PLOT_RHO_STATS = True
-RHO_STATS_STYLE = HSC
-
-RHO_STATS_YLIM_L = 1e-10, 4e-5
-RHO_STATS_YLIM_R = 1e-8, 4e-5
diff --git a/example/cfis/config_Pl_mccd.ini b/example/cfis/config_Pl_mccd.ini
@@ -81,8 +81,3 @@ REMOVE_OUTLIERS = False
 # REMOVE_OUTLIERS: Remove validated stars that are outliers in terms of shape
 # before drawing the plots.
 
-PLOT_RHO_STATS = True
-RHO_STATS_STYLE = HSC
-
-RHO_STATS_YLIM_L = 1e-10, 4e-5
-RHO_STATS_YLIM_R = 1e-8, 4e-5
diff --git a/example/cfis/config_Pl_psfex.ini b/example/cfis/config_Pl_psfex.ini
@@ -19,7 +19,7 @@ RUN_DATETIME = False
 [EXECUTION]
 
 # Module name, single string or comma-separated list of valid module runner names
-MODULE = mccd_plots_runner
+MODULE =
 
 # Parallel processing mode, SMP or MPI
 MODE = SMP
@@ -51,44 +51,3 @@ SMP_BATCH_SIZE = 4
 TIMEOUT = 96:00:00
 
 
-## Module options
-[MCCD_PLOTS_RUNNER]
-
-# NUMBERING_SCHEME (optional) string with numbering pattern for input files
-NUMBERING_SCHEME = -0000000
-
-#FILE_PATTERN = test
-FILE_PATTERN = full_starcat
-FILE_EXT = .fits
-
-HDU = 1
-
-PSF = psfex
-
-# was True
-PLOT_MEANSHAPES = False
-X_GRID = 5
-Y_GRID = 10
-
-# Optional: max values for elliptity and residual ellipticities
-MAX_E = 0.1
-MAX_DE = 0.01
-MIN_R2 = 4.5
-MAX_R2 = 7
-MAX_DR2 = 0.03
-
-#  was True
-PLOT_HISTOGRAMS = False
-REMOVE_OUTLIERS = False
-
-# X_GRID, Y_GRID: correspond to the number of bins in each direction of each
-# CCD from the focal plane. Ex: each CCD will be binned in 5x10 regular grids.
-#
-# REMOVE_OUTLIERS: Remove validated stars that are outliers in terms of shape
-# before drawing the plots.
-
-PLOT_RHO_STATS = True
-RHO_STATS_STYLE = UNIONS
-
-RHO_STATS_YLIM_L = 1e-10, 4e-5
-RHO_STATS_YLIM_R = 1e-8, 4e-5
diff --git a/example/cfis/config_Pl_psfex_conv.ini b/example/cfis/config_Pl_psfex_conv.ini
@@ -19,7 +19,7 @@ RUN_DATETIME = False
 [EXECUTION]
 
 # Module name, single string or comma-separated list of valid module runner names
-MODULE = mccd_plots_runner
+MODULE =
 
 # Parallel processing mode, SMP or MPI
 MODE = SMP
@@ -51,43 +51,3 @@ SMP_BATCH_SIZE = 4
 TIMEOUT = 96:00:00
 
 
-## Module options
-[MCCD_PLOTS_RUNNER]
-
-# NUMBERING_SCHEME (optional) string with numbering pattern for input files
-NUMBERING_SCHEME = -0000000
-
-FILE_PATTERN = full_starcat
-FILE_EXT = .fits
-
-HDU = 1
-
-PSF = psfex
-
-# was True
-PLOT_MEANSHAPES = False
-X_GRID = 5
-Y_GRID = 10
-
-# Optional: max values for elliptity and residual ellipticities
-MAX_E = 0.1
-MAX_DE = 0.01
-MIN_R2 = 4.5
-MAX_R2 = 7
-MAX_DR2 = 0.03
-
-#  was True
-PLOT_HISTOGRAMS = False
-REMOVE_OUTLIERS = False
-
-# X_GRID, Y_GRID: correspond to the number of bins in each direction of each
-# CCD from the focal plane. Ex: each CCD will be binned in 5x10 regular grids.
-#
-# REMOVE_OUTLIERS: Remove validated stars that are outliers in terms of shape
-# before drawing the plots.
-
-PLOT_RHO_STATS = True
-RHO_STATS_STYLE = UNIONS
-
-RHO_STATS_YLIM_L = 1e-10, 4e-5
-RHO_STATS_YLIM_R = 1e-8, 4e-5
diff --git a/example/cfis/config_exp_mccd.ini b/example/cfis/config_exp_mccd.ini
@@ -210,10 +210,6 @@ PLOT_HISTOGRAMS = True
 # before drawing the plots.
 REMOVE_OUTLIERS = False
 
-PLOT_RHO_STATS = True
-
-# RHO_STATS_STYLE: can be 'HSC' or 'DES'
-RHO_STATS_STYLE = HSC
 
 
 [MCCD_INTERP_RUNNER]
diff --git a/example/cfis/config_tile_Sx_exp_mccd.ini b/example/cfis/config_tile_Sx_exp_mccd.ini
@@ -272,7 +272,3 @@ PLOT_HISTOGRAMS = True
 # before drawing the plots.
 REMOVE_OUTLIERS = False
 
-PLOT_RHO_STATS = False
-
-# RHO_STATS_STYLE: can be 'HSC' or 'DES'
-RHO_STATS_STYLE = HSC
diff --git a/example/cfis/config_valjoint_Pl_mccd.ini b/example/cfis/config_valjoint_Pl_mccd.ini
@@ -83,12 +83,3 @@ PLOT_HISTOGRAMS = True
 # before drawing the plots.
 REMOVE_OUTLIERS = False
 
-
-# Options for rho statistics plots
-PLOT_RHO_STATS = True
-
-# RHO_STATS_STYLE: can be 'HSC' or 'DES'
-RHO_STATS_STYLE = HSC
-
-RHO_STATS_YLIM_L = 1e-10, 4e-5
-eHO_STATS_YLIM_R = 1e-8, 4e-5
diff --git a/example/cfis_simu/config_tile_Sx_exp_mccd.ini b/example/cfis_simu/config_tile_Sx_exp_mccd.ini
@@ -279,7 +279,3 @@ PLOT_HISTOGRAMS = True
 # before drawing the plots.
 REMOVE_OUTLIERS = False
 
-PLOT_RHO_STATS = False
-
-# RHO_STATS_STYLE: can be 'HSC' or 'DES'
-RHO_STATS_STYLE = HSC
diff --git a/install_shapepipe b/install_shapepipe
@@ -239,7 +239,6 @@ site-packages() {
   check_site_pkg "sf_tools"
   check_site_pkg "sip_tpv"
   check_site_pkg "sqlitedict"
-  check_site_pkg "treecorr"
 }
 
 # Function to return exit code
diff --git a/src/shapepipe/modules/mccd_package/__init__.py b/src/shapepipe/modules/mccd_package/__init__.py
@@ -178,14 +178,6 @@
 REMOVE_OUTLIERS: bool
     Option to remove validated stars that are outliers in terms of shape
     before drawing the plots
-PLOT_RHO_STATS: bool
-    Option to produce the rho stats plots
-RHO_STATS_STYLE: str
-    Style of the rho stats plot, options are ``HSC`` or ``DES``
-RHO_STATS_YLIM_L: tuple
-    Y-axis limits for left-hand rho stats plot
-RHO_STATS_YLIM_R: tuple
-    Y-axis limits for right-hand rho stats plot
 
 """
 
diff --git a/src/shapepipe/modules/mccd_package/mccd_plot_utilities.py b/src/shapepipe/modules/mccd_package/mccd_plot_utilities.py
diff --git a/src/shapepipe/modules/mccd_plots_runner.py b/src/shapepipe/modules/mccd_plots_runner.py
diff --git a/src/shapepipe/modules/python_example_runner.py b/src/shapepipe/modules/python_example_runner.py
