Index: trunk/ippTools/src/pxtables.c
===================================================================
--- trunk/ippTools/src/pxtables.c	(revision 11985)
+++ trunk/ippTools/src/pxtables.c	(revision 12024)
@@ -59,13 +59,13 @@
     CREATE_TABLE(rawExpCreateTable);
     CREATE_TABLE(rawImfileCreateTable);
-    CREATE_TABLE(p1PendingExpCreateTable);
-    CREATE_TABLE(p2PendingExpCreateTable);
-    CREATE_TABLE(p2PendingImfileCreateTable);
-    CREATE_TABLE(p2ProcessedExpCreateTable);
-    CREATE_TABLE(p2ProcessedImfileCreateTable);
-    CREATE_TABLE(p2MaskCreateTable);
-    CREATE_TABLE(p3PendingExpCreateTable);
-    CREATE_TABLE(p3ProcessedExpCreateTable);
-    CREATE_TABLE(p3MaskCreateTable);
+    CREATE_TABLE(guidePendingExpCreateTable);
+    CREATE_TABLE(chipPendingExpCreateTable);
+    CREATE_TABLE(chipPendingImfileCreateTable);
+    CREATE_TABLE(chipProcessedExpCreateTable);
+    CREATE_TABLE(chipProcessedImfileCreateTable);
+    CREATE_TABLE(chipMaskCreateTable);
+    CREATE_TABLE(camPendingExpCreateTable);
+    CREATE_TABLE(camProcessedExpCreateTable);
+    CREATE_TABLE(camMaskCreateTable);
     CREATE_TABLE(detRunCreateTable);
     CREATE_TABLE(detInputExpCreateTable);
@@ -79,14 +79,14 @@
     CREATE_TABLE(detResidExpCreateTable);
     CREATE_TABLE(detRunSummaryCreateTable);
-    CREATE_TABLE(p4RunCreateTable);
-    CREATE_TABLE(p4InputExpCreateTable);
-    CREATE_TABLE(p4SkyCellMapCreateTable);
-    CREATE_TABLE(p4SkyfileCreateTable);
-    CREATE_TABLE(p5RunCreateTable);
-    CREATE_TABLE(p5InputSkyfileCreateTable);
-    CREATE_TABLE(p5DiffSkyfileCreateTable);
-    CREATE_TABLE(p6RunCreateTable);
-    CREATE_TABLE(p6InputSkyfileCreateTable);
-    CREATE_TABLE(p6SumSkyfileCreateTable);
+    CREATE_TABLE(warpRunCreateTable);
+    CREATE_TABLE(warpInputExpCreateTable);
+    CREATE_TABLE(warpSkyCellMapCreateTable);
+    CREATE_TABLE(warpSkyfileCreateTable);
+    CREATE_TABLE(diffRunCreateTable);
+    CREATE_TABLE(diffInputSkyfileCreateTable);
+    CREATE_TABLE(diffSkyfileCreateTable);
+    CREATE_TABLE(stackRunCreateTable);
+    CREATE_TABLE(stackInputSkyfileCreateTable);
+    CREATE_TABLE(stackSumSkyfileCreateTable);
 
     return true;
@@ -99,9 +99,9 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    fprintf (stdout, "*** delete the P2 tables? ***\n");
+    fprintf (stdout, "*** delete the chip tables? ***\n");
     fprintf (stdout, "*** to delete the tables, answer YES, and give password ***\n");
     fprintf (stdout, "*** WARNING: this action is permanent ***\n\n");
 
-    fprintf (stdout, "delete the P2 tables (YES/[n]): ");
+    fprintf (stdout, "delete the chip tables (YES/[n]): ");
     fgets (line, 128, stdin);
     sscanf (line, "%s", answer);
@@ -135,13 +135,13 @@
     DROP_TABLE(rawExpDropTable);
     DROP_TABLE(rawImfileDropTable);
-    DROP_TABLE(p1PendingExpDropTable);
-    DROP_TABLE(p2PendingExpDropTable);
-    DROP_TABLE(p2PendingImfileDropTable);
-    DROP_TABLE(p2ProcessedExpDropTable);
-    DROP_TABLE(p2ProcessedImfileDropTable);
-    DROP_TABLE(p2MaskDropTable);
-    DROP_TABLE(p3PendingExpDropTable);
-    DROP_TABLE(p3ProcessedExpDropTable);
-    DROP_TABLE(p3MaskDropTable);
+    DROP_TABLE(guidePendingExpDropTable);
+    DROP_TABLE(chipPendingExpDropTable);
+    DROP_TABLE(chipPendingImfileDropTable);
+    DROP_TABLE(chipProcessedExpDropTable);
+    DROP_TABLE(chipProcessedImfileDropTable);
+    DROP_TABLE(chipMaskDropTable);
+    DROP_TABLE(camPendingExpDropTable);
+    DROP_TABLE(camProcessedExpDropTable);
+    DROP_TABLE(camMaskDropTable);
     DROP_TABLE(detRunDropTable);
     DROP_TABLE(detInputExpDropTable);
@@ -155,14 +155,14 @@
     DROP_TABLE(detResidExpDropTable);
     DROP_TABLE(detRunSummaryDropTable);
-    DROP_TABLE(p4RunDropTable);
-    DROP_TABLE(p4InputExpDropTable);
-    DROP_TABLE(p4SkyCellMapDropTable);
-    DROP_TABLE(p4SkyfileDropTable);
-    DROP_TABLE(p5RunDropTable);
-    DROP_TABLE(p5InputSkyfileDropTable);
-    DROP_TABLE(p5DiffSkyfileDropTable);
-    DROP_TABLE(p6RunDropTable);
-    DROP_TABLE(p6InputSkyfileDropTable);
-    DROP_TABLE(p6SumSkyfileDropTable);
+    DROP_TABLE(warpRunDropTable);
+    DROP_TABLE(warpInputExpDropTable);
+    DROP_TABLE(warpSkyCellMapDropTable);
+    DROP_TABLE(warpSkyfileDropTable);
+    DROP_TABLE(diffRunDropTable);
+    DROP_TABLE(diffInputSkyfileDropTable);
+    DROP_TABLE(diffSkyfileDropTable);
+    DROP_TABLE(stackRunDropTable);
+    DROP_TABLE(stackInputSkyfileDropTable);
+    DROP_TABLE(stackSumSkyfileDropTable);
 
     return status;