Changeset 5444 for trunk/psLib/src/astro

Timestamp:

Oct 24, 2005, 2:38:00 PM (21 years ago)

Author:

drobbin

Message:

Fixed psSphereOps except for Galactic transformation at the pole.

Location:

trunk/psLib/src/astro

Files:

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

trunk/psLib/src/astro/psSphereOps.c

@@ -8 +8 @@
  *  @author Dave Robbins, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-10-21 02:14:02 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-10-25 00:38:00 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -135 +135 @@
                                  0.0);
 
+    /*    psSphereRot *test = psSphereRotICRSToGalactic();
+        if (fabs(coord->d-DEG_TO_RAD(27.1283)) < 0.0001 && transform->q0 == test->q0 &&
+            transform->q1 == test->q1 && transform->q2 == test->q2 && transform->q3 == test->q3){
+            printf("\ncoordquat = %lf,%lf,%lf,%lf\n", coordQuat->q0, coordQuat->q1, coordQuat->q2,
+             coordQuat->q3);
+    //        coordQuat->q1 += -1.0;
+            test->q3 = - test->q3;
+            *(psSphereRot**)&transform = test;
+        }
+        psFree(test);
+    */
     // Inserted by PAP
     psSphereRot *conjugate = psSphereRotConjugate(NULL, transform);

trunk/psLib/src/astro/psSphereOps.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-10-21 02:14:02 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-10-25 00:38:00 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -45 +45 @@
  */
 typedef enum {
-    PS_SPHERICAL,               ///< offset corresponds to an angular offset
-    PS_LINEAR                   ///< offset corresponds to a linear offset
+    PS_SPHERICAL,                      ///< offset corresponds to an angular offset
+    PS_LINEAR                          ///< offset corresponds to a linear offset
 } psSphereOffsetMode;
 
@@ -55 +55 @@
  */
 typedef enum {
-    PS_ARCSEC,                  ///< Arcseconds
-    PS_ARCMIN,                  ///< Arcminutes
-    PS_DEGREE,                  ///< Degrees
-    PS_RADIAN                   ///< Radians
+    PS_ARCSEC,                         ///< Arcseconds
+    PS_ARCMIN,                         ///< Arcminutes
+    PS_DEGREE,                         ///< Degrees
+    PS_RADIAN                          ///< Radians
 } psSphereOffsetUnit;
 
@@ -68 +68 @@
 
 psSphereRot* psSphereRotAlloc(
-    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).
+    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).
 );
 
@@ -145 +145 @@
     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).
-);
-
-/** Converts a psCube to a psSphere
- *
- *  @return psSphere*       New psSphere that is equivalent to the input psCube
- *
- */
-psSphere* psCubeToSphere(
-    const psCube* cube                 ///< a cubic coordinate to convert
-);
-
-/** Converts a psSphere to a psCube
- *
- *  @return psCube*       New psCube that is equivalent to the input psSphere
- *
- */
-psCube* psSphereToCube(
-    const psSphere* sphere             ///< a spherical coordinate to convert
 );