Simplify creation of WCS in tests

Create WCS using crpix, etc. instead of setting FITS metadata. The result is shorter and easier to read. Note that the initial WCS data is for ICRS instead of FK5, but this has no effect on the tests.
lsst · Mar 15, 2018 · 1c519b1 · 1c519b1
1 parent 3b25f2a
commit 1c519b1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 88 deletions.
diff --git a/tests/test_astrometryTask.py b/tests/test_astrometryTask.py
@@ -28,7 +28,6 @@
 import numpy as np
 
 import lsst.utils.tests
-import lsst.daf.base as dafBase
 import lsst.afw.geom as afwGeom
 import lsst.afw.table as afwTable
 import lsst.afw.image as afwImage
@@ -44,31 +43,17 @@ def setUp(self):
         refCatDir = os.path.join(os.path.dirname(__file__), "data", "sdssrefcat")
 
         self.bbox = afwGeom.Box2I(afwGeom.Point2I(0, 0), afwGeom.Extent2I(3001, 3001))
-        self.ctrPix = afwGeom.Point2I(1500, 1500)
-        metadata = dafBase.PropertySet()
-        metadata.set("RADECSYS", "FK5")
-        metadata.set("EQUINOX", 2000.0)
-        metadata.set("CTYPE1", "RA---TAN")
-        metadata.set("CTYPE2", "DEC--TAN")
-        metadata.set("CUNIT1", "deg")
-        metadata.set("CUNIT2", "deg")
-        metadata.set("CRVAL1", 215.5)
-        metadata.set("CRVAL2", 53.0)
-        metadata.set("CRPIX1", self.ctrPix[0] + 1)
-        metadata.set("CRPIX2", self.ctrPix[1] + 1)
-        metadata.set("CD1_1", 5.1e-05)
-        metadata.set("CD1_2", 0.0)
-        metadata.set("CD2_2", -5.1e-05)
-        metadata.set("CD2_1", 0.0)
-        self.tanWcs = afwGeom.makeSkyWcs(metadata)
+        crpix = afwGeom.Box2D(self.bbox).getCenter()
+        self.tanWcs = afwGeom.makeSkyWcs(crpix=crpix,
+                                         crval=afwGeom.SpherePoint(215.5, 53.0, afwGeom.degrees),
+                                         cdMatrix=afwGeom.makeCdMatrix(scale=5.1e-5*afwGeom.degrees))
         self.exposure = afwImage.ExposureF(self.bbox)
         self.exposure.setWcs(self.tanWcs)
         self.exposure.setFilter(afwImage.Filter("r", True))
         butler = Butler(refCatDir)
         self.refObjLoader = LoadIndexedReferenceObjectsTask(butler=butler)
 
     def tearDown(self):
-        del self.ctrPix
         del self.tanWcs
         del self.exposure
         del self.refObjLoader

diff --git a/tests/test_fitTanSipWcsHighOrder.py b/tests/test_fitTanSipWcsHighOrder.py
@@ -25,7 +25,6 @@
 import numpy as np
 
 import lsst.utils.tests
-import lsst.daf.base as dafBase
 import lsst.afw.geom as afwGeom
 from lsst.meas.astrom import approximateWcs
 
@@ -39,25 +38,14 @@ class ApproximateWcsTestCase(lsst.utils.tests.TestCase):
     """
 
     def setUp(self):
-        metadata = dafBase.PropertySet()
-
         self.crPix = afwGeom.Point2D(15000, 4000)
         dimd = afwGeom.Extent2D(4000, 4000)
         bboxd = afwGeom.Box2D(self.crPix - dimd/2, dimd)
         self.bbox = afwGeom.Box2I(bboxd)
-        metadata.set("RADECSYS", 'ICRS')
-        metadata.set("EQUINOX", 2000.0)
-        metadata.setDouble("CRVAL1", 215.60)
-        metadata.setDouble("CRVAL2", 53.16)
-        metadata.setDouble("CRPIX1", self.crPix[0])
-        metadata.setDouble("CRPIX2", self.crPix[1])
-        metadata.set("CTYPE1", "RA---TAN")
-        metadata.set("CTYPE2", "DEC--TAN")
-        metadata.setDouble("CD1_1", 5.10808596133527E-05)
-        metadata.setDouble("CD1_2", 1.85579539217196E-07)
-        metadata.setDouble("CD2_2", -5.10281493481982E-05)
-        metadata.setDouble("CD2_1", -8.27440751733828E-07)
-        self.tanWcs = afwGeom.makeSkyWcs(metadata)
+        self.tanWcs = afwGeom.makeSkyWcs(crpix=self.crPix,
+                                         crval=afwGeom.SpherePoint(215.5, 53.0, afwGeom.degrees),
+                                         cdMatrix=afwGeom.makeCdMatrix(scale=5.1e-5*afwGeom.degrees,
+                                                                       orientation=1*afwGeom.degrees))
 
     def tearDown(self):
         del self.tanWcs

diff --git a/tests/test_makeMatchStatistics.py b/tests/test_makeMatchStatistics.py
@@ -27,7 +27,6 @@
 import numpy as np
 
 import lsst.utils.tests
-from lsst.daf.base import PropertySet
 import lsst.afw.geom as afwGeom
 import lsst.afw.math as afwMath
 import lsst.afw.table as afwTable
@@ -41,23 +40,9 @@ class TestAstrometricSolver(lsst.utils.tests.TestCase):
     def setUp(self):
         # make a nominal match list where the distances are 0; test can then modify
         # source centroid, reference coord or distance field for each match, as desired
-        ctrPix = afwGeom.Point2I(1500, 1500)
-        metadata = PropertySet()
-        metadata.set("RADECSYS", "FK5")
-        metadata.set("EQUINOX", 2000.0)
-        metadata.set("CTYPE1", "RA---TAN")
-        metadata.set("CTYPE2", "DEC--TAN")
-        metadata.set("CUNIT1", "deg")
-        metadata.set("CUNIT2", "deg")
-        metadata.set("CRVAL1", 215.5)
-        metadata.set("CRVAL2", 53.0)
-        metadata.set("CRPIX1", ctrPix[0] + 1)
-        metadata.set("CRPIX2", ctrPix[1] + 1)
-        metadata.set("CD1_1", 5.1e-05)
-        metadata.set("CD1_2", 0.0)
-        metadata.set("CD2_2", -5.1e-05)
-        metadata.set("CD2_1", 0.0)
-        self.wcs = afwGeom.makeSkyWcs(metadata)
+        self.wcs = afwGeom.makeSkyWcs(crpix=afwGeom.Point2D(1500, 1500),
+                                      crval=afwGeom.SpherePoint(215.5, 53.0, afwGeom.degrees),
+                                      cdMatrix=afwGeom.makeCdMatrix(scale=5.1e-5*afwGeom.degrees))
         self.bboxD = afwGeom.Box2D(afwGeom.Point2D(10, 100), afwGeom.Extent2D(1000, 1500))
         self.numMatches = 25
 

diff --git a/tests/test_matchOptimisticB.py b/tests/test_matchOptimisticB.py
@@ -25,7 +25,6 @@
 import os
 import unittest
 
-import lsst.daf.base as dafBase
 import lsst.afw.geom as afwGeom
 import lsst.afw.table as afwTable
 import lsst.utils.tests
@@ -41,23 +40,9 @@ def setUp(self):
 
         self.config = measAstrom.MatchOptimisticBTask.ConfigClass()
         self.matchOptimisticB = measAstrom.MatchOptimisticBTask(config=self.config)
-
-        metadata = dafBase.PropertySet()
-        metadata.set("RADECSYS", "FK5")
-        metadata.set("EQUINOX", 2000.0)
-        metadata.set("CTYPE1", "RA---TAN")
-        metadata.set("CTYPE2", "DEC--TAN")
-        metadata.set("CUNIT1", "deg")
-        metadata.set("CUNIT2", "deg")
-        metadata.set("CRVAL1", 36.930640)
-        metadata.set("CRVAL2", -4.939560)
-        metadata.set("CRPIX1", 792.4)
-        metadata.set("CRPIX2", 560.7)
-        metadata.set("CD1_1", -5.17e-05)
-        metadata.set("CD1_2", 0.0)
-        metadata.set("CD2_2", 5.17e-05)
-        metadata.set("CD2_1", 0.0)
-        self.wcs = afwGeom.makeSkyWcs(metadata)
+        self.wcs = afwGeom.makeSkyWcs(crpix=afwGeom.Point2D(791.4, 559.7),
+                                      crval=afwGeom.SpherePoint(36.930640, -4.939560, afwGeom.degrees),
+                                      cdMatrix=afwGeom.makeCdMatrix(scale=5.17e-5*afwGeom.degrees))
         self.distortedWcs = self.wcs
 
         self.filename = os.path.join(os.path.dirname(__file__), "cat.xy.fits")

diff --git a/tests/test_matchPessimisticB.py b/tests/test_matchPessimisticB.py
@@ -26,7 +26,6 @@
 import os
 import unittest
 
-import lsst.daf.base as dafBase
 import lsst.afw.geom as afwGeom
 import lsst.afw.table as afwTable
 import lsst.utils.tests
@@ -44,22 +43,9 @@ def setUp(self):
         self.MatchPessimisticB = measAstrom.MatchPessimisticBTask(
             config=self.config)
 
-        metadata = dafBase.PropertySet()
-        metadata.set("RADECSYS", "FK5")
-        metadata.set("EQUINOX", 2000.0)
-        metadata.set("CTYPE1", "RA---TAN")
-        metadata.set("CTYPE2", "DEC--TAN")
-        metadata.set("CUNIT1", "deg")
-        metadata.set("CUNIT2", "deg")
-        metadata.set("CRVAL1", 36.930640)
-        metadata.set("CRVAL2", -4.939560)
-        metadata.set("CRPIX1", 792.4)
-        metadata.set("CRPIX2", 560.7)
-        metadata.set("CD1_1", -5.17e-05)
-        metadata.set("CD1_2", 0.0)
-        metadata.set("CD2_2", 5.17e-05)
-        metadata.set("CD2_1", 0.0)
-        self.wcs = afwGeom.makeSkyWcs(metadata)
+        self.wcs = afwGeom.makeSkyWcs(crpix=afwGeom.Point2D(791.4, 559.7),
+                                      crval=afwGeom.SpherePoint(36.930640, -4.939560, afwGeom.degrees),
+                                      cdMatrix=afwGeom.makeCdMatrix(scale=5.17e-5*afwGeom.degrees))
         self.distortedWcs = self.wcs
 
         self.filename = os.path.join(os.path.dirname(__file__), "cat.xy.fits")