Changeset 16989 for trunk/ppMerge/src/ppMergeCheckInputs.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/ppMergeCheckInputs.c (modified) (1 diff)

trunk/ppMerge/src/ppMergeCheckInputs.c

@@ -106 +106 @@
         }
 
-        data->in->data[i] = pmFPAConstruct(config->camera);
-        pmFPAview *view = pmFPAAddSourceFromHeader(data->in->data[i], header, options->format);
+        pmFPA *fpa = pmFPAConstruct(config->camera);
+        pmFPAview *view = pmFPAAddSourceFromHeader(fpa, header, options->format);
         psFree(view);
+
+        // Cull chips and cells that don't have data
+        // Otherwise the abundance of metadata in the concepts (esp. for GPC) can overload the memory
+        psArray *chips = fpa->chips; // Array of chips in output
+        for (int i = 0; i < chips->n; i++) {
+            pmChip *chip = chips->data[i]; // Chip of interest
+            psArray *cells = chip->cells; // Array of cells
+            int culled = 0;             // Number of culled cells
+            for (int j = 0; j < cells->n; j++) {
+                pmCell *cell = cells->data[j];
+                pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // HDU for cell
+                if (!hdu || hdu->blankPHU) {
+                    psFree(cell->concepts);
+                    cell->concepts = NULL;
+                    culled++;
+                }
+            }
+            if (culled == cells->n) {
+                psFree(chip->concepts);
+                chip->concepts = NULL;
+            }
+        }
+        data->in->data[i] = fpa;
+
 
         // Use the first valid input as the basis for the output --- including the header