Changeset 5343 for trunk/psLib/src/astro/psSphereOps.c

Timestamp:

Oct 14, 2005, 3:42:48 PM (21 years ago)

Author:

drobbin

Message:

Made updates to SphereOps & tests. ApplyCel & Precess still produce erroroneus values.

File:

• trunk/psLib/src/astro/psSphereOps.c (modified) (4 diffs)

trunk/psLib/src/astro/psSphereOps.c

@@ -8 +8 @@
  *  @author Dave Robbins, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-10-14 00:07:37 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-10-15 01:42:46 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -134 +134 @@
     psSphereRotInvert(inv);
     psSphereRotCombine(result, result, inv);
+    //    psSphereRot *result = psSphereRotCombine(NULL, inv, coordQuat);
+    //    psSphereRotCombine(result, result, transform);
+    //    psSphereRot *result = psSphereRotCombine(NULL, coordQuat, transform);
+    //    psSphereRotCombine(result, inv, result);
+
+    //    out->r = atan2(result->q1, result->q0);
     out->r = atan2(result->q1, result->q0);
     out->d = asin(result->q2);
@@ -464 +470 @@
 
     // Calculate conversion constants
-    psF64 alphaP = DEG_TO_RAD(90.0) - ((DEG_TO_RAD(0.6406161) * T) +
-                                       (DEG_TO_RAD(0.0000839) * T * T) +
-                                       (DEG_TO_RAD(0.000005) * T * T * T));
+    //    psF64 alphaP = DEG_TO_RAD(90.0) - ((DEG_TO_RAD(0.6406161) * T) +
+    psF64 alphaP = DEG_TO_RAD(180.0) - ((DEG_TO_RAD(0.6406161) * T) +
+                                        (DEG_TO_RAD(0.0000839) * T * T) +
+                                        (DEG_TO_RAD(0.000005) * T * T * T));
 
     psF64 deltaP = (DEG_TO_RAD(0.5567530) * T) -
@@ -472 +479 @@
                    (DEG_TO_RAD(0.0000116) * T * T * T);
 
-    psF64 phiP = DEG_TO_RAD(90.0) + ((DEG_TO_RAD(0.6406161) * T) +
-                                     (DEG_TO_RAD(0.0003041) * T * T) +
-                                     (DEG_TO_RAD(0.0000051) * T * T * T));
+    //    psF64 phiP = DEG_TO_RAD(90.0) + ((DEG_TO_RAD(0.6406161) * T) +
+    psF64 phiP = DEG_TO_RAD(180.0) + ((DEG_TO_RAD(0.6406161) * T) +
+                                      (DEG_TO_RAD(0.0003041) * T * T) +
+                                      (DEG_TO_RAD(0.0000051) * T * T * T));
 
     // Create transform with proper constants