DM-48089: Add fgcmcal to LSSTComCam DRP.yaml

bps/resources/LSSTComCam/DRP.yaml

@@ -0,0 +1,17 @@
+# This BPS configuration snippet adds requestMemory values for DRP
+# and tasks.
+#
+# Use it by adding:
+#
+#   includeConfigs:
+#     - ${DRP_PIPE_DIR}/bps/resources/LSSTComCam/DRP.yaml
+#
+# (with no outer indentation) to your BPS config file.
+
+pipetask:
+  fgcmBuildFromIsolatedStars:
+    requestMemory: 16000
+  fgcmFitCycle:
+    requestCpus: 16
+    requestMemory: 32000
+    extraRunQuantumOptions: "-j 1 -n 16"

pipelines/LSSTComCam/DRP.yaml

@@ -2,10 +2,6 @@ description: DRP Pipeline for LSSTComCam
 instrument: lsst.obs.lsst.LsstComCam
 imports:
   - location: $DRP_PIPE_DIR/pipelines/_ingredients/LSSTComCam/DRP.yaml
-    exclude:
-      - fgcmBuildFromIsolatedStars
-      - fgcmFitCycle
-      - fgcmOutputProducts
 subsets:
   step1:
     subset:
@@ -47,6 +43,15 @@ subsets:
       gbdesAstrometricFit produces solutions per-tract, per-visit
       isolatedStarAssociation produces solutions per-tract.
       TODO: Evaluate GBDES after first DRP
+  step2c:
+    subset:
+      - fgcmBuildFromIsolatedStars
+      - fgcmFitCycle
+      - fgcmOutputProducts
+    description: |
+      This subset is the FGCM run that runs in "global" mode, which means
+      that one should only use an `instrument` and a `skymap` connection
+      (the latter of which links with the correct isolated star tables).
   step2d:
     subset:
       - finalizeCharacterization

pipelines/LSSTComCam/nightly-validation.yaml

@@ -14,6 +14,13 @@ imports:
       - fgcmOutputProducts
       - gbdesAstrometricFit
 tasks:
+  updateVisitSummary:
+    class: lsst.drp.tasks.update_visit_summary.UpdateVisitSummaryTask
+    config:
+      # Nightly validation should always keep these off.
+      wcs_provider: "input_summary"
+      photo_calib_provider: "input_summary"
+      background_provider: "input_summary"
   analyzePreSourceTableCore:
     class: lsst.analysis.tools.tasks.SourceTableVisitAnalysisTask
     config:

pipelines/_ingredients/LSSTComCam/DRP.yaml

@@ -34,11 +34,11 @@ tasks:
     class: lsst.fgcmcal.fgcmFitCycle.FgcmFitCycleTask
     config:
       doMultipleCycles: true
-      multipleCyclesFinalCycleNumber: 4
+      multipleCyclesFinalCycleNumber: 5
   fgcmOutputProducts:
     class: lsst.fgcmcal.fgcmOutputProducts.FgcmOutputProductsTask
     config:
-      connections.cycleNumber: 4
+      connections.cycleNumber: 5
   selectDeepCoaddVisits:
     class: lsst.pipe.tasks.selectImages.BestSeeingSelectVisitsTask
     config:
@@ -54,7 +54,7 @@ tasks:
       # TODO: Evaluate GBDES, SkyCorr, FGCM after initial DRP
       # Nightly validation should always keep these off.
       wcs_provider: "input_summary"
-      photo_calib_provider: "input_summary"
+      photo_calib_provider: "global"
       background_provider: "input_summary"
   reprocessVisitImage:
     class: lsst.drp.tasks.reprocess_visit_image.ReprocessVisitImageTask

tests/test_pipelines.py

@@ -638,6 +638,7 @@ def test_lsstcomcam_drp(self):
                 "#step1",
                 "#step2a",
                 "#step2b",
+                "#step2c",
                 "#step2d",
                 "#step2e",
                 "#step3a",
@@ -648,7 +649,7 @@ def test_lsstcomcam_drp(self):
                 "#step7",
             ],
             initial_dataset_types=REFCATS,
-            expected_inputs=COMMON_INPUTS | LSSTCOMCAM_INPUTS,
+            expected_inputs=COMMON_INPUTS | LSSTCOMCAM_INPUTS | {"fgcmLookUpTable"},
             expected_outputs=COMMON_OUTPUTS,
         )
         tester.run(butler, self)