Changeset 33415 for branches/meh_branches/ppstack_test/ippTools/share/camtool_find_pendingimfile.sql

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (3 diffs, 1 prop)

branches/meh_branches/ppstack_test/ippTools/share/camtool_find_pendingimfile.sql

@@ -2 +2 @@
     camRun.cam_id,
     chipProcessedImfile.*,
-    (IF(exp_time IS NOT NULL AND deteff_magref IS NOT NULL,
-       (2.5 * LOG10(exp_time) + chipProcessedImfile.deteff_magref),  NULL))
+    (IF(rawExp.exp_time IS NOT NULL AND deteff_magref IS NOT NULL,
+       (2.5 * LOG10(rawExp.exp_time) + chipProcessedImfile.deteff_magref),
+        NULL))
         AS deteff_inst,
     rawExp.exp_name,
@@ -13 +14 @@
     USING (chip_id)
 JOIN chipProcessedImfile
-    USING (chip_id)
+    USING (chip_id, exp_id)
 JOIN rawExp
-  ON chipProcessedImfile.exp_id = rawExp.exp_id
+    USING(exp_id)
+JOIN rawImfile
+    USING(exp_id, class_id)
 LEFT JOIN camProcessedExp
     USING(cam_id)
@@ -22 +25 @@
 WHERE
     camMask.label IS NULL
+    AND rawImfile.ignored = 0