Update astrometry.net references

Update references to our astrometry.net wrapper code
to the new meas_extensions_astrometryNet package.

python/lsst/pipe/tasks/calibrate.py

@@ -26,8 +26,8 @@
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
 import lsst.afw.table as afwTable
-from lsst.meas.astrom import AstrometryTask, displayAstrometry, createMatchMetadata, denormalizeMatches, \
-    LoadAstrometryNetObjectsTask
+from lsst.meas.astrom import AstrometryTask, displayAstrometry, createMatchMetadata, denormalizeMatches
+from lsst.meas.extensions.astrometryNet import LoadAstrometryNetObjectsTask
 from lsst.obs.base import ExposureIdInfo
 import lsst.daf.base as dafBase
 from lsst.afw.math import BackgroundList

python/lsst/pipe/tasks/characterizeImage.py

@@ -31,7 +31,8 @@
 from lsst.afw.table import SourceTable, SourceCatalog, IdFactory
 from lsst.meas.algorithms import SubtractBackgroundTask, SourceDetectionTask, MeasureApCorrTask
 from lsst.meas.algorithms.installGaussianPsf import InstallGaussianPsfTask
-from lsst.meas.astrom import RefMatchTask, displayAstrometry, LoadAstrometryNetObjectsTask
+from lsst.meas.astrom import RefMatchTask, displayAstrometry
+from lsst.meas.extensions.astrometryNet import LoadAstrometryNetObjectsTask
 from lsst.obs.base import ExposureIdInfo
 from lsst.meas.base import SingleFrameMeasurementTask, ApplyApCorrTask, CatalogCalculationTask
 from lsst.meas.deblender import SourceDeblendTask

python/lsst/pipe/tasks/imageDifference.py

@@ -31,7 +31,8 @@
 import lsst.afw.geom as afwGeom
 import lsst.afw.math as afwMath
 import lsst.afw.table as afwTable
-import lsst.meas.astrom as measAstrom
+from lsst.meas.astrom import AstrometryConfig, AstrometryTask
+from lsst.meas.extensions.astrometryNet import LoadAstrometryNetObjectsTask
 from lsst.pipe.tasks.registerImage import RegisterTask
 from lsst.meas.algorithms import SourceDetectionTask, PsfAttributes, SingleGaussianPsf, \
     ObjectSizeStarSelectorTask
@@ -99,11 +100,11 @@ class ImageDifferenceConfig(pexConfig.Config):
         default=True
     )
     refObjLoader = pexConfig.ConfigurableField(
-        target=measAstrom.LoadAstrometryNetObjectsTask,
+        target=LoadAstrometryNetObjectsTask,
         doc="reference object loader",
     )
     astrometer = pexConfig.ConfigurableField(
-        target=measAstrom.AstrometryTask,
+        target=AstrometryTask,
         doc="astrometry task; used to match sources to reference objects, but not to fit a WCS",
     )
     sourceSelector = pexConfig.ConfigurableField(
@@ -597,9 +598,9 @@ def run(self, sensorRef, templateIdList=None):
                     srcMatchDict = {}
 
                 # Create key,val pair where key=diaSourceId and val=refId
-                refAstromConfig = measAstrom.AstrometryConfig()
+                refAstromConfig = AstrometryConfig()
                 refAstromConfig.matcher.maxMatchDistArcSec = matchRadAsec
-                refAstrometer = measAstrom.AstrometryTask(refAstromConfig)
+                refAstrometer = AstrometryTask(refAstromConfig)
                 astromRet = refAstrometer.run(exposure=exposure, sourceCat=diaSources)
                 refMatches = astromRet.matches
                 if refMatches is None:

tests/testTicket-2155.py

@@ -25,7 +25,7 @@
 import os
 
 import lsst.meas.algorithms as measAlg
-from lsst.meas.astrom import ANetAstrometryTask, ANetAstrometryConfig
+from lsst.meas.extensions.astrometryNet import ANetAstrometryTask, ANetAstrometryConfig
 from lsst.meas.base import SingleFrameMeasurementTask, SingleFrameMeasurementConfig
 import lsst.utils.tests
 import lsst.afw.detection as afwDetection

ups/pipe_tasks.table

@@ -9,6 +9,7 @@ setupRequired(obs_base)
 setupRequired(python_future)
 setupOptional(meas_algorithms)
 setupOptional(meas_astrom)
+setupOptional(meas_extensions_astrometryNet)
 setupOptional(meas_deblender)
 setupOptional(astrometry_net_data)
 setupOptional(ip_isr)