Changeset 16855

Timestamp:

Mar 6, 2008, 1:10:08 PM (18 years ago)

Author:

eugene

Message:

warning, not error if both ZSIMPLE and ZTENSION are missing

File:

• trunk/Ohana/src/libfits/matrix/F_compress_M.c (modified) (2 diffs)

trunk/Ohana/src/libfits/matrix/F_compress_M.c

@@ -114 +114 @@
   have_ztension = gfits_scan (header, "ZTENSION", "%s", 1, exttype);
 
-  if (!have_zsimple && !have_ztension) ESCAPE;
-  if ( have_zsimple &&  have_ztension) ESCAPE;
+  // this is a very bogus case: we cannot have both keywords
+  if (have_zsimple && have_ztension) ESCAPE;
+
+  // if neither are present, we have an image that is not really following the standard:
+  // assume it is a PHU
+  if (!have_zsimple && !have_ztension) {
+    header->simple = TRUE;
+    gfits_extended_to_primary (header, header->simple, "Image data");
+
+    MOD_KEYWORD ("ZEXTEND",  "EXTEND",   "%t", &header->extend, header->extend);
+    MOD_KEYWORD ("ZBLOCKED", "BLOCKED",  "%t", &header->extend, header->extend);
+  }
 
   // have_zsimple : image comes from a PHU
@@ -125 +135 @@
     MOD_KEYWORD ("ZEXTEND",  "EXTEND",   "%t", &header->extend, header->extend);
     MOD_KEYWORD ("ZBLOCKED", "BLOCKED",  "%t", &header->extend, header->extend);
-  } else {
+  } 
+
+  // have_ztension : image comes from an extension
+  if (have_ztension) {
     gfits_delete (header, "ZTENSION", 1);
     gfits_modify_extended (header, exttype, "Image extension");