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

Timestamp:

Apr 11, 2017, 3:01:23 PM (9 years ago)

Author:

heather

Message:

changes to make forcedwards correctly (not dropping things)

File:

• trunk/ippToPsps/jython/gpc1db.py (modified) (4 diffs)

trunk/ippToPsps/jython/gpc1db.py

@@ -225 +225 @@
                SELECT DISTINCT exp_id,class_id \
                FROM addRun join \
+               addProcessedExp using(add_id) join \
                fullForceInput on (fullForceInput.ff_id = addRun.stage_id and \
                fullForceInput.warp_id = addRun.stage_extra1) \
@@ -233 +234 @@
                JOIN camRun USING(cam_id)  \
                JOIN chipRun USING(chip_id) \
-               WHERE add_id = " + str(forcedWarpID) + ") AS a"
+               WHERE addProcessedExp.fault = 0 and add_id = " + str(forcedWarpID) + ") AS a"
 
         try:
@@ -261 +262 @@
               JOIN addRun ON(fullForceInput.ff_id = addRun.stage_id \
               AND fullForceInput.warp_id = addRun.stage_extra1) \
+              JOIN addProcessedExp using (add_id) \
               JOIN minidvodbRun USING(minidvodb_name) \
               JOIN minidvodbProcessed USING(minidvodb_id)\
@@ -277 +279 @@
               AND addRun.stage = 'fullforce' \
               AND addRun.state = 'full'\
+              AND addProcessedExp.fault = 0 \
               AND stage_id = " + str(stageID)