Index: /trunk/psLib/src/dataManip/psConstants.h
===================================================================
--- /trunk/psLib/src/dataManip/psConstants.h	(revision 2215)
+++ /trunk/psLib/src/dataManip/psConstants.h	(revision 2216)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:29:12 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:32:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -15,14 +15,16 @@
 These constants are used by various functions in the psLib.
  *****************************************************************************/
-#define DETERMINE_BRACKET_STEP_SIZE 0.10
-#define MAX_LMM_ITERATIONS 100
-#define MAX_MINIMIZE_ITERATIONS 100
-#define LEFT_SPLINE_DERIV 0.0
-#define RIGHT_SPLINE_DERIV 0.0
+#define PS_DETERMINE_BRACKET_STEP_SIZE 0.10
+#define PS_MAX_LMM_ITERATIONS 100
+#define PS_MAX_MINIMIZE_ITERATIONS 100
+#define PS_LEFT_SPLINE_DERIV 0.0
+#define PS_RIGHT_SPLINE_DERIV 0.0
 /*****************************************************************************
 These are common mathimatical constants used by various functions in the psLib.
  *****************************************************************************/
-
 #define PS_ONE 1.0
+
+
+
 /*****************************************************************************
 Macros which take a generic psLib type and determine if it is NULL, or has
@@ -40,4 +42,6 @@
     return(RVAL); \
 }
+
+
 
 /*****************************************************************************
@@ -158,4 +162,5 @@
 
 
+
 /*****************************************************************************
     PS_POLY macros:
@@ -167,4 +172,6 @@
 } \
 
+
+
 /*****************************************************************************
     PS_IMAGE macros:
@@ -188,8 +195,10 @@
     return(RVAL); \
 }
+
+
+
 /*****************************************************************************
     PS_READOUT macros:
  *****************************************************************************/
-/** Preprocessor macro to generate error on a NULL image */
 #define PS_READOUT_CHECK_NULL(NAME, RVAL) \
 if (NAME == NULL || NAME->image == NULL) { \
@@ -198,4 +207,6 @@
 }
 
+
+
 /*****************************************************************************
     Misc. macros: 
Index: /trunk/psLib/src/dataManip/psMinimize.c
===================================================================
--- /trunk/psLib/src/dataManip/psMinimize.c	(revision 2215)
+++ /trunk/psLib/src/dataManip/psMinimize.c	(revision 2216)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:29:12 $
+ *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:32:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -114,7 +114,7 @@
 
     // XXX: The second derivatives at the endpoints, undefined in the SDR,
-    // are set in psConstants.h: LEFT_SPLINE_DERIV, RIGHT_SPLINE_DERIV.
+    // are set in psConstants.h: PS_LEFT_SPLINE_DERIV, PS_RIGHT_SPLINE_DERIV.
     derivs2[0] = -0.5;
-    u[0]= (3.0/(X[1]-X[0])) * ((Y[1]-Y[0])/(X[1]-X[0]) - LEFT_SPLINE_DERIV);
+    u[0]= (3.0/(X[1]-X[0])) * ((Y[1]-Y[0])/(X[1]-X[0]) - PS_LEFT_SPLINE_DERIV);
 
     for (i=1;i<=(n-2);i++) {
@@ -134,5 +134,5 @@
 
     qn = 0.5;
-    u[n-1] = (3.0/(X[n-1]-X[n-2])) * (RIGHT_SPLINE_DERIV - (Y[n-1]-Y[n-2])/(X[n-1]-X[n-2]));
+    u[n-1] = (3.0/(X[n-1]-X[n-2])) * (PS_RIGHT_SPLINE_DERIV - (Y[n-1]-Y[n-2])/(X[n-1]-X[n-2]));
     derivs2[n-1] = (u[n-1] - (qn * u[n-2])) / ((qn * derivs2[n-2]) + 1.0);
 
@@ -958,5 +958,5 @@
     float new_cDir = 0.0;
     psVector *bracket = psVectorAlloc(3, PS_TYPE_F32);
-    float stepSize = DETERMINE_BRACKET_STEP_SIZE;
+    float stepSize = PS_DETERMINE_BRACKET_STEP_SIZE;
     psVector *tmp = NULL;
     psS32 i = 0;
Index: /trunk/psLib/src/math/psConstants.h
===================================================================
--- /trunk/psLib/src/math/psConstants.h	(revision 2215)
+++ /trunk/psLib/src/math/psConstants.h	(revision 2216)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:29:12 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:32:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -15,14 +15,16 @@
 These constants are used by various functions in the psLib.
  *****************************************************************************/
-#define DETERMINE_BRACKET_STEP_SIZE 0.10
-#define MAX_LMM_ITERATIONS 100
-#define MAX_MINIMIZE_ITERATIONS 100
-#define LEFT_SPLINE_DERIV 0.0
-#define RIGHT_SPLINE_DERIV 0.0
+#define PS_DETERMINE_BRACKET_STEP_SIZE 0.10
+#define PS_MAX_LMM_ITERATIONS 100
+#define PS_MAX_MINIMIZE_ITERATIONS 100
+#define PS_LEFT_SPLINE_DERIV 0.0
+#define PS_RIGHT_SPLINE_DERIV 0.0
 /*****************************************************************************
 These are common mathimatical constants used by various functions in the psLib.
  *****************************************************************************/
-
 #define PS_ONE 1.0
+
+
+
 /*****************************************************************************
 Macros which take a generic psLib type and determine if it is NULL, or has
@@ -40,4 +42,6 @@
     return(RVAL); \
 }
+
+
 
 /*****************************************************************************
@@ -158,4 +162,5 @@
 
 
+
 /*****************************************************************************
     PS_POLY macros:
@@ -167,4 +172,6 @@
 } \
 
+
+
 /*****************************************************************************
     PS_IMAGE macros:
@@ -188,8 +195,10 @@
     return(RVAL); \
 }
+
+
+
 /*****************************************************************************
     PS_READOUT macros:
  *****************************************************************************/
-/** Preprocessor macro to generate error on a NULL image */
 #define PS_READOUT_CHECK_NULL(NAME, RVAL) \
 if (NAME == NULL || NAME->image == NULL) { \
@@ -198,4 +207,6 @@
 }
 
+
+
 /*****************************************************************************
     Misc. macros: 
Index: /trunk/psLib/src/math/psMinimize.c
===================================================================
--- /trunk/psLib/src/math/psMinimize.c	(revision 2215)
+++ /trunk/psLib/src/math/psMinimize.c	(revision 2216)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:29:12 $
+ *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:32:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -114,7 +114,7 @@
 
     // XXX: The second derivatives at the endpoints, undefined in the SDR,
-    // are set in psConstants.h: LEFT_SPLINE_DERIV, RIGHT_SPLINE_DERIV.
+    // are set in psConstants.h: PS_LEFT_SPLINE_DERIV, PS_RIGHT_SPLINE_DERIV.
     derivs2[0] = -0.5;
-    u[0]= (3.0/(X[1]-X[0])) * ((Y[1]-Y[0])/(X[1]-X[0]) - LEFT_SPLINE_DERIV);
+    u[0]= (3.0/(X[1]-X[0])) * ((Y[1]-Y[0])/(X[1]-X[0]) - PS_LEFT_SPLINE_DERIV);
 
     for (i=1;i<=(n-2);i++) {
@@ -134,5 +134,5 @@
 
     qn = 0.5;
-    u[n-1] = (3.0/(X[n-1]-X[n-2])) * (RIGHT_SPLINE_DERIV - (Y[n-1]-Y[n-2])/(X[n-1]-X[n-2]));
+    u[n-1] = (3.0/(X[n-1]-X[n-2])) * (PS_RIGHT_SPLINE_DERIV - (Y[n-1]-Y[n-2])/(X[n-1]-X[n-2]));
     derivs2[n-1] = (u[n-1] - (qn * u[n-2])) / ((qn * derivs2[n-2]) + 1.0);
 
@@ -958,5 +958,5 @@
     float new_cDir = 0.0;
     psVector *bracket = psVectorAlloc(3, PS_TYPE_F32);
-    float stepSize = DETERMINE_BRACKET_STEP_SIZE;
+    float stepSize = PS_DETERMINE_BRACKET_STEP_SIZE;
     psVector *tmp = NULL;
     psS32 i = 0;