Index: /trunk/psphot/src/psphotArguments.c
===================================================================
--- /trunk/psphot/src/psphotArguments.c	(revision 9575)
+++ /trunk/psphot/src/psphotArguments.c	(revision 9576)
@@ -132,5 +132,5 @@
     psMetadataAddStr (config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "", argv[1]);
 
-    psTrace(__func__, 1, "Done with psphotArguments...\n");
+    psTrace("psphot", 1, "Done with psphotArguments...\n");
     return (config);
 }
Index: /trunk/psphot/src/psphotBlendFit.c
===================================================================
--- /trunk/psphot/src/psphotBlendFit.c	(revision 9575)
+++ /trunk/psphot/src/psphotBlendFit.c	(revision 9576)
@@ -52,5 +52,5 @@
 	// skip sources which are insignificant flux?
 	if (source->modelPSF->params->data.F32[1] < 0.1) {
-	    psTrace ("psphotBlendFit", 5, "skipping near-zero source: %f, %f : %f\n",
+	    psTrace ("psphot", 5, "skipping near-zero source: %f, %f : %f\n",
 		     source->modelPSF->params->data.F32[1],
 		     source->modelPSF->params->data.F32[2],
@@ -65,15 +65,15 @@
 	// try fitting PSFs, then try extended sources
 	if (psphotFitBlend (readout, source, psf)) { 
-	    psTrace ("psphotBlendFit", 5, "source at %7.1f, %7.1f is psf", source->moments->x, source->moments->y);
+	    psTrace ("psphot", 5, "source at %7.1f, %7.1f is psf", source->moments->x, source->moments->y);
 	    Npsf ++;
 	    continue;
 	}
 	if (psphotFitBlob (readout, source, sources, psf)) {
-	    psTrace ("psphotBlendFit", 5, "source at %7.1f, %7.1f is ext", source->moments->x, source->moments->y);
+	    psTrace ("psphot", 5, "source at %7.1f, %7.1f is ext", source->moments->x, source->moments->y);
 	    Next ++;
 	    continue;
 	}
 
-	psTrace ("psphotBlendFit", 5, "source at %7.1f, %7.1f failed", source->moments->x, source->moments->y);
+	psTrace ("psphot", 5, "source at %7.1f, %7.1f failed", source->moments->x, source->moments->y);
 	Nfail ++;
 
@@ -84,5 +84,5 @@
     }
 
-    psLogMsg ("psphot", 3, "fit models: %f sec for %d objects (%d psf, %d ext, %d failed, %ld skipped)\n", psTimerMark ("psphot"), Nfit, Npsf, Next, Nfail, sources->n - Nfit);
+    psLogMsg ("psphot.psphotBlendFit", 3, "fit models: %f sec for %d objects (%d psf, %d ext, %d failed, %ld skipped)\n", psTimerMark ("psphot"), Nfit, Npsf, Next, Nfail, sources->n - Nfit);
     return (true);
 }
Index: /trunk/psphot/src/psphotEnsemblePSF.c
===================================================================
--- /trunk/psphot/src/psphotEnsemblePSF.c	(revision 9575)
+++ /trunk/psphot/src/psphotEnsemblePSF.c	(revision 9576)
@@ -86,5 +86,5 @@
 	    psPlane min = psImageBicubeMin (bicube);
 
-	    psTrace ("psphotEnsemblePSF", 5, "peak coord: %f %f -> %f %f\n", 
+	    psTrace ("psphot", 5, "peak coord: %f %f -> %f %f\n", 
 		     modelEXT->params->data.F32[PM_PAR_XPOS], modelEXT->params->data.F32[PM_PAR_YPOS], min.x + ix, min.y + iy);
 	    
Index: /trunk/psphot/src/psphotParseCamera.c
===================================================================
--- /trunk/psphot/src/psphotParseCamera.c	(revision 9575)
+++ /trunk/psphot/src/psphotParseCamera.c	(revision 9576)
@@ -83,5 +83,5 @@
     psFree (chips);
 
-    psTrace(__func__, 1, "Done with psphotParseCamera...\n");
+    psTrace("psphot", 1, "Done with psphotParseCamera...\n");
 
     psErrorClear();			// some metadata lookup may have failed
Index: /trunk/psphot/src/psphotReadout.c
===================================================================
--- /trunk/psphot/src/psphotReadout.c	(revision 9575)
+++ /trunk/psphot/src/psphotReadout.c	(revision 9576)
@@ -24,5 +24,5 @@
     psphotModelTest (readout, recipe);
 
-    if (psTraceGetLevel("psphot.images") > 5) {
+    if (psTraceGetLevel("psphot") > 5) {
 	psphotSaveImage (NULL, readout->image,  "image.fits");
 	psphotSaveImage (NULL, readout->mask,   "mask.fits");
@@ -95,5 +95,5 @@
     // measure aperture photometry corrections
     if (!psphotApResid (readout, sources, recipe, psf)) {
-	psTrace ("psphotReadout", 4, "failure on psphotApResid"); 
+	psTrace ("psphot", 4, "failure on psphotApResid"); 
         psError(PSPHOT_ERR_PHOTOM, false, "Measure aperture photometry corrections");
         return false;
Index: /trunk/psphot/src/psphotReplaceUnfit.c
===================================================================
--- /trunk/psphot/src/psphotReplaceUnfit.c	(revision 9575)
+++ /trunk/psphot/src/psphotReplaceUnfit.c	(revision 9576)
@@ -13,5 +13,5 @@
 	if (source->modelPSF == NULL) continue;
 
-	psTrace (__func__, 3, "replacing object at %f,%f\n", 
+	psTrace ("psphot", 3, "replacing object at %f,%f\n", 
 		 source->modelPSF->params->data.F32[2], source->modelPSF->params->data.F32[3]);
 
Index: /trunk/psphot/src/psphotSourceFits.c
===================================================================
--- /trunk/psphot/src/psphotSourceFits.c	(revision 9575)
+++ /trunk/psphot/src/psphotSourceFits.c	(revision 9576)
@@ -12,5 +12,5 @@
 	return status;
     }
-    psTrace ("psphot.blend", 5, "trying blend...\n");
+    psTrace ("psphot", 5, "trying blend...\n");
 
     // save the PSF model from the Ensemble fit
@@ -79,5 +79,5 @@
 	// if this one failed, skip it
 	if (!psphotEvalPSF (blend, model)) {
-	    psTrace ("psphot.blend", 5, "failed on blend %d of %ld\n", i, modelSet->n);
+	    psTrace ("psphot", 5, "failed on blend %d of %ld\n", i, modelSet->n);
 	    continue;
 	}
@@ -86,5 +86,5 @@
 	psFree(blend->modelPSF);
 	blend->modelPSF = psMemIncrRefCounter (model);
-	psTrace ("psphot.blend", 5, "fitted blend as PSF\n");
+	psTrace ("psphot", 5, "fitted blend as PSF\n");
 	pmModelSub (source->pixels, source->mask, model, false, false);
 	blend->mode |=  PM_SOURCE_MODE_SUBTRACTED;
@@ -96,10 +96,10 @@
     // evaluate the primary object
     if (!psphotEvalPSF (source, PSF)) {
-	psTrace ("psphot.blend", 5, "failed on blend 0 of %ld\n", modelSet->n);
+	psTrace ("psphot", 5, "failed on blend 0 of %ld\n", modelSet->n);
 	psFree (PSF);
 	return false;
     }
 
-    psTrace ("psphot.blend", 5, "fitted primary as PSF\n");
+    psTrace ("psphot", 5, "fitted primary as PSF\n");
     pmModelSub (source->pixels, source->mask, PSF, false, false);
     psFree (source->modelPSF);
@@ -140,5 +140,5 @@
     }
 
-    psTrace ("psphot.blend", 5, "fitted as PSF\n");
+    psTrace ("psphot", 5, "fitted as PSF\n");
     pmModelSub (source->pixels, source->mask, PSF, false, false);
 
@@ -189,5 +189,5 @@
     if (!pmSourceMoments (source, EXT_MOMENTS_RAD)) return false;
 
-    psTrace ("psphot.blend", 5, "trying blob...\n");
+    psTrace ("psphot", 5, "trying blob...\n");
 
     // this temporary source is used as a place-holder by the psphotEval functions below
@@ -219,5 +219,5 @@
 
     if (okEXT && okDBL) {
-	psTrace ("psphot.blend", 5, "blob chisq: %f vs %f\n", chiEXT, chiDBL);
+	psTrace ("psphot", 5, "blob chisq: %f vs %f\n", chiEXT, chiDBL);
 	// XXX EAM : a bogus bias: need to examine this better 
 	if (3*chiEXT > chiDBL) goto keepDBL;
@@ -237,5 +237,5 @@
     psFree (DBL);
     pmModelSub (source->pixels, source->mask, EXT, false, false);
-    psTrace ("psphot.blend", 5, "blob as EXT: %f %f\n", EXT->params->data.F32[2], EXT->params->data.F32[3]);
+    psTrace ("psphot", 5, "blob as EXT: %f %f\n", EXT->params->data.F32[2], EXT->params->data.F32[3]);
 
     // save new model
@@ -250,5 +250,5 @@
     pmModelSub (source->pixels, source->mask, (pmModel *) DBL->data[0], false, false);
     pmModelSub (source->pixels, source->mask, (pmModel *) DBL->data[1], false, false);
-    psTrace ("psphot.blend", 5, "blob as DBL: %f %f\n", ONE->params->data.F32[2], ONE->params->data.F32[3]);
+    psTrace ("psphot", 5, "blob as DBL: %f %f\n", ONE->params->data.F32[2], ONE->params->data.F32[3]);
 
     // drop old model, save new second model...
@@ -339,5 +339,5 @@
 
     if ((source->moments->Sx < 1e-3) || (source->moments->Sx < 1e-3)) {
-	psTrace ("psphotSourceFits", 5, "problem source: moments: %f %f\n", source->moments->Sx, source->moments->Sy);
+	psTrace ("psphot", 5, "problem source: moments: %f %f\n", source->moments->Sx, source->moments->Sy);
     }