Changeset 9540 for trunk/psLib/src/math/psStats.c

Timestamp:

Oct 13, 2006, 12:04:58 PM (20 years ago)

Author:

Paul Price

Message:

Fixing psTraceGetLevel to use same convention as for psTrace

File:

• trunk/psLib/src/math/psStats.c (modified) (13 diffs)

trunk/psLib/src/math/psStats.c

@@ -16 +16 @@
  * use ->min and ->max (PS_STAT_USE_RANGE)
  *
- *  @version $Revision: 1.186 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 21:13:48 $
+ *  @version $Revision: 1.187 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 22:04:58 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -480 +480 @@
     PS_ASSERT_PTR_NON_NULL(histogram->bounds, NULL);
     PS_ASSERT_PTR_NON_NULL(histogram->nums, NULL);
-    if (psTraceGetLevel(__func__) >= 8) {
+    if (psTraceGetLevel("psLib.math") >= 8) {
         PS_VECTOR_PRINT_F32(histogram->nums);
     }
@@ -561 +561 @@
     }
 
-    if (psTraceGetLevel(__func__) >= 8) {
+    if (psTraceGetLevel("psLib.math") >= 8) {
         PS_VECTOR_PRINT_F32(smooth);
     }
@@ -705 +705 @@
 {
     psTrace("psLib.math", 4, "---- %s() begin ----\n", __func__);
-    psTrace("psLib.math", 4, "Trace level is %d\n", psTraceGetLevel(__func__));
+    psTrace("psLib.math", 4, "Trace level is %d\n", psTraceGetLevel("psLib.math"));
 
     // Ensure that stats->clipIter is within the proper range.
@@ -886 +886 @@
     psTrace("psLib.math", 4, "---- %s() begin ----\n", __func__);
     psTrace("psLib.math", 5, "binNum, yVal is (%d, %f)\n", binNum, yVal);
-    if (psTraceGetLevel(__func__) >= 8) {
+    if (psTraceGetLevel("psLib.math") >= 8) {
         PS_VECTOR_PRINT_F32(xVec);
         PS_VECTOR_PRINT_F32(yVec);
@@ -1058 +1058 @@
 {
     psTrace("psLib.math", 4, "---- %s() begin ----\n", __func__);
-    if (psTraceGetLevel(__func__) >= 8) {
+    if (psTraceGetLevel("psLib.math") >= 8) {
         PS_VECTOR_PRINT_F32(myVector);
     }
@@ -1141 +1141 @@
         histogram = psHistogramAlloc(min, max, numBins);
         histogram = psVectorHistogram(histogram, myVector, errors, mask, maskVal);
-        if (psTraceGetLevel(__func__) >= 8) {
+        if (psTraceGetLevel("psLib.math") >= 8) {
             PS_VECTOR_PRINT_F32(histogram->bounds);
             PS_VECTOR_PRINT_F32(histogram->nums);
@@ -1152 +1152 @@
             cumulative->nums->data.F32[i] = cumulative->nums->data.F32[i-1] + histogram->nums->data.F32[i];
         }
-        if (psTraceGetLevel(__func__) >= 8) {
+        if (psTraceGetLevel("psLib.math") >= 8) {
             PS_VECTOR_PRINT_F32(cumulative->bounds);
             PS_VECTOR_PRINT_F32(cumulative->nums);
@@ -1417 +1417 @@
         psHistogram *histogram = psHistogramAlloc(min, max, numBins); // A new histogram (without outliers)
         histogram = psVectorHistogram(histogram, myVector, errors, mask, maskVal);
-        if (psTraceGetLevel(__func__) >= 8) {
+        if (psTraceGetLevel("psLib.math") >= 8) {
             PS_VECTOR_PRINT_F32(histogram->nums);
         }
@@ -1423 +1423 @@
         // Smooth the resulting histogram with a Gaussian with sigma_s = 1 bin.
         psVector *smoothed = vectorSmoothHistGaussian(histogram, newBinSize); // Smoothed histogram
-        if (psTraceGetLevel(__func__) >= 8) {
+        if (psTraceGetLevel("psLib.math") >= 8) {
             PS_VECTOR_PRINT_F32(smoothed);
         }
@@ -1496 +1496 @@
             x->data[j] = ordinate;
         }
-        if (psTraceGetLevel(__func__) >= 8) {
+        if (psTraceGetLevel("psLib.math") >= 8) {
             // XXX: Print the x array somehow.
             PS_VECTOR_PRINT_F32(y);
@@ -1525 +1525 @@
         params->data.F32[0] = stats->robustMedian;
         params->data.F32[1] = sigma;
-        if (psTraceGetLevel(__func__) >= 8) {
+        if (psTraceGetLevel("psLib.math") >= 8) {
             PS_VECTOR_PRINT_F32(params);
             PS_VECTOR_PRINT_F32(y);
@@ -1540 +1540 @@
             return false;
         }
-        if (psTraceGetLevel(__func__) >= 8) {
+        if (psTraceGetLevel("psLib.math") >= 8) {
             PS_VECTOR_PRINT_F32(params);
         }