Changeset 12680

Timestamp:

Mar 29, 2007, 11:59:42 AM (19 years ago)

Author:

Paul Price

Message:

Make sure header concepts are only read if they are available.

File:

• trunk/psModules/src/concepts/pmConcepts.c (modified) (3 diffs)

trunk/psModules/src/concepts/pmConcepts.c

@@ -204 +204 @@
     }
 
-    pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // Any HDU, required for the format
-    if (!hdu) {
+    // At least one HDU is required for the reading functions
+    pmHDU *hduLow = pmHDUGetLowest(fpa, chip, cell); // Lowest HDU.
+    if (!hduLow) {
         // Can't do anything --- don't record any success, but don't return an error either
         return true;
     }
+    pmHDU *hduHigh = pmHDUGetHighest(fpa, chip, cell); // Highest HDU
 
     bool success = true;                // Success in reading concepts?
@@ -229 +231 @@
     }
 
-    if (source & PM_CONCEPT_SOURCE_PHU && !(*read & PM_CONCEPT_SOURCE_PHU)) {
+    if (source & PM_CONCEPT_SOURCE_PHU && !(*read & PM_CONCEPT_SOURCE_PHU) && hduHigh->header) {
         if (p_pmConceptsReadFromHeader(target, *specs, fpa, chip, cell)) {
             *read |= PM_CONCEPT_SOURCE_PHU;
@@ -238 +240 @@
     }
 
-    if (source & PM_CONCEPT_SOURCE_HEADER && !(*read & PM_CONCEPT_SOURCE_HEADER)) {
+    // If there are multiple HDUs, then it may be that one of them hasn't been read yet (hdu->header not set)
+    if (source & PM_CONCEPT_SOURCE_HEADER && !(*read & PM_CONCEPT_SOURCE_HEADER) &&
+        hduLow != hduHigh && hduLow->header) {
         if (p_pmConceptsReadFromHeader(target, *specs, fpa, chip, cell)) {
             *read |= PM_CONCEPT_SOURCE_HEADER;