Merge branch 'tickets/DM-37784'

lsst · Feb 16, 2023 · 8a6e4e0 · 8a6e4e0
2 parents caf595e + 303ed70
commit 8a6e4e0
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 7 deletions.
diff --git a/ingredients/HSC/DRP+fakes.yaml b/ingredients/HSC/DRP+fakes.yaml
@@ -40,6 +40,10 @@ imports:
     - makeVisitTable
     - healSparsePropertyMaps
     - consolidateHealSparsePropertyMaps
+    - analyzeObjectTableCore
+    - analyzeObjectTableSurveyCore
+    - catalogMatchTract
+    - refCatObjectTract
     - faro_all
 tasks:
   singleFrameWithFakes:

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

diff --git a/pipelines/HSC/DRP-Prod.yaml b/pipelines/HSC/DRP-Prod.yaml
@@ -2,7 +2,8 @@ description: The DRP pipeline specialized for large data release productions
 instrument: lsst.obs.subaru.HyperSuprimeCam
 imports:
   - location: "$DRP_PIPE_DIR/ingredients/HSC/DRP.yaml"
-    exclude: faro_all
+    exclude:
+      - faro_all
 tasks:
   fgcmFitCycle:
     class: lsst.fgcmcal.fgcmFitCycle.FgcmFitCycleTask
@@ -135,3 +136,17 @@ subsets:
       This step has global aggregation tasks to run over all visits, detectors,
       tracts, etc.  This step should be run only with the instrument constraint
       in the data query.
+  step8:
+    subset:
+      - analyzeObjectTableCore
+      - analyzeObjectTableSurveyCore
+      - catalogMatchTract
+      - refCatObjectTract
+    description: |
+      Core (most important), coadd-level plots/metrics from analysis_tools.
+
+      Must be run after 'step3' (writeObjectTable). Cannot be run with any
+      dataquery constraints if analyzeObjectTableSurveyCore is included.
+
+      Can be run together with analysis_drp subsets, e.g. pipeline.yaml
+      (hash/pound sign)step8,analysis_coadd_plots,imsim_analysis_coadd_plots
diff --git a/pipelines/HSC/DRP-RC2.yaml b/pipelines/HSC/DRP-RC2.yaml
@@ -234,3 +234,17 @@ subsets:
       This step has global aggregation tasks to run over all visits, detectors,
       tracts, etc.  This step should be run only with the instrument constraint
       in the data query.
+  step8:
+    subset:
+      - analyzeObjectTableCore
+      - analyzeObjectTableSurveyCore
+      - catalogMatchTract
+      - refCatObjectTract
+    description: |
+      Core (most important), coadd-level plots/metrics from analysis_tools.
+
+      Must be run after 'step3' (writeObjectTable). Cannot be run with any
+      dataquery constraints if analyzeObjectTableSurveyCore is included.
+
+      Can be run together with analysis_drp subsets, e.g. pipeline.yaml
+      (hash/pound sign)step8,analysis_coadd_plots,imsim_analysis_coadd_plots
diff --git a/pipelines/HSC/DRP-ci_hsc.yaml b/pipelines/HSC/DRP-ci_hsc.yaml
@@ -1,12 +1,15 @@
 description: The DRP pipeline specialized for the ci_hsc test dataset.
 instrument: lsst.obs.subaru.HyperSuprimeCam
 imports:
-  location: "$DRP_PIPE_DIR/ingredients/HSC/DRP.yaml"
-  exclude:
-    # Don't run jointcal, fgcm, or (some of) faro, as there isn't enough data.
-    - fgcm
-    - jointcal
-    - faro_all
+  - location: $DRP_PIPE_DIR/ingredients/HSC/DRP.yaml
+    exclude:
+      - fgcm
+      - jointcal
+      - faro_all
+      # Some of these plots fail with ci_hsc data
+      - analyzeObjectTableCore
+      - refCatObjectTract
+  - location: $ANALYSIS_TOOLS_DIR/pipelines/visitQualityCore.yaml
 tasks:
   # Do expect jointcal's photoCalibs to be present even though we didn't
   # run it, since that's what the testdata_ci_hsc repo is set up to have.