Changeset 8245 for trunk/psLib/src/astro

Timestamp:

Aug 8, 2006, 4:26:44 PM (20 years ago)

Author:

jhoblitt

Message:

normalize psTrace() facility names

File:

• trunk/psLib/src/astro/psCoord.c (modified) (13 diffs)

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.122 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-08 23:32:22 $
+*  @version $Revision: 1.123 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-09 02:26:44 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -589 +589 @@
     psPolynomial2D *trans2)
 {
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
-    psTrace(__func__, 5, "multiplyDPoly2D(%d %d: %d %d)\n", trans1->nX, trans1->nY, trans2->nX, trans2->nY);
+    psTrace("psLib.astro", 4, "---- %s() begin ----\n", __func__);
+    psTrace("psLib.astro", 5, "multiplyDPoly2D(%d %d: %d %d)\n", trans1->nX, trans1->nY, trans2->nX, trans2->nY);
     psS32 orderX = trans1->nX + trans2->nX;
     psS32 orderY = trans1->nY + trans2->nY;
-    psTrace(__func__, 5, "out poly (nX, nY) is (%d, %d)\n", orderX, orderY);
+    psTrace("psLib.astro", 5, "out poly (nX, nY) is (%d, %d)\n", orderX, orderY);
 
     psPolynomial2D *out = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, orderX, orderY);
-    psTrace(__func__, 5, "Creating poly (%d, %d)\n", orderX, orderY);
+    psTrace("psLib.astro", 5, "Creating poly (%d, %d)\n", orderX, orderY);
 
     for (psS32 t1x = 0 ; t1x < (1 + trans1->nX) ; t1x++) {
@@ -609 +609 @@
         }
     }
-    psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+    psTrace("psLib.astro", 4, "---- %s() end ----\n", __func__);
     return(out);
 }
@@ -623 +623 @@
     int nSamples)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
-    psTrace(__func__, 3, "tracelevel(%s) is %d\n", __func__, psTraceGetLevel(__func__));
+    psTrace("psLib.astro", 3, "---- %s() begin ----\n", __func__);
+    psTrace("psLib.astro", 3, "tracelevel(%s) is %d\n", __func__, psTraceGetLevel(__func__));
 
     PS_ASSERT_PTR_NON_NULL(trans1, NULL);
     PS_ASSERT_PTR_NON_NULL(trans2, NULL);
-    psTrace(__func__, 5, "trans1->x is (%d, %d) order.\n", trans1->x->nX, trans1->x->nY);
-    psTrace(__func__, 5, "trans1->y is (%d, %d) order.\n", trans1->y->nX, trans1->y->nY);
-    psTrace(__func__, 5, "trans2->x is (%d, %d) order.\n", trans2->x->nX, trans2->x->nY);
-    psTrace(__func__, 5, "trans2->y is (%d, %d) order.\n", trans2->y->nX, trans2->y->nY);
+    psTrace("psLib.astro", 5, "trans1->x is (%d, %d) order.\n", trans1->x->nX, trans1->x->nY);
+    psTrace("psLib.astro", 5, "trans1->y is (%d, %d) order.\n", trans1->y->nX, trans1->y->nY);
+    psTrace("psLib.astro", 5, "trans2->x is (%d, %d) order.\n", trans2->x->nX, trans2->x->nY);
+    psTrace("psLib.astro", 5, "trans2->y is (%d, %d) order.\n", trans2->y->nX, trans2->y->nY);
     if (psTraceGetLevel(__func__) >= 6) {
         PS_POLY_PRINT_2D(trans1->x);
@@ -648 +648 @@
     psS32 orderX = PS_MAX(orderXnX, orderYnX);
     psS32 orderY = PS_MAX(orderXnY, orderYnY);
-    psTrace(__func__, 5, "The new (orderX, orderY) is (%d, %d)\n", orderX, orderY);
+    psTrace("psLib.astro", 5, "The new (orderX, orderY) is (%d, %d)\n", orderX, orderY);
 
     //
@@ -679 +679 @@
         }
     }
-    psTrace(__func__, 5, "New polynomial ranks are (%d %d %d %d)\n", myPT->x->nX, myPT->x->nY, myPT->y->nX, myPT->y->nY);
+    psTrace("psLib.astro", 5, "New polynomial ranks are (%d %d %d %d)\n", myPT->x->nX, myPT->x->nY, myPT->y->nX, myPT->y->nY);
 
     //
@@ -707 +707 @@
     }
 
-    psTrace(__func__, 5, "Determine the new x-polynomial\n");
+    psTrace("psLib.astro", 5, "Determine the new x-polynomial\n");
     for (psS32 t2x = 0 ; t2x < (trans2->x->nX + 1) ; t2x++) {
         for (psS32 t2y = 0 ; t2y < (trans2->x->nY + 1) ; t2y++) {
-            psTrace(__func__, 6, "X: -------------------- (t2x, t2y) (%d, %d) --------------------\n", t2x, t2y);
+            psTrace("psLib.astro", 6, "X: -------------------- (t2x, t2y) (%d, %d) --------------------\n", t2x, t2y);
             if (trans2->x->mask[t2x][t2y] == 0) {
-                psTrace(__func__, 6, "In this iteration, we raise trans1->x to the %d power and trans1->y to the %d-power.\n", t2x, t2y);
+                psTrace("psLib.astro", 6, "In this iteration, we raise trans1->x to the %d power and trans1->y to the %d-power.\n", t2x, t2y);
                 psPolynomial2D *newPoly = multiplyDPoly2D(trans1XPolys[t2x], trans1YPolys[t2y]);
 
@@ -734 +734 @@
     }
     if (psTraceGetLevel(__func__) >= 6) {
-        psTrace(__func__, 6, "The final x-polynomial\n");
+        psTrace("psLib.astro", 6, "The final x-polynomial\n");
         PS_POLY_PRINT_2D(myPT->x);
     }
@@ -741 +741 @@
     // Determine the new y-polynomial
     //
-    psTrace(__func__, 5, "Determine the new y-polynomial\n");
+    psTrace("psLib.astro", 5, "Determine the new y-polynomial\n");
     for (psS32 t2x = 0 ; t2x < (trans2->y->nX + 1) ; t2x++) {
         for (psS32 t2y = 0 ; t2y < (trans2->y->nY + 1) ; t2y++) {
-            psTrace(__func__, 5, "Y: -------------------- (t2x, t2y) (%d, %d) --------------------\n", t2x, t2y);
+            psTrace("psLib.astro", 5, "Y: -------------------- (t2x, t2y) (%d, %d) --------------------\n", t2x, t2y);
             if (trans2->y->mask[t2x][t2y] == 0) {
-                psTrace(__func__, 5, "In this iteration, we raise trans1->x to the %d power and trans1->y to the %d-power.\n", t2x, t2y);
+                psTrace("psLib.astro", 5, "In this iteration, we raise trans1->x to the %d power and trans1->y to the %d-power.\n", t2x, t2y);
                 psPolynomial2D *newPoly = multiplyDPoly2D(trans1XPolys[t2x], trans1YPolys[t2y]);
 
@@ -767 +767 @@
     }
     if (psTraceGetLevel(__func__) >= 6) {
-        psTrace(__func__, 6, "The final y-polynomial\n");
+        psTrace("psLib.astro", 6, "The final y-polynomial\n");
         PS_POLY_PRINT_2D(myPT->y);
     }
@@ -778 +778 @@
     psFree(trans1YPolys);
 
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psLib.astro", 3, "---- %s() end ----\n", __func__);
     return(myPT);
 }
@@ -969 +969 @@
 
             out->x+= xPoly->coeff[loop_x][loop_y] * xSum * ySum * ((psF32) loop_x);
-            psTrace(__func__, 6, "out->x+= (%.2f * %.2f * %.2f * %.2f)\n", xPoly->coeff[loop_x][loop_y], xSum, ySum, ((psF32) loop_x));
+            psTrace("psLib.astro", 6, "out->x+= (%.2f * %.2f * %.2f * %.2f)\n", xPoly->coeff[loop_x][loop_y], xSum, ySum, ((psF32) loop_x));
             ySum*= coord->y;
         }
@@ -991 +991 @@
 
             out->y+= yPoly->coeff[loop_x][loop_y] * xSum * ySum * ((psF32) loop_y);
-            psTrace(__func__, 6, "out->y+= (%.2f * %.2f * %.2f * %.2f)\n", yPoly->coeff[loop_x][loop_y], xSum, ySum, ((psF32) loop_y));
+            psTrace("psLib.astro", 6, "out->y+= (%.2f * %.2f * %.2f * %.2f)\n", yPoly->coeff[loop_x][loop_y], xSum, ySum, ((psF32) loop_y));
             ySum*= coord->y;
         }