Changeset 3355

Timestamp:

Mar 1, 2005, 12:21:34 PM (21 years ago)

Author:

gusciora

Message:

Fixing bug 316.

Location:

trunk/psLib/src

Files:

• dataManip/psStats.c (modified) (2 diffs)
• math/psStats.c (modified) (2 diffs)

trunk/psLib/src/dataManip/psStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.116 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-01 21:20:51 $
+ *  @version $Revision: 1.117 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-01 22:21:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1093 +1093 @@
 
         // b) compute new mean and stdev
-        p_psVectorSampleMean(myVector, errors, tmpMask, maskVal, statsTmp);
-        p_psVectorSampleStdev(myVector, errors, tmpMask, maskVal, statsTmp);
+        p_psVectorSampleMean(myVector, errors, tmpMask, 0xff, statsTmp);
+        p_psVectorSampleStdev(myVector, errors, tmpMask, 0xff, statsTmp);
 
         // If the new mean and stdev are NAN, we must exit the loop.
         // Otherwise, use the new results and continue.
         if (isnan(statsTmp->sampleMean) || isnan(statsTmp->sampleStdev)) {
-            // Exit loop.  XXX: Should we throw an error or warning here?
+            // Exit loop.  XXX: Should we throw an error/warning here?
             iter = stats->clipIter;
             rc = -1;

trunk/psLib/src/math/psStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.116 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-01 21:20:51 $
+ *  @version $Revision: 1.117 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-01 22:21:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1093 +1093 @@
 
         // b) compute new mean and stdev
-        p_psVectorSampleMean(myVector, errors, tmpMask, maskVal, statsTmp);
-        p_psVectorSampleStdev(myVector, errors, tmpMask, maskVal, statsTmp);
+        p_psVectorSampleMean(myVector, errors, tmpMask, 0xff, statsTmp);
+        p_psVectorSampleStdev(myVector, errors, tmpMask, 0xff, statsTmp);
 
         // If the new mean and stdev are NAN, we must exit the loop.
         // Otherwise, use the new results and continue.
         if (isnan(statsTmp->sampleMean) || isnan(statsTmp->sampleStdev)) {
-            // Exit loop.  XXX: Should we throw an error or warning here?
+            // Exit loop.  XXX: Should we throw an error/warning here?
             iter = stats->clipIter;
             rc = -1;