Changeset 35235 for branches/eam_branches/ipp-20130207/ippToPsps/jython/gpc1db.py

Timestamp:

Mar 5, 2013, 2:23:09 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130207/ippToPsps

Files:

• . (modified) (1 prop)
• jython/gpc1db.py (modified) (2 diffs)

branches/eam_branches/ipp-20130207/ippToPsps/jython/gpc1db.py

@@ -61 +61 @@
             sql = "SELECT DISTINCT stage_id, DEGREES(ra), DEGREES(decl) \
                    FROM addRun \
+                   JOIN addProcessedExp USING (add_id) \
                    JOIN minidvodbRun USING(minidvodb_name) \
                    JOIN minidvodbProcessed USING(minidvodb_id) \
                    JOIN camRun ON (stage_id = cam_id) \
+                   JOIN camProcessedExp USING(cam_id) \
                    JOIN chipRun USING (chip_id) \
                    JOIN rawExp USING (exp_id) \
@@ -73 +75 @@
                    AND minidvodbProcessed.fault = 0 \
                    AND mergedvodbProcessed.fault = 0 \
+                   AND camProcessedExp.fault = 0 \
+                   AND addProcessedExp.fault = 0 \
                    AND addRun.stage = '" + stage + "' \
                    AND addRun.state = 'full' \