diff options
| author | dencheva <dencheva@stsci.edu> | 2011-08-08 14:27:04 -0400 |
|---|---|---|
| committer | dencheva <dencheva@stsci.edu> | 2011-08-08 14:27:04 -0400 |
| commit | 111dea345f93e16abe246ca45d61e5bd2d696b0d (patch) | |
| tree | 4041bfd3257b71b676431e6d5a1ec54daed0b709 /lib/stwcs/updatewcs | |
| parent | 16c452455ab123b88ea1eb9ded5096114277afcd (diff) | |
| download | stwcs_hcf-111dea345f93e16abe246ca45d61e5bd2d696b0d.tar.gz | |
Removed parameter clobber in restoreWCS, so that it always overwrites the primary WCS. Not passing input parameter check now raises an Error. Not findong a wcskey raises a KeyError.
git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/stsci_python/trunk/stwcs@13537 fe389314-cf27-0410-b35b-8c050e845b92
Diffstat (limited to 'lib/stwcs/updatewcs')
| -rw-r--r-- | lib/stwcs/updatewcs/__init__.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/stwcs/updatewcs/__init__.py b/lib/stwcs/updatewcs/__init__.py index ac4ea91..0d6e08e 100644 --- a/lib/stwcs/updatewcs/__init__.py +++ b/lib/stwcs/updatewcs/__init__.py @@ -106,7 +106,6 @@ def updatewcs(input, vacorr=True, tddcorr=True, npolcorr=True, d2imcorr=True, logger.warning("\n\tNew IDCTAB file detected. All current WCSs will be deleted") cleanWCS(f) - #restore the original WCS keywords makecorr(f, acorr, wkey=wcskey, wname=wcsname, clobber=False) return files @@ -137,7 +136,7 @@ def makecorr(fname, allowed_corr, wkey=" ", wname=" ", clobber=False): #wcsutil.restoreWCS(f, ext=[], wcskey='O', clobber=True) #Determine the reference chip and create the reference HSTWCS object nrefchip, nrefext = getNrefchip(f) - wcsutil.restoreWCS(f, nrefext, wcskey='O', clobber=True) + wcsutil.restoreWCS(f, nrefext, wcskey='O') rwcs = HSTWCS(fobj=f, ext=nrefext) rwcs.readModel(update=True,header=f[nrefext].header) @@ -156,7 +155,7 @@ def makecorr(fname, allowed_corr, wkey=" ", wname=" ", clobber=False): if extn.header.has_key('extname'): extname = extn.header['extname'].lower() if extname == 'sci': - wcsutil.restoreWCS(f, ext=i, wcskey='O', clobber=True) + wcsutil.restoreWCS(f, ext=i, wcskey='O') sciextver = extn.header['extver'] ref_wcs = rwcs.deepcopy() hdr = extn.header @@ -172,7 +171,7 @@ def makecorr(fname, allowed_corr, wkey=" ", wname=" ", clobber=False): hdr.update(kw, kw2update[kw]) #if wkey is None, do not archive the primary WCS if key is not None: - wcsutil.archiveWCS(f, ext=i, wcskey=key, wcsname=name, reusekey=True) + wcsutil.archiveWCS(f, ext=i, wcskey=key, wcsname=name, reusekey=False) elif extname in ['err', 'dq', 'sdq', 'samp', 'time']: cextver = extn.header['extver'] if cextver == sciextver: |