Changeset 9541 for trunk/ppMerge

Timestamp:

Oct 13, 2006, 12:14:07 PM (20 years ago)

Author:

Paul Price

Message:

Fixing psTraceGetLevel to use same convention as for psTrace

Location:

trunk/ppMerge/src

Files:

• ppMergeCheckInputs.c (modified) (1 diff)
• ppMergeCombine.c (modified) (1 diff)
• ppMergeScaleZero.c (modified) (3 diffs)

trunk/ppMerge/src/ppMergeCheckInputs.c

@@ -66 +66 @@
         }
         psMetadata *header = psFitsReadHeader(NULL, inFile); // The FITS (primary) header
-        if (psTraceGetLevel(__func__) > 9) {
+        if (psTraceGetLevel("ppMerge") > 9) {
             psTrace(__func__, 9, "Primary header:\n");
             psMetadataPrint(stdout, header, 9);

trunk/ppMerge/src/ppMergeCombine.c

@@ -55 +55 @@
 {
     return;
-    if (psTraceGetLevel(__func__) > 9) {
+    if (psTraceGetLevel("ppMerge") > 9) {
         psMemBlock **leaks = NULL;
         int numLeaks = psMemCheckLeaks(0, &leaks, NULL, true);

trunk/ppMerge/src/ppMergeScaleZero.c

@@ -280 +280 @@
     if (options->scale) {
         // Need to normalize over the focal plane
-        if (psTraceGetLevel(__func__) > 9) {
+        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]);
@@ -321 +321 @@
 
     // Diagnostic stuff
-    if (scales && *scales && psTraceGetLevel(__func__) > 9) {
+    if (scales && *scales && psTraceGetLevel("ppMerge") > 9) {
         psImage *scalesDeref = *scales; // Dereference the pointer
         for (int i = 0; i < scalesDeref->numRows; i++) {
@@ -330 +330 @@
         }
     }
-    if (zeros && *zeros && psTraceGetLevel(__func__) > 9) {
+    if (zeros && *zeros && psTraceGetLevel("ppMerge") > 9) {
         psImage *zerosDeref = *zeros; // Dereference the pointer
         for (int i = 0; i < zerosDeref->numRows; i++) {