Index: trunk/psLib/src/Makefile.am
===================================================================
--- trunk/psLib/src/Makefile.am	(revision 3671)
+++ trunk/psLib/src/Makefile.am	(revision 3682)
@@ -28,5 +28,6 @@
 pslibinclude_HEADERS = \
 	psTest.h \
-	pslib.h
+	pslib.h \
+	pslib_strict.h
 
 install-exec-hook: libpslib.la
Index: trunk/psLib/src/astro/psCoord.c
===================================================================
--- trunk/psLib/src/astro/psCoord.c	(revision 3671)
+++ trunk/psLib/src/astro/psCoord.c	(revision 3682)
@@ -10,6 +10,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-31 23:01:46 $
+*  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -214,5 +214,5 @@
     psPlane *p = psAlloc(sizeof(psPlane));
 
-    p_psMemSetDeallocator(p, (psFreeFcn) planeFree);
+    psMemSetDeallocator(p, (psFreeFcn) planeFree);
     return(p);
 }
@@ -228,5 +228,5 @@
     psSphere *s = psAlloc(sizeof(psSphere));
 
-    p_psMemSetDeallocator(s, (psFreeFcn) sphereFree);
+    psMemSetDeallocator(s, (psFreeFcn) sphereFree);
     return(s);
 }
@@ -247,5 +247,5 @@
     pt->y = psDPolynomial2DAlloc(n1, n2, PS_POLYNOMIAL_ORD);
 
-    p_psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree);
+    psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree);
     return(pt);
 }
@@ -293,5 +293,5 @@
     pt->y = psDPolynomial4DAlloc(n1, n2, n3, n4, PS_POLYNOMIAL_ORD);
 
-    p_psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree);
+    psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree);
     return(pt);
 }
@@ -508,5 +508,5 @@
     p->type = type;
 
-    p_psMemSetDeallocator(p, (psFreeFcn) projectionFree);
+    psMemSetDeallocator(p, (psFreeFcn) projectionFree);
     return(p);
 }
Index: trunk/psLib/src/astronomy/psAstrometry.c
===================================================================
--- trunk/psLib/src/astronomy/psAstrometry.c	(revision 3671)
+++ trunk/psLib/src/astronomy/psAstrometry.c	(revision 3682)
@@ -8,6 +8,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-31 23:01:46 $
+ *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -191,5 +191,5 @@
     }
 
-    p_psMemSetDeallocator(tmp,(psFreeFcn)fixedPatternFree);
+    psMemSetDeallocator(tmp,(psFreeFcn)fixedPatternFree);
 
     return(tmp);
@@ -238,5 +238,5 @@
     exp->telescopeName = NULL;
 
-    p_psMemSetDeallocator(exp,(psFreeFcn)exposureFree);
+    psMemSetDeallocator(exp,(psFreeFcn)exposureFree);
 
     return exp;
@@ -263,5 +263,5 @@
     *(double *)&obs->tlr = tlr;
 
-    p_psMemSetDeallocator(obs,(psFreeFcn)observatoryFree);
+    psMemSetDeallocator(obs,(psFreeFcn)observatoryFree);
 
     return obs;
@@ -304,5 +304,5 @@
     newFPA->chi2 = 0.0f;
 
-    p_psMemSetDeallocator(newFPA,(psFreeFcn)FPAFree);
+    psMemSetDeallocator(newFPA,(psFreeFcn)FPAFree);
 
     return newFPA;
@@ -338,5 +338,5 @@
     chip->parent = parentFPA;
 
-    p_psMemSetDeallocator(chip,(psFreeFcn)chipFree);
+    psMemSetDeallocator(chip,(psFreeFcn)chipFree);
 
     return chip;
@@ -376,5 +376,5 @@
     cell->parent = parentChip;
 
-    p_psMemSetDeallocator(cell,(psFreeFcn)cellFree);
+    psMemSetDeallocator(cell,(psFreeFcn)cellFree);
 
     return cell;
@@ -399,5 +399,5 @@
     readout->metadata = NULL;
 
-    p_psMemSetDeallocator(readout,(psFreeFcn)readoutFree);
+    psMemSetDeallocator(readout,(psFreeFcn)readoutFree);
 
     return readout;
Index: trunk/psLib/src/astronomy/psCoord.c
===================================================================
--- trunk/psLib/src/astronomy/psCoord.c	(revision 3671)
+++ trunk/psLib/src/astronomy/psCoord.c	(revision 3682)
@@ -10,6 +10,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-31 23:01:46 $
+*  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -214,5 +214,5 @@
     psPlane *p = psAlloc(sizeof(psPlane));
 
-    p_psMemSetDeallocator(p, (psFreeFcn) planeFree);
+    psMemSetDeallocator(p, (psFreeFcn) planeFree);
     return(p);
 }
@@ -228,5 +228,5 @@
     psSphere *s = psAlloc(sizeof(psSphere));
 
-    p_psMemSetDeallocator(s, (psFreeFcn) sphereFree);
+    psMemSetDeallocator(s, (psFreeFcn) sphereFree);
     return(s);
 }
@@ -247,5 +247,5 @@
     pt->y = psDPolynomial2DAlloc(n1, n2, PS_POLYNOMIAL_ORD);
 
-    p_psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree);
+    psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree);
     return(pt);
 }
@@ -293,5 +293,5 @@
     pt->y = psDPolynomial4DAlloc(n1, n2, n3, n4, PS_POLYNOMIAL_ORD);
 
-    p_psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree);
+    psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree);
     return(pt);
 }
@@ -508,5 +508,5 @@
     p->type = type;
 
-    p_psMemSetDeallocator(p, (psFreeFcn) projectionFree);
+    psMemSetDeallocator(p, (psFreeFcn) projectionFree);
     return(p);
 }
Index: trunk/psLib/src/astronomy/psMetadata.c
===================================================================
--- trunk/psLib/src/astronomy/psMetadata.c	(revision 3671)
+++ trunk/psLib/src/astronomy/psMetadata.c	(revision 3682)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-29 21:31:54 $
+*  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -183,5 +183,5 @@
 
     // Set deallocator
-    p_psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);
+    psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);
 
     // Allocate and set metadata item comment
@@ -252,5 +252,5 @@
     metadata = (psMetadata*) psAlloc(sizeof(psMetadata));
     // Set deallocator
-    p_psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);
+    psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);
 
     // Allocate metadata's internal containers
@@ -598,5 +598,5 @@
 
     // Set deallocator
-    p_psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);
+    psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);
 
     if (regex == NULL) {
Index: trunk/psLib/src/collections/psArray.c
===================================================================
--- trunk/psLib/src/collections/psArray.c	(revision 3671)
+++ trunk/psLib/src/collections/psArray.c	(revision 3682)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-18 22:17:20 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -55,5 +55,5 @@
     // Create vector struct
     psArr = (psArray* ) psAlloc(sizeof(psArray));
-    p_psMemSetDeallocator(psArr, (psFreeFcn) arrayFree);
+    psMemSetDeallocator(psArr, (psFreeFcn) arrayFree);
 
     psArr->nalloc = nalloc;
Index: trunk/psLib/src/collections/psBitSet.c
===================================================================
--- trunk/psLib/src/collections/psBitSet.c	(revision 3671)
+++ trunk/psLib/src/collections/psBitSet.c	(revision 3682)
@@ -11,6 +11,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-22 19:25:52 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -80,5 +80,5 @@
     numBytes = ceil(n / 8.0);
     newObj = psAlloc(sizeof(psBitSet));
-    p_psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree);
+    psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree);
     newObj->n = numBytes;
 
Index: trunk/psLib/src/collections/psHash.c
===================================================================
--- trunk/psLib/src/collections/psHash.c	(revision 3671)
+++ trunk/psLib/src/collections/psHash.c	(revision 3682)
@@ -12,6 +12,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-18 22:17:20 $
+*  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -90,5 +90,5 @@
     psHashBucket* bucket = psAlloc(sizeof(psHashBucket));
 
-    p_psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree);
+    psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree);
 
     // Initialize the bucket.
@@ -141,5 +141,5 @@
     psHash* table = psAlloc(sizeof(psHash));
 
-    p_psMemSetDeallocator(table, (psFreeFcn) hashFree);
+    psMemSetDeallocator(table, (psFreeFcn) hashFree);
 
     // Allocate memory for the buckets.
Index: trunk/psLib/src/collections/psList.c
===================================================================
--- trunk/psLib/src/collections/psList.c	(revision 3671)
+++ trunk/psLib/src/collections/psList.c	(revision 3682)
@@ -6,6 +6,6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:23 $
+ *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -45,5 +45,5 @@
     psArray* iterators = list->iterators;
     for (int i = 0; i < iterators->n; i++) {
-        p_psMemSetDeallocator(iterators->data[i], NULL);
+        psMemSetDeallocator(iterators->data[i], NULL);
     }
 
@@ -129,5 +129,5 @@
     psList* list = psAlloc(sizeof(psList));
 
-    p_psMemSetDeallocator(list, (psFreeFcn) listFree);
+    psMemSetDeallocator(list, (psFreeFcn) listFree);
 
     list->size = 0;
@@ -153,5 +153,5 @@
     psListIterator* iter = psAlloc(sizeof(psListIterator));
 
-    p_psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree);
+    psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree);
 
     // initialize the attributes
Index: trunk/psLib/src/collections/psMetadata.c
===================================================================
--- trunk/psLib/src/collections/psMetadata.c	(revision 3671)
+++ trunk/psLib/src/collections/psMetadata.c	(revision 3682)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-29 21:31:54 $
+*  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -183,5 +183,5 @@
 
     // Set deallocator
-    p_psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);
+    psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);
 
     // Allocate and set metadata item comment
@@ -252,5 +252,5 @@
     metadata = (psMetadata*) psAlloc(sizeof(psMetadata));
     // Set deallocator
-    p_psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);
+    psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);
 
     // Allocate metadata's internal containers
@@ -598,5 +598,5 @@
 
     // Set deallocator
-    p_psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);
+    psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);
 
     if (regex == NULL) {
Index: trunk/psLib/src/collections/psVector.c
===================================================================
--- trunk/psLib/src/collections/psVector.c	(revision 3671)
+++ trunk/psLib/src/collections/psVector.c	(revision 3682)
@@ -9,6 +9,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-22 21:52:49 $
+*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -51,5 +51,5 @@
     // Create vector struct
     psVec = (psVector* ) psAlloc(sizeof(psVector));
-    p_psMemSetDeallocator(psVec, (psFreeFcn) vectorFree);
+    psMemSetDeallocator(psVec, (psFreeFcn) vectorFree);
 
     psVec->type.dimen = PS_DIMEN_VECTOR;
Index: trunk/psLib/src/dataIO/psFits.c
===================================================================
--- trunk/psLib/src/dataIO/psFits.c	(revision 3671)
+++ trunk/psLib/src/dataIO/psFits.c	(revision 3682)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-06 01:12:58 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -249,5 +249,5 @@
     fits->p_fd = fptr;
     strcpy((char*)fits->filename,name);
-    p_psMemSetDeallocator(fits,(psFreeFcn)fitsFree);
+    psMemSetDeallocator(fits,(psFreeFcn)fitsFree);
 
     return fits;
Index: trunk/psLib/src/dataIO/psLookupTable.c
===================================================================
--- trunk/psLib/src/dataIO/psLookupTable.c	(revision 3671)
+++ trunk/psLib/src/dataIO/psLookupTable.c	(revision 3682)
@@ -7,6 +7,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-31 02:33:17 $
+*  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii
@@ -421,5 +421,5 @@
 
     // Set deallocator
-    p_psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree);
+    psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree);
 
     // Allocate and set metadata item comment
Index: trunk/psLib/src/dataManip/psFunctions.c
===================================================================
--- trunk/psLib/src/dataManip/psFunctions.c	(revision 3671)
+++ trunk/psLib/src/dataManip/psFunctions.c	(revision 3682)
@@ -7,6 +7,6 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.95 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-06 01:12:58 $
+ *  @version $Revision: 1.96 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1048,5 +1048,5 @@
 
     newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);
 
     newPoly->type = type;
@@ -1075,5 +1075,5 @@
 
     newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);
 
     newPoly->type = type;
@@ -1113,5 +1113,5 @@
 
     newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);
 
     newPoly->type = type;
@@ -1161,5 +1161,5 @@
 
     newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);
 
     newPoly->type = type;
@@ -1410,5 +1410,5 @@
 
     newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);
 
     newPoly->type = type;
@@ -1437,5 +1437,5 @@
 
     newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);
 
     newPoly->type = type;
@@ -1475,5 +1475,5 @@
 
     newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);
 
     newPoly->type = type;
@@ -1523,5 +1523,5 @@
 
     newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);
 
     newPoly->type = type;
@@ -1829,5 +1829,5 @@
     tmp->knots->data.F32[numSplines] = max;
 
-    p_psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
     return(tmp);
 }
@@ -1872,5 +1872,5 @@
     }
 
-    p_psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
     return(tmp);
 }
Index: trunk/psLib/src/dataManip/psStats.c
===================================================================
--- trunk/psLib/src/dataManip/psStats.c	(revision 3671)
+++ trunk/psLib/src/dataManip/psStats.c	(revision 3682)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.124 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-29 22:51:24 $
+ *  @version $Revision: 1.125 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1833,5 +1833,5 @@
     // bins, then there are N+1 bounds to those bins.
     newHist = (psHistogram* ) psAlloc(sizeof(psHistogram));
-    p_psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);
+    psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);
     newHist->bounds = psVectorAlloc(n + 1, PS_TYPE_F32);
     newHist->bounds->n = newHist->bounds->nalloc;
@@ -1880,5 +1880,5 @@
     // Allocate memory for the new histogram structure.
     newHist = (psHistogram* ) psAlloc(sizeof(psHistogram));
-    p_psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);
+    psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);
     newHist->bounds = psVectorAlloc(bounds->n, PS_TYPE_F32);
     newHist->bounds->n = newHist->bounds->nalloc;
Index: trunk/psLib/src/fileUtils/psFits.c
===================================================================
--- trunk/psLib/src/fileUtils/psFits.c	(revision 3671)
+++ trunk/psLib/src/fileUtils/psFits.c	(revision 3682)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-06 01:12:58 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -249,5 +249,5 @@
     fits->p_fd = fptr;
     strcpy((char*)fits->filename,name);
-    p_psMemSetDeallocator(fits,(psFreeFcn)fitsFree);
+    psMemSetDeallocator(fits,(psFreeFcn)fitsFree);
 
     return fits;
Index: trunk/psLib/src/fileUtils/psLookupTable.c
===================================================================
--- trunk/psLib/src/fileUtils/psLookupTable.c	(revision 3671)
+++ trunk/psLib/src/fileUtils/psLookupTable.c	(revision 3682)
@@ -7,6 +7,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-31 02:33:17 $
+*  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii
@@ -421,5 +421,5 @@
 
     // Set deallocator
-    p_psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree);
+    psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree);
 
     // Allocate and set metadata item comment
Index: trunk/psLib/src/fits/psFits.c
===================================================================
--- trunk/psLib/src/fits/psFits.c	(revision 3671)
+++ trunk/psLib/src/fits/psFits.c	(revision 3682)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-06 01:12:58 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -249,5 +249,5 @@
     fits->p_fd = fptr;
     strcpy((char*)fits->filename,name);
-    p_psMemSetDeallocator(fits,(psFreeFcn)fitsFree);
+    psMemSetDeallocator(fits,(psFreeFcn)fitsFree);
 
     return fits;
Index: trunk/psLib/src/image/psImage.c
===================================================================
--- trunk/psLib/src/image/psImage.c	(revision 3671)
+++ trunk/psLib/src/image/psImage.c	(revision 3682)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-06 01:12:58 $
+ *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -67,5 +67,5 @@
     psImage* image = (psImage* ) psAlloc(sizeof(psImage));
 
-    p_psMemSetDeallocator(image, (psFreeFcn) imageFree);
+    psMemSetDeallocator(image, (psFreeFcn) imageFree);
 
     image->data.V = psAlloc(sizeof(psPtr ) * numRows);
Index: trunk/psLib/src/image/psImageConvolve.c
===================================================================
--- trunk/psLib/src/image/psImageConvolve.c	(revision 3671)
+++ trunk/psLib/src/image/psImageConvolve.c	(revision 3682)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-11 20:27:34 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -75,5 +75,5 @@
     result->kernel = kernelRows - yMin;
 
-    p_psMemSetDeallocator(result,(psFreeFcn)freeKernel);
+    psMemSetDeallocator(result,(psFreeFcn)freeKernel);
 
     return result;
Index: trunk/psLib/src/image/psImageExtraction.c
===================================================================
--- trunk/psLib/src/image/psImageExtraction.c	(revision 3671)
+++ trunk/psLib/src/image/psImageExtraction.c	(revision 3682)
@@ -9,6 +9,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-22 21:52:49 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -105,5 +105,5 @@
 
     // set the new psImage's deallocator to the same as the input image
-    p_psMemSetDeallocator(out,p_psMemGetDeallocator(image));
+    psMemSetDeallocator(out,psMemGetDeallocator(image));
 
     inputColOffset = elementSize * col0;
Index: trunk/psLib/src/imageops/psImageConvolve.c
===================================================================
--- trunk/psLib/src/imageops/psImageConvolve.c	(revision 3671)
+++ trunk/psLib/src/imageops/psImageConvolve.c	(revision 3682)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-11 20:27:34 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -75,5 +75,5 @@
     result->kernel = kernelRows - yMin;
 
-    p_psMemSetDeallocator(result,(psFreeFcn)freeKernel);
+    psMemSetDeallocator(result,(psFreeFcn)freeKernel);
 
     return result;
Index: trunk/psLib/src/math/psPolynomial.c
===================================================================
--- trunk/psLib/src/math/psPolynomial.c	(revision 3671)
+++ trunk/psLib/src/math/psPolynomial.c	(revision 3682)
@@ -7,6 +7,6 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.95 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-06 01:12:58 $
+ *  @version $Revision: 1.96 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1048,5 +1048,5 @@
 
     newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);
 
     newPoly->type = type;
@@ -1075,5 +1075,5 @@
 
     newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);
 
     newPoly->type = type;
@@ -1113,5 +1113,5 @@
 
     newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);
 
     newPoly->type = type;
@@ -1161,5 +1161,5 @@
 
     newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);
 
     newPoly->type = type;
@@ -1410,5 +1410,5 @@
 
     newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);
 
     newPoly->type = type;
@@ -1437,5 +1437,5 @@
 
     newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);
 
     newPoly->type = type;
@@ -1475,5 +1475,5 @@
 
     newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);
 
     newPoly->type = type;
@@ -1523,5 +1523,5 @@
 
     newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);
 
     newPoly->type = type;
@@ -1829,5 +1829,5 @@
     tmp->knots->data.F32[numSplines] = max;
 
-    p_psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
     return(tmp);
 }
@@ -1872,5 +1872,5 @@
     }
 
-    p_psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
     return(tmp);
 }
Index: trunk/psLib/src/math/psSpline.c
===================================================================
--- trunk/psLib/src/math/psSpline.c	(revision 3671)
+++ trunk/psLib/src/math/psSpline.c	(revision 3682)
@@ -7,6 +7,6 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.95 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-06 01:12:58 $
+ *  @version $Revision: 1.96 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1048,5 +1048,5 @@
 
     newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);
 
     newPoly->type = type;
@@ -1075,5 +1075,5 @@
 
     newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);
 
     newPoly->type = type;
@@ -1113,5 +1113,5 @@
 
     newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);
 
     newPoly->type = type;
@@ -1161,5 +1161,5 @@
 
     newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);
 
     newPoly->type = type;
@@ -1410,5 +1410,5 @@
 
     newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);
 
     newPoly->type = type;
@@ -1437,5 +1437,5 @@
 
     newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);
 
     newPoly->type = type;
@@ -1475,5 +1475,5 @@
 
     newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);
 
     newPoly->type = type;
@@ -1523,5 +1523,5 @@
 
     newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D));
-    p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);
 
     newPoly->type = type;
@@ -1829,5 +1829,5 @@
     tmp->knots->data.F32[numSplines] = max;
 
-    p_psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
     return(tmp);
 }
@@ -1872,5 +1872,5 @@
     }
 
-    p_psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
     return(tmp);
 }
Index: trunk/psLib/src/math/psStats.c
===================================================================
--- trunk/psLib/src/math/psStats.c	(revision 3671)
+++ trunk/psLib/src/math/psStats.c	(revision 3682)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.124 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-29 22:51:24 $
+ *  @version $Revision: 1.125 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1833,5 +1833,5 @@
     // bins, then there are N+1 bounds to those bins.
     newHist = (psHistogram* ) psAlloc(sizeof(psHistogram));
-    p_psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);
+    psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);
     newHist->bounds = psVectorAlloc(n + 1, PS_TYPE_F32);
     newHist->bounds->n = newHist->bounds->nalloc;
@@ -1880,5 +1880,5 @@
     // Allocate memory for the new histogram structure.
     newHist = (psHistogram* ) psAlloc(sizeof(psHistogram));
-    p_psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);
+    psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);
     newHist->bounds = psVectorAlloc(bounds->n, PS_TYPE_F32);
     newHist->bounds->n = newHist->bounds->nalloc;
Index: trunk/psLib/src/mathtypes/psImage.c
===================================================================
--- trunk/psLib/src/mathtypes/psImage.c	(revision 3671)
+++ trunk/psLib/src/mathtypes/psImage.c	(revision 3682)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-06 01:12:58 $
+ *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -67,5 +67,5 @@
     psImage* image = (psImage* ) psAlloc(sizeof(psImage));
 
-    p_psMemSetDeallocator(image, (psFreeFcn) imageFree);
+    psMemSetDeallocator(image, (psFreeFcn) imageFree);
 
     image->data.V = psAlloc(sizeof(psPtr ) * numRows);
Index: trunk/psLib/src/mathtypes/psVector.c
===================================================================
--- trunk/psLib/src/mathtypes/psVector.c	(revision 3671)
+++ trunk/psLib/src/mathtypes/psVector.c	(revision 3682)
@@ -9,6 +9,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-22 21:52:49 $
+*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -51,5 +51,5 @@
     // Create vector struct
     psVec = (psVector* ) psAlloc(sizeof(psVector));
-    p_psMemSetDeallocator(psVec, (psFreeFcn) vectorFree);
+    psMemSetDeallocator(psVec, (psFreeFcn) vectorFree);
 
     psVec->type.dimen = PS_DIMEN_VECTOR;
Index: trunk/psLib/src/pslib.h
===================================================================
--- trunk/psLib/src/pslib.h	(revision 3671)
+++ trunk/psLib/src/pslib.h	(revision 3682)
@@ -1,3 +1,2 @@
-
 /** @file  pslib.h
 *
@@ -9,6 +8,6 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-31 23:01:46 $
+*  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -18,168 +17,5 @@
 #define PS_LIB_H
 
-/******************************************************************************/
-
-/*  INCLUDE FILES                                                             */
-
-/******************************************************************************/
-
-// // 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 "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"
-
-/// @}
-
-// Collections
-/// @defgroup DataContainer Data Containers
-/// @{
-
-#include "psType.h"
-
-/// @defgroup LinkedList Linked List
-/// @ingroup DataContainer
-#include "psList.h"
-
-/// @defgroup HashTable Hash Table
-/// @ingroup DataContainer
-#include "psHash.h"
-
-/// @defgroup Scalar Scalar
-/// @ingroup DataContainer
-#include "psScalar.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
-/// @{
-#include "psImage.h"
-#include "psImageExtraction.h"
-#include "psImageManip.h"
-#include "psImageConvolve.h"
-
-/// @defgroup ImageIO Image File I/O Functions
-/// @ingroup Image
-#include "psImageIO.h"
-
-/// @defgroup ImageStats Image Statistical Functions
-/// @ingroup Image
-#include "psImageStats.h"
-
-/// @}
-
-/// @defgroup BitSet Bit Set Container
-/// @ingroup DataContainer
-#include "psBitSet.h"
-
-/// @}
-
-// Data Manipulation
-/// @defgroup DataManip Data Manipulation
-/// @{
-
-/// @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"
-
-/// @}
-
-// Astronomy
-/// @defgroup Astronomy Astronomy 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 "pslib_strict.h"
 
 #endif
Index: trunk/psLib/src/pslib_strict.h
===================================================================
--- trunk/psLib/src/pslib_strict.h	(revision 3682)
+++ trunk/psLib/src/pslib_strict.h	(revision 3682)
@@ -0,0 +1,187 @@
+/** @file  pslib_strict.h
+*
+*  @brief Contains the complete list of header files for pslib while poisoning
+*         the use of standard memory allocation routines.
+*
+*  This header file includes all the necessary header files for a user to
+*  user all public functions within the pslib library.
+*
+*  @author Eric Van Alst, MHPCC
+*
+*  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
+*
+*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
+*/
+
+#ifndef PS_LIB_STRICT_H
+#define PS_LIB_STRICT_H
+
+#ifdef PS_LIB_H  /* this is included from pslib.h, so don't poison anything */
+#ifndef PS_ALLOW_MALLOC
+#define PS_ALLOW_MALLOC
+#endif
+#else
+#undef PS_ALLOW_MALLOC /* don't allow code to not poison malloc, i.e., strict poisioning */
+#endif
+
+// // 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 "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"
+
+/// @}
+
+// Collections
+/// @defgroup DataContainer Data Containers
+/// @{
+
+#include "psType.h"
+
+/// @defgroup LinkedList Linked List
+/// @ingroup DataContainer
+#include "psList.h"
+
+/// @defgroup HashTable Hash Table
+/// @ingroup DataContainer
+#include "psHash.h"
+
+/// @defgroup Scalar Scalar
+/// @ingroup DataContainer
+#include "psScalar.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
+/// @{
+#include "psImage.h"
+#include "psImageExtraction.h"
+#include "psImageManip.h"
+#include "psImageConvolve.h"
+
+/// @defgroup ImageIO Image File I/O Functions
+/// @ingroup Image
+#include "psImageIO.h"
+
+/// @defgroup ImageStats Image Statistical Functions
+/// @ingroup Image
+#include "psImageStats.h"
+
+/// @}
+
+/// @defgroup BitSet Bit Set Container
+/// @ingroup DataContainer
+#include "psBitSet.h"
+
+/// @}
+
+// Data Manipulation
+/// @defgroup DataManip Data Manipulation
+/// @{
+
+/// @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"
+
+/// @}
+
+// Astronomy
+/// @defgroup Astronomy Astronomy 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"
+
+/// @}
+
+#endif
Index: trunk/psLib/src/sys/psError.c
===================================================================
--- trunk/psLib/src/sys/psError.c	(revision 3671)
+++ trunk/psLib/src/sys/psError.c	(revision 3682)
@@ -10,6 +10,6 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-22 21:52:49 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -62,5 +62,5 @@
     err->code = code;
 
-    p_psMemSetDeallocator(err,(psFreeFcn)errFree);
+    psMemSetDeallocator(err,(psFreeFcn)errFree);
 
     return err;
Index: trunk/psLib/src/sys/psErrorCodes.c
===================================================================
--- trunk/psLib/src/sys/psErrorCodes.c	(revision 3671)
+++ trunk/psLib/src/sys/psErrorCodes.c	(revision 3682)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -105,5 +105,5 @@
     }
 
-    p_psMemSetDeallocator(err,(psFreeFcn)freeErrorDescription);
+    psMemSetDeallocator(err,(psFreeFcn)freeErrorDescription);
     return err;
 }
Index: trunk/psLib/src/sys/psMemory.c
===================================================================
--- trunk/psLib/src/sys/psMemory.c	(revision 3671)
+++ trunk/psLib/src/sys/psMemory.c	(revision 3682)
@@ -8,6 +8,6 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-31 02:32:20 $
+*  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -641,5 +641,5 @@
 }
 
-void p_psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn)
+void psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn)
 {
     if (vptr == NULL) {
@@ -656,5 +656,5 @@
 
 }
-psFreeFcn p_psMemGetDeallocator(psPtr vptr)
+psFreeFcn psMemGetDeallocator(psPtr vptr)
 {
     if (vptr == NULL) {
Index: trunk/psLib/src/sys/psMemory.h
===================================================================
--- trunk/psLib/src/sys/psMemory.h	(revision 3671)
+++ trunk/psLib/src/sys/psMemory.h	(revision 3682)
@@ -12,6 +12,6 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -150,5 +150,5 @@
  *
  */
-void p_psMemSetDeallocator(
+void psMemSetDeallocator(
     psPtr ptr,                         ///< the memory block to operate on
     psFreeFcn freeFcn                  ///< the function to be executed at deallocation
@@ -164,5 +164,5 @@
  *  @return psFreeFcn    the routine to be called at deallocation.
  */
-psFreeFcn p_psMemGetDeallocator(
+psFreeFcn psMemGetDeallocator(
     psPtr ptr                          ///< the memory block
 );
Index: trunk/psLib/src/sys/psTrace.c
===================================================================
--- trunk/psLib/src/sys/psTrace.c	(revision 3671)
+++ trunk/psLib/src/sys/psTrace.c	(revision 3682)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-29 21:31:54 $
+ *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -67,5 +67,5 @@
 
     p_psMemSetPersistent(comp,true);
-    p_psMemSetDeallocator(comp, (psFreeFcn) componentFree);
+    psMemSetDeallocator(comp, (psFreeFcn) componentFree);
     comp->name = psStringCopy(name);
     p_psMemSetPersistent((psPtr)comp->name,true);
Index: trunk/psLib/src/sysUtils/psError.c
===================================================================
--- trunk/psLib/src/sysUtils/psError.c	(revision 3671)
+++ trunk/psLib/src/sysUtils/psError.c	(revision 3682)
@@ -10,6 +10,6 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-22 21:52:49 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -62,5 +62,5 @@
     err->code = code;
 
-    p_psMemSetDeallocator(err,(psFreeFcn)errFree);
+    psMemSetDeallocator(err,(psFreeFcn)errFree);
 
     return err;
Index: trunk/psLib/src/sysUtils/psErrorCodes.c
===================================================================
--- trunk/psLib/src/sysUtils/psErrorCodes.c	(revision 3671)
+++ trunk/psLib/src/sysUtils/psErrorCodes.c	(revision 3682)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -105,5 +105,5 @@
     }
 
-    p_psMemSetDeallocator(err,(psFreeFcn)freeErrorDescription);
+    psMemSetDeallocator(err,(psFreeFcn)freeErrorDescription);
     return err;
 }
Index: trunk/psLib/src/sysUtils/psMemory.c
===================================================================
--- trunk/psLib/src/sysUtils/psMemory.c	(revision 3671)
+++ trunk/psLib/src/sysUtils/psMemory.c	(revision 3682)
@@ -8,6 +8,6 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-31 02:32:20 $
+*  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -641,5 +641,5 @@
 }
 
-void p_psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn)
+void psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn)
 {
     if (vptr == NULL) {
@@ -656,5 +656,5 @@
 
 }
-psFreeFcn p_psMemGetDeallocator(psPtr vptr)
+psFreeFcn psMemGetDeallocator(psPtr vptr)
 {
     if (vptr == NULL) {
Index: trunk/psLib/src/sysUtils/psMemory.h
===================================================================
--- trunk/psLib/src/sysUtils/psMemory.h	(revision 3671)
+++ trunk/psLib/src/sysUtils/psMemory.h	(revision 3682)
@@ -12,6 +12,6 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -150,5 +150,5 @@
  *
  */
-void p_psMemSetDeallocator(
+void psMemSetDeallocator(
     psPtr ptr,                         ///< the memory block to operate on
     psFreeFcn freeFcn                  ///< the function to be executed at deallocation
@@ -164,5 +164,5 @@
  *  @return psFreeFcn    the routine to be called at deallocation.
  */
-psFreeFcn p_psMemGetDeallocator(
+psFreeFcn psMemGetDeallocator(
     psPtr ptr                          ///< the memory block
 );
Index: trunk/psLib/src/sysUtils/psTrace.c
===================================================================
--- trunk/psLib/src/sysUtils/psTrace.c	(revision 3671)
+++ trunk/psLib/src/sysUtils/psTrace.c	(revision 3682)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-29 21:31:54 $
+ *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -67,5 +67,5 @@
 
     p_psMemSetPersistent(comp,true);
-    p_psMemSetDeallocator(comp, (psFreeFcn) componentFree);
+    psMemSetDeallocator(comp, (psFreeFcn) componentFree);
     comp->name = psStringCopy(name);
     p_psMemSetPersistent((psPtr)comp->name,true);
Index: trunk/psLib/src/types/psArray.c
===================================================================
--- trunk/psLib/src/types/psArray.c	(revision 3671)
+++ trunk/psLib/src/types/psArray.c	(revision 3682)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-18 22:17:20 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -55,5 +55,5 @@
     // Create vector struct
     psArr = (psArray* ) psAlloc(sizeof(psArray));
-    p_psMemSetDeallocator(psArr, (psFreeFcn) arrayFree);
+    psMemSetDeallocator(psArr, (psFreeFcn) arrayFree);
 
     psArr->nalloc = nalloc;
Index: trunk/psLib/src/types/psBitSet.c
===================================================================
--- trunk/psLib/src/types/psBitSet.c	(revision 3671)
+++ trunk/psLib/src/types/psBitSet.c	(revision 3682)
@@ -11,6 +11,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-22 19:25:52 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -80,5 +80,5 @@
     numBytes = ceil(n / 8.0);
     newObj = psAlloc(sizeof(psBitSet));
-    p_psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree);
+    psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree);
     newObj->n = numBytes;
 
Index: trunk/psLib/src/types/psHash.c
===================================================================
--- trunk/psLib/src/types/psHash.c	(revision 3671)
+++ trunk/psLib/src/types/psHash.c	(revision 3682)
@@ -12,6 +12,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-18 22:17:20 $
+*  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -90,5 +90,5 @@
     psHashBucket* bucket = psAlloc(sizeof(psHashBucket));
 
-    p_psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree);
+    psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree);
 
     // Initialize the bucket.
@@ -141,5 +141,5 @@
     psHash* table = psAlloc(sizeof(psHash));
 
-    p_psMemSetDeallocator(table, (psFreeFcn) hashFree);
+    psMemSetDeallocator(table, (psFreeFcn) hashFree);
 
     // Allocate memory for the buckets.
Index: trunk/psLib/src/types/psList.c
===================================================================
--- trunk/psLib/src/types/psList.c	(revision 3671)
+++ trunk/psLib/src/types/psList.c	(revision 3682)
@@ -6,6 +6,6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:23 $
+ *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -45,5 +45,5 @@
     psArray* iterators = list->iterators;
     for (int i = 0; i < iterators->n; i++) {
-        p_psMemSetDeallocator(iterators->data[i], NULL);
+        psMemSetDeallocator(iterators->data[i], NULL);
     }
 
@@ -129,5 +129,5 @@
     psList* list = psAlloc(sizeof(psList));
 
-    p_psMemSetDeallocator(list, (psFreeFcn) listFree);
+    psMemSetDeallocator(list, (psFreeFcn) listFree);
 
     list->size = 0;
@@ -153,5 +153,5 @@
     psListIterator* iter = psAlloc(sizeof(psListIterator));
 
-    p_psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree);
+    psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree);
 
     // initialize the attributes
Index: trunk/psLib/src/types/psLookupTable.c
===================================================================
--- trunk/psLib/src/types/psLookupTable.c	(revision 3671)
+++ trunk/psLib/src/types/psLookupTable.c	(revision 3682)
@@ -7,6 +7,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-31 02:33:17 $
+*  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii
@@ -421,5 +421,5 @@
 
     // Set deallocator
-    p_psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree);
+    psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree);
 
     // Allocate and set metadata item comment
Index: trunk/psLib/src/types/psMetadata.c
===================================================================
--- trunk/psLib/src/types/psMetadata.c	(revision 3671)
+++ trunk/psLib/src/types/psMetadata.c	(revision 3682)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-29 21:31:54 $
+*  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -183,5 +183,5 @@
 
     // Set deallocator
-    p_psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);
+    psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);
 
     // Allocate and set metadata item comment
@@ -252,5 +252,5 @@
     metadata = (psMetadata*) psAlloc(sizeof(psMetadata));
     // Set deallocator
-    p_psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);
+    psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);
 
     // Allocate metadata's internal containers
@@ -598,5 +598,5 @@
 
     // Set deallocator
-    p_psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);
+    psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);
 
     if (regex == NULL) {