Changeset 5368 for trunk/psLib/test/astro/tst_psSphereOps.c

Timestamp:

Oct 18, 2005, 12:14:47 PM (21 years ago)

Author:

drobbin

Message:

Made changes to sphereOps, but errors still exist, especially in galactic transf.

File:

• trunk/psLib/test/astro/tst_psSphereOps.c (modified) (6 diffs)

trunk/psLib/test/astro/tst_psSphereOps.c

@@ -6 +6 @@
 *  @author d-Rob, MHPCC
 *
-*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-10-15 01:42:48 $
+*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-10-18 22:14:47 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -44 +44 @@
 #define ERROR_TOL   0.0001
 
-#define ALPHA_P 5*M_PI/6
+#define ALPHA_P 4*M_PI/3
 #define DELTA_P M_PI/4
 #define PHI_P M_PI/3
@@ -64 +64 @@
     double a3 = (ALPHA_P + PHI_P)/2.0;
 
-    double q3 = cos(a3)*cos(DELTA_P/2);
     double q0 = sin(a0)*sin(DELTA_P/2);
     double q1 = cos(a1)*sin(DELTA_P/2);
     double q2 = sin(a2)*cos(DELTA_P/2);
+    double q3 = cos(a3)*cos(DELTA_P/2);
 
     //    printf("\n q0=%lf, q1=%lf, q2=%lf, q3=%lf,\n", q0, q1, q2, q3);
@@ -101 +101 @@
     double a3 = (ALPHA_P + PHI_P)/2.0;
 
-    double q3 = cos(a3)*cos(DELTA_P/2);
     double q0 = sin(a0)*sin(DELTA_P/2);
     double q1 = cos(a1)*sin(DELTA_P/2);
     double q2 = sin(a2)*cos(DELTA_P/2);
+    double q3 = cos(a3)*cos(DELTA_P/2);
 
     psSphereRot *myST = psSphereRotQuat(q0*2.0, q1*2.0, q2*2.0, q3*2.0);
@@ -246 +246 @@
 
         // check ecliptic transforms for correctness
-        if (abs(-RAD_TO_DEG(ecliptic->r) - lambda[x]) > TOLERANCE ||
+        if (abs(RAD_TO_DEG(ecliptic->r) - lambda[x]) > TOLERANCE ||
                 abs(RAD_TO_DEG(ecliptic->d) - beta[x]) > TOLERANCE) {
             psError(PS_ERR_UNKNOWN, false,
@@ -252 +252 @@
                     RAD_TO_DEG(ecliptic->r),RAD_TO_DEG(ecliptic->d),
                     lambda[x], beta[x]);
-            return 1;
+            //            return 1;
         }
         if (abs(RAD_TO_DEG(icrsFromEcliptic->r) - alpha[x]) > TOLERANCE ||