Changeset 19611

Timestamp:

Sep 19, 2008, 7:51:56 AM (18 years ago)

Author:

eugene

Message:

letting verify mode pre-process before resid

Location:

branches/eam_branch_20080918/ippTools/share

Files:

• dettool_addprocessedexp.sql (modified) (1 diff)
• dettool_toprocessedexp.sql (modified) (1 diff)
• dettool_toprocessedimfile.sql (modified) (1 diff)
• dettool_toresidimfile.sql (modified) (2 diffs)

branches/eam_branch_20080918/ippTools/share/dettool_addprocessedexp.sql

@@ -21 +21 @@
 WHERE
   detRun.state = 'run'
-  AND detRun.mode = 'master'
+  AND (detRun.mode = 'master' or detRun.mode = 'verify')
   AND detProcessedExp.det_id IS NULL
   AND detProcessedExp.exp_id IS NULL

branches/eam_branch_20080918/ippTools/share/dettool_toprocessedexp.sql

@@ -48 +48 @@
     WHERE
         detRun.state = 'run'
-        AND detRun.mode = 'master'
+        AND (detRun.mode = 'master' or detRun.mode = 'verify')
         AND detProcessedExp.det_id IS NULL
         AND detProcessedExp.exp_id IS NULL

branches/eam_branch_20080918/ippTools/share/dettool_toprocessedimfile.sql

@@ -19 +19 @@
 WHERE
     detRun.state = 'run'
-    AND detRun.mode = 'master'
+    AND (detRun.mode = 'master' or detRun.mode = 'verify')
     AND detProcessedImfile.det_id IS NULL
     AND detProcessedImfile.exp_id IS NULL

branches/eam_branch_20080918/ippTools/share/dettool_toresidimfile.sql

@@ -55 +55 @@
     detRun.workdir,
     detRun.reduction,
-    -- XXX convert these to detProcessedImfile matching this detRun 
     detProcessedImfile.exp_id,
     detProcessedImfile.class_id,
@@ -66 +65 @@
 FROM detRun
 JOIN detRun AS detRunRef
-  ON detRun.ref_det_id = detRunRef.det_id
-JOIN detNormalizedImfile
-  ON detNormalizedImfile.det_id = detRun.ref_det_id
- AND detNormalizedImfile.iteration = detRun.ref_iter
+  ON detRunRef.det_id = detRun.ref_det_id
 JOIN detInputExp
-  ON detInputExp.det_id = detRun.det_id
+  ON detInputExp.det_id    = detRun.det_id
  AND detInputExp.iteration = detRun.iteration
 JOIN rawExp
-    ON detInputExp.exp_id = rawExp.exp_id
+  ON rawExp.exp_id = detInputExp.exp_id
 JOIN detProcessedImfile
-    ON detProcessedImfile.exp_id = detInputExp.exp_id
-   AND detProcessedImfile.det_id = detRun.det_id
-   AND detProcessedImfile.iteration = detRun.iteration
+  ON detProcessedImfile.det_id    = detRun.det_id
+ AND detProcessedImfile.exp_id    = detInputExp.exp_id
+JOIN detNormalizedImfile
+  ON detNormalizedImfile.det_id    = detRun.ref_det_id
+ AND detNormalizedImfile.iteration = detRun.ref_iter
+ AND detNormalizedImfile.class_id  = detProcessedImfile.class_id
 LEFT JOIN detResidImfile
-    ON detRun.det_id = detResidImfile.det_id
-    AND detRun.iteration = detResidImfile.iteration
-    AND rawImfile.exp_id = detResidImfile.exp_id
-    AND rawImfile.class_id = detResidImfile.class_id
+  ON detResidImfile.det_id    = detRun.det_id      
+ AND detResidImfile.iteration = detRun.iteration   
+ AND detResidImfile.exp_id    = detProcessedImfile.exp_id   
+ AND detResidImfile.class_id  = detProcessedImfile.class_id 
 WHERE
-    detRun.state = 'run'
-    AND detRun.mode = 'verify'
-    AND detRunRef.state = 'stop'
-    AND detNormalizedImfile.fault = 0
-    AND detResidImfile.det_id IS NULL
-    AND detResidImfile.iteration IS NULL
-    AND detResidImfile.exp_id IS NULL
-    AND detResidImfile.class_id IS NULL
+ detRun.state = 'run'
+ AND detRun.mode = 'verify'
+ AND detRunRef.state = 'stop'
+ AND detNormalizedImfile.fault = 0
+ AND detResidImfile.det_id IS NULL
+ AND detResidImfile.iteration IS NULL
+ AND detResidImfile.exp_id IS NULL
+ AND detResidImfile.class_id IS NULL
 ORDER BY exp_id