Index: /trunk/psLib/test/math/tst_psStats09.c
===================================================================
--- /trunk/psLib/test/math/tst_psStats09.c	(revision 7165)
+++ /trunk/psLib/test/math/tst_psStats09.c	(revision 7166)
@@ -74,9 +74,4 @@
         printf("        using a psF32 in vector\n");
         in = psVectorCopy(in, truth, PS_TYPE_F32);
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original in data %d: (%.1f)\n", i, in->data.F32[i]);
-            }
-        }
     }
 
@@ -84,10 +79,4 @@
         printf("        using a psF64 in vector\n");
         in = psVectorCopy(in, truth, PS_TYPE_F64);
-
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original in data %d: (%.1f)\n", i, in->data.F64[i]);
-            }
-        }
     }
 
@@ -95,10 +84,4 @@
         printf("        using a psS8 in vector\n");
         in = psVectorCopy(in, truth, PS_TYPE_S8);
-
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original in data %d: (%d)\n", i, in->data.S8[i]);
-            }
-        }
     }
 
@@ -106,10 +89,4 @@
         printf("        using a psU16 in vector\n");
         in = psVectorCopy(in, truth, PS_TYPE_U16);
-
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original in data %d: (%d)\n", i, in->data.U16[i]);
-            }
-        }
     }
 
@@ -117,10 +94,4 @@
         printf("        using a psS32 in vector\n");
         in = psVectorCopy(in, truth, PS_TYPE_S32);
-
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original in data %d: (%d)\n", i, in->data.S32[i]);
-            }
-        }
     }
 
@@ -136,10 +107,4 @@
             errors->n++;
         }
-
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original errors data %d: (%.1f)\n", i, errors->data.F32[i]);
-            }
-        }
     }
 
@@ -151,10 +116,4 @@
             errors->n++;
         }
-
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original errors data %d: (%.1f)\n", i, errors->data.F64[i]);
-            }
-        }
     }
 
@@ -166,10 +125,4 @@
             errors->n++;
         }
-
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original errors data %d: (%d)\n", i, errors->data.S8[i]);
-            }
-        }
     }
 
@@ -181,10 +134,4 @@
             errors->n++;
         }
-
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original errors data %d: (%d)\n", i, errors->data.U16[i]);
-            }
-        }
     }
 
@@ -196,10 +143,4 @@
             errors->n++;
         }
-
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original errors data %d: (%d)\n", i, errors->data.S32[i]);
-            }
-        }
     }
 
@@ -216,10 +157,4 @@
             mask->n++;
         }
-
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original mask data %d: (%d)\n", i, mask->data.U8[i]);
-            }
-        }
     }
 
@@ -231,10 +166,4 @@
             mask->n++;
         }
-
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original mask data %d: (%d)\n", i, mask->data.S32[i]);
-            }
-        }
     }
 
@@ -246,4 +175,5 @@
     outliers->n = numData;
     psVectorInit(outliers, 0);
+    long numOutliers = 0;
     if (flags & TST_IN_F32) {
         for (psS32 i=0;i<numData;i++) {
@@ -251,10 +181,11 @@
                 in->data.F32[i] = 100.0;
                 outliers->data.U8[i] = 1;
-            }
-        }
-
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original in data %d: (%.1f)\n", i, in->data.F32[i]);
+                numOutliers++;
+            }
+        }
+
+        if (VERBOSE) {
+            for (psS32 i=0;i<numData;i++) {
+                printf("Data %d: (%f)\n", i, in->data.F32[i]);
             }
         }
@@ -265,10 +196,11 @@
                 in->data.F64[i] = 100.0;
                 outliers->data.U8[i] = 1;
-            }
-        }
-
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original in data %d: (%.1f)\n", i, in->data.F64[i]);
+                numOutliers++;
+            }
+        }
+
+        if (VERBOSE) {
+            for (psS32 i=0;i<numData;i++) {
+                printf("Data %d: (%f)\n", i, in->data.F64[i]);
             }
         }
@@ -279,10 +211,11 @@
                 in->data.S8[i] = 100;
                 outliers->data.U8[i] = 1;
-            }
-        }
-
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original in data %d: (%d)\n", i, in->data.S8[i]);
+                numOutliers++;
+            }
+        }
+
+        if (VERBOSE) {
+            for (psS32 i=0;i<numData;i++) {
+                printf("Data %d: (%d)\n", i, in->data.S8[i]);
             }
         }
@@ -293,10 +226,11 @@
                 in->data.U16[i] = 100;
                 outliers->data.U8[i] = 1;
-            }
-        }
-
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original in data %d: (%d)\n", i, in->data.U16[i]);
+                numOutliers++;
+            }
+        }
+
+        if (VERBOSE) {
+            for (psS32 i=0;i<numData;i++) {
+                printf("Data %d: (%d)\n", i, in->data.U16[i]);
             }
         }
@@ -307,13 +241,16 @@
                 in->data.S32[i] = 100;
                 outliers->data.U8[i] = 1;
-            }
-        }
-
-        if (VERBOSE) {
-            for (psS32 i=0;i<numData;i++) {
-                printf("Original in data %d: (%d)\n", i, in->data.S32[i]);
-            }
-        }
-    }
+                numOutliers++;
+            }
+        }
+
+        if (VERBOSE) {
+            for (psS32 i=0;i<numData;i++) {
+                printf("Data %d: (%d)\n", i, in->data.S32[i]);
+            }
+        }
+    }
+
+    printf("%ld outliers.\n", numOutliers);
 
     //
@@ -342,4 +279,5 @@
     psStats *myStats = psStatsAlloc(PS_STAT_CLIPPED_MEAN | PS_STAT_CLIPPED_STDEV);
     myStats->clipSigma = 5.0;
+    myStats->clipIter = 2;
     psStats *rc = psVectorStats(myStats, in, errors, mask, maskValue);
     if (rc == NULL) {
@@ -353,4 +291,7 @@
             testStatus = false;
         }
+
+        printf("Used %ld data points after clipping %ld.\n", myStats->clippedNvalues,
+               in->n - myStats->clippedNvalues);
 
         if (fabs(myStats->clippedMean - sampleMean) > (ERROR_TOLERANCE * sampleMean)) {