Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/ppStack/src/ppStackMatch.c

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackMatch.c (modified) (3 diffs)

branches/eam_branches/ps2-tc3-20130727/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.
@@ -467 +471 @@
                 sum += kernels->rms;
                 num++;
-                //              psLogMsg("ppStack", PS_LOG_INFO, "KERNMATCHDUMP %d %d %g %g %g\n",
-                //                       index,num,kernels->mean,kernels->rms,sum);
+                //                              psLogMsg("ppStack", PS_LOG_INFO, "KERNMATCHDUMP %d %d %g %g %g %g\n",
+                //                                       index,num,kernels->mean,kernels->rms,sum,psImageCovarianceFactor(readout->covariance));
             }
             psFree(iter);
-            options->matchChi2->data.F32[index] = sum / (psImageCovarianceFactor(readout->covariance) * num);
+
+            // Apply the covariance factor to the chi^2 value
+            double covar_factor = 1.0;
+            if (type != PM_SUBTRACTION_KERNEL_SIMPLE) { // Except if we're using simple kernels.
+              covar_factor = psImageCovarianceFactor(readout->covariance);
+            }
+            options->matchChi2->data.F32[index] = sum / (covar_factor * num);
 
         }