Changeset 1491

Timestamp:

Aug 11, 2004, 1:53:54 PM (22 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psLib/src

Files:

• astro/psCoord.c (modified) (2 diffs)
• astronomy/psAstrometry.c (modified) (6 diffs)

trunk/psLib/src/astro/psCoord.c

@@ -1 @@
-
 /** @file  psCoord.c
 *
@@ -11 +10 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-11 20:07:44 $
+*  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-11 23:53:54 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/astronomy/psAstrometry.c

@@ -8 +8 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-11 23:25:18 $
+*  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-11 23:53:42 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -313 +313 @@
 
 /*****************************************************************************
-XXX: not done
+XXX: After I deproject the tangent plane to a sphere, do I have to do a
+spherical transformation to get it to the sky?
  *****************************************************************************/
 psSphere* psCoordCellToSkyQuick(psSphere* outSphere,
@@ -319 +320 @@
                                 const psCell* cell)
 {
-    psPlane* tmp1 = NULL;
+    psPlane *tpCoord = NULL;
+    psChip *chip = cell->parent;
+    psFPA *FPA = chip->parent;
+    psProjectionType oldProjectionType;
 
     if (outSphere == NULL) {
@@ -325 +329 @@
     }
 
-    tmp1 = psPlaneTransformApply(tmp1, cell->toSky, cellCoord);
-
-    // XXX: Do something to convert the linear coords in tmp1 to spherical
-    // coords in outSphere.
-
-    psFree(tmp1);
+    // Determine the tangent plane coordinates.
+    tpCoord = psPlaneTransformApply(tpCoord, cell->toTP, cellCoord);
+
+    // Save the old projection type and set the new projection type to TAN.
+    oldProjectionType = FPA->projection->type;
+    FPA->projection->type = PS_PROJ_TAN;
+
+    // Deproject the tangent plane coordinates a sphere.
+    outSphere = psDeproject(tpCoord, FPA->projection);
+
+    // Restore old projection type.  Free memory.
+    FPA->projection->type = oldProjectionType;
+    psFree(tpCoord);
 
     return (outSphere);
@@ -430 +441 @@
 
 /*****************************************************************************
-XXX: It is unclear how to perform this transformation.
+XXX: hmmm
  *****************************************************************************/
 psPlane* psCoordSkyToCellQuick(psPlane* cellCoord,
@@ -436 +447 @@
                                const psCell* cell)
 {
+    psPlane *tpCoord = NULL;
+    psChip *whichChip = cell->parent;
+    psFPA *whichFPA = whichChip->parent;
+    psProjectionType oldProjectionType;
+    psPlaneTransform *TPtoCell = NULL;
+
+    // Save the old projection type and set the new projection type to TAN.
+    oldProjectionType = whichFPA->projection->type;
+    whichFPA->projection->type = PS_PROJ_TAN;
+
     if (cellCoord == NULL) {
         cellCoord = (psPlane* ) psAlloc(sizeof(psPlane));
     }
 
+    tpCoord = psProject(skyCoord, whichFPA->projection);
+
+    // XXX: generate an error if cell->toTP is not linear.
+
+    // XXX: Invert cell->toTP, store in TPtoCell.
+    cellCoord = psPlaneTransformApply(cellCoord, TPtoCell, tpCoord);
+
+    // Restore old projection type.  Free memory.
+    whichFPA->projection->type = oldProjectionType;
+    psFree(tpCoord);
     return (cellCoord);
 }