CosmoStat · cailmdaley · May 30, 2026
diff --git a/docs/source/pipeline_tutorial.md b/docs/source/pipeline_tutorial.md
@@ -229,7 +229,7 @@ Next, the following tasks are run on the single-exposure single-CCD images:
 - The PSF model is created, either with `psfex` for PSFex, or
   with `mccd_preprocessing` and `mccd_fit_val` for MCCD.
 - The PSF model is interpolated to star positions for validation. For the PSFEx model, this is done
-  via a call to `psfex_interp`. For MCCD, the modules `merge_starcat`, `mccd_plots`, and
+  via a call to `psfex_interp`. For MCCD, the modules `merge_starcat` and
   `mccd_interp` are called.
 
 The output directory for both the `mccd` and `psfex` options is `run_sp_tile_Sx_exp_SxSePsf`.

diff --git a/docs/source/post_processing.md b/docs/source/post_processing.md
@@ -48,13 +48,13 @@ The following steps are required for pre-v1.4 runs performed on the canfar VM sy
       This script creates a new combined psf run in the ShapePipe `output` directory, by identifying all psf validation files
       and creating symbolic links. The run log file is updated.
 
-   3. Merge individual psf validation files into one catalogue. Create plots of the PSF and their residuals in the focal plane,
-      as a diagnostic of the overall PSF model.
-      As a scale-dependend test, which propagates directly to the shear correlation function, the rho statistics are computed,
-      see {cite:p}`rowe:10` and {cite:p}`jarvis:16`,
+   3. Merge individual psf validation files into one catalogue,
       ```bash
       shapepipe_run -c /path/to/shapepipe/example/cfis/config_MsPl_PSF.ini
-      ``` 
+      ```
+      PSF diagnostics — focal-plane mean-shape plots and the rho statistics, the scale-dependent test that
+      propagates directly to the shear correlation function (see {cite:p}`rowe:10` and {cite:p}`jarvis:16`) — are
+      no longer produced inside ShapePipe. They now live in `sp_validation`/`cosmo_val` (via `shear_psf_leakage`).
 
    4. Prepare output directory
 

diff --git a/example/cfis/config_MsPl_mccd.ini b/example/cfis/config_MsPl_mccd.ini
@@ -20,7 +20,7 @@ RUN_DATETIME = True
 [EXECUTION]
 
 # Module name, single string or comma-separated list of valid module runner names
-MODULE = merge_starcat_runner, mccd_plots_runner
+MODULE = merge_starcat_runner
 
 # Parallel processing mode, SMP or MPI
 MODE = SMP
@@ -67,33 +67,3 @@ FILE_PATTERN = validation_psf
 
 # FILE_EXT (optional) list of string extensions to identify input files
 FILE_EXT = .fits
-
-
-[MCCD_PLOTS_RUNNER]
-
-# NUMBERING_SCHEME (optional) string with numbering pattern for input files
-NUMBERING_SCHEME = -0000000
-
-FILE_PATTERN = full_starcat
-FILE_EXT = .fits
-
-PSF = mccd
-
-# Options for focal-plane plots                                                 
-PLOT_MEANSHAPES = True
-
-# 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.
-X_GRID = 5
-Y_GRID = 10
-
-# Optional: max values for elliptity and residual ellipticities
-MAX_E = 0.05
-MAX_DE = 0.005
-
-PLOT_HISTOGRAMS = True
-
-# REMOVE_OUTLIERS: Remove validated stars that are outliers in terms of shape
-# before drawing the plots.
-REMOVE_OUTLIERS = False
-
diff --git a/example/cfis/config_MsPl_psfex.ini b/example/cfis/config_MsPl_psfex.ini
@@ -19,7 +19,7 @@ RUN_DATETIME = False
 [EXECUTION]
 
 # Module name, single string or comma-separated list of valid module runner names
-MODULE = merge_starcat_runner, mccd_plots_runner
+MODULE = merge_starcat_runner
 
 # Parallel processing mode, SMP or MPI
 MODE = SMP
@@ -66,31 +66,3 @@ FILE_PATTERN = validation_psf
 
 # FILE_EXT (optional) list of string extensions to identify input files
 FILE_EXT = .fits
-
-
-[MCCD_PLOTS_RUNNER]
-
-# NUMBERING_SCHEME (optional) string with numbering pattern for input files
-NUMBERING_SCHEME = -0000000
-
-FILE_PATTERN = full_starcat
-FILE_EXT = .fits
-
-PLOT_MEANSHAPES = True
-X_GRID = 5
-Y_GRID = 10
-
-# Optional: max values for elliptity and residual ellipticities
-MAX_E = 0.05
-MAX_DE = 0.005
-
-PSF = psfex
-PLOT_HISTOGRAMS = True
-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.
-
diff --git a/example/cfis/config_MsPl_stars.ini b/example/cfis/config_MsPl_stars.ini
@@ -19,7 +19,7 @@ RUN_DATETIME = False
 [EXECUTION]
 
 # Module name, single string or comma-separated list of valid module runner names
-MODULE = merge_starcat_runner, mccd_plots_runner
+MODULE = merge_starcat_runner
 
 # Parallel processing mode, SMP or MPI
 MODE = SMP
@@ -66,31 +66,3 @@ FILE_PATTERN = star_selection
 
 # FILE_EXT (optional) list of string extensions to identify input files
 FILE_EXT = .fits
-
-
-[MCCD_PLOTS_RUNNER]
-
-# NUMBERING_SCHEME (optional) string with numbering pattern for input files
-NUMBERING_SCHEME = -0000000
-
-FILE_PATTERN = full_starcat
-FILE_EXT = .fits
-
-PLOT_MEANSHAPES = True
-X_GRID = 5
-Y_GRID = 10
-
-# Optional: max values for elliptity and residual ellipticities
-MAX_E = 0.05
-MAX_DE = 0.005
-
-PSF = psfex
-PLOT_HISTOGRAMS = True
-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.
-
diff --git a/example/cfis/config_Pl_mccd.ini b/example/cfis/config_Pl_mccd.ini
diff --git a/example/cfis/config_exp_mccd.ini b/example/cfis/config_exp_mccd.ini
@@ -21,7 +21,7 @@ RUN_NAME = run_sp_exp_SxSePsf
 # Module name, single string or comma-separated list of valid module runner names
 MODULE = sextractor_runner, setools_runner,
          mccd_preprocessing_runner, mccd_fit_val_runner,
-         merge_starcat_runner, mccd_plots_runner
+         merge_starcat_runner
 
 # Run mode, SMP or MPI
 MODE = SMP
@@ -184,34 +184,6 @@ VERBOSE = False
 NUMBERING_SCHEME = -0000000
 
 
-[MCCD_PLOTS_RUNNER]
-
-# Path to MCCD config file
-CONFIG_PATH = $SP_CONFIG/config_MCCD.ini
-
-MODE = FIT_VALIDATION
-
-VERBOSE = False
-
-# Now MCCD has created a focal-plane PSF model, including all CCDS per images,
-# thus single-exposure files
-NUMBERING_SCHEME = -0000000
-
-PLOT_MEANSHAPES = True
-
-# 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.
-X_GRID = 5
-Y_GRID = 10
-
-PLOT_HISTOGRAMS = True
-
-# REMOVE_OUTLIERS: Remove validated stars that are outliers in terms of shape
-# before drawing the plots.
-REMOVE_OUTLIERS = False
-
-
-
 [MCCD_INTERP_RUNNER]
 
 # MODE: Define the way the MCCD interpolation will run.

diff --git a/example/cfis/config_valjoint_Pl_mccd.ini b/example/cfis/config_valjoint_Pl_mccd.ini