Index: trunk/psModules/src/astrom/pmAstrometryObjects.h
===================================================================
--- trunk/psModules/src/astrom/pmAstrometryObjects.h	(revision 10780)
+++ trunk/psModules/src/astrom/pmAstrometryObjects.h	(revision 10829)
@@ -8,6 +8,6 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-12-17 09:45:20 $
+*  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-12-25 01:49:49 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -79,14 +79,23 @@
 pmAstromStats;
 
-/*
- *
- * If the two sets of coordinates are expected to agree very well (ie, the
- * current best-guess astrometric solution is quite close to the radius. The
- * following function accepts two sets of pmAstromObj sources and determines the
- * matched objects between the two lists. The input sources must have been
- * projected to the Focal Plane coordinates (pmAstromObj.FP), and the supplied
- * options entry must contain the desired match radius (keyword:
- * ASTROM.MATCH.RADIUS). The output consists an array of pmAstromMatch values,
- * defined below.
+typedef struct
+{
+    psStats *xStats;
+    psStats *yStats;
+    int     nMatch;                     ///<
+    double  nSigma;                     ///<
+}
+pmAstromFitResults;
+
+/*
+ *
+ * If the two sets of coordinates are expected to agree very well (ie, the current best-guess
+ * astrometric solution is quite close to reality), perform a match based on a simple radius
+ * test. The following functions accept two sets of pmAstromObj sources and determines the
+ * matched objects between the two lists using coordinates of the desired depth (depending on
+ * the function). The input and reference sources must have been projected to the desired depth
+ * (eg, for Focal Plane coordinates, to pmAstromObj.FP).  The specified radius must be in the
+ * units for the matching depth (chip: pixels, focal plane: microns, tangent plane:
+ * degrees. The output consists an array of pmAstromMatch values, defined above.
  *
  */
@@ -94,15 +103,20 @@
     const psArray *st1,
     const psArray *st2,
-    const psMetadata *config
+    double RADIUS
+);
+psArray *pmAstromRadiusMatchFP(
+    const psArray *st1,
+    const psArray *st2,
+    double RADIUS
 );
 psArray *pmAstromRadiusMatchTP(
     const psArray *st1,
     const psArray *st2,
-    const psMetadata *config
+    double RADIUS
 );
 psArray *pmAstromRadiusMatchChip(
     const psArray *st1,
     const psArray *st2,
-    const psMetadata *config
+    double RADIUS
 );
 
@@ -270,4 +284,5 @@
  */
 
+pmAstromFitResults *pmAstromFitResultsAlloc(void);
 
 /*
@@ -312,11 +327,10 @@
  *
  */
-bool pmAstromMatchFit(
+pmAstromFitResults *pmAstromMatchFit(
     psPlaneTransform *map,
-    psArray *st1,
-    psArray *st2,
+    psArray *raw,
+    psArray *ref,
     psArray *match,
-    psMetadata *config,
-    psMetadata *updates
+    psStats *stats
 );