Index: trunk/psModules/src/detrend/pmFlatNormalize.c
===================================================================
--- trunk/psModules/src/detrend/pmFlatNormalize.c	(revision 8108)
+++ trunk/psModules/src/detrend/pmFlatNormalize.c	(revision 8246)
@@ -71,5 +71,5 @@
         for (int i = 0; i < numSources; i++) {
             if (sourceMask->data.U8[i]) {
-                psTrace(__func__, 7, "Flux for exposure %d is masked.\n", i);
+                psTrace("psModules.detrend", 7, "Flux for exposure %d is masked.\n", i);
                 continue;
             }
@@ -89,5 +89,5 @@
                 sourceFlux->data.F32[i] = NAN;
             }
-            psTrace(__func__, 7, "Flux for exposure %d is %lf\n", i, exp(sourceFlux->data.F32[i]));
+            psTrace("psModules.detrend", 7, "Flux for exposure %d is %lf\n", i, exp(sourceFlux->data.F32[i]));
         }
 
@@ -117,8 +117,8 @@
                 chipGains->data.F32[i] = NAN;
             }
-            psTrace(__func__, 7, "Gain for chip %d is %lf\n", i, exp(-chipGains->data.F32[i]));
+            psTrace("psModules.detrend", 7, "Gain for chip %d is %lf\n", i, exp(-chipGains->data.F32[i]));
         }
 
-        psTrace(__func__, 2, "Iteration %d: difference is %e\n", iter, diff);
+        psTrace("psModules.detrend", 2, "Iteration %d: difference is %e\n", iter, diff);
 
         // Switch the old and new
Index: trunk/psModules/src/detrend/pmFringeStats.c
===================================================================
--- trunk/psModules/src/detrend/pmFringeStats.c	(revision 8108)
+++ trunk/psModules/src/detrend/pmFringeStats.c	(revision 8246)
@@ -3,6 +3,6 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-13 02:21:25 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:07 $
  *
  *  Copyright 2004 IfA
@@ -327,5 +327,5 @@
         dfPt[i] = 1.0 / medianSd->sampleStdev;
 
-        psTrace(__func__, 7, "[%d:%d,%d:%d]: %f %f\n", (int)region.x0, (int)region.x1,
+        psTrace("psModules.detrend", 7, "[%d:%d,%d:%d]: %f %f\n", (int)region.x0, (int)region.x1,
                 (int)region.y0, (int)region.y1, fPt[i], dfPt[i]);
     }
@@ -671,7 +671,7 @@
     int numClipped = 0;                 // Number clipped
     for (int i = 0; i < diffs->n; i++) {
-        psTrace(__func__, 10, "Region %d (%d): %f\n", i, mask->data.U8[i], diffs->data.F32[i]);
+        psTrace("psModules.detrend", 10, "Region %d (%d): %f\n", i, mask->data.U8[i], diffs->data.F32[i]);
         if (!mask->data.U8[i] && fabs(diffs->data.F32[i]) > middle + thresh) {
-            psTrace(__func__, 5, "Masking %d: %f\n", i, diffs->data.F32[i]);
+            psTrace("psModules.detrend", 5, "Masking %d: %f\n", i, diffs->data.F32[i]);
             mask->data.U8[i] = 1;
             numClipped++;
@@ -732,5 +732,5 @@
             if (!finite(fringe->f->data.F32[j])) {
                 mask->data.U8[j] = 1;
-                psTrace(__func__, 9, "Masking region %d because not finite in fringe %d.\n", j, i);
+                psTrace("psModules.detrend", 9, "Masking region %d because not finite in fringe %d.\n", j, i);
             }
         }
@@ -749,5 +749,5 @@
     fringeScaleDiffs(diff, science, fringes, scale);
     numClipped = clipRegions(diff, mask, 3.0*rej);
-    psTrace(__func__, 4, "%d regions clipped in initial pass.\n", numClipped);
+    psTrace("psModules.detrend", 4, "%d regions clipped in initial pass.\n", numClipped);
 
     unsigned int iter = 0;              // Iteration number
@@ -756,8 +756,8 @@
         iter++;
         scaleMeasure(scale, science, fringes); // The scales
-        psTrace(__func__, 1, "Fringe scales after iteration %d:\n", iter);
-        psTrace(__func__, 1, "Background: %f %f\n", scale->coeff->data.F32[0], scale->coeffErr->data.F32[0]);
+        psTrace("psModules.detrend", 1, "Fringe scales after iteration %d:\n", iter);
+        psTrace("psModules.detrend", 1, "Background: %f %f\n", scale->coeff->data.F32[0], scale->coeffErr->data.F32[0]);
         for (int i = 0; i < scale->nFringeFrames; i++) {
-            psTrace(__func__, 1, "%d: %f %f\n", i, scale->coeff->data.F32[i + 1],
+            psTrace("psModules.detrend", 1, "%d: %f %f\n", i, scale->coeff->data.F32[i + 1],
                     scale->coeffErr->data.F32[i + 1]);
         }
@@ -766,5 +766,5 @@
         iterClip = clipRegions(diff, mask, rej); // Number clipped
         numClipped += iterClip;
-        psTrace(__func__, 9, "Clipped: %d\tFrac: %f\n", iterClip, (float)numClipped/(float)numRegions);
+        psTrace("psModules.detrend", 9, "Clipped: %d\tFrac: %f\n", iterClip, (float)numClipped/(float)numRegions);
     } while (iterClip > 0 && iter < nIter && (float)numClipped/(float)numRegions <= 1.0 - keepFrac);
     psFree(diff);
@@ -811,7 +811,7 @@
     psFree(scienceStats);
 
-    psTrace(__func__, 7, "Fringe solution:\n");
+    psTrace("psModules.detrend", 7, "Fringe solution:\n");
     for (int i = 0; i < fringeImages->n + 1; i++) {
-        psTrace(__func__, 7, "%d: %f %f\n", i, scale->coeff->data.F32[i],
+        psTrace("psModules.detrend", 7, "%d: %f %f\n", i, scale->coeff->data.F32[i],
                 scale->coeffErr->data.F32[i]);
     }
Index: trunk/psModules/src/detrend/pmSubtractBias.c
===================================================================
--- trunk/psModules/src/detrend/pmSubtractBias.c	(revision 8108)
+++ trunk/psModules/src/detrend/pmSubtractBias.c	(revision 8246)
@@ -11,6 +11,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-03 19:37:55 $
+ *  @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
@@ -259,5 +259,5 @@
                     const pmReadout *bias, const pmReadout *dark)
 {
-    psTrace(".psModule.pmSubtracBias.pmSubtractBias", 4,
+    psTrace("psModules.detrend", 4,
             "---- pmSubtractBias() begin ----\n");
     PS_ASSERT_PTR_NON_NULL(in, NULL);
Index: trunk/psModules/src/detrend/pmSubtractSky.c
===================================================================
--- trunk/psModules/src/detrend/pmSubtractSky.c	(revision 8108)
+++ trunk/psModules/src/detrend/pmSubtractSky.c	(revision 8246)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-28 03:21:19 $
+ *  @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
@@ -33,5 +33,5 @@
 static psS32 DetermineNumBits(psStatsOptions data)
 {
-    psTrace("SubtractSky.DetermineNumBits", 4, "Calling DetermineNumBits(0x%x)\n", data);
+    psTrace("psModules.detrend", 4, "Calling DetermineNumBits(0x%x)\n", data);
 
     psS32 i;
@@ -46,5 +46,5 @@
     }
 
-    psTrace("SubtractSky.DetermineNumBits", 4,
+    psTrace("psModules.detrend", 4,
             "Calling DetermineNumBits(0x%x) -> %d\n", data, numBits);
     return(numBits);
@@ -58,5 +58,5 @@
 static psU64 getHighestPriorityStatOption(psU64 statOptions)
 {
-    psTrace("SubtractSky.getHighestPriorityStatOption", 4,
+    psTrace("psModules.detrend", 4,
             "Calling getHighestPriorityStatOption(0x%x)\n", statOptions);
 
@@ -95,5 +95,5 @@
                          psStatsOptions statOptions)
 {
-    psTrace("SubtractSky.binImage", 4, "Calling binImage(%d)\n", binFactor);
+    psTrace("psModules.detrend", 4, "Calling binImage(%d)\n", binFactor);
 
     if (binFactor <= 0) {
@@ -148,5 +148,5 @@
     psFree(myStats);
 
-    psTrace("SubtractSky.binImage", 4, "Exiting binImage(%d)\n", binFactor);
+    psTrace("psModules.detrend", 4, "Exiting binImage(%d)\n", binFactor);
     return(origImage);
 }
@@ -163,5 +163,5 @@
 static psS32 CalculatePolyTerms(psS32 xOrder, psS32 yOrder)
 {
-    psTrace("SubtractSky.CalculatePolyTerms", 4,
+    psTrace("psModules.detrend", 4,
             "Calling CalculatePolyTerms(%d, %d)\n", xOrder, yOrder);
 
@@ -178,5 +178,5 @@
         }
     }
-    psTrace("SubtractSky.CalculatePolyTerms", 4,
+    psTrace("psModules.detrend", 4,
             "Exiting CalculatePolyTerms(%d, %d) -> %d\n", xOrder, yOrder, localPolyTerms);
     return(localPolyTerms);
@@ -198,5 +198,5 @@
 static psS32 **buildPolyTerms(psS32 xOrder, psS32 yOrder)
 {
-    psTrace("SubtractSky.buildPolyTerms", 4,
+    psTrace("psModules.detrend", 4,
             "Calling buildPolyTerms(%d, %d)\n", xOrder, yOrder);
 
@@ -233,5 +233,5 @@
     }
 
-    psTrace("SubtractSky.buildPolyTerms", 4,
+    psTrace("psModules.detrend", 4,
             "Exiting buildPolyTerms(%d, %d)\n", xOrder, yOrder);
     return(polyTerms);
@@ -258,5 +258,5 @@
                       psS32 yOrder)
 {
-    psTrace("SubtractSky.buildPolyTerms", 4,
+    psTrace("psModules.detrend", 4,
             "Calling buildPolyTerms(%d, %d)\n", xOrder, yOrder);
 
@@ -276,5 +276,5 @@
         xSum*= x;
     }
-    psTrace("SubtractSky.buildPolyTerms", 4,
+    psTrace("psModules.detrend", 4,
             "Exiting buildPolyTerms(%d, %d)\n", xOrder, yOrder);
 }
@@ -297,5 +297,5 @@
     psImage *maskImage)
 {
-    psTrace("SubtractSky.ImageFitPolynomial", 4,
+    psTrace("psModules.detrend", 4,
             "Calling ImageFitPolynomial()\n");
     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
@@ -416,5 +416,5 @@
     for (i=0;i<localPolyTerms;i++) {
         myPoly->coeff[ polyTerms[i][0] ][ polyTerms[i][1] ] = C->data.F64[i];
-        psTrace(".psModule.pmSubtractSky.ImageFitPolynomial", 6,
+        psTrace("psModules.detrend", 6,
                 "myPoly->coeff[%d][%d] is %f\n", polyTerms[i][0], polyTerms[i][1], myPoly->coeff[ polyTerms[i][0] ][ polyTerms[i][1] ]);
     }
@@ -456,7 +456,7 @@
     }
 
-    psTrace("SubtractSky.ImageFitPolynomial", 4,
+    psTrace("psModules.detrend", 4,
             "Exiting ImageFitPolynomial()\n");
-    //    psTrace(".psModule.pmSubtractSky.ImageFitPolynomial", 4,
+    //    psTrace("psModules.detrend", 4,
     //            "---- ImageFitPolynomial() end successfully ----\n");
     return(myPoly);
@@ -487,5 +487,5 @@
         PS_WARN_PTR_NON_NULL(in->parent->concepts);
     }
-    psTrace(".psModule.pmSubtractSky", 4,
+    psTrace("psModules.detrend", 4,
             "---- pmSubtractSky() begin ----\n");
 
@@ -590,5 +590,5 @@
         psImageInit(binnedMaskImage, 0);
     }
-    psTrace(".psModule.pmSubtractSky", 4,
+    psTrace("psModules.detrend", 4,
             "binnedImage size is (%d, %d)\n", binnedImage->numRows, binnedImage->numCols);
 
@@ -609,9 +609,9 @@
         psF64 binnedStdev = myStats->sampleStdev;
         psFree(myStats);
-        psTrace(".psModule.pmSubtractSky", 6,
+        psTrace("psModules.detrend", 6,
                 "binned StDev is %f\n", binnedStdev);
 
         // Clip all pixels which are more than clipSD sigmas from the mean.
-        psTrace(".psModule.pmSubtractSky", 6,
+        psTrace("psModules.detrend", 6,
                 "clipSD is %f\n", clipSD);
 
@@ -705,5 +705,5 @@
                 trimmedImg->data.F32[row][col]-= binPixel;
 
-                psTrace(".psModule.pmSubtractSky", 8,
+                psTrace("psModules.detrend", 8,
                         "image[%d][%d] <--> binnedImage[%.2f][%.2f]: %f\n",
                         row, col, binRowF64-0.5, binColF64-0.5, binPixel);
@@ -718,5 +718,5 @@
     }
 
-    psTrace(".psModule.pmSubtractSky", 4,
+    psTrace("psModules.detrend", 4,
             "---- pmSubtractSky() exit successfully ----\n");
     return(in);