Index: trunk/psModules/src/camera/pmFPA.h
===================================================================
--- trunk/psModules/src/camera/pmFPA.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPA.h	(revision 11253)
@@ -1,20 +1,19 @@
-/// @file pmFPA.h
-///
-/// @brief Defines the focal plane hierarchy, along with functions for interacting with it
-///
-/// @ingroup Camera
-///
-/// @author George Gusciora, MHPCC
-/// @author Paul Price, IfA
-/// @author Eugene Magnier, IfA
-///
-/// @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-12-22 21:23:36 $
-///
-/// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
-///
+/* @file pmFPA.h
+ * @brief Defines the focal plane hierarchy, along with functions for interacting with it
+ *
+ * @author George Gusciora, MHPCC
+ * @author Paul Price, IfA
+ * @author Eugene Magnier, IfA
+ *
+ * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_FPA_H
 #define PM_FPA_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 #include <pslib.h>
@@ -184,5 +183,4 @@
 bool pmFPACheckParents(pmFPA *fpa       ///< FPA to check
                       );
-
-
+/// @}
 #endif // #ifndef PM_FPA_H
Index: trunk/psModules/src/camera/pmFPAConstruct.h
===================================================================
--- trunk/psModules/src/camera/pmFPAConstruct.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPAConstruct.h	(revision 11253)
@@ -1,18 +1,17 @@
-/// @file pmFPAConstruct.h
-///
-/// @brief Functions to create an FPA, and add data sources to it.
-///
-/// @ingroup Camera
-///
-/// @author Paul Price, IfA
-///
-/// @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2007-01-20 04:24:42 $
-///
-/// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
-///
+/* @file pmFPAConstruct.h
+ * @brief Functions to create an FPA, and add data sources to it.
+ *
+ * @author Paul Price, IfA
+ *
+ * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_FPA_CONSTRUCT_H
 #define PM_FPA_CONSTRUCT_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 #include <pslib.h>
@@ -62,4 +61,4 @@
                 bool concepts           ///< Print concepts?
                );
-
+/// @}
 #endif
Index: trunk/psModules/src/camera/pmFPACopy.h
===================================================================
--- trunk/psModules/src/camera/pmFPACopy.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPACopy.h	(revision 11253)
@@ -1,18 +1,17 @@
-/// @file pmFPACopy.h
-///
-/// @brief Functions to copy FPA components.
-///
-/// @ingroup Camera
-///
-/// @author Paul Price, IfA
-///
-/// @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-10-17 01:16:17 $
-///
-/// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
-///
+/* @file pmFPACopy.h
+ * @brief Functions to copy FPA components.
+ *
+ * @author Paul Price, IfA
+ *
+ * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_FPA_COPY_H
 #define PM_FPA_COPY_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 /// Copy an FPA and components, including the pixels, to a different representation of the same camera
@@ -73,5 +72,4 @@
                          int xBin, int yBin ///< Binning factors in x and y
                         );
-
-
+/// @}
 #endif
Index: trunk/psModules/src/camera/pmFPAExtent.h
===================================================================
--- trunk/psModules/src/camera/pmFPAExtent.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPAExtent.h	(revision 11253)
@@ -1,4 +1,16 @@
+/* @file  pmPFAExtent.h
+ *
+ * @author Paul Price, IfA
+ *
+ * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
+ */
+
 #ifndef PM_FPA_EXTENT_H
 #define PM_FPA_EXTENT_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 /// Return the extent of a readout
@@ -26,4 +38,4 @@
                      );
 
-
+/// @}
 #endif
Index: trunk/psModules/src/camera/pmFPAFlags.h
===================================================================
--- trunk/psModules/src/camera/pmFPAFlags.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPAFlags.h	(revision 11253)
@@ -1,20 +1,19 @@
-/// @file pmFPAFlags.h
-///
-/// @brief Functions for setting and checking the status flags within the FPA hierarchy
-///
-/// @ingroup Camera
-///
-/// @author George Gusciora, MHPCC
-/// @author Paul Price, IfA
-/// @author Eugene Magnier, IfA
-///
-/// @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-10-18 02:29:15 $
-///
-/// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
-///
+/*  @file pmFPAFlags.h
+ *  @brief Functions for setting and checking the status flags within the FPA hierarchy
+ * 
+ *  @author George Gusciora, MHPCC
+ *  @author Paul Price, IfA
+ *  @author Eugene Magnier, IfA
+ * 
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-24 02:54:14 $
+ *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_FPA_FLAGS_H
 #define PM_FPA_FLAGS_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 #include "pmFPA.h"
@@ -98,5 +97,4 @@
                       int cellNum       ///< Cell number to exclude
                      );
-
-
+/// @}
 #endif
Index: trunk/psModules/src/camera/pmFPAHeader.h
===================================================================
--- trunk/psModules/src/camera/pmFPAHeader.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPAHeader.h	(revision 11253)
@@ -1,18 +1,17 @@
-/// @file pmFPAHeader.h
-///
-/// @brief Functions read FITS headers for FPA components
-///
-/// @ingroup Camera
-///
-/// @author Paul Price, IfA
-///
-/// @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-10-17 01:29:02 $
-///
-/// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
-///
+/*  @file pmFPAHeader.h
+ *  @brief Functions read FITS headers for FPA components
+ * 
+ *  @author Paul Price, IfA
+ * 
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-24 02:54:14 $
+ *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_FPA_HEADER_H
 #define PM_FPA_HEADER_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 /// Read the FITS header (and ingest concepts) for an FPA, if it exists at this level
@@ -39,4 +38,4 @@
                       psFits *fits      ///< FITS file handle
                      );
-
+/// @}
 #endif
Index: trunk/psModules/src/camera/pmFPALevel.h
===================================================================
--- trunk/psModules/src/camera/pmFPALevel.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPALevel.h	(revision 11253)
@@ -1,18 +1,17 @@
-/// @file pmFPALevel.h
-///
-/// @brief Defines enum and string representations for the FPA levels
-///
-/// @ingroup Camera
-///
-/// @author Eugene Magnier, MHPCC
-///
-/// @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-10-18 02:29:15 $
-///
-/// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
-///
+/* @file pmFPALevel.h
+ * @brief Defines enum and string representations for the FPA levels
+ *
+ * @author Eugene Magnier, MHPCC
+ *
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_FPA_LEVEL_H
 #define PM_FPA_LEVEL_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 /// Specify the level of the FPA hierarchy
@@ -33,4 +32,4 @@
 pmFPALevel pmFPALevelFromName(const char *name ///< Level name
                              );
-
+/// @}
 #endif // #ifndef PM_FPA_LEVEL_H
Index: trunk/psModules/src/camera/pmFPAMaskWeight.h
===================================================================
--- trunk/psModules/src/camera/pmFPAMaskWeight.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPAMaskWeight.h	(revision 11253)
@@ -1,18 +1,18 @@
-/// @file pmFPAHeader.h
-///
-/// @brief Functions read FITS headers for FPA components
-///
-/// @ingroup Camera
-///
-/// @author Paul Price, IfA
-/// @author Eugene Magnier, IfA
-///
-/// @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-11-29 01:26:14 $
-///
-/// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
-///
+/* @file pmFPAHeader.h
+ * @brief Functions read FITS headers for FPA components
+ *
+ * @author Paul Price, IfA
+ * @author Eugene Magnier, IfA
+ *
+ * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
+ */
+
 #ifndef PM_FPA_MASK_WEIGHT_H
 #define PM_FPA_MASK_WEIGHT_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 #include "pmFPA.h"
@@ -80,6 +80,4 @@
                               bool poisson    ///< Use poisson weights (in addition to read noise)?
                              );
-
-
-
+/// @}
 #endif
Index: trunk/psModules/src/camera/pmFPAMosaic.h
===================================================================
--- trunk/psModules/src/camera/pmFPAMosaic.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPAMosaic.h	(revision 11253)
@@ -1,18 +1,17 @@
-/// @file pmFPAMosaic.h
-///
-/// @brief Functions to mosaic FPA components into a single entity
-///
-/// @ingroup Camera
-///
-/// @author Paul Price, IfA
-///
-/// @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-10-24 01:05:55 $
-///
-/// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
-///
+/* @file pmFPAMosaic.h
+ * @brief Functions to mosaic FPA components into a single entity
+ *
+ * @author Paul Price, IfA
+ *
+ * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_CHIP_MOSAIC_H
 #define PM_CHIP_MOSAIC_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 #include "pmFPA.h"
@@ -37,4 +36,4 @@
                  const pmFPA *source    ///< FPA whose chips and cells will be mosaicked
                 );
-
+/// @}
 #endif
Index: trunk/psModules/src/camera/pmFPARead.h
===================================================================
--- trunk/psModules/src/camera/pmFPARead.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPARead.h	(revision 11253)
@@ -1,18 +1,17 @@
-/// @file pmFPARead.h
-///
-/// @brief Functions to read FPA components from a FITS file
-///
-/// @ingroup Camera
-///
-/// @author Paul Price, IfA
-///
-/// @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-11-13 22:15:05 $
-///
-/// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
-///
+/* @file pmFPARead.h
+ * @brief Functions to read FPA components from a FITS file
+ *
+ * @author Paul Price, IfA
+ *
+ * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_FPA_READ_H
 #define PM_FPA_READ_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 #include <pslib.h>
@@ -133,4 +132,4 @@
                    const char *name     ///< Specifies the extension name, and target in the analysis metadata
                   );
-
+/// @}
 #endif
Index: trunk/psModules/src/camera/pmFPAUtils.h
===================================================================
--- trunk/psModules/src/camera/pmFPAUtils.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPAUtils.h	(revision 11253)
@@ -1,18 +1,17 @@
-/// @file pmFPAUtils.h
-///
-/// @brief Utility functions for FPAs
-///
-/// @ingroup Camera
-///
-/// @author Paul Price, IfA
-///
-/// @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-10-17 03:03:35 $
-///
-/// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
-///
+/* @file pmFPAUtils.h
+ * @brief Utility functions for FPAs
+ *
+ * @author Paul Price, IfA
+ *
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_FPA_UTILS_H
 #define PM_FPA_UTILS_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 #include "pmFPA.h"
@@ -33,5 +32,4 @@
                    const char *name     // Name of the cell
                   );
-
-
+/// @}
 #endif
Index: trunk/psModules/src/camera/pmFPAWrite.h
===================================================================
--- trunk/psModules/src/camera/pmFPAWrite.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPAWrite.h	(revision 11253)
@@ -1,22 +1,20 @@
-/// @file pmFPAWrite.h
-///
-/// @brief Write FPA components to a FITS file
-///
-/// @ingroup Camera
-///
-/// @author Paul Price, IfA
-///
-/// @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-11-18 23:43:28 $
-///
-/// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
-///
+/* @file pmFPAWrite.h
+ * @brief Write FPA components to a FITS file
+ *
+ * @author Paul Price, IfA
+ *
+ * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_FPA_WRITE_H
 #define PM_FPA_WRITE_H
 
+/// @addtogroup Camera Camera Layout
+/// @{
+
 #include <pslib.h>
 #include "pmFPA.h"
-
 
 /// Write a readout incrementally
@@ -167,4 +165,4 @@
                     const char *name    ///< Name for the table data, and the extension name
                    );
-
+/// @}
 #endif
Index: trunk/psModules/src/camera/pmFPA_JPEG.h
===================================================================
--- trunk/psModules/src/camera/pmFPA_JPEG.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPA_JPEG.h	(revision 11253)
@@ -1,20 +1,16 @@
-/** @file  pmFPAview.h
-*
-*  @brief Tools to manipulate the FPA structure elements.
-*
-*  @ingroup AstroImage
-*
-*  @author EAM, IfA
-*
-*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-12-03 18:48:10 $
-*
-*  Copyright 2004-2005 Institute for Astronomy, University of Hawaii
-*/
+/* @file  pmFPAview.h
+ * @brief Tools to manipulate the FPA structure elements.
+ *
+ * @author EAM, IfA
+ *
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_FPA_JPEG_H
 #define PM_FPA_JPEG_H
 
-/// @addtogroup AstroImage
+/// @addtogroup Camera Camera Layout
 /// @{
 
@@ -25,3 +21,4 @@
 bool pmReadoutWriteJPEG (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
 
+/// @}
 # endif
Index: trunk/psModules/src/camera/pmFPA_MANAPLOT.h
===================================================================
--- trunk/psModules/src/camera/pmFPA_MANAPLOT.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPA_MANAPLOT.h	(revision 11253)
@@ -1,20 +1,16 @@
-/** @file  pmFPAview.h
-*
-*  @brief Tools to manipulate the FPA structure elements.
-*
-*  @ingroup AstroImage
-*
-*  @author EAM, IfA
-*
-*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-12-03 18:48:10 $
-*
-*  Copyright 2004-2005 Institute for Astronomy, University of Hawaii
-*/
+/* @file  pmFPAview.h
+ * @brief Tools to manipulate the FPA structure elements.
+ *
+ * @author EAM, IfA
+ *
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_FPA_MANAPLOT_H
 #define PM_FPA_MANAPLOT_H
 
-/// @addtogroup AstroImage
+/// @addtogroup Camera Camera Layout
 /// @{
 
@@ -25,3 +21,4 @@
 bool pmReadoutWriteMANAPLOT (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
 
+/// @}
 # endif
Index: trunk/psModules/src/camera/pmFPAfile.h
===================================================================
--- trunk/psModules/src/camera/pmFPAfile.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPAfile.h	(revision 11253)
@@ -1,18 +1,17 @@
-/** @file  pmFPAview.h
-*
-*  @brief Tools to manipulate the FPA structure elements.
-*
-*  @ingroup AstroImage
-*
-*  @author EAM, IfA
-*
-*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-08 22:30:21 $
-*
-*  Copyright 2004-2005 Institute for Astronomy, University of Hawaii
-*/
+/* @file  pmFPAview.h
+ * @brief Tools to manipulate the FPA structure elements.
+ *
+ * @author EAM, IfA
+ *
+ * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_FPA_FILE_H
 #define PM_FPA_FILE_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 #include "pslib.h"
@@ -126,3 +125,4 @@
 pmFPAfileType pmFPAfileTypeFromString(const char *type);
 
+/// @}
 # endif
Index: trunk/psModules/src/camera/pmFPAfileDefine.h
===================================================================
--- trunk/psModules/src/camera/pmFPAfileDefine.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPAfileDefine.h	(revision 11253)
@@ -1,17 +1,16 @@
-/** @file  pmFPAview.h
-*
-*  @brief Tools to manipulate the FPA structure elements.
-*
-*  @ingroup AstroImage
-*
-*  @author EAM, IfA
-*
-*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-19 22:14:15 $
-*
-*  Copyright 2004-2005 Institute for Astronomy, University of Hawaii
-*/
+/* @file  pmFPAview.h
+ * @brief Tools to manipulate the FPA structure elements.
+ *
+ * @author EAM, IfA
+ *
+ * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
+ */
 
 #include <pmDetrendDB.h>
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 #ifndef PM_FPA_FILE_DEFINE_H
@@ -99,4 +98,4 @@
 pmFPAfile *pmFPAfileDefineSingleFromArgs (bool *found, pmConfig *config, const char *filename,
         const char *argname, int entry);
-
+/// @}
 # endif
Index: trunk/psModules/src/camera/pmFPAfileFitsIO.h
===================================================================
--- trunk/psModules/src/camera/pmFPAfileFitsIO.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPAfileFitsIO.h	(revision 11253)
@@ -1,19 +1,18 @@
-/** @file  pmFPAview.h
-*
-*  @brief Tools to manipulate the FPA structure elements.
-*
-*  @ingroup AstroImage
-*
-*  @author EAM, IfA
-*  @author PAP, IfA
-*
-*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-11-18 23:43:28 $
-*
-*  Copyright 2004-2005 Institute for Astronomy, University of Hawaii
-*/
+/* @file  pmFPAview.h
+ * @brief Tools to manipulate the FPA structure elements.
+ *
+ * @author EAM, IfA
+ * @author PAP, IfA
+ *
+ * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_FPA_FILE_FITS_IO_H
 #define PM_FPA_FILE_FITS_IO_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 /// Read an image into the current view
@@ -62,4 +61,4 @@
                              const char *name ///< Name of table
                             );
-
+/// @}
 # endif
Index: trunk/psModules/src/camera/pmFPAfileIO.h
===================================================================
--- trunk/psModules/src/camera/pmFPAfileIO.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPAfileIO.h	(revision 11253)
@@ -1,18 +1,17 @@
-/** @file  pmFPAview.h
-*
-*  @brief Tools to manipulate the FPA structure elements.
-*
-*  @ingroup AstroImage
-*
-*  @author EAM, IfA
-*
-*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-08 22:30:21 $
-*
-*  Copyright 2004-2005 Institute for Astronomy, University of Hawaii
-*/
+/* @file  pmFPAview.h
+ * @brief Tools to manipulate the FPA structure elements.
+ *
+ * @author EAM, IfA
+ *
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_FPA_FILE_IO_H
 #define PM_FPA_FILE_IO_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 // open the real file corresponding to the given pmFPAfile appropriate to the current view
@@ -40,3 +39,4 @@
 bool pmFPAfileIOChecks (pmConfig *config, const pmFPAview *view, pmFPAfilePlace place);
 
+/// @}
 # endif
Index: trunk/psModules/src/camera/pmFPAview.h
===================================================================
--- trunk/psModules/src/camera/pmFPAview.h	(revision 11242)
+++ trunk/psModules/src/camera/pmFPAview.h	(revision 11253)
@@ -1,18 +1,17 @@
-/// @file pmFPA.h
-///
-/// @brief Tools to manipulate the FPA structure elements.
-///
-/// @ingroup Camera
-///
-/// @author Eugene Magnier, IfA
-///
-/// @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-10-21 04:02:36 $
-///
-/// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
-///
+/* @file pmFPA.h
+ * @brief Tools to manipulate the FPA structure elements.
+ *
+ * @author Eugene Magnier, IfA
+ *
+ * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_FPA_VIEW_H
 #define PM_FPA_VIEW_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 #include "pmFPA.h"
@@ -112,3 +111,4 @@
                        );
 
+/// @}
 #endif
Index: trunk/psModules/src/camera/pmHDU.h
===================================================================
--- trunk/psModules/src/camera/pmHDU.h	(revision 11242)
+++ trunk/psModules/src/camera/pmHDU.h	(revision 11253)
@@ -1,18 +1,17 @@
-/// @file pmHDU.h
-///
-/// @brief Define a header data unit (from a FITS file), with functions to read and write
-///
-/// @ingroup Camera
-///
-/// @author Paul Price, IfA
-///
-/// @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-11-18 23:43:28 $
-///
-/// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
-///
+/* @file pmHDU.h
+ * @brief Define a header data unit (from a FITS file), with functions to read and write
+ *
+ * @author Paul Price, IfA
+ *
+ * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_HDU_H
 #define PM_HDU_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 /// An instance of the FITS Header Data Unit
@@ -80,3 +79,4 @@
                      );
 
+/// @}
 #endif
Index: trunk/psModules/src/camera/pmHDUGenerate.h
===================================================================
--- trunk/psModules/src/camera/pmHDUGenerate.h	(revision 11242)
+++ trunk/psModules/src/camera/pmHDUGenerate.h	(revision 11253)
@@ -1,18 +1,17 @@
-/// @file pmHDUGenerate.h
-///
-/// @brief Generate HDU pixels from FPA components that have pixels
-///
-/// @ingroup Camera
-///
-/// @author Paul Price, IfA
-///
-/// @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-10-17 03:29:08 $
-///
-/// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
-///
+/* @file pmHDUGenerate.h
+ * @brief Generate HDU pixels from FPA components that have pixels
+ *
+ * @author Paul Price, IfA
+ *
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_HDU_GENERATE_H
 #define PM_HDU_GENERATE_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 #include "pmFPA.h"
@@ -53,5 +52,4 @@
 bool pmHDUGenerateForFPA(pmFPA *fpa     ///< The fpa for which to generate an HDU
                         );
-
-
+/// @}
 #endif
Index: trunk/psModules/src/camera/pmHDUUtils.h
===================================================================
--- trunk/psModules/src/camera/pmHDUUtils.h	(revision 11242)
+++ trunk/psModules/src/camera/pmHDUUtils.h	(revision 11253)
@@ -1,18 +1,17 @@
-/// @file pmHDUUtils.h
-///
-/// @brief Utility functions for working with an HDU
-///
-/// @ingroup Camera
-///
-/// @author Paul Price, IfA
-///
-/// @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-10-21 03:31:07 $
-///
-/// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
-///
+/* @file pmHDUUtils.h
+ * @brief Utility functions for working with an HDU
+ *
+ * @author Paul Price, IfA
+ *
+ * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-24 02:54:14 $
+ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
+ */
 
 #ifndef PM_HDU_UTILS_H
 #define PM_HDU_UTILS_H
+
+/// @addtogroup Camera Camera Layout
+/// @{
 
 #include "pmFPA.h"
@@ -59,4 +58,4 @@
                 bool header             ///< Print header?
                );
-
+/// @}
 #endif