Changeset 7474

Timestamp:

Jun 9, 2006, 4:38:19 PM (20 years ago)

Author:

Paul Price

Message:

Case where PHU==FPA, EXTENSIONS==NONE wasn't processing the cells.

File:

• trunk/psModules/src/camera/pmFPAConstruct.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -505 +505 @@
     pmFPALevel level = hduLevel(format);// The level for the HDUs to go
     if (level == PM_FPA_LEVEL_NONE) {
-        // No extensions --- we're done
+        // No extensions.  We're done unless PHU == FPA, in which case we need to process the contents
+        if (strcasecmp(phuType, "FPA") == 0) {
+            const char *content = psMetadataLookupStr(&mdok, format, "CONTENTS"); // Contents of the FITS file
+            if (!mdok || !content || strlen(content) == 0) {
+                psError(PS_ERR_IO, true, "Unable to find CONTENTS of type STR in the camera "
+                        "format configuration.\n");
+                return false;
+            }
+            if (processContents(fpa, chip, cell, phdu, level, content, format) < 0) {
+                psError(PS_ERR_IO, false, "Error setting contents.\n");
+                return false;
+            }
+        }
         return true;
     }