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

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -522 +522 @@
     // Case 1: PHU=FPA and EXTENSIONS=NONE.  We need to parse the single list of chip:cell:cellType entries.
     if (strcasecmp(phuType, "FPA") == 0 && strcasecmp(extType, "NONE") == 0) {
+        phdu->blankPHU = false;
         const char *contents = psMetadataLookupStr(&mdok, format, "CONTENTS"); // The contents of the file
         if (!mdok || !contents || strlen(contents) == 0) {
@@ -529 +530 @@
             return NULL;
         }
-
         if (processContents(fpa, NULL, NULL, phdu, PM_FPA_LEVEL_FPA, contents, format) < 0) {
             psError(PS_ERR_IO, false, "Error setting CONTENTS");
@@ -563 +563 @@
     // chip/cell directly from that.
     if (strcasecmp(extType, "NONE") == 0) {
+        phdu->blankPHU = false;
         pmChip *chip = NULL;        // The chip of interest
         pmCell *cell = NULL;        // The cell of interest
@@ -650 +651 @@
     // Case 3: EXTENSIONS=CHIP or EXTENSIONS=CELL.  We have extensions that we iterate through.  The CONTENTS
     // is a list of extensions.
+    phdu->blankPHU = true;
     pmChip *chip = NULL;                // The chip of interest
     pmCell *cell = NULL;                // The cell of interest