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

Timestamp:

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

Author:

jhoblitt

Message:

normalize psTrace() facility names

File:

• trunk/psModules/src/objects/pmModel.c (modified) (10 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);
 }