Changeset 15163

Timestamp:

Oct 2, 2007, 10:20:07 AM (19 years ago)

Author:

Paul Price

Message:

pmFPAviewFitsWritePHU was writing a PHU, even if there was no blank
PHU. This means that it was writing twice!

File:

• branches/pap_branch_070920/psModules/src/camera/pmFPAfileFitsIO.c (modified) (1 diff)

branches/pap_branch_070920/psModules/src/camera/pmFPAfileFitsIO.c

@@ -471 +471 @@
     if (file->wrote_phu) return true;
 
-    // select or generate the desired fpa in the correct output format 
+    // select or generate the desired fpa in the correct output format
     pmFPA *fpa = pmFPAfileSuitableFPA(file, view, config);
+    pmHDU *phu = pmFPAviewThisHDU(view, fpa);
+    if (!phu || !phu->blankPHU) {
+        // No PHU to write!
+        psFree(fpa);
+        return true;
+    }
 
     switch (file->fileLevel) {
       case PM_FPA_LEVEL_FPA:
-        status = pmFPAWrite(fpa, file->fits, NULL, true, false);
-        break;
+        status = pmFPAWrite(fpa, file->fits, NULL, true, false);
+        break;
       case PM_FPA_LEVEL_CHIP: {
-          pmChip *chip = pmFPAviewThisChip(view, fpa);
-          status = pmChipWrite(chip, file->fits, NULL, true, false);
-          break;
+          pmChip *chip = pmFPAviewThisChip(view, fpa);
+          status = pmChipWrite(chip, file->fits, NULL, true, false);
+          break;
       }
       case PM_FPA_LEVEL_CELL: {
-          pmCell *cell = pmFPAviewThisCell(view, fpa);
-          status = pmCellWrite(cell, file->fits, NULL, true);
-          break;
+          pmCell *cell = pmFPAviewThisCell(view, fpa);
+          status = pmCellWrite(cell, file->fits, NULL, true);
+          break;
       }
       default:
-        psAbort("fileLevel not correctly set");
-        break;
+        psAbort("fileLevel not correctly set");
+        break;
     }