Index: trunk/ippTools/share/difftool_inputskyfile.sql
===================================================================
--- trunk/ippTools/share/difftool_inputskyfile.sql	(revision 16827)
+++ trunk/ippTools/share/difftool_inputskyfile.sql	(revision 16828)
@@ -17,8 +17,8 @@
         AND diffInputSkyfile.skycell_id = warpSkyfile.skycell_id
         AND diffInputSkyfile.tess_id    = warpSkyfile.tess_id
-    JOIN warpInputExp
-        ON diffInputSkyfile.warp_id = warpInputExp.warp_id
+    JOIN warpRun
+        ON diffInputSkyfile.warp_id = warpRun.warp_id
     JOIN camProcessedExp
-        ON warpInputExp.cam_id = camProcessedExp.cam_id
+        ON warpRun.cam_id = camProcessedExp.cam_id
     JOIN chipRun
         ON camProcessedExp.chip_id = chipRun.chip_id
@@ -47,8 +47,8 @@
     JOIN stackInputSkyfile
         ON diffInputSkyfile.stack_id = stackInputSkyfile.stack_id
-    JOIN warpInputExp
-        ON stackInputSkyfile.warp_id = warpInputExp.warp_id
+    JOIN warpRun
+        ON stackInputSkyfile.warp_id = warpRun.warp_id
     JOIN camProcessedExp
-        ON warpInputExp.cam_id = camProcessedExp.cam_id
+        ON warpRun.cam_id = camProcessedExp.cam_id
     JOIN chipRun
         ON camProcessedExp.chip_id = chipRun.chip_id
Index: trunk/ippTools/share/stacktool_inputskyfile.sql
===================================================================
--- trunk/ippTools/share/stacktool_inputskyfile.sql	(revision 16827)
+++ trunk/ippTools/share/stacktool_inputskyfile.sql	(revision 16828)
@@ -9,8 +9,8 @@
     AND stackRun.skycell_id       = warpSkyfile.skycell_id
     AND stackRun.tess_id          = warpSkyfile.tess_id
-JOIN warpInputExp
-    ON stackInputSkyfile.warp_id = warpInputExp.warp_id
+JOIN warpRun
+    ON stackInputSkyfile.warp_id = warpRun.warp_id
 JOIN camProcessedExp
-    ON warpInputExp.cam_id = camProcessedExp.cam_id
+    ON warpRun.cam_id = camProcessedExp.cam_id
 JOIN chipRun
     ON camProcessedExp.chip_id = chipRun.chip_id
Index: trunk/ippTools/src/warptool.c
===================================================================
--- trunk/ippTools/src/warptool.c	(revision 16827)
+++ trunk/ippTools/src/warptool.c	(revision 16828)
@@ -193,5 +193,5 @@
 
     if (config->where) {
-        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpInputExp");
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpRun");
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
@@ -240,5 +240,5 @@
 
         // negative simple so the default is true
-        if (!ippdbPrintMetadatas(stdout, output, "warpInputExp", !simple)) {
+        if (!ippdbPrintMetadatas(stdout, output, "warpRun", !simple)) {
             psError(PS_ERR_UNKNOWN, false, "failed to print array");
             psFree(output);
@@ -268,5 +268,5 @@
 
     if (config->where) {
-        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpInputExp");
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpRun");
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
@@ -343,5 +343,5 @@
 
     if (config->where) {
-        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpInputExp");
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpRun");
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
@@ -390,5 +390,5 @@
 
         // negative simple so the default is true
-        if (!ippdbPrintMetadatas(stdout, output, "warpInputExp", !simple)) {
+        if (!ippdbPrintMetadatas(stdout, output, "warpRun", !simple)) {
             psError(PS_ERR_UNKNOWN, false, "failed to print array");
             psFree(output);
@@ -402,5 +402,5 @@
 }
 
-    
+
 static bool addoverlapMode(pxConfig *config)
 {
@@ -673,16 +673,16 @@
     // XXX need to validate that this coresponds to an warpInputImfile
     if (!warpSkyfileInsert(config->dbh,
-			   (psS64)atoll(warp_id),
-			   skycell_id,
-			   tess_id,
-			   uri,
-			   path_base,
-			   bg,
-			   bg_stdev,
-			   dtime_warp,
-			   hostname,
-			   good_frac,
-			   ignore,
-			   code
+                           (psS64)atoll(warp_id),
+                           skycell_id,
+                           tess_id,
+                           uri,
+                           path_base,
+                           bg,
+                           bg_stdev,
+                           dtime_warp,
+                           hostname,
+                           good_frac,
+                           ignore,
+                           code
         )) {
         if (!psDBRollback(config->dbh)) {
@@ -717,5 +717,5 @@
     // < 5 & MYSQL 5 versions need to be kept in sync
 
-#undef MYSQL5 
+#undef MYSQL5
 #if MYSQL5
     // XXX at MySQL 4.1.21 (probably all of 4.1.x) chokes and dies on this