Index: trunk/psModules/src/astrom/pmAstrometry.c
===================================================================
--- trunk/psModules/src/astrom/pmAstrometry.c	(revision 5609)
+++ trunk/psModules/src/astrom/pmAstrometry.c	(revision 5674)
@@ -10,7 +10,9 @@
 * XXX: We should review the extent of the warning messages on these functions
 * when the transformations are not successful.
-*
-*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-11-27 19:28:56 $
+* 
+* XXX: Should we implement non-linear cell->chip transforms?
+* 
+*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-12-05 20:49:30 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -23,5 +25,4 @@
 #include <math.h>
 #include "pslib.h"
-#include "psDB.h"
 #include "pmAstrometry.h"
 
@@ -34,7 +35,8 @@
 XXX: Macro this for speed.
  *****************************************************************************/
-static psS32 checkValidImageCoords(double x,
-                                   double y,
-                                   psImage* tmpImage)
+static psS32 checkValidImageCoords(
+    double x,
+    double y,
+    psImage* tmpImage)
 {
     PS_ASSERT_IMAGE_NON_NULL(tmpImage, 0);
@@ -51,4 +53,5 @@
 /******************************************************************************
  *****************************************************************************/
+#define PS_FREE_HIERARCHY 1
 static void readoutFree(pmReadout *readout)
 {
@@ -77,5 +80,4 @@
 }
 
-#define PS_FREE_HIERARCHY 1
 static void cellFree(pmCell *cell)
 {
@@ -255,5 +257,5 @@
 }
 
-bool cellCheckParents(pmCell *cell)
+static psBool cellCheckParents(pmCell *cell)
 {
     if (cell == NULL) {
@@ -273,5 +275,5 @@
 }
 
-bool chipCheckParents(pmChip *chip)
+static psBool chipCheckParents(pmChip *chip)
 {
     if (chip == NULL) {
@@ -293,5 +295,5 @@
 }
 
-bool pmFPACheckParents(pmFPA *fpa)
+psBool pmFPACheckParents(pmFPA *fpa)
 {
     if (fpa == NULL) {
@@ -617,8 +619,5 @@
 
 /*****************************************************************************
-XXX: What about units for the (x,y) coords?
- 
-XXX: This has not been tested.
- *****************************************************************************/
+  *****************************************************************************/
 psSphere* pmCoordTPToSky(
     psSphere* outSphere,
@@ -635,8 +634,6 @@
     return(rc);
 }
+
 /*****************************************************************************
-XXX: What about units for the (x,y) coords?
- 
-XXX: This has not been tested.
  *****************************************************************************/
 psPlane* pmCoordSkyToTP(
@@ -655,7 +652,6 @@
 }
 
-
-// XXX: Should we check return codes of intermediate transforms?
-// XXX: This has not been tested.
+/*****************************************************************************
+ *****************************************************************************/
 psSphere* pmCoordCellToSky(
     psSphere* skyCoord,
@@ -700,4 +696,6 @@
 }
 
+/*****************************************************************************
+ *****************************************************************************/
 psPlane* pmCoordSkyToCell(
     psPlane* cellCoord,
@@ -749,6 +747,6 @@
 }
 
-// XXX: This has not been tested.
-// XXX: Verify the plane coords to sphere coord code.
+/*****************************************************************************
+ *****************************************************************************/
 psSphere* pmCoordCellToSkyQuick(
     psSphere* outSphere,
@@ -778,9 +776,4 @@
 
 /*****************************************************************************
-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(