Changeset 9541

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

Files:

• ppMerge/src/ppMergeCheckInputs.c (modified) (1 diff)
• ppMerge/src/ppMergeCombine.c (modified) (1 diff)
• ppMerge/src/ppMergeScaleZero.c (modified) (3 diffs)
• psModules/src/detrend/pmFringeStats.c (modified) (3 diffs)
• psModules/src/detrend/pmSubtractSky.c (modified) (2 diffs)
• psModules/src/imcombine/pmReadoutCombine.c (modified) (4 diffs)
• psModules/src/objects/pmSourceFitModel.c (modified) (2 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++) {

trunk/psModules/src/detrend/pmFringeStats.c

@@ -3 +3 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-20 02:36:36 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 22:11:02 $
  *
  *  Copyright 2004 IfA
@@ -600 +600 @@
     }
 
-    if (psTraceGetLevel(__func__) >= 5) {
+    if (psTraceGetLevel("psModules.detrend") >= 5) {
         printf("From %d points:\n", numPoints);
         for (int i = 0; i < numCoeffs; i++) {
@@ -802 +802 @@
     pmFringeStats *scienceStats = pmFringeStatsMeasure(fringes, readout, maskVal);
 
-    if (psTraceGetLevel(__func__) > 9) {
+    if (psTraceGetLevel("psModules.detrend") > 9) {
         for (int i = 0; i < fringes->nRequested; i++) {
             printf("%f", scienceStats->f->data.F32[i]);

trunk/psModules/src/detrend/pmSubtractSky.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-15 09:49:01 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 22:11:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -231 +231 @@
     }
 
-    if (psTraceGetLevel(".psModule.pmSubtractSky.buildPolyTerms") >= 10) {
+    if (psTraceGetLevel("psModules.detrend") >= 10) {
         for (i=0; i < localPolyTerms ; i++) {
             printf("x^%d * y^%d\n", polyTerms[i][0], polyTerms[i][1]);

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-20 02:36:36 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 22:11:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -282 +282 @@
             minInputCols - output->col0, maxInputCols - output->col0,
             minInputRows - output->row0, maxInputRows - output->row0);
-    if (psTraceGetLevel(__func__) >= 3) {
+    if (psTraceGetLevel("psModules.imcombine") >= 3) {
         for (int r = 0; r < inputs->n; r++) {
             pmReadout *readout = inputs->data[r]; // Input readout
@@ -309 +309 @@
         #if 0
 
-        if (psTraceGetLevel(__func__) > 9) {
+        if (psTraceGetLevel("psModules.imcombine") > 9) {
             printf("Processing row %d\r", i);
             fflush(stdout);
@@ -390 +390 @@
     }
     #if 0
-    if (psTraceGetLevel(__func__) > 9) {
+    if (psTraceGetLevel("psModules.imcombine") > 9) {
         printf("\n");
     }

trunk/psModules/src/objects/pmSourceFitModel.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 02:29:14 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 22:11:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -399 +399 @@
     psFree (oneParMax);
 
-    if (psTraceGetLevel(__func__) >= 5) {
+    if (psTraceGetLevel("psModules.objects") >= 5) {
         for (int i = 0; i < params->n; i++) {
             fprintf (stderr, "%d %f %d\n", i, params->data.F32[i], constrain->paramMask->data.U8[i]);