lsst · TallJimbo · Dec 19, 2024 · Dec 17, 2024 · Dec 19, 2024
diff --git a/bps/clustering/DRP-recalibrated.yaml b/bps/clustering/DRP-recalibrated.yaml
@@ -1,6 +1,5 @@
 # This is a prescription for quantum clustering with BPS, suitable for any
 # concrete pipeline based on the "DRP-recalibrated" pipeline.
-# It also includes clustering for analysis_drp plots.
 #
 # Use it by adding:
 #
@@ -16,22 +15,6 @@ cluster:
     dimensions: visit,detector
     equalDimensions: visit:exposure
 
-  visit_plots:
-    pipetasks: plot_CircAp12_sub_PS_meas_sky_stars_visit,plot_CircAp12_sub_PS_meas_sky_gals_visit,plot_CircAp12_sub_PS_meas_calib_psf_used_sky_stars_visit,plot_CircAp12_sub_PS_meas_calib_psf_used_sky_gals_visit,plot_CircAp12_sub_PS_calib_psf_used_sky_unknown_visit,plot_PSFluxSN_meas_sky_all_visit,plot_CircAp12_sub_PS_meas_calib_psf_used_scatter_visit,plot_CircAp12_sub_PS_all_scatter_visit,plot_CircAp25_sub_PS_all_scatter_visit,plot_CircAp12_sub_PS_gals_scatter_visit,plot_CircAp25_sub_PS_gals_scatter_visit,plot_CircAp12_sub_PS_meas_scatter_visit,plot_CircAp25_sub_PS_meas_scatter_visit,plot_skyObject_sky_visit,plot_astromRefCat_sky_visit_dRA,plot_astromRefCat_sky_visit_dDec,plot_astromRefCat_scatter_visit_dRA,plot_astromRefCat_scatter_visit_dDec
-    dimensions: visit
-
-  visit_plots_ellip:
-    pipetasks: plot_e1_scatter_visit,plot_e1_sky_visit,plot_e2_scatter_visit,plot_e2_sky_visit,plot_shapeSize_scatter_visit,plot_shapeSize_sky_visit,plot_e1PSF_scatter_visit,plot_e1PSF_sky_visit,plot_e2PSF_sky_visit,plot_e2PSF_scatter_visit,plot_ellipResids_quiver_visit,plot_shapeSizePSF_scatter_visit,plot_shapeSizePSF_sky_visit,plot_shapeSizeDiff_scatter_visit,plot_shapeSizeFractionalDiff_scatter_visit,plot_E1Diff_scatter_visit,plot_E2Diff_scatter_visit,plot_E1Diff_sky_visit,plot_E2Diff_sky_visit,plot_ShapeDiff_sky_visit,plot_RhoStatistics_visit
-    dimensions: skymap,visit
-
-  coadd_plots:
-    pipetasks: plot_CircAp12_sub_PSF_meas_sky_stars,plot_CircAp12_sub_PSF_meas_sky_gals,plot_CircAp12_sub_PSF_meas_calib_psf_used_sky_stars,plot_CircAp12_sub_PSF_meas_calib_psf_used_sky_gals,plot_CircAp12_sub_PSF_meas_calib_psf_used_sky_unknown,plot_PSFluxSN_meas_sky_all,plot_Kron_sub_PSFmag_meas_sky_galaxies,plot_Kron_sub_PSFmag_meas_sky_stars,plot_CModel_sub_PSFmag_meas_sky_galaxies,plot_CModel_sub_PSFmag_meas_sky_stars,plot_CircAp12_sub_PSF_meas_calib_psf_used_stars_scatter,plot_CircAp12_sub_PSF_meas_stars_scatter,plot_CircAp12_sub_PSF_meas_calib_psf_used_gals_scatter,plot_CircAp12_sub_PSF_meas_gals_scatter,plot_ri_gr_cmodel,plot_ri_gr_psf,plot_astromRefCat_sky_tract_dRA,plot_astromRefCat_sky_tract_dDec,plot_astromRefCat_scatter_tract_dRA,plot_astromRefCat_scatter_tract_dDec
-    dimensions: skymap,tract
-
-  coadd_plots_ellip:
-    pipetasks: plot_E1Diff_scatter,plot_E2Diff_scatter,plot_shapeSizeFractionalDiff_scatter,plot_E1Diff_sky,plot_E2Diff_sky,plot_shapeSizeFractionalDiff_sky,plot_E1Diff_magDiff_scatter,plot_E2Diff_magDiff_scatter,plot_shapeSizeFractionalDiff_magDiff_scatter,plot_shapeSizeDiff_scatter,plot_shapeSizeDiff_magDiff_scatter,plot_shapeSizeDiff_sky,plot_ellipResids_quiver,plot_e1_scatter,plot_e2_scatter,plot_shapeSize_scatter,plot_e1PSF_scatter,plot_e2PSF_scatter,plot_shapeSizePSF_scatter,plot_RhoStatistics
-    dimensions: skymap,tract
-
   coadd:
     pipetasks: assembleCoadd,inject_coadd,templateGen,detection
     dimensions: tract,patch,band

diff --git a/bps/clustering/LSSTCam-imSim/DRP-DC2-clustering.yaml b/bps/clustering/LSSTCam-imSim/DRP-DC2-clustering.yaml
@@ -1,5 +1,4 @@
 # This is a prescription for quantum clustering with BPS with DC2
-# It also includes clustering for analysis_drp plots.
 #
 # Use it by adding:
 #
@@ -15,22 +14,6 @@ cluster:
     dimensions: visit,detector
     equalDimensions: visit:exposure
 
-  visit_plots:
-    pipetasks: plot_CircAp12_sub_PS_meas_sky_stars_visit,plot_CircAp12_sub_PS_meas_sky_gals_visit,plot_CircAp12_sub_PS_meas_calib_psf_used_sky_stars_visit,plot_CircAp12_sub_PS_meas_calib_psf_used_sky_gals_visit,plot_CircAp12_sub_PS_calib_psf_used_sky_unknown_visit,plot_PSFluxSN_meas_sky_all_visit,plot_CircAp12_sub_PS_meas_calib_psf_used_scatter_visit,plot_CircAp12_sub_PS_all_scatter_visit,plot_CircAp25_sub_PS_all_scatter_visit,plot_CircAp12_sub_PS_gals_scatter_visit,plot_CircAp25_sub_PS_gals_scatter_visit,plot_CircAp12_sub_PS_meas_scatter_visit,plot_CircAp25_sub_PS_meas_scatter_visit,plot_skyObject_sky_visit,plot_astromRefCat_sky_visit_dRA,plot_astromRefCat_sky_visit_dDec,plot_astromRefCat_scatter_visit_dRA,plot_astromRefCat_scatter_visit_dDec
-    dimensions: visit
-
-  visit_plots_ellip:
-    pipetasks: plot_e1_scatter_visit,plot_e1_sky_visit,plot_e2_scatter_visit,plot_e2_sky_visit,plot_shapeSize_scatter_visit,plot_shapeSize_sky_visit,plot_e1PSF_scatter_visit,plot_e1PSF_sky_visit,plot_e2PSF_sky_visit,plot_e2PSF_scatter_visit,plot_ellipResids_quiver_visit,plot_shapeSizePSF_scatter_visit,plot_shapeSizePSF_sky_visit,plot_shapeSizeDiff_scatter_visit,plot_shapeSizeFractionalDiff_scatter_visit,plot_E1Diff_scatter_visit,plot_E2Diff_scatter_visit,plot_E1Diff_sky_visit,plot_E2Diff_sky_visit,plot_ShapeDiff_sky_visit,plot_RhoStatistics_visit
-    dimensions: skymap,visit
-
-  coadd_plots:
-    pipetasks: plot_CircAp12_sub_PSF_meas_sky_stars,plot_CircAp12_sub_PSF_meas_sky_gals,plot_CircAp12_sub_PSF_meas_calib_psf_used_sky_stars,plot_CircAp12_sub_PSF_meas_calib_psf_used_sky_gals,plot_CircAp12_sub_PSF_meas_calib_psf_used_sky_unknown,plot_PSFluxSN_meas_sky_all,plot_Kron_sub_PSFmag_meas_sky_galaxies,plot_Kron_sub_PSFmag_meas_sky_stars,plot_CModel_sub_PSFmag_meas_sky_galaxies,plot_CModel_sub_PSFmag_meas_sky_stars,plot_CircAp12_sub_PSF_meas_calib_psf_used_stars_scatter,plot_CircAp12_sub_PSF_meas_stars_scatter,plot_CircAp12_sub_PSF_meas_calib_psf_used_gals_scatter,plot_CircAp12_sub_PSF_meas_gals_scatter,plot_ri_gr_cmodel,plot_ri_gr_psf,plot_astromRefCat_sky_tract_dRA,plot_astromRefCat_sky_tract_dDec,plot_astromRefCat_scatter_tract_dRA,plot_astromRefCat_scatter_tract_dDec
-    dimensions: skymap,tract
-
-  coadd_plots_ellip:
-    pipetasks: plot_E1Diff_scatter,plot_E2Diff_scatter,plot_shapeSizeFractionalDiff_scatter,plot_E1Diff_sky,plot_E2Diff_sky,plot_shapeSizeFractionalDiff_sky,plot_E1Diff_magDiff_scatter,plot_E2Diff_magDiff_scatter,plot_shapeSizeFractionalDiff_magDiff_scatter,plot_shapeSizeDiff_scatter,plot_shapeSizeDiff_magDiff_scatter,plot_shapeSizeDiff_sky,plot_ellipResids_quiver,plot_e1_scatter,plot_e2_scatter,plot_shapeSize_scatter,plot_e1PSF_scatter,plot_e2PSF_scatter,plot_shapeSizePSF_scatter,plot_RhoStatistics
-    dimensions: skymap,tract
-
   coadd:
     pipetasks: assembleCoadd,inject_coadd,templateGen,detection
     dimensions: tract,patch,band

diff --git a/pipelines/DECam/DRP-Merian.yaml b/pipelines/DECam/DRP-Merian.yaml
@@ -9,4 +9,3 @@ imports:
   - location: $DRP_PIPE_DIR/pipelines/_ingredients/DECam/DRP.yaml
     exclude:
       - isrForCrosstalkSources
-  - location: $ANALYSIS_DRP_DIR/pipelines/analysis_drp_plots.yaml
diff --git a/pipelines/HSC/QaTractTables.yaml b/pipelines/HSC/QaTractTables.yaml
diff --git a/pipelines/HSC/analysis_drp_plots_tier2_3.yaml b/pipelines/HSC/analysis_drp_plots_tier2_3.yaml
diff --git a/pipelines/LATISS/DRP.yaml b/pipelines/LATISS/DRP.yaml
@@ -8,18 +8,6 @@ imports:
   - location: $ANALYSIS_TOOLS_DIR/pipelines/exposureQualityCore.yaml
     exclude:
       - analyzeObjectTableCore
-  # The following are from analysis_drp
-  # TODO: remove once they have all been ported to analysis_tools (DM-39081)
-  - location: $ANALYSIS_DRP_DIR/pipelines/analysis_drp_plots.yaml
-    include:
-      - plot_ri_gr_psf
-      - plot_ri_gr_cmodel
-      - plot_wFit_PSF
-      - plot_xFit_PSF
-  - location: $ANALYSIS_DRP_DIR/pipelines/coaddQAPlots_tier2_3.yaml
-    include:
-      - plot_ri_gr_contour_psf
-      - plot_ri_gr_contour_cmodel
 
 tasks:
   isr: lsst.ip.isr.IsrTaskLSST
@@ -221,16 +209,9 @@ subsets:
       - validateObjectTableCore
       - analyzeMatchedVisitCore
       - analyzeAmpOffsetMetadata
-      # The following are from analysis_drp
-      # TODO: remove once they have all been ported to analysis_tools (DM-39081)
-      - plot_ri_gr_psf
-      - plot_ri_gr_cmodel
-      - plot_wFit_PSF
-      - plot_xFit_PSF
     description: |
       Healsparse maps and "core" (most important), coadd-level plots/metrics
-      from analysis_tools (plus a few from analysis_drp to be deprecated once
-      replicated in analysis_tools).
+      from analysis_tools.
 
       Needs to be run after 'step3b'. Must be be run with only instrument and
       skymap dataquery constraints if analyzeObjectTableSurveyCore is included,

diff --git a/pipelines/LSSTCam-imSim/DRP-ci_imsim.yaml b/pipelines/LSSTCam-imSim/DRP-ci_imsim.yaml
@@ -2,7 +2,6 @@ description: DRP specialized for ci_imsim test package.
 instrument: lsst.obs.lsst.LsstCamImSim
 imports:
   - $DRP_PIPE_DIR/pipelines/_ingredients/LSSTCam-imSim/DRP.yaml
-  - $ANALYSIS_DRP_DIR/pipelines/LSSTCam-imSim/analysis_drp_plots.yaml
   - $ANALYSIS_TOOLS_DIR/pipelines/diaTractQualityCore.yaml
   - $ANALYSIS_TOOLS_DIR/pipelines/coaddQualityExtended.yaml
   - $MEAS_EXTENSIONS_MULTIPROFIT_DIR/pipelines/multiprofit_match_dc2.yaml

diff --git a/pipelines/LSSTCam-imSim/DRP-test-med-1.yaml b/pipelines/LSSTCam-imSim/DRP-test-med-1.yaml
@@ -2,4 +2,3 @@ description: DRP specialized for the ImSim-DC2 test-med-1 dataset
 instrument: lsst.obs.lsst.LsstCamImSim
 imports:
   - $DRP_PIPE_DIR/pipelines/_ingredients/LSSTCam-imSim/DRP.yaml
-  - $ANALYSIS_DRP_DIR/pipelines/LSSTCam-imSim/analysis_drp_plots.yaml
diff --git a/pipelines/_ingredients/DRP-minimal-calibration.yaml b/pipelines/_ingredients/DRP-minimal-calibration.yaml
@@ -165,7 +165,7 @@ tasks:
   transformDiaSourceCat:
     class: lsst.ap.association.TransformDiaSourceCatalogTask
     config:
-      doIncludeReliability: True
+      doIncludeReliability: true
       connections.coaddName: goodSeeing
       connections.diaSourceSchema: goodSeeingDiff_diaSrc_schema
       connections.diaSourceCat: goodSeeingDiff_diaSrc

diff --git a/pipelines/_ingredients/HSC/DRP.yaml b/pipelines/_ingredients/HSC/DRP.yaml
@@ -2,7 +2,6 @@ description: The DRP pipeline specialized for Subaru's HyperSuprime-Cam
 instrument: lsst.obs.subaru.HyperSuprimeCam
 imports:
   - $DRP_PIPE_DIR/pipelines/_ingredients/DRP-full.yaml
-  - $ANALYSIS_DRP_DIR/pipelines/analysis_drp_plots.yaml
   - $ANALYSIS_TOOLS_DIR/pipelines/coaddColumnValidate.yaml
   - $ANALYSIS_TOOLS_DIR/pipelines/coaddQualityCore.yaml
   - $ANALYSIS_TOOLS_DIR/pipelines/exposureQualityCore.yaml

diff --git a/tests/test_pipelines.py b/tests/test_pipelines.py
@@ -359,8 +359,6 @@ def test_hsc_drp_ci_hsc(self):
                 "goodSeeingVisits",
                 "mergedForcedSource",
                 "mergedForcedSourceOnDiaObject",
-                "objectTable_tract_astrometryRefCat_match",
-                "sourceTable_visit_astrometryRefCat_match",
             },
         )
         tester.run(butler, self)

diff --git a/ups/drp_pipe.table b/ups/drp_pipe.table
@@ -18,7 +18,6 @@ setupRequired(meas_transiNet)
 # dependency until all of its plots and metrics have analysis_tools
 # replacements in order to make it easier to run as a one-off.
 setupRequired(faro)
-setupRequired(analysis_drp)
 setupRequired(analysis_tools)
 setupRequired(drp_tasks)
 setupRequired(ap_association)