Changeset 14459 for trunk/psModules/src/imcombine/pmStack.c

Timestamp:

Aug 9, 2007, 2:34:04 PM (19 years ago)

Author:

Paul Price

Message:

Was getting a SEGV when no weight map was provided (bug 901).

File:

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

trunk/psModules/src/imcombine/pmStack.c

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-07-18 03:54:01 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-08-10 00:34:04 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -226 +226 @@
         psImage *mask = data->sky->mask; // Mask of interest
         pixelData->data.F32[i] = image->data.F32[y][x];
-        pixelWeights->data.F32[i] = weight->data.F32[y][x];
+        if (weight) {
+            pixelWeights->data.F32[i] = weight->data.F32[y][x];
+        }
         pixelMasks->data.PS_TYPE_MASK_DATA[i] = mask->data.PS_TYPE_MASK_DATA[y][x];
         if (pixelMasks->data.PS_TYPE_MASK_DATA[i] & maskVal) {
@@ -254 +256 @@
         (weight && !combinationVariance(&variance, pixelWeights, weights, pixelMasks, maskVal))) {
         image->data.F32[y][x] = NAN;
-        mask->data.PS_TYPE_MASK_DATA[y][x] = bad;
+            mask->data.PS_TYPE_MASK_DATA[y][x] = bad;
         if (weight) {
             weight->data.F32[y][x] = NAN;