Changeset 23199 for branches/cnb_branches/cnb_branch_20090215/ppMerge/src/ppMergeLoop_Threaded.c

Timestamp:

Mar 5, 2009, 11:24:29 AM (17 years ago)

Author:

beaumont

Message:

sync with mainline

Location:

branches/cnb_branches/cnb_branch_20090215

Files:

• . (modified) (1 prop)
• ppMerge/src/ppMergeLoop_Threaded.c (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090215/ppMerge/src/ppMergeLoop_Threaded.c

@@ -137 +137 @@
     assert(output && output->fpa);
     pmFPA *outFPA = output->fpa;        ///< Output FPA
+    pmHDU *lastHDU = NULL;              // Last HDU that was updated
     int cellNum = 0;                    ///< Index of cell
     if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
@@ -156 +157 @@
                 // No data here
                 continue;
+            }
+
+            // Update the header
+            {
+                pmHDU *hdu = pmHDUGetHighest(outFPA, outChip, outCell); // HDU for file
+                if (hdu && hdu != lastHDU) {
+                    ppMergeVersionHeader(hdu->header);
+                    lastHDU = hdu;
+                }
             }