Index: /trunk/psphot/src/pmObjects_EAM.c
===================================================================
--- /trunk/psphot/src/pmObjects_EAM.c	(revision 5133)
+++ /trunk/psphot/src/pmObjects_EAM.c	(revision 5134)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-26 07:17:19 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-26 19:49:41 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -615,10 +615,10 @@
     // XXX EAM : psRegionXXX funcs should take value not ptr
     srcRegion = psRegionForSquare (peak->x, peak->y, Radius);
-    srcRegion = psRegionForImage (mask, &srcRegion);
-
-    psImageMaskRegion (mask, &srcRegion, "OR", PSPHOT_MASK_MARKED);
+    srcRegion = psRegionForImage (mask, srcRegion);
+
+    psImageMaskRegion (mask, srcRegion, "OR", PSPHOT_MASK_MARKED);
     psStats *myStats = psStatsAlloc(statsOptions);
     myStats = psImageStats(myStats, image, mask, 0xff);
-    psImageMaskRegion (mask, &srcRegion, "AND", ~PSPHOT_MASK_MARKED);
+    psImageMaskRegion (mask, srcRegion, "AND", ~PSPHOT_MASK_MARKED);
 
     psF64 tmpF64;
Index: /trunk/psphot/src/pmPSFtry.c
===================================================================
--- /trunk/psphot/src/pmPSFtry.c	(revision 5133)
+++ /trunk/psphot/src/pmPSFtry.c	(revision 5134)
@@ -204,5 +204,5 @@
   // build binned versions of rflux, metric
   dBin = (stats->max - stats->min) / 10.0;
-  psVector *rfBin = psVectorCreate (stats->min, stats->max, dBin, PS_TYPE_F64);
+  psVector *rfBin = psVectorCreate (NULL, stats->min, stats->max, dBin, PS_TYPE_F64);
   psVector *daBin = psVectorAlloc (rfBin->n, PS_TYPE_F64);
   psVector *maskB = psVectorAlloc (rfBin->n, PS_TYPE_U8);
Index: /trunk/psphot/src/psLibUtils.c
===================================================================
--- /trunk/psphot/src/psLibUtils.c	(revision 5133)
+++ /trunk/psphot/src/psLibUtils.c	(revision 5134)
@@ -8,22 +8,6 @@
 // XXX EAM : these utility functions should be added back into PSLib
 
+# if (0) // now in psLib (v8)
 static psHash *timers = NULL;
-
-bool psTimerClear (char *name) {
-
-  bool status;
-
-  if (name == NULL) return false;
-
-  status = psHashRemove (timers, name);
-  return (status);
-}
-
-void psTimerFree () {
-
-  psFree (timers);
-  p_psTimeFinalize();
-  return;
-}
 
 // start/restart a named timer
@@ -40,4 +24,14 @@
 }
 
+bool psTimerClear (char *name) {
+
+  bool status;
+
+  if (name == NULL) return false;
+
+  status = psHashRemove (timers, name);
+  return (status);
+}
+
 // get current elapsed time on named timer
 psF64 psTimerMark (char *name) {
@@ -60,4 +54,13 @@
 }
 
+void psTimerFree () {
+
+  psFree (timers);
+  p_psTimeFinalize();
+  return;
+}
+# endif
+
+# if (0)
 // find the location of the specified argument
 int psArgumentGet (int argc, char **argv, char *arg) {
@@ -87,4 +90,5 @@
     return (N);
 }
+# endif
 
 // we have log levels 1 (Error), 2 (Warning), 3 (Info), 4 (Details), 5 (Minutiae)
@@ -276,4 +280,6 @@
 }	    
 
+# if (0)
+// now in psLib (v8)
 // count number of pixels with given mask value
 int psImageCountPixelMask (psImage *mask, psU8 value) 
@@ -290,4 +296,5 @@
     return (Npixels);
 }
+# endif
 
 // define a square region centered on the given coordinate
@@ -438,4 +445,5 @@
 # endif
 
+# if (0)
 psVector *psVectorCreate (double lower, double upper, double delta, psElemType type) {
 
@@ -450,4 +458,5 @@
   return (out);
 }
+# endif
 
 // XXX EAM a utility function
Index: /trunk/psphot/src/psLibUtils.h
===================================================================
--- /trunk/psphot/src/psLibUtils.h	(revision 5133)
+++ /trunk/psphot/src/psLibUtils.h	(revision 5134)
@@ -30,15 +30,17 @@
 
 // psLib extra utilities
+# if (0) // added to psLib v8
+int	     psArgumentGet (int argc, char **argv, char *arg); // added to SDRS
+int	     psArgumentRemove (int N, int *argc, char **argv); // added to SDRS
+bool 	     psTimerClear (char *name);   // added to SDRS 
+int          psImageCountPixelMask (psImage *mask, psU8 value); // added to SDRS
+psVector    *psVectorCreate (double lower, double upper, double delta, psElemType type); // added to SDRS
+# endif
+
 bool 	     psTimerStart (char *name);   // added to SDRS
-bool 	     psTimerClear (char *name);   // added to SDRS 
 psF64 	     psTimerMark (char *name);    // added to SDRS
 void 	     psTimerFree ();              // added to SDRS (as psTimerStop)
 psS32 	     psLogArguments (int *argc, char **argv);   // added to SDRS (part of psArgumentVerbosity)
 psS32 	     psTraceArguments (int *argc, char **argv); // added to SDRS (part of psArgumentVerbosity)
-int	     psArgumentGet (int argc, char **argv, char *arg); // added to SDRS
-int	     psArgumentRemove (int N, int *argc, char **argv); // added to SDRS
-psVector    *psVectorCreate (double lower, double upper, double delta, psElemType type); // added to SDRS
-// psVector    *psGetRowVectorFromImage(psImage *image, psU32 row); // added to SDRS (as psImageRow)
-int          psImageCountPixelMask (psImage *mask, psU8 value); // added to SDRS
 
 // basic image functions
Index: /trunk/psphot/src/psPolynomials.c
===================================================================
--- /trunk/psphot/src/psPolynomials.c	(revision 5133)
+++ /trunk/psphot/src/psPolynomials.c	(revision 5134)
@@ -12,5 +12,5 @@
 void Polynomial1DDump_EAM (psPolynomial1D *poly) {
 
-    for (int i = 0; i < poly->n + 1; i++) {
+    for (int i = 0; i < poly->COOL_1D_n + 1; i++) {
 	fprintf (stderr, "x^%d : %g +/- %g\n", i, poly->coeff[i], poly->coeffErr[i]);
     }
@@ -39,5 +39,5 @@
     newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D));
     newPoly->type = type;
-    newPoly->n = nOrder;
+    newPoly->COOL_1D_n = nOrder;
     newPoly->coeff = (psF64 *)psAlloc(nTerm * sizeof(psF64));
     newPoly->coeffErr = (psF64 *)psAlloc(nTerm * sizeof(psF64));
@@ -58,5 +58,5 @@
     psF64 xSum = 1.0;
 
-    for (loop_x = 0; loop_x < myPoly->n + 1; loop_x++) {
+    for (loop_x = 0; loop_x < myPoly->COOL_1D_n + 1; loop_x++) {
         if (myPoly->mask[loop_x] == 0) {
             polySum += xSum * myPoly->coeff[loop_x];
@@ -141,5 +141,5 @@
 # endif
       
-    nTerm = myPoly->n + 1;
+    nTerm = myPoly->COOL_1D_n + 1;
     A     = psImageAlloc(nTerm, nTerm, PS_TYPE_F64);
     B     = psVectorAlloc(nTerm, PS_TYPE_F64);
@@ -223,5 +223,5 @@
 
     if (poly == NULL) return;
-    for (int i = 0; i < poly->nX + 1; i++) {
+    for (int i = 0; i < poly->COOL_2D_nX + 1; i++) {
 	psFree (poly->coeff[i]);
 	psFree (poly->coeffErr[i]);
@@ -251,10 +251,10 @@
     newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D));
     newPoly->type = type;
-    newPoly->nX = nXorder;
-    newPoly->nY = nYorder;
+    newPoly->COOL_2D_nX = nXorder;
+    newPoly->COOL_2D_nY = nYorder;
 
     newPoly->coeff = (psF64 **)psAlloc(nXterm * sizeof(psF64 *));
     newPoly->coeffErr = (psF64 **)psAlloc(nXterm * sizeof(psF64 *));
-    newPoly->mask = (char **)psAlloc(nXterm * sizeof(char *));
+    newPoly->mask = (psMaskType **)psAlloc(nXterm * sizeof(psMaskType *));
     // XXX EAM : this is an error in the definition of the polynomial mask 
     //           (should be psU8 not char)
@@ -278,6 +278,6 @@
 void Polynomial2DDump_EAM (psPolynomial2D *poly) {
 
-    for (int i = 0; i < poly->nX + 1; i++) {
-	for (int j = 0; j < poly->nY + 1; j++) {
+    for (int i = 0; i < poly->COOL_2D_nX + 1; i++) {
+	for (int j = 0; j < poly->COOL_2D_nY + 1; j++) {
 	    fprintf (stderr, "x^%d y^%d : %g +/- %g\n", i, j, poly->coeff[i][j], poly->coeffErr[i][j]);
 	}
@@ -298,8 +298,8 @@
 
     // XXX EAM : nX is order, not nTerms
-    for (loop_x = 0; loop_x < myPoly->nX + 1; loop_x++) {
+    for (loop_x = 0; loop_x < myPoly->COOL_2D_nX + 1; loop_x++) {
         ySum = xSum;
 	// XXX EAM : nX is order, not nTerms
-        for (loop_y = 0; loop_y < myPoly->nY + 1; loop_y++) {
+        for (loop_y = 0; loop_y < myPoly->COOL_2D_nY + 1; loop_y++) {
             if (myPoly->mask[loop_x][loop_y] == 0) {
                 polySum += ySum * myPoly->coeff[loop_x][loop_y];
@@ -425,6 +425,6 @@
     psS32 nTerm, nXterm, nYterm;
 
-    nXterm = myPoly->nX + 1;
-    nYterm = myPoly->nY + 1;
+    nXterm = myPoly->COOL_2D_nX + 1;
+    nYterm = myPoly->COOL_2D_nY + 1;
     nTerm = nXterm * nYterm;
 
Index: /trunk/psphot/src/psphotDefinePixels.c
===================================================================
--- /trunk/psphot/src/psphotDefinePixels.c	(revision 5133)
+++ /trunk/psphot/src/psphotDefinePixels.c	(revision 5134)
@@ -11,5 +11,5 @@
     // Grab a subimage of the original image of size (2 * outerRadius).
     srcRegion = psRegionForSquare (x, y, Radius);
-    srcRegion = psRegionForImage (imdata->image, &srcRegion);
+    srcRegion = psRegionForImage (imdata->image, srcRegion);
 
     mySource->pixels = psImageSubset(imdata->image, srcRegion);
Index: /trunk/psphot/src/psphotSetup.c
===================================================================
--- /trunk/psphot/src/psphotSetup.c	(revision 5133)
+++ /trunk/psphot/src/psphotSetup.c	(revision 5134)
@@ -77,7 +77,6 @@
     float YMAX  = psMetadataLookupF32 (&status, config, "YMAX");
     psRegion keep = psRegionSet (XMIN, XMAX, YMIN, YMAX);
-    keep = psRegionForImage (image, &keep);
-    psImageKeepRegion (mask, &keep, "OR", PSPHOT_MASK_INVALID);
-    // XXX EAM : psRegionForImage should not take psRegion *keep
+    keep = psRegionForImage (image, keep);
+    psImageKeepRegion (mask, keep, "OR", PSPHOT_MASK_INVALID);
 
     // mask the saturated pixels