diff options
| author | dencheva <dencheva@stsci.edu> | 2014-05-01 17:44:37 -0400 |
|---|---|---|
| committer | dencheva <dencheva@stsci.edu> | 2014-05-01 17:44:37 -0400 |
| commit | 1aea0a057bde417b181538512006c1dfeccbc16e (patch) | |
| tree | c2700e59e198b77fb6581be3902edb99c2e1c0c0 /lib/stwcs/distortion | |
| parent | e2041048d7b03b0a8d9557863a1cfb32592fab1a (diff) | |
| download | stwcs_hcf-1aea0a057bde417b181538512006c1dfeccbc16e.tar.gz | |
further changes to move to astropy
git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/stwcs/trunk@31270 fe389314-cf27-0410-b35b-8c050e845b92
Diffstat (limited to 'lib/stwcs/distortion')
| -rw-r--r-- | lib/stwcs/distortion/coeff_converter.py | 12 | ||||
| -rw-r--r-- | lib/stwcs/distortion/utils.py | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/lib/stwcs/distortion/coeff_converter.py b/lib/stwcs/distortion/coeff_converter.py index 6d9a754..aace72f 100644 --- a/lib/stwcs/distortion/coeff_converter.py +++ b/lib/stwcs/distortion/coeff_converter.py @@ -1,18 +1,18 @@ from __future__ import division # confidence high import numpy as np -from astropy.io import fits as pyfits -#import pywcs +from astropy.io import fits from astropy import wcs as pywcs def sip2idc(wcs): """ Converts SIP style coefficients to IDCTAB coefficients. - :Parameters: - `wcs`: pyfits.Header or pywcs.WCS object + Parameters + ---------- + wcs : `astropy.io.fits.Header` or `astropy.wcs.WCS` object """ - if isinstance(wcs,pyfits.Header): + if isinstance(wcs, fits.Header): ocx10 = wcs.get('OCX10', None) ocx11 = wcs.get('OCX11', None) ocy10 = wcs.get('OCY10', None) @@ -22,7 +22,7 @@ def sip2idc(wcs): if None in [ocx10, ocx11, ocy10, ocy11, sipa, sipb]: print 'Cannot convert SIP to IDC coefficients.\n' return None, None - elif isinstance(wcs,pywcs.WCS): + elif isinstance(wcs, pywcs.WCS): try: ocx10 = wcs.ocx10 ocx11 = wcs.ocx11 diff --git a/lib/stwcs/distortion/utils.py b/lib/stwcs/distortion/utils.py index 69b24a5..5e0bf79 100644 --- a/lib/stwcs/distortion/utils.py +++ b/lib/stwcs/distortion/utils.py @@ -1,7 +1,6 @@ from __future__ import division # confidence high import os import numpy as np -#import pywcs from astropy import wcs as pywcs from stwcs import wcsutil from numpy import sqrt, arctan2 @@ -24,7 +23,7 @@ def output_wcs(list_of_wcsobj, ref_wcs=None, owcs=None, undistort=True): undistort: boolean (default-True) a flag whether to create an undistorted output WCS """ - fra_dec = np.vstack([w.calcFootprint() for w in list_of_wcsobj]) + fra_dec = np.vstack([w.calc_footprint() for w in list_of_wcsobj]) wcsname = list_of_wcsobj[0].wcs.name # This new algorithm may not be strictly necessary, but it may be more |