From 681f25c6237ea7667c00dcf1521b2e6bce9eba0f Mon Sep 17 00:00:00 2001
From: hlin730 <hlin730@users.noreply.github.com>
Date: Wed, 6 Dec 2023 15:21:05 -0600
Subject: [PATCH] Move tasks for consistency with HSC DRP-RC2.yaml

After review, move some tasks for consistency with HSC DRP-RC2.yaml:  selectGoodSeeingVisits and templateGen to step3a, writeRecalibratedSourceTable and transformSourceTable to step4, consolidateSourceTable to step5.
---
 pipelines/LATISS/DRP.yaml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pipelines/LATISS/DRP.yaml b/pipelines/LATISS/DRP.yaml
index 603cccdd..ac3a5643 100644
--- a/pipelines/LATISS/DRP.yaml
+++ b/pipelines/LATISS/DRP.yaml
@@ -135,10 +135,7 @@ subsets:
       - fgcmBuildFromIsolatedStars
       - fgcmFitCycle
       - fgcmOutputProducts
-      - transformSourceTable
-      - consolidateSourceTable
       - updateVisitSummary
-      - writeRecalibratedSourceTable
       - makeCcdVisitTable
       - makeVisitTable
     description: |
@@ -167,6 +164,8 @@ subsets:
       - forcedPhotCoadd
       - writeObjectTable
       - transformObjectTable
+      - selectGoodSeeingVisits
+      - templateGen
     description: |
       Tract-level coaddition tasks.
       Allowed data query constraints: instrument, skymap, tract.
@@ -181,8 +180,6 @@ subsets:
   step3b:
     subset:
       - consolidateObjectTable
-      - selectGoodSeeingVisits
-      - templateGen
     description: |
       Tract-level tasks.
       Allowed data query constraints: skymap, tract.
@@ -224,6 +221,8 @@ subsets:
       - detectAndMeasureDiaSources
       - transformDiaSourceCat
       - writeForcedSourceTable
+      - writeRecalibratedSourceTable
+      - transformSourceTable
     description: |
       Tasks that be run together, but only after the 'step1', 'step2', and
       'step3' subsets.
@@ -250,15 +249,14 @@ subsets:
       Tasks that can be run together, but only after the 'step1', 'step2',
       'step3', and 'step4' subsets.
 
-      This step includes patch-level aggregation Tasks. These should be run
-      with explicit 'tract' constraints in the data query, otherwise quanta
-      will be created for jobs with only partial visit coverage.
+      This step includes patch-level aggregation Tasks. 
       'consolidateForcedSourceTable' is a tract-level task that aggregates
       patches and should be rerun if any of the patches fail.
 
   step6:
     subset:
       - consolidateDiaSourceTable
+      - consolidateSourceTable
     description: |
       Tasks that can be run together, but only after the 'step1', 'step2',
       'step3', 'step4', and 'step5' subsets.