diff options
| author | dencheva <dencheva@stsci.edu> | 2009-10-15 12:17:50 -0400 |
|---|---|---|
| committer | dencheva <dencheva@stsci.edu> | 2009-10-15 12:17:50 -0400 |
| commit | 7765ca7fad42ade686fffc3fea1eeb80c1020428 (patch) | |
| tree | 7f95b3f14b6a86bdb86a92ca8239fe89ad98372f /updatewcs/det2im.py | |
| parent | 238774eeee125c177ff53c1b8c1084bc56bfee6b (diff) | |
| download | stwcs_hcf-7765ca7fad42ade686fffc3fea1eeb80c1020428.tar.gz | |
Once more - dgeo correction for binned images
git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/stsci_python/trunk/stwcs@8343 fe389314-cf27-0410-b35b-8c050e845b92
Diffstat (limited to 'updatewcs/det2im.py')
| -rw-r--r-- | updatewcs/det2im.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/updatewcs/det2im.py b/updatewcs/det2im.py index c8e9ab8..e04b518 100644 --- a/updatewcs/det2im.py +++ b/updatewcs/det2im.py @@ -1,5 +1,6 @@ import pyfits from pytools import fileutil +from stwcs import utils class DET2IMCorr(object): def updateWCS(cls, fobj): @@ -42,8 +43,8 @@ class DET2IMCorr(object): getAxisCorr = classmethod(getAxisCorr) def applyDet2ImCorr(cls,fobj, axiscorr): - - hdu = cls.createDgeoHDU(fobj, axiscorr) + binned = utils.getBinning(fobj) + hdu = cls.createDgeoHDU(fobj, axiscorr, binned) d2imarr_ind = cls.getD2imIndex(fobj) if d2imarr_ind: fobj[d2imarr_ind] = hdu @@ -63,32 +64,33 @@ class DET2IMCorr(object): return index getD2imIndex = classmethod(getD2imIndex) - def createDgeoHDU(cls, fobj, axiscorr): + def createDgeoHDU(cls, fobj, axiscorr, binned=1): d2imfile = fileutil.osfn(fobj[0].header['D2IMFILE']) d2im_data = pyfits.getdata(d2imfile, ext=1) sci_hdr = fobj['sci',1].header - d2im_hdr = cls.createDet2ImHdr(sci_hdr, d2im_data.shape, axiscorr) + d2im_hdr = cls.createDet2ImHdr(sci_hdr, d2im_data.shape, axiscorr, binned) hdu = pyfits.ImageHDU(header=d2im_hdr, data=d2im_data) return hdu createDgeoHDU = classmethod(createDgeoHDU) - def createDet2ImHdr(cls, sci_hdr, data_shape, axiscorr): + def createDet2ImHdr(cls, sci_hdr, data_shape, axiscorr, binned=1): """ Creates a header for the D2IMARR extension based on the reference file recorded in D2IMFILE keyword in the primary header. """ + ltv1 = sci_hdr.get('LTV1', 0.0) ltv2 = sci_hdr.get('LTV2', 0.0) naxis1 = data_shape[0] naxis2 = 0 crpix1 = 0.0 crpix2 = 0.0 - cdelt1 = 1.0 - cdelt2 = 1.0 - crval1 = 0.0 + ltv1 - crval2 = 0.0 + ltv2 + cdelt1 = 1.0 / binned + cdelt2 = 1.0 / binned + crval1 = (0.0 + ltv1) / binned + crval2 = (0.0 + ltv2) / binned keys = ['XTENSION','BITPIX','NAXIS','NAXIS1','NAXIS2', 'EXTNAME','EXTVER','PCOUNT','GCOUNT','CRPIX1', 'CDELT1','CRVAL1','CRPIX2','CDELT2','CRVAL2', 'AXISCORR'] |