Changeset 5557

Timestamp:

Nov 21, 2005, 9:34:44 AM (21 years ago)

Author:

magnier

Message:

implemented psCoordSkyToTP and psCoordTPToSky

Location:

branches/eam_rel8_b0/psModules/src/astrom

Files:

• pmAstrometry.c (modified) (3 diffs)
• pmAstrometry.h (modified) (2 diffs)

branches/eam_rel8_b0/psModules/src/astrom/pmAstrometry.c

@@ -8 +8 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-28 20:43:52 $
+*  @version $Revision: 1.1.4.1 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-11-21 19:34:44 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -458 +458 @@
 
     // XXX: this was done by a SLALIB call -- needs to be reimplemented
-    psWarning("Warning!  psCoordTPToSky functionality is no longer implemented");
+    // psWarning("Warning!  psCoordTPToSky functionality is no longer implemented");
     // slaAopqk(tpCoord->x, tpCoord->y, (double*)grommit,
     //         &AOB, &ZOB, &HOB, &outSphere->r, &outSphere->d);
+
+    // XXX EAM : basic TPToSky is performed by applying the projection
+    //           when the EOC code is ready, the full atmosphere, precession, nutation
+    //           model can be applied.
+
+    // XXX EAM : psDeproject needs to have a psSphere *out argument:
+    //           psPlane* psProject(psSphere *out, const psPlane *coord, const psProjection *projection);
+
+    psSphere *tmp = psDeproject (tpCoord, projection);
+    *outSphere = *tmp;
+    psFree (tmp);
 
     return (outSphere);
@@ -586 +597 @@
 
     // XXX: this was done by a SLALIB call -- needs to be reimplemented
-    psWarning("Warning!  psCoordSkyToTP functionality is no longer implemented");
+    // psWarning("Warning!  psCoordSkyToTP functionality is no longer implemented");
     // slaOapqk(type, in->r, in->d, (double*)grommit, &tpCoord->x, &tpCoord->y);
+
+    psPlane *tmp = psProject (in, projection);
+    *tpCoord = *tmp;
+    psFree (tmp);
 
     return(tpCoord);

branches/eam_rel8_b0/psModules/src/astrom/pmAstrometry.h

@@ -8 +8 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-28 20:43:52 $
+*  @version $Revision: 1.1.4.1 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-11-21 19:34:44 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -391 +391 @@
 );
 
-
 /** Translate a sky coordinate into a cell coordinate
  *