Index: trunk/psastro/src/psastro.h
===================================================================
--- trunk/psastro/src/psastro.h	(revision 5565)
+++ trunk/psastro/src/psastro.h	(revision 5575)
@@ -11,5 +11,7 @@
 # define toSky projection
 
-bool              pmCellInterpretWCS (pmCell *cell, psMetadata *header) ;
+bool              pmAstromReadWCS (psPlaneTransform **toFPA, psProjection **toSky, psMetadata *header);
+bool              pmAstromWriteWCS (psPlaneTransform *toFPA, psProjection *toSky, psMetadata *header);
+
 pmFPA            *pmFPACopyAstrom (pmFPA *inFPA);
 psMetadata       *psastroArguments (int *argc, char **argv);
@@ -21,13 +23,13 @@
 bool              psastroWriteCMP (pmFPA *fpa, char *filename);
 
-psMetadata *testArguments (int *argc, char **argv);
 
-psPlane *psCoordReadoutToCell (psPlane *cellpix, psPlane *readpix, pmReadout *readout);
-psPlane *psCoordCellToReadout (psPlane *readpix, psPlane *cellpix, pmReadout *readout);
-psPlane* psCoordChipToCell_EAM(psPlane* cellCoord, const psPlane* chipCoord, const pmCell* cell);
+psPlane          *psCoordReadoutToCell (psPlane *cellpix, psPlane *readpix, pmReadout *readout);
+psPlane 	 *psCoordCellToReadout (psPlane *readpix, psPlane *cellpix, pmReadout *readout);
+psPlane 	 *psCoordChipToCell_EAM(psPlane* cellCoord, const psPlane* chipCoord, const pmCell* cell);
 
-bool testWriteCMP (psMetadata *header, char *filename, psArray *sources);
-bool testWriteRef (char *filename, psArray *sources);
-bool testWriteRaw (char *filename, psArray *sources);
+bool 		  testWriteCMP (psMetadata *header, char *filename, psArray *sources);
+bool 		  testWriteRef (char *filename, psArray *sources);
+bool 		  testWriteRaw (char *filename, psArray *sources);
+psMetadata       *testArguments (int *argc, char **argv);
 
 bool 		  psastroProjectFPA (pmFPA *fpa, char *starlist, bool toSky);
@@ -35,10 +37,4 @@
 bool 		  psastroProjectRefstars (psArray *stars, pmReadout *readout);
 
-psPlane* psCoordChipToCell_EAM(
-    psPlane* out,                      ///< a plane struct to recycle. If NULL, a new struct is created
-    const psPlane* in,                 ///< the Chip coordinate
-    const pmCell* cell                 ///< the cell of interest
-);
-
 psPlaneTransform *p_psPlaneTransformLinearInvert_EAM(psPlaneTransform *transform);
-pmFPA *pmFPACopyAstrom (pmFPA *inFPA);
+pmFPA            *pmFPACopyAstrom (pmFPA *inFPA);