Changeset 27517 for branches/eam_branches/20100225/psModules/src/imcombine/pmSubtractionEquation.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• psModules/src/imcombine/pmSubtractionEquation.c (modified) (5 diffs)

branches/eam_branches/20100225/psModules/src/imcombine/pmSubtractionEquation.c

@@ -1003 +1003 @@
             psFree(stats);
 
+#ifdef TESTING
             fprintf(stderr, "Norm: %lf\n", normValue);
-
+#endif
             // Solve kernel components
             for (int i = 0; i < numSolution1; i++) {
@@ -1048 +1049 @@
         }
 
+        psFree(norms);
         psFree(solution);
         psFree(sumVector);
@@ -1147 +1149 @@
             psFree(stats);
 
+#ifdef TESTING
             fprintf(stderr, "Norm: %lf\n", normValue);
+#endif
 
             // Solve kernel components
@@ -1328 +1332 @@
             int n = stamps->num - i - 1;
             keepStamps->data.S32[index->data.S32[n]] = 1;
-            fprintf (stderr, "keeping %d (%d of %d)\n", index->data.S32[n], n, 9);
         }
         psFree (flux);
@@ -1519 +1522 @@
 
     }
+
+    psFree(keepStamps);
 
     psLogMsg("psModules.imcombine", PS_LOG_DETAIL, "%s", log);