Changeset 3884 for trunk/psLib/src/astro

Timestamp:

May 11, 2005, 12:02:16 PM (21 years ago)

Author:

desonia

Message:

changed PS_PI* to M_PI*.

Location:

trunk/psLib/src/astro

Files:

• psCoord.c (modified) (6 diffs)
• psTime.c (modified) (4 diffs)

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-19 05:46:24 $
+*  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-05-11 22:02:15 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -326 +326 @@
 {
     while (angle < FLT_EPSILON) {
-        angle+=PS_PI*2;
-    }
-
-    while (angle >= (PS_PI*2)) {
-        angle-=PS_PI*2;
+        angle+=M_PI*2;
+    }
+
+    while (angle >= (M_PI*2)) {
+        angle-=M_PI*2;
     }
     return(angle);
@@ -509 +509 @@
     } else if ( projection->type == PS_PROJ_PAR) {
         out->x = phi*(2.0*cos(2.0*theta/3.0) - 1.0);
-        out->y = PS_PI*sin(theta/3.0);
+        out->y = M_PI*sin(theta/3.0);
     } else {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
@@ -558 +558 @@
         // Parabolic deprojection
     } else if ( projection->type == PS_PROJ_PAR) {
-        psF64 rho = y/PS_PI;
+        psF64 rho = y/M_PI;
         phi = x/(1.0 - 4.0*rho*rho);
         theta = 3.0*asin(rho);
@@ -647 +647 @@
         // Wrap these to an acceptable range.  This assumes that all
         // angles are in radians.
-        tmp->r = fmod(tmp->r, 2*PS_PI);
-        tmp->d = fmod(tmp->d, 2*PS_PI);
+        tmp->r = fmod(tmp->r, 2*M_PI);
+        tmp->d = fmod(tmp->d, 2*M_PI);
         tmp->rErr = 0.0;
         tmp->dErr = 0.0;
@@ -760 +760 @@
         // Add offset and wrap to 0 to 2PI if necessary
         tmp->r = position->r + tmpR;
-        tmp->r = fmod(tmp->r, 2.0*PS_PI);
+        tmp->r = fmod(tmp->r, 2.0*M_PI);
         tmp->d = position->d + tmpD;
-        tmp->d = fmod(tmp->d, 2.0*PS_PI);
+        tmp->d = fmod(tmp->d, 2.0*M_PI);
         tmp->rErr = 0.0;
         tmp->dErr = 0.0;

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-19 02:13:53 $
+ *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-11 22:02:15 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -43 +43 @@
 
 /** Two times pi with double precision accuracy */
-#define TWOPI (2.0*PS_PI)
+#define TWOPI (2.0*M_PI)
 
 /** Conversion from radians to degrees */
-#define R2DEG = (180.0/PS_PI)
+#define R2DEG = (180.0/M_PI)
 
                 /** Maximum length of time string */
@@ -563 +563 @@
 
         t = 2000.0 + (mjd - 51544.03)/365.2422;
-        dut2ut1 = 0.022*sin(TWOPI*t) - 0.012*cos(TWOPI*t) - 0.006*sin(4.0*PS_PI*t) + 0.007*cos(4.0*PS_PI*t);
+        dut2ut1 = 0.022*sin(TWOPI*t) - 0.012*cos(TWOPI*t) - 0.006*sin(4.0*M_PI*t) + 0.007*cos(4.0*M_PI*t);
         result = dut->data.F64[0] + dut->data.F64[1]*(mjd - dut->data.F64[2]) - dut2ut1;
 
@@ -692 +692 @@
     }
 
-    // Create output sphere and convert arcsec to radians (i.e. x/60/60*PS_PI/180)
+    // Create output sphere and convert arcsec to radians (i.e. x/60/60*M_PI/180)
     output = psAlloc(sizeof(psSphere));
-    output->r = x * PS_PI / 648000.0;
-    output->d = y * PS_PI / 648000.0;
+    output->r = x * M_PI / 648000.0;
+    output->d = y * M_PI / 648000.0;
 
     return output;