diff options
| author | dencheva <dencheva@stsci.edu> | 2014-05-02 14:54:32 -0400 |
|---|---|---|
| committer | dencheva <dencheva@stsci.edu> | 2014-05-02 14:54:32 -0400 |
| commit | 3e30b1900c4181ca0091bc887c677efd7e7f7df4 (patch) | |
| tree | 455a17143af86945a9fa071c48cdcb399875b036 /lib/stwcs/wcsutil/hstwcs.py | |
| parent | e08f035f78da1cc3115f349b9c5b5b8e6de1b941 (diff) | |
| download | stwcs_hcf-3e30b1900c4181ca0091bc887c677efd7e7f7df4.tar.gz | |
replace deprecateed methods
git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/stwcs/trunk@31371 fe389314-cf27-0410-b35b-8c050e845b92
Diffstat (limited to 'lib/stwcs/wcsutil/hstwcs.py')
| -rw-r--r-- | lib/stwcs/wcsutil/hstwcs.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/stwcs/wcsutil/hstwcs.py b/lib/stwcs/wcsutil/hstwcs.py index 4c2c140..8cc56ee 100644 --- a/lib/stwcs/wcsutil/hstwcs.py +++ b/lib/stwcs/wcsutil/hstwcs.py @@ -433,7 +433,7 @@ class HSTWCS(WCS): k - one of 'a', 'b', 'ap', 'bp' """ - cards = fits.CardList() + cards = [] #fits.CardList() korder = self.sip.__getattribute__(k+'_order') cards.append(fits.Card(keyword=k.upper()+'_ORDER', value=korder)) coeffs = self.sip.__getattribute__(k) @@ -447,7 +447,7 @@ class HSTWCS(WCS): def _idc2hdr(self): # save some of the idc coefficients coeffs = ['ocx10', 'ocx11', 'ocy10', 'ocy11', 'idcscale'] - cards = fits.CardList() + cards = [] #fits.CardList() for c in coeffs: try: val = self.__getattribute__(c) @@ -591,7 +591,7 @@ detect_divergence=True, quiet=False) Using the method of consecutive approximations we iterate starting with the initial approximation, which is computed using the - non-distorion-aware :py:meth:`wcs_sky2pix` (or equivalent). + non-distorion-aware :py:meth:`wcs_world2pix` (or equivalent). The :py:meth:`all_world2pix` function uses a vectorized implementation of the method of consecutive approximations and therefore it is @@ -734,7 +734,7 @@ adaptive=False, detect_divergence=False, quiet=False) ##################################################################### ## INITIALIZE ITERATIVE PROCESS: ## ##################################################################### - x0, y0 = self.wcs_sky2pix(ra, dec, origin) # <-- initial approximation + x0, y0 = self.wcs_world2pix(ra, dec, origin) # <-- initial approximation # (WCS based only) # see if an iterative solution is required (when any of the @@ -796,8 +796,8 @@ adaptive=False, detect_divergence=False, quiet=False) dx, dy = self.pix2foc(x, y, origin) # If pix2foc does not apply all the required distortion # corrections then replace the above line with: - #r0, d0 = self.all_pix2sky(x, y, origin) - #dx, dy = self.wcs_sky2pix(r0, d0, origin ) + #r0, d0 = self.all_pix2world(x, y, origin) + #dx, dy = self.wcs_world2pix(r0, d0, origin ) dx -= x0 dy -= y0 @@ -845,8 +845,8 @@ adaptive=False, detect_divergence=False, quiet=False) dx[ind], dy[ind] = self.pix2foc(x[ind], y[ind], origin) # If pix2foc does not apply all the required distortion # corrections then replace the above line with: - #r0[ind], d0[ind] = self.all_pix2sky(x[ind], y[ind], origin) - #dx[ind], dy[ind] = self.wcs_sky2pix(r0[ind], d0[ind], origin) + #r0[ind], d0[ind] = self.all_pix2world(x[ind], y[ind], origin) + #dx[ind], dy[ind] = self.wcs_world2pix(r0[ind], d0[ind], origin) dx[ind] -= x0[ind] dy[ind] -= y0[ind] |