Changeset 16691

Timestamp:

Feb 27, 2008, 3:15:35 PM (18 years ago)

Author:

Paul Price

Message:

Major difference is that not reallocating the pixel list for the
second combination --- it was destroying the list of pixels used in
scans after the first.
Removed stats specification in combinationBuffer.
Fixing asserts.
Only mask both in 2-pixel combinations if rejection is specified.

File:

• trunk/psModules/src/imcombine/pmStack.c (modified) (8 diffs)

trunk/psModules/src/imcombine/pmStack.c

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-02-28 00:15:03 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-02-28 01:15:35 $
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
  *
@@ -60 +60 @@
 }
 
-static combineBuffer *combineBufferAlloc(long numImages, // Number of images that will be combined
-                                         psStatsOptions stat // Statistic to use
+static combineBuffer *combineBufferAlloc(long numImages // Number of images that will be combined
     )
 {
@@ -231 +230 @@
     assert(inputs);
     assert(numIter >= 0);
-    assert(rej > 0);
     assert(buffer);
     assert((useVariance && variance) || !useVariance);
@@ -311 +309 @@
               }
           }
-          if (useVariance && safe) {
+          if (useVariance && safe && numIter > 0) {
               // Use variance to check that the two are consistent
               float diff = pixelData->data.F32[0] - pixelData->data.F32[1];
@@ -542 +540 @@
     PS_ASSERT_INT_NONNEGATIVE(numIter, false);
     if (isnan(rej)) {
-        PS_ASSERT_INT_EQUAL(numIter, 0);
+        PS_ASSERT_INT_EQUAL(numIter, 0, false);
     } else {
         PS_ASSERT_FLOAT_LARGER_THAN(rej, 0.0, false);
@@ -598 +596 @@
 
     // Buffer for combination
-    combineBuffer *buffer = combineBufferAlloc(num, numIter == 0 ? PS_STAT_SAMPLE_MEAN :
-                                               PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_MEDIAN);
+    combineBuffer *buffer = combineBufferAlloc(num);
 
     if (havePixels) {
@@ -615 +612 @@
             }
             pixels = psPixelsConcatenate(pixels, data->pixels);
-            data->pixels = psPixelsRealloc(data->pixels, PIXEL_LIST_BUFFER); // Just in case more rejection
         }
         for (int i = 0; i < pixels->n; i++) {
@@ -627 +623 @@
                           maskVal, bad, numIter, rej, useVariance, safe, buffer);
         }
-        psTrace("psModules.imcombine", 5, "Additional %ld pixels fixed.\n", pixels->n);
         psFree(pixels);
         psFree(pixelMap);