Changeset 7226

Timestamp:

May 25, 2006, 4:48:47 PM (20 years ago)

Author:

Paul Price

Message:

Extending the block on writing certain FITS headers to tables;
blocking all keywords that start with a certain string (e.g., NAXIS,
to block NAXIS1, NAXIS2, NAXIS3, NAXIS23, etc).

File:

• trunk/psLib/src/fits/psFitsHeader.c (modified) (3 diffs)

trunk/psLib/src/fits/psFitsHeader.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-26 00:48:20 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-26 02:48:47 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -32 +32 @@
 
 // List of FITS header keys that may be duplicated; NULL-terminated
-static char *duplicateFitsKeys[] = {"COMMENT", "HIERARCH", "HISTORY", "", NULL};
+static char *duplicateFitsKeys[] = {"COMMENT", "HIERARCH", "HISTORY", NULL};
 
 // List of FITS header keys not to write (handled by cfitsio); NULL-terminated
-// XXX: Need to add table-related keywords here.
-static char *noWriteFitsKeys[] = {"SIMPLE", "BITPIX", "NAXIS", "NAXIS1", "NAXIS2", "NAXIS3", "EXTNAME",
-                                  "BSCALE", "BZERO", NULL};
+static char *noWriteFitsKeys[] = {"SIMPLE", "XTENSION", "BITPIX", "NAXIS", "EXTNAME", "BSCALE", "BZERO",
+                                  "TFIELDS", NULL};
+// List of the start of FITS header keys not to write (handled by cfitsio); NULL-terminated
+static char *noWriteFitsKeyStarts[] = {"NAXIS", "TTYPE", "TFORM", NULL};
 
 psMetadata* psFitsReadHeader(psMetadata* out,
@@ -261 +262 @@
             }
         }
+        // Also block out TTYPEn, NAXISn, etc --- keywords that start with a certain sequence
+        for (int i = 0; noWriteFitsKeyStarts[i] && writeKey; i++) {
+            if (strncmp(item->name, noWriteFitsKeyStarts[i], strlen(noWriteFitsKeyStarts[i])) == 0) {
+                writeKey = false;
+            }
+        }
         if (!writeKey) {
             // Don't write it; skip to the next key