Index: trunk/psLib/src/math/psMinimizeLMM.c
===================================================================
--- trunk/psLib/src/math/psMinimizeLMM.c	(revision 13959)
+++ trunk/psLib/src/math/psMinimizeLMM.c	(revision 13981)
@@ -10,6 +10,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-07 23:52:54 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-06-26 19:27:04 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -54,5 +54,5 @@
 /*****************************************************************************/
 
-bool p_psMinLM_GuessABP(
+bool psMinLM_GuessABP(
     psImage  *Alpha,
     psVector *Beta,
@@ -183,10 +183,10 @@
 
     // XXX should we give up if chisq is nan?
-    psF32 rcF32 = p_psMinLM_SetABX(alpha, beta, params, paramMask, x, y, dy, func);
+    psF32 rcF32 = psMinLM_SetABX(alpha, beta, params, paramMask, x, y, dy, func);
     if (isnan(rcF32)) {
-        psTrace ("psLib.math", 5, "p_psMinLM_SetABX() returned a NAN.\n");
+        psTrace ("psLib.math", 5, "psMinLM_SetABX() returned a NAN.\n");
         rc = false;
     }
-    psTrace("psLib.math", 5, "p_psMinLM_SetABX() was succesful\n");
+    psTrace("psLib.math", 5, "psMinLM_SetABX() was succesful\n");
     // dump some useful info if trace is defined
     if (psTraceGetLevel("psLib.math") >= 6) {
@@ -196,10 +196,10 @@
     }
 
-    bool rcBool = p_psMinLM_GuessABP(Alpha, delta, Params, alpha, beta, params, paramMask, NULL, 0.0);
+    bool rcBool = psMinLM_GuessABP(Alpha, delta, Params, alpha, beta, params, paramMask, NULL, 0.0);
     if (rcBool == false) {
-        psTrace ("psLib.math", 5, "p_psMinLM_GuessABP() returned FALSE.\n");
+        psTrace ("psLib.math", 5, "psMinLM_GuessABP() returned FALSE.\n");
         rc = false;
     }
-    psTrace("psLib.math", 5, "p_psMinLM_GuessABP() was succesful\n");
+    psTrace("psLib.math", 5, "psMinLM_GuessABP() was succesful\n");
     if (psTraceGetLevel("psLib.math") >= 6) {
         p_psImagePrint(psTraceGetDestination(), Alpha, "alpha guess (1)");
@@ -220,5 +220,5 @@
 
 // measure linear model prediction
-psF32 p_psMinLM_dLinear(
+psF32 psMinLM_dLinear(
     const psVector *Beta,
     const psVector *beta,
@@ -237,5 +237,5 @@
 
 // alpha, beta, params are already allocated
-psF32 p_psMinLM_SetABX(
+psF32 psMinLM_SetABX(
     psImage  *alpha,
     psVector *beta,
@@ -402,5 +402,5 @@
 
     // calculate initial alpha and beta, set chisq (min->value)
-    min->value = p_psMinLM_SetABX(alpha, beta, params, paramMask, x, y, dy, func);
+    min->value = psMinLM_SetABX(alpha, beta, params, paramMask, x, y, dy, func);
     if (isnan(min->value)) {
         min->iter = min->maxIter;
@@ -422,5 +422,5 @@
 
         // set a new guess for Alpha, Beta, Params
-        if (!p_psMinLM_GuessABP(Alpha, Beta, Params, alpha, beta, params, paramMask, checkLimits, lambda)) {
+        if (!psMinLM_GuessABP(Alpha, Beta, Params, alpha, beta, params, paramMask, checkLimits, lambda)) {
             min->iter ++;
             lambda *= 10.0;
@@ -429,5 +429,5 @@
 
         // measure linear model prediction
-        psF32 dLinear = p_psMinLM_dLinear(Beta, beta, lambda);
+        psF32 dLinear = psMinLM_dLinear(Beta, beta, lambda);
 
         // dump some useful info if trace is defined
@@ -441,5 +441,5 @@
 
         // calculate Chisq for new guess, update Alpha & Beta
-        Chisq = p_psMinLM_SetABX(Alpha, Beta, Params, paramMask, x, y, dy, func);
+        Chisq = psMinLM_SetABX(Alpha, Beta, Params, paramMask, x, y, dy, func);
         if (isnan(Chisq)) {
             min->iter ++;
@@ -480,5 +480,5 @@
     // construct & return the covariance matrix (if requested)
     if (covar != NULL) {
-        if (!p_psMinLM_GuessABP(covar, Beta, Params, alpha, beta, params, paramMask, NULL, 0.0)) {
+        if (!psMinLM_GuessABP(covar, Beta, Params, alpha, beta, params, paramMask, NULL, 0.0)) {
             psTrace ("psLib.math", 5, "failure to calculate covariance matrix\n");
         }
Index: trunk/psLib/src/math/psMinimizeLMM.h
===================================================================
--- trunk/psLib/src/math/psMinimizeLMM.h	(revision 13959)
+++ trunk/psLib/src/math/psMinimizeLMM.h	(revision 13981)
@@ -7,6 +7,6 @@
  * @author GLG, MHPCC
  *
- * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-02-06 21:36:09 $
+ * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-06-26 19:27:04 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -144,5 +144,5 @@
  *  @return psF32:    Chi-squared value for new guess
  */
-psF32 p_psMinLM_SetABX (
+psF32 psMinLM_SetABX (
     psImage  *alpha,                   ///< alpha guess
     psVector *beta,                    ///< beta guess
@@ -156,5 +156,5 @@
 
 
-bool p_psMinLM_GuessABP(
+bool psMinLM_GuessABP(
     psImage  *Alpha,
     psVector *Beta,
@@ -168,4 +168,9 @@
 );
 
+psF32 psMinLM_dLinear(
+    const psVector *Beta,
+    const psVector *beta,
+    psF32 lambda);
+
 /// @}
 #endif // #ifndef PS_MINIMIZE_LMM_H