Index: /branches/eam_rel9_b1/psModules/test/astrom/tst_pmAstrometry01.c
===================================================================
--- /branches/eam_rel9_b1/psModules/test/astrom/tst_pmAstrometry01.c	(revision 5855)
+++ /branches/eam_rel9_b1/psModules/test/astrom/tst_pmAstrometry01.c	(revision 5856)
@@ -5,6 +5,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-12-05 21:28:55 $
+*  @version $Revision: 1.2.6.1 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-12-28 02:05:18 $
 *
 * XXX: Add tests were the coordinate does not transform to any legitimate cell
@@ -12,4 +12,6 @@
 *
 * XXX: For each function, add tests for bad input parameters, as well as failed transforms.
+*
+* XXX: Must test pmFPASelectChip() and pmFPAExcludeChip().
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -23,8 +25,10 @@
 static psS32 test3( void );
 static psS32 test4( void );
+static psS32 test5( void );
 
 testDescription tests[] = {
                               {test3, -3, "pmAstrometry focal plane transformations", 0, false},
                               {test4, -3, "pmCheckParents()", 0, false},
+                              {test5, -3, "pmFPASelectChip() and pmFPAExcludeChip()", 0, false},
                               {NULL}
                           };
@@ -584,2 +588,83 @@
     return(testStatus);
 }
+
+/******************************************************************************
+test5(): This routine wil test the pmFPASelectChip() and pmFPAExcludeChip()
+functions.  We generate an pmFPA hierarchy, then set the ->valid members with
+those routines, then verify.
+ *****************************************************************************/
+psS32 test5( void )
+{
+    psS32 testStatus = 0;
+    pmChip *tmpChip = NULL;
+
+    //
+    // Generate a pmFPA hierarchy.
+    //
+    pmFPA *tmpFPA = genSystem();
+
+    //
+    // We test the ->valid member for each chip.
+    //
+    for (psS32 i = 0 ; i < tmpFPA->chips->n ; i++) {
+        tmpChip = (pmChip *) tmpFPA->chips->data[i];
+        if ((tmpChip == NULL) || (tmpChip->valid != false)) {
+            printf("TEST ERROR: Could not properly generate an FPA hierarchy.\n");
+            testStatus = 1;
+        }
+    }
+
+    //
+    // Exclude chip number 0, include all others, then test return value
+    //
+    psS32 numChips = pmFPAExcludeChip(tmpFPA, 0);
+    if (numChips != (NUM_CHIPS-1)) {
+        printf("TEST ERROR: pmFPAExcludeChip() did not return the correct number of chips.\n");
+        testStatus = 2;
+    }
+
+    //
+    // We test the ->valid member for each chip.
+    //
+    tmpChip = (pmChip *) tmpFPA->chips->data[0];
+    if (tmpChip->valid != false) {
+        printf("TEST ERROR: pmFPAExcludeChip() did not set the proper chip->valid to FALSE.\n");
+        testStatus = 3;
+    }
+    for (psS32 i = 1 ; i < tmpFPA->chips->n ; i++) {
+        pmChip *tmpChip = (pmChip *) tmpFPA->chips->data[i];
+        if (tmpChip->valid != true) {
+            printf("TEST ERROR: pmFPAExcludeChip() did not set the proper chip->valids to FALSE.\n");
+            testStatus = 4;
+        }
+    }
+
+
+    //
+    // Include chip number 0, exclude all others, then test return value
+    //
+    psBool tmpBool = pmFPASelectChip(tmpFPA, 0);
+    if (tmpBool != true) {
+        printf("TEST ERROR: pmFPASelectChip() returned FALSE.\n");
+        testStatus = 5;
+    }
+
+    //
+    // We test the ->valid member for each chip.
+    //
+    tmpChip = (pmChip *) tmpFPA->chips->data[0];
+    if (tmpChip->valid != true) {
+        printf("TEST ERROR: pmFPASelectChip() did not set the proper chip->valid to FALSE.\n");
+        testStatus = 6;
+    }
+    for (psS32 i = 1 ; i < tmpFPA->chips->n ; i++) {
+        pmChip *tmpChip = (pmChip *) tmpFPA->chips->data[i];
+        if (tmpChip->valid != false) {
+            printf("TEST ERROR: pmFPASelectChip() did not set the proper chip->valids to FALSE.\n");
+            testStatus = 7;
+        }
+    }
+
+    psFree(tmpFPA);
+    return(testStatus);
+}
Index: /branches/eam_rel9_b1/psModules/test/imsubtract/tst_pmSubtractBias.c
===================================================================
--- /branches/eam_rel9_b1/psModules/test/imsubtract/tst_pmSubtractBias.c	(revision 5855)
+++ /branches/eam_rel9_b1/psModules/test/imsubtract/tst_pmSubtractBias.c	(revision 5856)
@@ -19,5 +19,5 @@
  *  test03: Calculate a row overscan vector and subtract it from each
  *  row in the input image.
- * test05: 
+ * test05:
  *
  *  @author GLG, MHPCC
@@ -25,6 +25,6 @@
  *  XXX: Memory leaks are not being detected.
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-23 23:54:30 $
+ *  @version $Revision: 1.5.6.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-12-28 02:05:18 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -326,5 +326,5 @@
         rc = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_NONE, stat,
                             0, PM_FIT_NONE, myBias);
-     
+ 
         for (i=0;i<numRows;i++) {
             for (j=0;j<numCols;j++) {
@@ -335,5 +335,5 @@
                     testStatus = 1;
                 }
-     
+ 
                 // Restore myReadout for next test.
                 myReadout->image->data.F32[i][j] = (float) (i + j);
@@ -627,5 +627,5 @@
     // Set overscan axis in the metadata.
     //
-    psBool rc;
+    psBool rc = false;
     if (overscanaxis == PM_OVERSCAN_ROWS) {
         rc = psMetadataAddS32(myReadout->parent->concepts, PS_LIST_HEAD, "CELL.READDIR", 0, NULL, 1);
Index: /branches/eam_rel9_b1/psModules/test/objects/verified/tst_pmObjects01.stdout
===================================================================
--- /branches/eam_rel9_b1/psModules/test/objects/verified/tst_pmObjects01.stdout	(revision 5855)
+++ /branches/eam_rel9_b1/psModules/test/objects/verified/tst_pmObjects01.stdout	(revision 5856)
@@ -1,8 +1,4 @@
 Testing pmPeakAlloc()...
 Testing pmMomentsAlloc()...
-Testing pmModelAlloc(PS_MODEL_GAUSS)...
-Testing pmModelAlloc(PS_MODEL_GAUSS)...
-Testing pmModelAlloc(PS_MODEL_GAUSS)...
-Testing pmModelAlloc(PS_MODEL_GAUSS)...
 ----------------------------------------------------------------------------------
 Calling pmFindVectorPeaks with NULL psVector.  Should generate error and return NULL.