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-36768: Add psf image to alert cutouts #221

Merged
merged 3 commits into from
Jun 18, 2024
Merged

DM-36768: Add psf image to alert cutouts #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
234be34
Add psf to CCDData cutouts.
ebellm Jun 12, 2024
4503b90
Use pixel coordinates when computing the PSF.
ebellm Jun 18, 2024
45493ae
Use pixel coordinates directly when making cutouts.
ebellm Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions python/lsst/ap/association/packageAlerts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,23 +265,28 @@ def run(self,
sphPoint = geom.SpherePoint(diaSource["ra"],
diaSource["dec"],
geom.degrees)
pixelPoint = geom.Point2D(diaSource["x"],
diaSource["y"])

cutoutExtent = self.createDiaSourceExtent(diaSource["bboxSize"])
diffImCutout = self.createCcdDataCutout(
diffIm,
sphPoint,
pixelPoint,
cutoutExtent,
diffImPhotoCalib,
diaSource["diaSourceId"])
calexpCutout = self.createCcdDataCutout(
calexp,
sphPoint,
pixelPoint,
cutoutExtent,
calexpPhotoCalib,
diaSource["diaSourceId"])
templateCutout = self.createCcdDataCutout(
template,
sphPoint,
pixelPoint,
cutoutExtent,
templatePhotoCalib,
diaSource["diaSourceId"])
Expand Down Expand Up @@ -370,7 +375,7 @@ def produceAlerts(self, alerts, visit, detector):

self.producer.flush()

def createCcdDataCutout(self, image, skyCenter, extent, photoCalib, srcId):
def createCcdDataCutout(self, image, skyCenter, pixelCenter, extent, photoCalib, srcId):
"""Grab an image as a cutout and return a calibrated CCDData image.

Parameters
Expand All @@ -379,6 +384,8 @@ def createCcdDataCutout(self, image, skyCenter, extent, photoCalib, srcId):
Image to pull cutout from.
skyCenter : `lsst.geom.SpherePoint`
Center point of DiaSource on the sky.
pixelCenter : `lsst.geom.Point2D`
Pixel center of DiaSource on the sky.
extent : `lsst.geom.Extent2I`
Bounding box to cutout from the image.
photoCalib : `lsst.afw.image.PhotoCalib`
Expand All @@ -393,18 +400,18 @@ def createCcdDataCutout(self, image, skyCenter, extent, photoCalib, srcId):
CCDData object storing the calibrate information from the input
difference or template image.
"""

# Catch errors in retrieving the cutout.
try:
cutout = image.getCutout(skyCenter, extent)
cutout = image.getCutout(pixelCenter, extent)
except InvalidParameterError:
point = image.getWcs().skyToPixel(skyCenter)
imBBox = image.getBBox()
if not geom.Box2D(image.getBBox()).contains(point):
if not geom.Box2D(image.getBBox()).contains(pixelCenter):
self.log.warning(
"DiaSource id=%i centroid lies at pixel (%.2f, %.2f) "
"which is outside the Exposure with bounding box "
"((%i, %i), (%i, %i)). Returning None for cutout...",
srcId, point.x, point.y,
srcId, pixelCenter.x, pixelCenter.y,
imBBox.minX, imBBox.maxX, imBBox.minY, imBBox.maxY)
else:
raise InvalidParameterError(
Expand All @@ -414,6 +421,9 @@ def createCcdDataCutout(self, image, skyCenter, extent, photoCalib, srcId):
% srcId)
return None

# use image.psf.computeKernelImage to provide PSF centered in the array
cutoutPsf = image.psf.computeKernelImage(pixelCenter).array

# Find the value of the bottom corner of our cutout's BBox and
# subtract 1 so that the CCDData cutout position value will be
# [1, 1].
Expand All @@ -437,6 +447,7 @@ def createCcdDataCutout(self, image, skyCenter, extent, photoCalib, srcId):
uncertainty=VarianceUncertainty(calibCutout.getVariance().array),
flags=calibCutout.getMask().array,
wcs=cutoutWcs,
psf=cutoutPsf,
meta={"cutMinX": cutOutMinX,
"cutMinY": cutOutMinY},
unit=u.nJy)
Expand Down
8 changes: 8 additions & 0 deletions tests/test_packageAlerts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ def testCreateCcdDataCutout(self):
ccdData = packageAlerts.createCcdDataCutout(
self.exposure,
self.exposure.getWcs().getSkyOrigin(),
self.exposure.getWcs().getPixelOrigin(),
self.exposure.getBBox().getDimensions(),
self.exposure.getPhotoCalib(),
diaSrcId)
Expand All @@ -265,10 +266,13 @@ def testCreateCcdDataCutout(self):
self.cutoutWcs.wcs.cd)
self.assertFloatsAlmostEqual(ccdData.data,
calibExposure.getImage().array)
self.assertFloatsAlmostEqual(ccdData.psf,
self.exposure.psf.computeKernelImage(self.center).array)

ccdData = packageAlerts.createCcdDataCutout(
self.exposure,
geom.SpherePoint(0, 0, geom.degrees),
geom.Point2D(-100, -100),
self.exposure.getBBox().getDimensions(),
self.exposure.getPhotoCalib(),
diaSrcId)
Expand Down Expand Up @@ -321,12 +325,14 @@ def testMakeAlertDict(self):
sphPoint = geom.SpherePoint(diaSource["ra"],
diaSource["dec"],
geom.degrees)
pixelPoint = geom.Point2D(diaSource["x"], diaSource["y"])
cutout = self.exposure.getCutout(sphPoint,
geom.Extent2I(self.cutoutSize,
self.cutoutSize))
ccdCutout = packageAlerts.createCcdDataCutout(
cutout,
sphPoint,
pixelPoint,
geom.Extent2I(self.cutoutSize, self.cutoutSize),
cutout.getPhotoCalib(),
1234)
Expand Down Expand Up @@ -509,12 +515,14 @@ def testRun_without_produce(self, mock_server_check):
sphPoint = geom.SpherePoint(alert["diaSource"]["ra"],
alert["diaSource"]["dec"],
geom.degrees)
pixelPoint = geom.Point2D(alert["diaSource"]["x"], alert["diaSource"]["y"])
cutout = self.exposure.getCutout(sphPoint,
geom.Extent2I(self.cutoutSize,
self.cutoutSize))
ccdCutout = packageAlerts.createCcdDataCutout(
cutout,
sphPoint,
pixelPoint,
geom.Extent2I(self.cutoutSize, self.cutoutSize),
cutout.getPhotoCalib(),
1234)
Expand Down
Loading