Moved setMatchDistance function and test here from meas_algorithms

lsst · May 13, 2015 · 869c8c9 · 869c8c9
1 parent 763c488
commit 869c8c9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/python/lsst/meas/astrom/__init__.py b/python/lsst/meas/astrom/__init__.py
@@ -28,6 +28,7 @@
 from .anetAstrometry import *
 from .loadAstrometryNetObjects import *
 from .matchOptimisticB import *
+from .setMatchDistance import *
 
 from . import catalogStarSelector
 

diff --git a/python/lsst/meas/astrom/fitTanSipWcs.py b/python/lsst/meas/astrom/fitTanSipWcs.py
@@ -2,9 +2,9 @@
 
 import lsst.afw.geom as afwGeom
 import lsst.afw.table as afwTable
-from lsst.meas.algorithms import setMatchDistance
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
+from .setMatchDistance import setMatchDistance
 from .sip import makeCreateWcsWithSip
 
 __all__ = ["FitTanSipWcsTask", "FitTanSipWcsConfig"]

diff --git a/python/lsst/meas/astrom/matchOptimisticB.py b/python/lsst/meas/astrom/matchOptimisticB.py
@@ -3,9 +3,9 @@
 import numpy
 
 import lsst.afw.table as afwTable
-from lsst.meas.algorithms import setMatchDistance
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
+from .setMatchDistance import setMatchDistance
 from .astromLib import matchOptimisticB, MatchOptimisticBControl
 
 __all__ = ["MatchOptimisticBTask", "MatchOptimisticBConfig"]

diff --git a/tests/testFitTanSipWcsTask.py b/tests/testFitTanSipWcsTask.py
@@ -37,9 +37,9 @@
 import lsst.afw.geom as afwGeom
 import lsst.afw.image as afwImage
 import lsst.afw.table as afwTable
-from lsst.meas.algorithms import LoadReferenceObjectsTask, setMatchDistance
+from lsst.meas.algorithms import LoadReferenceObjectsTask
 from lsst.meas.base import SingleFrameMeasurementTask
-from lsst.meas.astrom import FitTanSipWcsTask
+from lsst.meas.astrom import FitTanSipWcsTask, setMatchDistance
 from lsst.meas.astrom.sip import makeCreateWcsWithSip
 
 class BaseTestCase(unittest.TestCase):