Changeset 5319 for trunk/psLib/src/astro

Timestamp:

Oct 13, 2005, 2:07:37 PM (21 years ago)

Author:

drobbin

Message:

Fixed/Updated SphereRot functions and tests.

Location:

trunk/psLib/src/astro

Files:

• psSphereOps.c (modified) (5 diffs)
• psSphereOps.h (modified) (2 diffs)

trunk/psLib/src/astro/psSphereOps.c

@@ -6 +6 @@
  *
  *  @author Robert DeSonia, MHPCC
+ *  @author Dave Robbins, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-10-13 20:23:57 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-10-14 00:07:37 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -62 +63 @@
     // calculate t*s*r.
     psSphereRot* result = psSphereRotCombine(NULL,&t,&s);
-    psMemSetDeallocator(result, (psFreeFunc)sphereRotFree);
     psSphereRotCombine(result,result,&r);
 
@@ -79 +79 @@
                              double q3)
 {
-    psSphereRot* rot = psAlloc(sizeof(psSphereRot));
+    psSphereRot* rot = (psSphereRot*)psAlloc(sizeof(psSphereRot));
+    psMemSetDeallocator(rot, (psFreeFunc)sphereRotFree);
 
     double len = sqrt(q0*q0 + q1*q1 + q2*q2 + q3*q3);
@@ -113 +114 @@
                                  sin(coord->d),
                                  0.0);
-    psSphereRot* coordQuatConjugate = psSphereRotQuat(
-                                          coordQuat->q0, coordQuat->q1, coordQuat->q2, coordQuat->q3);
-    coordQuat = psSphereRotInvert(coordQuat);
+    //    psSphereRot* coordQuatConjugate = psSphereRotQuat(
+    //                                       coordQuat->q0, coordQuat->q1, coordQuat->q2, coordQuat->q3);
+    //    coordQuat = psSphereRotInvert(coordQuat);
 
     // calculate q=(rp)r'
-    coordQuat = psSphereRotCombine(coordQuat, transform, coordQuat);
-    coordQuat = psSphereRotCombine(coordQuat, coordQuat, coordQuatConjugate);
+    //    coordQuat = psSphereRotCombine(coordQuat, transform, coordQuat);
+    //    coordQuat = psSphereRotCombine(coordQuat, coordQuat, coordQuatConjugate);
     // N.B., we can recycle coordQuat right away due to the implementation of
     // psSphereRotCombine; it puts the input values in a local variable first
 
-    out->r = atan2(coordQuat->q1,coordQuat->q0);
-    out->d = asin(coordQuat->q2);
+    //    out->r = atan2(coordQuat->q1,coordQuat->q0);
+    //    out->d = asin(coordQuat->q2);
+
+
+    //     psSphereRot *inv = psSphereRotInvert(transform);
+    psSphereRot *inv = (psSphereRot*)psAlloc(sizeof(psSphereRot));
+    *inv = *transform;
+    psSphereRot *result = psSphereRotCombine(NULL, transform, coordQuat);
+    psSphereRotInvert(inv);
+    psSphereRotCombine(result, result, inv);
+    out->r = atan2(result->q1, result->q0);
+    out->d = asin(result->q2);
+    out->rErr = 0.0;
+    out->dErr = 0.0;
+    psFree(inv);
+    psFree(result);
 
     psFree(coordQuat);
-    psFree(coordQuatConjugate);
+    //    psFree(coordQuatConjugate);
 
     return out;
@@ -141 +156 @@
     if (out == NULL) {
         out = (psSphereRot* ) psAlloc(sizeof(psSphereRot));
+        psMemSetDeallocator(out, (psFreeFunc)sphereRotFree);
     }
 

trunk/psLib/src/astro/psSphereOps.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-10-13 20:23:57 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-10-14 00:07:37 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -73 +73 @@
 );
 
-psSphereRot* psSphereRotAlloc2(
-    double alphaP,                      ///< north pole latitude
-    double deltaP,                      ///< north pole longitude
-    double phiP                         ///< defines the longitude in the input system of the equatorial intersection between the two systems (e.g, the first point of Ares).
-);
-
-psSphereRot* psSphereRotAlloc3(
-    double alphaP,                      ///< north pole latitude
-    double deltaP,                      ///< north pole longitude
-    double phiP                         ///< defines the longitude in the input system of the equatorial intersection between the two systems (e.g, the first point of Ares).
-);
-
-psSphereRot* psSphereRotAlloc4(
-    double alphaP,                      ///< north pole latitude
-    double deltaP,                      ///< north pole longitude
-    double phiP                         ///< defines the longitude in the input system of the equatorial intersection between the two systems (e.g, the first point of Ares).
-);
-
-psSphereRot* psSphereRotAlloc5(
-    double alphaP,                      ///< north pole latitude
-    double deltaP,                      ///< north pole longitude
-    double phiP                         ///< defines the longitude in the input system of the equatorial intersection between the two systems (e.g, the first point of Ares).
-);
-
-psSphereRot* psSphereRotAlloc6(
-    double alphaP,                      ///< north pole latitude
-    double deltaP,                      ///< north pole longitude
-    double phiP                         ///< defines the longitude in the input system of the equatorial intersection between the two systems (e.g, the first point of Ares).
-);
-
-psSphereRot* psSphereRotAlloc7(
-    double alphaP,                      ///< north pole latitude
-    double deltaP,                      ///< north pole longitude
-    double phiP                         ///< defines the longitude in the input system of the equatorial intersection between the two systems (e.g, the first point of Ares).
-);
-
-psSphereRot* psSphereRotAlloc8(
-    double alphaP,                      ///< north pole latitude
-    double deltaP,                      ///< north pole longitude
-    double phiP                         ///< defines the longitude in the input system of the equatorial intersection between the two systems (e.g, the first point of Ares).
-);
-
-
 /** Checks the type of a particular pointer.
  *