Changeset 8246 for trunk/psModules/src/detrend/pmFringeStats.c

Timestamp:

Aug 8, 2006, 4:37:08 PM (20 years ago)

Author:

jhoblitt

Message:

normalize psTrace() facility names

File:

• trunk/psModules/src/detrend/pmFringeStats.c (modified) (8 diffs)

trunk/psModules/src/detrend/pmFringeStats.c

@@ -3 +3 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-13 02:21:25 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:07 $
  *
  *  Copyright 2004 IfA
@@ -327 +327 @@
         dfPt[i] = 1.0 / medianSd->sampleStdev;
 
-        psTrace(__func__, 7, "[%d:%d,%d:%d]: %f %f\n", (int)region.x0, (int)region.x1,
+        psTrace("psModules.detrend", 7, "[%d:%d,%d:%d]: %f %f\n", (int)region.x0, (int)region.x1,
                 (int)region.y0, (int)region.y1, fPt[i], dfPt[i]);
     }
@@ -671 +671 @@
     int numClipped = 0;                 // Number clipped
     for (int i = 0; i < diffs->n; i++) {
-        psTrace(__func__, 10, "Region %d (%d): %f\n", i, mask->data.U8[i], diffs->data.F32[i]);
+        psTrace("psModules.detrend", 10, "Region %d (%d): %f\n", i, mask->data.U8[i], diffs->data.F32[i]);
         if (!mask->data.U8[i] && fabs(diffs->data.F32[i]) > middle + thresh) {
-            psTrace(__func__, 5, "Masking %d: %f\n", i, diffs->data.F32[i]);
+            psTrace("psModules.detrend", 5, "Masking %d: %f\n", i, diffs->data.F32[i]);
             mask->data.U8[i] = 1;
             numClipped++;
@@ -732 +732 @@
             if (!finite(fringe->f->data.F32[j])) {
                 mask->data.U8[j] = 1;
-                psTrace(__func__, 9, "Masking region %d because not finite in fringe %d.\n", j, i);
+                psTrace("psModules.detrend", 9, "Masking region %d because not finite in fringe %d.\n", j, i);
             }
         }
@@ -749 +749 @@
     fringeScaleDiffs(diff, science, fringes, scale);
     numClipped = clipRegions(diff, mask, 3.0*rej);
-    psTrace(__func__, 4, "%d regions clipped in initial pass.\n", numClipped);
+    psTrace("psModules.detrend", 4, "%d regions clipped in initial pass.\n", numClipped);
 
     unsigned int iter = 0;              // Iteration number
@@ -756 +756 @@
         iter++;
         scaleMeasure(scale, science, fringes); // The scales
-        psTrace(__func__, 1, "Fringe scales after iteration %d:\n", iter);
-        psTrace(__func__, 1, "Background: %f %f\n", scale->coeff->data.F32[0], scale->coeffErr->data.F32[0]);
+        psTrace("psModules.detrend", 1, "Fringe scales after iteration %d:\n", iter);
+        psTrace("psModules.detrend", 1, "Background: %f %f\n", scale->coeff->data.F32[0], scale->coeffErr->data.F32[0]);
         for (int i = 0; i < scale->nFringeFrames; i++) {
-            psTrace(__func__, 1, "%d: %f %f\n", i, scale->coeff->data.F32[i + 1],
+            psTrace("psModules.detrend", 1, "%d: %f %f\n", i, scale->coeff->data.F32[i + 1],
                     scale->coeffErr->data.F32[i + 1]);
         }
@@ -766 +766 @@
         iterClip = clipRegions(diff, mask, rej); // Number clipped
         numClipped += iterClip;
-        psTrace(__func__, 9, "Clipped: %d\tFrac: %f\n", iterClip, (float)numClipped/(float)numRegions);
+        psTrace("psModules.detrend", 9, "Clipped: %d\tFrac: %f\n", iterClip, (float)numClipped/(float)numRegions);
     } while (iterClip > 0 && iter < nIter && (float)numClipped/(float)numRegions <= 1.0 - keepFrac);
     psFree(diff);
@@ -811 +811 @@
     psFree(scienceStats);
 
-    psTrace(__func__, 7, "Fringe solution:\n");
+    psTrace("psModules.detrend", 7, "Fringe solution:\n");
     for (int i = 0; i < fringeImages->n + 1; i++) {
-        psTrace(__func__, 7, "%d: %f %f\n", i, scale->coeff->data.F32[i],
+        psTrace("psModules.detrend", 7, "%d: %f %f\n", i, scale->coeff->data.F32[i],
                 scale->coeffErr->data.F32[i]);
     }