summaryrefslogtreecommitdiff
path: root/lib/stwcs/updatewcs/npol.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/stwcs/updatewcs/npol.py')
-rw-r--r--lib/stwcs/updatewcs/npol.py138
1 files changed, 69 insertions, 69 deletions
diff --git a/lib/stwcs/updatewcs/npol.py b/lib/stwcs/updatewcs/npol.py
index 2607e48..a7b84da 100644
--- a/lib/stwcs/updatewcs/npol.py
+++ b/lib/stwcs/updatewcs/npol.py
@@ -11,35 +11,35 @@ logger = logging.getLogger('stwcs.updatewcs.npol')
class NPOLCorr(object):
"""
Defines a Lookup table prior distortion correction as per WCS paper IV.
- It uses a reference file defined by the NPOLFILE (suffix 'NPL') keyword
+ It uses a reference file defined by the NPOLFILE (suffix 'NPL') keyword
in the primary header.
-
+
Notes
-----
- - Using extensions in the reference file create a WCSDVARR extensions
+ - Using extensions in the reference file create a WCSDVARR extensions
and add them to the science file.
- - Add record-valued keywords to the science extension header to describe
+ - Add record-valued keywords to the science extension header to describe
the lookup tables.
- Add a keyword 'NPOLEXT' to the science extension header to store
the name of the reference file used to create the WCSDVARR extensions.
-
- If WCSDVARR extensions exist and `NPOLFILE` is different from `NPOLEXT`,
- a subsequent update will overwrite the existing extensions.
+
+ If WCSDVARR extensions exist and `NPOLFILE` is different from `NPOLEXT`,
+ a subsequent update will overwrite the existing extensions.
If WCSDVARR extensions were not found in the science file, they will be added.
-
+
It is assumed that the NPL reference files were created to work with IDC tables
- but will be applied with SIP coefficients. A transformation is applied to correct
+ but will be applied with SIP coefficients. A transformation is applied to correct
for the fact that the lookup tables will be applied before the first order coefficients
which are in the CD matrix when the SIP convention is used.
"""
-
+
def updateWCS(cls, fobj):
"""
Parameters
----------
fobj: pyfits object
Science file, for which a distortion correction in a NPOLFILE is available
-
+
"""
logger.info("\n\tStarting CompSIP: %s" %time.asctime())
try:
@@ -47,14 +47,14 @@ class NPOLCorr(object):
except AssertionError:
logger.exception('\n\tInput must be a pyfits.HDUList object')
raise
-
+
cls.applyNPOLCorr(fobj)
nplfile = fobj[0].header['NPOLFILE']
-
+
new_kw = {'NPOLEXT': nplfile}
return new_kw
-
- updateWCS = classmethod(updateWCS)
+
+ updateWCS = classmethod(updateWCS)
def applyNPOLCorr(cls, fobj):
"""
@@ -79,15 +79,15 @@ class NPOLCorr(object):
# get the data arrays from the reference file and transform them for use with SIP
dx,dy = cls.getData(nplfile, ccdchip)
idccoeffs = cls.getIDCCoeffs(header)
-
+
if idccoeffs != None:
dx, dy = cls.transformData(dx,dy, idccoeffs)
-
+
# 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
- wcsdvarr_y_version = 2 * extversion
-
+ wcsdvarr_y_version = 2 * extversion
+
for ename in zip(['DX', 'DY'], [wcsdvarr_x_version,wcsdvarr_y_version],[dx, dy]):
cls.addSciExtKw(header, wdvarr_ver=ename[1], npol_extname=ename[0])
hdu = cls.createNpolHDU(header, npolfile=nplfile, \
@@ -96,14 +96,14 @@ class NPOLCorr(object):
fobj[wcsdvarr_ind[ename[1]]] = hdu
else:
fobj.append(hdu)
-
-
+
+
applyNPOLCorr = classmethod(applyNPOLCorr)
-
+
def getWCSIndex(cls, fobj):
-
+
"""
- If fobj has WCSDVARR extensions:
+ If fobj has WCSDVARR extensions:
returns a mapping of their EXTVER kw to file object extension numbers
if fobj does not have WCSDVARR extensions:
an empty dictionary is returned
@@ -118,19 +118,19 @@ class NPOLCorr(object):
wcsd[fobj[e].header['EXTVER']] = e
logger.debug("A map of WSCDVARR externsions %s" % wcsd)
return wcsd
-
+
getWCSIndex = classmethod(getWCSIndex)
-
+
def addSciExtKw(cls, hdr, wdvarr_ver=None, npol_extname=None):
"""
Adds kw to sci extension to define WCSDVARR lookup table extensions
-
+
"""
if npol_extname =='DX':
j=1
else:
j=2
-
+
cperror = 'CPERROR%s' %j
cpdis = 'CPDIS%s' %j
dpext = 'DP%s.' %j + 'EXTVER'
@@ -140,24 +140,24 @@ class NPOLCorr(object):
keys = [cperror, cpdis, dpext, dpnaxes, dpaxis1, dpaxis2]
values = {cperror: 0.0, cpdis: 'Lookup', dpext: wdvarr_ver, dpnaxes: 2,
dpaxis1: 1, dpaxis2: 2}
-
- comments = {cperror: 'Maximum error of NPOL correction for axis %s' % j,
- cpdis: 'Prior distortion funcion type',
- dpext: 'Version number of WCSDVARR extension containing lookup distortion table',
+
+ comments = {cperror: 'Maximum error of NPOL correction for axis %s' % j,
+ cpdis: 'Prior distortion funcion type',
+ dpext: 'Version number of WCSDVARR extension containing lookup distortion table',
dpnaxes: 'Number of independent variables in distortion function',
- dpaxis1: 'Axis number of the jth independent variable in a distortion function',
+ dpaxis1: 'Axis number of the jth independent variable in a distortion function',
dpaxis2: 'Axis number of the jth independent variable in a distortion function'
}
# Look for HISTORY keywords. If present, insert new keywords before them
- before_key = 'HISTORY'
- if before_key not in hdr.ascard:
+ before_key = 'HISTORY'
+ if before_key not in hdr:
before_key = None
for key in keys:
hdr.update(key=key, value=values[key], comment=comments[key], before=before_key)
-
+
addSciExtKw = classmethod(addSciExtKw)
-
+
def getData(cls,nplfile, ccdchip):
"""
Get the data arrays from the reference NPOL files
@@ -178,7 +178,7 @@ class NPOLCorr(object):
npl.close()
return xdata, ydata
getData = classmethod(getData)
-
+
def transformData(cls, dx, dy, coeffs):
"""
Transform the NPOL data arrays for use with SIP
@@ -187,9 +187,9 @@ class NPOLCorr(object):
ndx.shape = dx.shape
ndy.shape=dy.shape
return ndx, ndy
-
+
transformData = classmethod(transformData)
-
+
def getIDCCoeffs(cls, header):
"""
Return a matrix of the scaled first order IDC coefficients.
@@ -209,11 +209,11 @@ class NPOLCorr(object):
except KeyError:
logger.exception("IDCSCALE not found in header - setting it to 1.")
idcscale = 1
-
+
return np.linalg.inv(coeffs/idcscale)
-
+
getIDCCoeffs = classmethod(getIDCCoeffs)
-
+
def createNpolHDU(cls, sciheader, npolfile=None, wdvarr_ver=1, npl_extname=None,data = None, ccdchip=1, binned=1):
"""
Creates an HDU to be added to the file object.
@@ -221,15 +221,15 @@ class NPOLCorr(object):
hdr = cls.createNpolHdr(sciheader, npolfile=npolfile, wdvarr_ver=wdvarr_ver, npl_extname=npl_extname, ccdchip=ccdchip, binned=binned)
hdu=pyfits.ImageHDU(header=hdr, data=data)
return hdu
-
+
createNpolHDU = classmethod(createNpolHDU)
-
+
def createNpolHdr(cls, sciheader, npolfile, wdvarr_ver, npl_extname, ccdchip, binned):
"""
- Creates a header for the WCSDVARR extension based on the NPOL reference file
+ Creates a header for the WCSDVARR extension based on the NPOL reference file
and sci extension header. The goal is to always work in image coordinates
- (also for subarrays and binned images. The WCS for the WCSDVARR extension
- i ssuch that a full size npol table is created and then shifted or scaled
+ (also for subarrays and binned images. The WCS for the WCSDVARR extension
+ i ssuch that a full size npol table is created and then shifted or scaled
if the science image is a subarray or binned image.
"""
npl = pyfits.open(npolfile)
@@ -247,30 +247,30 @@ class NPOLCorr(object):
else:
continue
npl.close()
-
- naxis = pyfits.getval(npolfile, 'NAXIS', ext=1)
+
+ naxis = npl[1].header['NAXIS']
ccdchip = nplextname #npol_header['CCDCHIP']
-
- kw = { 'NAXIS': 'Size of the axis',
+
+ kw = { 'NAXIS': 'Size of the axis',
'CDELT': 'Coordinate increment along axis',
- 'CRPIX': 'Coordinate system reference pixel',
+ 'CRPIX': 'Coordinate system reference pixel',
'CRVAL': 'Coordinate system value at reference pixel',
}
-
+
kw_comm1 = {}
kw_val1 = {}
for key in kw.keys():
for i in range(1, naxis+1):
si = str(i)
kw_comm1[key+si] = kw[key]
-
+
for i in range(1, naxis+1):
si = str(i)
kw_val1['NAXIS'+si] = npol_header.get('NAXIS'+si)
kw_val1['CDELT'+si] = npol_header.get('CDELT'+si, 1.0)
kw_val1['CRPIX'+si] = npol_header.get('CRPIX'+si, 0.0)
kw_val1['CRVAL'+si] = npol_header.get('CRVAL'+si, 0.0)
-
+
kw_comm0 = {'XTENSION': 'Image extension',
'BITPIX': 'IEEE floating point',
'NAXIS': 'Number of axes',
@@ -279,7 +279,7 @@ class NPOLCorr(object):
'PCOUNT': 'Special data area of size 0',
'GCOUNT': 'One data group',
}
-
+
kw_val0 = { 'XTENSION': 'IMAGE',
'BITPIX': -32,
'NAXIS': naxis,
@@ -289,32 +289,32 @@ class NPOLCorr(object):
'GCOUNT': 1,
'CCDCHIP': ccdchip,
}
-
- cdl = pyfits.CardList()
+
+ cdl = []
for key in kw_comm0.keys():
- cdl.append(pyfits.Card(key=key, value=kw_val0[key], comment=kw_comm0[key]))
+ cdl.append((key, kw_val0[key], kw_comm0[key]))
for key in kw_comm1.keys():
- cdl.append(pyfits.Card(key=key, value=kw_val1[key], comment=kw_comm1[key]))
+ cdl.append((key, kw_val1[key], kw_comm1[key]))
# Now add keywords from NPOLFILE header to document source of calibration
# include all keywords after and including 'FILENAME' from header
start_indx = -1
end_indx = 0
- for c,i in zip(npol_phdr,range(len(npol_phdr))):
+ for i, c in enumerate(npol_phdr):
if c == 'FILENAME':
start_indx = i
if c == '': # remove blanks from end of header
end_indx = i+1
break
if start_indx >= 0:
- for card in npol_phdr[start_indx:end_indx]:
+ for card in npol_phdr.cards[start_indx:end_indx]:
cdl.append(card)
-
+
hdr = pyfits.Header(cards=cdl)
-
+
return hdr
-
+
createNpolHdr = classmethod(createNpolHdr)
-
+
def get_ccdchip(cls, fobj, extname, extver):
"""
Given a science file or npol file determine CCDCHIP
@@ -331,6 +331,6 @@ class NPOLCorr(object):
elif fobj[0].header['INSTRUME'] == 'NICMOS':
ccdchip = fobj[extname, extver].header['CAMERA']
return ccdchip
-
+
get_ccdchip = classmethod(get_ccdchip)
- \ No newline at end of file
+