Skip to content

Commit

Permalink
Test a.net loader default constructor
Browse files Browse the repository at this point in the history
Test that LoadAstrometryNetObjectsTask can be default-constructed
and simplify testAstrometryTask accordingly by using the
default constructor.
  • Loading branch information
r-owen committed Jun 21, 2016
1 parent b913e19 commit 9533e9a
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions tests/testAstrometryTask.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,9 @@
import lsst.afw.image as afwImage
import lsst.meas.base as measBase
import lsst.meas.astrom as measAstrom

import testFindAstrometryNetDataDir as helper


def makeRefLoader():
config = measAstrom.LoadAstrometryNetObjectsTask.ConfigClass()
return measAstrom.LoadAstrometryNetObjectsTask(config=config)


class TestAstrometricSolver(utilsTests.TestCase):

def setUp(self):
Expand Down Expand Up @@ -70,7 +64,7 @@ def setUp(self):
self.exposure = afwImage.ExposureF(self.bbox)
self.exposure.setWcs(self.tanWcs)
self.exposure.setFilter(afwImage.Filter("r", True))
self.refObjLoader = makeRefLoader()
self.refObjLoader = measAstrom.LoadAstrometryNetObjectsTask()

def tearDown(self):
del self.ctrPix
Expand Down Expand Up @@ -150,8 +144,7 @@ def doTest(self, pixelsToTanPixels, order=3):
def makeSourceCat(self, distortedWcs):
"""Make a source catalog by reading the position reference stars and distorting the positions
"""
loaderConfig = measAstrom.LoadAstrometryNetObjectsTask.ConfigClass()
loader = measAstrom.LoadAstrometryNetObjectsTask(config=loaderConfig)
loader = measAstrom.LoadAstrometryNetObjectsTask()
loadRes = loader.loadPixelBox(bbox=self.bbox, wcs=distortedWcs, filterName="r")
refCat = loadRes.refCat
refCentroidKey = afwTable.Point2DKey(refCat.schema["centroid"])
Expand Down

0 comments on commit 9533e9a

Please sign in to comment.