Changeset 19454

Timestamp:

Sep 10, 2008, 8:17:54 AM (18 years ago)

Author:

Paul Price

Message:

Include variance factors in the variance.

File:

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

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

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.38.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-09-09 20:40:17 $
+ *  @version $Revision: 1.38.2.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-09-10 18:17:54 $
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
  *
@@ -265 +265 @@
         pixelData->data.F32[num] = image->data.F32[yIn][xIn];
         if (variance) {
-            pixelVariances->data.F32[num] = variance->data.F32[yIn][xIn];
+            pixelVariances->data.F32[num] = variance->data.F32[yIn][xIn] * varFactors->data.F32[i];
         }
         pixelWeights->data.F32[num] = data->weight;
@@ -312 +312 @@
               // 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] * varFactors->data.F32[0] +
-                  pixelVariances->data.F32[1] * varFactors->data.F32[1];
+              float sigma2 = pixelVariances->data.F32[0] + pixelVariances->data.F32[1];
               if (PS_SQR(diff) > PS_SQR(rej) * sigma2) {
                   // Not consistent: mark both for inspection
@@ -342 +341 @@
                   float rej2 = PS_SQR(rej); // Rejection level squared
                   for (int i = 0; i < num; i++) {
-                      pixelVariances->data.F32[i] *= rej2 * varFactors->data.F32[i];
+                      pixelVariances->data.F32[i] *= rej2;
                   }
               }
@@ -349 +348 @@
           // The clipping that follows is solely to identify suspect pixels.
           // These suspect pixels will be inspected in more detail by other functions.
-          int numClipped = INT_MAX;       // Number of pixels clipped per iteration
-          int totalClipped = 0;           // Total number of pixels clipped
+          int numClipped = INT_MAX;     // Number of pixels clipped per iteration
+          int totalClipped = 0;         // Total number of pixels clipped
+          float rej2 = PS_SQR(rej);     // Rejection level squared
           for (int i = 0; i < numIter && numClipped > 0 && num - totalClipped > 2; i++) {
               numClipped = 0;
@@ -361 +361 @@
               }
 
-              float limit = NAN;        // Rejection limit, when rejecting based on data properties
-              if (!useVariance) {
-                  limit = rej * stdev;
-              }
+              float limit = rej * stdev; // Rejection limit, when rejecting based on data properties
 
 // Mask a pixel for inspection
@@ -380 +377 @@
                   if (useVariance) {
                       // Comparing squares --- cheaper than lots of sqrts
-                      if (PS_SQR(diff) > pixelVariances->data.F32[j]) {
+                      if (PS_SQR(diff) > rej2 * pixelVariances->data.F32[j]) {
                           MASK_PIXEL_FOR_INSPECTION();
                       }