Index: /branches/pap/ippTools/share/bgtool_advancechip.sql
===================================================================
--- /branches/pap/ippTools/share/bgtool_advancechip.sql	(revision 28470)
+++ /branches/pap/ippTools/share/bgtool_advancechip.sql	(revision 28471)
@@ -8,6 +8,8 @@
     AND chipProcessedImfile.quality = 0
     AND chipProcessedImfile.fault = 0
-    AND chipBackgroundImfile.fault = 0
 -- WHERE hook %s
 GROUP BY chip_bg_id
-HAVING COUNT(chipBackgroundImfile.chip_bg_id) = COUNT(chipProcessedImfile.chip_id)
+HAVING
+    COUNT(chipBackgroundImfile.class_id) = COUNT(chipProcessedImfile.class_id)
+    AND SUM(IF(chipBackgroundImfile.fault > 0, 1, 0)) = 0
+    AND SUM(IF(chipBackgroundImfile.quality > 0, 1, 0)) != COUNT(*)
Index: /branches/pap/ippTools/share/bgtool_advancewarp.sql
===================================================================
--- /branches/pap/ippTools/share/bgtool_advancewarp.sql	(revision 28470)
+++ /branches/pap/ippTools/share/bgtool_advancewarp.sql	(revision 28471)
@@ -8,6 +8,8 @@
     AND warpSkyfile.quality = 0
     AND warpSkyfile.fault = 0
-    AND warpBackgroundSkyfile.fault = 0
 -- WHERE hook %s
 GROUP BY warp_bg_id
-HAVING COUNT(warpBackgroundSkyfile.warp_bg_id) = COUNT(warpSkyfile.warp_id)
+HAVING
+    COUNT(warpBackgroundSkyfile.skycell_id) = COUNT(warpSkyfile.skycell_id)
+    AND SUM(IF(warpBackgroundSkyfile.fault > 0, 1, 0)) = 0
+    AND SUM(IF(warpBackgroundSkyfile.quality > 0, 1, 0)) != COUNT(*)
