Changeset 9556

Timestamp:

Oct 13, 2006, 2:15:47 PM (20 years ago)

Author:

magnier

Message:

more psTrace cleanups, removed redundant func in trace messages

File:

• trunk/psLib/src/math/psMinimizeLMM.c (modified) (8 diffs)

trunk/psLib/src/math/psMinimizeLMM.c

@@ -10 +10 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 22:04:58 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-14 00:15:47 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -117 +117 @@
     if (false == psMatrixGJSolve(Alpha, Beta)) {
         // psError(PS_ERR_UNKNOWN, false, "singular matrix in Guess ABP\n");
-        psTrace (__func__, 4, "singular matrix in Guess ABP\n");
+        psTrace ("psLib.math", 4, "singular matrix in Guess ABP\n");
         return(false);
     }
@@ -158 +158 @@
     psMinimizeLMChi2Func func)
 {
-    psTrace("psLib.math", 3, "---- %s() begin ----\n", __func__);
+    psTrace("psLib.math", 3, "---- begin ----\n");
     // allocate internal arrays (current vs Guess)
     psImage  *alpha  = psImageAlloc (params->n, params->n, PS_TYPE_F64);
@@ -335 +335 @@
     psMinimizeLMChi2Func func)
 {
-    psTrace("psLib.math", 3, "---- %s() begin ----\n", __func__);
+    psTrace("psLib.math", 3, "---- begin ----\n");
     PS_ASSERT_PTR_NON_NULL(min, false);
     // XXX: If covar not NULL, do asserts...
@@ -414 +414 @@
         p_psVectorPrint(psTraceGetDestination(), params, "params guess (0)");
     }
-    if (psTraceGetLevel (__func__) >= 6) {
+    if (psTraceGetLevel ("psLib.math.psMinimizeLMChi2") >= 6) {
         psTrace("psLib.math", 6, "The current Param vector: \n");
         for (psS32 i = 0 ; i < Params->n ; i++) {
@@ -444 +444 @@
         }
         if (psTraceGetLevel("psLib.math") >= 6) {
-            if (psTraceGetLevel (__func__) >= 6) {
+            if (psTraceGetLevel ("psLib.math") >= 6) {
                 psTrace("psLib.math", 6, "The current Param vector: \n");
                 for (psS32 i = 0 ; i < Params->n ; i++) {
@@ -495 +495 @@
         if (!p_psMinLM_GuessABP(covar, Beta, Params, alpha, beta, params, paramMask,
                                 paramDelta, paramMin, paramMax, 0.0)) {
-            psTrace (__func__, 5, "failure to calculate covariance matrix\n");
+            psTrace ("psLib.math", 5, "failure to calculate covariance matrix\n");
         }
     }
@@ -509 +509 @@
     }
     if (min->iter == min->maxIter) {
-        psTrace("psLib.math", 3, "---- %s(false) end ----\n", __func__);
+        psTrace("psLib.math", 3, "---- end (false) ----\n");
         return(false);
     }
-    psTrace("psLib.math", 3, "---- %s(true) end ----\n", __func__);
+    psTrace("psLib.math", 3, "---- end (true) ----\n");
     return(true);
 }