diff options
24 files changed, 78 insertions, 58 deletions
diff --git a/lib/stwcs/distortion/coeff_converter.py b/lib/stwcs/distortion/coeff_converter.py index 301ee48..6d9a754 100644 --- a/lib/stwcs/distortion/coeff_converter.py +++ b/lib/stwcs/distortion/coeff_converter.py @@ -1,8 +1,9 @@ from __future__ import division # confidence high import numpy as np -import pyfits -import pywcs +from astropy.io import fits as pyfits +#import pywcs +from astropy import wcs as pywcs def sip2idc(wcs): """ diff --git a/lib/stwcs/distortion/utils.py b/lib/stwcs/distortion/utils.py index 234b69d..69b24a5 100644 --- a/lib/stwcs/distortion/utils.py +++ b/lib/stwcs/distortion/utils.py @@ -1,7 +1,8 @@ from __future__ import division # confidence high import os import numpy as np -import pywcs +#import pywcs +from astropy import wcs as pywcs from stwcs import wcsutil from numpy import sqrt, arctan2 from stsci.tools import fileutil diff --git a/lib/stwcs/gui/apply_headerlet.py b/lib/stwcs/gui/apply_headerlet.py index d87f586..8d8daf9 100644 --- a/lib/stwcs/gui/apply_headerlet.py +++ b/lib/stwcs/gui/apply_headerlet.py @@ -1,7 +1,8 @@ import os import string -import pyfits +#import pyfits +from astropy.io import fits as pyfits from stsci.tools import teal, parseinput import stwcs diff --git a/lib/stwcs/gui/archive_headerlet.py b/lib/stwcs/gui/archive_headerlet.py index 735baa4..65e133a 100644 --- a/lib/stwcs/gui/archive_headerlet.py +++ b/lib/stwcs/gui/archive_headerlet.py @@ -1,7 +1,8 @@ import os -import string +import string -import pyfits +#import pyfits +from astropy.io import fits as pyfits from stsci.tools import teal import stwcs @@ -41,7 +42,7 @@ def run(configObj=None): print ' Please restart this task and provide a value for this parameter.' print '='*60 return - + str_kw = ['wcsname','destim','sipname','npolfile','d2imfile', 'descrip','history','author'] @@ -53,16 +54,16 @@ def run(configObj=None): del cdict['_task_name_'] del cdict['filename'] del cdict['hdrname'] - + # Convert blank string input as None for kw in str_kw: if cdict[kw] == '': cdict[kw] = None if cdict['wcskey'].lower() == 'primary': cdict['wcskey'] = ' ' # Call function with properly interpreted input parameters - # Syntax: archive_as_headerlet(filename, sciext='SCI', wcsname=None, wcskey=None, + # Syntax: archive_as_headerlet(filename, sciext='SCI', wcsname=None, wcskey=None, # hdrname=None, destim=None, - # sipname=None, npolfile=None, d2imfile=None, + # sipname=None, npolfile=None, d2imfile=None, # author=None, descrip=None, history=None, # hdrlet=None, clobber=False) headerlet.archive_as_headerlet(configObj['filename'], configObj['hdrname'], diff --git a/lib/stwcs/gui/attach_headerlet.py b/lib/stwcs/gui/attach_headerlet.py index e33fdf2..5a3bdc8 100644 --- a/lib/stwcs/gui/attach_headerlet.py +++ b/lib/stwcs/gui/attach_headerlet.py @@ -1,6 +1,7 @@ import os -import pyfits +#import pyfits +from astropy.io import fits as pyfits from stsci.tools import teal import stwcs @@ -31,7 +32,7 @@ def getHelpAsString(docstring=False): return helpString def run(configObj=None): - + headerlet.attach_headerlet(configObj['filename'],configObj['hdrlet'], configObj['logging']) diff --git a/lib/stwcs/gui/delete_headerlet.py b/lib/stwcs/gui/delete_headerlet.py index 9eed22b..f25c545 100644 --- a/lib/stwcs/gui/delete_headerlet.py +++ b/lib/stwcs/gui/delete_headerlet.py @@ -1,6 +1,7 @@ import os -import pyfits +#import pyfits +from astropy.io import fits as pyfits from stsci.tools import teal from stsci.tools import parseinput diff --git a/lib/stwcs/gui/extract_headerlet.py b/lib/stwcs/gui/extract_headerlet.py index c807920..16a0aee 100644 --- a/lib/stwcs/gui/extract_headerlet.py +++ b/lib/stwcs/gui/extract_headerlet.py @@ -1,6 +1,7 @@ import os -import pyfits +#import pyfits +from astropy.io import fits as pyfits from stsci.tools import teal import stwcs @@ -51,7 +52,7 @@ def run(configObj=None): del cdict['output'] # Call function with properly interpreted input parameters - # Syntax: extract_headerlet(filename, output, extnum=None, hdrname=None, + # Syntax: extract_headerlet(filename, output, extnum=None, hdrname=None, # clobber=False, verbose=100) headerlet.extract_headerlet(configObj['filename'], configObj['output'], **cdict) diff --git a/lib/stwcs/gui/headerlet_summary.py b/lib/stwcs/gui/headerlet_summary.py index 1b2245e..7772a95 100644 --- a/lib/stwcs/gui/headerlet_summary.py +++ b/lib/stwcs/gui/headerlet_summary.py @@ -1,6 +1,7 @@ import os -import pyfits +#import pyfits +from astropy.io import fits as pyfits from stsci.tools import teal import stwcs @@ -31,7 +32,7 @@ def getHelpAsString(docstring=False): return helpString def run(configObj=None): - + # create dictionary of remaining parameters, deleting extraneous ones # such as those above cdict = configObj.dict() @@ -43,7 +44,7 @@ def run(configObj=None): cdict['columns'] = None # Call function with properly interpreted input parameters - # Syntax: headerlet_summary(filename,columns=None,pad=2,maxwidth=None, + # Syntax: headerlet_summary(filename,columns=None,pad=2,maxwidth=None, # output=None,clobber=True,quiet=False) headerlet.headerlet_summary(configObj['filename'],**cdict) diff --git a/lib/stwcs/gui/restore_headerlet.py b/lib/stwcs/gui/restore_headerlet.py index 1208897..46575db 100644 --- a/lib/stwcs/gui/restore_headerlet.py +++ b/lib/stwcs/gui/restore_headerlet.py @@ -1,7 +1,8 @@ import os -import string +import string -import pyfits +#import pyfits +from astropy.io import fits as pyfits from stsci.tools import teal import stwcs @@ -30,10 +31,10 @@ def getHelpAsString(docstring=False): return helpString def run(configObj=None): - + if configObj['distname'] not in ['',' ','INDEF']: # Call function with properly interpreted input parameters - # Syntax: restore_all_with_distname(filename, distname, primary, + # Syntax: restore_all_with_distname(filename, distname, primary, # archive=True, sciext='SCI', verbose=False) headerlet.restore_all_with_distname(configObj['filename'], configObj['distname'],configObj['primary'], @@ -41,7 +42,7 @@ def run(configObj=None): logging=configObj['logging']) else: # Call function with properly interpreted input parameters - # restore_from_headerlet(filename, hdrname=None, hdrext=None, + # restore_from_headerlet(filename, hdrname=None, hdrext=None, # archive=True, force=False) headerlet.restore_from_headerlet(configObj['filename'], hdrname=configObj['hdrname'],hdrext=configObj['hdrext'], diff --git a/lib/stwcs/gui/updatewcs.py b/lib/stwcs/gui/updatewcs.py index e818d96..1e5b9d9 100644 --- a/lib/stwcs/gui/updatewcs.py +++ b/lib/stwcs/gui/updatewcs.py @@ -1,6 +1,7 @@ import os -import pyfits +#import pyfits +from astropy.io import fits as pyfits from stsci.tools import parseinput from stsci.tools import fileutil from stsci.tools import teal @@ -41,7 +42,7 @@ def run(configObj=None): # Interpret primary parameters from configObj instance extname = configObj['extname'] input = configObj['input'] - + # create dictionary of remaining parameters, deleting extraneous ones # such as those above cdict = configObj.dict() diff --git a/lib/stwcs/gui/write_headerlet.py b/lib/stwcs/gui/write_headerlet.py index b9b17ad..9ba0639 100644 --- a/lib/stwcs/gui/write_headerlet.py +++ b/lib/stwcs/gui/write_headerlet.py @@ -1,6 +1,7 @@ import os -import pyfits +#import pyfits +from astropy.io import fits as pyfits from stsci.tools import teal from stsci.tools import parseinput @@ -52,7 +53,7 @@ def run(configObj=None): if configObj['output'] in ['',' ','INDEF']: configObj['output'] = None - + str_kw = ['wcsname','destim','sipname','npolfile','d2imfile', 'descrip','history','author','output','catalog'] diff --git a/lib/stwcs/updatewcs/__init__.py b/lib/stwcs/updatewcs/__init__.py index 8778065..4930082 100644 --- a/lib/stwcs/updatewcs/__init__.py +++ b/lib/stwcs/updatewcs/__init__.py @@ -1,12 +1,14 @@ from __future__ import division # confidence high import os -import pyfits +from astropy.io import fits as pyfits import numpy as np from stwcs import wcsutil from stwcs.wcsutil import HSTWCS import stwcs -import pywcs +#import pywcs +from astropy import wcs as pywcs +import astropy import utils, corrections, makewcs import npol, det2im @@ -171,7 +173,7 @@ def makecorr(fname, allowed_corr): if 'HISTORY' in f[0].header: f[0].header.update(key='UPWCSVER', value=stwcs.__version__, comment="Version of STWCS used to updated the WCS", before='HISTORY') - f[0].header.update(key='PYWCSVER', value=pywcs.__version__, + f[0].header.update(key='PYWCSVER', value=astropy.__version__, comment="Version of PYWCS used to updated the WCS", before='HISTORY') elif 'ASN_MTYP' in f[0].header: f[0].header.update(key='UPWCSVER', value=stwcs.__version__, diff --git a/lib/stwcs/updatewcs/apply_corrections.py b/lib/stwcs/updatewcs/apply_corrections.py index 740d424..fa56db6 100644 --- a/lib/stwcs/updatewcs/apply_corrections.py +++ b/lib/stwcs/updatewcs/apply_corrections.py @@ -1,7 +1,7 @@ from __future__ import division # confidence high import os -import pyfits +from astropy.io import fits as pyfits import time from stsci.tools import fileutil import os.path diff --git a/lib/stwcs/updatewcs/det2im.py b/lib/stwcs/updatewcs/det2im.py index dd48bc5..de98e1d 100644 --- a/lib/stwcs/updatewcs/det2im.py +++ b/lib/stwcs/updatewcs/det2im.py @@ -1,6 +1,6 @@ from __future__ import division # confidence high -import pyfits +from astropy.io import fits as pyfits from stsci.tools import fileutil import utils import numpy as np diff --git a/lib/stwcs/updatewcs/npol.py b/lib/stwcs/updatewcs/npol.py index cebaa8e..9346439 100644 --- a/lib/stwcs/updatewcs/npol.py +++ b/lib/stwcs/updatewcs/npol.py @@ -1,6 +1,6 @@ from __future__ import division # confidence high -import pyfits +from astropy.io import fits as pyfits from stsci.tools import fileutil import utils import numpy as np @@ -83,7 +83,7 @@ class NPOLCorr(object): if idccoeffs != None: dx, dy = cls.transformData(dx,dy, idccoeffs) - # Determine EXTVER for the WCSDVARR extension from the + # Determine EXTVER for the WCSDVARR extension from the # NPL file (EXTNAME, EXTVER) kw. # This is used to populate DPj.EXTVER kw wcsdvarr_x_version = 2 * extversion -1 @@ -276,8 +276,8 @@ class NPOLCorr(object): sciheader.get('LTM'+si+'_'+si, 1) kw_val1['CRPIX'+si] = npol_header.get('CRPIX'+si, 0.0) kw_val1['CRVAL'+si] = (npol_header.get('CRVAL'+si, 0.0) - \ - sciheader.get('LTV'+str(i), 0)) - + sciheader.get('LTV'+str(i), 0)) + kw_comm0 = {'XTENSION': 'Image extension', 'BITPIX': 'IEEE floating point', 'NAXIS': 'Number of axes', diff --git a/lib/stwcs/wcsutil/altwcs.py b/lib/stwcs/wcsutil/altwcs.py index ad17a11..9dd7edb 100644 --- a/lib/stwcs/wcsutil/altwcs.py +++ b/lib/stwcs/wcsutil/altwcs.py @@ -3,8 +3,10 @@ import os import string import numpy as np -import pywcs -import pyfits +#import pywcs +from astropy import wcs as pywcs +from astropy.io import fits as pyfits +#import pyfits from stsci.tools import fileutil as fu altwcskw = ['WCSAXES', 'CRVAL', 'CRPIX', 'PC', 'CDELT', 'CD', 'CTYPE', 'CUNIT', diff --git a/lib/stwcs/wcsutil/convertwcs.py b/lib/stwcs/wcsutil/convertwcs.py index 0fa61af..6f9f0bf 100644 --- a/lib/stwcs/wcsutil/convertwcs.py +++ b/lib/stwcs/wcsutil/convertwcs.py @@ -1,4 +1,5 @@ -import pyfits +from astropy.io import fits as pyfits + try: import stwcs from stwcs import wcsutil diff --git a/lib/stwcs/wcsutil/getinput.py b/lib/stwcs/wcsutil/getinput.py index bfe4234..b5a5df7 100644 --- a/lib/stwcs/wcsutil/getinput.py +++ b/lib/stwcs/wcsutil/getinput.py @@ -1,4 +1,4 @@ -import pyfits +from astropy.io import fits as pyfits from stsci.tools import irafglob, fileutil, parseinput def parseSingleInput(f=None, ext=None): diff --git a/lib/stwcs/wcsutil/headerlet.py b/lib/stwcs/wcsutil/headerlet.py index c2abad0..971efd5 100644 --- a/lib/stwcs/wcsutil/headerlet.py +++ b/lib/stwcs/wcsutil/headerlet.py @@ -19,8 +19,10 @@ import copy import time import numpy as np -import pyfits -import pywcs +from astropy.io import fits as pyfits +#import pywcs +from astropy import wcs as pywcs +from astropy.utils import lazyproperty import altwcs import wcscorr @@ -2679,7 +2681,7 @@ class HeaderletHDU(pyfits.hdu.nonstandard.FitsHDU): _extension = 'HDRLET' - @pyfits.util.lazyproperty + @lazyproperty def headerlet(self): """Return the encapsulated headerlet as a Headerlet object. diff --git a/lib/stwcs/wcsutil/hstwcs.py b/lib/stwcs/wcsutil/hstwcs.py index 36e1de4..4bd6eb0 100644 --- a/lib/stwcs/wcsutil/hstwcs.py +++ b/lib/stwcs/wcsutil/hstwcs.py @@ -1,8 +1,10 @@ from __future__ import division # confidence high import os -from pywcs import WCS -import pyfits +#from pywcs import WCS +from astropy.wcs import WCS +from astropy.io import fits as pyfits +#import pyfits import instruments from stwcs.distortion import models, coeff_converter import altwcs @@ -929,7 +931,6 @@ adaptive=False, detect_divergence=False, quiet=False) else: return np.dstack( [x, y] )[0] - def _updatehdr(self, ext_hdr): #kw2add : OCX10, OCX11, OCY10, OCY11 # record the model in the header for use by pydrizzle diff --git a/lib/stwcs/wcsutil/mosaic.py b/lib/stwcs/wcsutil/mosaic.py index d84c40b..18a4e28 100644 --- a/lib/stwcs/wcsutil/mosaic.py +++ b/lib/stwcs/wcsutil/mosaic.py @@ -1,7 +1,7 @@ from __future__ import division import numpy as np from matplotlib import pyplot as plt -import pyfits +from astropy.io import fits as pyfits import string from stsci.tools import parseinput, irafglob diff --git a/lib/stwcs/wcsutil/wcscorr.py b/lib/stwcs/wcsutil/wcscorr.py index af04591..37ab677 100644 --- a/lib/stwcs/wcsutil/wcscorr.py +++ b/lib/stwcs/wcsutil/wcscorr.py @@ -1,5 +1,5 @@ import os,copy -import pyfits +from astropy.io import fits as pyfits import numpy as np from stsci.tools import fileutil diff --git a/lib/stwcs/wcsutil/wcsdiff.py b/lib/stwcs/wcsutil/wcsdiff.py index 0d4b3a4..f027df2 100644 --- a/lib/stwcs/wcsutil/wcsdiff.py +++ b/lib/stwcs/wcsutil/wcsdiff.py @@ -1,7 +1,8 @@ from __future__ import print_function -import pywcs +#import pywcs +from astropy import wcs as pywcs from collections import OrderedDict -import pyfits +from astropy.io import fits as pyfits from .headerlet import parse_filename import numpy as np @@ -147,4 +148,4 @@ def get_extname_extnum(ext): extnum=1 extname = ext.header.get('EXTNAME', extname) extnum = ext.header.get('EXTVER', extnum) - return (extname, extnum)
\ No newline at end of file + return (extname, extnum) @@ -1,12 +1,12 @@ [metadata] name = stwcs -version = 1.1.4.dev +version = 1.2.0.dev author = Nadia Dencheva, Warren Hack author-email = help@stsci.edu summary = Recomputes the WCS of an HST observation and puts all distortion corrections in the headers home-page = http://www.stsci.edu/resources/software_hardware/stsci_python -classifier = +classifier = Intended Audience :: Science/Research License :: OSI Approved :: BSD License Operating System :: OS Independent @@ -14,19 +14,19 @@ classifier = Topic :: Scientific/Engineering :: Astronomy Topic :: Software Development :: Libraries :: Python Modules requires-python = >=2.6 -requires-dist = +requires-dist = stsci.tools - pywcs + astropy(>=0.3.1) [files] packages_root = lib -packages = +packages = stwcs stwcs.distortion stwcs.updatewcs stwcs.wcsutil stwcs.gui -data_files = +data_files = stwcs/gui = lib/stwcs/gui/*.help stwcs/gui/pars = lib/stwcs/gui/pars/* stwcs/gui/htmlhelp = lib/stwcs/gui/htmlhelp/* @@ -35,7 +35,7 @@ data_files = pre-hook.glob-data-files = stsci.distutils.hooks.glob_data_files [global] -setup_hooks = +setup_hooks = stsci.distutils.hooks.tag_svn_revision stsci.distutils.hooks.version_setup_hook stsci.distutils.hooks.use_packages_root |