Index: trunk/psLib/src/math/psMinimizeLMM.c
===================================================================
--- trunk/psLib/src/math/psMinimizeLMM.c	(revision 9538)
+++ trunk/psLib/src/math/psMinimizeLMM.c	(revision 9540)
@@ -10,6 +10,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 21:13:48 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 22:04:58 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -409,5 +409,5 @@
     }
     // dump some useful info if trace is defined
-    if (psTraceGetLevel(__func__) >= 6) {
+    if (psTraceGetLevel("psLib.math") >= 6) {
         p_psImagePrint(psTraceGetDestination(), alpha, "alpha guess (0)");
         p_psVectorPrint(psTraceGetDestination(), beta, "beta guess (0)");
@@ -438,10 +438,10 @@
 
         // dump some useful info if trace is defined
-        if (psTraceGetLevel(__func__) >= 6) {
+        if (psTraceGetLevel("psLib.math") >= 6) {
             p_psImagePrint(psTraceGetDestination(), Alpha, "alpha guess (1)");
             p_psVectorPrint(psTraceGetDestination(), Beta, "beta guess (1)");
             p_psVectorPrint(psTraceGetDestination(), Params, "params guess (1)");
         }
-        if (psTraceGetLevel(__func__) >= 6) {
+        if (psTraceGetLevel("psLib.math") >= 6) {
             if (psTraceGetLevel (__func__) >= 6) {
                 psTrace("psLib.math", 6, "The current Param vector: \n");
@@ -470,5 +470,5 @@
 
         // dump some useful info if trace is defined
-        if (psTraceGetLevel(__func__) >= 6) {
+        if (psTraceGetLevel("psLib.math") >= 6) {
             p_psImagePrint(psTraceGetDestination(), Alpha, "alpha guess (2)");
             p_psVectorPrint(psTraceGetDestination(), Beta, "beta guess (2)");
Index: trunk/psLib/src/math/psMinimizePolyFit.c
===================================================================
--- trunk/psLib/src/math/psMinimizePolyFit.c	(revision 9538)
+++ trunk/psLib/src/math/psMinimizePolyFit.c	(revision 9540)
@@ -10,6 +10,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-26 04:34:28 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 22:04:58 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -397,5 +397,5 @@
     psFree(sums);
 
-    if (psTraceGetLevel(__func__) >= 6) {
+    if (psTraceGetLevel("psLib.math") >= 6) {
         PS_IMAGE_PRINT_F64(A);
         PS_VECTOR_PRINT_F64(B);
@@ -487,5 +487,5 @@
     }
 
-    if (psTraceGetLevel(__func__) >= 6) {
+    if (psTraceGetLevel("psLib.math") >= 6) {
         psTrace("psLib.math", 6, "VectorFitPolynomial1D()\n");
         for (psS32 i = 0; i < f->n; i++) {
@@ -579,5 +579,5 @@
     psFree(xSums);
 
-    if (psTraceGetLevel(__func__) >= 4) {
+    if (psTraceGetLevel("psLib.math") >= 4) {
         printf("Least-squares vector:\n");
         for (int i = 0; i < nTerm; i++) {
@@ -818,5 +818,5 @@
         psTrace("psLib.math", 6, "Loop iteration %d.  Calling psVectorFitPolynomial1D()\n", N);
         psS32 Nkeep = 0;
-        if (psTraceGetLevel(__func__) >= 6) {
+        if (psTraceGetLevel("psLib.math") >= 6) {
             if (mask != NULL) {
                 for (psS32 i = 0 ; i < mask->n ; i++) {
@@ -847,5 +847,5 @@
             }
         }
-        if (psTraceGetLevel(__func__) >= 6) {
+        if (psTraceGetLevel("psLib.math") >= 6) {
             if (mask != NULL) {
                 for (psS32 i = 0 ; i < mask->n ; i++) {
@@ -1252,5 +1252,5 @@
         psTrace("psLib.math", 6, "Loop iteration %d.  Calling psVectorFitPolynomial1D()\n", N);
         psS32 Nkeep = 0;
-        if (psTraceGetLevel(__func__) >= 6) {
+        if (psTraceGetLevel("psLib.math") >= 6) {
             if (mask != NULL) {
                 for (psS32 i = 0 ; i < mask->n ; i++) {
@@ -1282,5 +1282,5 @@
         }
 
-        if (psTraceGetLevel(__func__) >= 6) {
+        if (psTraceGetLevel("psLib.math") >= 6) {
             if (mask != NULL) {
                 for (psS32 i = 0 ; i < mask->n ; i++) {
@@ -1772,5 +1772,5 @@
         psTrace("psLib.math", 6, "Loop iteration %d.  Calling psVectorFitPolynomial1D()\n", N);
         psS32 Nkeep = 0;
-        if (psTraceGetLevel(__func__) >= 6) {
+        if (psTraceGetLevel("psLib.math") >= 6) {
             if (mask != NULL) {
                 for (psS32 i = 0 ; i < mask->n ; i++) {
@@ -1801,5 +1801,5 @@
         }
 
-        if (psTraceGetLevel(__func__) >= 6) {
+        if (psTraceGetLevel("psLib.math") >= 6) {
             if (mask != NULL) {
                 for (psS32 i = 0 ; i < mask->n ; i++) {
@@ -2340,5 +2340,5 @@
         psTrace("psLib.math", 6, "Loop iteration %d.  Calling psVectorFitPolynomial4D()\n", N);
         psS32 Nkeep = 0;
-        if (psTraceGetLevel(__func__) >= 6) {
+        if (psTraceGetLevel("psLib.math") >= 6) {
             if (mask != NULL) {
                 for (psS32 i = 0 ; i < mask->n ; i++) {
@@ -2370,5 +2370,5 @@
         }
 
-        if (psTraceGetLevel(__func__) >= 6) {
+        if (psTraceGetLevel("psLib.math") >= 6) {
             if (mask != NULL) {
                 for (psS32 i = 0 ; i < mask->n ; i++) {
Index: trunk/psLib/src/math/psMinimizePowell.c
===================================================================
--- trunk/psLib/src/math/psMinimizePowell.c	(revision 9538)
+++ trunk/psLib/src/math/psMinimizePowell.c	(revision 9540)
@@ -11,6 +11,6 @@
  *  NOTE: XXX: The SDR is silent about data types.  F32 is implemented here.
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:26:44 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 22:04:58 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -380,5 +380,5 @@
     }
 
-    if (6 <= psTraceGetLevel(__func__)) {
+    if (6 <= psTraceGetLevel("psLib.math")) {
         for (i=0;i<params->n;i++) {
             psTrace("psLib.math", 6, "(params, paramMask, line)[%d] is (%f %d %f)\n", i,
Index: trunk/psLib/src/math/psPolynomial.c
===================================================================
--- trunk/psLib/src/math/psPolynomial.c	(revision 9538)
+++ trunk/psLib/src/math/psPolynomial.c	(revision 9540)
@@ -7,6 +7,6 @@
 *  polynomials.  It also contains a Gaussian functions.
 *
-*  @version $Revision: 1.150 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-10-13 21:13:48 $
+*  @version $Revision: 1.151 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-13 22:04:58 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -189,5 +189,5 @@
     }
 
-    if (psTraceGetLevel(__func__) >= 6) {
+    if (psTraceGetLevel("psLib.math") >= 6) {
         for (psS32 j = 0; j < numPolys; j++) {
             PS_POLY_PRINT_1D(chebPolys[j]);
Index: trunk/psLib/src/math/psSpline.c
===================================================================
--- trunk/psLib/src/math/psSpline.c	(revision 9538)
+++ trunk/psLib/src/math/psSpline.c	(revision 9540)
@@ -6,6 +6,6 @@
 *  This file contains the routines that allocate, free, and evaluate splines.
 *
-*  @version $Revision: 1.154 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-10-13 21:13:48 $
+*  @version $Revision: 1.155 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-13 22:04:58 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -120,5 +120,5 @@
 {
     psTrace("psLib.math", 4, "---- %s() begin ----\n", __func__);
-    if (psTraceGetLevel(__func__) >= 6) {
+    if (psTraceGetLevel("psLib.math") >= 6) {
         p_psVectorPrint(1, (psVector *) x, "x");
         p_psVectorPrint(1, (psVector *) y, "y");
@@ -406,5 +406,5 @@
     PS_ASSERT_VECTOR_NON_NULL(x, NULL);
     PS_ASSERT_VECTOR_TYPE_F32_OR_F64(x, NULL);
-    if (psTraceGetLevel(__func__) >= 6) {
+    if (psTraceGetLevel("psLib.math") >= 6) {
         PS_VECTOR_PRINT_F32(x);
         PS_PRINT_SPLINE2((psSpline1D *) spline);
Index: trunk/psLib/src/math/psStats.c
===================================================================
--- trunk/psLib/src/math/psStats.c	(revision 9538)
+++ trunk/psLib/src/math/psStats.c	(revision 9540)
@@ -16,6 +16,6 @@
  * use ->min and ->max (PS_STAT_USE_RANGE)
  *
- *  @version $Revision: 1.186 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 21:13:48 $
+ *  @version $Revision: 1.187 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 22:04:58 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -480,5 +480,5 @@
     PS_ASSERT_PTR_NON_NULL(histogram->bounds, NULL);
     PS_ASSERT_PTR_NON_NULL(histogram->nums, NULL);
-    if (psTraceGetLevel(__func__) >= 8) {
+    if (psTraceGetLevel("psLib.math") >= 8) {
         PS_VECTOR_PRINT_F32(histogram->nums);
     }
@@ -561,5 +561,5 @@
     }
 
-    if (psTraceGetLevel(__func__) >= 8) {
+    if (psTraceGetLevel("psLib.math") >= 8) {
         PS_VECTOR_PRINT_F32(smooth);
     }
@@ -705,5 +705,5 @@
 {
     psTrace("psLib.math", 4, "---- %s() begin ----\n", __func__);
-    psTrace("psLib.math", 4, "Trace level is %d\n", psTraceGetLevel(__func__));
+    psTrace("psLib.math", 4, "Trace level is %d\n", psTraceGetLevel("psLib.math"));
 
     // Ensure that stats->clipIter is within the proper range.
@@ -886,5 +886,5 @@
     psTrace("psLib.math", 4, "---- %s() begin ----\n", __func__);
     psTrace("psLib.math", 5, "binNum, yVal is (%d, %f)\n", binNum, yVal);
-    if (psTraceGetLevel(__func__) >= 8) {
+    if (psTraceGetLevel("psLib.math") >= 8) {
         PS_VECTOR_PRINT_F32(xVec);
         PS_VECTOR_PRINT_F32(yVec);
@@ -1058,5 +1058,5 @@
 {
     psTrace("psLib.math", 4, "---- %s() begin ----\n", __func__);
-    if (psTraceGetLevel(__func__) >= 8) {
+    if (psTraceGetLevel("psLib.math") >= 8) {
         PS_VECTOR_PRINT_F32(myVector);
     }
@@ -1141,5 +1141,5 @@
         histogram = psHistogramAlloc(min, max, numBins);
         histogram = psVectorHistogram(histogram, myVector, errors, mask, maskVal);
-        if (psTraceGetLevel(__func__) >= 8) {
+        if (psTraceGetLevel("psLib.math") >= 8) {
             PS_VECTOR_PRINT_F32(histogram->bounds);
             PS_VECTOR_PRINT_F32(histogram->nums);
@@ -1152,5 +1152,5 @@
             cumulative->nums->data.F32[i] = cumulative->nums->data.F32[i-1] + histogram->nums->data.F32[i];
         }
-        if (psTraceGetLevel(__func__) >= 8) {
+        if (psTraceGetLevel("psLib.math") >= 8) {
             PS_VECTOR_PRINT_F32(cumulative->bounds);
             PS_VECTOR_PRINT_F32(cumulative->nums);
@@ -1417,5 +1417,5 @@
         psHistogram *histogram = psHistogramAlloc(min, max, numBins); // A new histogram (without outliers)
         histogram = psVectorHistogram(histogram, myVector, errors, mask, maskVal);
-        if (psTraceGetLevel(__func__) >= 8) {
+        if (psTraceGetLevel("psLib.math") >= 8) {
             PS_VECTOR_PRINT_F32(histogram->nums);
         }
@@ -1423,5 +1423,5 @@
         // Smooth the resulting histogram with a Gaussian with sigma_s = 1 bin.
         psVector *smoothed = vectorSmoothHistGaussian(histogram, newBinSize); // Smoothed histogram
-        if (psTraceGetLevel(__func__) >= 8) {
+        if (psTraceGetLevel("psLib.math") >= 8) {
             PS_VECTOR_PRINT_F32(smoothed);
         }
@@ -1496,5 +1496,5 @@
             x->data[j] = ordinate;
         }
-        if (psTraceGetLevel(__func__) >= 8) {
+        if (psTraceGetLevel("psLib.math") >= 8) {
             // XXX: Print the x array somehow.
             PS_VECTOR_PRINT_F32(y);
@@ -1525,5 +1525,5 @@
         params->data.F32[0] = stats->robustMedian;
         params->data.F32[1] = sigma;
-        if (psTraceGetLevel(__func__) >= 8) {
+        if (psTraceGetLevel("psLib.math") >= 8) {
             PS_VECTOR_PRINT_F32(params);
             PS_VECTOR_PRINT_F32(y);
@@ -1540,5 +1540,5 @@
             return false;
         }
-        if (psTraceGetLevel(__func__) >= 8) {
+        if (psTraceGetLevel("psLib.math") >= 8) {
             PS_VECTOR_PRINT_F32(params);
         }