Index: trunk/psLib/src/dataIO/psLookupTable.c
===================================================================
--- trunk/psLib/src/dataIO/psLookupTable.c	(revision 3684)
+++ trunk/psLib/src/dataIO/psLookupTable.c	(revision 4031)
@@ -7,6 +7,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-08 17:58:57 $
+*  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-05-25 22:46:47 $
 *
 *  Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii
@@ -415,5 +415,5 @@
 
     // Can't read table if you don't know its name
-    PS_PTR_CHECK_NULL(fileName,NULL);
+    PS_ASSERT_PTR_NON_NULL(fileName,NULL);
 
     // Allocate lookup table
@@ -549,8 +549,8 @@
 
     // Check for NULL input table
-    PS_PTR_CHECK_NULL(table,NULL);
+    PS_ASSERT_PTR_NON_NULL(table,NULL);
 
     // Check for input table with NULL file name
-    PS_PTR_CHECK_NULL(table->fileName,NULL);
+    PS_ASSERT_PTR_NON_NULL(table->fileName,NULL);
 
     // Open table file specified by table->fileName
@@ -869,19 +869,19 @@
     // Error checks
     // Set status to error prior to check since if checks fails it will immediately return
-    PS_PTR_CHECK_NULL(status,NAN);
+    PS_ASSERT_PTR_NON_NULL(status,NAN);
     *status = PS_LOOKUP_ERROR;
-    PS_PTR_CHECK_NULL(table,NAN);
+    PS_ASSERT_PTR_NON_NULL(table,NAN);
     indexVec = table->index;
     values = table->values;
     numRows = table->numRows;
     numCols = table->numCols;
-    PS_PTR_CHECK_NULL(indexVec,NAN);
-    PS_PTR_CHECK_NULL(values,NAN);
-    PS_INT_CHECK_EQUALS(numRows, 0,NAN);
-    PS_INT_CHECK_EQUALS(numCols, 0,NAN);
-    PS_INT_CHECK_RANGE(column, 0, (int)(numCols-1), NAN);
+    PS_ASSERT_PTR_NON_NULL(indexVec,NAN);
+    PS_ASSERT_PTR_NON_NULL(values,NAN);
+    PS_ASSERT_INT_UNEQUAL(numRows, 0,NAN);
+    PS_ASSERT_INT_UNEQUAL(numCols, 0,NAN);
+    PS_ASSERT_INT_WITHIN_RANGE(column, 0, (int)(numCols-1), NAN);
 
     valuesVec = (psVector*)values->data[column];
-    PS_PTR_CHECK_NULL(indexVec,NAN);
+    PS_ASSERT_PTR_NON_NULL(indexVec,NAN);
 
     // Set status to success since it passed all parameter checks
@@ -942,8 +942,8 @@
 
     // Error checks
-    PS_PTR_CHECK_NULL(table,NULL);
-    PS_PTR_CHECK_NULL(stats,NULL);
+    PS_ASSERT_PTR_NON_NULL(table,NULL);
+    PS_ASSERT_PTR_NON_NULL(stats,NULL);
     numCols = table->numCols;
-    PS_INT_CHECK_EQUALS(numCols, 0,NULL);
+    PS_ASSERT_INT_UNEQUAL(numCols, 0,NULL);
 
     outVector = psVectorAlloc(numCols+1, PS_TYPE_F64);