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

Timestamp:

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

Author:

Paul Price

Message:

Fixing up trace components.

File:

• trunk/ppMerge/src/ppMergeCheckInputs.c (modified) (5 diffs)

trunk/ppMerge/src/ppMergeCheckInputs.c

@@ -54 +54 @@
             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 +65 @@
         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 +100 @@
         // 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 +110 @@
         psFree(header);
 
-        psTrace(__func__, 3, "%s checks out.\n", name);
+        psTrace("ppMerge", 3, "%s checks out.\n", name);
         numGood++;
     }
@@ -131 +131 @@
     }
     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;