Index: trunk/ippToPsps/jython/gpc1db.py
===================================================================
--- trunk/ippToPsps/jython/gpc1db.py	(revision 37754)
+++ trunk/ippToPsps/jython/gpc1db.py	(revision 37917)
@@ -145,7 +145,7 @@
         elif batchType == "FW":
             
-            stage = "forcedwarp"
-            sql = "SELECT DISTINCT sky_id, radeg, decdeg FROM fullForceInput \
-                   JOIN addRun ON(fullForceInput.ff_id = addRun.stage_id, fullForceInput.warp_id = addRun.stage_extra1) \
+            stage = "fullforce"
+            sql = "SELECT DISTINCT add_id, radeg, decdeg FROM fullForceInput \
+                   JOIN addRun ON(fullForceInput.ff_id = addRun.stage_id AND fullForceInput.warp_id = addRun.stage_extra1) \
                    JOIN minidvodbRun USING(minidvodb_name) \
                    JOIN minidvodbProcessed USING(minidvodb_id) \