Changeset 5588

Timestamp:

Nov 23, 2005, 1:54:43 PM (21 years ago)

Author:

gusciora

Message:

....

Location:

trunk/psLib/src

Files:

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

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.92 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-11-23 00:59:58 $
+*  @version $Revision: 1.93 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-11-23 23:54:43 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -458 +458 @@
 
     // Remove plate scales
-    psF64  x = coord->x * projection->Xs;
-    psF64  y = coord->y * projection->Ys;
+    // XXX: Verify this.  EAM suggested we do a multiply, however that does
+    // not make sense if we also do the multiply in psProject().
+    psF64  x = coord->x/projection->Xs;
+    psF64  y = coord->y/projection->Ys;
 
     // Perform inverse projection

trunk/psLib/src/math/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.80 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-23 21:18:12 $
+ *  @version $Revision: 1.81 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-11-23 23:54:43 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -592 +592 @@
 
 #define PS_POLY_PRINT_1D(NAME) \
+printf("Poly %s: (nX) is (%d)\n", #NAME, NAME->nX);\
 for (psS32 i = 0 ; i < NAME->nX+1 ; i++) {\
     printf("%s->coeff[%d] is %f\n", #NAME, i, NAME->coeff[i]); \
@@ -597 +598 @@
 
 #define PS_POLY_PRINT_2D(NAME) \
+printf("Poly %s: (nX, nY) is (%d, %d)\n", #NAME, NAME->nX, NAME->nY);\
 for (psS32 i = 0 ; i < NAME->nX+1 ; i++) {\
     for (psS32 j = 0 ; j < NAME->nY+1 ; j++) {\
@@ -602 +604 @@
     }\
 }\
+
+#define PS_PRINT_PLANE_TRANSFORM(NAME) \
+{ \
+    printf("---------------------- Plane Transform ----------------------\n"); \
+    printf("x:\n"); \
+    PS_POLY_PRINT_2D(NAME->x); \
+    printf("y:\n"); \
+    PS_POLY_PRINT_2D(NAME->y); \
+} \
+
 
 /*****************************************************************************