Index: /trunk/psLib/src/astronomy/psAstrometry.c
===================================================================
--- /trunk/psLib/src/astronomy/psAstrometry.c	(revision 2213)
+++ /trunk/psLib/src/astronomy/psAstrometry.c	(revision 2214)
@@ -8,6 +8,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:07:17 $
+ *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:20:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -229,8 +229,8 @@
     psS32 j;
 
-    PS_CHECK_NULL_IMAGE(x, NULL);
-    PS_CHECK_NULL_IMAGE(y, NULL);
-    PS_CHECK_IMAGE_TYPE(x, PS_TYPE_F64, NULL);
-    PS_CHECK_IMAGE_TYPE(y, PS_TYPE_F64, NULL);
+    PS_IMAGE_CHECK_NULL(x, NULL);
+    PS_IMAGE_CHECK_NULL(y, NULL);
+    PS_IMAGE_CHECK_TYPE(x, PS_TYPE_F64, NULL);
+    PS_IMAGE_CHECK_TYPE(y, PS_TYPE_F64, NULL);
 
     tmp = (psFixedPattern *) psAlloc(sizeof(psFixedPattern));
Index: /trunk/psLib/src/dataManip/psConstants.h
===================================================================
--- /trunk/psLib/src/dataManip/psConstants.h	(revision 2213)
+++ /trunk/psLib/src/dataManip/psConstants.h	(revision 2214)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:11:46 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:20:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -109,6 +109,9 @@
     return(RVAL); \
 }
-/*****************************************************************************
- 
+
+
+/*****************************************************************************
+Macros which take a psVector type and determine if it is NULL, or has the
+wrong type.
  *****************************************************************************/
 #define PS_VECTOR_CHECK_TYPE_F32_OR_F64(VEC, RVAL) \
@@ -118,5 +121,4 @@
 } \
 
-/** Preprocessor macro to generate error on an incorrect type */
 #define PS_VECTOR_CHECK_TYPE(NAME, TYPE, RVAL) \
 if (NAME->type.type != TYPE) { \
@@ -125,6 +127,5 @@
 }
 
-/** Preprocessor macro to generate error on a NULL vector */
-#define PS_VECTOR_CHEC_NULL(NAME, RVAL) \
+#define PS_VECTOR_CHECK_NULL(NAME, RVAL) \
 if (NAME == NULL || NAME->data.V == NULL) { \
     psError(__func__,"Unallowable operation: %s or its data is NULL.", #NAME); \
@@ -132,5 +133,4 @@
 } \
 
-/** Preprocessor macro to generate error for zero length vector */
 #define PS_VECTOR_CHECK_EMPTY(NAME, RVAL) \
 if (NAME->n < 1) { \
@@ -139,5 +139,4 @@
 } \
 
-/** Preprocessor macro to generate error on differing size vectors */
 #define PS_VECTOR_CHECK_SIZE_EQUAL(VEC1, VEC2, RVAL) \
 if (VEC1->n != VEC2->n) { \
@@ -145,10 +144,4 @@
     return(RVAL); \
 }
-
-#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]); \
-} \
-printf("\n"); \
 
 #define PS_VECTOR_F64_TO_F32(X64, X32) \
@@ -164,4 +157,9 @@
 } \
 
+#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]); \
+} \
+printf("\n"); \
 
 
@@ -169,5 +167,5 @@
  
 *****************************************************************************/
-#define PS_CHECK_NULL_POLY(NAME, NULL) \
+#define PS_POLY_CHECK_NULL(NAME, NULL) \
 if (NAME == NULL || NAME->coeff == NULL) { \
     psError(__func__,"Unallowable operation: polynomial %s or its coeffs is NULL.", #NAME); \
@@ -175,13 +173,8 @@
 } \
 
-
-
-
-
 /*****************************************************************************
  
 *****************************************************************************/
-/** Preprocessor macro to generate error on a NULL image */
-#define PS_CHECK_NULL_IMAGE(NAME, RVAL) \
+#define PS_IMAGE_CHECK_NULL(NAME, RVAL) \
 if (NAME == NULL || NAME->data.V == NULL) { \
     psError(__func__,"Unallowable operation: psImage %s or its data is NULL.", #NAME); \
@@ -189,6 +182,5 @@
 }
 
-/** Preprocessor macro to generate error for zero length rows or columns */
-#define PS_CHECK_EMPTY_IMAGE(NAME, RVAL) \
+#define PS_IMAGE_CHECK_EMPTY(NAME, RVAL) \
 if (NAME->numCols < 1 || NAME->numRows < 1) { \
     psError(__func__,"Unallowable operation: psImage %s has zero rows or columns (%dx%d).", #NAME, \
@@ -197,16 +189,15 @@
 }
 
-#define PS_CHECK_IMAGE_TYPE(NAME, TYPE, RVAL) \
+#define PS_IMAGE_CHECK_TYPE(NAME, TYPE, RVAL) \
 if (NAME->type.type != TYPE) { \
     psError(__func__,"Unallowable operation: psImage %s has incorrect type.", #NAME); \
     return(RVAL); \
 }
-
 /*****************************************************************************
  
  *****************************************************************************/
 /** Preprocessor macro to generate error on a NULL image */
-#define PS_CHECK_NULL_IMAGE_READOUT(NAME, RVAL) \
-if (NAME == NULL || NAME->image == NULL) {                                                         \
+#define PS_READOUT_CHECK_NULL(NAME, RVAL) \
+if (NAME == NULL || NAME->image == NULL) { \
     psError(__func__,"Unallowable operation: psReadout %s or its data is NULL.", #NAME); \
     return(RVAL); \
Index: /trunk/psLib/src/dataManip/psMatrix.c
===================================================================
--- /trunk/psLib/src/dataManip/psMatrix.c	(revision 2213)
+++ /trunk/psLib/src/dataManip/psMatrix.c	(revision 2214)
@@ -20,6 +20,6 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:11:47 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:20:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -42,5 +42,5 @@
 
 /** Preprocessor macro to generate error a NULL image */
-#define PS_VECTOR_CHEC_NULL(NAME, RETURN)                                                          \
+#define PS_VECTOR_CHECK_NULL(NAME, RETURN)                                                          \
 if (NAME == NULL || NAME->data.V == NULL) {                                                         \
     psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME);                          \
@@ -62,5 +62,5 @@
 
 /** Preprocessor macro to generate error a NULL image */
-#define PS_CHECK_NULL_IMAGE(NAME, RETURN)                                                           \
+#define PS_IMAGE_CHECK_NULL(NAME, RETURN)                                                           \
 if (NAME == NULL || NAME->data.V == NULL) {                                                         \
     psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME);                          \
@@ -128,5 +128,5 @@
     // Error checks
     PS_CHECK_POINTERS(inImage, outImage, outImage);
-    PS_CHECK_NULL_IMAGE(inImage, outImage);
+    PS_IMAGE_CHECK_NULL(inImage, outImage);
     PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
     PS_CHECK_SIZE_IMAGE(inImage, outImage);
@@ -135,5 +135,5 @@
     PS_CHECK_SIZE_IMAGE(outImage, outImage);
     PS_CHECK_ALLOC_VECTOR(outPerm, inImage->numRows, inImage->type.type);
-    PS_VECTOR_CHEC_NULL(outPerm, outImage);
+    PS_VECTOR_CHECK_NULL(outPerm, outImage);
     PS_CHECK_DIMEN_AND_TYPE(outPerm, PS_DIMEN_VECTOR, outImage);
 
@@ -177,13 +177,13 @@
     PS_CHECK_POINTERS(inVector, inPerm, outVector);
     PS_CHECK_POINTERS(outVector, inPerm, outVector);
-    PS_CHECK_NULL_IMAGE(inImage, outVector);
+    PS_IMAGE_CHECK_NULL(inImage, outVector);
     PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outVector);
     PS_CHECK_SIZE_IMAGE(inImage, outVector);
     PS_CHECK_ALLOC_VECTOR(outVector, inImage->numRows, inImage->type.type);
-    PS_VECTOR_CHEC_NULL(outVector, outVector);
+    PS_VECTOR_CHECK_NULL(outVector, outVector);
     PS_CHECK_DIMEN_AND_TYPE(outVector, PS_DIMEN_VECTOR, outVector);
-    PS_VECTOR_CHEC_NULL(inVector, outVector);
+    PS_VECTOR_CHECK_NULL(inVector, outVector);
     PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_VECTOR, outVector);
-    PS_VECTOR_CHEC_NULL(inPerm, outVector);
+    PS_VECTOR_CHECK_NULL(inPerm, outVector);
     PS_CHECK_DIMEN_AND_TYPE(inPerm, PS_DIMEN_VECTOR, outVector);
 
@@ -231,5 +231,5 @@
     }
     PS_CHECK_POINTERS(inImage, outImage, outImage);
-    PS_CHECK_NULL_IMAGE(inImage, outImage);
+    PS_IMAGE_CHECK_NULL(inImage, outImage);
     PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
     PS_CHECK_SIZE_IMAGE(inImage, outImage);
@@ -280,5 +280,5 @@
 
     // Error checks
-    PS_CHECK_NULL_IMAGE(inImage, NULL);
+    PS_IMAGE_CHECK_NULL(inImage, NULL);
     PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, NULL);
     PS_CHECK_SIZE_IMAGE(inImage, NULL);
@@ -323,8 +323,8 @@
     PS_CHECK_POINTERS(inImage1, outImage, outImage);
     PS_CHECK_POINTERS(inImage1, inImage2, outImage);
-    PS_CHECK_NULL_IMAGE(inImage1, outImage);
+    PS_IMAGE_CHECK_NULL(inImage1, outImage);
     PS_CHECK_DIMEN_AND_TYPE(inImage1, PS_DIMEN_IMAGE, outImage);
     PS_CHECK_SIZE_IMAGE(inImage1, outImage);
-    PS_CHECK_NULL_IMAGE(inImage2, outImage);
+    PS_IMAGE_CHECK_NULL(inImage2, outImage);
     PS_CHECK_DIMEN_AND_TYPE(inImage2, PS_DIMEN_IMAGE, outImage);
     PS_CHECK_SIZE_IMAGE(inImage2, outImage);
@@ -362,5 +362,5 @@
     // Error checks
     PS_CHECK_POINTERS(inImage, outImage, outImage);
-    PS_CHECK_NULL_IMAGE(inImage, outImage);
+    PS_IMAGE_CHECK_NULL(inImage, outImage);
     PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
     PS_CHECK_SIZE_IMAGE(inImage, outImage);
@@ -401,5 +401,5 @@
     // Error checks
     PS_CHECK_POINTERS(inImage, outImage, outImage);
-    PS_CHECK_NULL_IMAGE(inImage, outImage);
+    PS_IMAGE_CHECK_NULL(inImage, outImage);
     PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
     PS_CHECK_SIZE_IMAGE(inImage, outImage);
@@ -439,5 +439,5 @@
 
     // Error checks
-    PS_CHECK_NULL_IMAGE(inImage, outVector);
+    PS_IMAGE_CHECK_NULL(inImage, outVector);
     PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outVector);
     PS_CHECK_SIZE_IMAGE(inImage, outVector);
@@ -456,5 +456,5 @@
     }
 
-    PS_VECTOR_CHEC_NULL(outVector, outVector);
+    PS_VECTOR_CHECK_NULL(outVector, outVector);
 
     // More checks
@@ -498,5 +498,5 @@
 
     // Error checks
-    PS_VECTOR_CHEC_NULL(inVector, outImage);
+    PS_VECTOR_CHECK_NULL(inVector, outImage);
 
     if (inVector->type.dimen == PS_DIMEN_VECTOR) {
@@ -531,5 +531,5 @@
     }
 
-    PS_CHECK_NULL_IMAGE(outImage, outImage);
+    PS_IMAGE_CHECK_NULL(outImage, outImage);
     PS_CHECK_DIMEN_AND_TYPE(outImage, PS_DIMEN_IMAGE, outImage);
 
Index: /trunk/psLib/src/dataManip/psMinimize.c
===================================================================
--- /trunk/psLib/src/dataManip/psMinimize.c	(revision 2213)
+++ /trunk/psLib/src/dataManip/psMinimize.c	(revision 2214)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:11:47 $
+ *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:20:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -426,8 +426,8 @@
 {
     PS_PTR_CHECK_NULL(min, NULL);
-    PS_VECTOR_CHEC_NULL(params, NULL);
+    PS_VECTOR_CHECK_NULL(params, NULL);
     PS_VECTOR_CHECK_EMPTY(params, NULL);
     PS_PTR_CHECK_NULL(x, NULL);
-    PS_VECTOR_CHEC_NULL(y, NULL);
+    PS_VECTOR_CHECK_NULL(y, NULL);
     PS_VECTOR_CHECK_EMPTY(y, NULL);
     PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL);
@@ -855,6 +855,6 @@
     psS32 i;
     psPolynomial1D *tmpPoly;
-    PS_CHECK_NULL_POLY(myPoly, NULL);
-    PS_VECTOR_CHEC_NULL(y, NULL);
+    PS_POLY_CHECK_NULL(myPoly, NULL);
+    PS_VECTOR_CHECK_NULL(y, NULL);
     PS_VECTOR_CHECK_EMPTY(y, NULL);
     psVector *x64 = NULL;
@@ -1319,5 +1319,5 @@
                         psMinimizePowellFunc func)
 {
-    PS_VECTOR_CHEC_NULL(params, NULL);
+    PS_VECTOR_CHECK_NULL(params, NULL);
     PS_VECTOR_CHECK_EMPTY(params, NULL);
     PS_PTR_CHECK_NULL(min, NULL);
Index: /trunk/psLib/src/math/psConstants.h
===================================================================
--- /trunk/psLib/src/math/psConstants.h	(revision 2213)
+++ /trunk/psLib/src/math/psConstants.h	(revision 2214)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:11:46 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:20:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -109,6 +109,9 @@
     return(RVAL); \
 }
-/*****************************************************************************
- 
+
+
+/*****************************************************************************
+Macros which take a psVector type and determine if it is NULL, or has the
+wrong type.
  *****************************************************************************/
 #define PS_VECTOR_CHECK_TYPE_F32_OR_F64(VEC, RVAL) \
@@ -118,5 +121,4 @@
 } \
 
-/** Preprocessor macro to generate error on an incorrect type */
 #define PS_VECTOR_CHECK_TYPE(NAME, TYPE, RVAL) \
 if (NAME->type.type != TYPE) { \
@@ -125,6 +127,5 @@
 }
 
-/** Preprocessor macro to generate error on a NULL vector */
-#define PS_VECTOR_CHEC_NULL(NAME, RVAL) \
+#define PS_VECTOR_CHECK_NULL(NAME, RVAL) \
 if (NAME == NULL || NAME->data.V == NULL) { \
     psError(__func__,"Unallowable operation: %s or its data is NULL.", #NAME); \
@@ -132,5 +133,4 @@
 } \
 
-/** Preprocessor macro to generate error for zero length vector */
 #define PS_VECTOR_CHECK_EMPTY(NAME, RVAL) \
 if (NAME->n < 1) { \
@@ -139,5 +139,4 @@
 } \
 
-/** Preprocessor macro to generate error on differing size vectors */
 #define PS_VECTOR_CHECK_SIZE_EQUAL(VEC1, VEC2, RVAL) \
 if (VEC1->n != VEC2->n) { \
@@ -145,10 +144,4 @@
     return(RVAL); \
 }
-
-#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]); \
-} \
-printf("\n"); \
 
 #define PS_VECTOR_F64_TO_F32(X64, X32) \
@@ -164,4 +157,9 @@
 } \
 
+#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]); \
+} \
+printf("\n"); \
 
 
@@ -169,5 +167,5 @@
  
 *****************************************************************************/
-#define PS_CHECK_NULL_POLY(NAME, NULL) \
+#define PS_POLY_CHECK_NULL(NAME, NULL) \
 if (NAME == NULL || NAME->coeff == NULL) { \
     psError(__func__,"Unallowable operation: polynomial %s or its coeffs is NULL.", #NAME); \
@@ -175,13 +173,8 @@
 } \
 
-
-
-
-
 /*****************************************************************************
  
 *****************************************************************************/
-/** Preprocessor macro to generate error on a NULL image */
-#define PS_CHECK_NULL_IMAGE(NAME, RVAL) \
+#define PS_IMAGE_CHECK_NULL(NAME, RVAL) \
 if (NAME == NULL || NAME->data.V == NULL) { \
     psError(__func__,"Unallowable operation: psImage %s or its data is NULL.", #NAME); \
@@ -189,6 +182,5 @@
 }
 
-/** Preprocessor macro to generate error for zero length rows or columns */
-#define PS_CHECK_EMPTY_IMAGE(NAME, RVAL) \
+#define PS_IMAGE_CHECK_EMPTY(NAME, RVAL) \
 if (NAME->numCols < 1 || NAME->numRows < 1) { \
     psError(__func__,"Unallowable operation: psImage %s has zero rows or columns (%dx%d).", #NAME, \
@@ -197,16 +189,15 @@
 }
 
-#define PS_CHECK_IMAGE_TYPE(NAME, TYPE, RVAL) \
+#define PS_IMAGE_CHECK_TYPE(NAME, TYPE, RVAL) \
 if (NAME->type.type != TYPE) { \
     psError(__func__,"Unallowable operation: psImage %s has incorrect type.", #NAME); \
     return(RVAL); \
 }
-
 /*****************************************************************************
  
  *****************************************************************************/
 /** Preprocessor macro to generate error on a NULL image */
-#define PS_CHECK_NULL_IMAGE_READOUT(NAME, RVAL) \
-if (NAME == NULL || NAME->image == NULL) {                                                         \
+#define PS_READOUT_CHECK_NULL(NAME, RVAL) \
+if (NAME == NULL || NAME->image == NULL) { \
     psError(__func__,"Unallowable operation: psReadout %s or its data is NULL.", #NAME); \
     return(RVAL); \
Index: /trunk/psLib/src/math/psMatrix.c
===================================================================
--- /trunk/psLib/src/math/psMatrix.c	(revision 2213)
+++ /trunk/psLib/src/math/psMatrix.c	(revision 2214)
@@ -20,6 +20,6 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:11:47 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:20:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -42,5 +42,5 @@
 
 /** Preprocessor macro to generate error a NULL image */
-#define PS_VECTOR_CHEC_NULL(NAME, RETURN)                                                          \
+#define PS_VECTOR_CHECK_NULL(NAME, RETURN)                                                          \
 if (NAME == NULL || NAME->data.V == NULL) {                                                         \
     psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME);                          \
@@ -62,5 +62,5 @@
 
 /** Preprocessor macro to generate error a NULL image */
-#define PS_CHECK_NULL_IMAGE(NAME, RETURN)                                                           \
+#define PS_IMAGE_CHECK_NULL(NAME, RETURN)                                                           \
 if (NAME == NULL || NAME->data.V == NULL) {                                                         \
     psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME);                          \
@@ -128,5 +128,5 @@
     // Error checks
     PS_CHECK_POINTERS(inImage, outImage, outImage);
-    PS_CHECK_NULL_IMAGE(inImage, outImage);
+    PS_IMAGE_CHECK_NULL(inImage, outImage);
     PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
     PS_CHECK_SIZE_IMAGE(inImage, outImage);
@@ -135,5 +135,5 @@
     PS_CHECK_SIZE_IMAGE(outImage, outImage);
     PS_CHECK_ALLOC_VECTOR(outPerm, inImage->numRows, inImage->type.type);
-    PS_VECTOR_CHEC_NULL(outPerm, outImage);
+    PS_VECTOR_CHECK_NULL(outPerm, outImage);
     PS_CHECK_DIMEN_AND_TYPE(outPerm, PS_DIMEN_VECTOR, outImage);
 
@@ -177,13 +177,13 @@
     PS_CHECK_POINTERS(inVector, inPerm, outVector);
     PS_CHECK_POINTERS(outVector, inPerm, outVector);
-    PS_CHECK_NULL_IMAGE(inImage, outVector);
+    PS_IMAGE_CHECK_NULL(inImage, outVector);
     PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outVector);
     PS_CHECK_SIZE_IMAGE(inImage, outVector);
     PS_CHECK_ALLOC_VECTOR(outVector, inImage->numRows, inImage->type.type);
-    PS_VECTOR_CHEC_NULL(outVector, outVector);
+    PS_VECTOR_CHECK_NULL(outVector, outVector);
     PS_CHECK_DIMEN_AND_TYPE(outVector, PS_DIMEN_VECTOR, outVector);
-    PS_VECTOR_CHEC_NULL(inVector, outVector);
+    PS_VECTOR_CHECK_NULL(inVector, outVector);
     PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_VECTOR, outVector);
-    PS_VECTOR_CHEC_NULL(inPerm, outVector);
+    PS_VECTOR_CHECK_NULL(inPerm, outVector);
     PS_CHECK_DIMEN_AND_TYPE(inPerm, PS_DIMEN_VECTOR, outVector);
 
@@ -231,5 +231,5 @@
     }
     PS_CHECK_POINTERS(inImage, outImage, outImage);
-    PS_CHECK_NULL_IMAGE(inImage, outImage);
+    PS_IMAGE_CHECK_NULL(inImage, outImage);
     PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
     PS_CHECK_SIZE_IMAGE(inImage, outImage);
@@ -280,5 +280,5 @@
 
     // Error checks
-    PS_CHECK_NULL_IMAGE(inImage, NULL);
+    PS_IMAGE_CHECK_NULL(inImage, NULL);
     PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, NULL);
     PS_CHECK_SIZE_IMAGE(inImage, NULL);
@@ -323,8 +323,8 @@
     PS_CHECK_POINTERS(inImage1, outImage, outImage);
     PS_CHECK_POINTERS(inImage1, inImage2, outImage);
-    PS_CHECK_NULL_IMAGE(inImage1, outImage);
+    PS_IMAGE_CHECK_NULL(inImage1, outImage);
     PS_CHECK_DIMEN_AND_TYPE(inImage1, PS_DIMEN_IMAGE, outImage);
     PS_CHECK_SIZE_IMAGE(inImage1, outImage);
-    PS_CHECK_NULL_IMAGE(inImage2, outImage);
+    PS_IMAGE_CHECK_NULL(inImage2, outImage);
     PS_CHECK_DIMEN_AND_TYPE(inImage2, PS_DIMEN_IMAGE, outImage);
     PS_CHECK_SIZE_IMAGE(inImage2, outImage);
@@ -362,5 +362,5 @@
     // Error checks
     PS_CHECK_POINTERS(inImage, outImage, outImage);
-    PS_CHECK_NULL_IMAGE(inImage, outImage);
+    PS_IMAGE_CHECK_NULL(inImage, outImage);
     PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
     PS_CHECK_SIZE_IMAGE(inImage, outImage);
@@ -401,5 +401,5 @@
     // Error checks
     PS_CHECK_POINTERS(inImage, outImage, outImage);
-    PS_CHECK_NULL_IMAGE(inImage, outImage);
+    PS_IMAGE_CHECK_NULL(inImage, outImage);
     PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
     PS_CHECK_SIZE_IMAGE(inImage, outImage);
@@ -439,5 +439,5 @@
 
     // Error checks
-    PS_CHECK_NULL_IMAGE(inImage, outVector);
+    PS_IMAGE_CHECK_NULL(inImage, outVector);
     PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outVector);
     PS_CHECK_SIZE_IMAGE(inImage, outVector);
@@ -456,5 +456,5 @@
     }
 
-    PS_VECTOR_CHEC_NULL(outVector, outVector);
+    PS_VECTOR_CHECK_NULL(outVector, outVector);
 
     // More checks
@@ -498,5 +498,5 @@
 
     // Error checks
-    PS_VECTOR_CHEC_NULL(inVector, outImage);
+    PS_VECTOR_CHECK_NULL(inVector, outImage);
 
     if (inVector->type.dimen == PS_DIMEN_VECTOR) {
@@ -531,5 +531,5 @@
     }
 
-    PS_CHECK_NULL_IMAGE(outImage, outImage);
+    PS_IMAGE_CHECK_NULL(outImage, outImage);
     PS_CHECK_DIMEN_AND_TYPE(outImage, PS_DIMEN_IMAGE, outImage);
 
Index: /trunk/psLib/src/math/psMinimize.c
===================================================================
--- /trunk/psLib/src/math/psMinimize.c	(revision 2213)
+++ /trunk/psLib/src/math/psMinimize.c	(revision 2214)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:11:47 $
+ *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:20:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -426,8 +426,8 @@
 {
     PS_PTR_CHECK_NULL(min, NULL);
-    PS_VECTOR_CHEC_NULL(params, NULL);
+    PS_VECTOR_CHECK_NULL(params, NULL);
     PS_VECTOR_CHECK_EMPTY(params, NULL);
     PS_PTR_CHECK_NULL(x, NULL);
-    PS_VECTOR_CHEC_NULL(y, NULL);
+    PS_VECTOR_CHECK_NULL(y, NULL);
     PS_VECTOR_CHECK_EMPTY(y, NULL);
     PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL);
@@ -855,6 +855,6 @@
     psS32 i;
     psPolynomial1D *tmpPoly;
-    PS_CHECK_NULL_POLY(myPoly, NULL);
-    PS_VECTOR_CHEC_NULL(y, NULL);
+    PS_POLY_CHECK_NULL(myPoly, NULL);
+    PS_VECTOR_CHECK_NULL(y, NULL);
     PS_VECTOR_CHECK_EMPTY(y, NULL);
     psVector *x64 = NULL;
@@ -1319,5 +1319,5 @@
                         psMinimizePowellFunc func)
 {
-    PS_VECTOR_CHEC_NULL(params, NULL);
+    PS_VECTOR_CHECK_NULL(params, NULL);
     PS_VECTOR_CHECK_EMPTY(params, NULL);
     PS_PTR_CHECK_NULL(min, NULL);