Index: trunk/psModules/test/objects/tst_pmObjects01.c
===================================================================
--- trunk/psModules/test/objects/tst_pmObjects01.c	(revision 5516)
+++ trunk/psModules/test/objects/tst_pmObjects01.c	(revision 5681)
@@ -20,4 +20,8 @@
  * XXX: Memory leaks are not being caught.  If I allocated a psVector in these functions
  * and never deallocate, no error is generated.
+ *
+ * XXX: Much of this file is commented out due to the API changes in rel 7.
+ *
+ *
 Fully Tested:
     pmPeakAlloc()
@@ -27,6 +31,6 @@
     most of psObjects.c is not tested
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-15 20:09:03 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-12-05 21:28:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -50,8 +54,8 @@
 //static int test07(void);
 //static int test08(void);
-static int test09(void);
-static int test15(void);
-static int test16(void);
-static int test20(void);
+//static int test09(void);
+//static int test15(void);
+//static int test16(void);
+//static int test20(void);
 testDescription tests[] = {
                               {test00, 000, "pmObjects: structure allocators and deallocators", true, false},
@@ -64,8 +68,8 @@
                               //                              {test07, 001, "pmObjects: pmMin()", true, false},
                               //                              {test08, 001, "pmObjects: pmSourceModelGuess()", true, false},
-                              {test09, 001, "pmObjects: pmSourceContour()", true, false},
-                              {test15, 001, "pmObjects: pmSourceAddModel()", true, false},
-                              {test16, 001, "pmObjects: pmSourceSubModel()", true, false},
-                              {test20, 001, "pmObjects: pmSourceSubModel()", true, false},
+                              //{test09, 001, "pmObjects: pmSourceContour()", true, false},
+                              //{test15, 001, "pmObjects: pmSourceAddModel()", true, false},
+                              //{test16, 001, "pmObjects: pmSourceSubModel()", true, false},
+                              //{test20, 001, "pmObjects: pmSourceSubModel()", true, false},
                               {NULL}
                           };
@@ -1063,4 +1067,5 @@
 XXX: We don't verify the numbers.
  *****************************************************************************/
+/*
 int test15( void )
 {
@@ -1083,6 +1088,6 @@
         testStatus = false;
     }
-
-
+ 
+ 
     tmpSource->modelPSF = pmModelAlloc(PS_MODEL_GAUSS);
     tmpSource->modelPSF->params->data.F32[0] = 5.0;
@@ -1093,5 +1098,5 @@
     tmpSource->modelPSF->params->data.F32[5] = 1.0;
     tmpSource->modelPSF->params->data.F32[6] = 2.0;
-
+ 
     printf("----------------------------------------------------------------------------------\n");
     printf("Calling pmSourceAddModel with NULL psImage.  Should generate error, return FALSE.\n");
@@ -1101,5 +1106,5 @@
         testStatus = false;
     }
-
+ 
     printf("----------------------------------------------------------------------------------\n");
     printf("Calling pmSourceAddModel with NULL psSrc.  Should generate error, return FALSE.\n");
@@ -1109,5 +1114,5 @@
         testStatus = false;
     }
-
+ 
     printf("----------------------------------------------------------------------------------\n");
     printf("Calling pmSourceAddModel with acceptable data.\n");
@@ -1117,9 +1122,10 @@
         testStatus = false;
     }
-
+ 
     psFree(tmpSource);
     psFree(imgData);
     return(testStatus);
 }
+*/
 
 #define TST16_NUM_ROWS 100
@@ -1134,4 +1140,5 @@
 XXX: We don't verify the numbers.
  *****************************************************************************/
+/*
 int test16( void )
 {
@@ -1145,10 +1152,10 @@
     pmSource *tmpSource = NULL;
     psBool rc = false;
-
+ 
     pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST16_NUM_ROWS / 2),
                                   (psF32) (TST16_NUM_COLS / 2),
                                   200.0,
                                   PM_PEAK_LONE);
-
+ 
     printf("Calling pmSourceLocalSky with valid data.\n");
     tmpPeak->x = (psF32) (TST16_NUM_ROWS / 2);
@@ -1159,10 +1166,10 @@
                                  (psF32) TST16_INNER_RADIUS,
                                  (psF32) TST16_OUTER_RADIUS);
-
+ 
     if (tmpSource == NULL) {
         printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
         testStatus = false;
     }
-
+ 
     tmpSource->modelPSF = pmModelAlloc(PS_MODEL_GAUSS);
     tmpSource->modelPSF->params->data.F32[0] = 5.0;
@@ -1173,5 +1180,5 @@
     tmpSource->modelPSF->params->data.F32[5] = 1.0;
     tmpSource->modelPSF->params->data.F32[6] = 2.0;
-
+ 
     printf("----------------------------------------------------------------------------------\n");
     printf("Calling pmSourceSubModel with NULL psImage.  Should generate error, return FALSE.\n");
@@ -1181,5 +1188,5 @@
         testStatus = false;
     }
-
+ 
     printf("----------------------------------------------------------------------------------\n");
     printf("Calling pmSourceSubModel with NULL psSrc.  Should generate error, return FALSE.\n");
@@ -1189,5 +1196,5 @@
         testStatus = false;
     }
-
+ 
     printf("----------------------------------------------------------------------------------\n");
     printf("Calling pmSourceSubModel with acceptable data.\n");
@@ -1197,9 +1204,10 @@
         testStatus = false;
     }
-
+ 
     psFree(tmpSource);
     psFree(imgData);
     return(testStatus);
 }
+*/
 
 #define TST20_NUM_ROWS 100
@@ -1214,4 +1222,5 @@
 XXX: We don't verify the numbers.
  *****************************************************************************/
+/*
 int test20( void )
 {
@@ -1225,10 +1234,10 @@
     pmSource *tmpSource = NULL;
     psBool rc = false;
-
+ 
     pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST20_NUM_ROWS / 2),
                                   (psF32) (TST20_NUM_COLS / 2),
                                   200.0,
                                   PM_PEAK_LONE);
-
+ 
     printf("Calling pmSourceLocalSky with valid data.\n");
     tmpPeak->x = (psF32) (TST20_NUM_ROWS / 2);
@@ -1239,13 +1248,13 @@
                                  (psF32) TST20_INNER_RADIUS,
                                  (psF32) TST20_OUTER_RADIUS);
-
+ 
     if (tmpSource == NULL) {
         printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
         testStatus = false;
     }
-
+ 
     tmpSource->modelPSF = pmModelAlloc(PS_MODEL_GAUSS);
-
-
+ 
+ 
     tmpSource->modelPSF->params->data.F32[0] = 5.0;
     tmpSource->modelPSF->params->data.F32[1] = 70.0;
@@ -1255,5 +1264,5 @@
     tmpSource->modelPSF->params->data.F32[5] = 1.0;
     tmpSource->modelPSF->params->data.F32[6] = 2.0;
-
+ 
     printf("----------------------------------------------------------------------------------\n");
     printf("Calling pmSourceFitModel with NULL psImage.  Should generate error, return FALSE.\n");
@@ -1263,5 +1272,5 @@
         testStatus = false;
     }
-
+ 
     printf("----------------------------------------------------------------------------------\n");
     printf("Calling pmSourceFitModel with NULL pmSource.  Should generate error, return FALSE.\n");
@@ -1271,18 +1280,18 @@
         testStatus = false;
     }
-
+ 
     printf("----------------------------------------------------------------------------------\n");
     printf("Calling pmSourceFitModel with acceptable data.\n");
     rc = pmSourceFitModel(tmpSource, imgData);
     printf("pmSourceFitModel returned %d\n", rc);
-
+ 
     // XXX: Memory leaks are not being tested
     psVector *junk = psVectorAlloc(10, PS_TYPE_F32);
     junk->data.F32[0] = 0.0;
-
+ 
     psFree(tmpSource);
     psFree(imgData);
     return(testStatus);
 }
-
-
+*/
+