Changeset 16989 for trunk/ppMerge/src/ppMergeMaskAverageConcepts.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/ppMergeMaskAverageConcepts.c (modified) (3 diffs)

trunk/ppMerge/src/ppMergeMaskAverageConcepts.c

@@ -18 +18 @@
 // Generate a mask
 bool ppMergeMaskAverageConcepts(ppMergeData *data,  // Data
-                                ppMergeOptions *options, // Options
-                                pmConfig *config    // Configuration
+                                ppMergeOptions *options, // Options
+                                pmConfig *config    // Configuration
     )
 {
@@ -38 +38 @@
         while ((cellOut = pmFPAviewNextCell(view, fpaOut, 1))) {
 
+            pmHDU *hdu = pmHDUGetLowest(fpaOut, chipOut, cellOut);
+            if (!hdu || hdu->blankPHU) {
+                continue;
+            }
+
             // Get list of cells for concepts averaging
-            psList *inCells = psListAlloc(NULL); // List of cells
-            for (int i = 0; i < filenames->n; i++) {
-                if (! filenames->data[i] || strlen(filenames->data[i]) == 0) {
-                    continue;
-                }
-                pmCell *cellIn = pmFPAviewThisCell(view, data->in->data[i]); // Input cell
-                psListAdd(inCells, PS_LIST_TAIL, cellIn);
-            }
-            if (!pmConceptsAverageCells(cellOut, inCells, NULL, NULL, true)) {
-                psError(PS_ERR_UNKNOWN, false, "Unable to average cell concepts.");
-                psFree(inCells);
-                return false;
-            }
-            psFree(inCells);
+            psList *inCells = psListAlloc(NULL); // List of cells
+            for (int i = 0; i < filenames->n; i++) {
+                if (! filenames->data[i] || strlen(filenames->data[i]) == 0) {
+                    continue;
+                }
+                pmCell *cellIn = pmFPAviewThisCell(view, data->in->data[i]); // Input cell
+                psListAdd(inCells, PS_LIST_TAIL, cellIn);
+            }
+            if (!pmConceptsAverageCells(cellOut, inCells, NULL, NULL, true)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to average cell concepts.");
+                psFree(inCells);
+                return false;
+            }
+            psFree(inCells);
         }
     }
@@ -59 +64 @@
     psList *inFPAs = psListAlloc(NULL); // List of FPAs
     for (int i = 0; i < filenames->n; i++) {
-        if (! filenames->data[i] || strlen(filenames->data[i]) == 0) {
-            continue;
-        }
-        pmFPA *fpaIn = data->in->data[i]; // Input FPA
-        psListAdd(inFPAs, PS_LIST_TAIL, fpaIn);
+        if (! filenames->data[i] || strlen(filenames->data[i]) == 0) {
+            continue;
+        }
+        pmFPA *fpaIn = data->in->data[i]; // Input FPA
+        psListAdd(inFPAs, PS_LIST_TAIL, fpaIn);
     }
 
     if (!pmConceptsAverageFPAs(fpaOut, inFPAs)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to average FPA concepts.");
-        psFree(inFPAs);
-        return false;
+        psError(PS_ERR_UNKNOWN, false, "Unable to average FPA concepts.");
+        psFree(inFPAs);
+        return false;
     }
     psFree(inFPAs);