Changeset 40535

Timestamp:

Sep 26, 2018, 12:20:28 PM (8 years ago)

Author:

eugene

Message:

fix processing if number of inputs is not the same as number of stacks

Location:

trunk/ippTools/share

Files:

• dettool_tonormalizedstat.sql (modified) (1 diff)
• dettool_toresidimfile.sql (modified) (3 diffs)

trunk/ippTools/share/dettool_tonormalizedstat.sql

@@ -10 +10 @@
   COUNT(detResidImfile.class_id)
 FROM detRun
+JOIN detInputExp
+    USING (det_id, iteration)
 JOIN detProcessedImfile
     ON  detProcessedImfile.det_id    = detRun.det_id
+    AND detProcessedImfile.exp_id    = detInputExp.exp_id
 LEFT JOIN detResidImfile
     ON  detResidImfile.det_id    = detProcessedImfile.det_id

trunk/ippTools/share/dettool_toresidimfile.sql

@@ -21 +21 @@
 FROM detRun
 JOIN detInputExp
-    USING(det_id, iteration)
+--  USING(det_id, iteration)
+    ON detInputExp.det_id = detRun.det_id
+    AND detInputExp.iteration = detRun.iteration
+--  AND detInputExp.iteration = 0
 JOIN rawExp
     ON detInputExp.exp_id = rawExp.exp_id
@@ -77 +80 @@
   ON detInputExp.det_id    = detRun.det_id
  AND detInputExp.iteration = detRun.iteration
+-- AND detInputExp.iteration = 0
 JOIN rawExp
   ON rawExp.exp_id = detInputExp.exp_id
@@ -123 +127 @@
   ON detInputExp.det_id    = detRun.det_id
  AND detInputExp.iteration = detRun.iteration
+-- AND detInputExp.iteration = 0
 JOIN rawExp
   ON rawExp.exp_id = detInputExp.exp_id