Changeset 8863 for trunk/psModules/src/camera/pmFPAMosaic.c

Timestamp:

Sep 20, 2006, 2:49:44 PM (20 years ago)

Author:

Paul Price

Message:

Having mosaicked, conform the header appropriately so it will be recognised.

File:

• trunk/psModules/src/camera/pmFPAMosaic.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAMosaic.c

@@ -11 +11 @@
 #include "pmHDUUtils.h"
 #include "pmFPAMosaic.h"
+#include "pmConfig.h"
 
 #define CELL_LIST_BUFFER 50             // Buffer size for cell lists
@@ -1050 +1051 @@
     pmHDU *targetHDU = pmHDUFromChip(target); // The HDU for the target
     targetHDU->header = psMetadataCopy(targetHDU->header, sourceHDU->header);
+    pmHDU *phu = pmHDUGetHighest(target->parent, target, NULL);
+    if (!phu || !phu->header) {
+        psError(PS_ERR_UNKNOWN, true, "Unable to find HDU after mosaicking.\n");
+        return false;
+    }
+    if (!pmConfigConformHeader(phu->header, phu->format)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to conform header after mosaicking.\n");
+        return false;
+    }
 
     return true;
@@ -1178 +1188 @@
     targetHDU->header = psMetadataCopy(targetHDU->header, sourceHDU->header);
 
+    if (!pmConfigConformHeader(targetHDU->header, targetHDU->format)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to conform header after mosaicking.\n");
+        return false;
+    }
+
     return true;
 }