Index: trunk/psLib/src/pslib_strict.h
===================================================================
--- trunk/psLib/src/pslib_strict.h	(revision 4162)
+++ trunk/psLib/src/pslib_strict.h	(revision 4540)
@@ -9,6 +9,6 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-08 23:40:45 $
+*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-12 19:12:00 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26,159 +26,84 @@
 #endif // #else
 
-// // System Utilities
-
-/// @defgroup SysUtils System Utilities
+/// @defgroup astro Astrometry Functions
 /// @{
-
-/** @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 "fitsio.h"
-
-#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"
-
-/// @defgroup Configure Configure psLib
-/// @ingroup SysUtils
-#include "psConfigure.h"
-
+#include "psTime.h"
+#include "psCoord.h"
 /// @}
 
-// Collections
-/// @defgroup DataContainer Data Containers
+/// @defgroup db Database Functions
 /// @{
+#include "psDB.h"
+/// @}
 
-#include "psType.h"
+/// @defgroup fft Fourier Functions
+/// @{
+#include "psVectorFFT.h"
+#include "psImageFFT.h"
+/// @}
 
-/// @defgroup LinkedList Linked List
-/// @ingroup DataContainer
-#include "psList.h"
+/// @defgroup fits FITS I/O Functions
+/// @{
+#include "psFits.h"
+/// @}
 
-/// @defgroup HashTable Hash Table
-/// @ingroup DataContainer
-#include "psHash.h"
+/// @defgroup imageops Image Operations
+/// @{
+#include "psImageConvolve.h"
+#include "psImageGeomManip.h"
+#include "psImagePixelExtract.h"
+#include "psImagePixelManip.h"
+#include "psImageStats.h"
+#include "psImageStructManip.h"
+/// @}
 
-/// @defgroup Scalar Scalar
-/// @ingroup DataContainer
-#include "psScalar.h"
+/// @defgroup math Math Functions
+/// @{
+#include "psBinaryOp.h"
+#include "psCompare.h"
+#include "psConstants.h"
+#include "psMatrix.h"
+#include "psMinimize.h"
+#include "psRandom.h"
+#include "psFunctions.h"
+#include "psStats.h"
+#include "psUnaryOp.h"
+/// @}
 
-/// @defgroup Vector Vector Container
-/// @ingroup DataContainer
-#include "psVector.h"
-
-/// @defgroup Array Array Container
-/// @ingroup DataContainer
-#include "psArray.h"
-
-/// @defgroup Image Image Container
-/// @ingroup DataContainer
+/// @defgroup mathtypes Mathematical Data Objects
 /// @{
 #include "psImage.h"
-#include "psImagePixelExtract.h"
-#include "psImageStructManip.h"
-#include "psImageGeomManip.h"
-#include "psImagePixelManip.h"
-#include "psImageConvolve.h"
-
-/// @defgroup ImageStats Image Statistical Functions
-/// @ingroup Image
-#include "psImageStats.h"
-
+#include "psScalar.h"
+#include "psVector.h"
 /// @}
 
-/// @defgroup BitSet Bit Set Container
-/// @ingroup DataContainer
-#include "psBitSet.h"
-
+/// @defgroup sys System-Level Functions
+/// @{
+#include "psAbort.h"
+#include "psConfigure.h"
+#include "psError.h"
+#include "psErrorCodes.h"
+#include "psLogMsg.h"
+#include "psMemory.h"
+#include "psString.h"
+#include "psTrace.h"
+#include "psType.h"
 /// @}
 
-// Data Manipulation
-/// @defgroup DataManip Data Manipulation
+/// @defgroup types Basic Data Types
 /// @{
-
-/// @defgroup Compare Comparison Functions
-/// @ingroup DataManip
-#include "psCompare.h"
-
-/// @defgroup Stats Statistic Functions
-/// @ingroup DataManip
-#include "psStats.h"
-
-/// @defgroup Matrix Matrix Operations
-/// @ingroup DataManip
-#include "psMatrix.h"
-
-/// @defgroup MatrixArithmetic Matrix Arithmetic Operations
-/// @ingroup DataManip
-#include "psBinaryOp.h"
-#include "psUnaryOp.h"
-
-#include "psRandom.h"
-
-/// @defgroup Transform Fourier Transform Operations
-/// @ingroup DataManip
-#include "psVectorFFT.h"
-#include "psImageFFT.h"
-
-#include "psFunctions.h"
-#include "psMinimize.h"
-
+#include "psArray.h"
+#include "psBitSet.h"
+#include "psHash.h"
+#include "psList.h"
+#include "psLookupTable.h"
+#include "psMetadata.h"
+#include "psMetadataConfig.h"
+#include "psPixels.h"
 /// @}
 
-// Astronomy
-/// @defgroup Astronomy Astronomy Functions
+/// @defgroup xml XML Functions
 /// @{
-
-/// @defgroup CoordinateTransform Coordinate Functions
-/// @ingroup Astronomy
-#include "psCoord.h"
-
-/// @defgroup Photometry Photometry
-/// @ingroup Astronomy
-#include "psPhotometry.h"
-
-/// @defgroup Time Time Functions
-/// @ingroup Astronomy
-#include "psTime.h"
-
-/// @defgroup Metadata Metadata Functions
-/// @ingroup Astronomy
-#include "psMetadata.h"
-#include "psMetadataIO.h"
-
-/// @defgroup AstroImage Astrometry Functions
-/// @ingroup Astronomy
-#include "psAstrometry.h"
-#include "psConstants.h"
-#include "psDB.h"
-
-/// @}
-
-// FileUtils
-/// @defgroup FileUtils File Utilities
-/// @{
-#include "psFits.h"
-
-/// @defgroup LookupTable Lookup Table
-/// @ingroup FileUtils
-#include "psLookupTable.h"
-
+#include "psXML.h"
 /// @}