diff options
| author | dencheva <dencheva@stsci.edu> | 2014-04-24 15:28:34 -0400 |
|---|---|---|
| committer | dencheva <dencheva@stsci.edu> | 2014-04-24 15:28:34 -0400 |
| commit | d7256629cc01af99cb5e3be70a64000f6d2fb0dc (patch) | |
| tree | 659e429c5f8a088044f1bd8e8f48ecbf0ee21c34 | |
| parent | 63e6e5aa0d7ebca70489d03573bb122bfb11c788 (diff) | |
| download | stwcs_hcf-d7256629cc01af99cb5e3be70a64000f6d2fb0dc.tar.gz | |
port changes from astropy.wcs - naxis1/2 are private now.
git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/stwcs/trunk@31128 fe389314-cf27-0410-b35b-8c050e845b92
| -rw-r--r-- | lib/stwcs/distortion/utils.py | 6 | ||||
| -rw-r--r-- | lib/stwcs/wcsutil/hstwcs.py | 16 | ||||
| -rw-r--r-- | lib/stwcs/wcsutil/mosaic.py | 6 |
3 files changed, 22 insertions, 6 deletions
diff --git a/lib/stwcs/distortion/utils.py b/lib/stwcs/distortion/utils.py index 6cff569..234b69d 100644 --- a/lib/stwcs/distortion/utils.py +++ b/lib/stwcs/distortion/utils.py @@ -49,9 +49,9 @@ def output_wcs(list_of_wcsobj, ref_wcs=None, owcs=None, undistort=True): tanpix = outwcs.wcs.s2p(fra_dec, 0)['pixcrd'] - outwcs.naxis1 = int(np.ceil(tanpix[:,0].max() - tanpix[:,0].min())) - outwcs.naxis2 = int(np.ceil(tanpix[:,1].max() - tanpix[:,1].min())) - crpix = np.array([outwcs.naxis1/2., outwcs.naxis2/2.], dtype=np.float64) + outwcs._naxis1 = int(np.ceil(tanpix[:,0].max() - tanpix[:,0].min())) + outwcs._naxis2 = int(np.ceil(tanpix[:,1].max() - tanpix[:,1].min())) + crpix = np.array([outwcs._naxis1/2., outwcs._naxis2/2.], dtype=np.float64) outwcs.wcs.crpix = crpix outwcs.wcs.set() tanpix = outwcs.wcs.s2p(fra_dec, 0)['pixcrd'] diff --git a/lib/stwcs/wcsutil/hstwcs.py b/lib/stwcs/wcsutil/hstwcs.py index f48741d..36e1de4 100644 --- a/lib/stwcs/wcsutil/hstwcs.py +++ b/lib/stwcs/wcsutil/hstwcs.py @@ -162,6 +162,22 @@ class HSTWCS(WCS): self.setPscale() self.setOrient() + @property + def naxis1(self): + return self._naxis1 + + @naxis1.setter + def naxis1(self, value): + self._naxis1 = value + + @property + def naxis2(self): + return self._naxis2 + + @naxis2.setter + def naxis2(self, value): + self._naxis2 = value + def readIDCCoeffs(self, header): """ Reads in first order IDCTAB coefficients if present in the header diff --git a/lib/stwcs/wcsutil/mosaic.py b/lib/stwcs/wcsutil/mosaic.py index 0c02265..d84c40b 100644 --- a/lib/stwcs/wcsutil/mosaic.py +++ b/lib/stwcs/wcsutil/mosaic.py @@ -69,9 +69,9 @@ def vmosaic(fnames, outwcs=None, ref_wcs=None, ext=None, extname=None, undistort else: outwcs = utils.output_wcs(wcsobjects, undistort=undistort) if plot: - outc=np.array([[0.,0], [outwcs.naxis1,0], - [outwcs.naxis1, outwcs.naxis2], - [0,outwcs.naxis2], [0,0]]) + outc=np.array([[0.,0], [outwcs._naxis1, 0], + [outwcs._naxis1, outwcs._naxis2], + [0, outwcs._naxis2], [0, 0]]) plt.plot(outc[:,0], outc[:,1]) for wobj in wcsobjects: outcorners = outwcs.wcs_sky2pix(wobj.calcFootprint(),1) |