Merge branch 'tickets/DM-43406'

lsst · Mar 27, 2024 · 0ff8ce0 · 0ff8ce0
2 parents 26dbfd2 + 896f266
commit 0ff8ce0
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 6 deletions.
diff --git a/pipelines/HSC/DRP-RC2.yaml b/pipelines/HSC/DRP-RC2.yaml
@@ -241,7 +241,6 @@ subsets:
       - analyzeMatchedVisitCore
       - analyzeMatchedPreVisitCore
       - analyzeObjectTableCore
-      - analyzeObjectTableExtended
       - analyzeObjectTableSurveyCore
       - catalogMatchTract
       - photometricCatalogMatch

diff --git a/pipelines/HSC/DRP-RC2_subset.yaml b/pipelines/HSC/DRP-RC2_subset.yaml
@@ -413,7 +413,6 @@ subsets:
       - analyzeMatchedVisitCore
       - analyzeMatchedPreVisitCore
       - analyzeObjectTableCore
-      - analyzeObjectTableExtended
       - analyzeObjectTableSurveyCore
       - catalogMatchTract
       - photometricCatalogMatch

diff --git a/pipelines/HSC/DRP-ci_hsc.yaml b/pipelines/HSC/DRP-ci_hsc.yaml
@@ -10,6 +10,8 @@ imports:
       - faro_visit
       - faro_matched
       - faro_tract
+  # Extended-level plots should still be tested in CI
+  - location: $ANALYSIS_TOOLS_DIR/pipelines/coaddQualityExtended.yaml
 
 tasks:
   # Do expect jointcal's photoCalibs to be present even though we didn't

diff --git a/pipelines/LSSTCam-imSim/DRP-ci_imsim.yaml b/pipelines/LSSTCam-imSim/DRP-ci_imsim.yaml
@@ -4,6 +4,7 @@ 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
 
 tasks:
   deblend:

diff --git a/pipelines/LSSTComCamSim/DRP-ops-rehearsal-3.yaml b/pipelines/LSSTComCamSim/DRP-ops-rehearsal-3.yaml
@@ -97,7 +97,6 @@ subsets:
       # analysis_tools tasks
       - analyzeMatchedVisitCore
       - analyzeObjectTableCore
-      - analyzeObjectTableExtended
       - catalogMatchTract
       - photometricCatalogMatch
       - photometricRefCatObjectTract

diff --git a/pipelines/_ingredients/HSC/DRP.yaml b/pipelines/_ingredients/HSC/DRP.yaml
@@ -6,7 +6,6 @@ imports:
   - $ANALYSIS_DRP_DIR/pipelines/analysis_drp_plots.yaml
   - $ANALYSIS_TOOLS_DIR/pipelines/coaddColumnValidate.yaml
   - $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:

diff --git a/pipelines/_ingredients/LSSTCam-imSim/DRP.yaml b/pipelines/_ingredients/LSSTCam-imSim/DRP.yaml
@@ -6,7 +6,6 @@ imports:
   - $ANALYSIS_TOOLS_DIR/pipelines/coaddColumnValidate.yaml
   - $ANALYSIS_TOOLS_DIR/pipelines/coaddDiffMatchedQualityExtended.yaml
   - $ANALYSIS_TOOLS_DIR/pipelines/coaddQualityCore.yaml
-  - $ANALYSIS_TOOLS_DIR/pipelines/coaddQualityExtended.yaml
   - location: $ANALYSIS_TOOLS_DIR/pipelines/matchedVisitQualityCore.yaml
     exclude:
       - analyzeMatchedPreVisitCore  # imSim does not have preSourceTable_visit catalogs
@@ -255,7 +254,6 @@ subsets:
     subset:
       - analyzeMatchedVisitCore
       - analyzeObjectTableCore
-      - analyzeObjectTableExtended
       - analyzeObjectTableSurveyCore
       - catalogMatchTract
       - diff_matched_analysis