Update pipelines to use new per-detector finalizeCharacterization tasks.

erykoff · erykoff · commit 92e2f8b7d330 · 2025-03-10T20:45:49.000-07:00
diff --git a/bps/resources/LSSTComCamSim/DRP-ops-rehearsals.yaml b/bps/resources/LSSTComCamSim/DRP-ops-rehearsals.yaml
@@ -48,7 +48,7 @@ pipetask:
     requestMemory: 4059
   fgcmFitCycle:
     requestMemory: 7867
-  finalizeCharacterization:
+  consolidateFinalizeCharacterization:
     requestMemory: 7956
   forcedPhotCcd:
     requestMemory: 2310
diff --git a/pipelines/HSC/DRP-Prod.yaml b/pipelines/HSC/DRP-Prod.yaml
@@ -68,7 +68,8 @@ subsets:
       and CcdVisits.
   step2d:
     subset:
-      - finalizeCharacterization
+      - finalizeCharacterizationDetector
+      - consolidateFinalizeCharacterization
       - writeRecalibratedSourceTable
       - transformSourceTable
       - consolidateSourceTable
diff --git a/pipelines/HSC/DRP-RC2.yaml b/pipelines/HSC/DRP-RC2.yaml
@@ -128,7 +128,8 @@ subsets:
       functionality.  It may be removed in the future.
   step2cde:
     subset:
-      - finalizeCharacterization
+      - finalizeCharacterizationDetector
+      - consolidateFinalizeCharacterization
       - fgcmBuildFromIsolatedStars
       - fgcmFitCycle
       - fgcmOutputProducts
diff --git a/pipelines/HSC/DRP-RC2_subset.yaml b/pipelines/HSC/DRP-RC2_subset.yaml
@@ -54,7 +54,8 @@ subsets:
       contained within each subset.
   source_calibration:
     subset:
-      - finalizeCharacterization
+      - finalizeCharacterizationDetector
+      - consolidateFinalizeCharacterization
       - updateVisitSummary
       - makeCcdVisitTable
       - makeVisitTable
@@ -125,7 +126,8 @@ subsets:
     subset:
       - makeVisitTable
       - makeCcdVisitTable
-      - finalizeCharacterization
+      - finalizeCharacterizationDetector
+      - consolidateFinalizeCharacterization
       - updateVisitSummary
       - writeRecalibratedSourceTable
       - transformSourceTable
diff --git a/pipelines/LATISS/DRP.yaml b/pipelines/LATISS/DRP.yaml
@@ -137,7 +137,8 @@ subsets:
 
   step2bcde:
     subset:
-      - finalizeCharacterization
+      - finalizeCharacterizationDetector
+      - consolidateFinalizeCharacterization
       - fgcmBuildFromIsolatedStars
       - fgcmFitCycle
       - fgcmOutputProducts
diff --git a/pipelines/LSSTComCam/DRP.yaml b/pipelines/LSSTComCam/DRP.yaml
@@ -62,7 +62,8 @@ subsets:
       (the latter of which links with the correct isolated star tables).
   step2d:
     subset:
-      - finalizeCharacterization
+      - finalizeCharacterizationDetector
+      - consolidateFinalizeCharacterization
       - writeRecalibratedSourceTable
       - transformSourceTable
       - consolidateSourceTable
diff --git a/pipelines/LSSTComCam/nightly-validation.yaml b/pipelines/LSSTComCam/nightly-validation.yaml
@@ -64,7 +64,8 @@ subsets:
       tract.
   step2d:
     subset:
-      - finalizeCharacterization
+      - finalizeCharacterizationDetector
+      - consolidateFinalizeCharacterization
       - writeRecalibratedSourceTable
       - transformSourceTable
       - consolidateSourceTable
diff --git a/pipelines/LSSTComCamSim/DRP.yaml b/pipelines/LSSTComCamSim/DRP.yaml
@@ -50,7 +50,8 @@ subsets:
       - fgcmOutputProducts
   step2d:
     subset:
-      - finalizeCharacterization
+      - finalizeCharacterizationDetector
+      - consolidateFinalizeCharacterization
       - writeRecalibratedSourceTable
       - transformSourceTable
       - consolidateSourceTable
diff --git a/pipelines/LSSTComCamSim/nightly-validation.yaml b/pipelines/LSSTComCamSim/nightly-validation.yaml
@@ -61,7 +61,8 @@ subsets:
       tract.
   step2d:
     subset:
-      - finalizeCharacterization
+      - finalizeCharacterizationDetector
+      - consolidateFinalizeCharacterization
       - writeRecalibratedSourceTable
       - transformSourceTable
       - consolidateSourceTable
diff --git a/pipelines/_ingredients/DECam/DRP.yaml b/pipelines/_ingredients/DECam/DRP.yaml
@@ -173,7 +173,8 @@ subsets:
       per-tract, per-visit.
   step2d:
     subset:
-      - finalizeCharacterization
+      - finalizeCharacterizationDetector
+      - consolidateFinalizeCharacterization
       - writeRecalibratedSourceTable
       - transformSourceTable
       - consolidateSourceTable
diff --git a/pipelines/_ingredients/DRP-minimal-calibration.yaml b/pipelines/_ingredients/DRP-minimal-calibration.yaml
@@ -32,7 +32,8 @@ tasks:
       # introduced to the imSim pipelines
       # presource are the default catalog to match on
       connections.source_table_visit: sourceTable_visit
-  finalizeCharacterization: lsst.pipe.tasks.finalizeCharacterization.FinalizeCharacterizationTask
+  finalizeCharacterizationDetector: lsst.pipe.tasks.finalizeCharacterization.FinalizeCharacterizationDetectorTask
+  consolidateFinalizeCharacterization: lsst.pipe.tasks.finalizeCharacterization.ConsolidateFinalizeCharacterizationDetectorTask
   updateVisitSummary: lsst.drp.tasks.update_visit_summary.UpdateVisitSummaryTask
   reprocessVisitImage:
     class: lsst.drp.tasks.reprocess_visit_image.ReprocessVisitImageTask
diff --git a/pipelines/_ingredients/LSSTCam-imSim/DRP.yaml b/pipelines/_ingredients/LSSTCam-imSim/DRP.yaml
@@ -142,7 +142,8 @@ subsets:
       - consolidateSourceTable
       - consolidateVisitSummary
       - isolatedStarAssociation
-      - finalizeCharacterization
+      - finalizeCharacterizationDetector
+      - consolidateFinalizeCharacterization
       - makeCcdVisitTable
       - makeVisitTable
       - updateVisitSummary
@@ -160,7 +161,7 @@ subsets:
       data repository.
 
       Visit-level tasks include consolidateSourceTable, consolidateVisitSummary,
-      finalizeCharacterization, updateVisitSummary.
+      finalizeCharacterizationDetector, consolidateFinalizeCharacterization, updateVisitSummary.
       Tract-level tasks include: isolatedStarAssociation
       Full collection-level tasks include: makeCcdVisitTable, makeVisitTable
   step3:
