Merge pull request #113 from lsst/tickets/DM-43382

DM-43382: Add visit-level metric tasks
lsst · Mar 21, 2024 · fd46959 · fd46959
2 parents 8df5466 + e5064bb
commit fd46959
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/pipelines/HSC/DRP-RC2.yaml b/pipelines/HSC/DRP-RC2.yaml
@@ -210,6 +210,8 @@ subsets:
     subset:
       - consolidateDiaSourceTable
       - consolidateSourceTable
+      - catalogMatchVisit
+      - astrometricRefCatSourceVisit
     description: |
       Tasks that can be run together, but only after the 'step1', 'step2',
       'step3', and 'step4', 'step5' subsets

diff --git a/pipelines/HSC/DRP-RC2_subset.yaml b/pipelines/HSC/DRP-RC2_subset.yaml
@@ -322,6 +322,8 @@ subsets:
       - nsrcMeasVisit
       - TE3
       - TE4
+      - catalogMatchVisit
+      - astrometricRefCatSourceVisit
     description: |
       Per-visit tasks. These should never be run with tract constraints
   nightlyStep3:

diff --git a/pipelines/HSC/DRP-ci_hsc.yaml b/pipelines/HSC/DRP-ci_hsc.yaml
@@ -10,8 +10,6 @@ imports:
       - faro_visit
       - faro_matched
       - faro_tract
-  # We generally don't want all visit-level plots for non-CI runs
-  - location: $ANALYSIS_TOOLS_DIR/pipelines/visitQualityCore.yaml
 
 tasks:
   # Do expect jointcal's photoCalibs to be present even though we didn't
@@ -64,3 +62,5 @@ subsets:
       - plotPropertyMapTract
       - refCatObjectTract
       - validateObjectTableCore
+      - catalogMatchVisit
+      - astrometricRefCatSourceVisit
diff --git a/pipelines/LSSTCam-imSim/DRP-ci_imsim.yaml b/pipelines/LSSTCam-imSim/DRP-ci_imsim.yaml
@@ -4,7 +4,6 @@ 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/visitQualityCore.yaml
 
 tasks:
   deblend:
@@ -53,3 +52,5 @@ subsets:
       - diff_matched_analysis
       - refCatObjectTract
       - validateObjectTableCore
+      - catalogMatchVisit
+      - astrometricRefCatSourceVisit
diff --git a/pipelines/_ingredients/HSC/DRP.yaml b/pipelines/_ingredients/HSC/DRP.yaml
@@ -8,6 +8,7 @@ imports:
   - $ANALYSIS_TOOLS_DIR/pipelines/coaddQualityCore.yaml
   - $ANALYSIS_TOOLS_DIR/pipelines/coaddQualityExtended.yaml
   - $ANALYSIS_TOOLS_DIR/pipelines/matchedVisitQualityCore.yaml
+  - $ANALYSIS_TOOLS_DIR/pipelines/visitQualityCore.yaml
 tasks:
   isolatedStarAssociation:
     class: lsst.pipe.tasks.isolatedStarAssociation.IsolatedStarAssociationTask

diff --git a/pipelines/_ingredients/LSSTCam-imSim/DRP.yaml b/pipelines/_ingredients/LSSTCam-imSim/DRP.yaml
@@ -8,6 +8,7 @@ imports:
   - $ANALYSIS_TOOLS_DIR/pipelines/coaddQualityCore.yaml
   - $ANALYSIS_TOOLS_DIR/pipelines/coaddQualityExtended.yaml
   - $ANALYSIS_TOOLS_DIR/pipelines/matchedVisitQualityCore.yaml
+  - $ANALYSIS_TOOLS_DIR/pipelines/visitQualityCore.yaml
 parameters:
   filterMap: {
     "u": "lsst_u_smeared",
@@ -223,6 +224,8 @@ subsets:
   step6:
     subset:
       - consolidateDiaSourceTable
+      - catalogMatchVisit
+      - astrometricRefCatSourceVisit
     description: |
       Tasks that can be run together, but only after the 'step1', 'step2',
       'step3', and 'step4' subsets