Index: trunk/ippTools/src/warptool.c
===================================================================
--- trunk/ippTools/src/warptool.c	(revision 12040)
+++ trunk/ippTools/src/warptool.c	(revision 12041)
@@ -676,9 +676,7 @@
         " JOIN warpSkyCellMap\n"
         "   USING(warp_id)\n"
-        " JOIN chipProcessedExp\n"
-        "   ON warpSkyCellMap.exp_tag = chipProcessedExp.exp_tag\n"
         " JOIN chipProcessedImfile\n"
-        "   ON chipProcessedExp.exp_tag = chipProcessedImfile.exp_tag\n"
-        "   AND chipProcessedExp.class_id = chipProcessedImfile.class_id\n"
+        "   ON warpSkyCellMap.exp_tag = chipProcessedImfile.exp_tag\n"
+        "   AND warpSkyCellMap.class_id = chipProcessedImfile.class_id\n"
         " WHERE\n"
         "   warpRun.state = 'run'\n" 
@@ -769,7 +767,9 @@
         " JOIN warpSkyCellMap\n"
         "   USING(warp_id)\n"
+        " JOIN rawExp\n"
+        "   ON warpSkyCellMap.exp_tag = rawExp.exp_tag\n"
         " JOIN rawImfile\n"
-        "   ON warpSkyCellMap.exp_tag = rawImfile.exp_tag\n"
-        "   AND warpSkyCellMap.class_id = rawImfile.class_id\n"
+        "   ON rawExp.exp_tag = rawImfile.exp_tag\n"
+        "   AND rawExp.class_id = rawImfile.class_id\n"
         " LEFT JOIN warpSkyfile\n"
         "   USING(warp_id, skycell_id, tess_id)\n"