Index: trunk/psLib/src/sys/Makefile.am
===================================================================
--- trunk/psLib/src/sys/Makefile.am	(revision 4446)
+++ trunk/psLib/src/sys/Makefile.am	(revision 4540)
@@ -1,45 +1,37 @@
-#Makefile for sysUtils functions of psLib
+#Makefile for sys functions of psLib
 #
-INCLUDES = \
-	-I$(top_srcdir)/src/astro \
-	-I$(top_srcdir)/src/db \
-	-I$(top_srcdir)/src/fft \
-	-I$(top_srcdir)/src/fits \
-	-I$(top_srcdir)/src/imageops \
-	-I$(top_srcdir)/src/math \
-	-I$(top_srcdir)/src/mathtypes \
-	-I$(top_srcdir)/src/sys \
-	-I$(top_srcdir)/src/types \
-	-I$(top_srcdir)/src/xml \
-	$(all_includes)
+noinst_LTLIBRARIES = libpslibsys.la
 
-noinst_LTLIBRARIES = libpslibsysUtils.la
+libpslibsys_la_SOURCES = \
+	psAbort.c \
+	psConfigure.c  \
+	psError.c      \
+	psErrorCodes.c \
+	psLogMsg.c     \
+	psMemory.c     \
+	psString.c     \
+	psTrace.c
 
-libpslibsysUtils_la_SOURCES = \
-	psMemory.c     \
-	psError.c      \
-	psTrace.c      \
-	psLogMsg.c     \
-	psAbort.c      \
-	psString.c     \
-	psConfigure.c  \
-	psErrorCodes.c
+EXTRA_DIST = sys.i
 
-BUILT_SOURCES = psSysUtilsErrors.h
-EXTRA_DIST = psSysUtilsErrors.dat psSysUtilsErrors.h sysUtils.i
+BUILT_SOURCES = psErrorCodes.c
 
-psSysUtilsErrors.h: psSysUtilsErrors.dat
-	$(top_srcdir)/src/psParseErrorCodes --data=$? $@
+psErrorCodes.c: ../psErrorCodes_$(LANG).dat psErrorCodes.c.in psErrorCodes.h
+	$(top_srcdir)/psParseErrorCodes --data=../psErrorCodes_$(LANG).dat $@
+
+psError.h: psErrorCodes.h
+
+psErrorCodes.h: ../psErrorCodes_$(LANG).dat psErrorCodes.h.in
+	$(top_srcdir)/psParseErrorCodes --data=../psErrorCodes_$(LANG).dat $@
 
 pslibincludedir = $(includedir)
 pslibinclude_HEADERS = \
-	psType.h       \
+	psAbort.h \
+	psConfigure.h  \
+	psError.h      \
+	psErrorCodes.h \
+	psLogMsg.h     \
 	psMemory.h     \
-	psError.h      \
+	psString.h     \
 	psTrace.h      \
-	psLogMsg.h     \
-	psAbort.h      \
-	psString.h     \
-	psConfigure.h  \
-	psErrorCodes.h
-
+	psType.h
Index: trunk/psLib/src/sys/psConfigure.c
===================================================================
--- trunk/psLib/src/sys/psConfigure.c	(revision 4446)
+++ trunk/psLib/src/sys/psConfigure.c	(revision 4540)
@@ -13,6 +13,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-11 02:19:05 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-12 19:12:01 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -22,5 +22,5 @@
 #include "psError.h"
 #include "psConfigure.h"
-#include "psSysUtilsErrors.h"
+#include "psErrorText.h"
 #include "config.h"
 
Index: trunk/psLib/src/sys/psErrorCodes.c
===================================================================
--- trunk/psLib/src/sys/psErrorCodes.c	(revision 4446)
+++ trunk/psLib/src/sys/psErrorCodes.c	(revision 4540)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-25 02:02:05 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-12 19:12:01 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -20,21 +20,9 @@
 #include "psMemory.h"
 
-#include "psSysUtilsErrors.h"
-
-/* N.B., lines between '//~Start' and '//~End' are automatic generated from
- * the template following the '//~Start'.  The template is used to generate
- * the other lines by, for each error class in psErrorCodes.dat, the following
- * substitutions are made:
- *     $1  The error code name (first word in the psErrorCodes.dat lines)
- *     $2  The error description (rest of the line in psErrorCodes.dat)
- *     $n  The order of the source line in psErrorCodes.dat (comments excluded)
- *
- * DO NOT EDIT THE LINES BETWEEN //~Start and //~End!  ANY CHANGES WILL BE OVERWRITTEN.
- */
+#include "psErrorText.h"
 
 static psErrorDescription staticErrorCodes[] = {
             {PS_ERR_NONE,"not an error"},
             {PS_ERR_BASE,"base error"},
-            //~Start    {PS_ERR_$1,"$2"},
             {PS_ERR_UNKNOWN,"unknown error"},
             {PS_ERR_IO,"I/O error"},
@@ -48,5 +36,4 @@
             {PS_ERR_UNEXPECTED_NULL,"unexpected NULL found"},
             {PS_ERR_OS_CALL_FAILED,"unexpected result from an OS standard library call"},
-            //~End
             {PS_ERR_N_ERR_CLASSES,"error classes end marker"}
         };
Index: trunk/psLib/src/sys/psErrorCodes.h
===================================================================
--- trunk/psLib/src/sys/psErrorCodes.h	(revision 4446)
+++ 	(revision )
@@ -1,111 +1,0 @@
-/** @file  psErrorCodes.h
- *
- *  @brief Contains the error codes for the error classes
- *
- *  @ingroup ErrorHandling
- *
- *  @author Robert DeSonia, MHPCC
- *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
- *
- *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
- */
-
-#ifndef PS_ERROR_CODES_H
-#define PS_ERROR_CODES_H
-
-#include "psType.h"
-
-/* N.B., lines between '//~Start' and '//~End' are automatic generated from
- * the template following the '//~Start'.  The template is used to generate
- * the other lines by, for each error class in psErrorCodes.dat, the following
- * substitutions are made:
- *     $1  The error code name (first word in the psErrorCodes.dat lines)
- *     $2  The error description (rest of the line in psErrorCodes.dat)
- *     $n  The order of the source line in psErrorCodes.dat (comments excluded)
- *
- * DO NOT EDIT THE LINES BETWEEN //~Start and //~End!  ANY CHANGES WILL BE OVERWRITTEN.
- */
-
-/** @addtogroup ErrorHandling
- *  @{
- */
-
-/** enumeration of the static error code classes
- */
-typedef enum {
-    PS_ERR_NONE = 0,                   ///< not an error
-    PS_ERR_BASE = 256,
-    /**< base error.  Any psErrorCode less than this should be taken to be
-     *   valid values of errno
-     */
-
-    //~Start     PS_ERR_$1,   ///< $2
-    PS_ERR_UNKNOWN,   ///< unknown error
-    PS_ERR_IO,   ///< I/O error
-    PS_ERR_LOCATION_INVALID,   ///< specified location is unknown
-    PS_ERR_MEMORY_CORRUPTION,   ///< memory corruption detected
-    PS_ERR_MEMORY_DEREF_USAGE,   ///< dereferenced memory still used
-    PS_ERR_BAD_PARAMETER_VALUE,   ///< parameter is out-of-range
-    PS_ERR_BAD_PARAMETER_TYPE,   ///< parameter is of unsupported type
-    PS_ERR_BAD_PARAMETER_NULL,   ///< parameter is null
-    PS_ERR_BAD_PARAMETER_SIZE,   ///< size of parameter's data is outside of acceptable range.
-    PS_ERR_UNEXPECTED_NULL,   ///< unexpected NULL found
-    PS_ERR_OS_CALL_FAILED,   ///< unexpected result from an OS standard library call
-    //~End
-    PS_ERR_N_ERR_CLASSES               ///< end marker - should not be used as a true error
-} psErrorCode;
-
-/** An error code with description
- */
-typedef struct
-{
-    psErrorCode code;                  ///< An error code
-    const char *description;           ///< the associated description
-}
-psErrorDescription;
-
-/** Allocates a new psErrorDescription
- *
- *  @return psErrorDescription*        new psErrorDescription struct.
- */
-psErrorDescription* psErrorDescriptionAlloc(
-    psErrorCode code,                  ///< An error code
-    const char *description            ///< the associated description
-);
-
-/** Retrieves the description of an error code.
- *
- *  The routine psErrorCodeString returns the string associated with an error
- *  code.
- *
- *  @return const char*     the description associated with the given code.
- */
-const char *psErrorCodeString(
-    psErrorCode code                   ///< the associated error code
-);
-
-/** Register an error code
- *
- *  Any project needed to use psLib must define the necessary error codes and
- *  associated message strings.  This function registers an array of error
- *  codes with the error handling subsystem.
- *
- */
-void psErrorRegister(
-    const psErrorDescription* errors,  ///< Array of error codes to register
-    psS32 nerror                         ///< number of errors in input array
-);
-
-/** Clears error codes registered via psErrorRegister.
- *
- *  @return psBool    TRUE if given errorcode was removed, otherwise FALSE.
- */
-psBool p_psErrorUnregister(
-    psErrorCode code                   ///< the error code to find and remove
-);
-
-/// @}
-
-#endif // #ifndef PS_ERROR_CODES_H
Index: trunk/psLib/src/sys/psErrorCodes.h.in
===================================================================
--- trunk/psLib/src/sys/psErrorCodes.h.in	(revision 4540)
+++ trunk/psLib/src/sys/psErrorCodes.h.in	(revision 4540)
@@ -0,0 +1,87 @@
+/** @file  psErrorCodes.h
+ *
+ *  @brief Contains the error codes for the error classes
+ *
+ *  @ingroup ErrorHandling
+ *
+ *  @author Robert DeSonia, MHPCC
+ *
+ *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-12 19:12:01 $
+ *
+ *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
+ */
+
+#ifndef PS_ERROR_CODES_H
+#define PS_ERROR_CODES_H
+
+#include "psType.h"
+
+/** @addtogroup ErrorHandling
+ *  @{
+ */
+
+/** enumeration of the static error code classes
+ */
+typedef enum {
+    PS_ERR_NONE = 0,                   ///< not an error
+    PS_ERR_BASE = 256,
+    /**< base error.  Any psErrorCode less than this should be taken to be
+     *   valid values of errno
+     */
+    PS_ERR_${ErrorCode},
+    PS_ERR_N_ERR_CLASSES               ///< end marker - should not be used as a true error
+} psErrorCode;
+
+/** An error code with description
+ */
+typedef struct
+{
+    psErrorCode code;                  ///< An error code
+    const char *description;           ///< the associated description
+}
+psErrorDescription;
+
+/** Allocates a new psErrorDescription
+ *
+ *  @return psErrorDescription*        new psErrorDescription struct.
+ */
+psErrorDescription* psErrorDescriptionAlloc(
+    psErrorCode code,                  ///< An error code
+    const char *description            ///< the associated description
+);
+
+/** Retrieves the description of an error code.
+ *
+ *  The routine psErrorCodeString returns the string associated with an error
+ *  code.
+ *
+ *  @return const char*     the description associated with the given code.
+ */
+const char *psErrorCodeString(
+    psErrorCode code                   ///< the associated error code
+);
+
+/** Register an error code
+ *
+ *  Any project needed to use psLib must define the necessary error codes and
+ *  associated message strings.  This function registers an array of error
+ *  codes with the error handling subsystem.
+ *
+ */
+void psErrorRegister(
+    const psErrorDescription* errors,  ///< Array of error codes to register
+    psS32 nerror                         ///< number of errors in input array
+);
+
+/** Clears error codes registered via psErrorRegister.
+ *
+ *  @return psBool    TRUE if given errorcode was removed, otherwise FALSE.
+ */
+psBool p_psErrorUnregister(
+    psErrorCode code                   ///< the error code to find and remove
+);
+
+/// @}
+
+#endif // #ifndef PS_ERROR_CODES_H
Index: trunk/psLib/src/sys/psLogMsg.c
===================================================================
--- trunk/psLib/src/sys/psLogMsg.c	(revision 4446)
+++ trunk/psLib/src/sys/psLogMsg.c	(revision 4540)
@@ -12,6 +12,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-23 03:50:29 $
+ *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-12 19:12:01 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -42,5 +42,5 @@
 #include "psTrace.h"
 
-#include "psSysUtilsErrors.h"
+#include "psErrorText.h"
 
 #define MIN_LOG_LEVEL 0
Index: trunk/psLib/src/sys/psMemory.c
===================================================================
--- trunk/psLib/src/sys/psMemory.c	(revision 4446)
+++ trunk/psLib/src/sys/psMemory.c	(revision 4540)
@@ -8,6 +8,6 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-27 20:38:12 $
+*  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-12 19:12:01 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -25,5 +25,5 @@
 #include "psLogMsg.h"
 
-#include "psSysUtilsErrors.h"
+#include "psErrorText.h"
 
 #define P_PS_MEMMAGIC (psPtr )0xdeadbeef   // Magic number in psMemBlock header
Index: trunk/psLib/src/sys/psString.c
===================================================================
--- trunk/psLib/src/sys/psString.c	(revision 4446)
+++ trunk/psLib/src/sys/psString.c	(revision 4540)
@@ -12,6 +12,6 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-30 00:33:36 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-12 19:12:01 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -25,5 +25,5 @@
 #include "psError.h"
 
-#include "psSysUtilsErrors.h"
+#include "psErrorText.h"
 
 psString psStringCopy(const char *string)
Index: trunk/psLib/src/sys/psTrace.c
===================================================================
--- trunk/psLib/src/sys/psTrace.c	(revision 4446)
+++ trunk/psLib/src/sys/psTrace.c	(revision 4540)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-28 20:17:52 $
+ *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-12 19:12:01 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -51,5 +51,5 @@
 #include "psLogMsg.h"
 
-#include "psSysUtilsErrors.h"
+#include "psErrorText.h"
 
 static p_psComponent* cRoot = NULL; // The root of the trace component
Index: trunk/psLib/src/sys/psType.h
===================================================================
--- trunk/psLib/src/sys/psType.h	(revision 4446)
+++ trunk/psLib/src/sys/psType.h	(revision 4540)
@@ -10,6 +10,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-22 02:05:41 $
+*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-12 19:12:01 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -94,4 +94,50 @@
 } psElemType;
 
+/** Enumeration primarily used with metadata which defines a data structure
+ *  e.g., list, array, FITS file, etc.
+*/
+typedef enum {
+    PS_DATA_S32  = PS_TYPE_S32,        ///< psS32
+    PS_DATA_F32  = PS_TYPE_F32,        ///< psF32
+    PS_DATA_F64  = PS_TYPE_F64,        ///< psF64
+    PS_DATA_BOOL = PS_TYPE_BOOL,       ///< psBool
+    PS_DATA_STRING = 0x10000,          ///< psString (char *)
+    PS_DATA_ARRAY,                     ///< psArray
+    PS_DATA_BITSET,                    ///< psBitSet
+    PS_DATA_CELL,                      ///< psCell
+    PS_DATA_CHIP,                      ///< psChip
+    PS_DATA_CUBE,                      ///< psCube
+    PS_DATA_FITS,                      ///< psFits
+    PS_DATA_HASH,                      ///< psHash
+    PS_DATA_HISTOGRAM,                 ///< psHistogram
+    PS_DATA_IMAGE,                     ///< psImage
+    PS_DATA_KERNEL,                    ///< psKernel
+    PS_DATA_LIST,                      ///< psList
+    PS_DATA_LOOKUPTABLE,               ///< psLookupTable
+    PS_DATA_METADATA,                  ///< psMetadata
+    PS_DATA_METADATAITEM,              ///< psMetadataItem
+    PS_DATA_MINIMIZATION,              ///< psMinimization
+    PS_DATA_PIXELS,                    ///< psPixels
+    PS_DATA_PLANE,                     ///< psPlane
+    PS_DATA_PLANEDISTORT,              ///< psPlaneDistort
+    PS_DATA_PLANETRANSFORM,            ///< psPlaneTransform
+    PS_DATA_POLYNOMIAL1D,              ///< psPolynomial1D
+    PS_DATA_POLYNOMIAL2D,              ///< psPolynomial2D
+    PS_DATA_POLYNOMIAL3D,              ///< psPolynomial3D
+    PS_DATA_POLYNOMIAL4D,              ///< psPolynomial4D
+    PS_DATA_PROJECTION,                ///< psProjection
+    PS_DATA_READOUT,                   ///< psReadout
+    PS_DATA_REGION,                    ///< psRegion
+    PS_DATA_SCALAR,                    ///< psScalar
+    PS_DATA_SPHERE,                    ///< psSphere
+    PS_DATA_SPHERETRANSFORM,           ///< psSphereTransform
+    PS_DATA_SPLINE1D,                  ///< psSpline1D
+    PS_DATA_STATS,                     ///< psStats
+    PS_DATA_TIME,                      ///< psTime
+    PS_DATA_VECTOR,                    ///< psVector
+    PS_DATA_UNKNOWN,                   ///< Other data of an unknown type
+    PS_DATA_METADATA_MULTI             ///< Used internally for metadata; not a 'real' type
+} psDataType;
+
 #define PS_TYPE_MASK PS_TYPE_U8        /**< the psElemType to use for mask image */
 #define PS_TYPE_MASK_DATA U8           /**< the data member to use for mask image */
@@ -232,8 +278,16 @@
 typedef struct
 {
-    psElemType type;            ///< Primitive type.
-    psDimen dimen;              ///< Dimensionality.
+    psElemType type;                   ///< Primitive type.
+    psDimen dimen;                     ///< Dimensionality.
 }
 psType;
+
+typedef struct
+{
+    psElemType type;                   ///< The type
+    psDimen dimen;                     ///< The dimensionality.
+    //    psElemType type;                   ///< The type
+}
+psMathType;
 
 /** The type of a basic data type
@@ -245,5 +299,5 @@
 typedef struct
 {
-    psType  type;              ///< Data type information
+    psMathType type;              ///< Data type information
 }
 psMath;
Index: trunk/psLib/src/sys/sys.i
===================================================================
--- trunk/psLib/src/sys/sys.i	(revision 4540)
+++ trunk/psLib/src/sys/sys.i	(revision 4540)
@@ -0,0 +1,11 @@
+/* sys headers */
+
+%include "psAbort.h"
+%include "psConfigure.h"
+%include "psErrorCodes.h"
+%include "psError.h"
+%include "psLogMsg.h"
+%include "psMemory.h"
+%include "psString.h"
+%include "psTrace.h"
+%include "psType.h"