Changeset 7167

Timestamp:

May 22, 2006, 1:08:22 PM (20 years ago)

Author:

Paul Price

Message:

Don't bother checking values that have already been masked.

File:

• trunk/psLib/src/math/psStats.c (modified) (3 diffs)

trunk/psLib/src/math/psStats.c

@@ -16 +16 @@
  * use ->min and ->max (PS_STAT_USE_RANGE)
  *
- *  @version $Revision: 1.174 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-22 22:46:12 $
+ *  @version $Revision: 1.175 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-22 23:08:22 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -840 +840 @@
         if (errors) {
             for (long j = 0; j < myVector->n; j++) {
-                if (fabsf(myVector->data.F32[j] - clippedMean) > (stats->clipSigma * errors->data.F32[j])) {
+                if (! tmpMask->data.U8[j] & maskVal &&
+                        fabsf(myVector->data.F32[j] - clippedMean) > stats->clipSigma * errors->data.F32[j]) {
                     tmpMask->data.U8[j] = 0xff;
                     psTrace(__func__, 10, "Clipped %d: %f +/- %f\n", j,
@@ -850 +851 @@
         } else {
             for (long j = 0; j < myVector->n; j++) {
-                if (fabsf(myVector->data.F32[j] - clippedMean) > (stats->clipSigma * clippedStdev)) {
+                if (! tmpMask->data.U8[j] & maskVal &&
+                        fabsf(myVector->data.F32[j] - clippedMean) > (stats->clipSigma * clippedStdev)) {
                     tmpMask->data.U8[j] = 0xff;
                     psTrace(__func__, 10, "Clipped %d: %f\n", j, myVector->data.F32[j]);