Changeset 7849 for trunk/psModules/src/imcombine/pmReadoutCombine.c

Timestamp:

Jul 7, 2006, 7:21:12 PM (20 years ago)

Author:

Paul Price

Message:

Adding pmConceptsAverageCells() from previous cellConcepts() in pmFPAMosaic: given a list of cells, find a reasonable combination of the concepts. This is used in pmFPAMosaic and now also pmReadoutCombine.

File:

• trunk/psModules/src/imcombine/pmReadoutCombine.c (modified) (3 diffs)

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-04 00:19:11 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-07-08 05:21:12 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -18 +18 @@
 #include "pmFPA.h"
 #include "pmFPAMaskWeight.h"
+#include "pmConceptsAverage.h"
 
 #include "pmReadoutCombine.h"
@@ -396 +397 @@
     psFree(mask);
     psFree(weights);
-
     psFree(stats);
+
+    // Update the "concepts"
+    psList *inputCells = psListAlloc(NULL); // List of cells
+    for (long i = 0; i < inputs->n; i++) {
+        pmReadout *readout = inputs->data[i]; // Readout of interest
+        psListAdd(inputCells, PS_LIST_TAIL, readout->parent);
+    }
+    pmConceptsAverageCells(output->parent, inputCells, 0, 0, NULL, NULL);
+    psFree(inputCells);
 
     return true;