Index: trunk/psastro/src/psastro.h
===================================================================
--- trunk/psastro/src/psastro.h	(revision 5509)
+++ trunk/psastro/src/psastro.h	(revision 5560)
@@ -3,5 +3,13 @@
 # include <unistd.h>   // for unlink
 # include <pslib.h>
+# include <pmAstrometry.h>
+# include "psLibUtils.h"
+# include "pmAstrom.h"
 
+# define fromTPA fromTangentPlane
+# define toTPA toTangentPlane
+# define toSky projection
+
+# if (0)
 typedef struct
 {
@@ -19,4 +27,5 @@
     psPlaneTransform *fromFPA;          ///< Transformation from FPA to chip coordinates
     psArray *cells;                     ///< The cells
+    pmFPA *fpa;
 }
 pmChip;
@@ -28,4 +37,5 @@
     psArray *readouts;                  ///< The readouts (referred to by number)
     psMetadata *header;                 ///< header always corresponds to a cell
+    pmChip *chip;
 }
 pmCell;
@@ -39,11 +49,43 @@
     int rowBins;                        ///< Amount of binning in y-dimension
     psArray *stars;			///< sources detected / measured on readout
+    pmCell *cell;
 }
 pmReadout;
+# endif
 
-// dummy structure for template code (psFooAlloc, etc)
-typedef struct
-{
-    int i;
-} 
-psFoo;
+pmAstromStats     pmAstromGridAngle (psArray *st1, psArray *st2, psMetadata *config);
+psPlaneTransform *pmAstromGridApply (psPlaneTransform *map, pmAstromStats stat);
+pmAstromStats     pmAstromGridMatch (psArray *st1, psArray *st2, psMetadata *config);
+int               pmAstromObjSortByMag (const void **a, const void **b);
+bool              pmCellInterpretWCS (pmCell *cell, psMetadata *header) ;
+pmFPA            *pmFPACopyAstrom (pmFPA *inFPA);
+psMetadata       *psastroArguments (int *argc, char **argv);
+pmFPA            *psastroBuildFPA (psMetadata *header, psArray *stars);
+bool 		  psastroChipAstrom (pmFPA *fpa, psMetadata *config);
+psArray          *psastroLoadReference (psMetadata *header, psMetadata *config);
+psArray          *psastroReadCMP (psMetadata **header, char *filename);
+bool              psastroSelectBrightStars (pmFPA *fpa, psMetadata *config);
+bool              psastroWriteCMP (pmFPA *fpa, char *filename);
+
+psMetadata *testArguments (int *argc, char **argv);
+
+# if (0)
+pmFPA            *pmFPAAlloc (void);
+pmChip           *pmChipAlloc (void);
+pmCell           *pmCellAlloc (void);
+pmReadout        *pmReadoutAlloc (void);
+# endif
+
+# define SIGN(X)  (((X) == 0) ? 0 : ((fabs((double)(X))) / (X)))
+
+psPolynomial2D *psPolynomial2DCopy (psPolynomial2D *input);
+psPolynomial4D *psPolynomial4DCopy (psPolynomial4D *input);
+psPlaneDistort *psPlaneDistortCopy (psPlaneDistort *input);
+psPlaneTransform *psPlaneTransformCopy (psPlaneTransform *input);
+psProjection *psProjectionCopy (psProjection *input);
+psPlane *psCoordReadoutToCell (psPlane *cellpix, psPlane *readpix, pmReadout *readout);
+psPlane *psCoordCellToReadout (psPlane *readpix, psPlane *cellpix, pmReadout *readout);
+double psPlaneTransformGetRotation (psPlaneTransform *map);
+
+psPlaneDistort *psPlaneDistortInvert(psPlaneDistort *distort);
+psPlaneTransform *psPlaneTransformLinearInvert(psPlaneTransform *transform);