Changeset 33638 for branches/eam_branches/ipp-20111122/ippTools/share/camtool_find_pendingimfile.sql

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20111122/ippTools/share/camtool_find_pendingimfile.sql (modified) (2 diffs, 1 prop)

branches/eam_branches/ipp-20111122/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,
@@ -17 +18 @@
     USING(exp_id)
 JOIN rawImfile
-    USING(exp_id, class_id, exp_time)
+    USING(exp_id, class_id)
 LEFT JOIN camProcessedExp
     USING(cam_id)