Index: trunk/ippTools/share/dettool_pendingcleanup_normalizedexp.sql
===================================================================
--- trunk/ippTools/share/dettool_pendingcleanup_normalizedexp.sql	(revision 26567)
+++ trunk/ippTools/share/dettool_pendingcleanup_normalizedexp.sql	(revision 26815)
@@ -1,20 +1,12 @@
-SELECT
+SELECT DISTINCT 
     detNormalizedExp.*,
     rawExp.camera    
-FROM detRunSummary
-JOIN detNormalizedExp
-    USING(det_id,iteration)
+FROM detNormalizedExp
 JOIN detInputExp
-     USING(det_id,iteration)
+     USING(det_id,exp_id)
 JOIN rawExp
      USING(exp_id)
 WHERE
-    ((detRunSummary.data_state = 'goto_cleaned'
-      AND detNormalizedExp.data_state = 'full')
-     OR (detRunSummary.data_state = 'goto_scrubbed'
-      AND detNormalizedExp.data_state = 'full')
-     OR (detRunSummary.data_state = 'goto_purged'
-      AND detNormalizedExp.data_state = 'full')
-     OR detNormalizedExp.data_state = 'goto_cleaned'
+    (detNormalizedExp.data_state = 'goto_cleaned'
      OR detNormalizedExp.data_state = 'goto_scrubbed'
      OR detNormalizedExp.data_state = 'goto_purged')
Index: trunk/ippTools/share/dettool_pendingcleanup_normalizedimfile.sql
===================================================================
--- trunk/ippTools/share/dettool_pendingcleanup_normalizedimfile.sql	(revision 26567)
+++ trunk/ippTools/share/dettool_pendingcleanup_normalizedimfile.sql	(revision 26815)
@@ -2,19 +2,11 @@
     detNormalizedImfile.*,
     rawExp.camera
-FROM detRunSummary
-JOIN detNormalizedImfile
-    USING(det_id,iteration)
+FROM detNormalizedImfile
 JOIN detInputExp
-     USING(det_id,iteration)
+     USING(det_id,exp_id)
 JOIN rawExp
      USING(exp_id)
 WHERE
-    ((detRunSummary.data_state = 'goto_cleaned'
-      AND detNormalizedImfile.data_state = 'full')
-     OR (detRunSummary.data_state = 'goto_scrubbed'
-      AND detNormalizedImfile.data_state = 'full')
-     OR (detRunSummary.data_state = 'goto_purged'
-      AND detNormalizedImfile.data_state = 'full')
-     OR detNormalizedImfile.data_state = 'goto_cleaned'
+    (detNormalizedImfile.data_state = 'goto_cleaned'
      OR detNormalizedImfile.data_state = 'goto_scrubbed'
      OR detNormalizedImfile.data_state = 'goto_purged')
Index: trunk/ippTools/share/dettool_pendingcleanup_normalizedstat.sql
===================================================================
--- trunk/ippTools/share/dettool_pendingcleanup_normalizedstat.sql	(revision 26567)
+++ trunk/ippTools/share/dettool_pendingcleanup_normalizedstat.sql	(revision 26815)
@@ -2,19 +2,11 @@
     detNormalizedStatImfile.*,
     rawExp.camera
-FROM detRunSummary
-JOIN detNormalizedStatImfile
-    USING(det_id,iteration)
+FROM detNormalizedStatImfile
 JOIN detInputExp
-     USING(det_id,iteration)
+     USING(det_id,exp_id)
 JOIN rawExp
      USING(exp_id)
 WHERE
-    ((detRunSummary.data_state = 'goto_cleaned'
-      AND detNormalizedStatImfile.data_state = 'full')
-     OR (detRunSummary.data_state = 'goto_scrubbed'
-      AND detNormalizedStatImfile.data_state = 'full')
-     OR (detRunSummary.data_state = 'goto_purged'
-      AND detNormalizedStatImfile.data_state = 'full')
-     OR detNormalizedStatImfile.data_state = 'goto_cleaned'
+    (detNormalizedStatImfile.data_state = 'goto_cleaned'
      OR detNormalizedStatImfile.data_state = 'goto_scrubbed'
      OR detNormalizedStatImfile.data_state = 'goto_purged')
Index: trunk/ippTools/share/dettool_pendingcleanup_processedexp.sql
===================================================================
--- trunk/ippTools/share/dettool_pendingcleanup_processedexp.sql	(revision 26567)
+++ trunk/ippTools/share/dettool_pendingcleanup_processedexp.sql	(revision 26815)
@@ -1,19 +1,13 @@
 -- need to restrict to a single detRunSummary (require all to say 'cleaned'?)
-SELECT
+SELECT DISTINCT 
     detProcessedExp.*,
     rawExp.camera
-FROM detRunSummary
-JOIN detProcessedExp
-    USING(det_id)
+FROM detProcessedExp
+JOIN detInputExp
+     USING(det_id,exp_id)
 JOIN rawExp
      USING(exp_id)
 WHERE
-    ((detRunSummary.data_state = 'goto_cleaned'
-      AND detProcessedExp.data_state = 'full')
-     OR (detRunSummary.data_state = 'goto_scrubbed'
-         AND detProcessedExp.data_state = 'full')
-     OR (detRunSummary.data_state = 'goto_purged'
-         AND detProcessedExp.data_state = 'full')
-     OR detProcessedExp.data_state = 'goto_cleaned'
+    (detProcessedExp.data_state = 'goto_cleaned'
      OR detProcessedExp.data_state = 'goto_scrubbed'
      OR detProcessedExp.data_state = 'goto_purged')
Index: trunk/ippTools/share/dettool_pendingcleanup_processedimfile.sql
===================================================================
--- trunk/ippTools/share/dettool_pendingcleanup_processedimfile.sql	(revision 26567)
+++ trunk/ippTools/share/dettool_pendingcleanup_processedimfile.sql	(revision 26815)
@@ -1,10 +1,8 @@
-SELECT
+SELECT DISTINCT
     detProcessedImfile.*,
     rawExp.camera
-FROM detRunSummary
-JOIN detProcessedImfile
-    USING(det_id)
+    FROM detProcessedImfile
 JOIN detInputExp
-     USING(det_id,iteration,exp_id)
+     USING(det_id,exp_id)
 JOIN rawExp
      USING(exp_id)
Index: trunk/ippTools/share/dettool_pendingcleanup_residexp.sql
===================================================================
--- trunk/ippTools/share/dettool_pendingcleanup_residexp.sql	(revision 26567)
+++ trunk/ippTools/share/dettool_pendingcleanup_residexp.sql	(revision 26815)
@@ -1,20 +1,12 @@
-SELECT
+SELECT DISTINCT 
     detResidExp.*,
     rawExp.camera
-FROM detRunSummary
-JOIN detResidExp
-    USING(det_id,iteration)
+FROM detResidExp
 JOIN detInputExp
-     USING(det_id,iteration,exp_id)
+     USING(det_id,exp_id)
 JOIN rawExp
     USING(exp_id)
 WHERE
-    ((detRunSummary.data_state = 'goto_cleaned'
-      AND detResidExp.data_state = 'full')
-     OR (detRunSummary.data_state = 'goto_scrubbed'
-         AND detResidExp.data_state = 'full')
-     OR (detRunSummary.data_state = 'goto_purged'
-         AND detResidExp.data_state = 'full')
-     OR detResidExp.data_state = 'goto_cleaned'
+    (detResidExp.data_state = 'goto_cleaned'
      OR detResidExp.data_state = 'goto_scrubbed'
      OR detResidExp.data_state = 'goto_purged')
Index: trunk/ippTools/share/dettool_pendingcleanup_residimfile.sql
===================================================================
--- trunk/ippTools/share/dettool_pendingcleanup_residimfile.sql	(revision 26567)
+++ trunk/ippTools/share/dettool_pendingcleanup_residimfile.sql	(revision 26815)
@@ -1,20 +1,12 @@
-SELECT
+SELECT DISTINCT
     detResidImfile.*,
     rawExp.camera
-FROM detRunSummary
-JOIN detResidImfile
-    USING(det_id,iteration)
+FROM detResidImfile
 JOIN detInputExp
-    USING(det_id,iteration,exp_id)
+    USING(det_id,exp_id)
 JOIN rawExp
     USING(exp_id)
 WHERE
-    ((detRunSummary.data_state = 'goto_cleaned'
-      AND detResidImfile.data_state = 'full')
-     OR (detRunSummary.data_state = 'goto_scrubbed'
-      AND detResidImfile.data_state = 'full')
-     OR (detRunSummary.data_state = 'goto_purged'
-      AND detResidImfile.data_state = 'full')
-     OR detResidImfile.data_state = 'goto_cleaned'
+    (detResidImfile.data_state = 'goto_cleaned'
      OR detResidImfile.data_state = 'goto_scrubbed'
      OR detResidImfile.data_state = 'goto_purged')
Index: trunk/ippTools/share/dettool_pendingcleanup_stacked.sql
===================================================================
--- trunk/ippTools/share/dettool_pendingcleanup_stacked.sql	(revision 26567)
+++ trunk/ippTools/share/dettool_pendingcleanup_stacked.sql	(revision 26815)
@@ -1,20 +1,12 @@
-SELECT DISTINCT
+ySELECT DISTINCT
     detStackedImfile.*,
     rawExp.camera
-FROM detRunSummary
-JOIN detStackedImfile
-     USING(det_id,iteration)
+FROM detStackedImfile
 JOIN detInputExp
-     USING(det_id,iteration)
+     USING(det_id,exp_id)
 JOIN rawExp
      USING(exp_id)
 WHERE
-    ((detRunSummary.data_state = 'goto_cleaned'
-      AND detStackedImfile.data_state = 'full')
-     OR (detRunSummary.data_state = 'goto_scrubbed'
-      AND detStackedImfile.data_state = 'full')
-     OR (detRunSummary.data_state = 'goto_purged'
-      AND detStackedImfile.data_state = 'full')
-     OR detStackedImfile.data_state = 'goto_cleaned'
+    (detStackedImfile.data_state = 'goto_cleaned'
      OR detStackedImfile.data_state = 'goto_scrubbed'
      OR detStackedImfile.data_state = 'goto_purged')