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

Adapt to removal of pipe.base.task.Task.display(). #20

Merged
merged 2 commits into from
Jan 11, 2016
Merged

Adapt to removal of pipe.base.task.Task.display(). #20

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
468c9e9
Adapt to removal of pipe.base.task.Task.display().
jdswinbank Jan 5, 2016
f1e5c72
Update displayAstrometry() to new afw.display.
jdswinbank Jan 6, 2016
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
19 changes: 14 additions & 5 deletions python/lsst/meas/astrom/anetAstrometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# LSST Data Management System
# Copyright 2008, 2009, 2010, 2011 LSST Corporation.
# Copyright 2008-2016 AURA/LSST.
#
# This product includes software developed by the
# LSST Project (http://www.lsst.org/).
Expand All @@ -22,6 +22,7 @@
import numpy
from contextlib import contextmanager

import lsstDebug
import lsst.pex.exceptions
import lsst.afw.geom as afwGeom
from lsst.afw.cameraGeom import TAN_PIXELS
Expand Down Expand Up @@ -262,7 +263,6 @@ def distort(self, sourceCat, exposure):
for corner in detector.getCorners(TAN_PIXELS):
bboxD.include(corner)

import lsstDebug
if lsstDebug.Info(__name__).display:
frame = lsstDebug.Info(__name__).frame
pause = lsstDebug.Info(__name__).pause
Expand Down Expand Up @@ -343,7 +343,10 @@ def loadAndMatch(self, exposure, sourceCat, bbox=None):
raise RuntimeError("No astrometric matches")
self.log.info("%d astrometric matches" % (len(matches)))

self.display('astrometry', exposure=exposure, sources=sourceCat, matches=matches)
if self._display:
frame = lsstDebug.Info(__name__).frame
displayAstrometry(exposure=exposure, sourceCat=sourceCat, matches=matches,
frame=frame, pause=False)

return pipeBase.Struct(
refCat = astrom.refCat,
Expand Down Expand Up @@ -385,7 +388,10 @@ def _astrometry(self, sourceCat, exposure, bbox=None):
# Note that this is the Wcs for the provided positions, which may be distorted
exposure.setWcs(astrom.getWcs())

self.display('astrometry', exposure=exposure, sources=sourceCat, matches=matches)
if self._display:
frame = lsstDebug.Info(__name__).frame
displayAstrometry(exposure=exposure, sourceCat=sourceCat, matches=matches,
frame=frame, pause=False)

return pipeBase.Struct(
refCat = astrom.refCat,
Expand Down Expand Up @@ -463,7 +469,10 @@ def fitWcs(initialWcs, title=None):
else:
self.log.warn("Not calculating a SIP solution; matches may be suspect")

self.display('astrometry', exposure=exposure, sources=sourceCat, matches=matches)
if self._display:
frame = lsstDebug.Info(__name__).frame
displayAstrometry(exposure=exposure, sourceCat=sourceCat, matches=matches,
frame=frame, pause=False)

return sip

Expand Down
43 changes: 32 additions & 11 deletions python/lsst/meas/astrom/display.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,30 @@
#
# LSST Data Management System
# Copyright 2008-2016 AURA/LSST.
#
# This product includes software developed by the
# LSST Project (http://www.lsst.org/).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the LSST License Statement and
# the GNU General Public License along with this program. If not,
# see <http://www.lsstcorp.org/LegalNotices/>.
#
from __future__ import absolute_import, division, print_function

import math

import numpy as np

import lsst.afw.display as afwDisplay
from lsst.afw.image import ExposureF
from lsst.afw.table import Point2DKey

Expand All @@ -30,29 +51,29 @@ def displayAstrometry(refCat=None, sourceCat=None, distortedCentroidKey=None, bb
@param[in] title title for ds9 display
@param[in] pause pause for inspection of display? This is done by dropping into pdb.
"""
import lsst.afw.display.ds9 as ds9
disp = afwDisplay.getDisplay(frame)

if exposure is not None:
ds9.mtv(exposure, frame=frame, title=title)
disp.mtv(exposure, title=title)
elif bbox is not None:
ds9.mtv(exposure=ExposureF(bbox), frame=frame, title=title)
disp.mtv(exposure=ExposureF(bbox), title=title)

with ds9.Buffering():
with disp.Buffering():
if refCat is not None:
refCentroidKey = Point2DKey(refCat.schema["centroid"])
for refObj in refCat:
rx, ry = refObj.get(refCentroidKey)
ds9.dot("x", rx, ry, size=10, frame=frame, ctype=ds9.RED)
disp.dot("x", rx, ry, size=10, ctype=afwDisplay.RED)

if sourceCat is not None:
sourceCentroidKey = Point2DKey(sourceCat.schema["slot_Centroid"])
for source in sourceCat:
sx, sy = source.get(sourceCentroidKey)
ds9.dot("+", sx, sy, size=10, frame=frame, ctype=ds9.GREEN)
disp.dot("+", sx, sy, size=10, ctype=afwDisplay.GREEN)
if distortedCentroidKey is not None:
dx, dy = source.get(distortedCentroidKey)
ds9.dot("o", dx, dy, size=10, frame=frame, ctype=ds9.GREEN)
ds9.line([(sx, sy), (dx, dy)], ctype=ds9.GREEN, frame=frame)
disp.dot("o", dx, dy, size=10, ctype=afwDisplay.GREEN)
disp.line([(sx, sy), (dx, dy)], ctype=afwDisplay.GREEN)

if matches is not None:
refCentroidKey = Point2DKey(matches[0].first.schema["centroid"])
Expand All @@ -64,8 +85,8 @@ def displayAstrometry(refCat=None, sourceCat=None, distortedCentroidKey=None, bb
sourceCentroid = m.second.get(sourceCentroidKey)
radArr[i] = math.hypot(*(refCentroid - sourceCentroid))
sx, sy = sourceCentroid
ds9.dot("o", sx, sy, size=10, frame=frame, ctype=ds9.YELLOW)
ds9.line([refCentroid, sourceCentroid], ctype=ds9.YELLOW)
disp.dot("o", sx, sy, size=10, ctype=afwDisplay.YELLOW)
disp.line([refCentroid, sourceCentroid], ctype=afwDisplay.YELLOW)

print("<match radius> = %.4g +- %.4g [%d matches]" %
(radArr.mean(), radArr.std(), len(matches)))
Expand Down