Changeset 7717 for trunk/psModules/src/camera/pmFPACopy.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/pmFPACopy.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPACopy.c

@@ -32 +32 @@
 }
 
-static pmHDU *findPHU(const pmCell *cell// The cell for which to find the PHU
-                     )
+static pmHDU *findBlankPHU(const pmCell *cell// The cell for which to find the PHU
+                          )
 {
     assert(cell);
 
-    if (cell->hdu && cell->hdu->phu) {
+    if (cell->hdu && cell->hdu->blankPHU) {
         return cell->hdu;
     }
     pmChip *chip = cell->parent;        // The parent chip
-    if (chip->hdu && chip->hdu->phu) {
+    if (chip->hdu && chip->hdu->blankPHU) {
         return chip->hdu;
     }
     pmFPA *fpa = chip->parent;  // The parent FPA
-    if (fpa->hdu && fpa->hdu->phu) {
+    if (fpa->hdu && fpa->hdu->blankPHU) {
         return fpa->hdu;
     }
@@ -261 +261 @@
     }
     // Copy the PHU over as well, if required
-    pmHDU *targetPHU = findPHU(target); // The target PHU
+    pmHDU *targetPHU = findBlankPHU(target); // The target PHU
     if (targetPHU && targetPHU != targetHDU && !targetPHU->header) {
-        pmHDU *sourcePHU = findPHU(source); // The source PHU
+        pmHDU *sourcePHU = findBlankPHU(source); // The source PHU
         targetPHU->header = psMetadataCopy(targetPHU->header, sourcePHU->header);
     }