Changeset 3351

Timestamp:

Mar 1, 2005, 11:38:23 AM (21 years ago)

Author:

evanalst

Message:

Update psSphereTransform functions to pass unit tests.

Location:

trunk/psLib/src

Files:

• astro/psCoord.c (modified) (6 diffs)
• astronomy/psCoord.c (modified) (6 diffs)

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-25 22:28:42 $
+*  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-03-01 21:38:23 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -264 +264 @@
 XXX: Private Function.
  
-piNormalize(): take an input angle in radians and convert it to the range 0:PI.
+piNormalize(): take an input angle in radians and convert it to the range 0:2*PI.
  *****************************************************************************/
 psF32 piNormalize(psF32 angle)
 {
     while (angle < FLT_EPSILON) {
-        angle+=PS_PI;
-    }
-
-    while (angle >= PS_PI) {
-        angle-=PS_PI;
+        angle+=PS_PI*2;
+    }
+
+    while (angle >= (PS_PI*2)) {
+        angle-=PS_PI*2;
     }
     return(angle);
@@ -299 +299 @@
     psF64 eq55 = (sin(delta) * transform->cosDeltaP) -
                  (cos(delta) * transform->sinDeltaP * sin(alphaMinusAlphaP));
-
     psF64 eq56 = (cos(delta) * transform->cosDeltaP * sin(alphaMinusAlphaP)) +
                  (sin(delta) * transform->sinDeltaP);
-
     psF64 eq57 = cos(delta) * cos(alphaMinusAlphaP);
 
     psF64 theta = asin(eq55);
-    psF64 phi = atan2(eq56, eq57) + transform->alphaP;
-
-
+    psF64 phi = atan2(eq56, eq57) + transform->phiP;
     out->r = piNormalize(phi);
     out->d = theta;
@@ -344 +340 @@
 
     // Don't neglect the minus sign on deltaP (bug 244):
-    return (psSphereTransformAlloc(alphaP, -deltaP, phiP));
+    return (psSphereTransformAlloc(alphaP, deltaP, phiP));
 }
 
@@ -376 +372 @@
     psF64 phiP = 0.0;
 
-    return (psSphereTransformAlloc(alphaP, deltaP, phiP));
+    return (psSphereTransformAlloc(alphaP, -deltaP, phiP));
 }
 
 // XXX: This is bug 245: alphaP swaps with phiP from psSphereTransformGalacticToICRS()
-psSphereTransform* psSphereTransformICRSToGalactic(void)
+psSphereTransform* psSphereTransformGalacticToICRS(void)
 {
     psF64 alphaP = DEG_TO_RAD(32.93192);
@@ -389 +385 @@
 }
 
-psSphereTransform* psSphereTransformGalacticToICRS(void)
+psSphereTransform* psSphereTransformICRSToGalactic(void)
 {
     psF64 alphaP = DEG_TO_RAD(282.85948);

trunk/psLib/src/astronomy/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-25 22:28:42 $
+*  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-03-01 21:38:23 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -264 +264 @@
 XXX: Private Function.
  
-piNormalize(): take an input angle in radians and convert it to the range 0:PI.
+piNormalize(): take an input angle in radians and convert it to the range 0:2*PI.
  *****************************************************************************/
 psF32 piNormalize(psF32 angle)
 {
     while (angle < FLT_EPSILON) {
-        angle+=PS_PI;
-    }
-
-    while (angle >= PS_PI) {
-        angle-=PS_PI;
+        angle+=PS_PI*2;
+    }
+
+    while (angle >= (PS_PI*2)) {
+        angle-=PS_PI*2;
     }
     return(angle);
@@ -299 +299 @@
     psF64 eq55 = (sin(delta) * transform->cosDeltaP) -
                  (cos(delta) * transform->sinDeltaP * sin(alphaMinusAlphaP));
-
     psF64 eq56 = (cos(delta) * transform->cosDeltaP * sin(alphaMinusAlphaP)) +
                  (sin(delta) * transform->sinDeltaP);
-
     psF64 eq57 = cos(delta) * cos(alphaMinusAlphaP);
 
     psF64 theta = asin(eq55);
-    psF64 phi = atan2(eq56, eq57) + transform->alphaP;
-
-
+    psF64 phi = atan2(eq56, eq57) + transform->phiP;
     out->r = piNormalize(phi);
     out->d = theta;
@@ -344 +340 @@
 
     // Don't neglect the minus sign on deltaP (bug 244):
-    return (psSphereTransformAlloc(alphaP, -deltaP, phiP));
+    return (psSphereTransformAlloc(alphaP, deltaP, phiP));
 }
 
@@ -376 +372 @@
     psF64 phiP = 0.0;
 
-    return (psSphereTransformAlloc(alphaP, deltaP, phiP));
+    return (psSphereTransformAlloc(alphaP, -deltaP, phiP));
 }
 
 // XXX: This is bug 245: alphaP swaps with phiP from psSphereTransformGalacticToICRS()
-psSphereTransform* psSphereTransformICRSToGalactic(void)
+psSphereTransform* psSphereTransformGalacticToICRS(void)
 {
     psF64 alphaP = DEG_TO_RAD(32.93192);
@@ -389 +385 @@
 }
 
-psSphereTransform* psSphereTransformGalacticToICRS(void)
+psSphereTransform* psSphereTransformICRSToGalactic(void)
 {
     psF64 alphaP = DEG_TO_RAD(282.85948);