Changeset 17430

Timestamp:

Apr 10, 2008, 12:21:39 PM (18 years ago)

Author:

bills

Message:

need to merge chip concepts for masks too

File:

• trunk/ppMerge/src/ppMergeMask.c (modified) (1 diff)

trunk/ppMerge/src/ppMergeMask.c

@@ -370 +370 @@
         }
 
+        psList *inChips = psListAlloc(NULL);
+        for (int i=0; i < numFiles; i++) {
+            pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPMERGE.INPUT", i); // Input file
+            pmChip *chip = pmFPAviewThisChip(view, file->fpa);
+            psListAdd(inChips, PS_LIST_TAIL, chip);
+        }
+        if (!pmConceptsAverageChips(outChip, inChips, true)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to average Chip concepts.");
+            psFree(inChips);
+            goto PPMERGE_MASK_ERROR;
+        }
+        psFree(inChips);
         if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
             goto PPMERGE_MASK_ERROR;