Skip to content

Commit

Permalink
Mark optional prerequisite inputs as such.
Browse files Browse the repository at this point in the history
Prerequisite inputs are now required by default, and checked during QG
generation, since that's what we want for the vast majority of them.
  • Loading branch information
TallJimbo committed Jun 17, 2021
1 parent 59c8028 commit bb5eb9c
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions python/lsst/ip/isr/isrTask.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ class IsrTaskConnections(pipeBase.PipelineTaskConnections,
storageClass="CrosstalkCalib",
dimensions=["instrument", "detector"],
isCalibration=True,
minimum=0, # can fall back to cameraGeom
)
# TODO: DM-25348. This does not work yet to correctly load
# possible crosstalk sources.
Expand All @@ -130,6 +131,7 @@ class IsrTaskConnections(pipeBase.PipelineTaskConnections,
deferLoad=True,
multiple=True,
lookupFunction=crosstalkSourceLookup,
minimum=0, # not needed for all instruments, no config to control this
)
bias = cT.PrerequisiteInput(
name="bias",
Expand Down Expand Up @@ -165,27 +167,31 @@ class IsrTaskConnections(pipeBase.PipelineTaskConnections,
storageClass="ExposureF",
dimensions=["instrument", "physical_filter", "detector"],
isCalibration=True,
minimum=0, # only needed for some bands, even when enabled
)
strayLightData = cT.PrerequisiteInput(
name='yBackground',
doc="Input stray light calibration.",
storageClass="StrayLightData",
dimensions=["instrument", "physical_filter", "detector"],
isCalibration=True,
minimum=0, # only needed for some bands, even when enabled
)
bfKernel = cT.PrerequisiteInput(
name='bfKernel',
doc="Input brighter-fatter kernel.",
storageClass="NumpyArray",
dimensions=["instrument"],
isCalibration=True,
minimum=0, # can use either bfKernel or newBFKernel
)
newBFKernel = cT.PrerequisiteInput(
name='brighterFatterKernel',
doc="Newer complete kernel + gain solutions.",
storageClass="BrighterFatterKernel",
dimensions=["instrument", "detector"],
isCalibration=True,
minimum=0, # can use either bfKernel or newBFKernel
)
defects = cT.PrerequisiteInput(
name='defects',
Expand All @@ -200,6 +206,7 @@ class IsrTaskConnections(pipeBase.PipelineTaskConnections,
doc="Linearity correction calibration.",
dimensions=["instrument", "detector"],
isCalibration=True,
minimum=0, # can fall back to cameraGeom
)
opticsTransmission = cT.PrerequisiteInput(
name="transmission_optics",
Expand Down Expand Up @@ -281,6 +288,10 @@ def __init__(self, *, config=None):
self.prerequisiteInputs.discard("dark")
if config.doFlat is not True:
self.prerequisiteInputs.discard("flat")
if config.doFringe is not True:
self.prerequisiteInputs.discard("fringe")
if config.doStrayLight is not True:
self.prerequisiteInputs.discard("strayLightData")
if config.usePtcGains is not True and config.usePtcReadNoise is not True:
self.prerequisiteInputs.discard("ptc")
if config.doAttachTransmissionCurve is not True:
Expand Down

0 comments on commit bb5eb9c

Please sign in to comment.