Index: trunk/psModules/src/objects/pmPeaks.c
===================================================================
--- trunk/psModules/src/objects/pmPeaks.c	(revision 7604)
+++ trunk/psModules/src/objects/pmPeaks.c	(revision 8246)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-21 03:21:16 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:07 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -32,5 +32,5 @@
                               pmPeakType type)
 {
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
     pmPeak *tmpPeak = pmPeakAlloc(col, row, counts, type);
 
@@ -43,5 +43,5 @@
     // XXX EAM : is this free appropriate?  (does psArrayAdd increment memory counter?)
 
-    psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
     return(list);
 }
@@ -57,5 +57,5 @@
                                        psU32 row)
 {
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
     PS_ASSERT_IMAGE_NON_NULL(image, NULL);
     PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL);
@@ -66,5 +66,5 @@
     }
     tmpVector->n = image->numCols;
-    psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
     return(tmpVector);
 }
@@ -79,13 +79,13 @@
                              psS32 y)
 {
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
     if ((x >= valid.x0) &&
             (x <= valid.x1) &&
             (y >= valid.y0) &&
             (y <= valid.y1)) {
-        psTrace(__func__, 4, "---- %s(true) end ----\n", __func__);
+        psTrace("psModules.objects", 4, "---- %s(true) end ----\n", __func__);
         return(true);
     }
-    psTrace(__func__, 4, "---- %s(false) end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s(false) end ----\n", __func__);
     return(false);
 }
@@ -102,5 +102,5 @@
                     pmPeakType type)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     static int id = 1;
     pmPeak *tmp = (pmPeak *) psAlloc(sizeof(pmPeak));
@@ -113,5 +113,5 @@
     psMemSetDeallocator(tmp, (psFreeFunc) peakFree);
 
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmp);
 }
@@ -125,5 +125,5 @@
 int pmPeaksCompareAscend (const void **a, const void **b)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     pmPeak *A = *(pmPeak **)a;
     pmPeak *B = *(pmPeak **)b;
@@ -133,11 +133,11 @@
     diff = A->counts - B->counts;
     if (diff < FLT_EPSILON) {
-        psTrace(__func__, 3, "---- %s(-1) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(-1) end ----\n", __func__);
         return (-1);
     } else if (diff > FLT_EPSILON) {
-        psTrace(__func__, 3, "---- %s(+1) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(+1) end ----\n", __func__);
         return (+1);
     }
-    psTrace(__func__, 3, "---- %s(0) end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s(0) end ----\n", __func__);
     return (0);
 }
@@ -146,5 +146,5 @@
 int pmPeaksCompareDescend (const void **a, const void **b)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     pmPeak *A = *(pmPeak **)a;
     pmPeak *B = *(pmPeak **)b;
@@ -154,11 +154,11 @@
     diff = A->counts - B->counts;
     if (diff < FLT_EPSILON) {
-        psTrace(__func__, 3, "---- %s(+1) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(+1) end ----\n", __func__);
         return (+1);
     } else if (diff > FLT_EPSILON) {
-        psTrace(__func__, 3, "---- %s(-1) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(-1) end ----\n", __func__);
         return (-1);
     }
-    psTrace(__func__, 3, "---- %s(0) end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s(0) end ----\n", __func__);
     return (0);
 }
@@ -178,5 +178,5 @@
                             psF32 threshold)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_VECTOR_NON_NULL(vector, NULL);
     PS_ASSERT_VECTOR_NON_EMPTY(vector, NULL);
@@ -198,5 +198,5 @@
             tmpVector = psVectorAlloc(0, PS_TYPE_U32);
         }
-        psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
         return(tmpVector);
     }
@@ -264,5 +264,5 @@
     }
 
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmpVector);
 }
@@ -292,10 +292,10 @@
                           psF32 threshold)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_IMAGE_NON_NULL(image, NULL);
     PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL);
     if ((image->numRows == 1) || (image->numCols == 1)) {
         psError(PS_ERR_UNKNOWN, true, "Currently, input image must have at least 2 rows and 2 columns.");
-        psTrace(__func__, 3, "---- %s(NULL) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);
         return(NULL);
     }
@@ -361,5 +361,5 @@
     //
     if (image->numRows == 1) {
-        psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
         return(list);
     }
@@ -484,5 +484,5 @@
     psFree (tmpRow);
     psFree (row1);
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(list);
 }
@@ -507,5 +507,5 @@
                     const psRegion valid)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(peaks, NULL);
 
@@ -525,5 +525,5 @@
     }
 
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(peaks);
 }
@@ -537,5 +537,5 @@
     const psRegion valid)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(peaks, NULL);
 
@@ -553,5 +553,5 @@
         psArrayAdd (output, 200, tmpPeak);
     }
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(output);
 }