Index: trunk/psastro/src/pmAstrom.h
===================================================================
--- trunk/psastro/src/pmAstrom.h	(revision 5510)
+++ trunk/psastro/src/pmAstrom.h	(revision 5560)
@@ -3,6 +3,5 @@
 # include <unistd.h>   // for unlink
 # include <pslib.h>
-
-psArray *pmAstromGridMatch (psArray *s1, psArray *s2, pmAstromGridMatchOpt *opt);
+# include <pmAstrometry.h>
 
 typedef struct {
@@ -22,16 +21,30 @@
 
 typedef struct {
-    double minAngle;
-    double maxAngle;
-    double delAngle;
-} pmAstromOpt;
-
-typedef struct {
     psPlane center;
     psPlane offset;
-    double angle;
-    double minMetric;
-    double minVar;
-    int    nMatch;
-} pmAstromGridMatchStats;
+    double  angle;
+    double  minMetric;
+    double  minVar;
+    int     nMatch;
+} pmAstromStats;
 
+pmAstromObj 	 *pmAstromObjAlloc (void);
+pmAstromObj 	 *pmAstromObjCopy (pmAstromObj *old);
+pmAstromMatch    *pmAstromMatchAlloc (int i1, int i2);
+psArray          *pmAstromRadiusMatch (psArray *st1, psArray *st2, psMetadata *config);
+psArray          *pmAstromRotateObj (psArray *old, psPlane center, double angle);
+psPlaneTransform *pmAstromMatchFit (psPlaneTransform *map, psArray *st1, psArray *st2, psArray *match, psMetadata *config);
+
+int               pmAstromObjSortByFPX (const void **a, const void **b);
+
+bool 		  psastroProjectFPA (pmFPA *fpa, char *starlist, bool toSky);
+bool 		  psastroProjectRawstars (psArray *stars, pmReadout *readout);
+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);