Index: /trunk/psLib/src/dataManip/psConstants.h
===================================================================
--- /trunk/psLib/src/dataManip/psConstants.h	(revision 2207)
+++ /trunk/psLib/src/dataManip/psConstants.h	(revision 2208)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 01:17:53 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 01:21:01 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -121,26 +121,15 @@
 } \
 
+/** Preprocessor macro to generate error on differing size vectors */
+#define PS_CHECK_VECTOR_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); \
+    return(RVAL); \
+}
 
 
-/** Preprocessor macro to generate error on differing size vectors */
-#define PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(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); \
-    return(NULL); \
-}
 
-/** Preprocessor macro to generate error on differing size vectors */
-#define PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_F0(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); \
-    return(0.0); \
-}
 
-/** Preprocessor macro to generate error on differing size vectors */
-#define PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(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); \
-    return(NULL); \
-}
+
 
 /** Preprocessor macro to generate error on a NULL image */
Index: /trunk/psLib/src/dataManip/psMinimize.c
===================================================================
--- /trunk/psLib/src/dataManip/psMinimize.c	(revision 2207)
+++ /trunk/psLib/src/dataManip/psMinimize.c	(revision 2208)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 01:17:53 $
+ *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 01:21:01 $
  *
  *  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_RETURN_NULL(x32, y32);
-    PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(yErr32, y32);
+    PS_CHECK_VECTOR_SIZE_EQUAL(x32, y32, NULL);
+    PS_CHECK_VECTOR_SIZE_EQUAL(yErr32, y32, NULL);
 
     if (y32->n != (1 + mySpline->n)) {
@@ -431,10 +431,10 @@
     PS_CHECK_NULL_VECTOR(y, NULL);
     PS_CHECK_EMPTY_VECTOR(y, NULL);
-    PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(x, y);
+    PS_CHECK_VECTOR_SIZE_EQUAL(x, y, NULL);
     if (paramMask != NULL) {
-        PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(params, paramMask);
+        PS_CHECK_VECTOR_SIZE_EQUAL(params, paramMask, NULL);
     }
     if (yErr != NULL) {
-        PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(y, yErr);
+        PS_CHECK_VECTOR_SIZE_EQUAL(y, yErr, NULL);
     }
 
@@ -888,6 +888,6 @@
         CONVERT_VECTOR_F32_TO_F64(x, x64, x64Static);
     }
-    PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(x64, y64);
-    PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(yErr64, y64);
+    PS_CHECK_VECTOR_SIZE_EQUAL(x64, y64, NULL);
+    PS_CHECK_VECTOR_SIZE_EQUAL(yErr64, y64, NULL);
 
     // Call the appropriate vector fitting routine.
@@ -1363,5 +1363,5 @@
         myParamMask = (psVector *) paramMask;
     }
-    PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(params, myParamMask);
+    PS_CHECK_VECTOR_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 2207)
+++ /trunk/psLib/src/dataManip/psStats.c	(revision 2208)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 01:15:47 $
+ *  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 01:21:01 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1746,5 +1746,5 @@
 
     if (mask != NULL) {
-        PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(mask, in);
+        PS_CHECK_VECTOR_SIZE_EQUAL(mask, in, NULL);
         PS_CHECK_VECTOR_TYPE(mask, PS_TYPE_U8, NULL);
     }
Index: /trunk/psLib/src/math/psConstants.h
===================================================================
--- /trunk/psLib/src/math/psConstants.h	(revision 2207)
+++ /trunk/psLib/src/math/psConstants.h	(revision 2208)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 01:17:53 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 01:21:01 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -121,26 +121,15 @@
 } \
 
+/** Preprocessor macro to generate error on differing size vectors */
+#define PS_CHECK_VECTOR_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); \
+    return(RVAL); \
+}
 
 
-/** Preprocessor macro to generate error on differing size vectors */
-#define PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(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); \
-    return(NULL); \
-}
 
-/** Preprocessor macro to generate error on differing size vectors */
-#define PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_F0(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); \
-    return(0.0); \
-}
 
-/** Preprocessor macro to generate error on differing size vectors */
-#define PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(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); \
-    return(NULL); \
-}
+
 
 /** Preprocessor macro to generate error on a NULL image */
Index: /trunk/psLib/src/math/psMinimize.c
===================================================================
--- /trunk/psLib/src/math/psMinimize.c	(revision 2207)
+++ /trunk/psLib/src/math/psMinimize.c	(revision 2208)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 01:17:53 $
+ *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 01:21:01 $
  *
  *  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_RETURN_NULL(x32, y32);
-    PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(yErr32, y32);
+    PS_CHECK_VECTOR_SIZE_EQUAL(x32, y32, NULL);
+    PS_CHECK_VECTOR_SIZE_EQUAL(yErr32, y32, NULL);
 
     if (y32->n != (1 + mySpline->n)) {
@@ -431,10 +431,10 @@
     PS_CHECK_NULL_VECTOR(y, NULL);
     PS_CHECK_EMPTY_VECTOR(y, NULL);
-    PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(x, y);
+    PS_CHECK_VECTOR_SIZE_EQUAL(x, y, NULL);
     if (paramMask != NULL) {
-        PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(params, paramMask);
+        PS_CHECK_VECTOR_SIZE_EQUAL(params, paramMask, NULL);
     }
     if (yErr != NULL) {
-        PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(y, yErr);
+        PS_CHECK_VECTOR_SIZE_EQUAL(y, yErr, NULL);
     }
 
@@ -888,6 +888,6 @@
         CONVERT_VECTOR_F32_TO_F64(x, x64, x64Static);
     }
-    PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(x64, y64);
-    PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(yErr64, y64);
+    PS_CHECK_VECTOR_SIZE_EQUAL(x64, y64, NULL);
+    PS_CHECK_VECTOR_SIZE_EQUAL(yErr64, y64, NULL);
 
     // Call the appropriate vector fitting routine.
@@ -1363,5 +1363,5 @@
         myParamMask = (psVector *) paramMask;
     }
-    PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(params, myParamMask);
+    PS_CHECK_VECTOR_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 2207)
+++ /trunk/psLib/src/math/psStats.c	(revision 2208)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 01:15:47 $
+ *  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 01:21:01 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1746,5 +1746,5 @@
 
     if (mask != NULL) {
-        PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(mask, in);
+        PS_CHECK_VECTOR_SIZE_EQUAL(mask, in, NULL);
         PS_CHECK_VECTOR_TYPE(mask, PS_TYPE_U8, NULL);
     }