Skip to content

Commit

Permalink
Merge branch 'tickets/DM-46425'
Browse files Browse the repository at this point in the history
  • Loading branch information
leeskelvin committed Sep 25, 2024
2 parents c662ba5 + ac82b95 commit be71bff
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 6 deletions.
10 changes: 8 additions & 2 deletions pipelines/DECam/DRP-Merian.yaml
Original file line number Diff line number Diff line change
@@ -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
37 changes: 37 additions & 0 deletions pipelines/DECam/isrForCrosstalkSources.yaml
Original file line number Diff line number Diff line change
@@ -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.
11 changes: 7 additions & 4 deletions tests/test_pipelines.py
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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"),
[
Expand Down

0 comments on commit be71bff

Please sign in to comment.