Skip to content

Commit

Permalink
Respond to review comments
Browse files Browse the repository at this point in the history
Update the dataset name for the kernel
Change CCD to DETECTOR
Add comment about implementint per-detector correction
  • Loading branch information
mfisherlevine committed Sep 5, 2018
1 parent c561fd9 commit 80d1a86
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions python/lsst/ip/isr/isrTask.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,10 @@ class IsrTaskConfig(pexConfig.Config):
)
brighterFatterLevel = pexConfig.ChoiceField(
doc="The level at which to correct for brighter-fatter",
dtype=str, default="CCD",
dtype=str, default="DETECTOR",
allowed={
"AMP": "Every amplifier treated separately",
"CCD": "One kernel per CCD",
"DETECTOR": "One kernel per detector",
}
)
brighterFatterKernelFile = pexConfig.Field(
Expand Down Expand Up @@ -436,7 +436,7 @@ def readIsrData(self, dataRef, rawExposure):
if self.config.doDark else None
flatExposure = self.getIsrExposure(dataRef, self.config.flatDataProductName) \
if self.config.doFlat else None
brighterFatterKernel = dataRef.get("bfKernelNew") if self.config.doBrighterFatter else None
brighterFatterKernel = dataRef.get("brighterFatterKernelNew") if self.config.doBrighterFatter else None
defectList = dataRef.get("defects") if self.config.doDefect else None

if self.config.doCrosstalk:
Expand Down Expand Up @@ -593,9 +593,10 @@ def run(self, ccdExposure, bias=None, linearizer=None, dark=None, flat=None, def
self.maskAndInterpNan(ccdExposure)
interpolationDone = True

if self.config.brighterFatterLevel == 'CCD':
if self.config.brighterFatterLevel == 'DETECTOR':
bfKernel = bfKernel[ccdExposure.getDetector().getId()]
else:
# TODO: DM-15631 for implementing this
raise NotImplementedError("per-amplifier brighter-fatter correction not yet implemented")
self.brighterFatterCorrection(ccdExposure, bfKernel,
self.config.brighterFatterMaxIter,
Expand Down

0 comments on commit 80d1a86

Please sign in to comment.