Changeset 3000 for trunk/psLib/src/astronomy

Timestamp:

Jan 14, 2005, 1:27:56 PM (22 years ago)

Author:

gusciora

Message:

Replace ADD projections with mathworks formulas.

Location:

trunk/psLib/src/astronomy

Files:

• psAstrometry.c (modified) (2 diffs)
• psCoord.c (modified) (3 diffs)

trunk/psLib/src/astronomy/psAstrometry.c

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-14 01:13:15 $
+ *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-14 23:27:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -310 +310 @@
     exp->observatory = psMemIncrRefCounter((psPtr)observatory);
 
-    // XXX: how is these value derived?
+    // XXX: how is this value derived?
     *(double *)&exp->lst = psTimeToLST((psTime*)time,observatory->longitude);
     *(float *)&exp->positionAngle = 0.0f; // XXX: need input, see Bug #207

trunk/psLib/src/astronomy/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-01-13 22:45:28 $
+*  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-01-14 23:27:55 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -333 +333 @@
          
         */
-
         // ********************************************
         // From the mathworks: http://mathworld.wolfram.com/GnomonicProjection.html
@@ -431 +430 @@
         // delta_0 and phi_1 are the projection centers, not the point being projected.
         // (delta_0, phi_1) == (projection->R, projection->D)
+        // XXX: figure out how to use the two-argument atan2() here.
         // ********************************************
         psF32 row = PS_SQRT_F32((coord->x * coord->x) + (coord->y * coord->y));
         psF32 C = atan(row);
-        tmp->d = asin((cos(C) * sin(projection->D)) + ((coord->y * sin(C) * cos(projection->D)) / row));
+        tmp->d = asin((cos(C) * sin(projection->D)) +
+                      ((coord->y * sin(C) * cos(projection->D)) / row));
         psF32 tmpAtan = atan((coord->x * sin(C)) /
-                             ((row * cos(projection->D) * cos(C)) - (coord->y * sin(projection->D) * sin(C))));
+                             ((row * cos(projection->D) * cos(C)) -
+                              (coord->y * sin(projection->D) * sin(C))));
         tmp->r = projection->R + tmpAtan;