Changeset 9824 for trunk/ppMerge/src/ppMergeCombine.c

Timestamp:

Nov 1, 2006, 2:31:28 PM (20 years ago)

Author:

Paul Price

Message:

Fixing up trace components.

File:

• trunk/ppMerge/src/ppMergeCombine.c (modified) (7 diffs)

trunk/ppMerge/src/ppMergeCombine.c

@@ -70 +70 @@
         }
         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 +172 @@
                                                                 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 +219 @@
                     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 +252 @@
                 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 +291 @@
             // 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 +306 @@
         // 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 +314 @@
     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);
     }