Skip to content

Commit

Permalink
Merge pull request #277 from lsst/tickets/DM-46358
Browse files Browse the repository at this point in the history
DM-46358: Add new IsrTaskLSST calibration pipelines for LSSTCam.
  • Loading branch information
erykoff authored Nov 8, 2024
2 parents 21a25a1 + ab5e499 commit 768468b
Show file tree
Hide file tree
Showing 37 changed files with 254 additions and 69 deletions.
12 changes: 10 additions & 2 deletions pipelines/LSSTCam/cpBfk.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
description: cp_pipe brighter-fatter kernel calibration construction.
description: cp_pipe LSSTCam brighter-fatter kernel calibration construction.
instrument: lsst.obs.lsst.LsstCam
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:
useEfdPhotodiodeData: false
doExtractPhotodiodeData: true
auxiliaryHeaderKeys: ["CCOBCURR", "CCOBFLUX", "TEMP6"]
matchExposuresType: FLUX
4 changes: 2 additions & 2 deletions pipelines/LSSTCam/cpBias.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
description: cp_pipe BIAS calibration construction
description: cp_pipe LSSTCam BIAS calibration construction
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpBias.yaml
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpBiasLSST.yaml
4 changes: 4 additions & 0 deletions pipelines/LSSTCam/cpBiasBootstrap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
description: LSSTCam bootstrap bias calibration construction
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpBiasBootstrapLSST.yaml
13 changes: 2 additions & 11 deletions pipelines/LSSTCam/cpCti.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
description: LSSTCam bias calibration construction
description: LSSTCam cti calibration construction
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpCti.yaml
tasks:
cpCtiIsr:
class: lsst.ip.isr.IsrTask
config:
overscan.fitType: "MEDIAN_PER_ROW"
# Skip the first five columns to remove CTI effects. Skip the
# last two in case those columns are noisy.
overscan.leadingColumnsToSkip: 5
overscan.trailingColumnsToSkip: 2
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpCtiLSST.yaml
7 changes: 1 addition & 6 deletions pipelines/LSSTCam/cpDark.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
description: cp_pipe DARK calibration construction
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpDark.yaml
tasks:
cpDarkIsr:
class: lsst.ip.isr.IsrTask
config:
doCrosstalk: false
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpDarkLSST.yaml
4 changes: 4 additions & 0 deletions pipelines/LSSTCam/cpDarkBootstrap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
description: LSSTCam bootstrap dark calibration construction
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpDarkBootstrapLSST.yaml
29 changes: 27 additions & 2 deletions pipelines/LSSTCam/cpDefects.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,29 @@
description: cp_pipe DEFECT calibration construction from combined images.
description: cp_pipe LSSTCam DEFECT calibration construction from combined images.
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpDefects.yaml
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpDefectsLSST.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
9 changes: 2 additions & 7 deletions pipelines/LSSTCam/cpFlat.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
description: cp_pipe FLAT calibration construction optimized for single-CCD cameras
description: cp_pipe LSSTCam flat calibration construction.
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFlat.yaml
tasks:
cpFlatIsr:
class: lsst.ip.isr.IsrTask
config:
doCrosstalk: false
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFlatLSST.yaml
4 changes: 4 additions & 0 deletions pipelines/LSSTCam/cpFlatBootstrap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
description: LSSTCam bootstrap flat construction
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFlatBootstrapLSST.yaml
4 changes: 2 additions & 2 deletions pipelines/LSSTCam/cpFlatSingleChip.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
description: cp_pipe FLAT calibration construction
description: cp_pipe LSSTCam FLAT calibration construction, optimized for a single chip.
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFlatSingleChip.yaml
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFlatSingleChipLSST.yaml
14 changes: 10 additions & 4 deletions pipelines/LSSTCam/cpLinearizer.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
description: cp_pipe linearity calibration construction.
description: cp_pipe LSSTCam linearity calibration construction.
instrument: lsst.obs.lsst.LsstCam
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:
useEfdPhotodiodeData: false
doExtractPhotodiodeData: true
auxiliaryHeaderKeys: ["CCOBCURR", "CCOBFLUX", "TEMP6"]
matchExposuresType: FLUX
cpLinearizerSolve:
class: lsst.cp.pipe.LinearitySolveTask
config:
linearityType: Spline
usePhotodiode: true
splineGroupingColumn: CCOBCURR
maxLinearAdu: 120000
splineFitTemperatureColumn: TEMP6
splineFitWeightParsStart: [7.2e-5, 1e-4]
doSplineFitWeights: false
doSplineFitTemperature: true
doSplineFitTemperature: false
minPhotodiodeCurrent: 3e-10
doSplineFitOffset: true
splineFitMaxIter: 40
Expand Down
2 changes: 1 addition & 1 deletion pipelines/LSSTCam/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 LSSTCam task to plot Photon Transfer Curve dataset
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpPlotPtc.yaml
9 changes: 2 additions & 7 deletions pipelines/LSSTCam/cpPtc.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
description: LSSTCam Photon-Transfer Curve calibration construction.
instrument: lsst.obs.lsst.LsstCam
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
cpPtcExtract:
class: lsst.cp.pipe.ptc.PhotonTransferCurveExtractTask
config:
edgeMaskLevel: AMP
numEdgeSuspect: 20
useEfdPhotodiodeData: false
doExtractPhotodiodeData: true
auxiliaryHeaderKeys: ["CCOBCURR", "CCOBFLUX", "TEMP6"]
matchExposuresType: FLUX
4 changes: 4 additions & 0 deletions pipelines/LSSTCam/cpPtcFixupGainRatios.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
description: cp_pipe LSSTCam ptc fixup.
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpPtcFixupGainRatios.yaml
4 changes: 4 additions & 0 deletions pipelines/LSSTCam/cpPtcRename.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
description: cp_pipe ptc renaming (LSSTCam).
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpPtcRename.yaml
4 changes: 2 additions & 2 deletions pipelines/LSSTCam/cpSky.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
description: Sky frame generation pipeline definition.
description: LSSTCam Sky frame generation pipeline definition.
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpSky.yaml
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpSkyLSST.yaml
tasks:
cpSkyImage:
class: lsst.cp.pipe.CpSkyImageTask
Expand Down
4 changes: 4 additions & 0 deletions pipelines/LSSTCam/legacy_202409/cpBfk.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
description: cp_pipe brighter-fatter kernel calibration construction.
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpBfk.yaml
4 changes: 4 additions & 0 deletions pipelines/LSSTCam/legacy_202409/cpBias.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
description: cp_pipe BIAS calibration construction
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpBias.yaml
File renamed without changes.
13 changes: 13 additions & 0 deletions pipelines/LSSTCam/legacy_202409/cpCti.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
description: LSSTCam bias calibration construction
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpCti.yaml
tasks:
cpCtiIsr:
class: lsst.ip.isr.IsrTask
config:
overscan.fitType: "MEDIAN_PER_ROW"
# Skip the first five columns to remove CTI effects. Skip the
# last two in case those columns are noisy.
overscan.leadingColumnsToSkip: 5
overscan.trailingColumnsToSkip: 2
9 changes: 9 additions & 0 deletions pipelines/LSSTCam/legacy_202409/cpDark.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
description: cp_pipe DARK calibration construction
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpDark.yaml
tasks:
cpDarkIsr:
class: lsst.ip.isr.IsrTask
config:
doCrosstalk: false
File renamed without changes.
4 changes: 4 additions & 0 deletions pipelines/LSSTCam/legacy_202409/cpDefects.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
description: cp_pipe DEFECT calibration construction from combined images.
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpDefects.yaml
File renamed without changes.
9 changes: 9 additions & 0 deletions pipelines/LSSTCam/legacy_202409/cpFlat.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
description: cp_pipe FLAT calibration construction optimized for single-CCD cameras
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFlat.yaml
tasks:
cpFlatIsr:
class: lsst.ip.isr.IsrTask
config:
doCrosstalk: false
4 changes: 4 additions & 0 deletions pipelines/LSSTCam/legacy_202409/cpFlatSingleChip.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
description: cp_pipe FLAT calibration construction
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpFlatSingleChip.yaml
File renamed without changes.
20 changes: 20 additions & 0 deletions pipelines/LSSTCam/legacy_202409/cpLinearizer.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
description: cp_pipe linearity calibration construction.
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpLinearizer.yaml
tasks:
cpLinearizerSolve:
class: lsst.cp.pipe.LinearitySolveTask
config:
linearityType: Spline
usePhotodiode: true
splineGroupingColumn: CCOBCURR
maxLinearAdu: 120000
splineFitTemperatureColumn: TEMP6
splineFitWeightParsStart: [7.2e-5, 1e-4]
doSplineFitWeights: false
doSplineFitTemperature: true
minPhotodiodeCurrent: 3e-10
doSplineFitOffset: true
splineFitMaxIter: 40
splineKnots: 15
4 changes: 4 additions & 0 deletions pipelines/LSSTCam/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.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpPlotPtc.yaml
17 changes: 17 additions & 0 deletions pipelines/LSSTCam/legacy_202409/cpPtc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
description: LSSTCam Photon-Transfer Curve calibration construction.
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpPtc.yaml
tasks:
cpPtcIsr:
class: lsst.ip.isr.IsrTask
config:
doCrosstalk: false
cpPtcExtract:
class: lsst.cp.pipe.ptc.PhotonTransferCurveExtractTask
config:
edgeMaskLevel: AMP
numEdgeSuspect: 20
doExtractPhotodiodeData: true
auxiliaryHeaderKeys: ["CCOBCURR", "CCOBFLUX", "TEMP6"]
matchExposuresType: FLUX
File renamed without changes.
15 changes: 15 additions & 0 deletions pipelines/LSSTCam/legacy_202409/cpSky.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
description: Sky frame generation pipeline definition.
instrument: lsst.obs.lsst.LsstCam
imports:
- location: $CP_PIPE_DIR/pipelines/_ingredients/cpSky.yaml
tasks:
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
6 changes: 6 additions & 0 deletions pipelines/_ingredients/cpLinearizerLSST.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ tasks:
splineKnots: 10
trimmedState: false
usePhotodiode: true
subsets:
cpLinearizerPtc:
subset:
- cpLinearizerIsr
- cpLinearizerPtcExtract
- cpLinearizerPtcSolve
contracts:
- cpLinearizerIsr.doBootstrap == True
- cpLinearizerPtcExtract.connections.inputExp == cpLinearizerIsr.connections.outputExposure
Expand Down
Loading

0 comments on commit 768468b

Please sign in to comment.