Changeset 7289

Timestamp:

Jun 1, 2006, 5:27:46 PM (20 years ago)

Author:

Paul Price

Message:

Remove SIMPLE from the list of banned keywords, but ensure it's a boolean type.

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.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-01 21:56:59 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-02 03:27:46 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -36 +36 @@
 
 // List of FITS header keys not to write (handled by cfitsio); NULL-terminated
-static char *noWriteFitsKeys[] = {"SIMPLE", "XTENSION", "BITPIX", "NAXIS", "EXTNAME", "BSCALE", "BZERO",
+static char *noWriteFitsKeys[] = {"XTENSION", "BITPIX", "NAXIS", "EXTNAME", "BSCALE", "BZERO",
                                   "TFIELDS", NULL};
 // List of the start of FITS header keys not to write (handled by cfitsio); NULL-terminated
@@ -282 +282 @@
         }
 
+        // We allow the user to write SIMPLE, but it must be boolean
+        if (strcmp(item->name, "SIMPLE") == 0 && item->type != PS_DATA_BOOL) {
+            psError(PS_ERR_BAD_PARAMETER_TYPE, true, "SIMPLE in a FITS header must be of boolean type: not "
+                    "%x --- ignored.\n", item->type);
+            continue;
+        }
+
         switch (item->type) {
         case PS_DATA_BOOL: {