Changeset 37067 for branches/eam_branches/ipp-ops-20130712/ppStack/src/ppStackMatch.c

Timestamp:

Jul 17, 2014, 12:32:26 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) into trunk

Location:

branches/eam_branches/ipp-ops-20130712/ppStack/src

Files:

• . (modified) (1 prop)
• ppStackMatch.c (modified) (2 diffs)

branches/eam_branches/ipp-ops-20130712/ppStack/src/ppStackMatch.c

@@ -6 +6 @@
 #define COVAR_FRAC 0.01                 // Truncation fraction for covariance matrix
 
-// #define TESTING                         // Enable debugging output
+// #define TESTING                      // Enable debugging output
 // #define TESTING_REUSE_CONV           // Enable debugging for re-using convolved outputs from previous run
-
 // #define TESTING_CZW 
 
@@ -156 +155 @@
     if (options->convolve) {
         pmReadout *conv = pmReadoutAlloc(NULL); // Conv readout, for holding results temporarily
+
+        // MEH -- earlier defn needed with new simple mode modifications to  use TESTING_REUSE_CONV...
+        //const char *typeStr = psMetadataLookupStr(NULL, ppsub, "KERNEL.TYPE"); // Kernel type
+        //pmSubtractionKernelsType type = pmSubtractionKernelsTypeFromString(typeStr); // Kernel type
+
 #ifdef TESTING_REUSE_CONV
         // This is a hack to use the temporary convolved images and kernel generated previously.