Merge pull request #209 from lsst/tickets/DM-47750

DM-47750: Disable brighter fatter in AP's ISR
lsst · Nov 22, 2024 · 0f112a4 · 0f112a4
2 parents eb1ecc6 + 3e42419
commit 0f112a4
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 19 deletions.
diff --git a/pipelines/LATISS/ApPipe.yaml b/pipelines/LATISS/ApPipe.yaml
@@ -4,7 +4,4 @@ description: |
   which is used in realtime Prompt Processing production.
 instrument: lsst.obs.lsst.Latiss
 imports:
-  - location: $AP_PIPE_DIR/pipelines/_ingredients/ApPipe.yaml
-
-tasks:
-  isr: lsst.ip.isr.IsrTaskLSST
+  - location: $AP_PIPE_DIR/pipelines/_ingredients/ApPipeWithIsrTaskLSST.yaml
diff --git a/pipelines/LATISS/SingleFrame.yaml b/pipelines/LATISS/SingleFrame.yaml
@@ -3,6 +3,4 @@ description: >-
   no templates exist, specialized for LATISS
 instrument: lsst.obs.lsst.Latiss
 imports:
-  - location: $AP_PIPE_DIR/pipelines/_ingredients/SingleFrame.yaml
-tasks:
-  isr: lsst.ip.isr.IsrTaskLSST
+  - location: $AP_PIPE_DIR/pipelines/_ingredients/SingleFrameWithIsrTaskLSST.yaml
diff --git a/pipelines/LSSTComCam/ApPipe.yaml b/pipelines/LSSTComCam/ApPipe.yaml
@@ -4,13 +4,12 @@ description: |
   which is used in realtime Prompt Processing production.
 instrument: lsst.obs.lsst.LsstComCam
 imports:
-  - location: $AP_PIPE_DIR/pipelines/_ingredients/ApPipe.yaml
+  - location: $AP_PIPE_DIR/pipelines/_ingredients/ApPipeWithIsrTaskLSST.yaml
     exclude:
       # turn off R/B analysis to save processing time
       - rbClassify
 
 tasks:
-  isr: lsst.ip.isr.IsrTaskLSST
   transformDiaSrcCat:
     class: lsst.ap.association.TransformDiaSourceCatalogTask
     config:

diff --git a/pipelines/LSSTComCam/SingleFrame.yaml b/pipelines/LSSTComCam/SingleFrame.yaml
@@ -3,6 +3,4 @@ description: >-
   no templates exist, specialized for LSSTComCam
 instrument: lsst.obs.lsst.LsstComCam
 imports:
-  - location: $AP_PIPE_DIR/pipelines/_ingredients/SingleFrame.yaml
-tasks:
-  isr: lsst.ip.isr.IsrTaskLSST
+  - location: $AP_PIPE_DIR/pipelines/_ingredients/SingleFrameWithIsrTaskLSST.yaml
diff --git a/pipelines/LSSTComCamSim/ApPipe.yaml b/pipelines/LSSTComCamSim/ApPipe.yaml
@@ -4,13 +4,12 @@ description: |
   which is used in realtime Prompt Processing production.
 instrument: lsst.obs.lsst.LsstComCamSim
 imports:
-  - location: $AP_PIPE_DIR/pipelines/_ingredients/ApPipe.yaml
+  - location: $AP_PIPE_DIR/pipelines/_ingredients/ApPipeWithIsrTaskLSST.yaml
     exclude:
       # turn off R/B analysis to save processing time
       - rbClassify
 
 tasks:
-  isr: lsst.ip.isr.IsrTaskLSST
   transformDiaSrcCat:
     class: lsst.ap.association.TransformDiaSourceCatalogTask
     config:

diff --git a/pipelines/LSSTComCamSim/SingleFrame.yaml b/pipelines/LSSTComCamSim/SingleFrame.yaml
@@ -3,7 +3,4 @@ description: >-
   no templates exist, specialized for LSSTComCamSim
 instrument: lsst.obs.lsst.LsstComCamSim
 imports:
-  - location: $AP_PIPE_DIR/pipelines/_ingredients/SingleFrame.yaml
-tasks:
-  isr: lsst.ip.isr.IsrTaskLSST
-
+  - location: $AP_PIPE_DIR/pipelines/_ingredients/SingleFrameWithIsrTaskLSST.yaml
diff --git a/pipelines/_ingredients/ApPipeWithIsrTaskLSST.yaml b/pipelines/_ingredients/ApPipeWithIsrTaskLSST.yaml
@@ -0,0 +1,12 @@
+description: End to end Alert Production pipeline with IsrTaskLSST.
+
+imports:
+  - $AP_PIPE_DIR/pipelines/_ingredients/ApPipe.yaml
+
+tasks:
+  isr:
+    class: lsst.ip.isr.IsrTaskLSST
+    config:
+      # Some instruments have this already in obs_lsst.
+      # Here we turn if off for AP generally.
+      doBrighterFatter: False
diff --git a/pipelines/_ingredients/ProcessCcd.yaml b/pipelines/_ingredients/ProcessCcd.yaml
@@ -7,7 +7,10 @@ description: ProcessCcd - A set of tasks to run when processing raw images.
 # pipeline, e.g., $AP_PIPE_DIR/pipelines/$CAMERA/ProcessCcd.yaml.
 
 tasks:
-  isr: lsst.ip.isr.IsrTask
+  isr:
+    class: lsst.ip.isr.IsrTask
+    config:
+      doBrighterFatter: False
   calibrateImage:
     class: lsst.pipe.tasks.calibrateImage.CalibrateImageTask
 subsets:

diff --git a/pipelines/_ingredients/SingleFrameWithIsrTaskLSST.yaml b/pipelines/_ingredients/SingleFrameWithIsrTaskLSST.yaml
@@ -0,0 +1,12 @@
+description: Single-frame pipeline with IsrTaskLSST
+
+imports:
+  - location: $AP_PIPE_DIR/pipelines/_ingredients/SingleFrame.yaml
+
+tasks:
+  isr:
+    class: lsst.ip.isr.IsrTaskLSST
+    config:
+      # Some instruments have this already in obs_lsst.
+      # Here we turn if off for AP generally.
+      doBrighterFatter: False