Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM-46356: Create new calibration pipelines for IsrTaskLSST for LATISS #267

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions pipelines/LATISS/cpBfk.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
description: Latiss Brighter-Fatter kernel calibration construction.
description: LATISS Brighter-Fatter kernel calibration construction.
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpBfk.yaml
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpBfkLSST.yaml
tasks:
cpBfkPtcExtract:
class: lsst.cp.pipe.ptc.PhotonTransferCurveExtractTask
config:
# Limit the covariance range unless we get a super-dense
# PTC run for LATISS.
maximumRangeCovariancesAstier: 8
efdSalIndex: 201
cpBfkPtcSolve:
class: lsst.cp.pipe.ptc.PhotonTransferCurveSolveTask
config:
maximumRangeCovariancesAstier: 8
maximumRangeCovariancesAstierFullCovFit: 8
10 changes: 4 additions & 6 deletions pipelines/LATISS/cpBias.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
description: Latiss bias calibration construction
description: LATISS bias calibration construction
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpBias.yaml
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpBiasLSST.yaml
tasks:
cpBiasIsr:
class: lsst.ip.isr.IsrTask
class: lsst.ip.isr.IsrTaskLSST
config:
overscan.fitType: 'MEDIAN_PER_ROW'
doDefect: false
doCrosstalk: true
crosstalk.doQuadraticCrosstalkCorrection: false
4 changes: 4 additions & 0 deletions pipelines/LATISS/cpBiasBootstrap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
description: LATISS bootstrap bias calibration construction
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpBiasBootstrapLSST.yaml
14 changes: 4 additions & 10 deletions pipelines/LATISS/cpDark.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
# Note that if you edit this file you may also need to edit
# cpDarkForDefects.yaml.
description: Latiss dark calibration construction
description: LATISS dark calibration construction
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpDark.yaml
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpDarkLSST.yaml
tasks:
cpDarkIsr:
class: lsst.ip.isr.IsrTask
class: lsst.ip.isr.IsrTaskLSST
config:
overscan.fitType: 'MEDIAN_PER_ROW'
doLinearize: false
doCrosstalk: true
# This is necessary for cosmic ray rejection.
doDefect: true
crosstalk.doQuadraticCrosstalkCorrection: false
4 changes: 4 additions & 0 deletions pipelines/LATISS/cpDarkBootstrap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
description: LATISS bootstrap dark calibration construction
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpDarkBootstrapLSST.yaml
4 changes: 2 additions & 2 deletions pipelines/LATISS/cpDefects.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
description: cp_pipe DEFECT calibration construction from combined images.
description: cp_pipe LATISS defect calibration construction.
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpDefects.yaml
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpDefectsLSST.yaml
tasks:
cpMeasureBiasDefects:
class: lsst.cp.pipe.MeasureDefectsCombinedTask
Expand Down
11 changes: 2 additions & 9 deletions pipelines/LATISS/cpFilterScan.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
description: Latiss filter scan construction
description: LATISS filter scan construction
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFilterScan.yaml
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFilterScanLSST.yaml
tasks:
cpFilterScanIsr:
class: lsst.ip.isr.IsrTask
config:
connections.outputExposure: 'cpFilterScanIsrExp'
overscan.fitType: 'MEDIAN_PER_ROW'
doLinearize: false
doCrosstalk: false
cpFilterScanMerge:
class: lsst.cp.pipe.CpFilterScanTask
config:
Expand Down
10 changes: 4 additions & 6 deletions pipelines/LATISS/cpFlat.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
description: Latiss flat calibration construction
description: LATISS flat calibration construction
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFlatSingleChip.yaml
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFlatSingleChipLSST.yaml
tasks:
cpFlatIsr:
class: lsst.ip.isr.IsrTask
class: lsst.ip.isr.IsrTaskLSST
config:
overscan.fitType: "MEDIAN_PER_ROW"
doLinearize: false
doCrosstalk: true
crosstalk.doQuadraticCrosstalkCorrection: false
4 changes: 4 additions & 0 deletions pipelines/LATISS/cpFlatBootstrap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
description: LATISS bootstrap flat construction
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFlatBootstrapSingleChipLSST.yaml
10 changes: 4 additions & 6 deletions pipelines/LATISS/cpFlatSingleChip.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
description: cp_pipe FLAT calibration construction
description: LATISS flat calibration construction
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFlatSingleChip.yaml
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFlatSingleChipLSST.yaml
tasks:
cpFlatIsr:
class: lsst.ip.isr.IsrTask
class: lsst.ip.isr.IsrTaskLSST
config:
overscan.fitType: "MEDIAN_PER_ROW"
doLinearize: false
doCrosstalk: true
crosstalk.doQuadraticCrosstalkCorrection: false
11 changes: 7 additions & 4 deletions pipelines/LATISS/cpLinearizer.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
description: cp_pipe linearity calibration construction.
description: cp_pipe LATISS linearizer calibration construction.
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpLinearizer.yaml
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpLinearizerLSST.yaml
tasks:
cpLinearizerPtcExtract:
class: lsst.cp.pipe.ptc.PhotonTransferCurveExtractTask
config:
efdSalIndex: 201
cpLinearizerSolve:
class: lsst.cp.pipe.LinearitySolveTask
config:
linearityType: Spline
splineKnots: 10
maxLinearAdu: 120000
usePhotodiode: false
2 changes: 1 addition & 1 deletion pipelines/LATISS/cpPlotPtc.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
description: cp_pipe task to plot Photon Transfer Curve dataset
description: cp_pipe LATISS task to plot Photon Transfer Curve dataset
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpPlotPtc.yaml
15 changes: 3 additions & 12 deletions pipelines/LATISS/cpPtc.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
description: Latiss Photon-Transfer Curve calibration construction.
description: LATISS Photon-Transfer Curve calibration construction.
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpPtc.yaml
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpPtcLSST.yaml
tasks:
cpPtcIsr:
class: lsst.ip.isr.IsrTask
config:
doCrosstalk: false
doDefect: true
cpPtcExtract:
class: lsst.cp.pipe.ptc.PhotonTransferCurveExtractTask
config:
matchExposuresType: TIME
cpPtcSolve:
class: lsst.cp.pipe.ptc.PhotonTransferCurveSolveTask
config:
ptcFitType: EXPAPPROXIMATION
efdSalIndex: 201
11 changes: 4 additions & 7 deletions pipelines/LATISS/cpSky.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
description: Sky frame generation pipeline definition.
description: Sky frame generation for LATISS pipeline.
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpSky.yaml
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpSkyLSST.yaml
tasks:
cpSkyIsr:
class: lsst.ip.isr.isrTask.IsrTask
class: lsst.ip.isr.IsrTaskLSST
config:
overscan.fitType: "MEDIAN_PER_ROW"
doLinearize: false
doCrosstalk: true
doBrighterFatter: false
crosstalk.doQuadraticCrosstalkCorrection: false
cpSkyImage:
class: lsst.cp.pipe.CpSkyImageTask
config:
Expand Down
4 changes: 4 additions & 0 deletions pipelines/LATISS/legacy_202409/cpBfk.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
description: Latiss Brighter-Fatter kernel calibration construction.
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpBfk.yaml
11 changes: 11 additions & 0 deletions pipelines/LATISS/legacy_202409/cpBias.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
description: Latiss bias calibration construction
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpBias.yaml
tasks:
cpBiasIsr:
class: lsst.ip.isr.IsrTask
config:
overscan.fitType: 'MEDIAN_PER_ROW'
doDefect: false
doCrosstalk: true
File renamed without changes.
15 changes: 15 additions & 0 deletions pipelines/LATISS/legacy_202409/cpDark.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Note that if you edit this file you may also need to edit
# cpDarkForDefects.yaml.
description: Latiss dark calibration construction
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpDark.yaml
tasks:
cpDarkIsr:
class: lsst.ip.isr.IsrTask
config:
overscan.fitType: 'MEDIAN_PER_ROW'
doLinearize: false
doCrosstalk: true
# This is necessary for cosmic ray rejection.
doDefect: true
29 changes: 29 additions & 0 deletions pipelines/LATISS/legacy_202409/cpDefects.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
description: cp_pipe DEFECT calibration construction from combined images.
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpDefects.yaml
tasks:
cpMeasureBiasDefects:
class: lsst.cp.pipe.MeasureDefectsCombinedTask
config:
badPixelsToFillColumnThreshold: 1000
saturatedPixelsToFillColumnThreshold: 20
saturatedColumnDilationRadius: 2
cpMeasureDarkDefects:
class: lsst.cp.pipe.MeasureDefectsCombinedTask
config:
thresholdType: "VALUE"
darkCurrentThreshold: 3.0
badPixelsToFillColumnThreshold: 1000
saturatedPixelsToFillColumnThreshold: 20
saturatedColumnDilationRadius: 2
cpMeasureFlatDefects:
class: lsst.cp.pipe.MeasureDefectsCombinedWithFilterTask
config:
thresholdType: "VALUE"
fracThresholdFlat: 0.9
badPixelsToFillColumnThreshold: 1000
cpMergeDefects:
class: lsst.cp.pipe.MergeDefectsCombinedTask
config:
edgesAsDefects: true
16 changes: 16 additions & 0 deletions pipelines/LATISS/legacy_202409/cpFilterScan.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
description: Latiss filter scan construction
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFilterScan.yaml
tasks:
cpFilterScanIsr:
class: lsst.ip.isr.IsrTask
config:
connections.outputExposure: 'cpFilterScanIsrExp'
overscan.fitType: 'MEDIAN_PER_ROW'
doLinearize: false
doCrosstalk: false
cpFilterScanMerge:
class: lsst.cp.pipe.CpFilterScanTask
config:
referenceFilter: 'empty~empty'
11 changes: 11 additions & 0 deletions pipelines/LATISS/legacy_202409/cpFlat.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
description: Latiss flat calibration construction
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFlatSingleChip.yaml
tasks:
cpFlatIsr:
class: lsst.ip.isr.IsrTask
config:
overscan.fitType: "MEDIAN_PER_ROW"
doLinearize: false
doCrosstalk: true
11 changes: 11 additions & 0 deletions pipelines/LATISS/legacy_202409/cpFlatSingleChip.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
description: cp_pipe FLAT calibration construction
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFlatSingleChip.yaml
tasks:
cpFlatIsr:
class: lsst.ip.isr.IsrTask
config:
overscan.fitType: "MEDIAN_PER_ROW"
doLinearize: false
doCrosstalk: true
11 changes: 11 additions & 0 deletions pipelines/LATISS/legacy_202409/cpLinearizer.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
description: cp_pipe linearity calibration construction.
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpLinearizer.yaml
tasks:
cpLinearizerSolve:
class: lsst.cp.pipe.LinearitySolveTask
config:
linearityType: Spline
splineKnots: 10
maxLinearAdu: 120000
4 changes: 4 additions & 0 deletions pipelines/LATISS/legacy_202409/cpPlotPtc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
description: cp_pipe task to plot Photon Transfer Curve dataset
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpPlotPtc.yaml
18 changes: 18 additions & 0 deletions pipelines/LATISS/legacy_202409/cpPtc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
description: Latiss Photon-Transfer Curve calibration construction.
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpPtc.yaml
tasks:
cpPtcIsr:
class: lsst.ip.isr.IsrTask
config:
doCrosstalk: false
doDefect: true
cpPtcExtract:
class: lsst.cp.pipe.ptc.PhotonTransferCurveExtractTask
config:
matchExposuresType: TIME
cpPtcSolve:
class: lsst.cp.pipe.ptc.PhotonTransferCurveSolveTask
config:
ptcFitType: EXPAPPROXIMATION
22 changes: 22 additions & 0 deletions pipelines/LATISS/legacy_202409/cpSky.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
description: Sky frame generation pipeline definition.
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpSky.yaml
tasks:
cpSkyIsr:
class: lsst.ip.isr.isrTask.IsrTask
config:
overscan.fitType: "MEDIAN_PER_ROW"
doLinearize: false
doCrosstalk: true
doBrighterFatter: false
cpSkyImage:
class: lsst.cp.pipe.CpSkyImageTask
config:
# These values roughly equate to the dimensions of a single detector.
# As noted below, the sizes are in millimeters, and correspond to a
# background image of 4096*4096 pixels (4096*0.01=40.96).
# TODO: Revise these values on DM-43321.
largeScaleBackground.xSize: 40.96 # in mm
largeScaleBackground.ySize: 40.96 # in mm
largeScaleBackground.pixelSize: 0.01 # in mm per pixel
4 changes: 4 additions & 0 deletions pipelines/LATISS/legacy_202409/cpSpectroFlat.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
description: Sky frame generation pipeline definition.
instrument: lsst.obs.lsst.Latiss
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpSpectroFlat.yaml
13 changes: 9 additions & 4 deletions tests/test_pipelines.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,16 @@ def test_cameras(self):
@unittest.skipIf(not has_obs_lsst, reason="Cannot test LATISS pipelines without obs_lsst")
def test_latiss_pipelines(self):
for pipeline in self._get_pipelines(exclude=[
# The following two tasks are not part of the new pipelines.
"cpDarkForDefects.yaml",
"cpDefectsIndividual.yaml",
# The following task is not defined for LATISS.
"cpMonochromatorScan.yaml",
# TODO DM-46356: Remove following from exclusion list.
"cpBiasBootstrap.yaml",
"cpDarkBootstrap.yaml",
"cpFlatBootstrap.yaml",
# The following tasks will be added in the future.
"cpCrosstalk.yaml",
"cpFringe.yaml",
# TODO: DM-46426
"cpCti.yaml",
]):
self._check_pipeline(os.path.join(self.pipeline_path, "LATISS", pipeline))

Expand Down
Loading