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-39613: Use Mask for normalization rather than MaskedImage #268

Merged
merged 1 commit into from
Jun 23, 2023
Merged

DM-39613: Use Mask for normalization rather than MaskedImage #268

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
20 changes: 11 additions & 9 deletions python/lsst/ip/isr/defects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,9 @@ def _normalize(self):
region = lsst.geom.Box2I(lsst.geom.Point2I(minX, minY),
lsst.geom.Point2I(maxX, maxY))

mi = lsst.afw.image.MaskedImageF(region)
self.maskPixels(mi, maskName="BAD")
self._defects = Defects.fromMask(mi, "BAD")._defects
mask = lsst.afw.image.Mask(region)
self.maskPixels(mask, maskName="BAD")
self._defects = Defects.fromMask(mask, "BAD")._defects

@contextlib.contextmanager
def bulk_update(self):
Expand Down Expand Up @@ -258,18 +258,19 @@ def transpose(self):
retDefectList.append(nbbox)
return retDefectList

def maskPixels(self, maskedImage, maskName="BAD"):
def maskPixels(self, mask, maskName="BAD"):
"""Set mask plane based on these defects.

Parameters
----------
maskedImage : `lsst.afw.image.MaskedImage`
maskedImage : `lsst.afw.image.MaskedImage` or `lsst.afw.image.Mask`
Image to process. Only the mask plane is updated.
maskName : str, optional
Mask plane name to use.
"""
# mask bad pixels
mask = maskedImage.getMask()
if hasattr(mask, "getMask"):
mask = mask.getMask()
bitmask = mask.getPlaneBitMask(maskName)
for defect in self:
bbox = defect.getBBox()
Expand Down Expand Up @@ -659,12 +660,12 @@ def fromFootprintList(cls, fpList):
for fp in fpList), normalize_on_init=False)

@classmethod
def fromMask(cls, maskedImage, maskName):
def fromMask(cls, mask, maskName):
"""Compute a defect list from a specified mask plane.

Parameters
----------
maskedImage : `lsst.afw.image.MaskedImage`
mask : `lsst.afw.image.Mask` or `lsst.afw.image.MaskedImage`
Image to process.
maskName : `str` or `list`
Mask plane name, or list of names to convert.
Expand All @@ -674,7 +675,8 @@ def fromMask(cls, maskedImage, maskName):
defects : `Defects`
Defect list constructed from masked pixels.
"""
mask = maskedImage.getMask()
if hasattr(mask, "getMask"):
mask = mask.getMask()
thresh = lsst.afw.detection.Threshold(mask.getPlaneBitMask(maskName),
lsst.afw.detection.Threshold.BITMASK)
fpList = lsst.afw.detection.FootprintSet(mask, thresh).getFootprints()
Expand Down