DM-11162: Replace all use of Coord and subclasses with SpherePoint

python/lsst/synpipe/makeRaDecCat.py

@@ -71,7 +71,6 @@ def getRandomRaDec(nRand, minRa, maxRa, minDec, maxDec, rad=None):
         decArr = uniform(low=minDec, high=maxDec, size=nRand)
         return list(zip(raArr, decArr))
     else:
-        import lsst.afw.coord as afwCoord
         import lsst.afw.geom as afwGeom
 
         minSep = float(rad)
@@ -86,13 +85,12 @@ def getRandomRaDec(nRand, minRa, maxRa, minDec, maxDec, rad=None):
             else:
                 raTry = uniform(low=minRa, high=maxRa)
                 decTry = uniform(low=minDec, high=maxDec)
-                coordTry = afwCoord.Coord(afwGeom.Point2D(raTry, decTry))
+                coordTry = afwGeom.SpherePoint(raTry, decTry, afwGeom.degrees)
                 nExist = len(raArr)
                 sepGood = True
                 for ii in range(nExist):
-                    coordTest = afwCoord.Coord(afwGeom.Point2D(raArr[ii],
-                                                               decArr[ii]))
-                    sep = coordTry.angularSeparation(coordTest).asArcseconds()
+                    coordTest = afwGeom.SpherePoint(raArr[ii], decArr[ii], afwGeom.degrees)
+                    sep = coordTry.separation(coordTest).asArcseconds()
                     if sep <= minSep:
                         sepGood = False
                         break

python/lsst/synpipe/matchFakes.py

@@ -409,7 +409,6 @@ def getAstroTable(src, mags=True):
                                                 data=src.get(nameKey)))
         except lsst.pex.exceptions.LsstException:
             quadrupole = lsst.afw.geom.ellipses.ellipsesLib.Quadrupole
-            icrscoord = lsst.afw.coord.coordLib.IcrsCoord
             if type(src[0].get(nameKey)) is quadrupole:
                 """Check for shape measurements"""
                 reff, q, theta = list(zip(*[getEllipse(s.get(nameKey))
@@ -420,7 +419,7 @@ def getAstroTable(src, mags=True):
                                                     data=q))
                 tab.add_column(astropy.table.Column(name=name+'_theta',
                                                     data=theta))
-            elif type(src[0].get(nameKey)) is icrscoord:
+            elif type(src[0].get(nameKey)) is lsst.afw.geom.SpherePoint:
                 """Check for coordinate measurements"""
                 x, y = list(zip(*[(s.get(nameKey).getRa().asDegrees(),
                               s.get(nameKey).getDec().asDegrees())

python/lsst/synpipe/positionGalSimFakes.py

@@ -14,7 +14,6 @@
 import lsst.afw.geom
 import lsst.afw.math
 import lsst.afw.cameraGeom
-import lsst.afw.coord
 import lsst.pex.config as lsstConfig
 
 from lsst.pipe.tasks.fakes import BaseFakeSourcesConfig, BaseFakeSourcesTask
@@ -100,8 +99,7 @@ def run(self, exposure, background):
                 raise KeyError("No mag column in %s" % self.config.galList)
 
             try:
-                coordAdd = lsst.afw.geom.Point2D(gal['RA'], gal['DEC'])
-                galCoord = lsst.afw.coord.Coord(coordAdd)
+                galCoord = lsst.afw.geom.SpherePoint(gal['RA'], gal['DEC'], lsst.afw.geom.degrees)
             except KeyError:
                 raise KeyError("No RA/DEC column in {} table".format(self.config.galList))
 

python/lsst/synpipe/positionStarFakes.py

@@ -10,7 +10,6 @@
 
 import lsst.afw.geom as afwGeom
 import lsst.afw.math as afwMath
-import lsst.afw.coord as afwCoord
 import lsst.afw.image as afwImage
 import lsst.pex.config as afwConfig
 
@@ -63,8 +62,7 @@ def run(self, exposure, background):
                 raise KeyError("No mag column in %s" % self.config.starList)
 
             try:
-                starCoord = afwCoord.Coord(afwGeom.Point2D(star['RA'],
-                                                           star['DEC']))
+                starCoord = afwGeom.SpherePoint(star['RA'], star['DEC'], afwGeom.degrees)
             except KeyError:
                 raise KeyError("No RA/DEC column in table".format(self.config.starList))