Index: /trunk/archive/pslib/include/psAstrom.h
===================================================================
--- /trunk/archive/pslib/include/psAstrom.h	(revision 220)
+++ /trunk/archive/pslib/include/psAstrom.h	(revision 221)
@@ -14,24 +14,4 @@
 /* Include polynomial definitions */
 #include "psFunctions.h"
-
-/***********************************************************************************************************/
-
-/**
- * Astrometry coefficients.
- * These are composed of:
- * (1) Coefficients in x and y --- a general spatial fit.
- * (2) Coefficients in x and y for each polynomial order in magnitude, e.g. one set of coefficients in x and
- * y for mag^1, another set of coefficients in x and y for mag^2.
- * (3) Coefficients in x and y for each polynomial order in colour.
- */
-typedef struct {
-    psDPolynomial2D *restrict ra, dec;	//!< Spatial coefficients, i.e. x and y
-    int magOrder;			//!< Order of polynomial in magnitude
-    psDPolynomial2D *restrict raMag, decMag; //!< An ARRAY of polynomials for each polynomial order in
-					     //!< magnitude
-    int colorOrder;			//!< Order of polynomial in colour
-    psDPolynomial2D *restrict raCol, decCol; //!< An ARRAY of polynomials for each polynomial order in colour
-    enum psColorRef colorRef;		//!< Colour reference
-} psAstromCoeffs;
 
 
@@ -169,6 +149,8 @@
 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
+    psDPolynomial4D *restrict tpToFPX, *restrict tpToFPY; //!< General astrometric solution for tangent plane
+							  //!< to focal plane
+    psDPolynomial4D *restrict fpToTPXi, *restrict fpToTPEta; //!< General astrometric solution for focal plane
+							     //!< to tangent plane
     psMatrix *pattern;		        //!< Fixed pattern distortions for focal plane to tangent plane (simply
 					//!< * -1 for the reverse); MAY NEED TO BE REVISED UPON IMPLEMENTATION
@@ -176,4 +158,5 @@
     psDoubleArray *restrict tp;		//!< Data needed to convert from the sky to the tangent plane and back;
 					//!< produced by and used by SLALib (a.k.a. "Wallace's Grommit")
+    enum psColorrRef colorRef;		//!< Colour reference
     /* Characterisation of the solution */
     float rmsX, rmsY;		        //!< Dispersion in astrometric solution