Changeset 8246

Timestamp:

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

Author:

jhoblitt

Message:

normalize psTrace() facility names

Location:

trunk/psModules/src

Files:

• camera/pmFPA.c (modified) (9 diffs)
• camera/pmFPAConstruct.c (modified) (7 diffs)
• camera/pmFPACopy.c (modified) (3 diffs)
• camera/pmFPAEnsemble.c (modified) (2 diffs)
• camera/pmFPAMaskWeight.c (modified) (1 diff)
• camera/pmFPAMosaic.c (modified) (16 diffs)
• camera/pmFPARead.c (modified) (3 diffs)
• camera/pmFPAfileDefine.c (modified) (4 diffs)
• camera/pmFPAfileIO.c (modified) (13 diffs)
• camera/pmHDU.c (modified) (5 diffs)
• camera/pmHDUUtils.c (modified) (1 diff)
• concepts/pmConcepts.c (modified) (11 diffs)
• concepts/pmConceptsRead.c (modified) (3 diffs)
• concepts/pmConceptsWrite.c (modified) (4 diffs)
• config/pmConfig.c (modified) (11 diffs)
• detrend/pmFlatNormalize.c (modified) (3 diffs)
• detrend/pmFringeStats.c (modified) (8 diffs)
• detrend/pmSubtractBias.c (modified) (2 diffs)
• detrend/pmSubtractSky.c (modified) (20 diffs)
• imcombine/pmImageCombine.c (modified) (11 diffs)
• imcombine/pmImageSubtract.c (modified) (32 diffs)
• imcombine/pmReadoutCombine.c (modified) (5 diffs)
• objects/pmModel.c (modified) (10 diffs)
• objects/pmModelGroup.c (modified) (3 diffs)
• objects/pmMoments.c (modified) (3 diffs)
• objects/pmPeaks.c (modified) (22 diffs)
• objects/pmSource.c (modified) (13 diffs)
• objects/pmSourceContour.c (modified) (21 diffs)
• objects/pmSourceFitModel.c (modified) (8 diffs)
• objects/pmSourceSky.c (modified) (7 diffs)

trunk/psModules/src/camera/pmFPA.c

@@ -12 +12 @@
 * XXX: Should we implement non-linear cell->chip transforms?
 *
-*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-02 02:17:11 $
+*  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-09 02:37:07 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -38 +38 @@
     // if this readout has a parent, drop that instance
     if (readout->parent) {
-        psTrace(__func__, 9, "Removing readout %lx from cell %lx...\n", (size_t)readout, (size_t)readout->parent);
+        psTrace("psModules.camera", 9, "Removing readout %lx from cell %lx...\n", (size_t)readout, (size_t)readout->parent);
         psArray *readouts = readout->parent->readouts;
         for (int i = 0; i < readouts->n; i++) {
@@ -46 +46 @@
         }
     }
-    psTrace(__func__, 9, "Freeing readout %lx\n", (size_t) readout);
+    psTrace("psModules.camera", 9, "Freeing readout %lx\n", (size_t) readout);
     psFree(readout->image);
     psFree(readout->mask);
@@ -59 +59 @@
     // if this cell has a parent, drop that instance
     if (cell->parent) {
-        psTrace(__func__, 9, "Removing cell %lx from chip %lx...\n", (size_t)cell, (size_t)cell->parent);
+        psTrace("psModules.camera", 9, "Removing cell %lx from chip %lx...\n", (size_t)cell, (size_t)cell->parent);
         psArray *cells = cell->parent->cells;
         for (int i = 0; i < cells->n; i++) {
@@ -67 +67 @@
         }
     }
-    psTrace(__func__, 9, "Freeing cell %lx\n", (size_t)cell);
+    psTrace("psModules.camera", 9, "Freeing cell %lx\n", (size_t)cell);
     pmCellFreeReadouts(cell);
     psFree(cell->readouts);
@@ -81 +81 @@
     // if this chip has a parent, drop that instance
     if (chip->parent) {
-        psTrace(__func__, 9, "Removing chip %lx from fpa %lx...\n", (size_t)chip, (size_t)chip->parent);
+        psTrace("psModules.camera", 9, "Removing chip %lx from fpa %lx...\n", (size_t)chip, (size_t)chip->parent);
         psArray *chips = chip->parent->chips;
         for (int i = 0; i < chips->n; i++) {
@@ -90 +90 @@
     }
 
-    psTrace(__func__, 9, "Freeing chip %lx\n", (size_t)chip);
+    psTrace("psModules.camera", 9, "Freeing chip %lx\n", (size_t)chip);
     pmChipFreeCells(chip);
     psFree(chip->cells);
@@ -109 +109 @@
 static void FPAFree(pmFPA *fpa)
 {
-    psTrace(__func__, 9, "Freeing fpa %lx\n", (size_t)fpa);
+    psTrace("psModules.camera", 9, "Freeing fpa %lx\n", (size_t)fpa);
 
     // NULL the parent pointers
@@ -149 +149 @@
         }
         tmpReadout->parent = NULL;
-        psTrace(__func__, 9, "Will now free readout %lx...\n", (size_t)tmpReadout);
+        psTrace("psModules.camera", 9, "Will now free readout %lx...\n", (size_t)tmpReadout);
     }
     cell->readouts = psArrayRealloc(cell->readouts, 0);

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -244 +244 @@
     }
 
-    psTrace(__func__, 5, "Looking up %s in the CONTENTS.\n", contentKey);
+    psTrace("psModules.camera", 5, "Looking up %s in the CONTENTS.\n", contentKey);
     const char *content = psMetadataLookupStr(&mdok, contents, contentKey);
     if (!mdok || !content || strlen(content) == 0) {
@@ -593 +593 @@
             // Need to look up what chip we have.
             psString chipName = phuNameFromHeader("CHIP.NAME", fileInfo, header);
-            psTrace(__func__, 5, "This is chip %s\n", chipName);
+            psTrace("psModules.camera", 5, "This is chip %s\n", chipName);
             int chipNum = pmFPAFindChip(fpa, chipName); // Chip number
             if (chipNum == -1) {
@@ -794 +794 @@
     PS_ASSERT_PTR_NON_NULL(fpa,);
 
-    psTrace(__func__, 1, "FPA:\n");
+    psTrace("psModules.camera", 1, "FPA:\n");
     if (fpa->hdu) {
         pmHDUPrint(fd, fpa->hdu, 2, header);
@@ -805 +805 @@
     // Iterate over the FPA
     for (int i = 0; i < chips->n; i++) {
-        psTrace(__func__, 3, "Chip: %d\n", i);
+        psTrace("psModules.camera", 3, "Chip: %d\n", i);
         pmChip *chip = chips->data[i]; // The chip
         if (chip->hdu) {
@@ -817 +817 @@
         psArray *cells = chip->cells;   // Array of cells
         for (int j = 0; j < cells->n; j++) {
-            psTrace(__func__, 5, "Cell: %d\n", j);
+            psTrace("psModules.camera", 5, "Cell: %d\n", j);
             pmCell *cell = cells->data[j]; // The cell
             if (cell->hdu) {
@@ -829 +829 @@
             for (int k = 0; k < readouts->n; k++) {
                 pmReadout *readout = readouts->data[k]; // The readout
-                psTrace(__func__, 6, "Readout %d:\n", k);
-                psTrace(__func__, 7, "row0: %d\n", readout->row0);
-                psTrace(__func__, 7, "col0: %d\n", readout->col0);
+                psTrace("psModules.camera", 6, "Readout %d:\n", k);
+                psTrace("psModules.camera", 7, "row0: %d\n", readout->row0);
+                psTrace("psModules.camera", 7, "col0: %d\n", readout->col0);
                 psImage *image = readout->image; // The image
                 psList *bias = readout->bias; // The list of bias images
                 if (image) {
-                    psTrace(__func__, 7, "Image: [%d:%d,%d:%d] (%dx%d)\n", image->col0, image->col0 +
+                    psTrace("psModules.camera", 7, "Image: [%d:%d,%d:%d] (%dx%d)\n", image->col0, image->col0 +
                             image->numCols, image->row0, image->row0 + image->numRows, image->numCols,
                             image->numRows);
@@ -843 +843 @@
                     psImage *biasImage = NULL; // Bias image from iteration
                     while ((biasImage = psListGetAndIncrement(biasIter))) {
-                        psTrace(__func__, 7, "Bias:  [%d:%d,%d:%d] (%dx%d)\n", biasImage->col0,
+                        psTrace("psModules.camera", 7, "Bias:  [%d:%d,%d:%d] (%dx%d)\n", biasImage->col0,
                                 biasImage->col0 + biasImage->numCols, biasImage->row0,
                                 biasImage->row0 + biasImage->numRows, biasImage->numCols, biasImage->numRows);

trunk/psModules/src/camera/pmFPACopy.c

@@ -92 +92 @@
             }
         }
-        psTrace(__func__, 3, "xFlip: %d; yFlip: %d\n", xFlip, yFlip);
+        psTrace("psModules.camera", 3, "xFlip: %d; yFlip: %d\n", xFlip, yFlip);
     }
 
@@ -228 +228 @@
         int xBin = psMetadataLookupS32(NULL, source->concepts, "CELL.XBIN"); // CELL.XBIN from source
         pmReadout *readout = source->readouts->data[0]; // A representative readout
-        psTrace(__func__, 3, "CELL.X0: Before: %d After: %d\n", xZero,
+        psTrace("psModules.camera", 3, "CELL.X0: Before: %d After: %d\n", xZero,
                 xZero - (readout->image->numCols - 1) * xParity * xBin);
-        psTrace(__func__, 9, "(xParity: %d xBin: %d numCols: %d)\n", xParity, xBin, readout->image->numCols);
+        psTrace("psModules.camera", 9, "(xParity: %d xBin: %d numCols: %d)\n", xParity, xBin, readout->image->numCols);
         xZero -= (readout->image->numCols - 1) * xParity * xBin; // Change the parity on the X0 position
         psMetadataItem *newItem = psMetadataLookup(target->concepts, "CELL.X0"); // CELL.X0 from target
@@ -240 +240 @@
         int yBin = psMetadataLookupS32(NULL, source->concepts, "CELL.YBIN"); // Parity in y
         pmReadout *readout = source->readouts->data[0]; // A representative readout
-        psTrace(__func__, 3, "CELL.Y0: Before: %d After: %d\n", yZero,
+        psTrace("psModules.camera", 3, "CELL.Y0: Before: %d After: %d\n", yZero,
                 yZero - (readout->image->numRows - 1) * yParity * yBin);
-        psTrace(__func__, 9, "(yParity: %d yBin: %d numRows: %d)\n", yParity, yBin, readout->image->numRows);
+        psTrace("psModules.camera", 9, "(yParity: %d yBin: %d numRows: %d)\n", yParity, yBin, readout->image->numRows);
         yZero -= (readout->image->numRows - 1) * yParity * yBin; // Change the parity on the Y0 position
         psMetadataItem *newItem = psMetadataLookup(target->concepts, "CELL.Y0"); // CELL.Y0 from target

trunk/psModules/src/camera/pmFPAEnsemble.c

@@ -238 +238 @@
         }
 
-        psTrace(__func__, 3, "%s --> FPA: %s, chip: %d, cell: %d\n", filename, fpaName,
+        psTrace("psModules.camera", 3, "%s --> FPA: %s, chip: %d, cell: %d\n", filename, fpaName,
                 view->chip, view->cell);
 
@@ -245 +245 @@
         if (!check) {
             // Add in the new FPA
-            psTrace(__func__, 5, "New FPA.\n");
+            psTrace("psModules.camera", 5, "New FPA.\n");
             component = pmFPAComponentAlloc(fpa, view);
             psMetadataAddPtr(fpas, PS_LIST_TAIL, fpaName, PS_DATA_UNKNOWN, NULL, component->fpa);
         } else {
             // Need to put the appropriate element of the new FPA in the old one.
-            psTrace(__func__, 5, "Adding to extant FPA.\n");
+            psTrace("psModules.camera", 5, "Adding to extant FPA.\n");
             pmFPA *oldFPA = check->data.V; // The existing FPA
             component = pmFPAComponentAlloc(oldFPA, view);

trunk/psModules/src/camera/pmFPAMaskWeight.c

@@ -110 +110 @@
         return false;
     }
-    psTrace(__func__, 5, "Saturation: %f, bad: %f\n", saturation, bad);
+    psTrace("psModules.camera", 5, "Saturation: %f, bad: %f\n", saturation, bad);
 
 

trunk/psModules/src/camera/pmFPAMosaic.c

@@ -243 +243 @@
     if (x0 != readout->col0 + readout->image->col0 - (int)imageBounds->x0 ||
             y0 != readout->row0 + readout->image->row0 - (int)imageBounds->y0) {
-        psTrace(__func__, 5, "CELL.X0,Y0 don't match: %d,%d vs %d,%d\n", x0, y0,
+        psTrace("psModules.camera", 5, "CELL.X0,Y0 don't match: %d,%d vs %d,%d\n", x0, y0,
                 readout->col0 + readout->image->col0 - (int)imageBounds->x0,
                 readout->row0 + readout->image->row0 - (int)imageBounds->y0);
@@ -280 +280 @@
     psRegion *imageBounds = psRegionAlloc(INFINITY, 0, INFINITY, 0); // Bound of image on HDU
     if (!chipBounds(imageBounds, chip) || !chipContiguousBiassec(imageBounds, chip)) {
-        psTrace(__func__, 5, "Image isn't contiguous.\n");
+        psTrace("psModules.camera", 5, "Image isn't contiguous.\n");
         psFree(imageBounds);
         return NULL;
@@ -286 +286 @@
 
     psString region = psRegionToString(*imageBounds);
-    psTrace(__func__, 7, "Image bounds: %s\n", region);
+    psTrace("psModules.camera", 7, "Image bounds: %s\n", region);
     psFree(region);
 
@@ -309 +309 @@
             if (!chipContiguousTrimsec(imageBounds, testChip) ||
                     !chipContiguousBiassec(imageBounds, testChip)) {
-                psTrace(__func__, 5, "Image isn't contiguous.\n");
+                psTrace("psModules.camera", 5, "Image isn't contiguous.\n");
                 psFree(imageBounds);
                 return NULL;
@@ -349 +349 @@
     psRegion *imageBounds = psRegionAlloc(0, 0, 0, 0); // Bound of image on HDU
     if (!fpaContiguous(imageBounds, fpa)) {
-        psTrace(__func__, 5, "Image isn't contiguous.\n");
+        psTrace("psModules.camera", 5, "Image isn't contiguous.\n");
         psFree(imageBounds);
         return NULL;
@@ -355 +355 @@
 
     psString region = psRegionToString(*imageBounds);
-    psTrace(__func__, 7, "Image bounds: %s\n", region);
+    psTrace("psModules.camera", 7, "Image bounds: %s\n", region);
     psFree(region);
 
@@ -406 +406 @@
     psElemType type = 0;
     int numImages = 0;                  // Number of images
-    psTrace(__func__, 3, "Mosaicking %ld cells.\n", source->n);
+    psTrace("psModules.camera", 3, "Mosaicking %ld cells.\n", source->n);
     for (int i = 0; i < source->n; i++) {
         psImage *image = source->data[i]; // The image of interest
@@ -425 +425 @@
         int xParity = xFlip->data.U8[i] ? -1 : 1;
         int yParity = yFlip->data.U8[i] ? -1 : 1;
-        psTrace(__func__, 5, "Extent of cell %d: %d -> %d , %d -> %d\n", i, x0->data.S32[i],
+        psTrace("psModules.camera", 5, "Extent of cell %d: %d -> %d , %d -> %d\n", i, x0->data.S32[i],
                 x0->data.S32[i] + xParity * xBinSource->data.S32[i] * image->numCols, y0->data.S32[i],
                 y0->data.S32[i] + yParity * yBinSource->data.S32[i] * image->numRows);
@@ -450 +450 @@
     }
 
-    psTrace(__func__, 3, "Spliced image will be %dx%d\n", (int)xSize, (int)ySize);
+    psTrace("psModules.camera", 3, "Spliced image will be %dx%d\n", (int)xSize, (int)ySize);
     psImage *mosaic = psImageAlloc((int)xSize, (int)ySize, type); // The mosaic image
     psImageInit(mosaic, 0);
@@ -586 +586 @@
         good = false;
     }
-    psTrace(__func__, 5, "Cell %d: x0=%d y0=%d\n", index, x0Cell, y0Cell);
+    psTrace("psModules.camera", 5, "Cell %d: x0=%d y0=%d\n", index, x0Cell, y0Cell);
 
     // Offset of the chip on the FPA
@@ -682 +682 @@
     masks->data[index]   = psMemIncrRefCounter(readout->mask);
 
-    psTrace(__func__, 9, "Added cell (%x) %ld: %d,%d; %d,%d, %d,%d.\n", cell, index,
+    psTrace("psModules.camera", 9, "Added cell (%x) %ld: %d,%d; %d,%d, %d,%d.\n", cell, index,
             x0->data.S32[index], y0->data.S32[index], xBin->data.S32[index], yBin->data.S32[index],
             xFlip->data.U8[index], yFlip->data.U8[index]);
@@ -970 +970 @@
     if ((chipRegion = niceChip(&xBin, &yBin, source))) {
         // Case 1 --- we need only cut out the region
-        psTrace(__func__, 1, "Case 1 mosaicking: simple cut-out.\n");
+        psTrace("psModules.camera", 1, "Case 1 mosaicking: simple cut-out.\n");
         pmHDU *hdu = source->hdu;       // The HDU that has the pixels
         if (!hdu || !hdu->images) {
@@ -984 +984 @@
     } else {
         // Case 2 --- we need to mosaic by cut and paste
-        psTrace(__func__, 1, "Case 2 mosaicking: cut and paste.\n");
+        psTrace("psModules.camera", 1, "Case 2 mosaicking: cut and paste.\n");
         if (!chipMosaic(&mosaicImage, &mosaicMask, &mosaicWeights, &xBin, &yBin, source, targetCell)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to mosaic cells.\n");
@@ -991 +991 @@
         chipRegion = psRegionAlloc(NAN, NAN, NAN, NAN); // We've cut and paste, so there's no valid trimsec
     }
-    psTrace(__func__, 1, "xBin,yBin: %d,%d\n", xBin, yBin);
+    psTrace("psModules.camera", 1, "xBin,yBin: %d,%d\n", xBin, yBin);
 
     // Set the concepts for the target cell
@@ -1066 +1066 @@
     if ((fpaRegion = niceFPA(&xBin, &yBin, source))) {
         // Case 1 --- we need only cut out the region
-        psTrace(__func__, 1, "Case 1 mosaicking: simple cut-out.\n");
+        psTrace("psModules.camera", 1, "Case 1 mosaicking: simple cut-out.\n");
         pmHDU *hdu = source->hdu;         // The HDU that has the pixels
         mosaicImage = psMemIncrRefCounter(psImageSubset(hdu->images->data[0], *fpaRegion));
@@ -1077 +1077 @@
     } else {
         // Case 2 --- we need to mosaic by cut and paste
-        psTrace(__func__, 1, "Case 2 mosaicking: cut and paste.\n");
+        psTrace("psModules.camera", 1, "Case 2 mosaicking: cut and paste.\n");
         if (!fpaMosaic(&mosaicImage, &mosaicMask, &mosaicWeights, &xBin, &yBin, source,
                        targetChip, targetCell)) {

trunk/psModules/src/camera/pmFPARead.c

@@ -126 +126 @@
     }
 
-    psTrace(__func__, 5, "Reading section [%.0f:%.0f,%.0f:%.0f]\n",
+    psTrace("psModules.camera", 5, "Reading section [%.0f:%.0f,%.0f:%.0f]\n",
             toRead.x0, toRead.x1, toRead.y0, toRead.y1);
     psImage *image = psFitsReadImage(fits, toRead, z); // Desired pixels
-    psTrace(__func__, 7, "Image is %dx%d\n", image->numCols, image->numRows);
+    psTrace("psModules.camera", 7, "Image is %dx%d\n", image->numCols, image->numRows);
 
     // XXX: We only support F32 for now
@@ -140 +140 @@
     if (resize) {
         // For some reason, the region of interest is smaller than the number of pixels we want.
-        psTrace(__func__, 5, "Resizing image to %.0fx%.0f\n",
+        psTrace("psModules.camera", 5, "Resizing image to %.0fx%.0f\n",
                 fullSize.x1 - fullSize.x0, fullSize.y1 - fullSize.y0);
         psImage *temp = psImageAlloc(fullSize.x1 - fullSize.x0, fullSize.y1 - fullSize.y0, image->type.type);
@@ -286 +286 @@
     if (offset >= maxSize) {
         // We've read everything there is
-        psTrace(__func__, 7, "Read everything.\n");
+        psTrace("psModules.camera", 7, "Read everything.\n");
         psFree(readout->image);
         return false;
     }
     int upper = PS_MIN(offset + numScans, maxSize); // The upper limit for the pixel read
-    psTrace(__func__, 7, "offset=%d, upper = %d, image is %dx%d, trimsec [%.0f:%.0f,%.0f:%.0f]\n",
+    psTrace("psModules.camera", 7, "offset=%d, upper = %d, image is %dx%d, trimsec [%.0f:%.0f,%.0f:%.0f]\n",
             offset, upper, naxis1, naxis2, trimsec->x0, trimsec->x1, trimsec->y0, trimsec->y1);
 

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -301 +301 @@
     psArray *infiles = psMetadataLookupPtr(&status, config->arguments, argname);
     if (!status) {
-        psTrace("pmFPAfile", 5, "Failed to find %s in argument list", argname);
+        psTrace("psModules.camera", 5, "Failed to find %s in argument list", argname);
         return NULL;
     }
@@ -429 +429 @@
     psArray *infiles = psMetadataLookupPtr(&status, config->arguments, argname);
     if (!status) {
-        psTrace("pmFPAfile", 5, "Failed to find %s in argument list", argname);
+        psTrace("psModules.camera", 5, "Failed to find %s in argument list", argname);
         return NULL;
     }
@@ -809 +809 @@
     pmFPAfile *file = psMetadataLookupPtr (&status, files, name);
     if (!status) {
-        psTrace("pmFPAfile", 6, "Internal File %s not in file list", name);
+        psTrace("psModules.camera", 6, "Internal File %s not in file list", name);
         return true;
     }
@@ -817 +817 @@
     }
     if (file->mode != PM_FPA_MODE_INTERNAL) {
-        psTrace("pmFPAfile", 6, "FPA File %s not Internal, not dropping", name);
+        psTrace("psModules.camera", 6, "FPA File %s not Internal, not dropping", name);
         return true;
     }

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -37 +37 @@
 
     if (file->state & PM_FPA_STATE_INACTIVE) {
-        psTrace("pmFPAfile", 6, "skip open for %s, files is inactive", file->name);
+        psTrace("psModules.camera", 6, "skip open for %s, files is inactive", file->name);
         return true;
     }
@@ -214 +214 @@
 
     if (file->state & PM_FPA_STATE_INACTIVE) {
-        psTrace("pmFPAfile", 6, "skip read for %s, files is inactive", file->name);
+        psTrace("psModules.camera", 6, "skip read for %s, files is inactive", file->name);
         return true;
     }
 
     if (file->mode != PM_FPA_MODE_READ) {
-        psTrace("pmFPAfile", 6, "skip read for %s, mode is not READ", file->name);
+        psTrace("psModules.camera", 6, "skip read for %s, mode is not READ", file->name);
         return true;
     }
@@ -236 +236 @@
     // do we need to read this file?
     if (level != file->dataLevel) {
-        psTrace("pmFPAfile", 6, "skip reading of %s at this level %s: dataLevel is %s",
+        psTrace("psModules.camera", 6, "skip reading of %s at this level %s: dataLevel is %s",
                 file->name, pmFPALevelToName(level), pmFPALevelToName(file->dataLevel));
         return true;
@@ -281 +281 @@
 
     if (file->state & PM_FPA_STATE_INACTIVE) {
-        psTrace("pmFPAfile", 6, "skip free for %s, files is inactive", file->name);
+        psTrace("psModules.camera", 6, "skip free for %s, files is inactive", file->name);
         return true;
     }
@@ -290 +290 @@
     // do we need to read this file?
     if (level != file->freeLevel) {
-        psTrace("pmFPAfile", 6, "skip free of %s at this level %s: freeLevel is %s",
+        psTrace("psModules.camera", 6, "skip free of %s at this level %s: freeLevel is %s",
                 file->name, pmFPALevelToName(level), pmFPALevelToName(file->freeLevel));
         return true;
@@ -335 +335 @@
 
     if (file->state & PM_FPA_STATE_INACTIVE) {
-        psTrace("pmFPAfile", 6, "skip write for %s, files is inactive", file->name);
+        psTrace("psModules.camera", 6, "skip write for %s, files is inactive", file->name);
         return true;
     }
 
     if (file->mode != PM_FPA_MODE_WRITE) {
-        psTrace("pmFPAfile", 6, "skip write for %s, mode is not WRITE", file->name);
+        psTrace("psModules.camera", 6, "skip write for %s, mode is not WRITE", file->name);
         return true;
     }
 
     if (!file->save) {
-        psTrace("pmFPAfile", 6, "skip write for %s, save is FALSE", file->name);
+        psTrace("psModules.camera", 6, "skip write for %s, save is FALSE", file->name);
         return true;
     }
@@ -354 +354 @@
     // do we need to write this file?
     if (level != file->dataLevel) {
-        psTrace("pmFPAfile", 6, "skip writing of %s at this level %s: dataLevel is %s",
+        psTrace("psModules.camera", 6, "skip writing of %s at this level %s: dataLevel is %s",
                 file->name, pmFPALevelToName(level), pmFPALevelToName(file->dataLevel));
         return true;
@@ -411 +411 @@
     // these are not error conditions; these are state tests
     if (file->state & PM_FPA_STATE_INACTIVE) {
-        psTrace("pmFPAfile", 6, "skip create for inactive file %s", file->name);
+        psTrace("psModules.camera", 6, "skip create for inactive file %s", file->name);
         return true;
     }
     if (file->mode != PM_FPA_MODE_WRITE) {
-        psTrace("pmFPAfile", 6, "skip create for non-write file %s", file->name);
+        psTrace("psModules.camera", 6, "skip create for non-write file %s", file->name);
         return true;
     }
@@ -424 +424 @@
     // don't create the file if the src (FPA) is not defined
     if (file->src == NULL) {
-        psTrace("pmFPAfile", 6, "skip create for FPA without src FPA for %s", file->name);
+        psTrace("psModules.camera", 6, "skip create for FPA without src FPA for %s", file->name);
         return true;
     }
@@ -430 +430 @@
     // do we need to write this file?
     if (level != file->fileLevel) {
-        psTrace("pmFPAfile", 6, "skip creation of %s at this level %s: fileLevel is %s",
+        psTrace("psModules.camera", 6, "skip creation of %s at this level %s: fileLevel is %s",
                 file->name, pmFPALevelToName(level), pmFPALevelToName(file->fileLevel));
         return true;
@@ -465 +465 @@
 
     if (file->state & PM_FPA_STATE_INACTIVE) {
-        psTrace("pmFPAfile", 6, "skip close for %s, files is inactive", file->name);
+        psTrace("psModules.camera", 6, "skip close for %s, files is inactive", file->name);
         return true;
     }
@@ -475 +475 @@
     pmFPALevel level = pmFPAviewLevel (view);
     if (file->fileLevel != level) {
-        psTrace("pmFPAfile", 6, "skip closing of %s at this level %s: dataLevel is %s",
+        psTrace("psModules.camera", 6, "skip closing of %s at this level %s: dataLevel is %s",
                 file->name, pmFPALevelToName(level), pmFPALevelToName(file->dataLevel));
         return true;
@@ -533 +533 @@
     pmFPAfile *file = psMetadataLookupPtr (&status, files, name);
     if (!status) {
-        psTrace("pmFPAfile", 6, "%s is not a defined IO file", name);
+        psTrace("psModules.camera", 6, "%s is not a defined IO file", name);
         return false;
     }

trunk/psModules/src/camera/pmHDU.c

@@ -78 +78 @@
 
     // Move to the appropriate extension
-    psTrace(__func__, 5, "Moving to extension %s...\n", hdu->extname);
+    psTrace("psModules.camera", 5, "Moving to extension %s...\n", hdu->extname);
     if (!hduMove(hdu, fits)) {
         return false;
@@ -84 +84 @@
 
     if (!hdu->header) {
-        psTrace(__func__, 5, "Reading the header...\n");
+        psTrace("psModules.camera", 5, "Reading the header...\n");
         hdu->header = psFitsReadHeader(NULL, fits);
         if (! hdu->header) {
@@ -122 +122 @@
             psFree(hdu->images);        // Blow away anything existing
         }
-        psTrace(__func__, 5, "Reading the pixels...\n");
+        psTrace("psModules.camera", 5, "Reading the pixels...\n");
         hdu->images = psFitsReadImageCube(fits, psRegionSet(0,0,0,0));
         if (! hdu->images) {
@@ -155 +155 @@
     PS_ASSERT_PTR_NON_NULL(fits, false);
 
-    psTrace(__func__, 7, "Writing HDU %s\n", hdu->extname);
+    psTrace("psModules.camera", 7, "Writing HDU %s\n", hdu->extname);
 
     if (hdu->images && hdu->table && !hdu->header) {
@@ -199 +199 @@
 
     if (hdu->images) {
-        psTrace(__func__, 9, "Writing pixels for %s\n", hdu->extname);
+        psTrace("psModules.camera", 9, "Writing pixels for %s\n", hdu->extname);
         if (!psFitsWriteImageCube(fits, hdu->header, hdu->images, extname)) {
             psError(PS_ERR_IO, false, "Unable to write image to extension %s\n", hdu->extname);

trunk/psModules/src/camera/pmHDUUtils.c

@@ -97 +97 @@
 
     if (hdu->blankPHU) {
-        psTrace(__func__, level, "HDU: (PHU)\n");
+        psTrace("psModules.camera", level, "HDU: (PHU)\n");
     } else {
-        psTrace(__func__, level, "HDU: %s\n", hdu->extname);
+        psTrace("psModules.camera", level, "HDU: %s\n", hdu->extname);
     }
 
-    psTrace(__func__, level + 1, "Format: %x\n", hdu->format);
+    psTrace("psModules.camera", level + 1, "Format: %x\n", hdu->format);
     if (header) {
         if (hdu->header) {
-            psTrace(__func__, level + 1, "Header:\n");
+            psTrace("psModules.camera", level + 1, "Header:\n");
             psMetadataPrint(fd, hdu->header, level + 2);
         } else {
-            psTrace(__func__, level + 1, "No header.\n");
+            psTrace("psModules.camera", level + 1, "No header.\n");
         }
     }
 
     if (hdu->images) {
-        psTrace(__func__, level + 1, "Images:\n");
+        psTrace("psModules.camera", level + 1, "Images:\n");
         for (long i = 0; i < hdu->images->n; i++) {
             psImage *image = hdu->images->data[i]; // Image of interest
-            psTrace(__func__, level + 2, "%ld: %dx%d\n", i, image->numCols, image->numRows);
+            psTrace("psModules.camera", level + 2, "%ld: %dx%d\n", i, image->numCols, image->numRows);
         }
     } else {
-        psTrace(__func__, level + 1, "NO images.\n");
+        psTrace("psModules.camera", level + 1, "NO images.\n");
     }
 
     if (hdu->masks) {
-        psTrace(__func__, level + 1, "Masks:\n");
+        psTrace("psModules.camera", level + 1, "Masks:\n");
         for (long i = 0; i < hdu->masks->n; i++) {
             psImage *mask = hdu->masks->data[i]; // Mask of interest
-            psTrace(__func__, level + 2, "%ld: %dx%d\n", i, mask->numCols, mask->numRows);
+            psTrace("psModules.camera", level + 2, "%ld: %dx%d\n", i, mask->numCols, mask->numRows);
         }
     } else {
-        psTrace(__func__, level + 1, "NO masks.\n");
+        psTrace("psModules.camera", level + 1, "NO masks.\n");
     }
 
     if (hdu->weights) {
-        psTrace(__func__, level + 1, "Weights:\n");
+        psTrace("psModules.camera", level + 1, "Weights:\n");
         for (long i = 0; i < hdu->masks->n; i++) {
             psImage *weight = hdu->weights->data[i]; // Weight image of interest
-            psTrace(__func__, level + 2, "%ld: %dx%d\n", i, weight->numCols, weight->numRows);
+            psTrace("psModules.camera", level + 2, "%ld: %dx%d\n", i, weight->numCols, weight->numRows);
         }
     } else {
-        psTrace(__func__, level + 1, "NO weights.\n");
+        psTrace("psModules.camera", level + 1, "NO weights.\n");
     }
     #endif

trunk/psModules/src/concepts/pmConcepts.c

@@ -89 +89 @@
     psMetadataItem *specItem = NULL;    // Item from the specs metadata
     while ((specItem = psMetadataGetAndIncrement(specsIter))) {
-        psTrace(__func__, 9, "Blanking %s...\n", specItem->name);
+        psTrace("psModules.concepts", 9, "Blanking %s...\n", specItem->name);
         pmConceptSpec *spec = specItem->data.V; // The specification
         psMetadataItem *blank = spec->blank; // The concept
@@ -189 +189 @@
     }
 
-    psTrace(__func__, 3, "Writing concepts (%x %x %x): %x\n", fpa, chip, cell, source);
+    psTrace("psModules.concepts", 3, "Writing concepts (%x %x %x): %x\n", fpa, chip, cell, source);
 
     if (source & PM_CONCEPT_SOURCE_CAMERA) {
@@ -212 +212 @@
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
-    psTrace("psModule.concepts", 5, "Blanking FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+    psTrace("psModules.concepts", 5, "Blanking FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
     return conceptsBlank(&conceptsFPA, fpa->concepts);
 }
@@ -225 +225 @@
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
-    psTrace("psModule.concepts", 5, "Reading FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+    psTrace("psModules.concepts", 5, "Reading FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
     bool success = conceptsRead(&conceptsFPA, fpa, NULL, NULL, &fpa->conceptsRead, source, db, fpa->concepts);
     if (propagateDown) {
@@ -248 +248 @@
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
-    psTrace("psModule.concepts", 5, "Writing FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+    psTrace("psModules.concepts", 5, "Writing FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
     bool success = conceptsWrite(&conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
     if (propagateDown) {
@@ -267 +267 @@
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
-    psTrace("psModule.concepts", 5, "Blanking chip concepts: %x %x\n", conceptsChip, chip->concepts);
+    psTrace("psModules.concepts", 5, "Blanking chip concepts: %x %x\n", conceptsChip, chip->concepts);
     return conceptsBlank(&conceptsChip, chip->concepts);
 }
@@ -280 +280 @@
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
-    psTrace("psModule.concepts", 5, "Reading chip concepts: %x %x\n", conceptsChip, chip->concepts);
+    psTrace("psModules.concepts", 5, "Reading chip concepts: %x %x\n", conceptsChip, chip->concepts);
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
     bool success = conceptsRead(&conceptsChip, fpa, chip, NULL, &chip->conceptsRead, source, db,
@@ -308 +308 @@
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
-    psTrace("psModule.concepts", 5, "Writing chip concepts: %x %x\n", conceptsChip, chip->concepts);
+    psTrace("psModules.concepts", 5, "Writing chip concepts: %x %x\n", conceptsChip, chip->concepts);
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
     bool success = conceptsWrite(&conceptsChip, fpa, chip, NULL, source, db, chip->concepts);
@@ -331 +331 @@
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
-    psTrace("psModule.concepts", 5, "Blanking cell concepts: %x %x\n", conceptsCell, cell->concepts);
+    psTrace("psModules.concepts", 5, "Blanking cell concepts: %x %x\n", conceptsCell, cell->concepts);
     return conceptsBlank(&conceptsCell, cell->concepts);
 }
@@ -343 +343 @@
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
-    psTrace("psModule.concepts", 5, "Reading cell concepts: %x %x\n", conceptsCell, cell->concepts);
+    psTrace("psModules.concepts", 5, "Reading cell concepts: %x %x\n", conceptsCell, cell->concepts);
     pmChip *chip = cell->parent;        // Chip to which the cell belongs
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
@@ -371 +371 @@
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
-    psTrace("psModule.concepts", 5, "Writing cell concepts: %x %x\n", conceptsCell, cell->concepts);
+    psTrace("psModules.concepts", 5, "Writing cell concepts: %x %x\n", conceptsCell, cell->concepts);
     pmChip *chip = cell->parent;        // Chip to which the cell belongs
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs

trunk/psModules/src/concepts/pmConceptsRead.c

@@ -177 +177 @@
     PS_ASSERT_PTR_NON_NULL(target, false);
 
-    psTrace(__func__, 3, "Reading concepts from defaults...\n");
+    psTrace("psModules.concepts", 3, "Reading concepts from defaults...\n");
 
     pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
@@ -199 +199 @@
         psString name = specItem->name; // The concept name
         psMetadataItem *conceptItem = psMetadataLookup(defaults, name); // The concept, or NULL
-        psTrace(__func__, 10, "%s: %x\n", name, conceptItem);
+        psTrace("psModules.concepts", 10, "%s: %x\n", name, conceptItem);
         if (conceptItem && conceptItem->type == PS_DATA_METADATA) {
-            psTrace(__func__, 5, "%s is of type METADATA.\n", name);
+            psTrace("psModules.concepts", 5, "%s is of type METADATA.\n", name);
             // Check for DEPEND
             psMetadata *dependMenu = conceptItem->data.V; // The DEPEND menu
@@ -236 +236 @@
             }
             const char *dependKey = dependValue->data.V; // The key to the DEPEND menu
-            psTrace(__func__, 7, "%s.DEPEND resolves to %s....\n", name, dependKey);
+            psTrace("psModules.concepts", 7, "%s.DEPEND resolves to %s....\n", name, dependKey);
 
             conceptItem = psMetadataLookup(dependMenu, dependKey);

trunk/psModules/src/concepts/pmConceptsWrite.c

@@ -140 +140 @@
     switch (item->type) {
     case PS_DATA_STRING:
-        psTrace(__func__, 9, "Writing header %s: %s\n", keyword, item->data.V);
+        psTrace("psModules.concepts", 9, "Writing header %s: %s\n", keyword, item->data.V);
         return psMetadataAddStr(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.V);
     case PS_DATA_S32:
-        psTrace(__func__, 9, "Writing header %s: %d\n", keyword, item->data.S32);
+        psTrace("psModules.concepts", 9, "Writing header %s: %d\n", keyword, item->data.S32);
         return psMetadataAddS32(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.S32);
     case PS_DATA_F32:
-        psTrace(__func__, 9, "Writing header %s: %f\n", keyword, item->data.F32);
+        psTrace("psModules.concepts", 9, "Writing header %s: %f\n", keyword, item->data.F32);
         return psMetadataAddF32(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.F32);
     case PS_DATA_F64:
-        psTrace(__func__, 9, "Writing header %s: %f\n", keyword, item->data.F64);
+        psTrace("psModules.concepts", 9, "Writing header %s: %f\n", keyword, item->data.F64);
         return psMetadataAddF64(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.F64);
     case PS_DATA_REGION: {
             psString region = psRegionToString(*(psRegion*)item->data.V);
-            psTrace(__func__, 9, "Writing header %s: %s\n", keyword, region);
+            psTrace("psModules.concepts", 9, "Writing header %s: %s\n", keyword, region);
             bool result = psMetadataAddStr(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                            region);
@@ -252 +252 @@
             psString source = psMetadataLookupStr(&mdok, cell->config, nameSource); // The source
             if (mdok && strlen(source) > 0) {
-                psTrace(__func__, 8, "%s is %s\n", nameSource, source);
+                psTrace("psModules.concepts", 8, "%s is %s\n", nameSource, source);
                 if (strcasecmp(source, "HEADER") == 0) {
                     if (cameraItem->type != PS_DATA_STRING) {
@@ -259 +259 @@
                         continue;
                     }
-                    psTrace(__func__, 8, "Writing %s to header %s\n", name, cameraItem->data.V);
+                    psTrace("psModules.concepts", 8, "Writing %s to header %s\n", name, cameraItem->data.V);
                     writeHeader(hdu, cameraItem->data.V, formatted);
                 } else if (strcasecmp(source, "VALUE") == 0) {
-                    psTrace(__func__, 8, "Checking %s against camera format.\n", name);
+                    psTrace("psModules.concepts", 8, "Checking %s against camera format.\n", name);
                     if (! compareConcepts(formatted, cameraItem)) {
                         psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by value in the camera "
@@ -384 +384 @@
                 continue;
             }
-            psTrace(__func__, 3, "Writing %s to header %s\n", name, headerItem->data.V);
+            psTrace("psModules.concepts", 3, "Writing %s to header %s\n", name, headerItem->data.V);
             psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
             psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell);

trunk/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-02 19:33:29 $
+ *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:07 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -92 +92 @@
     struct stat filestat;
 
-    psTrace(__func__, 3, "Loading %s configuration from file %s\n",
+    psTrace("psModules.config", 3, "Loading %s configuration from file %s\n",
             description, name);
 
@@ -307 +307 @@
     psString timeName = psMetadataLookupStr(&mdok, config->site, "TIME");
     if (mdok && timeName) {
-        psTrace(__func__, 7, "Initialising psTime with file %s\n", timeName);
+        psTrace("psModules.config", 7, "Initialising psTime with file %s\n", timeName);
         // XXX: PAP had a call to psLibInit is PRODUCTION not set.  Why?
         psTimeInitialize(timeName);
@@ -319 +319 @@
     int logLevel = psMetadataLookupS32(&mdok, config->site, "LOGLEVEL");
     if (mdok && logLevel >= 0) {
-        psTrace(__func__, 7, "Setting log level to %d\n", logLevel);
+        psTrace("psModules.config", 7, "Setting log level to %d\n", logLevel);
         psLogSetLevel(logLevel);
     }
@@ -330 +330 @@
     psString logFormat = psMetadataLookupStr(&mdok, config->site, "LOGFORMAT");
     if (mdok && logFormat) {
-        psTrace(__func__, 7, "Setting log format to %s\n", logFormat);
+        psTrace("psModules.config", 7, "Setting log format to %s\n", logFormat);
         psLogSetFormat(logFormat);
     }
@@ -380 +380 @@
                 continue;
             }
-            psTrace(__func__, 7, "Setting trace level for %s to %d\n", traceItem->name, traceItem->data.S32);
+            psTrace("psModules.config", 7, "Setting trace level for %s to %d\n", traceItem->name, traceItem->data.S32);
             psTraceSetLevel(traceItem->name, traceItem->data.S32);
         }
@@ -429 +429 @@
             // It doesn't have a required header keyword, so it's not it
             psFree(ruleIter);
-            psTrace(__func__, 5, "Can't find %s\n", ruleItem->name);
+            psTrace("psModules.config", 5, "Can't find %s\n", ruleItem->name);
             return false;
         }
@@ -435 +435 @@
         // Check to see if the rule works
         if (! psMetadataItemCompare(headerItem, ruleItem)) {
-            psTrace(__func__, 5, "%s doesn't match.\n", ruleItem->name);
+            psTrace("psModules.config", 5, "%s doesn't match.\n", ruleItem->name);
             psFree(ruleIter);
             return false;
@@ -476 +476 @@
             continue;
         }
-        psTrace(__func__, 5, "Reading camera format for %s...\n", formatsItem->name);
+        psTrace("psModules.config", 5, "Reading camera format for %s...\n", formatsItem->name);
         psMetadata *testFormat = NULL;  // Format to test against what we've got
         if (!readConfig(&testFormat, formatsItem->data.V, formatsItem->name)) {
@@ -529 +529 @@
         while ((camerasItem = psMetadataGetAndIncrement(camerasIter))) {
             // Open the camera information
-            psTrace(__func__, 3, "Inspecting camera %s (%s)\n", camerasItem->name, camerasItem->comment);
+            psTrace("psModules.config", 3, "Inspecting camera %s (%s)\n", camerasItem->name, camerasItem->comment);
             if (camerasItem->type != PS_DATA_STRING) {
                 psLogMsg(__func__, PS_LOG_WARN, "Camera configuration for %s in CAMERAS is not of type STR "
@@ -536 +536 @@
             }
 
-            psTrace(__func__, 5, "Reading camera configuration for %s...\n", camerasItem->name);
+            psTrace("psModules.config", 5, "Reading camera configuration for %s...\n", camerasItem->name);
             psMetadata *testCamera = NULL; // Camera to test against what we've got:
 

trunk/psModules/src/detrend/pmFlatNormalize.c

@@ -71 +71 @@
         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 +89 @@
                 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 +117 @@
                 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

trunk/psModules/src/detrend/pmFringeStats.c

@@ -3 +3 @@
  *  @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 +327 @@
         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 +671 @@
     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 +732 @@
             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 +749 @@
     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 +756 @@
         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 +766 @@
         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 +811 @@
     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]);
     }

trunk/psModules/src/detrend/pmSubtractBias.c

@@ -11 +11 @@
  *  @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 +259 @@
                     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);

trunk/psModules/src/detrend/pmSubtractSky.c

@@ -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 +33 @@
 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 +46 @@
     }
 
-    psTrace("SubtractSky.DetermineNumBits", 4,
+    psTrace("psModules.detrend", 4,
             "Calling DetermineNumBits(0x%x) -> %d\n", data, numBits);
     return(numBits);
@@ -58 +58 @@
 static psU64 getHighestPriorityStatOption(psU64 statOptions)
 {
-    psTrace("SubtractSky.getHighestPriorityStatOption", 4,
+    psTrace("psModules.detrend", 4,
             "Calling getHighestPriorityStatOption(0x%x)\n", statOptions);
 
@@ -95 +95 @@
                          psStatsOptions statOptions)
 {
-    psTrace("SubtractSky.binImage", 4, "Calling binImage(%d)\n", binFactor);
+    psTrace("psModules.detrend", 4, "Calling binImage(%d)\n", binFactor);
 
     if (binFactor <= 0) {
@@ -148 +148 @@
     psFree(myStats);
 
-    psTrace("SubtractSky.binImage", 4, "Exiting binImage(%d)\n", binFactor);
+    psTrace("psModules.detrend", 4, "Exiting binImage(%d)\n", binFactor);
     return(origImage);
 }
@@ -163 +163 @@
 static psS32 CalculatePolyTerms(psS32 xOrder, psS32 yOrder)
 {
-    psTrace("SubtractSky.CalculatePolyTerms", 4,
+    psTrace("psModules.detrend", 4,
             "Calling CalculatePolyTerms(%d, %d)\n", xOrder, yOrder);
 
@@ -178 +178 @@
         }
     }
-    psTrace("SubtractSky.CalculatePolyTerms", 4,
+    psTrace("psModules.detrend", 4,
             "Exiting CalculatePolyTerms(%d, %d) -> %d\n", xOrder, yOrder, localPolyTerms);
     return(localPolyTerms);
@@ -198 +198 @@
 static psS32 **buildPolyTerms(psS32 xOrder, psS32 yOrder)
 {
-    psTrace("SubtractSky.buildPolyTerms", 4,
+    psTrace("psModules.detrend", 4,
             "Calling buildPolyTerms(%d, %d)\n", xOrder, yOrder);
 
@@ -233 +233 @@
     }
 
-    psTrace("SubtractSky.buildPolyTerms", 4,
+    psTrace("psModules.detrend", 4,
             "Exiting buildPolyTerms(%d, %d)\n", xOrder, yOrder);
     return(polyTerms);
@@ -258 +258 @@
                       psS32 yOrder)
 {
-    psTrace("SubtractSky.buildPolyTerms", 4,
+    psTrace("psModules.detrend", 4,
             "Calling buildPolyTerms(%d, %d)\n", xOrder, yOrder);
 
@@ -276 +276 @@
         xSum*= x;
     }
-    psTrace("SubtractSky.buildPolyTerms", 4,
+    psTrace("psModules.detrend", 4,
             "Exiting buildPolyTerms(%d, %d)\n", xOrder, yOrder);
 }
@@ -297 +297 @@
     psImage *maskImage)
 {
-    psTrace("SubtractSky.ImageFitPolynomial", 4,
+    psTrace("psModules.detrend", 4,
             "Calling ImageFitPolynomial()\n");
     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
@@ -416 +416 @@
     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 +456 @@
     }
 
-    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 +487 @@
         PS_WARN_PTR_NON_NULL(in->parent->concepts);
     }
-    psTrace(".psModule.pmSubtractSky", 4,
+    psTrace("psModules.detrend", 4,
             "---- pmSubtractSky() begin ----\n");
 
@@ -590 +590 @@
         psImageInit(binnedMaskImage, 0);
     }
-    psTrace(".psModule.pmSubtractSky", 4,
+    psTrace("psModules.detrend", 4,
             "binnedImage size is (%d, %d)\n", binnedImage->numRows, binnedImage->numCols);
 
@@ -609 +609 @@
         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 +705 @@
                 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 +718 @@
     }
 
-    psTrace(".psModule.pmSubtractSky", 4,
+    psTrace("psModules.detrend", 4,
             "---- pmSubtractSky() exit successfully ----\n");
     return(in);

trunk/psModules/src/imcombine/pmImageCombine.c

@@ -8 +8 @@
  *  @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 +50 @@
     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 +297 @@
     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 +312 @@
 )
 {
-    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 +365 @@
     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 +382 @@
                                 psPlaneTransform *myOutToIn)
 {
-    psTrace("ImageCombine.DetermineRegion", 4, "Calling DetermineRegion()\n");
+    psTrace("psModules.imcombine", 4, "Calling DetermineRegion()\n");
     psRegion myRegion;
     myRegion.x0 = PS_MAX_F32;
@@ -457 +457 @@
     }
 
-    psTrace("ImageCombine.DetermineRegion", 4, "Exiting DetermineRegion()\n");
+    psTrace("psModules.imcombine", 4, "Exiting DetermineRegion()\n");
     return(myRegion);
 }
@@ -466 +466 @@
 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 +475 @@
     }
 
-    psTrace("ImageCombine.ImageConvertF32", 4, "Exiting ImageConvertF32()\n");
+    psTrace("psModules.imcombine", 4, "Exiting ImageConvertF32()\n");
     return(imgF32);
 }
@@ -504 +504 @@
 )
 {
-    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 +663 @@
     psFree(inCoords);
     psFree(outCoords);
-    psTrace("ImageCombine.pmRejectPixels", 3, "Exiting pmRejectPixels()\n");
+    psTrace("psModules.imcombine", 3, "Exiting pmRejectPixels()\n");
     return(rejects);
 }

trunk/psModules/src/imcombine/pmImageSubtract.c

@@ -7 +7 @@
  *  @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 +97 @@
         int spatialOrder)
 {
-    psTrace("ImageSubtract.pmSubtractionKernelsAllocPOIS", 3,
+    psTrace("psModules.imcombine", 3,
             "Calling pmSubtractionKernelsAllocPOIS(%d, %d)\n", size, spatialOrder);
     PS_ASSERT_INT_POSITIVE(size, NULL);
@@ -173 +173 @@
     }
 
-    psTrace("ImageSubtract.pmSubtractionKernelsAllocPOIS", 3,
+    psTrace("psModules.imcombine", 3,
             "Exiting pmSubtractionKernelsAllocPOIS(%d, %d)\n", size, spatialOrder);
     return(tmp);
@@ -190 +190 @@
     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 +306 @@
     }
 
-    psTrace("ImageSubtract.pmSubtractionKernelsAllocISIS", 3,
+    psTrace("psModules.imcombine", 3,
             "Exiting pmSubtractionKernelsAllocISIS(%d, %d, %d, %d)\n",
             sigmas->n, orders->n, size, spatialOrder);
@@ -333 +333 @@
                                 )
 {
-    psTrace("ImageSubtract.pmSubtractionFindStamps", 3,
+    psTrace("psModules.imcombine", 3,
             "Calling pmSubtractionFindStamps(%d, %f, %d, %d, %d)\n",
             maskVal, threshold, xNum, yNum, border);
@@ -456 +456 @@
         }
     }
-    psTrace("ImageSubtract.pmSubtractionFindStamps", 3,
+    psTrace("psModules.imcombine", 3,
             "Exiting pmSubtractionFindStamps(%d, %f, %d, %d, %d)\n",
             maskVal, threshold, xNum, yNum, border);
@@ -474 +474 @@
                                 psF32 y)
 {
-    psTrace("ImageSubtract.GenSpatialOrder", 4,
+    psTrace("psModules.imcombine", 4,
             "Calling GenSpatialOrder(%d, %f, %f)\n", spatialOrder, x, y);
 
@@ -490 +490 @@
     }
 
-    psTrace("ImageSubtract.GenSpatialOrder", 4,
+    psTrace("psModules.imcombine", 4,
             "Exiting GenSpatialOrder(%d, %f, %f)\n", spatialOrder, x, y);
 
@@ -509 +509 @@
 
 
-    psTrace("ImageSubtract.IsisKernelConvolve", 4,
+    psTrace("psModules.imcombine", 4,
             "Calling IsisKernelConvolve(%d, %d, %d)\n", kernelID, col, row);
     psS32 spatialOrder = kernels->spatialOrder;
@@ -541 +541 @@
     psFree(polyValues);
 
-    psTrace("ImageSubtract.IsisKernelConvolve", 4,
+    psTrace("psModules.imcombine", 4,
             "Exiting IsisKernelConvolve(%d, %d, %d)\n", kernelID, col, row);
     return(conv);
@@ -563 +563 @@
                                psS32 row)
 {
-    psTrace("ImageSubtract.ConvolvePixelPois", 4,
+    psTrace("psModules.imcombine", 4,
             "Calling ConvolvePixelPois(%d, %d)\n", col, row);
     psS32 nBF = kernels->u->n;
@@ -604 +604 @@
     }
 
-    psTrace("ImageSubtract.ConvolvePixelPois", 4,
+    psTrace("psModules.imcombine", 4,
             "Exiting ConvolvePixelPois(%d, %d)\n", col, row);
     return(conv);
@@ -628 +628 @@
                                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 +640 @@
     }
 
-    psTrace("ImageSubtract.ConvolvePixelIsis", 4,
+    psTrace("psModules.imcombine", 4,
             "Exiting ConvolvePixelIsis(%d, %d)\n", col, row);
     return(conv);
@@ -655 +655 @@
                               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 +724 @@
     }
 
-    psTrace("ImageSubtract.ConvolveImage", 4, "Exiting ConvolveImage()\n");
+    psTrace("psModules.imcombine", 4, "Exiting ConvolveImage()\n");
     return convolved;
 }
@@ -743 +743 @@
                                    )
 {
-    psTrace("ImageSubtract.pmSubtractionCalculateEquation", 3,
+    psTrace("psModules.imcombine", 3,
             "Calling pmSubtractionCalculateEquation()\n");
     PS_ASSERT_PTR_NON_NULL(stamps, false);
@@ -805 +805 @@
     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 +829 @@
             }
             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 +840 @@
                                                   ((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 +848 @@
                 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 +932 @@
                 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 +998 @@
         }
     }
-    psTrace("ImageSubtract.pmSubtractionCalculateEquation", 3,
+    psTrace("psModules.imcombine", 3,
             "Exiting pmSubtractionCalculateEquation()\n");
     return(true);
@@ -1012 +1012 @@
                                     )
 {
-    psTrace("ImageSubtract.pmSubtractionSolveEquation", 3,
+    psTrace("psModules.imcombine", 3,
             "Calling pmSubtractionSolveEquation()\n");
     PS_ASSERT_PTR_NON_NULL(stamps, NULL);
@@ -1120 +1120 @@
     psFree(permutation);
 
-    psTrace("ImageSubtract.pmSubtractionSolveEquation", 3,
+    psTrace("psModules.imcombine", 3,
             "Exiting pmSubtractionSolveEquation()\n");
     return(solution);
@@ -1138 +1138 @@
                                      const psVector *solution)
 {
-    psTrace("ImageSubtract.CalculateDeviations", 4,
+    psTrace("psModules.imcombine", 4,
             "Calling CalculateDeviations()\n");
     PS_ASSERT_PTR_NON_NULL(stamps, NULL);
@@ -1220 +1220 @@
     psFree(subStamp);
 
-    psTrace("ImageSubtract.CalculateDeviations", 4,
+    psTrace("psModules.imcombine", 4,
             "Exiting CalculateDeviations()\n");
     return deviations;
@@ -1238 +1238 @@
                               )
 {
-    psTrace("ImageSubtract.pmSubtractionRejectStamps", 3,
+    psTrace("psModules.imcombine", 3,
             "Calling pmSubtractionRejectStamps()\n");
     PS_ASSERT_PTR_NON_NULL(stamps, false);
@@ -1313 +1313 @@
 
     psFree(deviations);
-    psTrace("ImageSubtract.pmSubtractionRejectStamps", 3,
+    psTrace("psModules.imcombine", 3,
             "Exiting pmSubtractionRejectStamps()\n");
     return(true);
@@ -1327 +1327 @@
                                  )
 {
-    psTrace("ImageSubtract.pmSubtractionKernelImage", 3,
+    psTrace("psModules.imcombine", 3,
             "Calling pmSubtractionKernelImage()\n");
     PS_ASSERT_VECTOR_NON_NULL(solution, NULL);
@@ -1401 +1401 @@
     psFree(polyValues);
 
-    psTrace("ImageSubtract.pmSubtractionKernelImage", 3,
+    psTrace("psModules.imcombine", 3,
             "Exiting pmSubtractionKernelImage()\n");
     return(out);

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -5 +5 @@
  *  @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 +168 @@
         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 +184 @@
         *(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 +274 @@
     #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 +280 @@
         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);

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

trunk/psModules/src/objects/pmModelGroup.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-21 03:21:16 $
+ *  @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
@@ -203 +203 @@
                             pmModelType modelType)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(source->moments, false);
     PS_ASSERT_PTR_NON_NULL(source->peak, false);
@@ -211 +211 @@
     pmModelGuessFunc modelGuessFunc = pmModelGuessFunc_GetFunction(modelType);
     modelGuessFunc(model, source);
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(model);
 }

trunk/psModules/src/objects/pmMoments.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-21 03:21:16 $
+ *  @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
@@ -23 +23 @@
 pmMoments *pmMomentsAlloc()
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     pmMoments *tmp = (pmMoments *) psAlloc(sizeof(pmMoments));
     tmp->x = 0.0;
@@ -35 +35 @@
     tmp->nPixels = 0;
 
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmp);
 }

trunk/psModules/src/objects/pmPeaks.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-21 03:21:16 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:07 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -32 +32 @@
                               pmPeakType type)
 {
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
     pmPeak *tmpPeak = pmPeakAlloc(col, row, counts, type);
 
@@ -43 +43 @@
     // XXX EAM : is this free appropriate?  (does psArrayAdd increment memory counter?)
 
-    psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
     return(list);
 }
@@ -57 +57 @@
                                        psU32 row)
 {
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
     PS_ASSERT_IMAGE_NON_NULL(image, NULL);
     PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL);
@@ -66 +66 @@
     }
     tmpVector->n = image->numCols;
-    psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
     return(tmpVector);
 }
@@ -79 +79 @@
                              psS32 y)
 {
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
     if ((x >= valid.x0) &&
             (x <= valid.x1) &&
             (y >= valid.y0) &&
             (y <= valid.y1)) {
-        psTrace(__func__, 4, "---- %s(true) end ----\n", __func__);
+        psTrace("psModules.objects", 4, "---- %s(true) end ----\n", __func__);
         return(true);
     }
-    psTrace(__func__, 4, "---- %s(false) end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s(false) end ----\n", __func__);
     return(false);
 }
@@ -102 +102 @@
                     pmPeakType type)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     static int id = 1;
     pmPeak *tmp = (pmPeak *) psAlloc(sizeof(pmPeak));
@@ -113 +113 @@
     psMemSetDeallocator(tmp, (psFreeFunc) peakFree);
 
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmp);
 }
@@ -125 +125 @@
 int pmPeaksCompareAscend (const void **a, const void **b)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     pmPeak *A = *(pmPeak **)a;
     pmPeak *B = *(pmPeak **)b;
@@ -133 +133 @@
     diff = A->counts - B->counts;
     if (diff < FLT_EPSILON) {
-        psTrace(__func__, 3, "---- %s(-1) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(-1) end ----\n", __func__);
         return (-1);
     } else if (diff > FLT_EPSILON) {
-        psTrace(__func__, 3, "---- %s(+1) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(+1) end ----\n", __func__);
         return (+1);
     }
-    psTrace(__func__, 3, "---- %s(0) end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s(0) end ----\n", __func__);
     return (0);
 }
@@ -146 +146 @@
 int pmPeaksCompareDescend (const void **a, const void **b)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     pmPeak *A = *(pmPeak **)a;
     pmPeak *B = *(pmPeak **)b;
@@ -154 +154 @@
     diff = A->counts - B->counts;
     if (diff < FLT_EPSILON) {
-        psTrace(__func__, 3, "---- %s(+1) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(+1) end ----\n", __func__);
         return (+1);
     } else if (diff > FLT_EPSILON) {
-        psTrace(__func__, 3, "---- %s(-1) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(-1) end ----\n", __func__);
         return (-1);
     }
-    psTrace(__func__, 3, "---- %s(0) end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s(0) end ----\n", __func__);
     return (0);
 }
@@ -178 +178 @@
                             psF32 threshold)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_VECTOR_NON_NULL(vector, NULL);
     PS_ASSERT_VECTOR_NON_EMPTY(vector, NULL);
@@ -198 +198 @@
             tmpVector = psVectorAlloc(0, PS_TYPE_U32);
         }
-        psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
         return(tmpVector);
     }
@@ -264 +264 @@
     }
 
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmpVector);
 }
@@ -292 +292 @@
                           psF32 threshold)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_IMAGE_NON_NULL(image, NULL);
     PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL);
     if ((image->numRows == 1) || (image->numCols == 1)) {
         psError(PS_ERR_UNKNOWN, true, "Currently, input image must have at least 2 rows and 2 columns.");
-        psTrace(__func__, 3, "---- %s(NULL) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);
         return(NULL);
     }
@@ -361 +361 @@
     //
     if (image->numRows == 1) {
-        psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
         return(list);
     }
@@ -484 +484 @@
     psFree (tmpRow);
     psFree (row1);
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(list);
 }
@@ -507 +507 @@
                     const psRegion valid)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(peaks, NULL);
 
@@ -525 +525 @@
     }
 
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(peaks);
 }
@@ -537 +537 @@
     const psRegion valid)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(peaks, NULL);
 
@@ -553 +553 @@
         psArrayAdd (output, 200, tmpPeak);
     }
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(output);
 }

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

trunk/psModules/src/objects/pmSourceContour.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-21 21:27:04 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -49 +49 @@
 {
 
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
 
     // We define variables incr and lastColumn so that we can use the same loop
@@ -70 +70 @@
         float value = image->data.F32[y][subCol];
         if (value <= threshold) {
-            psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+            psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
             return (subCol);
         }
         subCol += incr;
     }
-    psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
     return (lastColumn);
 }
@@ -89 +89 @@
 {
 
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
 
     // We define variables incr and lastColumn so that we can use the same loop
@@ -109 +109 @@
         float value = image->data.F32[y][subCol];
         if (value >= threshold) {
-            psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+            psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
             if (subCol == x) {
                 return (subCol);
@@ -117 +117 @@
         subCol += incr;
     }
-    psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
     return (lastColumn);
 }
@@ -139 +139 @@
                        psU32 dir)
 {
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
     //
     // Convert coords to subImage space.
@@ -149 +149 @@
     if (!((0 <= subCol) && (subCol < source->pixels->numCols))) {
         psError(PS_ERR_UNKNOWN, true, "Starting column outside subImage range");
-        psTrace(__func__, 4, "---- %s(NAN) end ----\n", __func__);
+        psTrace("psModules.objects", 4, "---- %s(NAN) end ----\n", __func__);
         return(NAN);
     }
     if (!((0 <= subRow) && (subRow < source->pixels->numRows))) {
-        psTrace(__func__, 4, "---- %s(NAN) end ----\n", __func__);
+        psTrace("psModules.objects", 4, "---- %s(NAN) end ----\n", __func__);
         psError(PS_ERR_UNKNOWN, true, "Starting row outside subImage range");
         return(NAN);
@@ -162 +162 @@
     psF32 oldValue = pmModelEval(source->modelEXT, source->pixels, subCol, subRow);
     if (oldValue == level) {
-        psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+        psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
         return(((psF32) (subCol + source->pixels->col0)));
     }
@@ -184 +184 @@
         psF32 newValue = pmModelEval(source->modelEXT, source->pixels, subCol, subRow);
         if (oldValue == level) {
-            psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+            psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
             return((psF32) (subCol + source->pixels->col0));
         }
@@ -190 +190 @@
         if ((newValue <= level) && (level <= oldValue)) {
             // This is simple linear interpolation.
-            psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+            psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
             return( ((psF32) (subCol + source->pixels->col0)) + ((psF32) incr) * ((level - newValue) / (oldValue - newValue)) );
         }
@@ -196 +196 @@
         if ((oldValue <= level) && (level <= newValue)) {
             // This is simple linear interpolation.
-            psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+            psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
             return( ((psF32) (subCol + source->pixels->col0)) + ((psF32) incr) * ((level - oldValue) / (newValue - oldValue)) );
         }
@@ -203 +203 @@
     }
 
-    psTrace(__func__, 4, "---- %s(NAN) end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s(NAN) end ----\n", __func__);
     return(NAN);
 }
@@ -215 +215 @@
     int xR, yR, x0, x1, x0s, x1s;
 
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(image, false);
 
@@ -327 +327 @@
     tmpArray->data[0] = (psPtr *) xVec;
     tmpArray->data[1] = (psPtr *) yVec;
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmpArray);
 }
@@ -348 +348 @@
                                psF32 level)
 {
-    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(image, false);
@@ -379 +379 @@
             psFree(xVec);
             psFree(yVec);
-            psTrace(__func__, 3, "---- %s(NULL) end ----\n", __func__);
+            psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);
             return(NULL);
             //psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not find contour edge (NAN)\n");
@@ -392 +392 @@
             psFree(xVec);
             psFree(yVec);
-            psTrace(__func__, 3, "---- %s(NULL) end ----\n", __func__);
+            psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);
             return(NULL);
             //psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not find contour edge (NAN)\n");
         }
-        psTrace(__func__, 4, "The intercepts are (%.2f, %.2f)\n", leftIntercept, rightIntercept);
+        psTrace("psModules.objects", 4, "The intercepts are (%.2f, %.2f)\n", leftIntercept, rightIntercept);
         xVec->data.F32[row+xVec->n] = ((psF32) source->pixels->col0) + rightIntercept;
 
@@ -417 +417 @@
             psFree(xVec);
             psFree(yVec);
-            psTrace(__func__, 3, "---- %s(NULL) end ----\n", __func__);
+            psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);
             return(NULL);
             //psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not find contour edge (NAN)\n");
@@ -429 +429 @@
             psFree(xVec);
             psFree(yVec);
-            psTrace(__func__, 3, "---- %s(NULL) end ----\n", __func__);
+            psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);
             return(NULL);
             //psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not find contour edge (NAN)\n");
@@ -447 +447 @@
     tmpArray->data[0] = (psPtr *) yVec;
     tmpArray->data[1] = (psPtr *) xVec;
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmpArray);
 }

trunk/psModules/src/objects/pmSourceFitModel.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-21 03:21:16 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -47 +47 @@
                        pmSourceFitMode mode)
 {
-    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->moments, false);
@@ -162 +162 @@
     if (nPix <  nParams + 1) {
         psTrace (".pmObjects.pmSourceFitModel", 4, "insufficient valid pixels\n");
-        psTrace(__func__, 3, "---- %s(false) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(false) end ----\n", __func__);
         model->status = PM_MODEL_BADARGS;
         psFree (x);
@@ -244 +244 @@
 
     rc = (onPic && fitStatus);
-    psTrace(__func__, 3, "---- %s(%d) end ----\n", __func__, rc);
+    psTrace("psModules.objects", 3, "---- %s(%d) end ----\n", __func__, rc);
     return(rc);
 }
@@ -329 +329 @@
                      pmSourceFitMode mode)
 {
-    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->moments, false);
@@ -489 +489 @@
     if (nPix <  nParams + 1) {
         psTrace (__func__, 4, "insufficient valid pixels\n");
-        psTrace(__func__, 3, "---- %s() end : fail pixels ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s() end : fail pixels ----\n", __func__);
         model->status = PM_MODEL_BADARGS;
         psFree (x);
@@ -517 +517 @@
     if (!fitStatus) {
         // psError(PS_ERR_UNKNOWN, false, "Failed to fit model (%d)\n", nSrc);
-        psTrace(__func__, 4, "Failed to fit model (%d)\n", nSrc);
+        psTrace("psModules.objects", 4, "Failed to fit model (%d)\n", nSrc);
     }
 
@@ -587 +587 @@
     rc = (onPic && fitStatus);
     psTrace (__func__, 5, "onPic: %d, fitStatus: %d, nIter: %d, chisq: %f, nDof: %d\n", onPic, fitStatus, model->nIter, model->chisq, model->nDOF);
-    psTrace(__func__, 3, "---- %s end : status %d ----\n", __func__, rc);
+    psTrace("psModules.objects", 3, "---- %s end : status %d ----\n", __func__, rc);
     return(rc);
 }

trunk/psModules/src/objects/pmSourceSky.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-28 03:21:19 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -41 +41 @@
     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_IMAGE_NON_NULL(source->pixels, false);
@@ -71 +71 @@
 
     if (isnan(value)) {
-        psTrace(__func__, 3, "---- %s(false) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(false) end ----\n", __func__);
         return(false);
     }
@@ -78 +78 @@
     }
     source->moments->Sky = value;
-    psTrace(__func__, 3, "---- %s(true) end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s(true) end ----\n", __func__);
     return (true);
 }
@@ -88 +88 @@
     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_IMAGE_NON_NULL(source->weight, false);
@@ -118 +118 @@
 
     if (isnan(value)) {
-        psTrace(__func__, 3, "---- %s(false) end ----\n", __func__);
+        psTrace("psModules.objects", 3, "---- %s(false) end ----\n", __func__);
         return(false);
     }
@@ -125 +125 @@
     }
     source->moments->dSky = value;
-    psTrace(__func__, 3, "---- %s(true) end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s(true) end ----\n", __func__);
     return (true);
 }