Changeset 16989 for trunk/ppMerge/src/ppMergeCombine.c

Timestamp:

Mar 13, 2008, 2:29:14 PM (18 years ago)

Author:

Paul Price

Message:

Fix for outrageous use of memory when combining GPC images --- there are so many chips and cells, each with their own concepts metadata, that the memory is filled with metadataItems. Added a purge of the ones that aren't required. Since the concepts are integral to the system, it's sometimes necessary when iterating to skip cells that have had the concepts purged.

File:

• trunk/ppMerge/src/ppMergeCombine.c (modified) (3 diffs)

trunk/ppMerge/src/ppMergeCombine.c

@@ -133 +133 @@
         while ((cell = pmFPAviewNextCell(view, fpa, 1))) {
             cellNum++;
+
+            pmHDU *hdu = pmHDUGetLowest(data->out, chip, cell); // HDU for cell
+            if (!hdu || hdu->blankPHU) {
+                pmCellWrite(cell, data->outFile, config->database, true); // Write header only
+                continue;
+            }
             if (cell->hdu) {
                 // Data will exist soon
@@ -138 +144 @@
                 chip->data_exists = cell->data_exists = true;
             }
-            pmCellWrite(cell, data->outFile, config->database, true); // Write header only
             pmReadout *readout = pmReadoutAlloc(cell); // Output readout of interest
             psArray *stack = psArrayAlloc(filenames->n); // Stack of readouts to combine
@@ -155 +160 @@
 
             // Put version metadata into header
-            pmHDU *hdu = pmHDUFromCell(cell);
             if (hdu && hdu != lastHDU) {
                 if (!hdu->header) {