Changeset 37917 for trunk/ippToPsps/jython/gpc1db.py

Timestamp:

Feb 20, 2015, 1:19:35 PM (11 years ago)

Author:

heather

Message:

current state of ipptopsps / sas37 - ob/p2/st/df work

File:

• trunk/ippToPsps/jython/gpc1db.py (modified) (1 diff)

trunk/ippToPsps/jython/gpc1db.py

@@ -145 +145 @@
         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) \