Changeset 6932 for trunk/psModules/src/astrom/pmFPARead.c

Timestamp:

Apr 20, 2006, 12:33:34 PM (20 years ago)

Author:

Paul Price

Message:

Using pmCellReadHeader now, to ensure all cells get updated 'concepts' following the header read.

File:

• trunk/psModules/src/astrom/pmFPARead.c (modified) (3 diffs)

trunk/psModules/src/astrom/pmFPARead.c

@@ -10 +10 @@
 #include "pmConcepts.h"
 #include "psRegionIsBad.h"
-#include "pmHDUUtils.h"
+#include "pmFPAHeader.h"
 
 #define MAX(x,y) ((x) > (y) ? (x) : (y))
@@ -87 +87 @@
     // Get the HDU and read the header
     pmCell *cell = readout->parent;     // The parent cell
+    if (!pmCellReadHeader(cell, fits)) {
+        psError(PS_ERR_IO, false, "Unable to read header for cell!\n");
+        return false;
+    }
+
     pmHDU *hdu = pmHDUFromCell(cell);   // The HDU
     if (!hdu) {
@@ -92 +97 @@
     }
 
-    if (!hdu->header) {
-        if (!pmHDUReadHeader(hdu, fits)) {
-            psError(PS_ERR_IO, false, "Unable to read HDU header!\n");
-            return false;
-        }
-        pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, false, NULL);
-    }
+    // Make sure we have the information we need
+    pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, false, NULL);
 
     // Get the trim and bias sections