Changeset 15308

Timestamp:

Oct 12, 2007, 4:42:29 PM (19 years ago)

Author:

Paul Price

Message:

Average concepts for FPA.

Location:

trunk/ppMerge/src

Files:

• ppMergeCombine.c (modified) (2 diffs)
• ppMergeConfig.c (modified) (1 diff)

trunk/ppMerge/src/ppMergeCombine.c

@@ -212 +212 @@
                 psTrace("ppMerge", 5, "Chip %d, cell %d, scan %d\n", view->chip, view->cell, numScan);
                 if (numRead > 0) {
-
                     if (options->shutter) {
                         pmShutterCorrectionGenerate(readout, NULL, stack, shutterRef, shutters->data[cellNum],
@@ -365 +364 @@
     psFree(rng);
 
+
+    // Get list of FPAs for concepts averaging
+    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 (!pmConceptsAverageFPAs(fpa, inFPAs)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to average FPA concepts.");
+        psFree(inFPAs);
+        return false;
+    }
+    psFree(inFPAs);
+
+
     return true;
 

trunk/ppMerge/src/ppMergeConfig.c

@@ -59 +59 @@
 
     psMetadataCopy(config->arguments, arguments);
+    psFree(arguments);
 
     // Everything remaining must be input files