Index: /trunk/psLib/src/dataManip/psStats.c
===================================================================
--- /trunk/psLib/src/dataManip/psStats.c	(revision 1283)
+++ /trunk/psLib/src/dataManip/psStats.c	(revision 1284)
@@ -15,5 +15,4 @@
 #include "psAbort.h"
 #include "psStats.h"
-#include "psVectorSort.h"
 #include "psMinimize.h"
 #include "psFunctions.h"
@@ -40,26 +39,32 @@
 
 /** Preprocessor macro to generate error on an incorrect type */
-#define PS_CHECK_VECTOR_TYPE(NAME, TYPE)                                                          \
-if (NAME->type.type != TYPE) {                                                         \
-    psError(__func__,"Invalid operation: %s has incorrect type.", #NAME);                          \
+#define PS_CHECK_VECTOR_TYPE(NAME, TYPE) \
+if (NAME->type.type != TYPE) { \
+    psError(__func__,"Invalid operation: %s has incorrect type.", #NAME); \
 }
 
 /** Preprocessor macro to generate error on a NULL vector */
-#define PS_CHECK_NULL_VECTOR(NAME)                                                          \
-if (NAME == NULL || NAME->data.V == NULL) {                                                         \
-    psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME);                          \
+#define PS_CHECK_NULL_VECTOR(NAME) \
+if (NAME == NULL || NAME->data.V == NULL) { \
+    psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME); \
 }
 
 /** Preprocessor macro to generate error for zero length vector */
-#define PS_CHECK_EMPTY_VECTOR(NAME)                                                          \
-if (NAME->n < 1) {                                                                                  \
-    psError(__func__,"Invalid operation: %s has zero n value.", #NAME);                             \
+#define PS_CHECK_EMPTY_VECTOR(NAME) \
+if (NAME->n < 1) { \
+    psError(__func__,"Invalid operation: %s has zero n value.", #NAME); \
 }
 
 /** Preprocessor macro to generate error on differing size vectors */
-#define PS_CHECK_VECTOR_SIZE_EQUAL(VEC1, VEC2)                                                          \
-if (VEC1->n != VEC2->n) {               \
+#define PS_CHECK_VECTOR_SIZE_EQUAL(VEC1, VEC2) \
+if (VEC1->n != VEC2->n) { \
     psError(__func__,"Vector %s has size %d, Vector %s has size %d.", #VEC1, VEC1->n, #VEC2, VEC2->n); \
 }
+
+#define PS_PRINT_VECTOR(NAME) \
+for (int my_i=0;my_i<NAME->n;my_i++) { \
+    printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \
+} \
+printf("\n"); \
 
 /*****************************************************************************/
@@ -653,5 +658,4 @@
     psFree(unsortedVector);
     psFree(sortedVector);
-    // NOTE: This is the
 }
 
@@ -668,6 +672,4 @@
     NULL
  
-NOTE: the mean is always calculated exactly.  Robust means are never
-calculated in this routine.
  *****************************************************************************/
 void p_psVectorSampleStdev(const psVector *restrict myVector,
@@ -1044,10 +1046,4 @@
 }
 
-#define PS_PRINT_VECTOR(NAME) \
-for (int my_i=0;my_i<NAME->n;my_i++) { \
-    printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \
-} \
-printf("\n"); \
-
 /******************************************************************************
 p_psVectorRobustStats(myVector, maskVector, maskVal, stats): this procedure
@@ -1059,8 +1055,8 @@
 PS_STAT_ROBUST_QUARTILE
 I have included all that computation in a single function, as opposed to
-breaking it across several functions for one primary reason:
+breaking it across several functions for one primary reason: 
 they all
 require the same basic initial processing steps (calculate the histogram,
-etc.)
+etc.) 
 however there is no currently defined means, in the SDRS, to
 specify this computation as a separate step.  If the above robust stat
@@ -1611,5 +1607,5 @@
     // NOTE: Verify that this is the correct action.
     if (bounds == NULL) {
-        //        psAbort(__func__, "psHistogram requested with NULL bounds");
+        // psAbort(__func__, "psHistogram requested with NULL bounds");
         return(NULL);
     }
@@ -1617,5 +1613,5 @@
     // NOTE: Verify that this is the correct action.
     if (bounds->n <= 1) {
-        //        psAbort(__func__, "psHistogram requested with NULL bounds");
+        // psAbort(__func__, "psHistogram requested with NULL bounds");
         return(NULL);
     }
Index: /trunk/psLib/src/dataManip/psStats.d
===================================================================
--- /trunk/psLib/src/dataManip/psStats.d	(revision 1283)
+++ /trunk/psLib/src/dataManip/psStats.d	(revision 1284)
@@ -1,3 +1,4 @@
-psStats.o psStats.d : psStats.c ../sysUtils/psMemory.h ../collections/psVector.h \
-  ../collections/psType.h ../sysUtils/psTrace.h ../sysUtils/psError.h \
-  ../sysUtils/psAbort.h psStats.h
+psStats.o psStats.d : psStats.c ../sysUtils/psMemory.h ../image/psImage.h \
+  ../collections/psType.h ../collections/psVector.h ../sysUtils/psTrace.h \
+  ../sysUtils/psError.h ../sysUtils/psAbort.h psStats.h psMinimize.h \
+  psFunctions.h
Index: /trunk/psLib/src/dataManip/psStats.h
===================================================================
--- /trunk/psLib/src/dataManip/psStats.h	(revision 1283)
+++ /trunk/psLib/src/dataManip/psStats.h	(revision 1284)
@@ -9,6 +9,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-22 23:44:49 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-23 00:06:40 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -62,4 +62,5 @@
     double robustUQ;            ///< robust upper quartile
     double robustLQ;            ///< robust lower quartile
+    double XXX;
     double robustN50;           ///<
     double robustNfit;          ///<
Index: /trunk/psLib/src/math/psStats.c
===================================================================
--- /trunk/psLib/src/math/psStats.c	(revision 1283)
+++ /trunk/psLib/src/math/psStats.c	(revision 1284)
@@ -15,5 +15,4 @@
 #include "psAbort.h"
 #include "psStats.h"
-#include "psVectorSort.h"
 #include "psMinimize.h"
 #include "psFunctions.h"
@@ -40,26 +39,32 @@
 
 /** Preprocessor macro to generate error on an incorrect type */
-#define PS_CHECK_VECTOR_TYPE(NAME, TYPE)                                                          \
-if (NAME->type.type != TYPE) {                                                         \
-    psError(__func__,"Invalid operation: %s has incorrect type.", #NAME);                          \
+#define PS_CHECK_VECTOR_TYPE(NAME, TYPE) \
+if (NAME->type.type != TYPE) { \
+    psError(__func__,"Invalid operation: %s has incorrect type.", #NAME); \
 }
 
 /** Preprocessor macro to generate error on a NULL vector */
-#define PS_CHECK_NULL_VECTOR(NAME)                                                          \
-if (NAME == NULL || NAME->data.V == NULL) {                                                         \
-    psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME);                          \
+#define PS_CHECK_NULL_VECTOR(NAME) \
+if (NAME == NULL || NAME->data.V == NULL) { \
+    psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME); \
 }
 
 /** Preprocessor macro to generate error for zero length vector */
-#define PS_CHECK_EMPTY_VECTOR(NAME)                                                          \
-if (NAME->n < 1) {                                                                                  \
-    psError(__func__,"Invalid operation: %s has zero n value.", #NAME);                             \
+#define PS_CHECK_EMPTY_VECTOR(NAME) \
+if (NAME->n < 1) { \
+    psError(__func__,"Invalid operation: %s has zero n value.", #NAME); \
 }
 
 /** Preprocessor macro to generate error on differing size vectors */
-#define PS_CHECK_VECTOR_SIZE_EQUAL(VEC1, VEC2)                                                          \
-if (VEC1->n != VEC2->n) {               \
+#define PS_CHECK_VECTOR_SIZE_EQUAL(VEC1, VEC2) \
+if (VEC1->n != VEC2->n) { \
     psError(__func__,"Vector %s has size %d, Vector %s has size %d.", #VEC1, VEC1->n, #VEC2, VEC2->n); \
 }
+
+#define PS_PRINT_VECTOR(NAME) \
+for (int my_i=0;my_i<NAME->n;my_i++) { \
+    printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \
+} \
+printf("\n"); \
 
 /*****************************************************************************/
@@ -653,5 +658,4 @@
     psFree(unsortedVector);
     psFree(sortedVector);
-    // NOTE: This is the
 }
 
@@ -668,6 +672,4 @@
     NULL
  
-NOTE: the mean is always calculated exactly.  Robust means are never
-calculated in this routine.
  *****************************************************************************/
 void p_psVectorSampleStdev(const psVector *restrict myVector,
@@ -1044,10 +1046,4 @@
 }
 
-#define PS_PRINT_VECTOR(NAME) \
-for (int my_i=0;my_i<NAME->n;my_i++) { \
-    printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \
-} \
-printf("\n"); \
-
 /******************************************************************************
 p_psVectorRobustStats(myVector, maskVector, maskVal, stats): this procedure
@@ -1059,8 +1055,8 @@
 PS_STAT_ROBUST_QUARTILE
 I have included all that computation in a single function, as opposed to
-breaking it across several functions for one primary reason:
+breaking it across several functions for one primary reason: 
 they all
 require the same basic initial processing steps (calculate the histogram,
-etc.)
+etc.) 
 however there is no currently defined means, in the SDRS, to
 specify this computation as a separate step.  If the above robust stat
@@ -1611,5 +1607,5 @@
     // NOTE: Verify that this is the correct action.
     if (bounds == NULL) {
-        //        psAbort(__func__, "psHistogram requested with NULL bounds");
+        // psAbort(__func__, "psHistogram requested with NULL bounds");
         return(NULL);
     }
@@ -1617,5 +1613,5 @@
     // NOTE: Verify that this is the correct action.
     if (bounds->n <= 1) {
-        //        psAbort(__func__, "psHistogram requested with NULL bounds");
+        // psAbort(__func__, "psHistogram requested with NULL bounds");
         return(NULL);
     }
Index: /trunk/psLib/src/math/psStats.h
===================================================================
--- /trunk/psLib/src/math/psStats.h	(revision 1283)
+++ /trunk/psLib/src/math/psStats.h	(revision 1284)
@@ -9,6 +9,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-22 23:44:49 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-23 00:06:40 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -62,4 +62,5 @@
     double robustUQ;            ///< robust upper quartile
     double robustLQ;            ///< robust lower quartile
+    double XXX;
     double robustN50;           ///<
     double robustNfit;          ///<