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-13790: Remove all use of the geom package #56

Merged
merged 2 commits into from
May 11, 2018
Merged

DM-13790: Remove all use of the geom package #56

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
180493f
Improve makePolygon in checkTract
r-owen May 8, 2018
06ddc42
Update from geom to sphgeom
r-owen May 8, 2018
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
7 changes: 4 additions & 3 deletions python/lsst/pipe/drivers/coaddDriver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from lsst.afw.fits.fitsLib import FitsError
from lsst.ctrl.pool.parallel import BatchPoolTask
from lsst.ctrl.pool.pool import Pool, abortOnError, NODE
from lsst.geom import convexHull
import lsst.sphgeom
from lsst.pex.config import Config, Field, ConfigurableField
from lsst.pipe.base import Struct, ArgumentParser
from lsst.pipe.tasks.coaddBase import CoaddTaskRunner
Expand Down Expand Up @@ -228,8 +228,9 @@ def checkTract(self, cache, tractId, selectIdList):
"""
def makePolygon(wcs, bbox):
"""Return a polygon for the image, given Wcs and bounding box"""
return convexHull([wcs.pixelToSky(afwGeom.Point2D(coord)).getVector() for
coord in bbox.getCorners()])
boxPixelCorners = afwGeom.Box2D(bbox).getCorners()
boxSkyCorners = wcs.pixelToSky(boxPixelCorners)
return lsst.sphgeom.ConvexPolygonconvexHull([coord.getVector() for coord in boxSkyCorners])

skymap = cache.skymap
tract = skymap[tractId]
Expand Down
2 changes: 1 addition & 1 deletion ups/pipe_drivers.table
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
setupRequired(ctrl_pool)
setupRequired(afw)
setupRequired(pex_exceptions)
setupRequired(geom)
setupRequired(sphgeom)
setupRequired(pex_config)
setupRequired(pipe_base)
setupRequired(pipe_tasks)
Expand Down