Index: /trunk/psLib/src/Doxyfile
===================================================================
--- /trunk/psLib/src/Doxyfile	(revision 973)
+++ /trunk/psLib/src/Doxyfile	(revision 974)
@@ -20,144 +20,144 @@
 PROJECT_NAME           = "Pan-STARRS Foundation Library"
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
 PROJECT_NUMBER         = "$Name: not supported by cvs2svn $"
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = ../docs
 
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 
-# (Japanese with English messages), Korean, Norwegian, Polish, Portuguese, 
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch,
+# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en
+# (Japanese with English messages), Korean, Norwegian, Polish, Portuguese,
 # Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
 
 OUTPUT_LANGUAGE        = English
 
-# This tag can be used to specify the encoding used in the generated output. 
-# The encoding is not always determined by the language that is chosen, 
-# but also whether or not the output is meant for Windows or non-Windows users. 
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
-# forces the Windows encoding (this is the default for the Windows binary), 
-# whereas setting the tag to NO uses a Unix-style encoding (the default for 
+# This tag can be used to specify the encoding used in the generated output.
+# The encoding is not always determined by the language that is chosen,
+# but also whether or not the output is meant for Windows or non-Windows users.
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
+# forces the Windows encoding (this is the default for the Windows binary),
+# whereas setting the tag to NO uses a Unix-style encoding (the default for
 # all platforms other than Windows).
 
 USE_WINDOWS_ENCODING   = NO
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
 # Set to NO to disable this.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
 
 REPEAT_BRIEF           = YES
 
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
 # description.
 
 ALWAYS_DETAILED_SEC    = YES
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
-# members of a class in the documentation of that class as if those members were 
-# ordinary class members. Constructors, destructors and assignment operators of 
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
+# members of a class in the documentation of that class as if those members were
+# ordinary class members. Constructors, destructors and assignment operators of
 # the base classes will not be shown.
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
 # to NO the shortest path that makes the file name unique will be used.
 
 FULL_PATH_NAMES        = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
 # the path. It is allowed to use relative paths in the argument list.
 
-STRIP_FROM_PATH        = 
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
+STRIP_FROM_PATH        =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
 # doesn't support long names like on DOS, Mac, or CD-ROM.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like the Qt-style comments (thus requiring an
 # explict @brief command for a brief description.
 
 JAVADOC_AUTOBRIEF      = YES
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
 # description. Set this tag to YES if you prefer the old behaviour instead.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen
 # will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
+# If set to NO, the detailed description appears after the member
 # documentation.
 
 DETAILS_AT_TOP         = YES
 
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
 # reimplements.
 
 INHERIT_DOCS           = YES
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
 TAB_SIZE               = 4
 
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
 # put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:". 
+# will result in a user-defined paragraph with heading "Side Effects:".
 # You can put \n's in the value part of an alias to insert newlines.
 
 ALIASES                =
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
-# only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
 # of all members will be omitted, etc.
 
 OPTIMIZE_OUTPUT_FOR_C  = YES
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
-# only. Doxygen will then generate output that is more tailored for Java. 
-# For instance, namespaces will be presented as packages, qualified scopes 
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
+# only. Doxygen will then generate output that is more tailored for Java.
+# For instance, namespaces will be presented as packages, qualified scopes
 # will look different, etc.
 
@@ -165,7 +165,7 @@
 
 # Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
 # the \nosubgrouping command.
 
@@ -176,45 +176,45 @@
 #---------------------------------------------------------------------------
 
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
 # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
 
 EXTRACT_ALL            = YES
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
 # will be included in the documentation.
 
 EXTRACT_PRIVATE        = NO
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
 # will be included in the documentation.
 
 EXTRACT_STATIC         = NO
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
 # If set to NO only classes defined in header files are included.
 
 EXTRACT_LOCAL_CLASSES  = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
 # This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
 # overviews. This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
 # documentation.
 
@@ -230,5 +230,5 @@
 # The INTERNAL_DOCS tag determines if documentation 
 # that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
+# to NO (the default) then the documentation will be excluded.
 # Set it to YES to include the internal documentation.
 
@@ -298,5 +298,5 @@
 # The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
 # the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
+# the documentation. If the initializer consists of more lines than specified
 # here it will be hidden. Use a value of 0 to hide initializers completely. 
 # The appearance of the initializer of individual variables and defines in the 
@@ -322,5 +322,5 @@
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
+# generated by doxygen. Possible values are YES and NO. If left blank
 # NO is used.
 
@@ -362,5 +362,6 @@
 # with spaces.
 
-INPUT                  = mainpage.dox \
+INPUT                  = pslib.h \
+                         mainpage.dox \
                          sysUtils \
                          dataManip \
@@ -374,5 +375,5 @@
 # *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
 
-FILE_PATTERNS          = 
+FILE_PATTERNS          =
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories 
@@ -382,5 +383,5 @@
 RECURSIVE              = YES
 
-# The EXCLUDE tag can be used to specify files and/or directories that should 
+# The EXCLUDE tag can be used to specify files and/or directories that should
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
Index: /trunk/psLib/src/collections/psBitSet.h
===================================================================
--- /trunk/psLib/src/collections/psBitSet.h	(revision 973)
+++ /trunk/psLib/src/collections/psBitSet.h	(revision 974)
@@ -8,8 +8,10 @@
  *  string.
  *
+ *  @ingroup BitSet
+ *
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-10 00:29:57 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -18,4 +20,7 @@
 #ifndef PSBITSET_H
 #define PSBITSET_H
+
+/// @addtogroup BitSet
+/// @{
 
 /******************************************************************************/
@@ -111,3 +116,5 @@
 );
 
+/// @}
+
 #endif
Index: /trunk/psLib/src/collections/psList.h
===================================================================
--- /trunk/psLib/src/collections/psList.h	(revision 973)
+++ /trunk/psLib/src/collections/psList.h	(revision 974)
@@ -4,11 +4,12 @@
 /** @file psList.h
  *  @brief Support for doubly linked lists
- *  @ingroup DataContainers
  *
  *  @author Robert Lupton, Princeton University
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-09 02:16:41 $
+ *  @ingroup LinkedList
+ *
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -18,4 +19,8 @@
 
 #include "psVector.h"
+
+/** @addtogroup LinkedList
+ *  @{
+ */
 
 /** Special values of index into list
@@ -54,8 +59,4 @@
 }
 psList;
-
-/** @addtogroup DataContainers General Data Container Utilities
- *  @{
- */
 
 /** Constructor */
Index: /trunk/psLib/src/collections/psSort.h
===================================================================
--- /trunk/psLib/src/collections/psSort.h	(revision 973)
+++ /trunk/psLib/src/collections/psSort.h	(revision 974)
@@ -12,8 +12,10 @@
  *  in the sorted array is undefined.
  *
+ *  @ingroup Sort
+ *
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-09 18:23:22 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -22,4 +24,7 @@
 #ifndef PSSORT_H
 #define PSSORT_H
+
+/// @addtogroup Sort
+/// @{
 
 /******************************************************************************/
@@ -58,3 +63,5 @@
 psVector *psSortIndex(psVector *restrict outVector, const psVector *restrict inVector);
 
+/// @}
+
 #endif
Index: /trunk/psLib/src/collections/psVector.h
===================================================================
--- /trunk/psLib/src/collections/psVector.h	(revision 973)
+++ /trunk/psLib/src/collections/psVector.h	(revision 974)
@@ -6,9 +6,11 @@
  *  in manupulating vectors.
  *
+ *  @ingroup Vector
+ *
  *  @author Robert DeSonia, MHPCC
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-03 00:32:32 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -19,4 +21,7 @@
 
 #include "psType.h"
+
+/// @addtogroup Vector
+/// @{
 
 /** An vector to support primitive types.
@@ -121,3 +126,5 @@
 );
 
+/// @}
+
 #endif
Index: /trunk/psLib/src/dataManip/psFFT.h
===================================================================
--- /trunk/psLib/src/dataManip/psFFT.h	(revision 973)
+++ /trunk/psLib/src/dataManip/psFFT.h	(revision 974)
@@ -3,8 +3,10 @@
  *  @brief Contains FFT transforms functions
  *
+ *  @ingroup Transform
+ *
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-02 19:41:57 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16,4 +18,7 @@
 #include "psImage.h"
 #include "psVector.h"
+
+/// @addtogroup Transform
+/// @{
 
 /** Details on FFT implementation (private). */
@@ -42,4 +47,5 @@
 psVector* psVectorPowerSpectrum(psVector* out, const psVector* in);
 
+/// @}
 
 #endif
Index: /trunk/psLib/src/dataManip/psFunctions.h
===================================================================
--- /trunk/psLib/src/dataManip/psFunctions.h	(revision 973)
+++ /trunk/psLib/src/dataManip/psFunctions.h	(revision 974)
@@ -3,6 +3,10 @@
 
 /** \file psFunctions.h
- *  \brief Standard Mathematical Functions. 
- *  \ingroup MathGroup
+ *  \brief Standard Mathematical Functions.
+ *  \ingroup Stats
+ */
+
+/** \addtogroup Stats
+ *  \{
  */
 
@@ -67,7 +71,4 @@
 
 /** Functions **************************************************************/
-/** \addtogroup MathGroup Math Utilities
- *  \{
- */
 
 /** Constructor */
@@ -129,6 +130,4 @@
                   );
 
-/* \} */ // End of MathGroup Functions
-
 /*****************************************************************************/
 
@@ -174,9 +173,4 @@
 }
 psDPolynomial4D;
-
-/** Functions **************************************************************/
-/** \addtogroup MathGroup Math Utilities
- *  \{
- */
 
 /** Constructor */
Index: /trunk/psLib/src/dataManip/psMatrix.h
===================================================================
--- /trunk/psLib/src/dataManip/psMatrix.h	(revision 973)
+++ /trunk/psLib/src/dataManip/psMatrix.h	(revision 974)
@@ -17,8 +17,10 @@
  *  operate only with the psF64 data type.
  *
+ *  @ingroup Matrix
+ *
  *  @author Ross Harman, MHPCC
- *   
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-08 01:58:03 $
+ *
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28,23 +30,10 @@
 #define PSMATRIX_H
 
-/******************************************************************************/
-/*  DEFINE STATEMENTS                                                         */
-/******************************************************************************/
-
-// None
-
-/******************************************************************************/
-/*  TYPE DEFINITIONS                                                          */
-/******************************************************************************/
-
-// None
-
-/*****************************************************************************/
-/* FUNCTION PROTOTYPES                                                       */
-/*****************************************************************************/
+/// @addtogroup Matrix
+/// @{
 
 /** LU Decomposition of psImage matrix.
  *
- *  Performs a LU decomposition on a psImage matrix and returns the LU matrix. If the user specifies NULL for 
+ *  Performs a LU decomposition on a psImage matrix and returns the LU matrix. If the user specifies NULL for
  *  the outImage or outPerm arguments, then they will be automatically created. The input image must 
  *  be square. This function operates only with the psF64 data type. Input and output arguments should not be 
@@ -77,5 +66,5 @@
 /** Invert psImage matrix.
  *
- *  Inverts a psImage matrix and returns the determinant as an option through the argument list. If the user 
+ *  Inverts a psImage matrix and returns the determinant as an option through the argument list. If the user
  *  specifies NULL as the outImage argument, then it will automatically be created. The input image must be 
  *  square. This function operates only with the psF64 data type. Input and output arguments should not be 
@@ -172,3 +161,5 @@
 );
 
+/// @}
+
 #endif
Index: /trunk/psLib/src/dataManip/psMinimize.h
===================================================================
--- /trunk/psLib/src/dataManip/psMinimize.h	(revision 973)
+++ /trunk/psLib/src/dataManip/psMinimize.h	(revision 974)
@@ -4,9 +4,9 @@
 /** \file psMinimize.h
  *  \brief minimization operations
- *  \ingroup MathGroup
+ *  \ingroup Stats
  */
 
 /** Functions **************************************************************/
-/** \addtogroup MathGroup Math Utilities
+/** \addtogroup Stats
  *  \{
  */
Index: /trunk/psLib/src/dataManip/psStats.h
===================================================================
--- /trunk/psLib/src/dataManip/psStats.h	(revision 973)
+++ /trunk/psLib/src/dataManip/psStats.h	(revision 974)
@@ -6,7 +6,11 @@
 /** \file psStats.h
  *  \brief basic statistical operations
- *  \ingroup MathGroup
+ *  \ingroup Stats
  */
 #include "psVector.h"
+
+/// @addtogroup Stats
+/// @{
+
 /******************************************************************************
     Statistical functions and data structures.
@@ -112,4 +116,6 @@
 
 
+/// @}
+
 #endif
 
Index: /trunk/psLib/src/dataManip/psVectorFFT.h
===================================================================
--- /trunk/psLib/src/dataManip/psVectorFFT.h	(revision 973)
+++ /trunk/psLib/src/dataManip/psVectorFFT.h	(revision 974)
@@ -3,8 +3,10 @@
  *  @brief Contains FFT transforms functions
  *
+ *  @ingroup Transform
+ *
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-02 19:41:57 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16,4 +18,7 @@
 #include "psImage.h"
 #include "psVector.h"
+
+/// @addtogroup Transform
+/// @{
 
 /** Details on FFT implementation (private). */
@@ -42,4 +47,5 @@
 psVector* psVectorPowerSpectrum(psVector* out, const psVector* in);
 
+/// @}
 
 #endif
Index: /trunk/psLib/src/fft/psVectorFFT.h
===================================================================
--- /trunk/psLib/src/fft/psVectorFFT.h	(revision 973)
+++ /trunk/psLib/src/fft/psVectorFFT.h	(revision 974)
@@ -3,8 +3,10 @@
  *  @brief Contains FFT transforms functions
  *
+ *  @ingroup Transform
+ *
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-02 19:41:57 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16,4 +18,7 @@
 #include "psImage.h"
 #include "psVector.h"
+
+/// @addtogroup Transform
+/// @{
 
 /** Details on FFT implementation (private). */
@@ -42,4 +47,5 @@
 psVector* psVectorPowerSpectrum(psVector* out, const psVector* in);
 
+/// @}
 
 #endif
Index: /trunk/psLib/src/image/psImage.h
===================================================================
--- /trunk/psLib/src/image/psImage.h	(revision 973)
+++ /trunk/psLib/src/image/psImage.h	(revision 974)
@@ -6,9 +6,11 @@
  *  in manupulating images.
  *
+ *  @ingroup Image
+ *
  *  @author Robert DeSonia, MHPCC
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-02 23:29:14 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,13 +23,6 @@
 #include "psType.h"
 
-/******************************************************************************/
-/*  DEFINE STATEMENTS                                                         */
-/******************************************************************************/
-
-// None
-
-/******************************************************************************/
-/*  TYPE DEFINITIONS                                                          */
-/******************************************************************************/
+/// @addtogroup Image
+/// @{
 
 /** Basic image data structure.
@@ -199,3 +194,5 @@
 );
 
+/// @}
+
 #endif
Index: /trunk/psLib/src/image/psImageIO.h
===================================================================
--- /trunk/psLib/src/image/psImageIO.h	(revision 973)
+++ /trunk/psLib/src/image/psImageIO.h	(revision 974)
@@ -5,8 +5,10 @@
  *  This file defines the file input/output functions for the psImage structure.
  *
+ *  @ingroup ImageIO
+ *
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-29 01:42:44 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16,4 +18,7 @@
 
 #include "psImage.h"
+
+/// @addtogroup ImageIO
+/// @{
 
 /** Read an image or subimage from a FITS file specified by a filename.
@@ -72,3 +77,5 @@
 );
 
+/// @}
+
 #endif
Index: /trunk/psLib/src/mainpage.dox
===================================================================
--- /trunk/psLib/src/mainpage.dox	(revision 973)
+++ /trunk/psLib/src/mainpage.dox	(revision 974)
@@ -14,5 +14,5 @@
 @section install How to Build from source:
 
-Before building the IPP from source, it is required that the 'opt' directory 
+Before building the IPP from source, it is required that the 'opt' directory
 tree from cvs be downloaded and built.  The steps are approximately as follows:
 <pre>
Index: /trunk/psLib/src/math/psMatrix.h
===================================================================
--- /trunk/psLib/src/math/psMatrix.h	(revision 973)
+++ /trunk/psLib/src/math/psMatrix.h	(revision 974)
@@ -17,8 +17,10 @@
  *  operate only with the psF64 data type.
  *
+ *  @ingroup Matrix
+ *
  *  @author Ross Harman, MHPCC
- *   
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-08 01:58:03 $
+ *
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28,23 +30,10 @@
 #define PSMATRIX_H
 
-/******************************************************************************/
-/*  DEFINE STATEMENTS                                                         */
-/******************************************************************************/
-
-// None
-
-/******************************************************************************/
-/*  TYPE DEFINITIONS                                                          */
-/******************************************************************************/
-
-// None
-
-/*****************************************************************************/
-/* FUNCTION PROTOTYPES                                                       */
-/*****************************************************************************/
+/// @addtogroup Matrix
+/// @{
 
 /** LU Decomposition of psImage matrix.
  *
- *  Performs a LU decomposition on a psImage matrix and returns the LU matrix. If the user specifies NULL for 
+ *  Performs a LU decomposition on a psImage matrix and returns the LU matrix. If the user specifies NULL for
  *  the outImage or outPerm arguments, then they will be automatically created. The input image must 
  *  be square. This function operates only with the psF64 data type. Input and output arguments should not be 
@@ -77,5 +66,5 @@
 /** Invert psImage matrix.
  *
- *  Inverts a psImage matrix and returns the determinant as an option through the argument list. If the user 
+ *  Inverts a psImage matrix and returns the determinant as an option through the argument list. If the user
  *  specifies NULL as the outImage argument, then it will automatically be created. The input image must be 
  *  square. This function operates only with the psF64 data type. Input and output arguments should not be 
@@ -172,3 +161,5 @@
 );
 
+/// @}
+
 #endif
Index: /trunk/psLib/src/math/psMinimize.h
===================================================================
--- /trunk/psLib/src/math/psMinimize.h	(revision 973)
+++ /trunk/psLib/src/math/psMinimize.h	(revision 974)
@@ -4,9 +4,9 @@
 /** \file psMinimize.h
  *  \brief minimization operations
- *  \ingroup MathGroup
+ *  \ingroup Stats
  */
 
 /** Functions **************************************************************/
-/** \addtogroup MathGroup Math Utilities
+/** \addtogroup Stats
  *  \{
  */
Index: /trunk/psLib/src/math/psPolynomial.h
===================================================================
--- /trunk/psLib/src/math/psPolynomial.h	(revision 973)
+++ /trunk/psLib/src/math/psPolynomial.h	(revision 974)
@@ -3,6 +3,10 @@
 
 /** \file psFunctions.h
- *  \brief Standard Mathematical Functions. 
- *  \ingroup MathGroup
+ *  \brief Standard Mathematical Functions.
+ *  \ingroup Stats
+ */
+
+/** \addtogroup Stats
+ *  \{
  */
 
@@ -67,7 +71,4 @@
 
 /** Functions **************************************************************/
-/** \addtogroup MathGroup Math Utilities
- *  \{
- */
 
 /** Constructor */
@@ -129,6 +130,4 @@
                   );
 
-/* \} */ // End of MathGroup Functions
-
 /*****************************************************************************/
 
@@ -174,9 +173,4 @@
 }
 psDPolynomial4D;
-
-/** Functions **************************************************************/
-/** \addtogroup MathGroup Math Utilities
- *  \{
- */
 
 /** Constructor */
Index: /trunk/psLib/src/math/psSpline.h
===================================================================
--- /trunk/psLib/src/math/psSpline.h	(revision 973)
+++ /trunk/psLib/src/math/psSpline.h	(revision 974)
@@ -3,6 +3,10 @@
 
 /** \file psFunctions.h
- *  \brief Standard Mathematical Functions. 
- *  \ingroup MathGroup
+ *  \brief Standard Mathematical Functions.
+ *  \ingroup Stats
+ */
+
+/** \addtogroup Stats
+ *  \{
  */
 
@@ -67,7 +71,4 @@
 
 /** Functions **************************************************************/
-/** \addtogroup MathGroup Math Utilities
- *  \{
- */
 
 /** Constructor */
@@ -129,6 +130,4 @@
                   );
 
-/* \} */ // End of MathGroup Functions
-
 /*****************************************************************************/
 
@@ -174,9 +173,4 @@
 }
 psDPolynomial4D;
-
-/** Functions **************************************************************/
-/** \addtogroup MathGroup Math Utilities
- *  \{
- */
 
 /** Constructor */
Index: /trunk/psLib/src/math/psStats.h
===================================================================
--- /trunk/psLib/src/math/psStats.h	(revision 973)
+++ /trunk/psLib/src/math/psStats.h	(revision 974)
@@ -6,7 +6,11 @@
 /** \file psStats.h
  *  \brief basic statistical operations
- *  \ingroup MathGroup
+ *  \ingroup Stats
  */
 #include "psVector.h"
+
+/// @addtogroup Stats
+/// @{
+
 /******************************************************************************
     Statistical functions and data structures.
@@ -112,4 +116,6 @@
 
 
+/// @}
+
 #endif
 
Index: /trunk/psLib/src/mathtypes/psImage.h
===================================================================
--- /trunk/psLib/src/mathtypes/psImage.h	(revision 973)
+++ /trunk/psLib/src/mathtypes/psImage.h	(revision 974)
@@ -6,9 +6,11 @@
  *  in manupulating images.
  *
+ *  @ingroup Image
+ *
  *  @author Robert DeSonia, MHPCC
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-02 23:29:14 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,13 +23,6 @@
 #include "psType.h"
 
-/******************************************************************************/
-/*  DEFINE STATEMENTS                                                         */
-/******************************************************************************/
-
-// None
-
-/******************************************************************************/
-/*  TYPE DEFINITIONS                                                          */
-/******************************************************************************/
+/// @addtogroup Image
+/// @{
 
 /** Basic image data structure.
@@ -199,3 +194,5 @@
 );
 
+/// @}
+
 #endif
Index: /trunk/psLib/src/mathtypes/psVector.h
===================================================================
--- /trunk/psLib/src/mathtypes/psVector.h	(revision 973)
+++ /trunk/psLib/src/mathtypes/psVector.h	(revision 974)
@@ -6,9 +6,11 @@
  *  in manupulating vectors.
  *
+ *  @ingroup Vector
+ *
  *  @author Robert DeSonia, MHPCC
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-03 00:32:32 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -19,4 +21,7 @@
 
 #include "psType.h"
+
+/// @addtogroup Vector
+/// @{
 
 /** An vector to support primitive types.
@@ -121,3 +126,5 @@
 );
 
+/// @}
+
 #endif
Index: /trunk/psLib/src/pslib.h
===================================================================
--- /trunk/psLib/src/pslib.h	(revision 973)
+++ /trunk/psLib/src/pslib.h	(revision 974)
@@ -8,6 +8,6 @@
  *  @author Eric Van Alst, MHPCC
  *   
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-08 19:08:40 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -22,41 +22,85 @@
 
 // System Utilities
+
+/// @defgroup SysUtils System Utilities
+/// @{
+
+/** @defgroup MemoryManagement Memory Management Utilities
+ *
+ *  This is the generic memory management system put inbetween the user's high level code and the OS-level
+ *  memory allocation routines.  This system adds such features as callback routines for memory error events,
+ *  tracing capabilities, and reference counting.
+ *
+ *  @ingroup SysUtils
+ */
+
 #include "psMemory.h"
+
+/// @defgroup LogTrace Tracing and Logging
+/// @ingroup SysUtils
 #include "psLogMsg.h"
 #include "psTrace.h"
+
+/// @defgroup ErrorHandling Error Handling
+/// @ingroup SysUtils
 #include "psAbort.h"
 #include "psError.h"
+
 #include "psString.h"
 
+/// @}
+
 // Collections
+/// @defgroup DataContainer Data Containers
+/// @{
+
 #include "psType.h"
-#include "psVector.h"
-#include "psImage.h"
-#include "psBitSet.h"
-#include "psSort.h"
-#include "psHash.h"
+
+/// @defgroup LinkedList Linked List
+/// @ingroup DataContainer
 #include "psList.h"
 
+/// @defgroup HashTable Hash Table
+/// @ingroup DataContainer
+#include "psHash.h"
+
+/// @defgroup Vector Vector Container
+/// @ingroup DataContainer
+#include "psVector.h"
+
+/// @defgroup Image Image Container
+/// @ingroup DataContainer
+#include "psImage.h"
+
+/// @defgroup BitSet Bit Set
+/// @ingroup DataContainer
+#include "psBitSet.h"
+
+/// @defgroup Sort Sorting Functions
+/// @ingroup DataContainer
+#include "psSort.h"
+/// @}
+
 // Data Manipulation
+/// @defgroup DataManip Data Manipulation
+/// @{
+
+/// @defgroup Stats Statistic Functions
+/// @ingroup DataManip
 #include "psStats.h"
+
+/// @defgroup Matrix Matrix Operations
+/// @ingroup DataManip
 #include "psMatrix.h"
+
+/// @defgroup Transform Fourier Transform
+/// @ingroup DataManip
 #include "psFFT.h"
+
+/// @defgroup ImageIO Image File I/O
+/// @ingroup DataManip
 #include "psImageIO.h"
 
-/******************************************************************************/
-/*  DEFINE STATEMENTS                                                         */
-/******************************************************************************/
-
-// None
-
-/******************************************************************************/
-/*  TYPE DEFINITIONS                                                          */
-/******************************************************************************/
-
-// None
-
-/*****************************************************************************/
-/* FUNCTION PROTOTYPES                                                       */
-/*****************************************************************************/
+/// @}
 
 #endif
Index: /trunk/psLib/src/sys/psAbort.h
===================================================================
--- /trunk/psLib/src/sys/psAbort.h	(revision 973)
+++ /trunk/psLib/src/sys/psAbort.h	(revision 974)
@@ -1,5 +1,3 @@
 /** @file  psAbort.h
- *
- *  @ingroup SystemGroup System Utilities
  *
  *  @brief Contains the declarations for the abort function
@@ -9,8 +7,10 @@
  *  needing to abort from program execution.
  *
+ *  @ingroup ErrorHandling
+ *
  *  @author Eric Van Alst, MHPCC
- *   
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-27 19:24:32 $
+ *
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20,22 +20,7 @@
 #define PS_ABORT_H
 
-/******************************************************************************/
-/*  DEFINE STATEMENTS                                                         */
-/******************************************************************************/
-
-// None
-
-/******************************************************************************/
-/*  TYPE DEFINITIONS                                                          */
-/******************************************************************************/
-
-// None
-
-/*****************************************************************************/
-/* FUNCTION PROTOTYPES                                                       */
-/*****************************************************************************/
 
 // Doxygen grouping tags
-/** @addtogroup SystemGroup System Utilities
+/** @addtogroup ErrorHandling
  *  @{
  */
Index: /trunk/psLib/src/sys/psError.h
===================================================================
--- /trunk/psLib/src/sys/psError.h	(revision 973)
+++ /trunk/psLib/src/sys/psError.h	(revision 974)
@@ -2,6 +2,4 @@
  *
  *  @brief Contains the declarations for the error reporting functions
- *
- *  @ingroup SystemGroup
  *
  *  Error reporting functions shall be used to create log entries in the
@@ -10,8 +8,10 @@
  *  of error detected.
  *
+ *  @ingroup ErrorHandling
+ *
  *  @author Eric Van Alst, MHPCC
- *   
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-27 19:24:32 $
+ *
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,21 +21,5 @@
 #define PS_ERROR_H
 
-/******************************************************************************/
-/*  DEFINE STATEMENTS                                                         */
-/******************************************************************************/
-
-// None
-
-/******************************************************************************/
-/*  TYPE DEFINITIONS                                                          */
-/******************************************************************************/
-
-// None
-
-/*****************************************************************************/
-/* FUNCTION PROTOTYPES                                                       */
-/*****************************************************************************/
-
-/** @addtogroup SystemGroup System Utilities
+/** @addtogroup ErrorHandling
  *  @{
  */
@@ -56,5 +40,5 @@
 );
 
-/* @} */  // End of SystemGroup Functions
+/* @} */  // End of SysUtils Functions
 
 #endif
Index: /trunk/psLib/src/sys/psLogMsg.h
===================================================================
--- /trunk/psLib/src/sys/psLogMsg.h	(revision 973)
+++ /trunk/psLib/src/sys/psLogMsg.h	(revision 974)
@@ -1,16 +1,14 @@
 #if !defined(PS_LOG_MSG_H)
 #define PS_LOG_MSG_H
-#endif
 
 /** \file psLogMsg.h
  *  \brief log messaging facilities
- *  \ingroup SystemGroup
+ *  \ingroup LogTrace
  */
 
 #include <stdarg.h>
 
-/** Functions **************************************************************/
-/** \addtogroup SystemGroup System Utilities
- *  \{
+/** @addtogroup LogTrace
+ *  @{
  */
 
@@ -56,5 +54,4 @@
 ;
 
-/* \} */ // End of SystemGroup Functions
 
 ///< Status codes for log messages
@@ -71,2 +68,5 @@
     PS_LOG_TO_STDOUT };
 
+/// @}
+
+#endif
Index: /trunk/psLib/src/sys/psMemory.h
===================================================================
--- /trunk/psLib/src/sys/psMemory.h	(revision 973)
+++ /trunk/psLib/src/sys/psMemory.h	(revision 974)
@@ -12,8 +12,8 @@
  *  @author Robert Lupton, Princeton University
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-04 23:46:48 $
- *
- *  @ingroup SystemGroup System Utilities
+ *  @ingroup MemoryManagement
+ *
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,12 +21,7 @@
 
 #include <stdio.h>                      // needed for FILE
-#include <pthread.h>                   // we need a mutex to make this stuff thread safe.
-
-/** @addtogroup MemoryManagement Memory Management Utilities
- *  @ingroup SystemGroup
- *
- *  This is the generic memory management system put inbetween the user's high level code and the OS-level
- *  memory allocation routines.  This system adds such features as callback routines for memory error events,
- *  tracing capabilities, and reference counting.
+#include <pthread.h>                    // we need a mutex to make this stuff thread safe.
+
+/** @addtogroup MemoryManagement
  *  @{
  */
Index: /trunk/psLib/src/sys/psString.h
===================================================================
--- /trunk/psLib/src/sys/psString.h	(revision 973)
+++ /trunk/psLib/src/sys/psString.h	(revision 974)
@@ -3,5 +3,5 @@
  *  @brief Contains the declarations of string utility functions
  *
- *  @ingroup SystemGroup
+ *  @ingroup SysUtils
  *
  *  String utility functions defined shall provide basic string copying
@@ -9,7 +9,7 @@
  *
  *  @author Eric Van Alst, MHPCC
- *   
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-28 22:19:20 $
+ *
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -37,5 +37,5 @@
 
 // Doxygen group tags
-/** @addtogroup SystemGroup System Utilities
+/** @addtogroup SysUtils
  *  @{
  */
Index: /trunk/psLib/src/sys/psTrace.h
===================================================================
--- /trunk/psLib/src/sys/psTrace.h	(revision 973)
+++ /trunk/psLib/src/sys/psTrace.h	(revision 974)
@@ -6,5 +6,5 @@
 /** \file psTrace.h
  *  \brief basic run-time trace facilities
- *  \ingroup SystemGroup
+ *  \ingroup LogTrace
  */
 
@@ -23,8 +23,10 @@
 Component;
 
-/** Functions **************************************************************/
-/** \addtogroup SystemGroup System Utilities
+/** \addtogroup LogTrace
  *  \{
  */
+
+
+/** Functions **************************************************************/
 
 /// Send a trace message
Index: /trunk/psLib/src/sys/psType.h
===================================================================
--- /trunk/psLib/src/sys/psType.h	(revision 973)
+++ /trunk/psLib/src/sys/psType.h	(revision 974)
@@ -5,9 +5,11 @@
  *  This file defines common datatypes used throughout psLib.
  *
+ *  @ingroup DataContainer
+ *
  *  @author Robert DeSonia, MHPCC
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-02 23:29:14 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -19,4 +21,7 @@
 #include <complex.h>
 #include <stdint.h>
+
+/// @addtogroup DataContainer
+/// @{
 
 /******************************************************************************/
@@ -114,3 +119,5 @@
 psType;
 
+/// @}
+
 #endif
Index: /trunk/psLib/src/sysUtils/psAbort.h
===================================================================
--- /trunk/psLib/src/sysUtils/psAbort.h	(revision 973)
+++ /trunk/psLib/src/sysUtils/psAbort.h	(revision 974)
@@ -1,5 +1,3 @@
 /** @file  psAbort.h
- *
- *  @ingroup SystemGroup System Utilities
  *
  *  @brief Contains the declarations for the abort function
@@ -9,8 +7,10 @@
  *  needing to abort from program execution.
  *
+ *  @ingroup ErrorHandling
+ *
  *  @author Eric Van Alst, MHPCC
- *   
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-27 19:24:32 $
+ *
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20,22 +20,7 @@
 #define PS_ABORT_H
 
-/******************************************************************************/
-/*  DEFINE STATEMENTS                                                         */
-/******************************************************************************/
-
-// None
-
-/******************************************************************************/
-/*  TYPE DEFINITIONS                                                          */
-/******************************************************************************/
-
-// None
-
-/*****************************************************************************/
-/* FUNCTION PROTOTYPES                                                       */
-/*****************************************************************************/
 
 // Doxygen grouping tags
-/** @addtogroup SystemGroup System Utilities
+/** @addtogroup ErrorHandling
  *  @{
  */
Index: /trunk/psLib/src/sysUtils/psError.h
===================================================================
--- /trunk/psLib/src/sysUtils/psError.h	(revision 973)
+++ /trunk/psLib/src/sysUtils/psError.h	(revision 974)
@@ -2,6 +2,4 @@
  *
  *  @brief Contains the declarations for the error reporting functions
- *
- *  @ingroup SystemGroup
  *
  *  Error reporting functions shall be used to create log entries in the
@@ -10,8 +8,10 @@
  *  of error detected.
  *
+ *  @ingroup ErrorHandling
+ *
  *  @author Eric Van Alst, MHPCC
- *   
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-27 19:24:32 $
+ *
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,21 +21,5 @@
 #define PS_ERROR_H
 
-/******************************************************************************/
-/*  DEFINE STATEMENTS                                                         */
-/******************************************************************************/
-
-// None
-
-/******************************************************************************/
-/*  TYPE DEFINITIONS                                                          */
-/******************************************************************************/
-
-// None
-
-/*****************************************************************************/
-/* FUNCTION PROTOTYPES                                                       */
-/*****************************************************************************/
-
-/** @addtogroup SystemGroup System Utilities
+/** @addtogroup ErrorHandling
  *  @{
  */
@@ -56,5 +40,5 @@
 );
 
-/* @} */  // End of SystemGroup Functions
+/* @} */  // End of SysUtils Functions
 
 #endif
Index: /trunk/psLib/src/sysUtils/psHash.h
===================================================================
--- /trunk/psLib/src/sysUtils/psHash.h	(revision 973)
+++ /trunk/psLib/src/sysUtils/psHash.h	(revision 974)
@@ -12,6 +12,6 @@
  *  @author George Gusciora, MHPCC
  *   
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-10 01:31:05 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,5 +21,5 @@
 #define PS_HASH_H
 
-/** \addtogroup HashTable Hash Table
+/** \addtogroup HashTable
  *  \{
  */
Index: /trunk/psLib/src/sysUtils/psLogMsg.h
===================================================================
--- /trunk/psLib/src/sysUtils/psLogMsg.h	(revision 973)
+++ /trunk/psLib/src/sysUtils/psLogMsg.h	(revision 974)
@@ -1,16 +1,14 @@
 #if !defined(PS_LOG_MSG_H)
 #define PS_LOG_MSG_H
-#endif
 
 /** \file psLogMsg.h
  *  \brief log messaging facilities
- *  \ingroup SystemGroup
+ *  \ingroup LogTrace
  */
 
 #include <stdarg.h>
 
-/** Functions **************************************************************/
-/** \addtogroup SystemGroup System Utilities
- *  \{
+/** @addtogroup LogTrace
+ *  @{
  */
 
@@ -56,5 +54,4 @@
 ;
 
-/* \} */ // End of SystemGroup Functions
 
 ///< Status codes for log messages
@@ -71,2 +68,5 @@
     PS_LOG_TO_STDOUT };
 
+/// @}
+
+#endif
Index: /trunk/psLib/src/sysUtils/psMemory.h
===================================================================
--- /trunk/psLib/src/sysUtils/psMemory.h	(revision 973)
+++ /trunk/psLib/src/sysUtils/psMemory.h	(revision 974)
@@ -12,8 +12,8 @@
  *  @author Robert Lupton, Princeton University
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-04 23:46:48 $
- *
- *  @ingroup SystemGroup System Utilities
+ *  @ingroup MemoryManagement
+ *
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,12 +21,7 @@
 
 #include <stdio.h>                      // needed for FILE
-#include <pthread.h>                   // we need a mutex to make this stuff thread safe.
-
-/** @addtogroup MemoryManagement Memory Management Utilities
- *  @ingroup SystemGroup
- *
- *  This is the generic memory management system put inbetween the user's high level code and the OS-level
- *  memory allocation routines.  This system adds such features as callback routines for memory error events,
- *  tracing capabilities, and reference counting.
+#include <pthread.h>                    // we need a mutex to make this stuff thread safe.
+
+/** @addtogroup MemoryManagement
  *  @{
  */
Index: /trunk/psLib/src/sysUtils/psString.h
===================================================================
--- /trunk/psLib/src/sysUtils/psString.h	(revision 973)
+++ /trunk/psLib/src/sysUtils/psString.h	(revision 974)
@@ -3,5 +3,5 @@
  *  @brief Contains the declarations of string utility functions
  *
- *  @ingroup SystemGroup
+ *  @ingroup SysUtils
  *
  *  String utility functions defined shall provide basic string copying
@@ -9,7 +9,7 @@
  *
  *  @author Eric Van Alst, MHPCC
- *   
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-28 22:19:20 $
+ *
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -37,5 +37,5 @@
 
 // Doxygen group tags
-/** @addtogroup SystemGroup System Utilities
+/** @addtogroup SysUtils
  *  @{
  */
Index: /trunk/psLib/src/sysUtils/psTrace.h
===================================================================
--- /trunk/psLib/src/sysUtils/psTrace.h	(revision 973)
+++ /trunk/psLib/src/sysUtils/psTrace.h	(revision 974)
@@ -6,5 +6,5 @@
 /** \file psTrace.h
  *  \brief basic run-time trace facilities
- *  \ingroup SystemGroup
+ *  \ingroup LogTrace
  */
 
@@ -23,8 +23,10 @@
 Component;
 
-/** Functions **************************************************************/
-/** \addtogroup SystemGroup System Utilities
+/** \addtogroup LogTrace
  *  \{
  */
+
+
+/** Functions **************************************************************/
 
 /// Send a trace message
Index: /trunk/psLib/src/sysUtils/psType.h
===================================================================
--- /trunk/psLib/src/sysUtils/psType.h	(revision 973)
+++ /trunk/psLib/src/sysUtils/psType.h	(revision 974)
@@ -5,9 +5,11 @@
  *  This file defines common datatypes used throughout psLib.
  *
+ *  @ingroup DataContainer
+ *
  *  @author Robert DeSonia, MHPCC
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-02 23:29:14 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -19,4 +21,7 @@
 #include <complex.h>
 #include <stdint.h>
+
+/// @addtogroup DataContainer
+/// @{
 
 /******************************************************************************/
@@ -114,3 +119,5 @@
 psType;
 
+/// @}
+
 #endif
Index: /trunk/psLib/src/types/psBitSet.h
===================================================================
--- /trunk/psLib/src/types/psBitSet.h	(revision 973)
+++ /trunk/psLib/src/types/psBitSet.h	(revision 974)
@@ -8,8 +8,10 @@
  *  string.
  *
+ *  @ingroup BitSet
+ *
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-10 00:29:57 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -18,4 +20,7 @@
 #ifndef PSBITSET_H
 #define PSBITSET_H
+
+/// @addtogroup BitSet
+/// @{
 
 /******************************************************************************/
@@ -111,3 +116,5 @@
 );
 
+/// @}
+
 #endif
Index: /trunk/psLib/src/types/psList.h
===================================================================
--- /trunk/psLib/src/types/psList.h	(revision 973)
+++ /trunk/psLib/src/types/psList.h	(revision 974)
@@ -4,11 +4,12 @@
 /** @file psList.h
  *  @brief Support for doubly linked lists
- *  @ingroup DataContainers
  *
  *  @author Robert Lupton, Princeton University
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-09 02:16:41 $
+ *  @ingroup LinkedList
+ *
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -18,4 +19,8 @@
 
 #include "psVector.h"
+
+/** @addtogroup LinkedList
+ *  @{
+ */
 
 /** Special values of index into list
@@ -54,8 +59,4 @@
 }
 psList;
-
-/** @addtogroup DataContainers General Data Container Utilities
- *  @{
- */
 
 /** Constructor */