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-26615: remove afw filter wavelength dependence from DCR model #425

Merged
merged 2 commits into from
Nov 4, 2020
Merged

DM-26615: remove afw filter wavelength dependence from DCR model #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82202e9
Remove afw filter dependence from DcrModel
isullivan Oct 28, 2020
40eb44b
Add validation check to all of the configs used in the tests.
isullivan Oct 28, 2020
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
38 changes: 27 additions & 11 deletions python/lsst/pipe/tasks/dcrAssembleCoadd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,18 @@ class DcrAssembleCoaddConfig(CompareWarpAssembleCoaddConfig,
target=MeasurePsfTask,
doc="Task to measure the PSF of the coadd, if ``doCalculatePsf`` is set.",
)
effectiveWavelength = pexConfig.Field(
doc="Effective wavelength of the filter, in nm."
"Required if transmission curves aren't used."
"Support for using transmission curves is to be added in DM-13668.",
dtype=float,
)
bandwidth = pexConfig.Field(
doc="Bandwidth of the physical filter, in nm."
"Required if transmission curves aren't used."
"Support for using transmission curves is to be added in DM-13668.",
dtype=float,
)

def setDefaults(self):
CompareWarpAssembleCoaddConfig.setDefaults(self)
Expand Down Expand Up @@ -520,10 +532,6 @@ def prepareDcrInputs(self, templateCoadd, warpRefList, weightList):
"""
sigma2fwhm = 2.*np.sqrt(2.*np.log(2.))
filterInfo = templateCoadd.getFilter()
if np.isnan(filterInfo.getFilterProperty().getLambdaMin()):
raise NotImplementedError("No minimum/maximum wavelength information found"
" in the filter definition! Please add lambdaMin and lambdaMax"
" to the Mapper class in your obs package.")
tempExpName = self.getTempExpDatasetName(self.warpType)
dcrShifts = []
airmassDict = {}
Expand All @@ -548,7 +556,9 @@ def prepareDcrInputs(self, templateCoadd, warpRefList, weightList):
if self.config.doAirmassWeight:
weightList[visitNum] *= airmass
dcrShifts.append(np.max(np.abs(calculateDcr(visitInfo, templateCoadd.getWcs(),
filterInfo, self.config.dcrNumSubfilters))))
self.config.effectiveWavelength,
self.config.bandwidth,
self.config.dcrNumSubfilters))))
self.log.info("Selected airmasses:\n%s", airmassDict)
self.log.info("Selected parallactic angles:\n%s", angleDict)
self.log.info("Selected PSF sizes:\n%s", psfSizeDict)
Expand All @@ -561,6 +571,8 @@ def prepareDcrInputs(self, templateCoadd, warpRefList, weightList):
psf = templateCoadd.getPsf()
dcrModels = DcrModel.fromImage(templateCoadd.maskedImage,
self.config.dcrNumSubfilters,
effectiveWavelength=self.config.effectiveWavelength,
bandwidth=self.config.bandwidth,
filterInfo=filterInfo,
psf=psf)
return dcrModels
Expand Down Expand Up @@ -773,7 +785,8 @@ def calculateNImage(self, dcrModels, bbox, warpRefList, spanSetMaskList, statsCt
weightImage[(mask.array & statsCtrl.getAndMask()) == 0] = 1.
# The weights must be shifted in exactly the same way as the residuals,
# because they will be used as the denominator in the weighted average of residuals.
weightsGenerator = self.dcrResiduals(weightImage, visitInfo, wcs, dcrModels.filter)
weightsGenerator = self.dcrResiduals(weightImage, visitInfo, wcs,
dcrModels.effectiveWavelength, dcrModels.bandwidth)
for shiftedWeights, dcrNImage, dcrWeight in zip(weightsGenerator, dcrNImages, dcrWeights):
dcrNImage.array += np.rint(shiftedWeights).astype(dcrNImage.array.dtype)
dcrWeight.array += shiftedWeights
Expand Down Expand Up @@ -851,7 +864,9 @@ def dcrAssembleSubregion(self, dcrModels, subExposures, bbox, dcrBBox, warpRefLi
# The residuals are stored as a list of generators.
# This allows the residual for a given subfilter and exposure to be created
# on the fly, instead of needing to store them all in memory.
residualGeneratorList.append(self.dcrResiduals(residual, visitInfo, wcs, dcrModels.filter))
residualGeneratorList.append(self.dcrResiduals(residual, visitInfo, wcs,
dcrModels.effectiveWavelength,
dcrModels.bandwidth))

dcrSubModelOut = self.newModelFromResidual(dcrModels, residualGeneratorList, dcrBBox, statsCtrl,
gain=gain,
Expand All @@ -860,7 +875,7 @@ def dcrAssembleSubregion(self, dcrModels, subExposures, bbox, dcrBBox, warpRefLi
dcrWeights=dcrWeights)
dcrModels.assign(dcrSubModelOut, bbox)

def dcrResiduals(self, residual, visitInfo, wcs, filterInfo):
def dcrResiduals(self, residual, visitInfo, wcs, effectiveWavelength, bandwidth):
"""Prepare a residual image for stacking in each subfilter by applying the reverse DCR shifts.

Parameters
Expand All @@ -874,7 +889,7 @@ def dcrResiduals(self, residual, visitInfo, wcs, filterInfo):
Coordinate system definition (wcs) for the exposure.
filterInfo : `lsst.afw.image.Filter`
The filter definition, set in the current instruments' obs package.
Required for any calculation of DCR, including making matched templates.
Note: this object will be changed in DM-21333.

Yields
------
Expand All @@ -886,7 +901,7 @@ def dcrResiduals(self, residual, visitInfo, wcs, filterInfo):
filteredResidual = ndimage.spline_filter(residual, order=self.config.imageInterpOrder)
# Note that `splitSubfilters` is always turned off in the reverse direction.
# This option introduces additional blurring if applied to the residuals.
dcrShift = calculateDcr(visitInfo, wcs, filterInfo, self.config.dcrNumSubfilters,
dcrShift = calculateDcr(visitInfo, wcs, effectiveWavelength, bandwidth, self.config.dcrNumSubfilters,
splitSubfilters=False)
for dcr in dcrShift:
yield applyDcr(filteredResidual, dcr, useInverse=True, splitSubfilters=False,
Expand Down Expand Up @@ -944,7 +959,8 @@ def newModelFromResidual(self, dcrModels, residualGeneratorList, dcrBBox, statsC
self.config.regularizationWidth)
dcrModels.conditionDcrModel(newModelImages, dcrBBox, gain=gain)
self.applyModelWeights(newModelImages, refImage[dcrBBox], modelWeights)
return DcrModel(newModelImages, dcrModels.filter, dcrModels.psf,
return DcrModel(newModelImages, dcrModels.filter, dcrModels.effectiveWavelength,
dcrModels.bandwidth, dcrModels.psf,
dcrModels.mask, dcrModels.variance)

def calculateConvergence(self, dcrModels, subExposures, bbox, warpRefList, weightList, statsCtrl):
Expand Down
7 changes: 7 additions & 0 deletions tests/test_assembleCoadd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,8 @@ def setDefaults(self):
self.assembleStaticSkyModel.retarget(MockCompareWarpAssembleCoaddTask)
self.assembleStaticSkyModel.doWrite = False
self.doWrite = False
self.effectiveWavelength = 476.31 # Use LSST g band values for the test.
self.bandwidth = 552. - 405.


class MockDcrAssembleCoaddTask(MockAssembleCoaddTask, DcrAssembleCoaddTask):
Expand Down Expand Up @@ -234,26 +236,31 @@ def checkGen2Gen3Compatibility(self, assembleTask, warpType="direct"):

def testGen2Gen3Compatibility(self):
config = MockAssembleCoaddConfig()
config.validate()
assembleTask = MockAssembleCoaddTask(config=config)
self.checkGen2Gen3Compatibility(assembleTask)

def testPsfMatchedGen2Gen3Compatibility(self):
config = MockAssembleCoaddConfig(warpType="psfMatched")
config.validate()
assembleTask = MockAssembleCoaddTask(config=config)
self.checkGen2Gen3Compatibility(assembleTask, warpType="psfMatched")

def testSafeClipGen2Gen3Compatibility(self):
config = MockSafeClipAssembleCoaddConfig()
config.validate()
assembleTask = MockSafeClipAssembleCoaddTask(config=config)
self.checkGen2Gen3Compatibility(assembleTask)

def testCompareWarpGen2Gen3Compatibility(self):
config = MockCompareWarpAssembleCoaddConfig()
config.validate()
assembleTask = MockCompareWarpAssembleCoaddTask(config=config)
self.checkGen2Gen3Compatibility(assembleTask)

def testDcrGen2Gen3Compatibility(self):
config = MockDcrAssembleCoaddConfig()
config.validate()
assembleTask = MockDcrAssembleCoaddTask(config=config)
self.checkGen2Gen3Compatibility(assembleTask)

Expand Down