Index: /trunk/psLib/src/dataManip/psConstants.h
===================================================================
--- /trunk/psLib/src/dataManip/psConstants.h	(revision 2212)
+++ /trunk/psLib/src/dataManip/psConstants.h	(revision 2213)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:07:17 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:11:46 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -119,5 +119,5 @@
 
 /** Preprocessor macro to generate error on an incorrect type */
-#define PS_CHECK_VECTOR_TYPE(NAME, TYPE, RVAL) \
+#define PS_VECTOR_CHECK_TYPE(NAME, TYPE, RVAL) \
 if (NAME->type.type != TYPE) { \
     psError(__func__,"Unallowable operation: %s has incorrect type.", #NAME); \
@@ -126,5 +126,5 @@
 
 /** Preprocessor macro to generate error on a NULL vector */
-#define PS_CHECK_NULL_VECTOR(NAME, RVAL) \
+#define PS_VECTOR_CHEC_NULL(NAME, RVAL) \
 if (NAME == NULL || NAME->data.V == NULL) { \
     psError(__func__,"Unallowable operation: %s or its data is NULL.", #NAME); \
@@ -133,5 +133,5 @@
 
 /** Preprocessor macro to generate error for zero length vector */
-#define PS_CHECK_EMPTY_VECTOR(NAME, RVAL) \
+#define PS_VECTOR_CHECK_EMPTY(NAME, RVAL) \
 if (NAME->n < 1) { \
     psError(__func__,"Unallowable operation: %s has zero n value.", #NAME); \
@@ -140,5 +140,5 @@
 
 /** Preprocessor macro to generate error on differing size vectors */
-#define PS_CHECK_VECTOR_SIZE_EQUAL(VEC1, VEC2, RVAL) \
+#define PS_VECTOR_CHECK_SIZE_EQUAL(VEC1, VEC2, RVAL) \
 if (VEC1->n != VEC2->n) { \
     psError(__func__,"Vector %s has size %d, Vector %s has size %d.", #VEC1, VEC1->n, #VEC2, VEC2->n); \
@@ -146,5 +146,5 @@
 }
 
-#define PS_PRINT_VECTOR(NAME) \
+#define PS_VECTOR_PRINT(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]); \
Index: /trunk/psLib/src/dataManip/psMatrix.c
===================================================================
--- /trunk/psLib/src/dataManip/psMatrix.c	(revision 2212)
+++ /trunk/psLib/src/dataManip/psMatrix.c	(revision 2213)
@@ -20,6 +20,6 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:31 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:11:47 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -42,5 +42,5 @@
 
 /** Preprocessor macro to generate error a NULL image */
-#define PS_CHECK_NULL_VECTOR(NAME, RETURN)                                                          \
+#define PS_VECTOR_CHEC_NULL(NAME, RETURN)                                                          \
 if (NAME == NULL || NAME->data.V == NULL) {                                                         \
     psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME);                          \
@@ -135,5 +135,5 @@
     PS_CHECK_SIZE_IMAGE(outImage, outImage);
     PS_CHECK_ALLOC_VECTOR(outPerm, inImage->numRows, inImage->type.type);
-    PS_CHECK_NULL_VECTOR(outPerm, outImage);
+    PS_VECTOR_CHEC_NULL(outPerm, outImage);
     PS_CHECK_DIMEN_AND_TYPE(outPerm, PS_DIMEN_VECTOR, outImage);
 
@@ -181,9 +181,9 @@
     PS_CHECK_SIZE_IMAGE(inImage, outVector);
     PS_CHECK_ALLOC_VECTOR(outVector, inImage->numRows, inImage->type.type);
-    PS_CHECK_NULL_VECTOR(outVector, outVector);
+    PS_VECTOR_CHEC_NULL(outVector, outVector);
     PS_CHECK_DIMEN_AND_TYPE(outVector, PS_DIMEN_VECTOR, outVector);
-    PS_CHECK_NULL_VECTOR(inVector, outVector);
+    PS_VECTOR_CHEC_NULL(inVector, outVector);
     PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_VECTOR, outVector);
-    PS_CHECK_NULL_VECTOR(inPerm, outVector);
+    PS_VECTOR_CHEC_NULL(inPerm, outVector);
     PS_CHECK_DIMEN_AND_TYPE(inPerm, PS_DIMEN_VECTOR, outVector);
 
@@ -456,5 +456,5 @@
     }
 
-    PS_CHECK_NULL_VECTOR(outVector, outVector);
+    PS_VECTOR_CHEC_NULL(outVector, outVector);
 
     // More checks
@@ -498,5 +498,5 @@
 
     // Error checks
-    PS_CHECK_NULL_VECTOR(inVector, outImage);
+    PS_VECTOR_CHEC_NULL(inVector, outImage);
 
     if (inVector->type.dimen == PS_DIMEN_VECTOR) {
Index: /trunk/psLib/src/dataManip/psMinimize.c
===================================================================
--- /trunk/psLib/src/dataManip/psMinimize.c	(revision 2212)
+++ /trunk/psLib/src/dataManip/psMinimize.c	(revision 2213)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:07:17 $
+ *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:11:47 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -274,6 +274,6 @@
         CONVERT_VECTOR_F64_TO_F32(x, x32, x32Static);
     }
-    PS_CHECK_VECTOR_SIZE_EQUAL(x32, y32, NULL);
-    PS_CHECK_VECTOR_SIZE_EQUAL(yErr32, y32, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(x32, y32, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(yErr32, y32, NULL);
 
     if (y32->n != (1 + mySpline->n)) {
@@ -426,15 +426,15 @@
 {
     PS_PTR_CHECK_NULL(min, NULL);
-    PS_CHECK_NULL_VECTOR(params, NULL);
-    PS_CHECK_EMPTY_VECTOR(params, NULL);
+    PS_VECTOR_CHEC_NULL(params, NULL);
+    PS_VECTOR_CHECK_EMPTY(params, NULL);
     PS_PTR_CHECK_NULL(x, NULL);
-    PS_CHECK_NULL_VECTOR(y, NULL);
-    PS_CHECK_EMPTY_VECTOR(y, NULL);
-    PS_CHECK_VECTOR_SIZE_EQUAL(x, y, NULL);
+    PS_VECTOR_CHEC_NULL(y, NULL);
+    PS_VECTOR_CHECK_EMPTY(y, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL);
     if (paramMask != NULL) {
-        PS_CHECK_VECTOR_SIZE_EQUAL(params, paramMask, NULL);
+        PS_VECTOR_CHECK_SIZE_EQUAL(params, paramMask, NULL);
     }
     if (yErr != NULL) {
-        PS_CHECK_VECTOR_SIZE_EQUAL(y, yErr, NULL);
+        PS_VECTOR_CHECK_SIZE_EQUAL(y, yErr, NULL);
     }
 
@@ -856,6 +856,6 @@
     psPolynomial1D *tmpPoly;
     PS_CHECK_NULL_POLY(myPoly, NULL);
-    PS_CHECK_NULL_VECTOR(y, NULL);
-    PS_CHECK_EMPTY_VECTOR(y, NULL);
+    PS_VECTOR_CHEC_NULL(y, NULL);
+    PS_VECTOR_CHECK_EMPTY(y, NULL);
     psVector *x64 = NULL;
     psVector *y64 = NULL;
@@ -888,6 +888,6 @@
         CONVERT_VECTOR_F32_TO_F64(x, x64, x64Static);
     }
-    PS_CHECK_VECTOR_SIZE_EQUAL(x64, y64, NULL);
-    PS_CHECK_VECTOR_SIZE_EQUAL(yErr64, y64, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(x64, y64, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(yErr64, y64, NULL);
 
     // Call the appropriate vector fitting routine.
@@ -1319,6 +1319,6 @@
                         psMinimizePowellFunc func)
 {
-    PS_CHECK_NULL_VECTOR(params, NULL);
-    PS_CHECK_EMPTY_VECTOR(params, NULL);
+    PS_VECTOR_CHEC_NULL(params, NULL);
+    PS_VECTOR_CHECK_EMPTY(params, NULL);
     PS_PTR_CHECK_NULL(min, NULL);
     PS_PTR_CHECK_NULL(coords, NULL);
@@ -1363,5 +1363,5 @@
         myParamMask = (psVector *) paramMask;
     }
-    PS_CHECK_VECTOR_SIZE_EQUAL(params, myParamMask, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(params, myParamMask, NULL);
 
     // 1: Set v[i] to be the unit vectors for each dimension in params
Index: /trunk/psLib/src/dataManip/psStats.c
===================================================================
--- /trunk/psLib/src/dataManip/psStats.c	(revision 2212)
+++ /trunk/psLib/src/dataManip/psStats.c	(revision 2213)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:07:17 $
+ *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:11:47 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1746,6 +1746,6 @@
 
     if (mask != NULL) {
-        PS_CHECK_VECTOR_SIZE_EQUAL(mask, in, NULL);
-        PS_CHECK_VECTOR_TYPE(mask, PS_TYPE_U8, NULL);
+        PS_VECTOR_CHECK_SIZE_EQUAL(mask, in, NULL);
+        PS_VECTOR_CHECK_TYPE(mask, PS_TYPE_U8, NULL);
     }
     // ************************************************************************
Index: /trunk/psLib/src/math/psConstants.h
===================================================================
--- /trunk/psLib/src/math/psConstants.h	(revision 2212)
+++ /trunk/psLib/src/math/psConstants.h	(revision 2213)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:07:17 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:11:46 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -119,5 +119,5 @@
 
 /** Preprocessor macro to generate error on an incorrect type */
-#define PS_CHECK_VECTOR_TYPE(NAME, TYPE, RVAL) \
+#define PS_VECTOR_CHECK_TYPE(NAME, TYPE, RVAL) \
 if (NAME->type.type != TYPE) { \
     psError(__func__,"Unallowable operation: %s has incorrect type.", #NAME); \
@@ -126,5 +126,5 @@
 
 /** Preprocessor macro to generate error on a NULL vector */
-#define PS_CHECK_NULL_VECTOR(NAME, RVAL) \
+#define PS_VECTOR_CHEC_NULL(NAME, RVAL) \
 if (NAME == NULL || NAME->data.V == NULL) { \
     psError(__func__,"Unallowable operation: %s or its data is NULL.", #NAME); \
@@ -133,5 +133,5 @@
 
 /** Preprocessor macro to generate error for zero length vector */
-#define PS_CHECK_EMPTY_VECTOR(NAME, RVAL) \
+#define PS_VECTOR_CHECK_EMPTY(NAME, RVAL) \
 if (NAME->n < 1) { \
     psError(__func__,"Unallowable operation: %s has zero n value.", #NAME); \
@@ -140,5 +140,5 @@
 
 /** Preprocessor macro to generate error on differing size vectors */
-#define PS_CHECK_VECTOR_SIZE_EQUAL(VEC1, VEC2, RVAL) \
+#define PS_VECTOR_CHECK_SIZE_EQUAL(VEC1, VEC2, RVAL) \
 if (VEC1->n != VEC2->n) { \
     psError(__func__,"Vector %s has size %d, Vector %s has size %d.", #VEC1, VEC1->n, #VEC2, VEC2->n); \
@@ -146,5 +146,5 @@
 }
 
-#define PS_PRINT_VECTOR(NAME) \
+#define PS_VECTOR_PRINT(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]); \
Index: /trunk/psLib/src/math/psMatrix.c
===================================================================
--- /trunk/psLib/src/math/psMatrix.c	(revision 2212)
+++ /trunk/psLib/src/math/psMatrix.c	(revision 2213)
@@ -20,6 +20,6 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:31 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:11:47 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -42,5 +42,5 @@
 
 /** Preprocessor macro to generate error a NULL image */
-#define PS_CHECK_NULL_VECTOR(NAME, RETURN)                                                          \
+#define PS_VECTOR_CHEC_NULL(NAME, RETURN)                                                          \
 if (NAME == NULL || NAME->data.V == NULL) {                                                         \
     psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME);                          \
@@ -135,5 +135,5 @@
     PS_CHECK_SIZE_IMAGE(outImage, outImage);
     PS_CHECK_ALLOC_VECTOR(outPerm, inImage->numRows, inImage->type.type);
-    PS_CHECK_NULL_VECTOR(outPerm, outImage);
+    PS_VECTOR_CHEC_NULL(outPerm, outImage);
     PS_CHECK_DIMEN_AND_TYPE(outPerm, PS_DIMEN_VECTOR, outImage);
 
@@ -181,9 +181,9 @@
     PS_CHECK_SIZE_IMAGE(inImage, outVector);
     PS_CHECK_ALLOC_VECTOR(outVector, inImage->numRows, inImage->type.type);
-    PS_CHECK_NULL_VECTOR(outVector, outVector);
+    PS_VECTOR_CHEC_NULL(outVector, outVector);
     PS_CHECK_DIMEN_AND_TYPE(outVector, PS_DIMEN_VECTOR, outVector);
-    PS_CHECK_NULL_VECTOR(inVector, outVector);
+    PS_VECTOR_CHEC_NULL(inVector, outVector);
     PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_VECTOR, outVector);
-    PS_CHECK_NULL_VECTOR(inPerm, outVector);
+    PS_VECTOR_CHEC_NULL(inPerm, outVector);
     PS_CHECK_DIMEN_AND_TYPE(inPerm, PS_DIMEN_VECTOR, outVector);
 
@@ -456,5 +456,5 @@
     }
 
-    PS_CHECK_NULL_VECTOR(outVector, outVector);
+    PS_VECTOR_CHEC_NULL(outVector, outVector);
 
     // More checks
@@ -498,5 +498,5 @@
 
     // Error checks
-    PS_CHECK_NULL_VECTOR(inVector, outImage);
+    PS_VECTOR_CHEC_NULL(inVector, outImage);
 
     if (inVector->type.dimen == PS_DIMEN_VECTOR) {
Index: /trunk/psLib/src/math/psMinimize.c
===================================================================
--- /trunk/psLib/src/math/psMinimize.c	(revision 2212)
+++ /trunk/psLib/src/math/psMinimize.c	(revision 2213)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:07:17 $
+ *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:11:47 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -274,6 +274,6 @@
         CONVERT_VECTOR_F64_TO_F32(x, x32, x32Static);
     }
-    PS_CHECK_VECTOR_SIZE_EQUAL(x32, y32, NULL);
-    PS_CHECK_VECTOR_SIZE_EQUAL(yErr32, y32, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(x32, y32, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(yErr32, y32, NULL);
 
     if (y32->n != (1 + mySpline->n)) {
@@ -426,15 +426,15 @@
 {
     PS_PTR_CHECK_NULL(min, NULL);
-    PS_CHECK_NULL_VECTOR(params, NULL);
-    PS_CHECK_EMPTY_VECTOR(params, NULL);
+    PS_VECTOR_CHEC_NULL(params, NULL);
+    PS_VECTOR_CHECK_EMPTY(params, NULL);
     PS_PTR_CHECK_NULL(x, NULL);
-    PS_CHECK_NULL_VECTOR(y, NULL);
-    PS_CHECK_EMPTY_VECTOR(y, NULL);
-    PS_CHECK_VECTOR_SIZE_EQUAL(x, y, NULL);
+    PS_VECTOR_CHEC_NULL(y, NULL);
+    PS_VECTOR_CHECK_EMPTY(y, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL);
     if (paramMask != NULL) {
-        PS_CHECK_VECTOR_SIZE_EQUAL(params, paramMask, NULL);
+        PS_VECTOR_CHECK_SIZE_EQUAL(params, paramMask, NULL);
     }
     if (yErr != NULL) {
-        PS_CHECK_VECTOR_SIZE_EQUAL(y, yErr, NULL);
+        PS_VECTOR_CHECK_SIZE_EQUAL(y, yErr, NULL);
     }
 
@@ -856,6 +856,6 @@
     psPolynomial1D *tmpPoly;
     PS_CHECK_NULL_POLY(myPoly, NULL);
-    PS_CHECK_NULL_VECTOR(y, NULL);
-    PS_CHECK_EMPTY_VECTOR(y, NULL);
+    PS_VECTOR_CHEC_NULL(y, NULL);
+    PS_VECTOR_CHECK_EMPTY(y, NULL);
     psVector *x64 = NULL;
     psVector *y64 = NULL;
@@ -888,6 +888,6 @@
         CONVERT_VECTOR_F32_TO_F64(x, x64, x64Static);
     }
-    PS_CHECK_VECTOR_SIZE_EQUAL(x64, y64, NULL);
-    PS_CHECK_VECTOR_SIZE_EQUAL(yErr64, y64, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(x64, y64, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(yErr64, y64, NULL);
 
     // Call the appropriate vector fitting routine.
@@ -1319,6 +1319,6 @@
                         psMinimizePowellFunc func)
 {
-    PS_CHECK_NULL_VECTOR(params, NULL);
-    PS_CHECK_EMPTY_VECTOR(params, NULL);
+    PS_VECTOR_CHEC_NULL(params, NULL);
+    PS_VECTOR_CHECK_EMPTY(params, NULL);
     PS_PTR_CHECK_NULL(min, NULL);
     PS_PTR_CHECK_NULL(coords, NULL);
@@ -1363,5 +1363,5 @@
         myParamMask = (psVector *) paramMask;
     }
-    PS_CHECK_VECTOR_SIZE_EQUAL(params, myParamMask, NULL);
+    PS_VECTOR_CHECK_SIZE_EQUAL(params, myParamMask, NULL);
 
     // 1: Set v[i] to be the unit vectors for each dimension in params
Index: /trunk/psLib/src/math/psStats.c
===================================================================
--- /trunk/psLib/src/math/psStats.c	(revision 2212)
+++ /trunk/psLib/src/math/psStats.c	(revision 2213)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:07:17 $
+ *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:11:47 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1746,6 +1746,6 @@
 
     if (mask != NULL) {
-        PS_CHECK_VECTOR_SIZE_EQUAL(mask, in, NULL);
-        PS_CHECK_VECTOR_TYPE(mask, PS_TYPE_U8, NULL);
+        PS_VECTOR_CHECK_SIZE_EQUAL(mask, in, NULL);
+        PS_VECTOR_CHECK_TYPE(mask, PS_TYPE_U8, NULL);
     }
     // ************************************************************************