Index: /trunk/ppMerge/src/ppMergeCheckInputs.c
===================================================================
--- /trunk/ppMerge/src/ppMergeCheckInputs.c	(revision 9823)
+++ /trunk/ppMerge/src/ppMergeCheckInputs.c	(revision 9824)
@@ -54,5 +54,5 @@
             continue;
         }
-        psTrace(__func__, 1, "Checking input file %s....\n", name);
+        psTrace("ppMerge", 1, "Checking input file %s....\n", name);
         psFits *inFile = psFitsOpen(filenames->data[i], "r"); // The FITS file to read
         if (!inFile) {
@@ -65,5 +65,5 @@
         psMetadata *header = psFitsReadHeader(NULL, inFile); // The FITS (primary) header
         if (psTraceGetLevel("ppMerge") > 9) {
-            psTrace(__func__, 9, "Primary header:\n");
+            psTrace("ppMerge", 9, "Primary header:\n");
             psMetadataPrint(stdout, header, 9);
         }
@@ -100,5 +100,5 @@
         // Use the first valid input as the basis for the output --- including the header
         if (!data->out) {
-            psTrace(__func__, 5, "Constructing output using %s as a template.\n", name);
+            psTrace("ppMerge", 5, "Constructing output using %s as a template.\n", name);
             data->out = pmFPAConstruct(config->camera);
             pmFPAview *view = pmFPAAddSourceFromHeader(data->out, header, options->format);
@@ -110,5 +110,5 @@
         psFree(header);
 
-        psTrace(__func__, 3, "%s checks out.\n", name);
+        psTrace("ppMerge", 3, "%s checks out.\n", name);
         numGood++;
     }
@@ -131,7 +131,7 @@
     }
     data->numCells = numCells;
-    psTrace(__func__, 3, "Output has %d cells.\n", numCells);
+    psTrace("ppMerge", 3, "Output has %d cells.\n", numCells);
 
-    psTrace(__func__, 3, "We have %d good inputs.\n", numGood);
+    psTrace("ppMerge", 3, "We have %d good inputs.\n", numGood);
     if (numGood > 1) {
         return data;
Index: /trunk/ppMerge/src/ppMergeCombine.c
===================================================================
--- /trunk/ppMerge/src/ppMergeCombine.c	(revision 9823)
+++ /trunk/ppMerge/src/ppMergeCombine.c	(revision 9824)
@@ -70,7 +70,7 @@
         }
         psFree(leaks);
-        psTrace(__func__, 0, "Memory in use: %zd\n", totalSize);
-        psTrace(__func__, 0, "Largest block: %ld\n", largest);
-        psTrace(__func__, 0, "sbrk(): %zd\n", sbrk(0));
+        psTrace("ppMerge", 0, "Memory in use: %zd\n", totalSize);
+        psTrace("ppMerge", 0, "Largest block: %ld\n", largest);
+        psTrace("ppMerge", 0, "sbrk(): %zd\n", sbrk(0));
     }
     return;
@@ -172,5 +172,5 @@
                                                                 options->shutterRej,
                                                                 options->combine->maskVal);
-                    psTrace(__func__, 5, "Chip %d, cell %d\n", view->chip, view->cell);
+                    psTrace("ppMerge", 5, "Chip %d, cell %d\n", view->chip, view->cell);
                 } else {
                     psError(PS_ERR_UNKNOWN, true, "Not enough images to combine: %d\n", numRead);
@@ -219,5 +219,5 @@
                     if (numRead > 0) {
                         pmReadoutCombine(readout, stack, cellZeros, cellScales, options->combine);
-                        psTrace(__func__, 5, "Chip %d, cell %d, scan %d\n", view->chip, view->cell, numScan);
+                        psTrace("ppMerge", 5, "Chip %d, cell %d, scan %d\n", view->chip, view->cell, numScan);
                     }
                     numScan++;
@@ -252,5 +252,5 @@
                 if (numRead > 0) {
                     pmReadoutCombine(readout, stack, cellZeros, cellScales, options->combine);
-                    psTrace(__func__, 5, "Chip %d, cell %d\n", view->chip, view->cell);
+                    psTrace("ppMerge", 5, "Chip %d, cell %d\n", view->chip, view->cell);
                 }
 
@@ -291,5 +291,5 @@
             // Write the pixels
             if (cell->hdu) {
-                psTrace(__func__, 5, "Writing out cell HDU.\n");
+                psTrace("ppMerge", 5, "Writing out cell HDU.\n");
                 pmCellWrite(cell, data->outFile, config->database, false);
                 pmCellFreeData(cell);
@@ -306,5 +306,5 @@
         // Write the pixels
         if (chip->hdu) {
-            psTrace(__func__, 5, "Writing out chip HDU.\n");
+            psTrace("ppMerge", 5, "Writing out chip HDU.\n");
             pmChipWrite(chip, data->outFile, config->database, false, false);
             pmChipFreeData(chip);
@@ -314,5 +314,5 @@
     if (data->out->hdu) {
         // Write the pixels
-        psTrace(__func__, 5, "Writing out FPA HDU.\n");
+        psTrace("ppMerge", 5, "Writing out FPA HDU.\n");
         pmFPAWrite(data->out, data->outFile, config->database, false, false);
     }
Index: /trunk/ppMerge/src/ppMergeScaleZero.c
===================================================================
--- /trunk/ppMerge/src/ppMergeScaleZero.c	(revision 9823)
+++ /trunk/ppMerge/src/ppMergeScaleZero.c	(revision 9824)
@@ -116,5 +116,5 @@
                         fromConcepts = true;
                         (*scales)->data.F32[i][cellNum] = scale;
-                        psTrace(__func__, 9, "Scale for input %ld, chip %ld, cell %ld: %f\n", i, j, k, scale);
+                        psTrace("ppMerge", 9, "Scale for input %ld, chip %ld, cell %ld: %f\n", i, j, k, scale);
                     } else if (!first && fromConcepts) {
                         psLogMsg(__func__, PS_LOG_WARN, "PPMERGE.SCALE and PPMERGE.ZERO have been set "
@@ -137,5 +137,5 @@
                         fromConcepts = true;
                         (*zeros)->data.F32[i][cellNum] = zero;
-                        psTrace(__func__, 9, "Zero for input %ld, chip %ld, cell %ld: %f\n", i, j, k, zero);
+                        psTrace("ppMerge", 9, "Zero for input %ld, chip %ld, cell %ld: %f\n", i, j, k, zero);
                     } else if (!first && fromConcepts) {
                         psLogMsg(__func__, PS_LOG_WARN, "PPMERGE.SCALE and PPMERGE.ZERO have been set "
@@ -175,5 +175,5 @@
             continue;
         }
-        psTrace(__func__, 9, "Opening %s to get background...\n", name);
+        psTrace("ppMerge", 9, "Opening %s to get background...\n", name);
         psFits *inFile = data->files->data[i]; // The FITS file to read
         pmFPA *fpa = data->in->data[i]; // The FPA for this input
@@ -263,5 +263,5 @@
                     psFree(sampleMask);
                     background->data.F32[i][cellNum] = getStat(bgStats, options->mean);
-                    psTrace(__func__, 3, "Background for %s, cell %d is %f\n", name, cellNum,
+                    psTrace("ppMerge", 3, "Background for %s, cell %d is %f\n", name, cellNum,
                             background->data.F32[i][cellNum]);
                 }
@@ -279,5 +279,5 @@
         if (psTraceGetLevel("ppMerge") > 9) {
             for (int i = 0; i < gains->n; i++) {
-                psTrace(__func__, 10, "Gain for cell %d is %f\n", i, gains->data.F32[i]);
+                psTrace("ppMerge", 10, "Gain for cell %d is %f\n", i, gains->data.F32[i]);
             }
         }
@@ -322,5 +322,5 @@
         for (int i = 0; i < scalesDeref->numRows; i++) {
             for (int j = 0; j < scalesDeref->numCols; j++) {
-                psTrace(__func__, 9, "Scale for exposure %d, cell %d is: %f\n", i, j,
+                psTrace("ppMerge", 9, "Scale for exposure %d, cell %d is: %f\n", i, j,
                         scalesDeref->data.F32[i][j]);
             }
@@ -331,5 +331,5 @@
         for (int i = 0; i < zerosDeref->numRows; i++) {
             for (int j = 0; j < zerosDeref->numCols; j++) {
-                psTrace(__func__, 9, "Zero for exposure %d, cell %d is: %f\n", i, j,
+                psTrace("ppMerge", 9, "Zero for exposure %d, cell %d is: %f\n", i, j,
                         zerosDeref->data.F32[i][j]);
             }