Index: /branches/pap/ippTools/share/chiptool_completely_processed_exp.sql =================================================================== --- /branches/pap/ippTools/share/chiptool_completely_processed_exp.sql (revision 23580) +++ /branches/pap/ippTools/share/chiptool_completely_processed_exp.sql (revision 23581) @@ -35,3 +35,4 @@ COUNT(rawImfile.class_id) = COUNT(chipProcessedImfile.class_id) AND SUM(chipProcessedImfile.fault) = 0 + AND SUM(chipProcessedImfile.quality > 0) != COUNT(*) ) as Foo Index: /branches/pap/ippTools/share/difftool_definebyquery.sql =================================================================== --- /branches/pap/ippTools/share/difftool_definebyquery.sql (revision 23580) +++ /branches/pap/ippTools/share/difftool_definebyquery.sql (revision 23581) @@ -39,4 +39,5 @@ warpSkyfile.fault = 0 AND warpSkyfile.ignored = 0 + AND warpSkyfile.quality = 0 -- warpsToDiff WHERE hook %s ) AS warpsToDiff Index: /branches/pap/ippTools/share/difftool_definebyquery_part1.sql =================================================================== --- /branches/pap/ippTools/share/difftool_definebyquery_part1.sql (revision 23580) +++ /branches/pap/ippTools/share/difftool_definebyquery_part1.sql (revision 23581) @@ -8,12 +8,14 @@ FROM warpRun JOIN warpSkyfile USING(warp_id) - JOIN fakeRun USING(fake_id) - JOIN camRun USING(cam_id) - JOIN chipRun USING (chip_id) + JOIN fakeRun USING(fake_id) + JOIN camRun USING(cam_id) + JOIN chipRun USING (chip_id) JOIN rawExp USING(exp_id) LEFT JOIN diffRun USING(exp_id) WHERE + warpSkyfile.fault = 0 warpSkyfile.ignored = 0 + AND warpSkyfile.quality = 0 -- warp where hook %s -- exp where hook %s Index: /branches/pap/ippTools/share/flatcorr_completely_processed_chiprun.sql =================================================================== --- /branches/pap/ippTools/share/flatcorr_completely_processed_chiprun.sql (revision 23580) +++ /branches/pap/ippTools/share/flatcorr_completely_processed_chiprun.sql (revision 23581) @@ -14,5 +14,5 @@ dvodb FROM - (SELECT + (SELECT chipRun.*, rawImfile.class_id as rawimfile_class_id, @@ -33,4 +33,5 @@ COUNT(rawImfile.class_id) = COUNT(chipProcessedImfile.class_id) AND SUM(chipProcessedImfile.fault) = 0 - ) as Foo + AND SUM(chipProcessedImfile.quality > 0) != COUNT(*) + ) as Foo ) as Bar Index: /branches/pap/ippTools/share/flatcorr_pending.sql =================================================================== --- /branches/pap/ippTools/share/flatcorr_pending.sql (revision 23580) +++ /branches/pap/ippTools/share/flatcorr_pending.sql (revision 23581) @@ -1,3 +1,3 @@ -SELECT +SELECT * FROM @@ -21,4 +21,4 @@ HAVING COUNT(rawImfile.class_id) = COUNT(chipProcessedImfile.class_id) - AND SUM(chipProcessedImfile.fault) = 0 + AND SUM(chipProcessedImfile.fault > 0) = 0 Index: /branches/pap/ippTools/share/stacktool_definebyquery_insert_random_part1.sql =================================================================== --- /branches/pap/ippTools/share/stacktool_definebyquery_insert_random_part1.sql (revision 23580) +++ /branches/pap/ippTools/share/stacktool_definebyquery_insert_random_part1.sql (revision 23581) @@ -29,4 +29,5 @@ AND warpSkyfile.fault = 0 AND warpSkyfile.ignored = 0 + AND warpSkyfile.quality = 0 -- Put additional constraints here -- stacktool_definebyquery_insert_random_part2.sql goes here Index: /branches/pap/ippTools/share/stacktool_definebyquery_part1.sql =================================================================== --- /branches/pap/ippTools/share/stacktool_definebyquery_part1.sql (revision 23580) +++ /branches/pap/ippTools/share/stacktool_definebyquery_part1.sql (revision 23581) @@ -17,13 +17,14 @@ COUNT(warpSkyfile.skycell_id) AS num_warp -- number of warps that can be stacked FROM warpRun - JOIN warpSkyfile USING(warp_id) - JOIN fakeRun USING(fake_id) - JOIN camRun USING(cam_id) - JOIN chipRun USING(chip_id) - JOIN rawExp USING(exp_id) + JOIN warpSkyfile USING(warp_id) + JOIN fakeRun USING(fake_id) + JOIN camRun USING(cam_id) + JOIN chipRun USING(chip_id) + JOIN rawExp USING(exp_id) WHERE warpRun.state = 'full' - AND warpSkyfile.ignored = 0 - AND warpSkyfile.fault = 0 + AND warpSkyfile.ignored = 0 + AND warpSkyfile.fault = 0 + AND warpSkyfile.quality = 0 -- Here should follow the SQL in stacktool_definebyquery_part2.sql, -- after any additional WHERE conditions have been added Index: /branches/pap/ippTools/share/warptool_finished_run_select.sql =================================================================== --- /branches/pap/ippTools/share/warptool_finished_run_select.sql (revision 23580) +++ /branches/pap/ippTools/share/warptool_finished_run_select.sql (revision 23581) @@ -19,4 +19,4 @@ HAVING COUNT(warpSkyCellMap.warp_id) = COUNT(warpSkyfile.warp_id) - AND SUM(warpSkyfile.fault) = 0 + AND SUM(warpSkyfile.fault > 0) = 0 ) as Foo Index: /branches/pap/ippTools/share/warptool_imfile.sql =================================================================== --- /branches/pap/ippTools/share/warptool_imfile.sql (revision 23580) +++ /branches/pap/ippTools/share/warptool_imfile.sql (revision 23581) @@ -26,3 +26,4 @@ AND camRun.state = 'full' AND chipRun.state = 'full' + AND chipProcessedImfile.quality = 0 Index: /branches/pap/ippTools/share/warptool_revertwarped_delete.sql =================================================================== --- /branches/pap/ippTools/share/warptool_revertwarped_delete.sql (revision 23580) +++ /branches/pap/ippTools/share/warptool_revertwarped_delete.sql (revision 23581) @@ -6,3 +6,4 @@ AND camRun.chip_id = chipRun.chip_id AND chipRun.exp_id = rawExp.exp_id - AND warpSkyfile.fault != 0 + AND (warpSkyfile.fault != 0 OR warpSkyfile.quality != 0) + Index: /branches/pap/ippTools/share/warptool_revertwarped_update.sql =================================================================== --- /branches/pap/ippTools/share/warptool_revertwarped_update.sql (revision 23580) +++ /branches/pap/ippTools/share/warptool_revertwarped_update.sql (revision 23581) @@ -6,3 +6,3 @@ JOIN rawExp USING(exp_id) SET warpRun.state = 'new' -WHERE warpSkyfile.fault != 0 +WHERE (warpSkyfile.fault != 0 OR warpSkyfile.quality != 0) Index: /branches/pap/ippconfig/recipes/ppStatsFromMetadata.config =================================================================== --- /branches/pap/ippconfig/recipes/ppStatsFromMetadata.config (revision 23580) +++ /branches/pap/ippconfig/recipes/ppStatsFromMetadata.config (revision 23581) @@ -50,5 +50,5 @@ ENTRY VAL ROBUST_MEDIAN F32 ROBUST_STDEV -bg_mean_stdev ENTRY VAL ROBUST_STDEV F32 RMS -bg_stdev - ENTRY VAL QUALITY BOOL CONSTANT -quality + ENTRY VAL QUALITY S32 CONSTANT -quality # Bad quality flag END @@ -169,5 +169,5 @@ ENTRY VAL IQ_M2S_L F32 SAMPLE_MEAN -iq_m2s_lq ENTRY VAL IQ_M2S_U F32 SAMPLE_MEAN -iq_m2s_uq - ENTRY VAL QUALITY BOOL CONSTANT -quality + ENTRY VAL QUALITY S32 CONSTANT -quality # Bad quality flag END @@ -255,5 +255,5 @@ ENTRY VAL RANGE.YMAX S32 CONSTANT -ymax ENTRY VAL ACCEPT BOOL CONSTANT -accept - ENTRY VAL QUALITY BOOL CONSTANT -quality + ENTRY VAL QUALITY S32 CONSTANT -quality # Bad quality flag END @@ -282,5 +282,5 @@ ENTRY VAL NUM_SOURCES S32 SUM -sources ENTRY VAL GOOD_PIXEL_FRAC F32 MEAN -good_frac - ENTRY VAL QUALITY BOOL CONSTANT -quality + ENTRY VAL QUALITY S32 CONSTANT -quality # Bad quality flag END @@ -305,5 +305,5 @@ ENTRY VAL NUM_SOURCES S32 SUM -sources ENTRY VAL GOOD_PIXEL_FRAC F32 MEAN -good_frac - ENTRY VAL QUALITY BOOL CONSTANT -quality + ENTRY VAL QUALITY S32 CONSTANT -quality # Bad quality flag END