Changeset 1515 for trunk/psLib/src/astronomy/psAstrometry.c

Timestamp:

Aug 11, 2004, 8:42:42 PM (22 years ago)

Author:

gusciora

Message:

...

File:

• trunk/psLib/src/astronomy/psAstrometry.c (modified) (5 diffs)

trunk/psLib/src/astronomy/psAstrometry.c

@@ -8 +8 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-12 05:36:53 $
+*  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-12 06:42:42 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -285 +285 @@
 }
 
-// XXX: must wrap SLA_QAPQK here.
+extern void sla_AOPQK(double RAP, double DAP, double *AOPRMS,
+                          double *AOB, double *ZOB, double *HOB, double *DOB,
+                          double *ROB);
+/*****************************************************************************
+XXX: What about units for the (x,y) coords?
+ *****************************************************************************/
 psSphere* psCoordTPToSky(psSphere* outSphere,
                          const psPlane* tpCoord,
                          const psGrommit* grommit)
 {
+    double AOB = 0.0;
+    double ZOB = 0.0;
+    double HOB = 0.0;
+
     if (tpCoord == NULL) {
         psAbort(__func__, "input parameter tpCoord is NULL.");
@@ -300 +309 @@
     }
 
-    /*
-     * double RAP; double DAP;
-     * 
-     * extern void sla_OAPQK(TYPE, OB1, OB2, AOPRMS, RAP, DAP); 
-     * sla_OAPQK(TYPE, OB1, OB2, *grommit, &RAP, &DAP);
-     */
+    sla_AOPQK(tpCoord->x, tpCoord->y, (double *) grommit,
+              &AOB, &ZOB, &HOB, &outSphere->r, &outSphere->d);
 
     return (outSphere);
@@ -403 +408 @@
 }
 
-/*****************************************************************************
-XXX: must wrap SLA_AOPQK here.
+extern void sla_OAPQK(char *TYPE, double OB1, double OB2,
+                          double *AOPRMS, double *RAP, double *DAP);
+/*****************************************************************************
+XXX: What about units for the (x,y) coords?
  *****************************************************************************/
 psPlane* psCoordSkyToTP(psPlane* tpCoord,
@@ -416 +423 @@
         psAbort(__func__, "input parameter grommit is NULL.");
     }
-
-    /*
-        extern void sla_AOPQK(RAP, DAP, AOPRMS, AOB, ZOB, HOB, DOB, ROB);
-        double AOB;
-        double ZOB;
-        double HOB;
-        double DOB;
-        double ROB;
-     
-        if (tpCoord == NULL) {
-            tpCoord = (psPlane* ) psAlloc(sizeof(psPlane));
-        }
-     
-        sla_AOPQK(psSphere->r, psSphere->d, *grommit, &AOB, &ZOB, &HOB, &DOB, &ROB);
-        tpCoord->x = XXX;
-        tpCoord->y = XXX;
-        return (tpCoord);
-    */
-    return(NULL);
+    if (tpCoord == NULL) {
+        tpCoord = (psPlane* ) psAlloc(sizeof(psPlane));
+    }
+
+    sla_OAPQK("RA", in->r, in->d, (double *) grommit, &tpCoord->x, &tpCoord->y);
+
+    return(tpCoord);
 }