Changeset 8246 for trunk/psModules/src/objects

Timestamp:

Aug 8, 2006, 4:37:08 PM (20 years ago)

Author:

jhoblitt

Message:

normalize psTrace() facility names

Location:

trunk/psModules/src/objects

Files:

• pmModel.c (modified) (10 diffs)
• pmModelGroup.c (modified) (3 diffs)
• pmMoments.c (modified) (3 diffs)
• pmPeaks.c (modified) (22 diffs)
• pmSource.c (modified) (13 diffs)
• pmSourceContour.c (modified) (21 diffs)
• pmSourceFitModel.c (modified) (8 diffs)
• pmSourceSky.c (modified) (7 diffs)

trunk/psModules/src/objects/pmModel.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-21 03:21:16 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:07 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -31 +31 @@
 static void modelFree(pmModel *tmp)
 {
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
     psFree(tmp->params);
     psFree(tmp->dparams);
-    psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
 }
 
@@ -44 +44 @@
 pmModel *pmModelAlloc(pmModelType type)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     pmModel *tmp = (pmModel *) psAlloc(sizeof(pmModel));
 
@@ -69 +69 @@
 
     psMemSetDeallocator(tmp, (psFreeFunc) modelFree);
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmp);
 }
@@ -102 +102 @@
 psF32 pmModelEval(pmModel *model, psImage *image, psS32 col, psS32 row)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(image, false);
     PS_ASSERT_PTR_NON_NULL(model, false);
@@ -119 +119 @@
     tmpF = modelFunc (NULL, model->params, x);
     psFree(x);
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmpF);
 }
@@ -131 +131 @@
                       )
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
 
     PS_ASSERT_PTR_NON_NULL(model, false);
@@ -183 +183 @@
     }
     psFree(x);
-    psTrace(__func__, 3, "---- %s(true) end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s(true) end ----\n", __func__);
     return(true);
 }
@@ -195 +195 @@
                 bool sky)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     psBool rc = AddOrSubModel(image, mask, model, center, sky, true);
-    psTrace(__func__, 3, "---- %s(%d) end ----\n", __func__, rc);
+    psTrace("psModules.objects", 3, "---- %s(%d) end ----\n", __func__, rc);
     return(rc);
 }
@@ -209 +209 @@
                 bool sky)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     psBool rc = AddOrSubModel(image, mask, model, center, sky, false);
-    psTrace(__func__, 3, "---- %s(%d) end ----\n", __func__, rc);
+    psTrace("psModules.objects", 3, "---- %s(%d) end ----\n", __func__, rc);
     return(rc);
 }

trunk/psModules/src/objects/pmModelGroup.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-21 03:21:16 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:07 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -203 +203 @@
                             pmModelType modelType)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(source->moments, false);
     PS_ASSERT_PTR_NON_NULL(source->peak, false);
@@ -211 +211 @@
     pmModelGuessFunc modelGuessFunc = pmModelGuessFunc_GetFunction(modelType);
     modelGuessFunc(model, source);
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(model);
 }

trunk/psModules/src/objects/pmMoments.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-21 03:21:16 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:07 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23 +23 @@
 pmMoments *pmMomentsAlloc()
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     pmMoments *tmp = (pmMoments *) psAlloc(sizeof(pmMoments));
     tmp->x = 0.0;
@@ -35 +35 @@
     tmp->nPixels = 0;
 
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmp);
 }

trunk/psModules/src/objects/pmPeaks.c

@@ -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 +32 @@
                               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 +43 @@
     // 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 +57 @@
                                        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 +66 @@
     }
     tmpVector->n = image->numCols;
-    psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
     return(tmpVector);
 }
@@ -79 +79 @@
                              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 +102 @@
                     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 +113 @@
     psMemSetDeallocator(tmp, (psFreeFunc) peakFree);
 
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmp);
 }
@@ -125 +125 @@
 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 +133 @@
     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 +146 @@
 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 +154 @@
     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 +178 @@
                             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 +198 @@
             tmpVector = psVectorAlloc(0, PS_TYPE_U32);
         }
-        psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
         return(tmpVector);
     }
@@ -264 +264 @@
     }
 
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmpVector);
 }
@@ -292 +292 @@
                           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 +361 @@
     //
     if (image->numRows == 1) {
-        psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
         return(list);
     }
@@ -484 +484 @@
     psFree (tmpRow);
     psFree (row1);
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(list);
 }
@@ -507 +507 @@
                     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 +525 @@
     }
 
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(peaks);
 }
@@ -537 +537 @@
     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 +553 @@
         psArrayAdd (output, 200, tmpPeak);
     }
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(output);
 }

trunk/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-22 20:04:13 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27 +27 @@
 static void sourceFree(pmSource *tmp)
 {
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
     psFree(tmp->peak);
     psFree(tmp->pixels);
@@ -36 +36 @@
     psFree(tmp->modelEXT);
     psFree(tmp->blends);
-    psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
 }
 
@@ -61 +61 @@
 pmSource *pmSourceAlloc()
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     static int id = 1;
     pmSource *tmp = (pmSource *) psAlloc(sizeof(pmSource));
@@ -83 +83 @@
     tmp->pixWeight = 0.0;
 
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmp);
 }
@@ -163 +163 @@
 pmPSFClump pmSourcePSFClump(psArray *sources, psMetadata *metadata)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
 
     # define NPIX 10
@@ -328 +328 @@
     }
 
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return (psfClump);
 }
@@ -345 +345 @@
 bool pmSourceRoughClass(psArray *sources, psMetadata *metadata, pmPSFClump clump)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
 
     psBool rc = true;
@@ -455 +455 @@
     psTrace (".pmObjects.pmSourceRoughClass", 2, "Ncr:      %3d\n", Ncr);
 
-    psTrace(__func__, 3, "---- %s(%d) end ----\n", __func__, rc);
+    psTrace("psModules.objects", 3, "---- %s(%d) end ----\n", __func__, rc);
     return(rc);
 }
@@ -481 +481 @@
                      psF32 radius)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(source, false);
     PS_ASSERT_PTR_NON_NULL(source->peak, false);
@@ -588 +588 @@
     if ((numPixels < 0.75*R2) || (Sum <= 0)) {
         psTrace (".psModules.pmSourceMoments", 3, "no valid pixels for source\n");
-        psTrace(__func__, 3, "---- %s(false) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(false) end ----\n", __func__);
         return (false);
     }
@@ -607 +607 @@
                  "large centroid swing; invalid peak %d, %d\n",
                  source->peak->x, source->peak->y);
-        psTrace(__func__, 3, "---- %s(false) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(false) end ----\n", __func__);
         return (false);
     }
@@ -630 +630 @@
              source->moments->Sx, source->moments->Sy, source->moments->Sxy);
 
-    psTrace(__func__, 3, "---- %s(true) end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s(true) end ----\n", __func__);
     return(true);
 }

trunk/psModules/src/objects/pmSourceContour.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-21 21:27:04 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -49 +49 @@
 {
 
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
 
     // We define variables incr and lastColumn so that we can use the same loop
@@ -70 +70 @@
         float value = image->data.F32[y][subCol];
         if (value <= threshold) {
-            psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+            psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
             return (subCol);
         }
         subCol += incr;
     }
-    psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
     return (lastColumn);
 }
@@ -89 +89 @@
 {
 
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
 
     // We define variables incr and lastColumn so that we can use the same loop
@@ -109 +109 @@
         float value = image->data.F32[y][subCol];
         if (value >= threshold) {
-            psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+            psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
             if (subCol == x) {
                 return (subCol);
@@ -117 +117 @@
         subCol += incr;
     }
-    psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
     return (lastColumn);
 }
@@ -139 +139 @@
                        psU32 dir)
 {
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
     //
     // Convert coords to subImage space.
@@ -149 +149 @@
     if (!((0 <= subCol) && (subCol < source->pixels->numCols))) {
         psError(PS_ERR_UNKNOWN, true, "Starting column outside subImage range");
-        psTrace(__func__, 4, "---- %s(NAN) end ----\n", __func__);
+        psTrace("psModules.objects", 4, "---- %s(NAN) end ----\n", __func__);
         return(NAN);
     }
     if (!((0 <= subRow) && (subRow < source->pixels->numRows))) {
-        psTrace(__func__, 4, "---- %s(NAN) end ----\n", __func__);
+        psTrace("psModules.objects", 4, "---- %s(NAN) end ----\n", __func__);
         psError(PS_ERR_UNKNOWN, true, "Starting row outside subImage range");
         return(NAN);
@@ -162 +162 @@
     psF32 oldValue = pmModelEval(source->modelEXT, source->pixels, subCol, subRow);
     if (oldValue == level) {
-        psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+        psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
         return(((psF32) (subCol + source->pixels->col0)));
     }
@@ -184 +184 @@
         psF32 newValue = pmModelEval(source->modelEXT, source->pixels, subCol, subRow);
         if (oldValue == level) {
-            psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+            psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
             return((psF32) (subCol + source->pixels->col0));
         }
@@ -190 +190 @@
         if ((newValue <= level) && (level <= oldValue)) {
             // This is simple linear interpolation.
-            psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+            psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
             return( ((psF32) (subCol + source->pixels->col0)) + ((psF32) incr) * ((level - newValue) / (oldValue - newValue)) );
         }
@@ -196 +196 @@
         if ((oldValue <= level) && (level <= newValue)) {
             // This is simple linear interpolation.
-            psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+            psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
             return( ((psF32) (subCol + source->pixels->col0)) + ((psF32) incr) * ((level - oldValue) / (newValue - oldValue)) );
         }
@@ -203 +203 @@
     }
 
-    psTrace(__func__, 4, "---- %s(NAN) end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s(NAN) end ----\n", __func__);
     return(NAN);
 }
@@ -215 +215 @@
     int xR, yR, x0, x1, x0s, x1s;
 
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(image, false);
 
@@ -327 +327 @@
     tmpArray->data[0] = (psPtr *) xVec;
     tmpArray->data[1] = (psPtr *) yVec;
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmpArray);
 }
@@ -348 +348 @@
                                psF32 level)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(source, false);
     PS_ASSERT_PTR_NON_NULL(image, false);
@@ -379 +379 @@
             psFree(xVec);
             psFree(yVec);
-            psTrace(__func__, 3, "---- %s(NULL) end ----\n", __func__);
+            psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);
             return(NULL);
             //psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not find contour edge (NAN)\n");
@@ -392 +392 @@
             psFree(xVec);
             psFree(yVec);
-            psTrace(__func__, 3, "---- %s(NULL) end ----\n", __func__);
+            psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);
             return(NULL);
             //psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not find contour edge (NAN)\n");
         }
-        psTrace(__func__, 4, "The intercepts are (%.2f, %.2f)\n", leftIntercept, rightIntercept);
+        psTrace("psModules.objects", 4, "The intercepts are (%.2f, %.2f)\n", leftIntercept, rightIntercept);
         xVec->data.F32[row+xVec->n] = ((psF32) source->pixels->col0) + rightIntercept;
 
@@ -417 +417 @@
             psFree(xVec);
             psFree(yVec);
-            psTrace(__func__, 3, "---- %s(NULL) end ----\n", __func__);
+            psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);
             return(NULL);
             //psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not find contour edge (NAN)\n");
@@ -429 +429 @@
             psFree(xVec);
             psFree(yVec);
-            psTrace(__func__, 3, "---- %s(NULL) end ----\n", __func__);
+            psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);
             return(NULL);
             //psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not find contour edge (NAN)\n");
@@ -447 +447 @@
     tmpArray->data[0] = (psPtr *) yVec;
     tmpArray->data[1] = (psPtr *) xVec;
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmpArray);
 }

trunk/psModules/src/objects/pmSourceFitModel.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-21 03:21:16 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -47 +47 @@
                        pmSourceFitMode mode)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(source, false);
     PS_ASSERT_PTR_NON_NULL(source->moments, false);
@@ -162 +162 @@
     if (nPix <  nParams + 1) {
         psTrace (".pmObjects.pmSourceFitModel", 4, "insufficient valid pixels\n");
-        psTrace(__func__, 3, "---- %s(false) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(false) end ----\n", __func__);
         model->status = PM_MODEL_BADARGS;
         psFree (x);
@@ -244 +244 @@
 
     rc = (onPic && fitStatus);
-    psTrace(__func__, 3, "---- %s(%d) end ----\n", __func__, rc);
+    psTrace("psModules.objects", 3, "---- %s(%d) end ----\n", __func__, rc);
     return(rc);
 }
@@ -329 +329 @@
                      pmSourceFitMode mode)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(source, false);
     PS_ASSERT_PTR_NON_NULL(source->moments, false);
@@ -489 +489 @@
     if (nPix <  nParams + 1) {
         psTrace (__func__, 4, "insufficient valid pixels\n");
-        psTrace(__func__, 3, "---- %s() end : fail pixels ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s() end : fail pixels ----\n", __func__);
         model->status = PM_MODEL_BADARGS;
         psFree (x);
@@ -517 +517 @@
     if (!fitStatus) {
         // psError(PS_ERR_UNKNOWN, false, "Failed to fit model (%d)\n", nSrc);
-        psTrace(__func__, 4, "Failed to fit model (%d)\n", nSrc);
+        psTrace("psModules.objects", 4, "Failed to fit model (%d)\n", nSrc);
     }
 
@@ -587 +587 @@
     rc = (onPic && fitStatus);
     psTrace (__func__, 5, "onPic: %d, fitStatus: %d, nIter: %d, chisq: %f, nDof: %d\n", onPic, fitStatus, model->nIter, model->chisq, model->nDOF);
-    psTrace(__func__, 3, "---- %s end : status %d ----\n", __func__, rc);
+    psTrace("psModules.objects", 3, "---- %s end : status %d ----\n", __func__, rc);
     return(rc);
 }

trunk/psModules/src/objects/pmSourceSky.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-28 03:21:19 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -41 +41 @@
     psF32 Radius)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(source, false);
     PS_ASSERT_IMAGE_NON_NULL(source->pixels, false);
@@ -71 +71 @@
 
     if (isnan(value)) {
-        psTrace(__func__, 3, "---- %s(false) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(false) end ----\n", __func__);
         return(false);
     }
@@ -78 +78 @@
     }
     source->moments->Sky = value;
-    psTrace(__func__, 3, "---- %s(true) end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s(true) end ----\n", __func__);
     return (true);
 }
@@ -88 +88 @@
     psF32 Radius)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(source, false);
     PS_ASSERT_IMAGE_NON_NULL(source->weight, false);
@@ -118 +118 @@
 
     if (isnan(value)) {
-        psTrace(__func__, 3, "---- %s(false) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(false) end ----\n", __func__);
         return(false);
     }
@@ -125 +125 @@
     }
     source->moments->dSky = value;
-    psTrace(__func__, 3, "---- %s(true) end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s(true) end ----\n", __func__);
     return (true);
 }