Index: trunk/ippTools/share/difftool_inputskyfile.sql
===================================================================
--- trunk/ippTools/share/difftool_inputskyfile.sql	(revision 26170)
+++ trunk/ippTools/share/difftool_inputskyfile.sql	(revision 26179)
@@ -27,15 +27,9 @@
     JOIN chipRun
         USING(chip_id)
-    JOIN chipProcessedImfile
-        USING(chip_id)
     JOIN rawExp
-        ON chipRun.exp_id = rawExp.exp_id
+        USING(exp_id)
     WHERE
-	-- diffRun.state = 'new' AND 
-        warpRun.state = 'full'
-        AND warpRun.state = 'full'
-        AND fakeRun.state = 'full'
-        AND camRun.state = 'full'
-        AND chipRun.state = 'full'
+        (diffRun.state = 'new' or diffRun.state = 'full')
+        AND (warpRun.state = 'full')
         -- where hook %s
     UNION
@@ -67,14 +61,9 @@
     JOIN chipRun
         USING(chip_id)
-    JOIN chipProcessedImfile
-        USING(chip_id)
     JOIN rawExp
-        ON chipRun.exp_id = rawExp.exp_id
+        USING(exp_id)
     WHERE
-        -- diffRun.state = 'new' AND 
- 	warpRun.state = 'full'
-        AND fakeRun.state = 'full'
-        AND camRun.state = 'full'
-        AND chipRun.state = 'full'
+        (diffRun.state = 'new' or diffRun.state = 'full')
+        AND (warpRun.state = 'full')
         -- where hook %s
     UNION
@@ -107,5 +96,5 @@
         USING(chip_id)
     JOIN rawExp
-        ON chipRun.exp_id = rawExp.exp_id
+        USING(exp_id)
     WHERE
         (diffRun.state = 'new' or diffRun.state = 'full')
@@ -140,5 +129,5 @@
         USING(chip_id)
     JOIN rawExp
-        ON chipRun.exp_id = rawExp.exp_id
+        USING(exp_id)
     WHERE
         (diffRun.state = 'new' or diffRun.state = 'full')