Index: trunk/archive/pslib/include/psAstrom.h
===================================================================
--- trunk/archive/pslib/include/psAstrom.h	(revision 160)
+++ trunk/archive/pslib/include/psAstrom.h	(revision 198)
@@ -10,4 +10,5 @@
 /* Include colour definitions */
 #include "psColour.h"
+#include "psMatrix.h"
 
 
@@ -21,5 +22,5 @@
     int xyColourOrder;		        //!< Spatial (x,y) order of polynomial in colour times x and y
     int xyMagOrder;		        //!< Spatial (x,y) order of polynomial in magnitude times x and y
-    enum psColourRef colourRef;	        //!< Colour reference
+    psColourRef colourRef;	        //!< Colour reference
     psDoubleArray *restrict coeff;	//!< Coefficients of astrometric solution
     psDoubleArray *restrict coeffErr;	//!< Error in coefficients
@@ -28,10 +29,10 @@
 /** Constructor */
 psAstromCoeffs *
-psAstromCoeffsAlloc(int xyOrder,		//!< Spatial (x,y) order of polynomial
-		  int colourOrder,	//!< Order of polynomial in colour
-		  int magOrder,		//!< Order of polynomial in magnitude
-		  int xyColourOrder,	//!< Spatial (x,y) order of polynomial in colour times x and y
-		  int xyMagOrder,	//!< Spatial (x,y) order of polynomial in magnitude times x and y
-		  enum psColourRef colourRef //!< Colour reference
+psAstromCoeffsAlloc(int xyOrder,	//!< Spatial (x,y) order of polynomial
+		    int colourOrder,	//!< Order of polynomial in colour
+		    int magOrder,	//!< Order of polynomial in magnitude
+		    int xyColourOrder,	//!< Spatial (x,y) order of polynomial in colour times x and y
+		    int xyMagOrder,	//!< Spatial (x,y) order of polynomial in magnitude times x and y
+		    psColourRef colourRef //!< Colour reference
     );
 
@@ -112,5 +113,5 @@
     float rotation;			//!< Rotation of OTA on the focal plane.  Specified from +x through +y
     psCellDescriptionArray *restrict cells; //!< Cell descriptions
-    psOTAAstrom *astrom;		//!< OTA astrometry
+    struct psOTAAstrom *astrom;		    //!< OTA astrometry
 } psOTADescription;
 
@@ -157,11 +158,11 @@
 
 /** Constructor */
-psAstrom *
-psAstromAlloc(const psTelPointing *telescope //!< Telescope pointing, used to initialise the tp data.
-    );
-
-/** Destructor */
-void
-psAstromFree(psAstrom *restrict myAstrom	//!< Object to destroy
+psOTAAstrom *
+psOTAAstromAlloc(const psTelPointing *telescope //!< Telescope pointing, used to initialise the tp data.
+    );
+
+/** Destructor */
+void
+psOTAAstromFree(psOTAAstrom *restrict myAstrom	//!< Object to destroy
     );
 
@@ -204,5 +205,5 @@
 float
 psGetParallactic(const psSkyPos *restrict position, //!< Position on the sky
-		 real siderealTime	//!< Sidereal time
+		 float siderealTime	//!< Sidereal time
 		 );
 
@@ -210,5 +211,5 @@
 float
 psGetRefraction(float colour,		//!< Colour of object
-		enum psColourRef colourRef; //!< Colour reference
+		psColourRef colourRef,	//!< Colour reference
 		psTelPointing telescope	//!< Telescope pointing information, for airmass, temp and pressure
     );