Changeset 1543

Timestamp:

Aug 13, 2004, 3:51:11 PM (22 years ago)

Author:

gusciora

Message:

...

File:

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

trunk/psLib/src/astronomy/psAstrometry.c

@@ -8 +8 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-13 23:43:29 $
+*  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-14 01:51:11 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -560 +560 @@
     }
 
-    // Determine which chip contains these FPA coordinates.
-    psChip *newChip = psChipInFPA(fpaCoord, FPA);
-    if (newChip == NULL) {
-        return(NULL);
-    }
-
-    chipCoord = psPlaneTransformApply(chipCoord, newChip->fromFPA, fpaCoord);
-    psFree(newChip);
+    chipCoord = psPlaneTransformApply(chipCoord, chip->fromFPA, fpaCoord);
+
     return(chipCoord);
 }
@@ -587 +581 @@
     }
 
-    // Determine which cell contains these FPA coordinates.
-    psCell *newCell = psCellInChip(chipCoord, chip);
-    if (newCell == NULL) {
-        return(NULL);
-    }
-
-    cellCoord = psPlaneTransformApply(cellCoord, newCell->fromChip, chipCoord);
-    psFree(newCell);
+    cellCoord = psPlaneTransformApply(cellCoord, cell->fromChip, chipCoord);
+
     return(cellCoord);
 }
 
-/*****************************************************************************
-XXX: Should we do anything to determine which cell contains the coordinates?
- *****************************************************************************/
 psPlane* psCoordSkyToCell(psPlane* cellCoord,
                           const psSphere* skyCoord,
@@ -638 +623 @@
 }
 
-/*****************************************************************************
-XXX: Should we do anything to determine which cell contains the coordinates?
- *****************************************************************************/
 psPlane* psCoordSkyToCellQuick(psPlane* cellCoord,
                                const psSphere* skyCoord,