Changeset 5553 for trunk/psModules/src/astrom

Timestamp:

Nov 18, 2005, 3:11:03 PM (20 years ago)

Author:

gusciora

Message:

Coded the cell->toSky Quick routine.

File:

• trunk/psModules/src/astrom/pmAstrometry.c (modified) (4 diffs)

trunk/psModules/src/astrom/pmAstrometry.c

@@ -8 +8 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-11-19 00:55:18 $
+*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-11-19 01:11:03 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -559 +559 @@
 
 // XXX: This has not been tested.
-// XXX: How do we get sphere coods from the cell->toSky plane transform?
+// XXX: Verify the plane coords to sphere coord code.
 psSphere* pmCoordCellToSkyQuick(
     psSphere* outSphere,
@@ -568 +568 @@
     PS_ASSERT_PTR_NON_NULL(cell, NULL);
     PS_ASSERT_PTR_NON_NULL(cell->toSky, NULL);
-
-    //    return(psPlaneTransformApply(outSphere, cell->toSky, cellCoord));
-    psLogMsg(__func__, PS_LOG_WARN,
-             "WARNING: psCoordCellToSkyQuick(): This function is not fully specified in the SDRS.  Returning NULL.\n");
+    psPlane outPlane;
+    psPlaneTransformApply(&outPlane, cell->toSky, cellCoord);
+    psSphere *out = outSphere;
+    if (out == NULL) {
+        out = psSphereAlloc();
+    }
+    out->r = outPlane.y;
+    out->d = outPlane.x;
+
     return(NULL);
+}
+
+/*****************************************************************************
+XXX: What about units for the (x,y) coords?
+ 
+XXX: This has not been tested.
+ 
+XXX: Verify the plane coords to sphere coord code.
+ *****************************************************************************/
+psPlane* pmCoordSkyToCellQuick(
+    psPlane* cellCoord,
+    const psSphere* skyCoord,
+    const pmCell* cell)
+{
+    PS_ASSERT_PTR_NON_NULL(skyCoord, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->toSky, NULL);
+    psPlane skyPlane;
+    skyPlane.y = skyCoord->r;
+    skyPlane.x = skyCoord->d;
+
+    return(psPlaneTransformApply(cellCoord, cell->toSky, &skyPlane));
 }
 
@@ -656 +683 @@
 }
 
-
-/*****************************************************************************
-XXX: What about units for the (x,y) coords?
- 
-XXX: This has not been tested.
- 
-XXX: How do we get sphere coods from the cell->toSky plane transform?
- *****************************************************************************/
-psPlane* pmCoordSkyToCellQuick(
-    psPlane* cellCoord,
-    const psSphere* skyCoord,
-    const pmCell* cell)
-{
-    PS_ASSERT_PTR_NON_NULL(skyCoord, NULL);
-    PS_ASSERT_PTR_NON_NULL(cell, NULL);
-    PS_ASSERT_PTR_NON_NULL(cell->toSky, NULL);
-
-    //    return(p_psProject(cellCoord, skyCoord, cell->toSky));
-    psLogMsg(__func__, PS_LOG_WARN,
-             "WARNING: psCoordCellToSkyQuick(): This function is not fully specified in the SDRS.  Returning NULL.\n");
-    return(NULL);
-}
-//This code will