Index: trunk/archive/pslib/include/psObject.h
===================================================================
--- trunk/archive/pslib/include/psObject.h	(revision 251)
+++ trunk/archive/pslib/include/psObject.h	(revision 344)
@@ -11,15 +11,15 @@
 /** Object definition, to handle both objects we detect, and catalogues */
 typedef struct {
-    psCoord *cell;			//!< Centre position on Cell, with associated error
-    psCoord *sky;			//!< Position on the sky, with associated error
-    float mag, magErr;			//!< Magnitude and associated error
-    float isoMag, isoMagErr;		//!< Isophotal magnitude and associated error
-    float fwhm, fwhmErr;		//!< FWHM and associated error
-    float ellipA, ellipB;		//!< Elliptical semi-major (A) and semi-minor (B) axes
-    float ellipAngle;			//!< Ellipse position angle
-    float sky, skyErr;			//!< Local sky level, and associated error
-    float colour, colourErr;		//!< Colour and associated error, if known
-    psPhotSysrem colorPlus, colorMinus;	//!< Colour reference
-    psBitMask *quality;			//!< Bit mask for quality information
+    psCoord *cell;			///< Centre position on Cell, with associated error
+    psCoord *sky;			///< Position on the sky, with associated error
+    float mag, magErr;			///< Magnitude and associated error
+    float isoMag, isoMagErr;		///< Isophotal magnitude and associated error
+    float fwhm, fwhmErr;		///< FWHM and associated error
+    float ellipA, ellipB;		///< Elliptical semi-major (A) and semi-minor (B) axes
+    float ellipAngle;			///< Ellipse position angle
+    float sky, skyErr;			///< Local sky level, and associated error
+    float colour, colourErr;		///< Colour and associated error, if known
+    psPhotSysrem colorPlus, colorMinus;	///< Colour reference
+    psBitMask *quality;			///< Bit mask for quality information
     psCell *parentCell;			///< Cell this measurement came from
 } psObject;
@@ -37,20 +37,20 @@
 /** An assembly of objects */
 typedef struct {
-    psType type;			//!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
-    int size;				//!< Total number of elements available
-    int n;				//!< Number of elements in use
-    psObject *arr;			//!< The array data
+    psType type;			///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
+    int size;				///< Total number of elements available
+    int n;				///< Number of elements in use
+    psObject *arr;			///< The array data
 } psObjectArray;
 
 /** Constructor */
-psObjectArray *psObjectArrayAlloc(int s, //!< Total number of elements to make available
-				  int n	//!< Number of elements that will be used
+psObjectArray *psObjectArrayAlloc(int s, ///< Total number of elements to make available
+				  int n	///< Number of elements that will be used
     );
 /** Reallocator */
-psObjectArray *psObjectArrayRealloc(psObjectArray *myArray, //!< Array to reallocate
-				    int s //!< Total number of elements to make available
+psObjectArray *psObjectArrayRealloc(psObjectArray *myArray, ///< Array to reallocate
+				    int s ///< Total number of elements to make available
     );
 /** Destructor */
-void psObjectArrayFree(psObjectArray *restrict myArray //!< Array to free
+void psObjectArrayFree(psObjectArray *restrict myArray ///< Array to free
     );
 
@@ -59,17 +59,17 @@
 /** Associates objects on an image with the image */
 typedef struct {
-    const struct psImage *image;	//!< Image that produced the objects, which has metadata we need
-    psObjectArray *objects;		//!< The objects
+    const struct psImage *image;	///< Image that produced the objects, which has metadata we need
+    psObjectArray *objects;		///< The objects
 } psImageObjects;
 
 /** Constructor */
 psImageObjects *
-psImageObjectsAlloc(const struct psImage *image, //!< Image that produced the objects, with needed metadata
-		    psObjectArray *objects //!< The objects
+psImageObjectsAlloc(const struct psImage *image, ///< Image that produced the objects, with needed metadata
+		    psObjectArray *objects ///< The objects
     );
 
 /** Destructor */
 void
-psImageObjectsFree(psImageObjects *restrict myImageObjects //!< Object to destroy
+psImageObjectsFree(psImageObjects *restrict myImageObjects ///< Object to destroy
 		  );
 
@@ -78,17 +78,17 @@
 /** Objects from a catalogue */
 typedef struct {
-    psCatalogue catalogue;		//!< Source catalogue from which objects come
-    psObjectArray *object;		//!< The objects
+    psCatalogue catalogue;		///< Source catalogue from which objects come
+    psObjectArray *object;		///< The objects
 } psCatalogueObjects;
 
 /** Constructor */
 psCatalogueObjects *
-psCatalogueObjectsAlloc(enum psCatalogue *catalogue, //!< Source catalogue
-			psObjectArray *objects //!< The objects
+psCatalogueObjectsAlloc(enum psCatalogue *catalogue, ///< Source catalogue
+			psObjectArray *objects ///< The objects
     );
 
 /** Destructor */
 void
-psCatalogueObjectsFree(psCatalogueObjects *restrict myCatalogueObjects //!< Object to destroy
+psCatalogueObjectsFree(psCatalogueObjects *restrict myCatalogueObjects ///< Object to destroy
 		      );
 
@@ -97,23 +97,23 @@
 /** A "super" object --- an object with multiple detections in different images */
 typedef struct {
-    const struct  psImageArray *images;	//!< Images that provided the different measurements
-    const psObjectArray *objects;	//!< Individual object measurements
+    const struct  psImageArray *images;	///< Images that provided the different measurements
+    const psObjectArray *objects;	///< Individual object measurements
 
     /* Derived quantities */
-    psSkyPos *meanSkyPos;		//!< Mean position on the sky
-    double pmRA, pmDec;			//!< Proper motion in RA and Dec
-    double pmRAErr, pmDecErr;		//!< Errors in proper motion
-    float posChi2;			//!< chi^2 for position
+    psSkyPos *meanSkyPos;		///< Mean position on the sky
+    double pmRA, pmDec;			///< Proper motion in RA and Dec
+    double pmRAErr, pmDecErr;		///< Errors in proper motion
+    float posChi2;			///< chi^2 for position
 } psSuperObject;
 
 /** Constructor */
 psSuperObject *
-psSuperObjectAlloc(const struct psImageArray *images, //!< The images with the measurements
-		   const psObjectArray *objects //!< Object measurements
+psSuperObjectAlloc(const struct psImageArray *images, ///< The images with the measurements
+		   const psObjectArray *objects ///< Object measurements
     );
 
 /** Destructor */
 void
-psSuperObjectFree(psSuperObject *restrict mySuperObject //!< Object to destroy
+psSuperObjectFree(psSuperObject *restrict mySuperObject ///< Object to destroy
 		 );
 
@@ -129,10 +129,10 @@
  */
 psIntArray *
-psCorrelateObjects(const psObjectArray *restrict myObjects1, //!< First bunch of objects
-		   const psObjectArray *restrict myObjects2, //!< Second bunch of objects
-		   const psOTADescription *myOTA1, //!< OTA description for first bunch of objects, or NULL for
-						   //!< sky
-		   const psOTADescription *myOTA2 //!< OTA description for second bunch of objects, or NULL for
-						  //!< sky
+psCorrelateObjects(const psObjectArray *restrict myObjects1, ///< First bunch of objects
+		   const psObjectArray *restrict myObjects2, ///< Second bunch of objects
+		   const psOTADescription *myOTA1, ///< OTA description for first bunch of objects, or NULL for
+						   ///< sky
+		   const psOTADescription *myOTA2 ///< OTA description for second bunch of objects, or NULL for
+						  ///< sky
 		   );
 
@@ -142,9 +142,9 @@
  */
 int
-psGetCorrelatedMatches(const psIntArray matches, //!< Index array specifying matches */
-		       const psObjectArray *restrict myObjects1, //!< First bunch of objects
-		       const psObjectArray *restrict myObjects2, //!< Second bunch of objects
-		       psObjectArray *matched1, //!< Matched objects in first bunch
-		       psObjectArray *matched2 //!< Matched objects in second bunch
+psGetCorrelatedMatches(const psIntArray matches, ///< Index array specifying matches */
+		       const psObjectArray *restrict myObjects1, ///< First bunch of objects
+		       const psObjectArray *restrict myObjects2, ///< Second bunch of objects
+		       psObjectArray *matched1, ///< Matched objects in first bunch
+		       psObjectArray *matched2 ///< Matched objects in second bunch
 		       );
 
@@ -155,23 +155,23 @@
 /** Get objects within a particular magnitude range */
 psObjectArray *
-psSelectObjectMag(psObjectArray *restrict myArray, //!< Bunch of objects to select from
-		  float magLower,	//!< Lower bound for magnitude
-		  float magUpper	//!< Upper bound for magnitude
+psSelectObjectMag(psObjectArray *restrict myArray, ///< Bunch of objects to select from
+		  float magLower,	///< Lower bound for magnitude
+		  float magUpper	///< Upper bound for magnitude
 		  );
 
 /** Get objects within a radius on the sky */
 psObjectArray *
-psSelectObjectSkyDist(psObjectArray *restrict myArray, //!< Bunch of objects to select from
-		      psSkyPos *skyPos,	//!< Position on the sky
-		      float radius,	//!< Radius of search
-		      int circleOrSquare //!< Circle = 1, Square = 2
+psSelectObjectSkyDist(psObjectArray *restrict myArray, ///< Bunch of objects to select from
+		      psSkyPos *skyPos,	///< Position on the sky
+		      float radius,	///< Radius of search
+		      int circleOrSquare ///< Circle = 1, Square = 2
 		      );
 
 /** Get objects within a particular colour range */
 psObjectArray *
-psSelectObjectColour(psObjectArray *restrict myArray, //!< Bunch of objects to select from
-		     float magLower,	//!< Lower bound for colour
-		     float magUpper,	//!< Upper bound for colour
-		     psColourRef colourRef //!< Only select those with this colour reference
+psSelectObjectColour(psObjectArray *restrict myArray, ///< Bunch of objects to select from
+		     float magLower,	///< Lower bound for colour
+		     float magUpper,	///< Upper bound for colour
+		     psColourRef colourRef ///< Only select those with this colour reference
 		     );