Changeset 15769

Timestamp:

Dec 7, 2007, 4:36:46 PM (18 years ago)

Author:

jhoblitt

Message:

fix .fault handling

Location:

trunk/ippTools/share

Files:

• chiptool_completely_processed_exp.sql (modified) (1 diff)
• dettool_tonormalizedexp.sql (modified) (2 diffs)
• dettool_tonormalizedstat.sql (modified) (2 diffs)
• dettool_toprocessedexp.sql (modified) (2 diffs)
• dettool_toresidexp.sql (modified) (2 diffs)
• dettool_tostacked.sql (modified) (2 diffs)
• flatcorr_completely_processed_chiprun.sql (modified) (1 diff)
• flatcorr_pending.sql (modified) (1 diff)

trunk/ippTools/share/chiptool_completely_processed_exp.sql

@@ -24 +24 @@
     WHERE
         chipRun.state = 'run'
-        AND (chipProcessedImfile.fault = 0 || chipProcessedImfile.fault IS NULL)
     GROUP BY
         chipRun.chip_id,
         chipRun.exp_id
-    HAVING COUNT(rawImfile.class_id) = COUNT(chipProcessedImfile.class_id)
+    HAVING
+        COUNT(rawImfile.class_id) = COUNT(chipProcessedImfile.class_id)
+        AND SUM(chipProcessedImfile.fault) = 0
     ) as Foo

trunk/ippTools/share/dettool_tonormalizedexp.sql

@@ -30 +30 @@
         detRun.state = 'run'
         AND detRun.mode = 'master'
-        AND detNormalizedImfile.fault = 0
         AND detNormalizedExp.det_id IS NULL
         AND detNormalizedExp.iteration IS NULL
@@ -39 +38 @@
     HAVING
         COUNT(detNormalizedImfile.class_id) = COUNT(rawImfile.class_id)
+        AND SUM(detNormalizedImfile.fault) = 0
     ) as Foo

trunk/ippTools/share/dettool_tonormalizedstat.sql

@@ -45 +45 @@
         detRun.state = 'run'
         AND detRun.mode = 'master'
-        AND (detStackedImfile.fault = 0 || detStackedImfile.fault IS NULL)
         AND detNormalizedStatImfile.det_id IS NULL
         AND detNormalizedStatImfile.iteration IS NULL
@@ -53 +52 @@
         detRun.iteration,
         detRun.det_id
-    HAVING COUNT(rawImfile.class_id) = COUNT(detStackedImfile.class_id)
+    HAVING
+        COUNT(rawImfile.class_id) = COUNT(detStackedImfile.class_id)
+        AND SUM(detStackedImfile.fault) = 0
     ) as tonormalizedstat

trunk/ippTools/share/dettool_toprocessedexp.sql

@@ -49 +49 @@
         detRun.state = 'run'
         AND detRun.mode = 'master'
-        AND (detProcessedImfile.fault = 0 || detProcessedImfile.fault IS NULL)
         AND detProcessedExp.det_id IS NULL
         AND detProcessedExp.exp_id IS NULL
@@ -58 +57 @@
     HAVING
         COUNT(detProcessedImfile.class_id) = COUNT(rawImfile.class_id)
+        AND SUM(detProcessedImfile.fault) = 0
     ) AS detProcessedExp
 

trunk/ippTools/share/dettool_toresidexp.sql

@@ -56 +56 @@
     WHERE
         detRun.state = 'run'
-        AND (detResidImfile.fault = 0 || detResidImfile.fault IS NULL)
         AND detResidExp.det_id IS NULL
         AND detResidExp.iteration IS NULL
@@ -66 +65 @@
     HAVING
         COUNT(rawImfile.class_id) = COUNT(detResidImfile.class_id)
+        AND SUM(detResidImfile.fault = 0)
     ) AS toresidexp

trunk/ippTools/share/dettool_tostacked.sql

@@ -41 +41 @@
     detRun.state = 'run'
     AND detRun.mode = 'master'
-    AND (detProcessedImfile.fault = 0 or detProcessedImfile.fault IS NULL)
     AND detStackedImfile.det_id IS NULL
     AND detStackedImfile.iteration IS NULL
@@ -51 +50 @@
 HAVING
     COUNT(detProcessedImfile.class_id) = COUNT(rawImfile.class_id)
+    AND SUM(detProcessedImfile.fault) = 0

trunk/ippTools/share/flatcorr_completely_processed_chiprun.sql

@@ -27 +27 @@
         WHERE
             chipRun.state = 'stop'
-            AND (chipProcessedImfile.fault = 0 || chipProcessedImfile.fault IS NULL)
         GROUP BY
             chipRun.chip_id,
             chipRun.exp_id
-        HAVING COUNT(rawImfile.class_id) = COUNT(chipProcessedImfile.class_id)
+        HAVING
+            COUNT(rawImfile.class_id) = COUNT(chipProcessedImfile.class_id)
+            AND SUM(chipProcessedImfile.fault) = 0
         ) as Foo
     ) as Bar

trunk/ippTools/share/flatcorr_pending.sql

@@ -16 +16 @@
     flatcorrRun.state = 'run'
     AND chipRun.state = 'stop'
-    AND (chipProcessedImfile.fault = 0 || chipProcessedImfile.fault IS NULL)
 GROUP BY
     chipRun.chip_id,
     chipRun.exp_id
-HAVING COUNT(rawImfile.class_id) = COUNT(chipProcessedImfile.class_id)
+HAVING
+    COUNT(rawImfile.class_id) = COUNT(chipProcessedImfile.class_id)
+    AND SUM(chipProcessedImfile.fault) = 0