From af9b1eb4d5879b156d318811ee7038bb9f3b62bd Mon Sep 17 00:00:00 2001
From: Lee Kelvin <lkelvin@astro.princeton.edu>
Date: Tue, 24 Sep 2024 10:38:32 -0700
Subject: [PATCH 1/2] Move DECam precursor step to its own pipeline

---
 pipelines/DECam/DRP-Merian.yaml             | 10 ++++--
 pipelines/DECam/isrForCrosstalkSources.yaml | 37 +++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 pipelines/DECam/isrForCrosstalkSources.yaml

diff --git a/pipelines/DECam/DRP-Merian.yaml b/pipelines/DECam/DRP-Merian.yaml
index 5a9f9b3d..77e221e1 100644
--- a/pipelines/DECam/DRP-Merian.yaml
+++ b/pipelines/DECam/DRP-Merian.yaml
@@ -1,6 +1,12 @@
 description: |
   The DRP pipeline specialized for the DECam instrument, developed against the
   Merian dataset.
+
+  Prior to running subsets or tasks in this pipeline, the DECam prerequisite
+  task isrForCrosstalkSources must be run. More information on that task can be
+  found in the isrForCrosstalkSources.yaml pipeline file.
 imports:
-  - $DRP_PIPE_DIR/pipelines/_ingredients/DECam/DRP.yaml
-  - $ANALYSIS_DRP_DIR/pipelines/analysis_drp_plots.yaml
+  - location: $DRP_PIPE_DIR/pipelines/_ingredients/DECam/DRP.yaml
+    exclude:
+      - isrForCrosstalkSources
+  - location: $ANALYSIS_DRP_DIR/pipelines/analysis_drp_plots.yaml
diff --git a/pipelines/DECam/isrForCrosstalkSources.yaml b/pipelines/DECam/isrForCrosstalkSources.yaml
new file mode 100644
index 00000000..99f21568
--- /dev/null
+++ b/pipelines/DECam/isrForCrosstalkSources.yaml
@@ -0,0 +1,37 @@
+description: |
+  The DECam prerequisite task isrForCrosstalkSources.
+
+  The isrForCrosstalkSources task generates crosstalk sources for
+  ISR/inter-chip crosstalk by applying overscan correction on raw frames. A new
+  dataset is written, which should be used as an input for further DECam data
+  processing.
+
+  This task is intended to be run once, prior to initial data processing.
+instrument: lsst.obs.decam.DarkEnergyCamera
+tasks:
+  isrForCrosstalkSources:
+    class: lsst.ip.isr.IsrTask
+    config:
+      connections.outputExposure: overscanRaw
+      doOverscan: true
+      doAssembleCcd: false
+      doBias: false
+      doCrosstalk: false
+      doVariance: false
+      doLinearize: false
+      doDefect: false
+      doNanMasking: false
+      doDark: false
+      doFlat: false
+      doFringe: false
+      doInterpolate: false
+subsets:
+  step0:
+    subset:
+      - isrForCrosstalkSources
+    description: |
+      Tasks which should be run once, prior to initial data processing.
+
+      This step generates crosstalk sources for ISR/inter-chip crosstalk by
+      applying overscan correction on raw frames. A new dataset is written,
+      which should be used as an input for further data processing.

From ac82b9536fcbf92001f083e821664ea35272bf1b Mon Sep 17 00:00:00 2001
From: Lee Kelvin <lkelvin@astro.princeton.edu>
Date: Tue, 24 Sep 2024 11:49:46 -0700
Subject: [PATCH 2/2] Update test_pipelines unit testing for new format

---
 tests/test_pipelines.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/test_pipelines.py b/tests/test_pipelines.py
index bc1b3cad..b49db427 100644
--- a/tests/test_pipelines.py
+++ b/tests/test_pipelines.py
@@ -230,10 +230,10 @@ def makeButler(self, **kwargs: Any) -> Butler:
         DatastoreMock.apply(butler)
         return butler
 
-    def test_decam_drp_merian(self):
+    def test_decam_isrForCrosstalkSources(self):
         butler = self.makeButler(writeable=True)
-        tester0 = PipelineStepTester(
-            os.path.join(PIPELINES_DIR, "DECam", "DRP-Merian.yaml"),
+        tester = PipelineStepTester(
+            os.path.join(PIPELINES_DIR, "DECam", "isrForCrosstalkSources.yaml"),
             ["#step0"],
             [
                 ("ps1_pv3_3pi_20170110", {"htm7"}, "SimpleCatalog", False),
@@ -246,7 +246,10 @@ def test_decam_drp_merian(self):
             },
             expected_outputs={"overscanRaw"},
         )
-        tester0.run(butler, self)
+        tester.run(butler, self)
+
+    def test_decam_drp_merian(self):
+        butler = self.makeButler(writeable=True)
         tester = PipelineStepTester(
             os.path.join(PIPELINES_DIR, "DECam", "DRP-Merian.yaml"),
             [