Changeset 5682

Timestamp:

Dec 5, 2005, 11:33:29 AM (20 years ago)

Author:

gusciora

Message:

The previous psCoord.c merge is not correct. Neither is this.

Location:

trunk/psLib/src

Files:

• astro/psCoord.c (modified) (4 diffs)
• math/psStats.c (modified) (2 diffs)

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.95 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-11-30 02:17:17 $
+*  @version $Revision: 1.96 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-12-05 21:33:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -62 +62 @@
  
 XXX: Use the ADD version which is based on determinants.
+ 
+XXX: This code no longer makes sense.  The merge must be reviewed.
  *****************************************************************************/
 
@@ -105 +107 @@
 
     if (1) {
+        // XXX: There is no reason to execute this code and the following code.
         psF64 A = transform->x->coeff[1][0];
         psF64 B = transform->x->coeff[0][1];
@@ -125 +128 @@
 
     }
-    //    printf("HMMM: out->x: (%f %f %f)\n", out->x->coeff[0][0], out->x->coeff[1][0], out->x->coeff[0][1]);
-    //    printf("HMMM: out->y: (%f %f %f)\n", out->y->coeff[0][0], out->y->coeff[1][0], out->y->coeff[0][1]);
-
-
+
+
+    // XXX: There is no reason to execute this code and the previous codes.
     // unless the cross terms are available, set these matrix elements to 0
     psF64 r12 = 0.0;

trunk/psLib/src/math/psStats.c

@@ -17 +17 @@
  *
  *
- *  @version $Revision: 1.156 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-12-01 23:35:33 $
+ *  @version $Revision: 1.157 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-12-05 21:33:29 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1672 +1672 @@
 }
 
-// XXX: Get rid of this, or put it in psConstants.h
-void PRINT_LEAKS()
-{
-    psScalar *tmpScalar = psScalarAlloc(0.0, PS_TYPE_F32);
-    psMemCheckCorruption( 1 );
-    psS32 currentId = psMemGetId();
-    //    psMemBlock** blks;
-    //    psS32 nLeaks = psMemCheckLeaks( currentId, &blks, stderr, false );
-    psS32 nLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
-    printf("COOL: %d leaks.\n", nLeaks);
-    tmpScalar->data.F32 = 0.0;
-}
-
-/*
-#define PRINT_MEMLEAKS(NUM) \
-    printf("A: ---------------------------------------- (ID: %d)\n", NUM); \
-    memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); \
-    printf("B: ---------------------------------------- (%d)\n", memLeaks); \
-#define PRINT_MEMLEAKS(NUM) \
-memLeaks = currentId;
-*/
-
-
 /******************************************************************************
 p_psVectorRobustStats(myVector, maskVector, maskVal, stats): This is the new