Changeset 8246 for trunk/psModules/src/objects/pmSource.c

Timestamp:

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

Author:

jhoblitt

Message:

normalize psTrace() facility names

File:

• trunk/psModules/src/objects/pmSource.c (modified) (13 diffs)

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);
 }