Index: trunk/psModules/src/imcombine/pmImageCombine.c
===================================================================
--- trunk/psModules/src/imcombine/pmImageCombine.c	(revision 8004)
+++ trunk/psModules/src/imcombine/pmImageCombine.c	(revision 8246)
@@ -8,6 +8,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-28 03:21:19 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:07 $
  *
  *  XXX: pmRejectPixels() has a known bug with the pmImageTransform() call.
@@ -50,5 +50,5 @@
     PS_ASSERT_PTR_NON_NULL(images, combine);
     psU32 numImages = images->n;
-    psTrace("ImageCombine.pmCombineImages", 3, "Calling pmCombineImages(%d)\n", images->n);
+    psTrace("psModules.imcombine", 3, "Calling pmCombineImages(%d)\n", images->n);
 
     if (errors != NULL) {
@@ -297,5 +297,5 @@
     psFree(qpPtr);
 
-    psTrace("ImageCombine.pmCombineImages", 3, "Exiting pmCombineImages(%d)\n", images->n);
+    psTrace("psModules.imcombine", 3, "Exiting pmCombineImages(%d)\n", images->n);
     return(combine);
 }
@@ -312,5 +312,5 @@
 )
 {
-    psTrace("ImageCombine.CalcGradient", 4, "Calling CalcGradient(%d, %d)\n", x, y);
+    psTrace("psModules.imcombine", 4, "Calling CalcGradient(%d, %d)\n", x, y);
     int num = 0;
     psVector *pixels = psVectorAlloc(8, PS_TYPE_F32); // Array of pixels
@@ -365,5 +365,5 @@
     psFree(mask);
 
-    psTrace("ImageCombine.CalcGradient", 4, "Exiting CalcGradient(%d, %d)\n", x, y);
+    psTrace("psModules.imcombine", 4, "Exiting CalcGradient(%d, %d)\n", x, y);
     return(median / image->data.F32[y][x]);
 }
@@ -382,5 +382,5 @@
                                 psPlaneTransform *myOutToIn)
 {
-    psTrace("ImageCombine.DetermineRegion", 4, "Calling DetermineRegion()\n");
+    psTrace("psModules.imcombine", 4, "Calling DetermineRegion()\n");
     psRegion myRegion;
     myRegion.x0 = PS_MAX_F32;
@@ -457,5 +457,5 @@
     }
 
-    psTrace("ImageCombine.DetermineRegion", 4, "Exiting DetermineRegion()\n");
+    psTrace("psModules.imcombine", 4, "Exiting DetermineRegion()\n");
     return(myRegion);
 }
@@ -466,5 +466,5 @@
 static psImage *ImageConvertF32(psImage *image)
 {
-    psTrace("ImageCombine.ImageConvertF32", 4, "Calling ImageConvertF32()\n");
+    psTrace("psModules.imcombine", 4, "Calling ImageConvertF32()\n");
     psImage *imgF32 = psImageAlloc(image->numCols, image->numRows, PS_TYPE_F32);
 
@@ -475,5 +475,5 @@
     }
 
-    psTrace("ImageCombine.ImageConvertF32", 4, "Exiting ImageConvertF32()\n");
+    psTrace("psModules.imcombine", 4, "Exiting ImageConvertF32()\n");
     return(imgF32);
 }
@@ -504,5 +504,5 @@
 )
 {
-    psTrace("ImageCombine.pmRejectPixels", 3, "Calling pmRejectPixels()\n");
+    psTrace("psModules.imcombine", 3, "Calling pmRejectPixels()\n");
     PS_ASSERT_PTR_NON_NULL(images, NULL);
     for (psS32 im = 0 ; im < images->n ; im++) {
@@ -663,5 +663,5 @@
     psFree(inCoords);
     psFree(outCoords);
-    psTrace("ImageCombine.pmRejectPixels", 3, "Exiting pmRejectPixels()\n");
+    psTrace("psModules.imcombine", 3, "Exiting pmRejectPixels()\n");
     return(rejects);
 }
Index: trunk/psModules/src/imcombine/pmImageSubtract.c
===================================================================
--- trunk/psModules/src/imcombine/pmImageSubtract.c	(revision 8004)
+++ trunk/psModules/src/imcombine/pmImageSubtract.c	(revision 8246)
@@ -7,6 +7,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-30 23:59:49 $
+ *  @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
@@ -97,5 +97,5 @@
         int spatialOrder)
 {
-    psTrace("ImageSubtract.pmSubtractionKernelsAllocPOIS", 3,
+    psTrace("psModules.imcombine", 3,
             "Calling pmSubtractionKernelsAllocPOIS(%d, %d)\n", size, spatialOrder);
     PS_ASSERT_INT_POSITIVE(size, NULL);
@@ -173,5 +173,5 @@
     }
 
-    psTrace("ImageSubtract.pmSubtractionKernelsAllocPOIS", 3,
+    psTrace("psModules.imcombine", 3,
             "Exiting pmSubtractionKernelsAllocPOIS(%d, %d)\n", size, spatialOrder);
     return(tmp);
@@ -190,5 +190,5 @@
     PS_ASSERT_VECTOR_NON_NULL(sigmas, NULL);
     PS_ASSERT_VECTOR_NON_NULL(orders, NULL);
-    psTrace("ImageSubtract.pmSubtractionKernelsAllocISIS", 3,
+    psTrace("psModules.imcombine", 3,
             "Calling pmSubtractionKernelsAllocISIS(%d, %d, %d, %d)\n",
             sigmas->n, orders->n, size, spatialOrder);
@@ -306,5 +306,5 @@
     }
 
-    psTrace("ImageSubtract.pmSubtractionKernelsAllocISIS", 3,
+    psTrace("psModules.imcombine", 3,
             "Exiting pmSubtractionKernelsAllocISIS(%d, %d, %d, %d)\n",
             sigmas->n, orders->n, size, spatialOrder);
@@ -333,5 +333,5 @@
                                 )
 {
-    psTrace("ImageSubtract.pmSubtractionFindStamps", 3,
+    psTrace("psModules.imcombine", 3,
             "Calling pmSubtractionFindStamps(%d, %f, %d, %d, %d)\n",
             maskVal, threshold, xNum, yNum, border);
@@ -456,5 +456,5 @@
         }
     }
-    psTrace("ImageSubtract.pmSubtractionFindStamps", 3,
+    psTrace("psModules.imcombine", 3,
             "Exiting pmSubtractionFindStamps(%d, %f, %d, %d, %d)\n",
             maskVal, threshold, xNum, yNum, border);
@@ -474,5 +474,5 @@
                                 psF32 y)
 {
-    psTrace("ImageSubtract.GenSpatialOrder", 4,
+    psTrace("psModules.imcombine", 4,
             "Calling GenSpatialOrder(%d, %f, %f)\n", spatialOrder, x, y);
 
@@ -490,5 +490,5 @@
     }
 
-    psTrace("ImageSubtract.GenSpatialOrder", 4,
+    psTrace("psModules.imcombine", 4,
             "Exiting GenSpatialOrder(%d, %f, %f)\n", spatialOrder, x, y);
 
@@ -509,5 +509,5 @@
 
 
-    psTrace("ImageSubtract.IsisKernelConvolve", 4,
+    psTrace("psModules.imcombine", 4,
             "Calling IsisKernelConvolve(%d, %d, %d)\n", kernelID, col, row);
     psS32 spatialOrder = kernels->spatialOrder;
@@ -541,5 +541,5 @@
     psFree(polyValues);
 
-    psTrace("ImageSubtract.IsisKernelConvolve", 4,
+    psTrace("psModules.imcombine", 4,
             "Exiting IsisKernelConvolve(%d, %d, %d)\n", kernelID, col, row);
     return(conv);
@@ -563,5 +563,5 @@
                                psS32 row)
 {
-    psTrace("ImageSubtract.ConvolvePixelPois", 4,
+    psTrace("psModules.imcombine", 4,
             "Calling ConvolvePixelPois(%d, %d)\n", col, row);
     psS32 nBF = kernels->u->n;
@@ -604,5 +604,5 @@
     }
 
-    psTrace("ImageSubtract.ConvolvePixelPois", 4,
+    psTrace("psModules.imcombine", 4,
             "Exiting ConvolvePixelPois(%d, %d)\n", col, row);
     return(conv);
@@ -628,5 +628,5 @@
                                psS32 row)
 {
-    psTrace("ImageSubtract.ConvolvePixelIsis", 4,
+    psTrace("psModules.imcombine", 4,
             "Calling ConvolvePixelIsis(%d, %d)\n", col, row);
     psF32 background = solution->data.F64[solution->n-1];
@@ -640,5 +640,5 @@
     }
 
-    psTrace("ImageSubtract.ConvolvePixelIsis", 4,
+    psTrace("psModules.imcombine", 4,
             "Exiting ConvolvePixelIsis(%d, %d)\n", col, row);
     return(conv);
@@ -655,5 +655,5 @@
                               const psSubtractionKernels *kernels)
 {
-    psTrace("ImageSubtract.ConvolveImage", 4, "Calling ConvolveImage()\n");
+    psTrace("psModules.imcombine", 4, "Calling ConvolveImage()\n");
     PS_ASSERT_IMAGE_NON_NULL(input, NULL);
     PS_ASSERT_IMAGE_NON_EMPTY(input, NULL);
@@ -724,5 +724,5 @@
     }
 
-    psTrace("ImageSubtract.ConvolveImage", 4, "Exiting ConvolveImage()\n");
+    psTrace("psModules.imcombine", 4, "Exiting ConvolveImage()\n");
     return convolved;
 }
@@ -743,5 +743,5 @@
                                    )
 {
-    psTrace("ImageSubtract.pmSubtractionCalculateEquation", 3,
+    psTrace("psModules.imcombine", 3,
             "Calling pmSubtractionCalculateEquation()\n");
     PS_ASSERT_PTR_NON_NULL(stamps, false);
@@ -805,7 +805,7 @@
     for (psS32 s = 0; s < stamps->n; s++) {
         pmStamp *stamp = (pmStamp *) stamps->data[s];
-        psTrace("pmSubtractionCalculateEquation", 6, "subCalcEqn(): stamp %d\n", s);
+        psTrace("psModules.imcombine", 6, "subCalcEqn(): stamp %d\n", s);
         if (stamp->status == PM_STAMP_RECALC) {
-            psTrace("pmSubtractionCalculateEquation", 6, "subCalcEqn(): stamp %d: status is PM_STAMP_RECALC.\n", s);
+            psTrace("psModules.imcombine", 6, "subCalcEqn(): stamp %d: status is PM_STAMP_RECALC.\n", s);
             psImage *stampMatrix = stamp->matrix;
             psVector *stampVector = stamp->vector;
@@ -829,5 +829,5 @@
             }
             psVectorInit(stampVector, 0.0);
-            psTrace("pmSubtractionCalculateEquation", 6, "subCalcEqn(): stamp %d: allocate matrix and vector.\n", s);
+            psTrace("psModules.imcombine", 6, "subCalcEqn(): stamp %d: allocate matrix and vector.\n", s);
 
             //
@@ -840,5 +840,5 @@
                                                   ((psF64) (stamp->y - numHalfRows)) / ((psF64) numHalfRows));
 
-            psTrace("pmSubtractionCalculateEquation", 6, "subCalcEqn(): stamp %d: generated spatial order terms.\n", s);
+            psTrace("psModules.imcombine", 6, "subCalcEqn(): stamp %d: generated spatial order terms.\n", s);
 
             if (kernels->type == PM_SUBTRACTION_KERNEL_POIS) {
@@ -848,5 +848,5 @@
                 for (psS32 y = stamp->y - footprint; y < stamp->y + footprint; y++) {
                     for (psS32 x = stamp->x - footprint; x < stamp->x + footprint; x++) {
-                        psTrace("pmSubtractionCalculateEquation", 6, "subCalcEqn(): pixel (%d, %d).\n", y, x);
+                        psTrace("psModules.imcombine", 6, "subCalcEqn(): pixel (%d, %d).\n", y, x);
 
                         // The inverse of the noise, squared.
@@ -932,5 +932,5 @@
                 for (psS32 y = stamp->y - footprint; y < stamp->y + footprint; y++) {
                     for (psS32 x = stamp->x - footprint; x < stamp->x + footprint; x++) {
-                        psTrace("pmSubtractionCalculateEquation", 6, "subCalcEqn(): pixel (%d, %d).\n", y, x);
+                        psTrace("psModules.imcombine", 6, "subCalcEqn(): pixel (%d, %d).\n", y, x);
                         psF32 invNoise2 = 1.0/reference->data.F32[y][x]; // The inverse of the noise, squared.
 
@@ -998,5 +998,5 @@
         }
     }
-    psTrace("ImageSubtract.pmSubtractionCalculateEquation", 3,
+    psTrace("psModules.imcombine", 3,
             "Exiting pmSubtractionCalculateEquation()\n");
     return(true);
@@ -1012,5 +1012,5 @@
                                     )
 {
-    psTrace("ImageSubtract.pmSubtractionSolveEquation", 3,
+    psTrace("psModules.imcombine", 3,
             "Calling pmSubtractionSolveEquation()\n");
     PS_ASSERT_PTR_NON_NULL(stamps, NULL);
@@ -1120,5 +1120,5 @@
     psFree(permutation);
 
-    psTrace("ImageSubtract.pmSubtractionSolveEquation", 3,
+    psTrace("psModules.imcombine", 3,
             "Exiting pmSubtractionSolveEquation()\n");
     return(solution);
@@ -1138,5 +1138,5 @@
                                      const psVector *solution)
 {
-    psTrace("ImageSubtract.CalculateDeviations", 4,
+    psTrace("psModules.imcombine", 4,
             "Calling CalculateDeviations()\n");
     PS_ASSERT_PTR_NON_NULL(stamps, NULL);
@@ -1220,5 +1220,5 @@
     psFree(subStamp);
 
-    psTrace("ImageSubtract.CalculateDeviations", 4,
+    psTrace("psModules.imcombine", 4,
             "Exiting CalculateDeviations()\n");
     return deviations;
@@ -1238,5 +1238,5 @@
                               )
 {
-    psTrace("ImageSubtract.pmSubtractionRejectStamps", 3,
+    psTrace("psModules.imcombine", 3,
             "Calling pmSubtractionRejectStamps()\n");
     PS_ASSERT_PTR_NON_NULL(stamps, false);
@@ -1313,5 +1313,5 @@
 
     psFree(deviations);
-    psTrace("ImageSubtract.pmSubtractionRejectStamps", 3,
+    psTrace("psModules.imcombine", 3,
             "Exiting pmSubtractionRejectStamps()\n");
     return(true);
@@ -1327,5 +1327,5 @@
                                  )
 {
-    psTrace("ImageSubtract.pmSubtractionKernelImage", 3,
+    psTrace("psModules.imcombine", 3,
             "Calling pmSubtractionKernelImage()\n");
     PS_ASSERT_VECTOR_NON_NULL(solution, NULL);
@@ -1401,5 +1401,5 @@
     psFree(polyValues);
 
-    psTrace("ImageSubtract.pmSubtractionKernelImage", 3,
+    psTrace("psModules.imcombine", 3,
             "Exiting pmSubtractionKernelImage()\n");
     return(out);
Index: trunk/psModules/src/imcombine/pmReadoutCombine.c
===================================================================
--- trunk/psModules/src/imcombine/pmReadoutCombine.c	(revision 8004)
+++ trunk/psModules/src/imcombine/pmReadoutCombine.c	(revision 8246)
@@ -5,6 +5,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-12 03:30:53 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:07 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -168,5 +168,5 @@
         minInputCols = PS_MIN(minInputCols, readout->col0);
         maxInputCols = PS_MAX(maxInputCols, readout->col0 + readout->image->numCols);
-        psTrace(__func__, 7, "Readout %d: offset %d,%d; size %dx%d\n", i,
+        psTrace("psModules.imcombine", 7, "Readout %d: offset %d,%d; size %dx%d\n", i,
                 readout->col0, readout->row0, readout->image->numCols, readout->image->numRows);
     }
@@ -184,5 +184,5 @@
         *(psS32 *) &(output->row0) = minInputRows;
     }
-    psTrace(__func__, 7, "Output minimum: %d,%d\n", output->col0, output->row0);
+    psTrace("psModules.imcombine", 7, "Output minimum: %d,%d\n", output->col0, output->row0);
 
     // Allocate the output products
@@ -274,5 +274,5 @@
     #ifndef PS_NO_TRACE
 
-    psTrace(__func__, 3, "Iterating output: %d --> %d, %d --> %d\n",
+    psTrace("psModules.imcombine", 3, "Iterating output: %d --> %d, %d --> %d\n",
             minInputCols - output->col0, maxInputCols - output->col0,
             minInputRows - output->row0, maxInputRows - output->row0);
@@ -280,5 +280,5 @@
         for (int r = 0; r < inputs->n; r++) {
             pmReadout *readout = inputs->data[r]; // Input readout
-            psTrace(__func__, 3, "Iterating input %d: %d --> %d, %d --> %d\n", r,
+            psTrace("psModules.imcombine", 3, "Iterating input %d: %d --> %d, %d --> %d\n", r,
                     minInputCols - readout->col0, maxInputCols - readout->col0,
                     minInputRows - readout->row0, maxInputRows - readout->row0);