Index: /trunk/archive/pslib/include/psFunctions.h
===================================================================
--- /trunk/archive/pslib/include/psFunctions.h	(revision 1583)
+++ /trunk/archive/pslib/include/psFunctions.h	(revision 1584)
@@ -14,11 +14,11 @@
 psGaussian(float x,			///< Value at which to evaluate
 	   float mean,			///< Mean for the Gaussian
-	   float stddev,		///< Standard deviation for the Gaussian
-	   int normal)			///< normalized Gaussian?
+	   float sigma,			///< Standard deviation for the Gaussian
+	   bool normal)			///< normalized Gaussian?
 ;
 
 psVector *
 psGaussianDev(float mean,		///< Mean for the Gaussian
-	      float stddev,		///< Standard deviation for the Gaussian
+	      float sigma,		///< Standard deviation for the Gaussian
 	      int Npts)			///< Number of points generated
 ;
@@ -110,5 +110,5 @@
 float
 psPolynomial1DEval(float x,		///< Value at which to evaluate
-		   const psPolynomial1D *restrict myPoly ///< Coefficients for the polynomial
+		   const psPolynomial1D *myPoly ///< Coefficients for the polynomial
 		   );
 
@@ -117,5 +117,5 @@
 psPolynomial2DEval(float x,		///< Value x at which to evaluate
 		   float y,		///< Value y at which to evaluate
-		   const psPolynomial2D *restrict myPoly ///< Coefficients for the polynomial
+		   const psPolynomial2D *myPoly ///< Coefficients for the polynomial
 		   );
 
@@ -125,5 +125,5 @@
 		   float y,		///< Value y at which to evaluate
 		   float z,		///< Value z at which to evaluate
-		   const psPolynomial3D *restrict myPoly ///< Coefficients for the polynomial
+		   const psPolynomial3D *myPoly ///< Coefficients for the polynomial
 		   );
 
@@ -134,35 +134,35 @@
 		   float y,		///< Value y at which to evaluate
 		   float z,		///< Value z at which to evaluate
-		   const psPolynomial4D *restrict myPoly ///< Coefficients for the polynomial
+		   const psPolynomial4D *myPoly ///< Coefficients for the polynomial
 		   );
 
 /** Evaluate 1D polynomial: vector input */
 psVector *
-psPolynomial1DEvalVector(psVector *x,	///< Value at which to evaluate
-			 const psPolynomial1D *restrict myPoly ///< Coefficients for the polynomial
+psPolynomial1DEvalVector(const psVector *x, ///< Value at which to evaluate
+			 const psPolynomial1D *myPoly ///< Coefficients for the polynomial
 			 );
 
 /** Evaluate 2D polynomial: vector input */
 psVector *
-psPolynomial2DEvalVector(psVector *x,	///< Value x at which to evaluate
-			 psVector *y,	///< Value y at which to evaluate
-			 const psPolynomial2D *restrict myPoly ///< Coefficients for the polynomial
+psPolynomial2DEvalVector(const psVector *x, ///< Value x at which to evaluate
+			 const psVector *y, ///< Value y at which to evaluate
+			 const psPolynomial2D *myPoly ///< Coefficients for the polynomial
 			 );
 
 /** Evaluate 3D polynomial: vector input */
 psVector *
-psPolynomial3DEvalVector(psVector *x,	///< Value x at which to evaluate
-			 psVector *y,	///< Value y at which to evaluate
-			 psVector *z,	///< Value z at which to evaluate
-			 const psPolynomial3D *restrict myPoly ///< Coefficients for the polynomial
+psPolynomial3DEvalVector(const psVector *x, ///< Value x at which to evaluate
+			 const psVector *y, ///< Value y at which to evaluate
+			 const psVector *z, ///< Value z at which to evaluate
+			 const psPolynomial3D *myPoly ///< Coefficients for the polynomial
 			 );
 
 /** Evaluate 4D polynomial: vector input */
 psVector *
-psPolynomial4DEvalVector(psVector *w,	///< Value w at which to evaluate
-			 psVector *x,	///< Value x at which to evaluate
-			 psVector *y,	///< Value y at which to evaluate
-			 psVector *z,	///< Value z at which to evaluate
-			 const psPolynomial4D *restrict myPoly ///< Coefficients for the polynomial
+psPolynomial4DEvalVector(const psVector *w, ///< Value w at which to evaluate
+			 const psVector *x, ///< Value x at which to evaluate
+			 const psVector *y, ///< Value y at which to evaluate
+			 const psVector *z, ///< Value z at which to evaluate
+			 const psPolynomial4D *myPoly ///< Coefficients for the polynomial
 			 );
 
@@ -232,23 +232,8 @@
 				      );
 
-
-/** Destructor */
-void psDPolynomial1DFree(psDPolynomial1D *restrict myPoly ///< Polynomial to destroy
-    );
-/** Destructor */
-void psDPolynomial2DFree(psDPolynomial2D *restrict myPoly ///< Polynomial to destroy
-    );
-/** Destructor */
-void psDPolynomial3DFree(psDPolynomial3D *restrict myPoly ///< Polynomial to destroy
-    );
-/** Destructor */
-void psDPolynomial4DFree(psDPolynomial4D *restrict myPoly ///< Polynomial to destroy
-    );
-
-
 /** Evaluate 1D polynomial (double precision) */
 double
 psDPolynomial1DEval(double x,		///< Value at which to evaluate
-		    const psDPolynomial1D *restrict myPoly ///< Coefficients for the polynomial
+		    const psDPolynomial1D *myPoly ///< Coefficients for the polynomial
 		    );
 
@@ -257,5 +242,5 @@
 psDPolynomial2DEval(double x,		///< Value x at which to evaluate
 		    double y,		///< Value y at which to evaluate
-		    const psDPolynomial2D *restrict myPoly ///< Coefficients for the polynomial
+		    const psDPolynomial2D *myPoly ///< Coefficients for the polynomial
 		    );
 
@@ -265,5 +250,5 @@
 		    double y,		///< Value y at which to evaluate
 		    double z,		///< Value z at which to evaluate
-		    const psDPolynomial3D *restrict myPoly ///< Coefficients for the polynomial
+		    const psDPolynomial3D *myPoly ///< Coefficients for the polynomial
 		    );
 
@@ -274,35 +259,35 @@
 		    double y,		///< Value y at which to evaluate
 		    double z,		///< Value z at which to evaluate
-		    const psDPolynomial4D *restrict myPoly ///< Coefficients for the polynomial
+		    const psDPolynomial4D *myPoly ///< Coefficients for the polynomial
 		    );
 
 /** Evaluate 1D polynomial: vector input */
 psVector *
-psDPolynomial1DEvalVector(psVector *x,	///< Value at which to evaluate
-			  const psDPolynomial1D *restrict myPoly ///< Coefficients for the polynomial
+psDPolynomial1DEvalVector(const psVector *x, ///< Value at which to evaluate
+			  const psDPolynomial1D *myPoly ///< Coefficients for the polynomial
 			  );
 
 /** Evaluate 2D polynomial: vector input */
 psVector *
-psDPolynomial2DEvalVector(psVector *x,	///< Value x at which to evaluate
-			  psVector *y,	///< Value y at which to evaluate
-			  const psDPolynomial2D *restrict myPoly ///< Coefficients for the polynomial
+psDPolynomial2DEvalVector(const psVector *x, ///< Value x at which to evaluate
+			  const psVector *y, ///< Value y at which to evaluate
+			  const psDPolynomial2D *myPoly ///< Coefficients for the polynomial
 			  );
 
 /** Evaluate 3D polynomial: vector input */
 psVector *
-psDPolynomial3DEvalVector(psVector *x,	///< Value x at which to evaluate
-			  psVector *y,	///< Value y at which to evaluate
-			  psVector *z,	///< Value z at which to evaluate
-			  const psDPolynomial3D *restrict myPoly ///< Coefficients for the polynomial
+psDPolynomial3DEvalVector(const psVector *x, ///< Value x at which to evaluate
+			  const psVector *y, ///< Value y at which to evaluate
+			  const psVector *z, ///< Value z at which to evaluate
+			  const psDPolynomial3D *myPoly ///< Coefficients for the polynomial
 			  );
 
 /** Evaluate 4D polynomial: vector input */
 psVector *
-psDPolynomial4DEvalVector(psVector *w,	///< Value w at which to evaluate
-			  psVector *x,	///< Value x at which to evaluate
-			  psVector *y,	///< Value y at which to evaluate
-			  psVector *z,	///< Value z at which to evaluate
-			  const psDPolynomial4D *restrict myPoly ///< Coefficients for the polynomial
+psDPolynomial4DEvalVector(const psVector *w, ///< Value w at which to evaluate
+			  const psVector *x, ///< Value x at which to evaluate
+			  const psVector *y, ///< Value y at which to evaluate
+			  const psVector *z, ///< Value z at which to evaluate
+			  const psDPolynomial4D *myPoly ///< Coefficients for the polynomial
 			  );
 
@@ -313,8 +298,8 @@
 /* Splines */
 
-/** A 1D cubic-spline */
+/** A 1D spline */
 typedef struct {
     int n;				///< Number of spline pieces
-    psPolynomial1D *spline;		///< Array of n splines
+    psPolynomial1D **spline;		///< Array of n pointers to splines
     float *domains;			///< The boundaries between each spline piece.  Size is n+1.
 } psSpline1D;
@@ -344,5 +329,5 @@
 
 /** Evaluator: vector version */
-psVector *psSpline1DEvalVector(psVector *x, ///< Coordinates at which to evaluate
+psVector *psSpline1DEvalVector(const psVector *x, ///< Coordinates at which to evaluate
 			       const psSpline1D *spline ///< Spline to evaluate
 			       );
Index: /trunk/archive/pslib/include/psMinimize.h
===================================================================
--- /trunk/archive/pslib/include/psMinimize.h	(revision 1583)
+++ /trunk/archive/pslib/include/psMinimize.h	(revision 1584)
@@ -85,7 +85,7 @@
 psPolynomial1D *
 psVectorFitPolynomial1D(psPolynomial1D *myPoly, ///< Polynomial to fit
-			const psVector *restrict x, ///< Ordinates (or NULL to just use the indices)
-			const psVector *restrict y, ///< Coordinates
-			const psVector *restrict yErr) ///< Errors in coordinates, or NULL
+			const psVector *x, ///< Ordinates (or NULL to just use the indices)
+			const psVector *y, ///< Coordinates
+			const psVector *yErr) ///< Errors in coordinates, or NULL
 ;