Changeset 7717 for trunk/psModules/src/camera/pmHDU.c

Timestamp:

Jun 27, 2006, 7:12:19 PM (20 years ago)

Author:

Paul Price

Message:

Changes to pmHDU and pmFPAWrite to (hopefully) fix for the last time
this horrible problem of when we write that annoying blank PHU. When
we want to write something out, there are four usage cases for the
pm{FPA,Chip,Cell}Write functions:

(1) Write the blank PHU only: blank=true, recurse=false;
(2) Write an image HDU only: blank=false, recurse=false;
(3) Write an entire file: blank=true, recurse=true; and
(4) Write only image HDUs within the file: blank=false, recurse=true.

So here, the "blank" boolean indicates whether we should write a
"blank" HDU (which consists of a header only, i.e., no pixels) when we
come across it. "recurse" is self-explanatory.

File:

• trunk/psModules/src/camera/pmHDU.c (modified) (2 diffs)

trunk/psModules/src/camera/pmHDU.c

@@ -15 +15 @@
 {
     // Deal with the PHU case
-    if (strcasecmp(hdu->extname, "PHU") == 0 || hdu->phu) {
-        if (! psFitsMoveExtNum(fits, 0, false)) {
+    if (hdu->blankPHU) {
+        if (!psFitsMoveExtNum(fits, 0, false)) {
             psError(PS_ERR_IO, false, "Unable to move to primary header!\n");
             return false;
         }
-        hdu->phu = true;
-        return true;
-    }
-
-    if (! psFitsMoveExtName(fits, hdu->extname)) {
+        return true;
+    }
+
+    if (!psFitsMoveExtName(fits, hdu->extname)) {
         psError(PS_ERR_IO, false, "Unable to move to extension %s\n", hdu->extname);
         return false;
-    }
-    // Now, just in case for some reason the PHU has an extension name that we've moved to....
-    if (psFitsGetExtNum(fits) == 0) {
-        hdu->phu = true;
-    } else {
-        hdu->phu = false;
     }
 
@@ -61 +54 @@
 
     if (!extname || strlen(extname) == 0) {
-        hdu->phu = true;
-        hdu->extname = psStringCopy("PHU");
+        hdu->blankPHU = true;
+        hdu->extname = NULL;
     } else {
-        if (strcasecmp(extname, "PHU") == 0) {
-            hdu->phu = true;
-        } else {
-            hdu->phu = false;
-        }
+        hdu->blankPHU = false;
         hdu->extname = psStringCopy(extname);
     }