Merge branch 'master' of github.com:dstndstn/astrometry.net

blind/anet.py

@@ -33,7 +33,13 @@
 import mimetools, mimetypes
 import os, stat
 from cStringIO import StringIO
-import pyfits 
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 import time
 
 __author__  = "J. S. Bloom"

blind/centroid-noise.py

@@ -7,7 +7,13 @@
 from pylab import *
 from numpy import *
 from numpy.random import *
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 
 # Given an image and an xylist (including estimated image sigma),
 # look at a cutout around each source position, add noise, and recompute

blind/image2xy.py

@@ -42,7 +42,13 @@
 # You need ctypes and a recent (1.0) numpy for this to work. I've included
 # pyfits so you don't have to. 
 
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 import sys
 import scipy
 import os

blind/spoof.py

@@ -1,4 +1,10 @@
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 import math
 from math import exp
 from matplotlib.pylab import imread

blind/test_plotstuff.py

@@ -3,7 +3,13 @@
 	matplotlib.use('Agg')
 import unittest
 
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 import numpy as np
 import pylab as plt
 from math import pi,sqrt

blind/test_plotstuff2.py

@@ -2,7 +2,13 @@
 if __name__ == '__main__':
 	matplotlib.use('Agg')
 import unittest
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 from astrometry.util.fits import *
 from astrometry.blind.plotstuff import *
 import numpy as np

blind/ver.py

@@ -1,5 +1,11 @@
 import math
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 from numpy import *
 from matplotlib.pylab import figure, plot, xlabel, ylabel, loglog, clf
 from matplotlib.pylab import semilogy, show, find, legend, hist, axis

catalogs/ngc2000tofits.py

@@ -1,4 +1,10 @@
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 from numpy import *
 from ngc2000 import ngc2000, ngc2000accurate
 from astrometry.util.fits import *

net/process_submissions.py

@@ -29,7 +29,13 @@
 django.setup()
 
 
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 
 
 import tempfile

sdss/common.py

@@ -2,7 +2,13 @@
 from astrometry.util.fits import fits_table
 from astrometry.util.miscutils import get_overlapping_region
 import numpy as np
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 
 try:
     import cutils

sdss/dr10.py

@@ -1,5 +1,11 @@
 import os
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 from astrometry.util.fits import fits_table
 import numpy as np
 

sdss/dr8.py

@@ -9,7 +9,13 @@
 try:
     import fitsio
 except:
-    import pyfits
+    try:
+        import pyfits
+    except ImportError:
+        try:
+            from astropy.io import fits as pyfits
+        except ImportError:
+            raise ImportError("Cannot import either pyfits or astropy.io.fits")
 
 from common import *
 from dr7 import *

sdss/dr9.py

@@ -1,5 +1,11 @@
 import os
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 from astrometry.util.fits import fits_table
 import numpy as np
 

util/2mass_catalog.py

@@ -2,7 +2,13 @@
 import sys
 from optparse import OptionParser
 
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 from numpy import *
 
 from astrometry.util.fits import *

util/fits.py

@@ -7,7 +7,13 @@ class NoPyfits(object):
     pyfits = NoPyfits()
 except:
     try:
-        import pyfits
+        try:
+            import pyfits
+        except ImportError:
+            try:
+                from astropy.io import fits as pyfits
+            except ImportError:
+                raise ImportError("Cannot import either pyfits or astropy.io.fits")
     except:
         pyfits = NoPyfits()
 import numpy as np
@@ -686,17 +692,25 @@ def fits_table(dataorfn=None, rows=None, hdunum=1, hdu=None, ext=None,
             # in a try/catch in case pyfits isn't available
             isrecarray = (type(data) == pyfits.core.FITS_rec)
         except:
-            import traceback
-            traceback.print_exc()
-            pass
-        if not isrecarray:
             try:
-                import pyfits.fitsrec
-                isrecarray = (type(data) == pyfits.fitsrec.FITS_rec)
+                from astropy.io import fits as pyfits
+                isrecarray = (type(data) == pyfits.core.FITS_rec)
             except:
                 import traceback
                 traceback.print_exc()
                 pass
+        if not isrecarray:
+            try:
+                import pyfits.fitsrec
+                isrecarray = (type(data) == pyfits.fitsrec.FITS_rec)
+            except:
+                try:
+                    from astropy.io import fits as pyfits
+                    isrecarray = (type(data) == pyfits.fitsrec.FITS_rec)
+                except:
+                    import traceback
+                    traceback.print_exc()
+                    pass
         #if not isrecarray:
         #    if type(data) == np.recarray:
         #        isrecarray = True
@@ -849,7 +863,7 @@ def streaming_text_table(forfn, skiplines=0, split=None, maxcols=None,
         t1 = time.clock()
 
         floattypes = [float,np.float32,np.float64]
-        inttypes = [int, np.int32, np.int64]
+        inttypes = [int, np.int16, np.int32, np.int64]
 
         for dat,typ in zip(data, coltypes):
             if typ in floattypes:
@@ -876,8 +890,13 @@ def streaming_text_table(forfn, skiplines=0, split=None, maxcols=None,
         # trim to valid rows
         data = [dat[:goodrows] for dat in data]
         # convert
-        data = [np.array(dat).astype(typ) for dat,typ in zip(data, coltypes)]
-
+        try:
+            data = [np.array(dat).astype(typ) for dat,typ in zip(data, coltypes)]
+        except:
+            for name,dat,typ in zip(colnames, data, coltypes):
+                print 'Column', name
+                np.array(dat).astype(typ)
+            raise
         t3 = time.clock()
 
         #print 'Reading & splitting:', t1-t0

util/fits2fits.py

@@ -16,9 +16,21 @@
     # of the path: astrometry to pick up pyfits, and .. to pick up astrometry itself.
     sys.path.insert(1, andir)
     sys.path.insert(2, rootdir)
-    import pyfits
+    try:
+        import pyfits
+    except ImportError:
+        try:
+            from astropy.io import fits as pyfits
+        except ImportError:
+            raise ImportError("Cannot import either pyfits or astropy.io.fits")
 
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 from astrometry.util.fits import pyfits_writeto
 
 def fits2fits(infile, outfile, verbose=False, fix_idr=False):

util/fix_sdss_idr.py

@@ -1,5 +1,11 @@
 import sys
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 import numpy
 
 from astrometry.util.fits import pyfits_writeto

util/hpimage.py

@@ -1,7 +1,13 @@
 import sys
 
 from pylab import *
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 from numpy import *
 
 from astrometry.util.healpix import *

util/matchfile_to_wcs.py

@@ -1,4 +1,10 @@
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 from optparse import OptionParser
 from astrometry.util.fits import *
 

util/removelines.py

@@ -9,7 +9,13 @@
     addpath.addpath()
 
 import numpy
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 from numpy import *
 from numpy.random import rand
 from astrometry.util.fits import pyfits_writeto

util/removelines_general.py

@@ -1,7 +1,13 @@
 #! /usr/bin/env python
 
 import sys
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+    except ImportError:
+        raise ImportError("Cannot import either pyfits or astropy.io.fits")
 
 from math import *
 from numpy import *

util/removelines_rotate.py

@@ -13,7 +13,15 @@
 
 if __name__ == '__main__':
 	try:
-		import pyfits
+                try:
+                        import pyfits
+                except ImportError:
+                        try:
+                                from astropy.io import fits as pyfits
+                        except ImportError:
+                                raise ImportError(
+                                        "Cannot import either pyfits or astropy.io.fits"
+                                        )
 		import astrometry
 		from astrometry.util.shell import shell_escape
 		from astrometry.util.filetype import filetype_short
@@ -33,7 +41,13 @@
 		sys.path.insert(2, rootdir)
 
 import numpy
-import pyfits
+try:
+    import pyfits
+except ImportError:
+    try:
+        from astropy.io import fits as pyfits
+        except ImportError:
+            raise ImportError("Cannot import either pyfits or astropy.io.fits")
 from numpy import *
 from numpy.random import rand