Standardize python imports

Use standard `from __future__ import...`
If `__all__ = [...]` exists then put it after `from __future__...`
If `__all__ = [...]` does not exist, add it.
Import numpy as np.
Remove #! lines

python/lsst/meas/astrom/approximateWcs.py

@@ -21,6 +21,8 @@
 #
 from __future__ import absolute_import, division, print_function
 
+__all__ = ["approximateWcs"]
+
 from builtins import range
 from builtins import object
 import numpy as np
@@ -32,8 +34,6 @@
 from lsst.meas.astrom.sip import makeCreateWcsWithSip
 from lsst.afw.image.basicUtils import assertWcsAlmostEqualOverBBox
 
-__all__ = ["approximateWcs"]
-
 
 class _MockTestCase(object):
     """A fake unit test case class that will enable us to call

python/lsst/meas/astrom/astrometry.py

@@ -20,6 +20,9 @@
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
 from __future__ import absolute_import, division, print_function
+
+__all__ = ["AstrometryConfig", "AstrometryTask"]
+
 from builtins import range
 
 import lsst.pex.config as pexConfig

python/lsst/meas/astrom/catalogStarSelector.py

@@ -1,5 +1,3 @@
-from builtins import input
-from builtins import object
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.
@@ -21,6 +19,13 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
+from __future__ import absolute_import, division, print_function
+
+__all__ = ["CatalogStarSelectorConfig", "CatalogStarSelectorTask"]
+
+from builtins import input
+from builtins import object
+
 from lsst.afw.table import SourceCatalog
 from lsst.meas.algorithms import BaseStarSelectorTask, starSelectorRegistry
 from lsst.pipe.base import Struct

python/lsst/meas/astrom/createMatchMetadata.py

@@ -1,11 +1,11 @@
 from __future__ import absolute_import, division, print_function
 
+__all__ = ["MatchMetadata", "createMatchMetadata"]
+
 from lsst.daf.base import PropertyList
 from lsst.afw.geom import Box2D
 from lsst.afw.image.utils import getDistortedWcs
 
-__all__ = ["MatchMetadata", "createMatchMetadata"]
-
 
 class MatchMetadata(PropertyList):
     """Metadata required for unpersisting a match list"""

python/lsst/meas/astrom/denormalizeMatches.py

@@ -1,7 +1,9 @@
-import lsst.afw.table
+from __future__ import absolute_import, division, print_function
 
 __all__ = ["denormalizeMatches"]
 
+import lsst.afw.table
+
 
 def denormalizeMatches(matches, matchMeta=None):
     """Generate a denormalized Catalog of matches

python/lsst/meas/astrom/directMatch.py

@@ -1,5 +1,7 @@
 from __future__ import absolute_import, division, print_function
 
+__all__ = ["DirectMatchConfig", "DirectMatchTask"]
+
 from lsst.pex.config import Config, Field, ConfigurableField
 from lsst.pipe.base import Task, Struct
 from .createMatchMetadata import MatchMetadata
@@ -9,9 +11,6 @@
 from lsst.afw.geom import arcseconds
 
 
-__all__ = ["DirectMatchConfig", "DirectMatchTask"]
-
-
 class DirectMatchConfig(Config):
     """Configuration for DirectMatchTask"""
     refObjLoader = ConfigurableField(target=LoadIndexedReferenceObjectsTask, doc="Load reference objects")

python/lsst/meas/astrom/display.py

@@ -20,6 +20,9 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 from __future__ import absolute_import, division, print_function
+
+__all__ = ["displayAstrometry", "plotAstrometry"]
+
 from builtins import zip
 import math
 
@@ -29,8 +32,6 @@
 from lsst.afw.image import ExposureF
 from lsst.afw.table import Point2DKey
 
-__all__ = ["displayAstrometry", "plotAstrometry"]
-
 
 def displayAstrometry(refCat=None, sourceCat=None, distortedCentroidKey=None, bbox=None, exposure=None,
                       matches=None, frame=1, title="", pause=True):

python/lsst/meas/astrom/fitTanSipWcs.py

@@ -1,4 +1,7 @@
 from __future__ import absolute_import, division, print_function
+
+__all__ = ["FitTanSipWcsTask", "FitTanSipWcsConfig"]
+
 from builtins import zip
 from builtins import range
 
@@ -13,8 +16,6 @@
 from .setMatchDistance import setMatchDistance
 from .sip import makeCreateWcsWithSip
 
-__all__ = ["FitTanSipWcsTask", "FitTanSipWcsConfig"]
-
 
 class FitTanSipWcsConfig(pexConfig.Config):
     order = pexConfig.RangeField(

python/lsst/meas/astrom/matchOptimisticB/matchOptimisticBContinued.py

@@ -1,4 +1,7 @@
 from __future__ import absolute_import, division, print_function
+
+__all__ = ["matchOptimisticB", "MatchOptimisticBTask", "MatchOptimisticBConfig", "SourceInfo"]
+
 from builtins import range
 from builtins import object
 import math
@@ -13,8 +16,6 @@
 from ..setMatchDistance import setMatchDistance
 from . import matchOptimisticB, MatchOptimisticBControl
 
-__all__ = ["matchOptimisticB", "MatchOptimisticBTask", "MatchOptimisticBConfig", "SourceInfo"]
-
 
 class MatchOptimisticBConfig(pexConfig.Config):
     """Configuration for MatchOptimisticBTask

python/lsst/meas/astrom/ref_match.py

@@ -21,6 +21,8 @@
 #
 from __future__ import absolute_import, division, print_function
 
+__all__ = ['RefMatchConfig', 'RefMatchTask']
+
 from lsst.afw.image.utils import getDistortedWcs
 import lsst.afw.geom as afwGeom
 import lsst.afw.math as afwMath
@@ -31,8 +33,6 @@
 from . import makeMatchStatistics
 from .createMatchMetadata import createMatchMetadata
 
-__all__ = ['RefMatchConfig', 'RefMatchTask']
-
 
 class RefMatchConfig(pexConfig.Config):
     matcher = pexConfig.ConfigurableField(

python/lsst/meas/astrom/setMatchDistance.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.
@@ -20,11 +19,12 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-
-import lsst.afw.table as afwTable
+from __future__ import absolute_import, division, print_function
 
 __all__ = ["setMatchDistance"]
 
+import lsst.afw.table as afwTable
+
 
 def setMatchDistance(matches):
     """Set the distance field of the matches in a match list to the distance in radians on the sky

python/lsst/meas/astrom/sip/cleanBadPoints.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-from builtins import range
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.
@@ -21,6 +19,11 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
+from __future__ import absolute_import, division, print_function
+
+__all__ = ["clean"]
+
+from builtins import range
 
 import numpy as np
 

python/lsst/meas/astrom/sip/genDistortedImage.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from builtins import range
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.
@@ -21,6 +19,14 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
+from __future__ import absolute_import, division, print_function
+
+__all__ = ["noDistort", "linearXDistort", "quadraticDistortX",
+           "cubicDistortX", "manyTermX", "crossTerms1",
+           "crossTerms2", "crossTerms3", "quadraticDistort",
+           "T2DistortX", "T2DistortX"]
+
+from builtins import range
 
 import math
 

python/lsst/meas/astrom/sip/sourceMatchStatistics.py

@@ -19,7 +19,9 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
+from __future__ import absolute_import, division, print_function
 
+__all__ = ["sourceMatchStatistics"]
 
 import numpy as np
 

python/lsst/meas/astrom/verifyWcs.py

@@ -1,4 +1,3 @@
-from builtins import range
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.
@@ -20,6 +19,11 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
+from __future__ import absolute_import, division, print_function
+
+__all__ = ["checkMatches"]
+
+from builtins import range
 
 import numpy as np
 

tests/testDenormalizeMatches.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, print_function
+
 import sys
 import unittest
 

tests/testDirectMatch.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 from __future__ import absolute_import, division, print_function
 
 #
@@ -26,7 +25,8 @@
 import os
 import sys
 import unittest
-import numpy
+
+import numpy as np
 
 import lsst.utils.tests
 import lsst.meas.astrom
@@ -42,7 +42,7 @@ class DirectMatchTestCase(lsst.utils.tests.TestCase):
     """Tests for lsst.meas.astrom.DirectMatchTask"""
 
     def setUp(self):
-        numpy.random.seed(12345)
+        np.random.seed(12345)
         self.butler = Butler(RefCatDir)
         refObjLoader = LoadIndexedReferenceObjectsTask(butler=self.butler)
         center = lsst.afw.coord.IcrsCoord(215.5*lsst.afw.geom.degrees, 53.0*lsst.afw.geom.degrees)
@@ -81,9 +81,9 @@ def testWithNoise(self):
         offset = (0.1*lsst.afw.geom.arcseconds).asRadians()
         num = len(references)
         ra, dec = references["coord_ra"], references["coord_dec"]
-        cosDec = numpy.cos(dec.mean())
-        ra += offset/cosDec*numpy.random.uniform(-1.0, 1.0, num)
-        dec += offset*numpy.random.uniform(-1.0, 1.0, num)
+        cosDec = np.cos(dec.mean())
+        ra += offset/cosDec*np.random.uniform(-1.0, 1.0, num)
+        dec += offset*np.random.uniform(-1.0, 1.0, num)
         self.checkMatching(references)
 
 

tests/testFitTanSipWcsTask.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.
 #
@@ -31,7 +29,7 @@
 # both the testing class and the implementation class allowing test
 # discovery to only run tests found in the subclasses.
 
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import range
 from builtins import object
 import math

tests/testJoinMatchListWithCatalog.py

@@ -1,5 +1,3 @@
-from builtins import range
-#!/usr/bin/env python
 #
 # LSST Data Management System
 #
@@ -22,6 +20,9 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
+from __future__ import absolute_import, division, print_function
+
+from builtins import range
 import os
 import unittest
 
@@ -55,7 +56,6 @@ def setUp(self):
         mi.assign(smallExposure.getMaskedImage(), smallExposure.getBBox())
 
         logLevel = Log.INFO
-        #logLevel = Log.DEBUG
         refCatDir = os.path.join(testDir, "data", "sdssrefcat")
         butler = Butler(refCatDir)
         refObjLoader = LoadIndexedReferenceObjectsTask(butler=butler)

tests/testLsf1d.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.
@@ -21,8 +19,7 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import range
 import unittest
 

tests/testLsf2d.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.
@@ -21,8 +19,7 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import range
 import unittest
 

tests/testMakeMatchStatistics.py

@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-from __future__ import absolute_import, division, print_function
-from builtins import zip
 #
 # LSST Data Management System
 # Copyright 2015 LSST Corporation.
@@ -22,6 +19,8 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
+from __future__ import absolute_import, division, print_function
+from builtins import zip
 import unittest
 import math
 

tests/testMatchOptimisticB.py

@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-from __future__ import absolute_import, division, print_function
-
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.
@@ -22,6 +19,8 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
+from __future__ import absolute_import, division, print_function
+
 import math
 import os
 import unittest