Changeset 3182 for trunk/psLib/src/astro/psCoord.c

Timestamp:

Feb 9, 2005, 4:36:42 PM (21 years ago)

Author:

desonia

Message:

prepared the config/data directories to be installed into standard areas.

File:

• trunk/psLib/src/astro/psCoord.c (modified) (6 diffs)

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-03 00:45:06 $
+*  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-10 02:36:41 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -267 +267 @@
 {
     while (angle < FLT_EPSILON) {
-        angle+=M_PI;
-    }
-
-    while (angle >= M_PI) {
-        angle-=M_PI;
+        angle+=PS_PI;
+    }
+
+    while (angle >= PS_PI) {
+        angle-=PS_PI;
     }
     return(angle);
@@ -547 +547 @@
         R = PS_SQRT_F32((coord->x * coord->x) + (coord->y * coord->y));
         tmp->d = atan2(-coord->y, coord->x);
-        tmp->r = acos((R * M_PI) / 180.0);
+        tmp->r = acos((R * PS_PI) / 180.0);
 
     } else if (projection->type == PS_PROJ_CAR) {
@@ -555 +555 @@
     } else if (projection->type == PS_PROJ_MER) {
         tmp->d = coord->x;
-        tmp->r = (2.0 * atan(exp((coord->y * M_PI / 180.0)))) - 180.0;
+        tmp->r = (2.0 * atan(exp((coord->y * PS_PI / 180.0)))) - 180.0;
 
     } else if (projection->type == PS_PROJ_AIT) {
-        chu1 = (coord->x * M_PI) / 720.0;
+        chu1 = (coord->x * PS_PI) / 720.0;
         chu1 *= chu1;
-        chu2 = (coord->y * M_PI) / 360.0;
+        chu2 = (coord->y * PS_PI) / 360.0;
         chu2 *= chu2;
         chu = PS_SQRT_F32(1.0 - chu1 - chu2);
-        tmp->d = 2.0 * atan2((2.0 * chu * chu) - 1.0, (coord->x * chu * M_PI) / 360.0);
-        tmp->r = asin((coord->y * chu * M_PI) / 180.0);
+        tmp->d = 2.0 * atan2((2.0 * chu * chu) - 1.0, (coord->x * chu * PS_PI) / 360.0);
+        tmp->r = asin((coord->y * chu * PS_PI) / 180.0);
 
     } else if (projection->type == PS_PROJ_PAR) {
@@ -640 +640 @@
         // Wrap these to an acceptable range.  This assumes that all
         // angles are in radians.
-        tmp->r = fmod(tmp->r, 2*M_PI);
-        tmp->d = fmod(tmp->d, 2*M_PI);
+        tmp->r = fmod(tmp->r, 2*PS_PI);
+        tmp->d = fmod(tmp->d, 2*PS_PI);
         tmp->rErr = 0.0;
         tmp->dErr = 0.0;
@@ -731 +731 @@
         tmp = (psSphere* ) psAlloc(sizeof(psSphere));
         tmp->r = position->r + tmpR;
-        tmp->r = fmod(tmp->r, 2.0*M_PI);
+        tmp->r = fmod(tmp->r, 2.0*PS_PI);
         tmp->d = position->d + tmpD;
-        tmp->d = fmod(tmp->d, 2.0*M_PI);
+        tmp->d = fmod(tmp->d, 2.0*PS_PI);
         tmp->rErr = 0.0;
         tmp->dErr = 0.0;