Changeset 8246 for trunk/psModules/src/camera

Timestamp:

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

Author:

jhoblitt

Message:

normalize psTrace() facility names

Location:

trunk/psModules/src/camera

Files:

• pmFPA.c (modified) (9 diffs)
• pmFPAConstruct.c (modified) (7 diffs)
• pmFPACopy.c (modified) (3 diffs)
• pmFPAEnsemble.c (modified) (2 diffs)
• pmFPAMaskWeight.c (modified) (1 diff)
• pmFPAMosaic.c (modified) (16 diffs)
• pmFPARead.c (modified) (3 diffs)
• pmFPAfileDefine.c (modified) (4 diffs)
• pmFPAfileIO.c (modified) (13 diffs)
• pmHDU.c (modified) (5 diffs)
• pmHDUUtils.c (modified) (1 diff)

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