Index: /trunk/psModules/src/config/pmConfig.c
===================================================================
--- /trunk/psModules/src/config/pmConfig.c	(revision 6324)
+++ /trunk/psModules/src/config/pmConfig.c	(revision 6325)
@@ -3,6 +3,6 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-02 04:51:14 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 21:03:23 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -449,5 +449,7 @@
     }
 
-    dbh = psDBInit(dbServer, dbUsername, dbPassword, dbName);
+
+
+    psDB *dbh = psDBInit(dbServer, dbUsername, dbPassword, dbName);
     psFree(dbServer);
     psFree(dbUsername);
Index: /trunk/psModules/src/imcombine/pmReadoutCombine.c
===================================================================
--- /trunk/psModules/src/imcombine/pmReadoutCombine.c	(revision 6324)
+++ /trunk/psModules/src/imcombine/pmReadoutCombine.c	(revision 6325)
@@ -5,6 +5,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-26 21:19:25 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 21:03:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -410,6 +410,6 @@
     psRegion minRegion;
     psRegion maxRegion;
-    psStats *minStats = psStatsAlloc(PS_STAT_ROBUST_MEAN);
-    psStats *maxStats = psStatsAlloc(PS_STAT_ROBUST_MEAN);
+    psStats *minStats = psStatsAlloc(PS_STAT_FITTED_MEAN);
+    psStats *maxStats = psStatsAlloc(PS_STAT_FITTED_MEAN);
     psStats *diffStats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN);
     psVector *diffs = psVectorAlloc(fringePoints->n, PS_TYPE_F32);
@@ -445,6 +445,6 @@
         }
 
-        fp->midValue = 0.5 * (maxStats->robustMean + minStats->robustMean);
-        fp->delta = maxStats->robustMean - minStats->robustMean;
+        fp->midValue = 0.5 * (maxStats->fittedMean + minStats->fittedMean);
+        fp->delta = maxStats->fittedMean - minStats->fittedMean;
         diffs->data.F32[i] = fp->delta;
     }
@@ -455,5 +455,5 @@
     psFree(diffs);
     if (diffStats == NULL) {
-        psError(PS_ERR_UNKNOWN, true, "Could not determine robust median of the differences.\n");
+        psError(PS_ERR_UNKNOWN, true, "Could not determine fitted median of the differences.\n");
         return(NULL);
     }
Index: /trunk/psModules/src/imsubtract/pmSubtractBias.c
===================================================================
--- /trunk/psModules/src/imsubtract/pmSubtractBias.c	(revision 6324)
+++ /trunk/psModules/src/imsubtract/pmSubtractBias.c	(revision 6325)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-26 21:10:51 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 21:03:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -179,11 +179,12 @@
     psStatsOptions opt = 0;
 
-    if (stat->options & PS_STAT_ROBUST_MODE) {
-        if (numOptions == 0) {
-            opt = PS_STAT_ROBUST_MODE;
-        }
-        numOptions++;
-    }
-
+    /*
+        if (stat->options & PS_STAT_ROBUST_MODE) {
+            if (numOptions == 0) {
+                opt = PS_STAT_ROBUST_MODE;
+            }
+            numOptions++;
+        }
+    */
     if (stat->options & PS_STAT_ROBUST_MEDIAN) {
         if (numOptions == 0) {
@@ -193,7 +194,7 @@
     }
 
-    if (stat->options & PS_STAT_ROBUST_MEAN) {
+    if (stat->options & PS_STAT_FITTED_MEAN) {
         if (numOptions == 0) {
-            opt = PS_STAT_ROBUST_MEAN;
+            opt = PS_STAT_FITTED_MEAN;
         }
         numOptions++;
Index: /trunk/psModules/src/imsubtract/pmSubtractSky.c
===================================================================
--- /trunk/psModules/src/imsubtract/pmSubtractSky.c	(revision 6324)
+++ /trunk/psModules/src/imsubtract/pmSubtractSky.c	(revision 6325)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-15 20:09:03 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 21:03:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -67,13 +67,15 @@
     } else if (statOptions & PS_STAT_CLIPPED_MEAN) {
         return(PS_STAT_CLIPPED_MEAN);
-    } else if (statOptions & PS_STAT_ROBUST_MEAN) {
-        return(PS_STAT_ROBUST_MEAN);
+    } else if (statOptions & PS_STAT_FITTED_MEAN) {
+        return(PS_STAT_FITTED_MEAN);
     } else if (statOptions & PS_STAT_ROBUST_MEDIAN) {
         return(PS_STAT_ROBUST_MEDIAN);
-    } else if (statOptions & PS_STAT_ROBUST_MODE) {
-        return(PS_STAT_ROBUST_MODE);
     }
     psError(PS_ERR_UNKNOWN, true, "Unallowable option requested for statistically binning image pixels.\n");
     return(-1);
+    // XXX
+    //else if (statOptions & PS_STAT_ROBUST_MODE) {
+    //    return(PS_STAT_ROBUST_MODE);
+    //}
 }
 
Index: /trunk/psModules/src/objects/pmObjects.c
===================================================================
--- /trunk/psModules/src/objects/pmObjects.c	(revision 6324)
+++ /trunk/psModules/src/objects/pmObjects.c	(revision 6325)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-26 21:19:25 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 21:03:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1653,5 +1653,9 @@
 
     psTrace (".pmObjects.pmSourceFitModel", 5, "fitting function\n");
-    fitStatus = psMinimizeLMChi2(myMin, covar, params, paramMask, x, y, yErr, modelFunc);
+
+    /* XXXX: Must change this:
+        fitStatus = psMinimizeLMChi2(myMin, covar, params, paramMask, x, y,
+                                     yErr, modelFunc);
+    */
     for (int i = 0; i < dparams->n; i++) {
         if ((paramMask != NULL) && paramMask->data.U8[i])
@@ -1819,5 +1823,7 @@
 
     psTrace (".pmObjects.pmSourceFitModel", 5, "fitting function\n");
-    fitStatus = psMinimizeLMChi2(myMin, covar, params, paramMask, x, y, yErr, modelFunc);
+    /* XXXX: Must change this:
+        fitStatus = psMinimizeLMChi2(myMin, covar, params, paramMask, x, y, yErr, modelFunc);
+    */
     for (int i = 0; i < dparams->n; i++) {
         if ((paramMask != NULL) && paramMask->data.U8[i])
Index: /trunk/psModules/test/config/tst_pmConfig.c
===================================================================
--- /trunk/psModules/test/config/tst_pmConfig.c	(revision 6324)
+++ /trunk/psModules/test/config/tst_pmConfig.c	(revision 6325)
@@ -13,6 +13,6 @@
  * pmConfigDB()
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-26 21:10:51 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 21:03:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -61,5 +61,5 @@
     str[0] = "ARGS:";
     str[1] = "-site";
-    str[2] = "SampleIPPConfig";
+    str[2] = "data/SampleIPPConfig";
 
     psMetadata *site = psMetadataAlloc();
Index: /trunk/psModules/test/config/verified/tst_pmConfig.stderr
===================================================================
--- /trunk/psModules/test/config/verified/tst_pmConfig.stderr	(revision 6324)
+++ /trunk/psModules/test/config/verified/tst_pmConfig.stderr	(revision 6325)
@@ -22,5 +22,5 @@
     Error: *argc is 0 or less.
 <HOST>|I|readConfig
-    Loading site configuration from file SampleIPPConfig
+    Loading site configuration from file data/SampleIPPConfig
 
 ---> TESTPOINT PASSED (Test Point Driver{pmConfig:} | tst_pmConfig.c)
Index: /trunk/psModules/test/config/verified/tst_pmConfig.stdout
===================================================================
--- /trunk/psModules/test/config/verified/tst_pmConfig.stdout	(revision 6324)
+++ /trunk/psModules/test/config/verified/tst_pmConfig.stdout	(revision 6325)
@@ -16,2 +16,3 @@
 Calling pmConfigRead() with negative argc.  Should generate ERROR, return false.
 ----------------------------------------------------------------
+Calling pmConfigRead() with acceptable arguments.
Index: /trunk/psModules/test/imcombine/verified/tst_pmImageCombine.stdout
===================================================================
--- /trunk/psModules/test/imcombine/verified/tst_pmImageCombine.stdout	(revision 6324)
+++ /trunk/psModules/test/imcombine/verified/tst_pmImageCombine.stdout	(revision 6325)
@@ -19,19 +19,26 @@
 Calling with a NULL stats.  Should generate error, return NULL.
 Calling with acceptable data.  Should generate a psImage.
+Image 0, questionable pixel 0 is (1.000000 2.000000)
+Image 0, questionable pixel 1 is (4.000000 5.000000)
 Image 1, questionable pixel 0 is (0.000000 8.000000)
 Image 1, questionable pixel 1 is (1.000000 2.000000)
-Image 1, questionable pixel 2 is (3.000000 9.000000)
-Image 1, questionable pixel 3 is (4.000000 5.000000)
-Image 1, questionable pixel 4 is (3.000000 8.000000)
-Image 2, questionable pixel 0 is (9.000000 9.000000)
-Image 2, questionable pixel 1 is (0.000000 5.000000)
-Image 2, questionable pixel 2 is (6.000000 2.000000)
-Image 2, questionable pixel 3 is (3.000000 7.000000)
+Image 1, questionable pixel 2 is (9.000000 9.000000)
+Image 1, questionable pixel 3 is (3.000000 9.000000)
+Image 1, questionable pixel 4 is (4.000000 5.000000)
+Image 1, questionable pixel 5 is (3.000000 8.000000)
+Image 2, questionable pixel 0 is (1.000000 2.000000)
+Image 2, questionable pixel 1 is (9.000000 9.000000)
+Image 2, questionable pixel 2 is (0.000000 5.000000)
+Image 2, questionable pixel 3 is (6.000000 2.000000)
+Image 2, questionable pixel 4 is (3.000000 7.000000)
 Image 3, questionable pixel 0 is (7.000000 5.000000)
+Image 4, questionable pixel 0 is (3.000000 8.000000)
 
 
 
 Calling pmRejectPixels() with acceptable data.  Should generate a psArray.
-tst_pmImageCombine.c: Image 0 had 0 rejects.
+tst_pmImageCombine.c: Image 0 had 2 rejects.
+Image 0, rejected pixel 0 is (1.000000 2.000000)
+Image 0, rejected pixel 1 is (4.000000 5.000000)
 tst_pmImageCombine.c: Image 1 had 4 rejects.
 Image 1, rejected pixel 0 is (0.000000 8.000000)
@@ -39,9 +46,11 @@
 Image 1, rejected pixel 2 is (4.000000 5.000000)
 Image 1, rejected pixel 3 is (3.000000 8.000000)
-tst_pmImageCombine.c: Image 2 had 3 rejects.
-Image 2, rejected pixel 0 is (0.000000 5.000000)
-Image 2, rejected pixel 1 is (6.000000 2.000000)
-Image 2, rejected pixel 2 is (3.000000 7.000000)
+tst_pmImageCombine.c: Image 2 had 4 rejects.
+Image 2, rejected pixel 0 is (1.000000 2.000000)
+Image 2, rejected pixel 1 is (0.000000 5.000000)
+Image 2, rejected pixel 2 is (6.000000 2.000000)
+Image 2, rejected pixel 3 is (3.000000 7.000000)
 tst_pmImageCombine.c: Image 3 had 1 rejects.
 Image 3, rejected pixel 0 is (7.000000 5.000000)
-tst_pmImageCombine.c: Image 4 had 0 rejects.
+tst_pmImageCombine.c: Image 4 had 1 rejects.
+Image 4, rejected pixel 0 is (3.000000 8.000000)