Changeset 19439 for branches/pap_branch_080908/psModules/src/imcombine/pmStack.c

Timestamp:

Sep 9, 2008, 10:40:17 AM (18 years ago)

Author:

Paul Price

Message:

Wasn't using variance factors when comparing 2 values.

File:

• branches/pap_branch_080908/psModules/src/imcombine/pmStack.c (modified) (3 diffs)

branches/pap_branch_080908/psModules/src/imcombine/pmStack.c

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-09-03 19:42:54 $
+ *  @version $Revision: 1.38.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-09-09 20:40:17 $
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
  *
@@ -309 +309 @@
               }
           }
-          if (useVariance && safe && numIter > 0) {
+          if (useVariance && numIter > 0) {
               // Use variance to check that the two are consistent
               float diff = pixelData->data.F32[0] - pixelData->data.F32[1];
-              float sigma2 = pixelVariances->data.F32[0] + pixelVariances->data.F32[1];
+              float sigma2 = pixelVariances->data.F32[0] * varFactors->data.F32[0] +
+                  pixelVariances->data.F32[1] * varFactors->data.F32[1];
               if (PS_SQR(diff) > PS_SQR(rej) * sigma2) {
                   // Not consistent: mark both for inspection
@@ -354 +355 @@
               float median, stdev;    // Median and stdev of the combination, for rejection
 
-              if (!combinationMedianStdev(&median, useVariance ? NULL : &stdev, pixelData, pixelMasks, sort)) {
+              if (!combinationMedianStdev(&median, useVariance ? NULL : &stdev,
+                                          pixelData, pixelMasks, sort)) {
                   psWarning("Bad median/stdev at %d,%d", x, y);
                   break;