Index: trunk/psModules/src/camera/pmFPAConstruct.c
===================================================================
--- trunk/psModules/src/camera/pmFPAConstruct.c	(revision 7719)
+++ trunk/psModules/src/camera/pmFPAConstruct.c	(revision 8246)
@@ -244,5 +244,5 @@
     }
 
-    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,5 +593,5 @@
             // 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,5 +794,5 @@
     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,5 +805,5 @@
     // 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,5 +817,5 @@
         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,11 +829,11 @@
             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,5 +843,5 @@
                     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);