Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/psModules/src/imcombine/pmStack.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/imcombine/pmStack.c (modified) (3 diffs)

branches/cnb_branches/cnb_branch_20090301/psModules/src/imcombine/pmStack.c

@@ -34 +34 @@
 
 //#define TESTING                         // Enable test output
-//#define TEST_X 2318                     // x coordinate to examine
-//#define TEST_Y 2306                     // y coordinate to examine
+//#define TEST_X 1085                     // x coordinate to examine
+//#define TEST_Y 3371                     // y coordinate to examine
 
 
@@ -265 +265 @@
 
     int numBad = frac * numGood + 0.5;  // Number of bad values
-    int low = numBad / 2, high = low + numGood; // Indices (modulo masked pixels) delimiting range of interest
+    int low = numBad / 2, high = low + numGood - numBad; // Indices (modulo masked pixels)
 
     sortBuffer = psVectorSortIndex(sortBuffer, values);
@@ -536 +536 @@
 #ifdef TESTING
                   if (x == TEST_X && y == TEST_Y) {
-                      fprintf(stderr, "Rejection limit: %f\n", limit);
+                      fprintf(stderr, "Rejecting without variance; rejection limit: %f\n", limit);
                   }
 #endif
               } else {
+#ifdef TESTING
+                  if (x == TEST_X && y == TEST_Y) {
+                      fprintf(stderr, "Rejecting with variance...\n");
+                  }
+#endif
                   median = combinationWeightedOlympic(pixelData, pixelWeights, pixelMasks, discard, sort);
               }