Index: trunk/ppMerge/src/ppMergeScaleZero.c
===================================================================
--- trunk/ppMerge/src/ppMergeScaleZero.c	(revision 9737)
+++ 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]);
             }