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.

Sign up for GitHub

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

Jump to bottom

DM-22661: isrTask failed to find master flat due to filter difference #122

Merged
merged 1 commit into from
Jan 10, 2020
Merged

DM-22661: isrTask failed to find master flat due to filter difference #122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 23 additions & 3 deletions python/lsst/ip/isr/isrTask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,11 @@ class IsrTaskConfig(pipeBase.PipelineTaskConfig,
doc="Fallback default filter name for calibrations.",
optional=True
)
useFallbackDate = pexConfig.Field(
dtype=bool,
doc="Pass observation date when using fallback filter.",
default=False,
)
expectWcs = pexConfig.Field(
dtype=bool,
default=True,
Expand Down Expand Up @@ -901,6 +906,13 @@ def readIsrData(self, dataRef, rawExposure):
NotImplementedError :
Raised if a per-amplifier brighter-fatter kernel is requested by the configuration.
"""
try:
dateObs = rawExposure.getInfo().getVisitInfo().getDate()
dateObs = dateObs.toPython().isoformat()
except RuntimeError:
self.log.warn("Unable to identify dateObs for rawExposure.")
dateObs = None

ccd = rawExposure.getDetector()
filterName = afwImage.Filter(rawExposure.getFilter().getId()).getName() # Canonical name for filter
rawExposure.mask.addMaskPlane("UNMASKEDNAN") # needed to match pre DM-15862 processing.
Expand All @@ -913,7 +925,8 @@ def readIsrData(self, dataRef, rawExposure):
if self.config.doCrosstalk else None)
darkExposure = (self.getIsrExposure(dataRef, self.config.darkDataProductName)
if self.config.doDark else None)
flatExposure = (self.getIsrExposure(dataRef, self.config.flatDataProductName)
flatExposure = (self.getIsrExposure(dataRef, self.config.flatDataProductName,
dateObs=dateObs)
if self.config.doFlat else None)

brighterFatterKernel = None
Expand Down Expand Up @@ -1501,7 +1514,7 @@ def runDataRef(self, sensorRef):

return result

def getIsrExposure(self, dataRef, datasetType, immediate=True):
def getIsrExposure(self, dataRef, datasetType, dateObs=None, immediate=True):
"""!Retrieve a calibration dataset for removing instrument signature.

Parameters
Expand All @@ -1512,6 +1525,9 @@ def getIsrExposure(self, dataRef, datasetType, immediate=True):
for.
datasetType : `str`
Type of dataset to retrieve (e.g. 'bias', 'flat', etc).
dateObs : `str`, optional
Date of the observation. Used to correct butler failures
when using fallback filters.
immediate : `Bool`
If True, disable butler proxies to enable error handling
within this routine.
Expand All @@ -1532,7 +1548,11 @@ def getIsrExposure(self, dataRef, datasetType, immediate=True):
if not self.config.fallbackFilterName:
raise RuntimeError("Unable to retrieve %s for %s: %s." % (datasetType, dataRef.dataId, exc1))
try:
exp = dataRef.get(datasetType, filter=self.config.fallbackFilterName, immediate=immediate)
if self.config.useFallbackDate and dateObs:
exp = dataRef.get(datasetType, filter=self.config.fallbackFilterName,
dateObs=dateObs, immediate=immediate)
else:
exp = dataRef.get(datasetType, filter=self.config.fallbackFilterName, immediate=immediate)
except Exception as exc2:
raise RuntimeError("Unable to retrieve %s for %s, even with fallback filter %s: %s AND %s." %
(datasetType, dataRef.dataId, self.config.fallbackFilterName, exc1, exc2))
Expand Down