Index: trunk/archive/pslib/include/psAstrom.h
===================================================================
--- trunk/archive/pslib/include/psAstrom.h	(revision 214)
+++ trunk/archive/pslib/include/psAstrom.h	(revision 216)
@@ -10,28 +10,8 @@
 /* Include colour definitions */
 #include "psColour.h"
+/* Include matrix definitions */
 #include "psMatrix.h"
-
-
-
-/***********************************************************************************************************/
-
-/** Astrometric coefficients.
- * First twelve coefficients are: const, x, y, x*x, x*y, y*y, x*x*x, x*x*y, x*y*y, y*y*y, mag, color
- */
-typedef struct {
-    psDoubleArray *restrict coeff;	//!< Coefficients of astrometric solution
-    psDoubleArray *restrict coeffErr;	//!< Error in coefficients
-    psBitMask *restrict coeffMask;	//!< Use this coefficient?
-    psColourRef colourRef;	        //!< Colour reference
-} psAstromCoeffs;
-
-/** Constructor */
-psAstromCoeffs *
-psAstromCoeffsAlloc(void);
-
-/** Destructor */
-void
-psAstromCoeffsFree(psAstromCoeffs *restrict myAstromCoeffs //!< Object to destroy
-    );
+/* Include polynomial definitions */
+#include "psFunctions.h"
 
 /***********************************************************************************************************/
@@ -163,11 +143,12 @@
  * must calculate for each tangent point.
  *
- * Coordinate frames 2 and 3 are hidden from the user because all they care about is going between frames 1
- * and 4.
+ * Coordinate frames 2 and 3 are generally hidden from the user because all they care about is going between
+ * frames 1 and 4.
  */
 typedef struct {
     /* Focal plane to and from tangent plane */
-    psAstromCoeffs *restrict tpToFP;	//!< General astrometric solution for tangent plane to focal plane
-    psAstromCoeffs *restrict fpToTP;	//!< General astrometric solution for focal plane to tangent plane
+    psDPolynomial2D *restrict tpToFP;	//!< General astrometric solution for tangent plane to focal plane
+    psDPolynomial2D *restrict fpToTP;	//!< General astrometric solution for focal plane to tangent plane
+    enum psColorRef colorRef;		//!< Colour reference
     psMatrix *pattern;		        //!< Fixed pattern distortions for focal plane to tangent plane (simply
 					//!< * -1 for the reverse); MAY NEED TO BE REVISED UPON IMPLEMENTATION