summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordencheva <dencheva@stsci.edu>2011-12-02 17:25:22 -0500
committerdencheva <dencheva@stsci.edu>2011-12-02 17:25:22 -0500
commitc4d1a04cb9cc7c6edd8d19f4dd23f26a1a051384 (patch)
tree47cf140d2570b9ebca0aaef6d830f5157b90344a
parenteedb9c9a8aa22fc8cdf314de58d7eea1de2f7f8d (diff)
downloadstwcs_hcf-c4d1a04cb9cc7c6edd8d19f4dd23f26a1a051384.tar.gz
If HDRNAME is not provided, it is set to WCSNAME : write_headerlet, archive_as_headerlet
git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/stsci_python/trunk/stwcs@14047 fe389314-cf27-0410-b35b-8c050e845b92
-rw-r--r--lib/stwcs/wcsutil/headerlet.py28
1 files changed, 7 insertions, 21 deletions
diff --git a/lib/stwcs/wcsutil/headerlet.py b/lib/stwcs/wcsutil/headerlet.py
index 9daf7cd..e5d1d03 100644
--- a/lib/stwcs/wcsutil/headerlet.py
+++ b/lib/stwcs/wcsutil/headerlet.py
@@ -750,15 +750,7 @@ def write_headerlet(filename, hdrname, output=None, sciext='SCI',
print ' needs to be specified. '
print '='*60
raise ValueError
-
- if hdrname in [None, ' ','']:
- print '='*60
- print '[write_headerlet]'
- print 'No valid name for this headerlet was provided for %s.' % fname
- print ' A valid value for "hdrname" needs to be specified. '
- print '='*60
- raise ValueError
-
+
# Translate 'wcskey' value for PRIMARY WCS to valid altwcs value of ' '
if wcskey == 'PRIMARY':
wcskey = ' '
@@ -781,7 +773,9 @@ def write_headerlet(filename, hdrname, output=None, sciext='SCI',
wname = scihdr['wcsname'+wcskey]
else:
wname = wcsname
-
+ if hdrname in [None, ' ', '']:
+ hdrname = wcsname
+
print 'Creating the headerlet from image :', fname
hdrletobj = create_headerlet(fobj, sciext=sciext,
wcsname=wname, wcskey=wcskey,
@@ -1699,16 +1693,6 @@ def archive_as_headerlet(filename, hdrname, sciext='SCI',
fobj.close()
raise ValueError
- if hdrname in [None, ' ', '']:
- print '='*60
- print '[archive_as_headerlet]'
- print 'No valid name for this headerlet was provided for %s.' % fname
- print ' A valid value for "hdrname" needs to be specified. '
- print '='*60
- if close_fobj:
- fobj.close()
- raise ValueError
-
# Translate 'wcskey' value for PRIMARY WCS to valid altwcs value of ' '
if wcskey == 'PRIMARY':
wcskey = ' '
@@ -1719,7 +1703,9 @@ def archive_as_headerlet(filename, hdrname, sciext='SCI',
if wcsname is None:
scihdr = fobj[sciext, 1].header
wcsname = scihdr['wcsname'+wcskey]
-
+
+ if hdrname in [None, ' ', '']:
+ hdrname = wcsname
# Check to see whether or not a HeaderletHDU with this hdrname already
# exists