Changeset 36071 for branches/eam_branches/ipp-20130711/ppStack/src/ppStackMatch.c

Timestamp:

Aug 30, 2013, 4:48:58 PM (13 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20130711/ppStack/src/ppStackMatch.c (modified) (1 diff)

branches/eam_branches/ipp-20130711/ppStack/src/ppStackMatch.c

@@ -467 +467 @@
                 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);
 
         }