summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/stwcs/updatewcs/__init__.py30
-rw-r--r--lib/stwcs/updatewcs/det2im.py2
-rw-r--r--lib/stwcs/updatewcs/npol.py2
-rw-r--r--lib/stwcs/wcsutil/altwcs.py8
-rw-r--r--lib/stwcs/wcsutil/headerlet.py10
-rw-r--r--lib/stwcs/wcsutil/hstwcs.py132
-rw-r--r--lib/stwcs/wcsutil/mosaic.py10
-rw-r--r--lib/stwcs/wcsutil/wcscorr.py14
8 files changed, 100 insertions, 108 deletions
diff --git a/lib/stwcs/updatewcs/__init__.py b/lib/stwcs/updatewcs/__init__.py
index 4930082..d8acb17 100644
--- a/lib/stwcs/updatewcs/__init__.py
+++ b/lib/stwcs/updatewcs/__init__.py
@@ -124,7 +124,7 @@ def makecorr(fname, allowed_corr):
if 'DET2IMCorr' in allowed_corr:
kw2update = det2im.DET2IMCorr.updateWCS(f)
for kw in kw2update:
- f[1].header.update(kw, kw2update[kw])
+ f[1].header[kw] = kw2update[kw]
for i in range(len(f))[1:]:
extn = f[i]
@@ -146,14 +146,14 @@ def makecorr(fname, allowed_corr):
corr_klass = corrections.__getattribute__(c)
kw2update = corr_klass.updateWCS(ext_wcs, ref_wcs)
for kw in kw2update:
- hdr.update(kw, kw2update[kw])
+ hdr[kw] = kw2update[kw]
# give the primary WCS a WCSNAME value
idcname = f[0].header.get('IDCTAB', " ")
if idcname.strip() and 'idc.fits' in idcname:
wname = ''.join(['IDC_',
utils.extract_rootname(idcname,suffix='_idc')])
else: wname = " "
- hdr.update('WCSNAME', wname)
+ hdr['WCSNAME'] = wname
elif extname in ['err', 'dq', 'sdq', 'samp', 'time']:
cextver = extn.header['extver']
@@ -168,18 +168,22 @@ def makecorr(fname, allowed_corr):
if 'NPOLCorr' in allowed_corr:
kw2update = npol.NPOLCorr.updateWCS(f)
for kw in kw2update:
- f[1].header.update(kw, kw2update[kw])
+ f[1].header[kw] = kw2update[kw]
# Finally record the version of the software which updated the WCS
if 'HISTORY' in f[0].header:
- f[0].header.update(key='UPWCSVER', value=stwcs.__version__,
- comment="Version of STWCS used to updated the WCS", before='HISTORY')
- f[0].header.update(key='PYWCSVER', value=astropy.__version__,
- comment="Version of PYWCS used to updated the WCS", before='HISTORY')
+ f[0].header.set('UPWCSVER', value=stwcs.__version__,
+ comment="Version of STWCS used to updated the WCS",
+ before='HISTORY')
+ f[0].header.set('PYWCSVER', value=astropy.__version__,
+ comment="Version of PYWCS used to updated the WCS",
+ before='HISTORY')
elif 'ASN_MTYP' in f[0].header:
- f[0].header.update(key='UPWCSVER', value=stwcs.__version__,
- comment="Version of STWCS used to updated the WCS", after='ASN_MTYP')
- f[0].header.update(key='PYWCSVER', value=pywcs.__version__,
- comment="Version of PYWCS used to updated the WCS", after='ASN_MTYP')
+ f[0].header.set('UPWCSVER', value=stwcs.__version__,
+ comment="Version of STWCS used to updated the WCS",
+ after='ASN_MTYP')
+ f[0].header.set('PYWCSVER', value=pywcs.__version__,
+ comment="Version of PYWCS used to updated the WCS",
+ after='ASN_MTYP')
else:
# Find index of last non-blank card, and insert this new keyword after that card
for i in range(len(f[0].header) - 1, 0, -1):
@@ -212,7 +216,7 @@ def copyWCS(w, ehdr):
wcsutil.pc2cd(hwcs)
for k in hwcs.keys():
key = k[:7]
- ehdr.update(key=key, value=hwcs[k])
+ ehdr[key] = hwcs[k]
def getNrefchip(fobj):
"""
diff --git a/lib/stwcs/updatewcs/det2im.py b/lib/stwcs/updatewcs/det2im.py
index de98e1d..a783c88 100644
--- a/lib/stwcs/updatewcs/det2im.py
+++ b/lib/stwcs/updatewcs/det2im.py
@@ -149,7 +149,7 @@ class DET2IMCorr(object):
before_key = None
for key in keys:
- hdr.update(key=key, value=values[key], comment=comments[key], before=before_key)
+ hdr.set(key, value=values[key], comment=comments[key], before=before_key)
addSciExtKw = classmethod(addSciExtKw)
diff --git a/lib/stwcs/updatewcs/npol.py b/lib/stwcs/updatewcs/npol.py
index 9346439..0427b61 100644
--- a/lib/stwcs/updatewcs/npol.py
+++ b/lib/stwcs/updatewcs/npol.py
@@ -159,7 +159,7 @@ class NPOLCorr(object):
before_key = None
for key in keys:
- hdr.update(key=key, value=values[key], comment=comments[key], before=before_key)
+ hdr.set(key, value=values[key], comment=comments[key], before=before_key)
addSciExtKw = classmethod(addSciExtKw)
diff --git a/lib/stwcs/wcsutil/altwcs.py b/lib/stwcs/wcsutil/altwcs.py
index 9dd7edb..a8f1cc1 100644
--- a/lib/stwcs/wcsutil/altwcs.py
+++ b/lib/stwcs/wcsutil/altwcs.py
@@ -423,7 +423,8 @@ def _restore(fobj, ukey, fromextnum,
for k in hwcs.keys():
key = k[:-1]
if key in fobj[toextension].header.keys():
- fobj[toextension].header.update(key=key, value = hwcs[k])
+ #fobj[toextension].header.update(key=key, value = hwcs[k])
+ fobj[toextension].header[key] = hwcs[k]
else:
continue
if key == 'O' and 'TDDALPHA' in fobj[toextension].header:
@@ -431,7 +432,7 @@ def _restore(fobj, ukey, fromextnum,
fobj[toeztension].header['TDDBETA'] = 0.0
if 'ORIENTAT' in fobj[toextension].header:
norient = np.rad2deg(np.arctan2(hwcs['CD1_2'+'%s' %ukey], hwcs['CD2_2'+'%s' %ukey]))
- fobj[toextension].header.update(key='ORIENTAT', value=norient)
+ fobj[toextension].header['ORIENTAT'] = norient
#header operations
def _check_headerpars(fobj, ext):
@@ -659,7 +660,8 @@ def pc2cd(hdr, key=' '):
val = 1.
else:
val = 0.
- hdr.update(key='CD'+c+'%s' %key, value=val)
+ #hdr.update(key='CD'+c+'%s' %key, value=val)
+ hdr['CD{0}{1}'.format(c, key)] = val
return hdr
def _parpasscheck(fobj, ext, wcskey, fromext=None, toext=None, reusekey=False):
diff --git a/lib/stwcs/wcsutil/headerlet.py b/lib/stwcs/wcsutil/headerlet.py
index 971efd5..3ab53f5 100644
--- a/lib/stwcs/wcsutil/headerlet.py
+++ b/lib/stwcs/wcsutil/headerlet.py
@@ -1024,7 +1024,7 @@ def create_headerlet(filename, sciext='SCI', hdrname=None, destim=None,
whdul = hwcs.to_fits(relax=True, wkey=" ")
if hasattr(hwcs, 'orientat'):
orient_comment = "positions angle of image y axis (deg. e of n)"
- whdul[0].header.update('ORIENTAT', hwcs.orientat, comment=orient_comment)
+ whdul[0].header['ORIENTAT'] = (wcs.orientat, orient_comment)
whdul[0].header.append(('TG_ENAME', ext[0], 'Target science data extname'))
whdul[0].header.append(('TG_EVER', ext[1], 'Target science data extver'))
@@ -1496,7 +1496,7 @@ def restore_from_headerlet(filename, hdrname=None, hdrext=None, archive=True,
else:
priwcs_hdrname = 'UNKNOWN'
priwcs_name = priwcs_hdrname
- scihdr.update('WCSNAME', priwcs_name)
+ scihdr['WCSNAME'] = priwcs_name
priwcs_unique = verify_hdrname_is_unique(fobj, priwcs_hdrname)
if archive and priwcs_unique:
@@ -1915,7 +1915,7 @@ class Headerlet(pyfits.HDUList):
logging=self.logging)
orig_hlt_hdu = HeaderletHDU.fromheaderlet(orig_hlt)
numhlt += 1
- orig_hlt_hdu.header.update('EXTVER', numhlt)
+ orig_hlt_hdu.header['EXTVER'] = numhlt
logger.info("Created headerlet %s to be attached to file" % hdrname)
else:
logger.info("Headerlet with name %s is already attached" % hdrname)
@@ -1954,7 +1954,7 @@ class Headerlet(pyfits.HDUList):
logging=self.logging)
numhlt += 1
alt_hlet_hdu = HeaderletHDU.fromheaderlet(alt_hlet)
- alt_hlet_hdu.header.update('EXTVER', numhlt)
+ alt_hlet_hdu.header['EXTVER'] = numhlt
alt_hlethdu.append(alt_hlet_hdu)
hdrlet_extnames.append(hname)
@@ -2182,7 +2182,7 @@ class Headerlet(pyfits.HDUList):
numhlt = countExtn(fobj, 'HDRLET')
new_hlt = HeaderletHDU.fromheaderlet(self)
- new_hlt.header.update('extver', numhlt + 1)
+ new_hlt.header['extver'] = numhlt + 1
fobj.append(new_hlt)
utils.updateNEXTENDKw(fobj)
else:
diff --git a/lib/stwcs/wcsutil/hstwcs.py b/lib/stwcs/wcsutil/hstwcs.py
index 53e86cd..b9983e6 100644
--- a/lib/stwcs/wcsutil/hstwcs.py
+++ b/lib/stwcs/wcsutil/hstwcs.py
@@ -61,7 +61,7 @@ class NoConvergence(Exception):
"""
An error class used to report non-convergence and/or divergence of
numerical methods. It is used to report errors in the iterative solution
- used by the :py:meth:`~stwcs.hstwcs.HSTWCS.all_sky2pix`\ .
+ used by the :py:meth:`~stwcs.hstwcs.HSTWCS.all_world2pix`\ .
Attributes
----------
@@ -81,12 +81,12 @@ class NoConvergence(Exception):
solution appears to be divergent. If the solution does not diverge,
`divergent` will be set to `None`.
- slow_conv : None, numpy.array
+ failed2converge : None, numpy.array
Indices of the points in :py:attr:`best_solution` array for which the
solution failed to converge within the specified maximum number
- of iterations. If there are no non-converging points (i.e., if
+ of iterations. If there are no non-converging poits (i.e., if
the required accuracy has been achieved for all points) then
- `slow_conv` will be set to `None`.
+ `failed2converge` will be set to `None`.
"""
def __init__(self, *args, **kwargs):
@@ -96,7 +96,7 @@ class NoConvergence(Exception):
self.accuracy = kwargs.pop('accuracy', None)
self.niter = kwargs.pop('niter', None)
self.divergent = kwargs.pop('divergent', None)
- self.slow_conv = kwargs.pop('slow_conv', None)
+ self.failed2converge= kwargs.pop('failed2converge', None)
#
@@ -395,11 +395,11 @@ class HSTWCS(WCS):
wname = build_default_wcsname(self.idctab)
else:
wname = 'DEFAULT'
- h.update('wcsname'+wcskey, value=wname)
+ h['wcsname{0}'.format(wcskey)] = wname
if idc2hdr:
for card in self._idc2hdr():
- h.update(card.key+wcskey, value=card.value, comment=card.comment)
+ h[card.key+wcskey] = (card.value, card.comment)
try:
del h['RESTFRQ']
del h['RESTWAV']
@@ -407,9 +407,9 @@ class HSTWCS(WCS):
if sip2hdr and self.sip:
for card in self._sip2hdr('a'):
- h.update(card.key,value=card.value,comment=card.comment)
+ h[card.key] = (card.value, card.comment)
for card in self._sip2hdr('b'):
- h.update(card.key,value=card.value,comment=card.comment)
+ h[card.key] = (card.value, card.comment)
try:
ap = self.sip.ap
@@ -422,10 +422,10 @@ class HSTWCS(WCS):
if ap:
for card in self._sip2hdr('ap'):
- h.update(card.key,value=card.value,comment=card.comment)
+ h[card.key] = (card.value, card.comment)
if bp:
for card in self._sip2hdr('bp'):
- h.update(card.key,value=card.value,comment=card.comment)
+ h[card.key] = (card.value, card.comment)
return h
def _sip2hdr(self, k):
@@ -462,9 +462,9 @@ class HSTWCS(WCS):
def pc2cd(self):
self.wcs.cd = self.wcs.pc.copy()
- def all_sky2pix(self, *args, **kwargs):
+ def all_world2pix(self, *args, **kwargs):
"""
- all_sky2pix(*arg, accuracy=1.0e-4, maxiter=20, adaptive=False, \
+ all_world2pix(*arg, accuracy=1.0e-4, maxiter=20, adaptive=False, \
detect_divergence=True, quiet=False)
Performs full inverse transformation using iterative solution
@@ -487,7 +487,7 @@ detect_divergence=True, quiet=False)
other instruments.
.. note::
- The :py:meth:`all_sky2pix` uses a vectorized implementation
+ The :py:meth:`all_world2pix` uses a vectorized implementation
of the method of consecutive approximations (see `Notes`
section below) in which it iterates over *all* input poits
*regardless* until the required accuracy has been reached for
@@ -498,7 +498,7 @@ detect_divergence=True, quiet=False)
characteristics of the geometric distortions for a given
instrument). In this situation it may be
advantageous to set `adaptive` = `True`\ in which
- case :py:meth:`all_sky2pix` will continue iterating *only* over
+ case :py:meth:`all_world2pix` will continue iterating *only* over
the points that have not yet converged to the required
accuracy. However, for the HST's ACS/WFC detector, which has
the strongest distortions of all HST instruments, testing has
@@ -511,18 +511,18 @@ detect_divergence=True, quiet=False)
penalty.
.. note::
- When `detect_divergence` is `True`\ , :py:meth:`all_sky2pix` \
+ When `detect_divergence` is `True`\ , :py:meth:`all_world2pix` \
will automatically switch to the adaptive algorithm once
divergence has been detected.
detect_divergence : bool, optional (Default = True)
Specifies whether to perform a more detailed analysis of the
- convergence to a solution. Normally :py:meth:`all_sky2pix`
+ convergence to a solution. Normally :py:meth:`all_world2pix`
may not achieve the required accuracy
if either the `tolerance` or `maxiter` arguments are too low.
However, it may happen that for some geometric distortions
the conditions of convergence for the the method of consecutive
- approximations used by :py:meth:`all_sky2pix` may not be
+ approximations used by :py:meth:`all_world2pix` may not be
satisfied, in which case consecutive approximations to the
solution will diverge regardless of the `tolerance` or `maxiter`
settings.
@@ -535,19 +535,19 @@ detect_divergence=True, quiet=False)
"improve" diverging solutions. This may result in NaN or Inf
values in the return results (in addition to a performance
penalties). Even when `detect_divergence` is
- `False`\ , :py:meth:`all_sky2pix`\ , at the end of the iterative
+ `False`\ , :py:meth:`all_world2pix`\ , at the end of the iterative
process, will identify invalid results (NaN or Inf) as "diverging"
solutions and will raise :py:class:`NoConvergence` unless
the `quiet` parameter is set to `True`\ .
- When `detect_divergence` is `True`\ , :py:meth:`all_sky2pix` will
+ When `detect_divergence` is `True`\ , :py:meth:`all_world2pix` will
detect points for
which current correction to the coordinates is larger than
the correction applied during the previous iteration **if** the
requested accuracy **has not yet been achieved**\ . In this case,
if `adaptive` is `True`, these points will be excluded from
further iterations and if `adaptive`
- is `False`\ , :py:meth:`all_sky2pix` will automatically
+ is `False`\ , :py:meth:`all_world2pix` will automatically
switch to the adaptive algorithm.
.. note::
@@ -570,7 +570,7 @@ detect_divergence=True, quiet=False)
.. note::
Indices of the diverging inverse solutions will be reported
in the `divergent` attribute of the
- raised :py:class:`NoConvergence` exception object.
+ raised :py:class:`NoConvergence` object.
quiet : bool, optional (Default = False)
Do not throw :py:class:`NoConvergence` exceptions when the method
@@ -595,21 +595,15 @@ detect_divergence=True, quiet=False)
with the initial approximation, which is computed using the
non-distorion-aware :py:meth:`wcs_sky2pix` (or equivalent).
- The :py:meth:`all_sky2pix` function uses a vectorized implementation
+ The :py:meth:`all_world2pix` function uses a vectorized implementation
of the method of consecutive approximations and therefore it is
highly efficient (>30x) when *all* data points that need to be
converted from sky coordinates to image coordinates are passed at
*once*\ . Therefore, it is advisable, whenever possible, to pass
as input a long array of all points that need to be converted
- to :py:meth:`all_sky2pix` instead of calling :py:meth:`all_sky2pix`
+ to :py:meth:`all_world2pix` instead of calling :py:meth:`all_world2pix`
for each data point. Also see the note to the `adaptive` parameter.
- See Also
- --------
- A detailed description of the algorithm is available on astropy's
- GitHub page,
- issue `#2373 <https://github.com/astropy/astropy/pull/2373>`_\ .
-
Examples
--------
>>> import stwcs, pyfits
@@ -617,43 +611,42 @@ detect_divergence=True, quiet=False)
>>> w = stwcs.wcsutil.HSTWCS(hdulist, ext=('sci',1))
>>> hdulist.close()
- >>> ra, dec = w.all_pix2sky([1,2,3],[1,1,1],1); print(ra); print(dec)
+ >>> ra, dec = w.all_pix2world([1,2,3],[1,1,1],1); print(ra); print(dec)
[ 5.52645241 5.52649277 5.52653313]
[-72.05171776 -72.05171295 -72.05170814]
- >>> radec = w.all_pix2sky([[1,1],[2,1],[3,1]],1); print(radec)
+ >>> radec = w.all_pix2world([[1,1],[2,1],[3,1]],1); print(radec)
[[ 5.52645241 -72.05171776]
[ 5.52649277 -72.05171295]
[ 5.52653313 -72.05170814]]
- >>> x, y = w.all_sky2pix(ra,dec,1)
+ >>> x, y = w.all_world2pix(ra,dec,1)
>>> print(x)
[ 1.00000233 2.00000232 3.00000233]
>>> print(y)
[ 0.99999997 0.99999997 0.99999998]
- >>> xy = w.all_sky2pix(radec,1)
+ >>> xy = w.all_world2pix(radec,1)
>>> print(xy)
[[ 1.00000233 0.99999997]
[ 2.00000232 0.99999997]
[ 3.00000233 0.99999998]]
- >>> xy = w.all_sky2pix(radec,1, maxiter=3, accuracy=1.0e-10, \
+ >>> xy = w.all_world2pix(radec,1, maxiter=3, accuracy=1.0e-10, \
quiet=False)
- NoConvergence: 'HSTWCS.all_sky2pix' failed to converge to requested \
+ NoConvergence: 'HSTWCS.all_world2pix' failed to converge to requested \
accuracy after 3 iterations.
>>>
Now try to use some diverging data:
- >>> divradec = w.all_pix2sky([[1.0,1.0],[10000.0,50000.0],\
+ >>> divradec = w.all_pix2world([[1.0,1.0],[10000.0,50000.0],\
[3.0,1.0]],1); print(divradec)
[[ 5.52645241 -72.05171776]
[ 7.15979392 -70.81405561]
[ 5.52653313 -72.05170814]]
>>> try:
- >>> xy = w.all_sky2pix(divradec,1, maxiter=20, accuracy=1.0e-4, \
+ >>> xy = w.all_world2pix(divradec,1, maxiter=20, accuracy=1.0e-4, \
adaptive=False, detect_divergence=True, quiet=False)
>>> except stwcs.wcsutil.hstwcs.NoConvergence as e:
>>> print("Indices of diverging points: {}".format(e.divergent))
- >>> print("Indices of poorly converging points: {}"\
-.format(e.slow_conv))
+ >>> print("Indices of poorly converging points: {}".format(e.failed2converge))
>>> print("Best solution: {}".format(e.best_solution))
>>> print("Achieved accuracy: {}".format(e.accuracy))
>>> raise e
@@ -671,18 +664,15 @@ adaptive=False, detect_divergence=True, quiet=False)
[ 6.02334592e-05 6.59713067e-07]]
Traceback (innermost last):
File "<console>", line 8, in <module>
- NoConvergence: 'HSTWCS.all_sky2pix' failed to converge to the \
-requested accuracy.
- After 5 iterations, the solution is diverging at least for one \
-input point.
+ NoConvergence: 'HSTWCS.all_world2pix' failed to converge to the requested accuracy.
+ After 5 iterations, the solution is diverging at least for one input point.
>>> try:
- >>> xy = w.all_sky2pix(divradec,1, maxiter=20, accuracy=1.0e-4, \
+ >>> xy = w.all_world2pix(divradec,1, maxiter=20, accuracy=1.0e-4, \
adaptive=False, detect_divergence=False, quiet=False)
>>> except stwcs.wcsutil.hstwcs.NoConvergence as e:
>>> print("Indices of diverging points: {}".format(e.divergent))
- >>> print("Indices of poorly converging points: {}"\
-.format(e.slow_conv))
+ >>> print("Indices of poorly converging points: {}".format(e.failed2converge))
>>> print("Best solution: {}".format(e.best_solution))
>>> print("Achieved accuracy: {}".format(e.accuracy))
>>> raise e
@@ -700,10 +690,8 @@ adaptive=False, detect_divergence=False, quiet=False)
[ 0. 0.]]
Traceback (innermost last):
File "<console>", line 8, in <module>
- NoConvergence: 'HSTWCS.all_sky2pix' failed to converge to the \
-requested accuracy.
- After 20 iterations, the solution is diverging at least for one \
-input point.
+ NoConvergence: 'HSTWCS.all_world2pix' failed to converge to the requested accuracy.
+ After 20 iterations, the solution is diverging at least for one input point.
"""
#####################################################################
@@ -770,8 +758,8 @@ input point.
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
@@ -779,7 +767,7 @@ input point.
x -= dx
y -= dy
- # norm (L2) squared of the correction:
+ # norn (L2) squared of the correction:
dn2prev = dx**2+dy**2
dn2 = dn2prev
@@ -814,14 +802,15 @@ input point.
dx -= x0
dy -= y0
- # update norm (L2) squared of the correction:
+ # update norn (L2) squared of the correction:
dn2 = dx**2+dy**2
# check for divergence (we do this in two stages
# to optimize performance for the most common
# scenario when succesive approximations converge):
if detect_divergence:
- if np.any(dn2 > dn2prev):
+ ind, = np.where(dn2 <= dn2prev)
+ if ind.shape[0] < npts:
inddiv, = np.where(
np.logical_and(dn2 > dn2prev, dn2 >= accuracy2))
if inddiv.shape[0] > 0:
@@ -862,7 +851,7 @@ input point.
dx[ind] -= x0[ind]
dy[ind] -= y0[ind]
- # update norm (L2) squared of the correction:
+ # update norn (L2) squared of the correction:
dn2 = dx**2+dy**2
# update indices of elements that still need correction:
@@ -917,18 +906,18 @@ input point.
np.seterr(invalid = old_invalid, over = old_over)
if inddiv is None:
- raise NoConvergence("'HSTWCS.all_sky2pix' failed to " \
+ raise NoConvergence("'HSTWCS.all_world2pix' failed to " \
"converge to the requested accuracy after {:d} " \
"iterations.".format(k), best_solution = sol, \
- accuracy = err, niter = k, slow_conv = ind, \
+ accuracy = err, niter = k, failed2converge = ind, \
divergent = None)
else:
- raise NoConvergence("'HSTWCS.all_sky2pix' failed to " \
+ raise NoConvergence("'HSTWCS.all_world2pix' failed to " \
"converge to the requested accuracy.{0:s}" \
"After {1:d} iterations, the solution is diverging " \
"at least for one input point." \
.format(os.linesep, k), best_solution = sol, \
- accuracy = err, niter = k, slow_conv = ind, \
+ accuracy = err, niter = k, failed2converge = ind, \
divergent = inddiv)
#####################################################################
@@ -942,20 +931,19 @@ input point.
else:
return np.dstack( [x, y] )[0]
-
def _updatehdr(self, ext_hdr):
#kw2add : OCX10, OCX11, OCY10, OCY11
# record the model in the header for use by pydrizzle
- ext_hdr.update('OCX10', self.idcmodel.cx[1,0])
- ext_hdr.update('OCX11', self.idcmodel.cx[1,1])
- ext_hdr.update('OCY10', self.idcmodel.cy[1,0])
- ext_hdr.update('OCY11', self.idcmodel.cy[1,1])
- ext_hdr.update('IDCSCALE', self.idcmodel.refpix['PSCALE'])
- ext_hdr.update('IDCTHETA', self.idcmodel.refpix['THETA'])
- ext_hdr.update('IDCXREF', self.idcmodel.refpix['XREF'])
- ext_hdr.update('IDCYREF', self.idcmodel.refpix['YREF'])
- ext_hdr.update('IDCV2REF', self.idcmodel.refpix['V2REF'])
- ext_hdr.update('IDCV3REF', self.idcmodel.refpix['V3REF'])
+ ext_hdr['OCX10'] = self.idcmodel.cx[1,0]
+ ext_hdr['OCX11'] = self.idcmodel.cx[1,1]
+ ext_hdr['OCY10'] = self.idcmodel.cy[1,0]
+ ext_hdr['OCY11'] = self.idcmodel.cy[1,1]
+ ext_hdr['IDCSCALE'] = self.idcmodel.refpix['PSCALE']
+ ext_hdr['IDCTHETA'] = self.idcmodel.refpix['THETA']
+ ext_hdr['IDCXREF'] = self.idcmodel.refpix['XREF']
+ ext_hdr['IDCYREF'] = self.idcmodel.refpix['YREF']
+ ext_hdr['IDCV2REF'] = self.idcmodel.refpix['V2REF']
+ ext_hdr['IDCV3REF'] = self.idcmodel.refpix['V3REF']
def printwcs(self):
"""
diff --git a/lib/stwcs/wcsutil/mosaic.py b/lib/stwcs/wcsutil/mosaic.py
index 18a4e28..5f15f2f 100644
--- a/lib/stwcs/wcsutil/mosaic.py
+++ b/lib/stwcs/wcsutil/mosaic.py
@@ -96,9 +96,9 @@ def updatehdr(fname, wcsobj, wkey, wcsname, ext=1, clobber=False):
hwcs = wcs2header(wcsobj)
wcsnamekey = 'WCSNAME' + wkey
- f[ext].header.update(key=wcsnamekey, value=wcsname)
+ f[ext].header[wcsnamekey] = wcsname
for k in hwcs.keys():
- f[ext].header.update(key=k[:7]+wkey, value=hwcs[k])
+ f[ext].header[k[:7]+wkey] = hwcs[k]
f.close()
@@ -108,12 +108,12 @@ def wcs2header(wcsobj):
if wcsobj.wcs.has_cd():
altwcs.pc2cd(h)
- h.update('CTYPE1', 'RA---TAN')
- h.update('CTYPE2', 'DEC--TAN')
+ h['CTYPE1'] = 'RA---TAN'
+ h['CTYPE2'] = 'DEC--TAN'
norient = np.rad2deg(np.arctan2(h['CD1_2'],h['CD2_2']))
#okey = 'ORIENT%s' % wkey
okey = 'ORIENT'
- h.update(key=okey, value=norient)
+ h[okey] = norient
return h
def readWCS(input, exts=None, extname=None):
diff --git a/lib/stwcs/wcsutil/wcscorr.py b/lib/stwcs/wcsutil/wcscorr.py
index 37ab677..c581e7f 100644
--- a/lib/stwcs/wcsutil/wcscorr.py
+++ b/lib/stwcs/wcsutil/wcscorr.py
@@ -64,11 +64,9 @@ def init_wcscorr(input, force=False):
# add new rows later
wcsext = create_wcscorr(descrip=True,numrows=numsci, padding=(numsci*numwcs) + numsci * 4)
# Assign the correct EXTNAME value to this table extension
- wcsext.header.update('TROWS', numsci * 2,
- comment='Number of updated rows in table')
- wcsext.header.update('EXTNAME', 'WCSCORR',
- comment='Table with WCS Update history')
- wcsext.header.update('EXTVER', 1)
+ wcsext.header['TROWS'] = (numsci * 2, 'Number of updated rows in table')
+ wcsext.header['EXTNAME'] = ('WCSCORR', 'Table with WCS Update history')
+ wcsext.header['EXTVER'] = 1
# define set of WCS keywords which need to be managed and copied to the table
wcs1 = stwcs.wcsutil.HSTWCS(fimg,ext=('SCI',1))
@@ -425,7 +423,7 @@ def update_wcscorr(dest, source=None, extname='SCI', wcs_id=None, active=True):
# Now populate with values from new table
upd_table.data.field(name)[old_nrows:old_nrows + new_nrows] = \
new_table.data.field(name)
- upd_table.header.update('TROWS', old_nrows + new_nrows)
+ upd_table.header['TROWS'] = old_nrows + new_nrows
# replace old extension with newly updated table extension
dest['WCSCORR'] = upd_table
@@ -463,14 +461,14 @@ def restore_file_from_wcscorr(image, id='OPUS', wcskey=''):
skey = key
else:
skey = key[:7]+wcskey
- fimg['sci',extn].header.update(skey,wcs_table.data.field(tkey)[erow])
+ fimg['sci',extn].header[skey] = wcs_table.data.field(tkey)[erow]
for key in DEFAULT_PRI_KEYS:
if key in wcs_table.data.names:
if wcskey == '':
pkey = key
else:
pkey = key[:7]+wcskey
- fimg[0].header.update(pkey,wcs_table.data.field(key)[erow])
+ fimg[0].header[pkey] = wcs_table.data.field(key)[erow]
utils.updateNEXTENDKw(fimg)
generated by cgit (git 2.34.1) at 2025-04-29 15:46:34 -0400