Use SpherePoint instead of Coord or IcrsCoord

bin.src/plot_jointcal_results.py

@@ -32,9 +32,9 @@ def prep_reference_loader(center, radius):
 
     Parameters
     ----------
-    center: afw.coord
+    center: lsst.afw.SpherePoint
         The center of the field you're testing on.
-    radius: afw.geom.angle
+    radius: lsst.afw.geom.angle
         The radius to load objects around center.
     """
     refLoader = LoadAstrometryNetObjectsTask(LoadAstrometryNetObjectsConfig())

include/lsst/jointcal/CcdImage.h

@@ -10,9 +10,9 @@
 #include "lsst/afw/geom/SkyWcs.h"
 #include "lsst/afw/image/PhotoCalib.h"
 #include "lsst/afw/image/VisitInfo.h"
-#include "lsst/afw/coord/Coord.h"
 #include "lsst/daf/base/PropertySet.h"
 #include "lsst/afw/geom/Box.h"
+#include "lsst/afw/geom/SpherePoint.h"
 #include "lsst/jointcal/MeasuredStar.h"
 #include "lsst/jointcal/Gtransfo.h"
 #include "lsst/jointcal/Frame.h"
@@ -117,7 +117,7 @@ class CcdImage {
     /**
      * @brief      Gets the boresight RA/Dec.
      */
-    lsst::afw::coord::IcrsCoord getBoresightRaDec() const { return _boresightRaDec; }
+    lsst::afw::geom::SpherePoint getBoresightRaDec() const { return _boresightRaDec; }
 
     //!
     double getHourAngle() const { return _hourAngle; }
@@ -166,7 +166,7 @@ class CcdImage {
     CcdIdType _ccdId;
     VisitIdType _visit;
 
-    lsst::afw::coord::IcrsCoord _boresightRaDec;
+    lsst::afw::geom::SpherePoint _boresightRaDec;
     double _airMass;  // airmass value.
     double _mjd;      // modified julian date
     std::shared_ptr<afw::image::PhotoCalib> _photoCalib;

python/lsst/jointcal/jointcal.py

@@ -12,7 +12,6 @@
 import lsst.pipe.base as pipeBase
 import lsst.afw.image as afwImage
 import lsst.afw.geom as afwGeom
-import lsst.afw.coord as afwCoord
 import lsst.pex.exceptions as pexExceptions
 import lsst.afw.table
 import lsst.meas.algorithms
@@ -363,17 +362,20 @@ def run(self, dataRefs, profile_jointcal=False):
         filters = collections.Counter(filters)
 
         centers = [ccdImage.getBoresightRaDec() for ccdImage in associations.getCcdImageList()]
-        commonTangentPoint = lsst.afw.coord.averageCoord(centers)
-        self.log.debug("Using common tangent point: %s", commonTangentPoint.getPosition())
-        associations.setCommonTangentPoint(commonTangentPoint.getPosition())
+        commonTangentPoint = afwGeom.averageSpherePoint(centers)
+        self.log.debug("Using common tangent point: %s", commonTangentPoint.getPosition(afwGeom.degrees))
+        associations.setCommonTangentPoint(commonTangentPoint.getPosition(afwGeom.degrees))
 
         # Use external reference catalogs handled by LSST stack mechanism
         # Get the bounding box overlapping all associated images
         # ==> This is probably a bad idea to do it this way <== To be improved
         bbox = associations.getRaDecBBox()
-        center = afwCoord.IcrsCoord(bbox.getCenter(), afwGeom.degrees)
-        corner = afwCoord.IcrsCoord(bbox.getMax(), afwGeom.degrees)
-        radius = center.angularSeparation(corner).asRadians()
+        # with Python 3 this can be simplified to afwGeom.SpherePoint(*bbox.getCenter(), afwGeom.degrees)
+        bboxCenter = bbox.getCenter()
+        center = afwGeom.SpherePoint(bboxCenter[0], bboxCenter[1], afwGeom.degrees)
+        bboxMax = bbox.getMax()
+        corner = afwGeom.SpherePoint(bboxMax[0], bboxMax[1], afwGeom.degrees)
+        radius = center.separation(corner).asRadians()
 
         # Get astrometry_net_data path
         anDir = lsst.utils.getPackageDir('astrometry_net_data')
@@ -428,8 +430,8 @@ def _do_load_refcat_and_fit(self, associations, defaultFilter, center, radius,
             The star/reference star associations to fit.
         defaultFilter : str
             filter to load from reference catalog.
-        center : lsst.afw.coord.IcrsCoord
-            Center of field to load from reference catalog.
+        center : lsst.afw.geom.SpherePoint
+            ICRS center of field to load from reference catalog.
         radius : lsst.afw.geom.Angle
             On-sky radius to load from reference catalog.
         name : str

python/lsst/jointcal/utils.py

@@ -47,7 +47,7 @@ def __init__(self, match_radius=0.1*arcseconds, flux_limit=100.0,
         """
         Parameters
         ----------
-        match_radius : lsst.afw.Angle
+        match_radius : lsst.afw.geom.Angle
             match sources within this radius for RMS statistics
         flux_limit : float
             Signal/Noise (flux/fluxSigma) for sources to be included in the RMS cross-match.

src/Associations.cc

@@ -20,7 +20,6 @@
 #include "lsst/pex/exceptions.h"
 #include "lsst/afw/geom/Box.h"
 #include "lsst/afw/geom/Point.h"
-#include "lsst/afw/coord/Coord.h"
 #include "lsst/afw/image/Calib.h"
 
 namespace jointcal = lsst::jointcal;
@@ -167,7 +166,7 @@ void Associations::collectRefStars(lsst::afw::table::SortedCatalogT<lsst::afw::t
     for (size_t i = 0; i < refCat.size(); i++) {
         auto const &record = refCat.get(i);
 
-        afw::coord::IcrsCoord coord = record->get(coordKey);
+        auto coord = record->get(coordKey);
         double defaultFlux = record->get(fluxKey) / JanskyToMaggy;
         double defaultFluxErr;
         if (fluxErrKey.isValid()) {

src/SipToGtransfo.cc

@@ -2,9 +2,9 @@
 
 #include "Eigen/Core"
 #include "lsst/jointcal/SipToGtransfo.h"
-#include "lsst/afw/coord/Coord.h"
 #include "lsst/afw/geom/Angle.h"
 #include "lsst/afw/geom/SkyWcs.h"
+#include "lsst/afw/geom/SpherePoint.h"
 #include "lsst/afw/image/ImageUtils.h"
 #include "lsst/jointcal/Point.h"
 #include "lsst/jointcal/Frame.h"
@@ -54,8 +54,8 @@ std::shared_ptr<afw::geom::SkyWcs> gtransfoToTanWcs(const jointcal::TanSipPix2Ra
        "FITS units" yet because the SkyWcs constructors expect it in LSST
        units */
 
-    afw::coord::IcrsCoord const crval(wcsTransfo.getTangentPoint().x * afwGeom::degrees,
-                                      wcsTransfo.getTangentPoint().y * afwGeom::degrees);
+    afw::geom::SpherePoint const crval(wcsTransfo.getTangentPoint().x * afwGeom::degrees,
+                                       wcsTransfo.getTangentPoint().y * afwGeom::degrees);
 
     // CD matrix:
     Eigen::Matrix2d cdMat;

tests/jointcalTestBase.py

@@ -33,11 +33,11 @@ def setUp_base(self, center, radius,
 
         Parameters
         ----------
-        center : lsst.afw.IcrsCoord
+        center : lsst.afw.geom.SpherePoint
             Center of the reference catalog.
-        radius : lsst.afw.Angle
+        radius : lsst.afw.geom.Angle
             Radius from center to load reference catalog objects inside.
-        match_radius : lsst.afw.Angle
+        match_radius : lsst.afw.geom.Angle
             matching radius when calculating RMS of result.
         input_dir : str
             Directory of input butler repository.
@@ -94,9 +94,9 @@ def _prep_reference_loader(self, center, radius):
         Parameters
         ----------
 
-        center : afw.coord
+        center : lsst.afw.SpherePoint
             The center of the field you're testing on.
-        radius : afw.geom.angle
+        radius : lsst.afw.geom.angle
             The radius to load objects around center.
         """
         refLoader = LoadAstrometryNetObjectsTask(LoadAstrometryNetObjectsConfig())

tests/test_jointcal_cfht.py

@@ -7,7 +7,6 @@
 
 from astropy import units as u
 
-import lsst.afw.coord
 import lsst.afw.geom
 import lsst.utils
 import lsst.pex.exceptions
@@ -41,7 +40,7 @@ def setUp(self):
         do_plot = False
 
         # center of the cfht validation_data catalog
-        center = lsst.afw.coord.IcrsCoord(214.884832*lsst.afw.geom.degrees, 52.6622199*lsst.afw.geom.degrees)
+        center = lsst.afw.geom.SpherePoint(214.884832, 52.6622199, lsst.afw.geom.degrees)
         radius = 3*lsst.afw.geom.degrees
 
         input_dir = os.path.join(self.data_dir, 'cfht')

tests/test_jointcal_cfht_minimal.py

@@ -5,7 +5,6 @@
 import unittest
 import os
 
-import lsst.afw.coord
 import lsst.afw.geom
 import lsst.utils
 import lsst.pex.exceptions
@@ -33,7 +32,7 @@ def setUp(self):
         do_plot = False
 
         # center of the cfht validation_data catalog
-        center = lsst.afw.coord.IcrsCoord(214.884832*lsst.afw.geom.degrees, 52.6622199*lsst.afw.geom.degrees)
+        center = lsst.afw.geom.SpherePoint(214.884832, 52.6622199, lsst.afw.geom.degrees)
         radius = 3*lsst.afw.geom.degrees
 
         input_dir = os.path.join(self.data_dir, 'cfht_minimal')

tests/test_jointcal_decam.py

@@ -9,7 +9,6 @@
 
 from astropy import units as u
 
-import lsst.afw.coord
 import lsst.afw.geom
 import lsst.utils
 import lsst.pex.exceptions
@@ -41,7 +40,7 @@ def setUp(self):
         do_plot = False
 
         # center of the decam validation_data catalog
-        center = lsst.afw.coord.IcrsCoord(150.1191666*lsst.afw.geom.degrees, 2.20583333*lsst.afw.geom.degrees)
+        center = lsst.afw.geom.SpherePoint(150.1191666, 2.20583333, lsst.afw.geom.degrees)
         radius = 3*lsst.afw.geom.degrees
 
         input_dir = os.path.join(self.data_dir, 'decam')

tests/test_jointcal_hsc.py

@@ -8,7 +8,6 @@
 
 from astropy import units as u
 
-import lsst.afw.coord
 import lsst.afw.geom
 import lsst.utils
 import lsst.pex.exceptions
@@ -41,7 +40,7 @@ def setUp(self):
         do_plot = False
 
         # center of the hsc validation_data catalog
-        center = lsst.afw.coord.IcrsCoord(320.367492*lsst.afw.geom.degrees, 0.3131554*lsst.afw.geom.degrees)
+        center = lsst.afw.geom.SpherePoint(320.367492, 0.3131554, lsst.afw.geom.degrees)
         radius = 5*lsst.afw.geom.degrees
 
         input_dir = os.path.join(self.data_dir, 'hsc')

tests/test_jointcal_lsstSim.py

@@ -11,7 +11,6 @@
 
 import lsst.afw.geom
 import lsst.afw.image
-import lsst.afw.coord
 import lsst.utils
 import lsst.pex.exceptions
 from lsst.meas.extensions.astrometryNet import LoadAstrometryNetObjectsTask
@@ -45,7 +44,7 @@ def setUp(self):
         do_plot = False
 
         # position of the Twinkles run 1 catalog
-        center = lsst.afw.coord.IcrsCoord(53.00914*lsst.afw.geom.degrees, -27.43895*lsst.afw.geom.degrees)
+        center = lsst.afw.geom.SpherePoint(53.00914, -27.43895, lsst.afw.geom.degrees)
         radius = 3*lsst.afw.geom.degrees
 
         input_dir = os.path.join(self.data_dir, 'twinkles1')