Standarize import order

lsst-dm · Jun 20, 2018 · d0d147c · timj · Jul 9, 2018 · d0d147c
1 parent 918e4a9
commit d0d147c
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/bin.src/makeSourceList.py b/bin.src/makeSourceList.py
@@ -4,13 +4,11 @@
 import warnings
 
 import numpy as np
-
 import astropy.table
 
 import lsst.utils
 import lsst.pipe.base as pipeBase
 import lsst.pex.config as pexConfig
-
 import lsst.synpipe.makeRaDecCat as makeRaDecCat
 from lsst.synpipe.FakeSourceLib import SkyMapIdContainer
 

diff --git a/bin.src/makeSourceListGrid.py b/bin.src/makeSourceListGrid.py
@@ -9,7 +9,6 @@
 import warnings
 
 import numpy as np
-
 import astropy.table
 
 import lsst.utils

diff --git a/bin.src/runMatchFakes.py b/bin.src/runMatchFakes.py
@@ -5,6 +5,7 @@
 """
 
 import argparse
+
 import lsst.synpipe.matchFakes as matchFakes
 
 if __name__ == '__main__':

diff --git a/bin.src/tractFindVisits.py b/bin.src/tractFindVisits.py
@@ -4,7 +4,9 @@
 import os
 import argparse
 import itertools
+
 import numpy as np
+
 import lsst.daf.persistence as dafPersist
 from distutils.version import StrictVersion
 

diff --git a/python/lsst/synpipe/compareModel.py b/python/lsst/synpipe/compareModel.py
@@ -4,7 +4,6 @@
 import argparse
 
 import numpy as np
-
 import astropy.table
 
 import lsst.pipe.base

diff --git a/python/lsst/synpipe/makeFakeGalaxy.py b/python/lsst/synpipe/makeFakeGalaxy.py
@@ -1,11 +1,10 @@
 import warnings
 
 import numpy as np
+import astropy.fits.io
 
 import galsim
 
-import pyfits as fits
-
 
 def makeGalaxy(flux, gal, psfImage,
                galType='sersic', cosmosCat=None,
@@ -606,7 +605,7 @@ def testMakeFake(galList, asciiTab=False, single=True, double=True, real=True):
                                                  ('b_a', 'float'),
                                                  ('theta', 'float')])
         else:
-            galData = fits.open(galList)[1].data
+            galData = astropy.io.fits.open(galList)[1].data
 
         for igal, gal in enumerate(galData):
 
@@ -630,7 +629,7 @@ def testMakeFake(galList, asciiTab=False, single=True, double=True, real=True):
         if asciiTab:
             raise Exception("For now, only FITS input is allowed !!")
         else:
-            galData = fits.open(galList)[1].data
+            galData = astropy.io.fits.open(galList)[1].data
 
         for igal, gal in enumerate(galData):
 
@@ -681,7 +680,7 @@ def testMakeFake(galList, asciiTab=False, single=True, double=True, real=True):
         if asciiTab:
             raise Exception("For now, only FITS input is allowed !!")
         else:
-            galData = fits.open(galList)[1].data
+            galData = astropy.io.fits.open(galList)[1].data
 
         for igal, gal in enumerate(galData):
 

diff --git a/python/lsst/synpipe/matchFakeStars.py b/python/lsst/synpipe/matchFakeStars.py
@@ -3,12 +3,14 @@
 matches fakes based on position stored in the calibrated exposure image header
 """
 
-import lsst.daf.persistence as dafPersist
-import numpy as np
 import argparse
 import re
 import collections
 
+import numpy as np
+
+import lsst.daf.persistence as dafPersist
+
 
 def getFakeSources(rootdir, dataId, tol=0.1):
     """Get list of sources which agree in position with fake ones with tol

diff --git a/python/lsst/synpipe/matchFakes.py b/python/lsst/synpipe/matchFakes.py
@@ -7,6 +7,7 @@
 import re
 import argparse
 import collections
+
 import numpy as np
 import astropy.table
 

diff --git a/python/lsst/synpipe/mergeOnlyFakes.py b/python/lsst/synpipe/mergeOnlyFakes.py
@@ -1,7 +1,6 @@
 import lsst.pex.config as pexConfig
 import lsst.afw.detection as afwDetect
 import lsst.pipe.tasks.multiBand as mBand
-
 from lsst.pipe.tasks.coaddBase import getSkyInfo
 
 # WARNING: if you want to add configuration variables (maybe how close you are

diff --git a/python/lsst/synpipe/randomStarFakes.py b/python/lsst/synpipe/randomStarFakes.py
@@ -1,11 +1,11 @@
+import numpy as np
+
 import lsst.afw.image
 import lsst.afw.geom
 import lsst.afw.math
 import lsst.pex.config
 from lsst.pipe.tasks.fakes import BaseFakeSourcesConfig, BaseFakeSourcesTask
 
-import numpy as np
-
 
 class RandomStarFakeSourcesConfig(BaseFakeSourcesConfig):
     nStars = lsst.pex.config.Field(dtype=int, default=1,