Index: trunk/ippTools/share/Makefile.am =================================================================== --- trunk/ippTools/share/Makefile.am (revision 19038) +++ trunk/ippTools/share/Makefile.am (revision 19092) @@ -1,128 +1,156 @@ dist_pkgdata_DATA = \ - camtool_find_chip_id.sql \ - camtool_find_pendingexp.sql \ - camtool_find_pendingimfile.sql \ - camtool_find_processedexp.sql \ - camtool_queue_chip_id.sql \ - camtool_reset_faulted_runs.sql \ - camtool_revertprocessedexp.sql \ - chiptool_completely_processed_exp.sql \ - chiptool_donecleanup.sql \ - chiptool_find_rawexp.sql \ - chiptool_pendingcleanupimfile.sql \ - chiptool_pendingcleanuprun.sql \ - chiptool_pendingimfile.sql \ - chiptool_processedimfile.sql \ - chiptool_revertprocessedimfile.sql \ - chiptool_run.sql \ - chiptool_unmasked.sql \ - detselect_search.sql \ - detselect_select.sql \ - dettool_addprocessedexp.sql \ - dettool_childlessrun.sql \ - dettool_definebydetrun.sql \ - dettool_detrunsummary.sql \ - dettool_find_completed_runs.sql \ - dettool_input.sql \ - dettool_normalizedexp.sql \ - dettool_normalizedimfile.sql \ - dettool_normalizedstat.sql \ - dettool_pending.sql \ - dettool_processedimfile.sql \ - dettool_raw.sql \ - dettool_residexp.sql \ - dettool_residimfile.sql \ - dettool_revertdetrunsummary.sql \ - dettool_revertnormalizedexp.sql \ - dettool_revertnormalizedimfile.sql \ - dettool_revertnormalizedstat.sql \ - dettool_revertprocessedexp.sql \ - dettool_revertprocessedimfile.sql \ - dettool_revertresidexp.sql \ - dettool_revertresidimfile.sql\ - dettool_revertstacked.sql \ - dettool_runs.sql \ - dettool_stacked.sql \ - dettool_start_new_iteration.sql \ - dettool_stop_completed_correct_runs.sql \ - dettool_tocorrectexp.sql \ - dettool_tocorrectimfile.sql \ - dettool_todetrunsummary.sql \ - dettool_tonormalize.sql \ - dettool_tonormalizedexp.sql \ - dettool_tonormalizedstat.sql \ - dettool_toprocessedexp.sql \ - dettool_toprocessedimfile.sql \ - dettool_toresidexp.sql \ - dettool_toresidimfile.sql \ - dettool_tostacked.sql \ - difftool_inputskyfile.sql \ - difftool_definebyquery.sql \ - difftool_revertdiffskyfile_update.sql \ - difftool_revertdiffskyfile_delete.sql \ - difftool_skyfile.sql \ - difftool_todiffskyfile.sql \ - faketool_completely_processed_exp.sql \ - faketool_find_camrun.sql \ - faketool_find_pendingexp.sql \ - faketool_pendingimfile.sql \ - faketool_processedimfile.sql \ - faketool_queue_cam_id.sql \ - faketool_revertprocessedimfile.sql \ - faketool_unmasked.sql \ - flatcorr_completely_processed_chiprun.sql \ - flatcorr_create_tmp_chiprundone.sql \ - flatcorr_find_completed_floatcorruns.sql \ - flatcorr_find_processedimfiles.sql \ - flatcorr_pending.sql \ - magictool_definebyquery_temp_create.sql \ - magictool_definebyquery_temp_insert.sql \ - magictool_definebyquery_temp_insert_groupby.sql \ - magictool_definebyquery_select_part1.sql \ - magictool_definebyquery_select_part2.sql \ - magictool_definebyquery_insert.sql \ - magictool_inputskyfile.sql \ - magictool_totree.sql \ - magictool_tomask.sql \ - magictool_toprocess_inputs.sql \ - magictool_toprocess_tree.sql \ - magictool_toskyfilemask.sql \ - magictool_inputs.sql \ - magictool_addmask.sql \ - magictool_mask.sql \ - pstamptool_addjob_otherjob.sql \ - pstamptool_addjob_stampjob.sql \ - pstamptool_datastore.sql \ - pstamptool_pendingjob.sql \ - pstamptool_pendingreq.sql \ - pxadmin_create_tables.sql \ - pxadmin_drop_tables.sql \ - pztool_find_completed_exp.sql \ - pztool_pendingimfile.sql \ - pztool_revert_downloadimfile_faults.sql \ - pztool_revert_fileset_faults.sql \ - pztool_revertcopied.sql \ - regtool_create_dup_table.sql \ - regtool_pendingexp.sql \ - regtool_pendingimfile.sql \ - regtool_populate_dup_table.sql \ - regtool_processedexp.sql \ - regtool_processedimfile.sql \ - regtool_revertprocessedexp.sql \ - regtool_revertprocessedimfile.sql \ - stacktool_definebyquery_part1.sql \ - stacktool_definebyquery_part2.sql \ - stacktool_definebyquery_insert.sql \ - stacktool_definebyquery_insert_random.sql \ - stacktool_inputskyfile.sql \ - stacktool_revertsumskyfile_update.sql \ - stacktool_revertsumskyfile_delete.sql \ - stacktool_sumskyfile.sql \ - stacktool_tosum.sql \ - warptool_exp.sql \ - warptool_imfile.sql \ - warptool_revertwarped.sql \ - warptool_scmap.sql \ - warptool_tooverlap.sql \ - warptool_towarped.sql \ - warptool_warped.sql + camtool_donecleanup.sql \ + camtool_find_chip_id.sql \ + camtool_find_pendingexp.sql \ + camtool_find_pendingimfile.sql \ + camtool_find_processedexp.sql \ + camtool_pendingcleanupexp.sql \ + camtool_pendingcleanuprun.sql \ + camtool_queue_chip_id.sql \ + camtool_reset_faulted_runs.sql \ + camtool_revertprocessedexp.sql \ + chiptool_completely_processed_exp.sql \ + chiptool_donecleanup.sql \ + chiptool_find_rawexp.sql \ + chiptool_pendingcleanupimfile.sql \ + chiptool_pendingcleanuprun.sql \ + chiptool_pendingimfile.sql \ + chiptool_processedimfile.sql \ + chiptool_revertprocessedimfile.sql \ + chiptool_run.sql \ + chiptool_unmasked.sql \ + detselect_search.sql \ + detselect_select.sql \ + dettool_addprocessedexp.sql \ + dettool_childlessrun.sql \ + dettool_definebydetrun.sql \ + dettool_detrunsummary.sql \ + dettool_find_completed_runs.sql \ + dettool_input.sql \ + dettool_normalizedexp.sql \ + dettool_normalizedimfile.sql \ + dettool_normalizedstat.sql \ + dettool_pending.sql \ + dettool_pendingcleanup_normalizedexp.sql \ + dettool_pendingcleanup_normalizedimfile.sql \ + dettool_pendingcleanup_normalizedstat.sql \ + dettool_pendingcleanup_processedexp.sql \ + dettool_pendingcleanup_processedimfile.sql \ + dettool_pendingcleanup_residexp.sql \ + dettool_pendingcleanup_residimfile.sql \ + dettool_pendingcleanup_stacked.sql \ + dettool_processedimfile.sql \ + dettool_raw.sql \ + dettool_residexp.sql \ + dettool_residimfile.sql \ + dettool_revertdetrunsummary.sql \ + dettool_revertnormalizedexp.sql \ + dettool_revertnormalizedimfile.sql \ + dettool_revertnormalizedstat.sql \ + dettool_revertprocessedexp.sql \ + dettool_revertprocessedimfile.sql \ + dettool_revertresidexp.sql \ + dettool_revertresidimfile.sql \ + dettool_revertstacked.sql \ + dettool_runs.sql \ + dettool_stacked.sql \ + dettool_start_new_iteration.sql \ + dettool_stop_completed_correct_runs.sql \ + dettool_tocorrectexp.sql \ + dettool_tocorrectimfile.sql \ + dettool_todetrunsummary.sql \ + dettool_tonormalize.sql \ + dettool_tonormalizedexp.sql \ + dettool_tonormalizedstat.sql \ + dettool_toprocessedexp.sql \ + dettool_toprocessedimfile.sql \ + dettool_toresidexp.sql \ + dettool_toresidimfile.sql \ + dettool_tostacked.sql \ + difftool_definebyquery.sql \ + difftool_donecleanup.sql \ + difftool_inputskyfile.sql \ + difftool_pendingcleanuprun.sql \ + difftool_pendingcleanupskyfile.sql \ + difftool_revertdiffskyfile_delete.sql \ + difftool_revertdiffskyfile_update.sql \ + difftool_skyfile.sql \ + difftool_todiffskyfile.sql \ + faketool_completely_processed_exp.sql \ + faketool_donecleanup.sql \ + faketool_find_camrun.sql \ + faketool_find_pendingexp.sql \ + faketool_pendingcleanupimfile.sql \ + faketool_pendingcleanuprun.sql \ + faketool_pendingimfile.sql \ + faketool_processedimfile.sql \ + faketool_queue_cam_id.sql \ + faketool_revertprocessedimfile.sql \ + faketool_unmasked.sql \ + flatcorr_completely_processed_chiprun.sql \ + flatcorr_create_tmp_chiprundone.sql \ + flatcorr_find_completed_floatcorruns.sql \ + flatcorr_find_processedimfiles.sql \ + flatcorr_pending.sql \ + magictool_addmask.sql \ + magictool_create_tmp_warpcomplete.sql \ + magictool_definebyquery.sql \ + magictool_definebyquery_insert.sql \ + magictool_definebyquery_select_part1.sql \ + magictool_definebyquery_select_part2.sql \ + magictool_definebyquery_select_test.sql \ + magictool_definebyquery_temp_create.sql \ + magictool_definebyquery_temp_insert.sql \ + magictool_definebyquery_temp_insert_groupby.sql \ + magictool_inputs.sql \ + magictool_inputskyfile.sql \ + magictool_mask.sql \ + magictool_tomask.sql \ + magictool_toprocess_inputs.sql \ + magictool_toprocess_tree.sql \ + magictool_toskyfilemask.sql \ + magictool_totree.sql \ + pstamptool_addjob_otherjob.sql \ + pstamptool_addjob_stampjob.sql \ + pstamptool_datastore.sql \ + pstamptool_pendingjob.sql \ + pstamptool_pendingreq.sql \ + pxadmin_create_tables.sql \ + pxadmin_drop_tables.sql \ + pztool_find_completed_exp.sql \ + pztool_pendingimfile.sql \ + pztool_revert_downloadimfile_faults.sql \ + pztool_revert_fileset_faults.sql \ + pztool_revertcopied.sql \ + regtool_create_dup_table.sql \ + regtool_pendingexp.sql \ + regtool_pendingimfile.sql \ + regtool_populate_dup_table.sql \ + regtool_processedexp.sql \ + regtool_processedimfile.sql \ + regtool_revertprocessedexp.sql \ + regtool_revertprocessedimfile.sql \ + stacktool_definebyquery_insert.sql \ + stacktool_definebyquery_insert_random.sql \ + stacktool_definebyquery_part1.sql \ + stacktool_definebyquery_part2.sql \ + stacktool_definebyquery_test.sql \ + stacktool_donecleanup.sql \ + stacktool_find_complete_warps.sql \ + stacktool_inputskyfile.sql \ + stacktool_pendingcleanuprun.sql \ + stacktool_pendingcleanupskyfile.sql \ + stacktool_revertsumskyfile_delete.sql \ + stacktool_revertsumskyfile_update.sql \ + stacktool_sumskyfile.sql \ + stacktool_tosum.sql \ + warptool_donecleanup.sql \ + warptool_exp.sql \ + warptool_imfile.sql \ + warptool_pendingcleanuprun.sql \ + warptool_pendingcleanupskyfile.sql \ + warptool_revertwarped.sql \ + warptool_scmap.sql \ + warptool_tooverlap.sql \ + warptool_towarped.sql \ + warptool_warped.sql Index: trunk/ippTools/share/camtool_donecleanup.sql =================================================================== --- trunk/ippTools/share/camtool_donecleanup.sql (revision 19092) +++ trunk/ippTools/share/camtool_donecleanup.sql (revision 19092) @@ -0,0 +1,5 @@ +SELECT + camRun.* +FROM camRun +WHERE + camRun.state = 'cleaned' Index: trunk/ippTools/share/camtool_find_pendingexp.sql =================================================================== --- trunk/ippTools/share/camtool_find_pendingexp.sql (revision 19038) +++ trunk/ippTools/share/camtool_find_pendingexp.sql (revision 19092) @@ -25,5 +25,5 @@ WHERE chipRun.state = 'full' - AND camRun.state = 'run' + AND camRun.state = 'new' AND camMask.label IS NULL AND camProcessedExp.cam_id IS NULL Index: trunk/ippTools/share/camtool_pendingcleanupexp.sql =================================================================== --- trunk/ippTools/share/camtool_pendingcleanupexp.sql (revision 19092) +++ trunk/ippTools/share/camtool_pendingcleanupexp.sql (revision 19092) @@ -0,0 +1,15 @@ +SELECT + camProcessedExp.*, + camRun.state, + camRun.workdir, + camRun.label, + camRun.reduction, + camRun.expgroup, + camRun.dvodb, + camRun.tess_id, + camRun.end_stage +FROM camRun +JOIN camProcessedExp + USING(cam_id) +WHERE + camRun.state = 'goto_cleaned' Index: trunk/ippTools/share/camtool_pendingcleanuprun.sql =================================================================== --- trunk/ippTools/share/camtool_pendingcleanuprun.sql (revision 19092) +++ trunk/ippTools/share/camtool_pendingcleanuprun.sql (revision 19092) @@ -0,0 +1,11 @@ +SELECT + camRun.cam_id, + rawExp.camera, + camRun.state +FROM camRun +JOIN chipRun +USING (chip_id) +JOIN rawExp +USING (exp_id) +WHERE + camRun.state = 'goto_cleaned' Index: trunk/ippTools/share/camtool_reset_faulted_runs.sql =================================================================== --- trunk/ippTools/share/camtool_reset_faulted_runs.sql (revision 19038) +++ trunk/ippTools/share/camtool_reset_faulted_runs.sql (revision 19092) @@ -1,4 +1,4 @@ UPDATE camRun, camProcessedExp, chipRun, rawExp -SET camRun.state = 'run' +SET camRun.state = 'new' WHERE camRun.cam_id = camProcessedExp.cam_id Index: trunk/ippTools/share/dettool_addprocessedexp.sql =================================================================== --- trunk/ippTools/share/dettool_addprocessedexp.sql (revision 19038) +++ trunk/ippTools/share/dettool_addprocessedexp.sql (revision 19092) @@ -25,6 +25,6 @@ AND detProcessedExp.exp_id IS NULL AND detInputExp.include = 1 - AND detRun.det_id = %s - AND detProcessedImfile.exp_id = '%s' + AND detRun.det_id = %lld + AND detProcessedImfile.exp_id = %lld GROUP BY detProcessedImfile.class_id, Index: trunk/ippTools/share/dettool_definebydetrun.sql =================================================================== --- trunk/ippTools/share/dettool_definebydetrun.sql (revision 19038) +++ trunk/ippTools/share/dettool_definebydetrun.sql (revision 19092) @@ -3,5 +3,5 @@ INSERT INTO detInputExp SELECT - %d, + %lld, 0, detResidExp.exp_id, @@ -10,3 +10,3 @@ JOIN rawExp USING(exp_id) - WHERE det_id = %d + WHERE det_id = %lld Index: trunk/ippTools/share/dettool_pendingcleanup_normalizedexp.sql =================================================================== --- trunk/ippTools/share/dettool_pendingcleanup_normalizedexp.sql (revision 19092) +++ trunk/ippTools/share/dettool_pendingcleanup_normalizedexp.sql (revision 19092) @@ -0,0 +1,9 @@ +SELECT + detNormalizedExp.*, + detRunSummary.data_state +FROM detRunSummary +JOIN detNormalizedExp + USING(det_id,iteration) +WHERE + detRunSummary.data_state = 'goto_cleaned' +AND detNormalizedExp.data_state = 'full' Index: trunk/ippTools/share/dettool_pendingcleanup_normalizedimfile.sql =================================================================== --- trunk/ippTools/share/dettool_pendingcleanup_normalizedimfile.sql (revision 19092) +++ trunk/ippTools/share/dettool_pendingcleanup_normalizedimfile.sql (revision 19092) @@ -0,0 +1,9 @@ +SELECT + detNormalizedImfile.*, + detRunSummary.data_state +FROM detRunSummary +JOIN detNormalizedImfile + USING(det_id,iteration) +WHERE + detRunSummary.data_state = 'goto_cleaned' +AND detNormalizedImfile.data_state = 'full' Index: trunk/ippTools/share/dettool_pendingcleanup_normalizedstat.sql =================================================================== --- trunk/ippTools/share/dettool_pendingcleanup_normalizedstat.sql (revision 19092) +++ trunk/ippTools/share/dettool_pendingcleanup_normalizedstat.sql (revision 19092) @@ -0,0 +1,9 @@ +SELECT + detNormalizedStatImfile.*, + detRunSummary.data_state +FROM detRunSummary +JOIN detNormalizedStatImfile + USING(det_id,iteration) +WHERE + detRunSummary.data_state = 'goto_cleaned' +AND detNormalizedStatImfile.data_state = 'full' Index: trunk/ippTools/share/dettool_pendingcleanup_processedexp.sql =================================================================== --- trunk/ippTools/share/dettool_pendingcleanup_processedexp.sql (revision 19092) +++ trunk/ippTools/share/dettool_pendingcleanup_processedexp.sql (revision 19092) @@ -0,0 +1,10 @@ +-- need to restrict to a single detRunSummary (require all to say 'cleaned'?) +SELECT + detProcessedExp.*, + detRunSummary.data_state +FROM detRunSummary +JOIN detProcessedExp + USING(det_id) +WHERE + detRunSummary.data_state = 'goto_cleaned' +AND detProcessedExp.data_state = 'full' Index: trunk/ippTools/share/dettool_pendingcleanup_processedimfile.sql =================================================================== --- trunk/ippTools/share/dettool_pendingcleanup_processedimfile.sql (revision 19092) +++ trunk/ippTools/share/dettool_pendingcleanup_processedimfile.sql (revision 19092) @@ -0,0 +1,10 @@ +-- need to restrict to a single detRunSummary (require all to say 'cleaned'?) +SELECT + detProcessedImfile.*, + detRunSummary.data_state +FROM detRunSummary +JOIN detProcessedImfile + USING(det_id) +WHERE + detRunSummary.data_state = 'goto_cleaned' +AND detProcessedImfile.data_state = 'full' Index: trunk/ippTools/share/dettool_pendingcleanup_residexp.sql =================================================================== --- trunk/ippTools/share/dettool_pendingcleanup_residexp.sql (revision 19092) +++ trunk/ippTools/share/dettool_pendingcleanup_residexp.sql (revision 19092) @@ -0,0 +1,9 @@ +SELECT + detResidExp.*, + detRunSummary.data_state +FROM detRunSummary +JOIN detResidExp + USING(det_id,iteration) +WHERE + detRunSummary.data_state = 'goto_cleaned' +AND detResidExp.data_state = 'full' Index: trunk/ippTools/share/dettool_pendingcleanup_residimfile.sql =================================================================== --- trunk/ippTools/share/dettool_pendingcleanup_residimfile.sql (revision 19092) +++ trunk/ippTools/share/dettool_pendingcleanup_residimfile.sql (revision 19092) @@ -0,0 +1,9 @@ +SELECT + detResidImfile.*, + detRunSummary.data_state +FROM detRunSummary +JOIN detResidImfile + USING(det_id,iteration) +WHERE + detRunSummary.data_state = 'goto_cleaned' +AND detResidImfile.data_state = 'full' Index: trunk/ippTools/share/dettool_pendingcleanup_stacked.sql =================================================================== --- trunk/ippTools/share/dettool_pendingcleanup_stacked.sql (revision 19092) +++ trunk/ippTools/share/dettool_pendingcleanup_stacked.sql (revision 19092) @@ -0,0 +1,9 @@ +SELECT + detStackedImfile.*, + detRunSummary.data_state +FROM detRunSummary +JOIN detStackedImfile + USING(det_id,iteration) +WHERE + detRunSummary.data_state = 'goto_cleaned' +AND detStackedImfile.data_state = 'full' Index: trunk/ippTools/share/difftool_donecleanup.sql =================================================================== --- trunk/ippTools/share/difftool_donecleanup.sql (revision 19092) +++ trunk/ippTools/share/difftool_donecleanup.sql (revision 19092) @@ -0,0 +1,5 @@ +SELECT + diffRun.* +FROM diffRun +WHERE + diffRun.state = 'cleaned' Index: trunk/ippTools/share/difftool_inputskyfile.sql =================================================================== --- trunk/ippTools/share/difftool_inputskyfile.sql (revision 19038) +++ trunk/ippTools/share/difftool_inputskyfile.sql (revision 19092) @@ -30,8 +30,8 @@ ON chipRun.exp_id = rawExp.exp_id WHERE - diffRun.state = 'run' - AND warpRun.state = 'stop' - AND fakeRun.state = 'stop' - AND camRun.state = 'stop' + diffRun.state = 'new' + AND warpRun.state = 'full' + AND fakeRun.state = 'full' + AND camRun.state = 'full' AND chipRun.state = 'full' UNION @@ -66,8 +66,8 @@ ON chipRun.exp_id = rawExp.exp_id WHERE - diffRun.state = 'run' - AND warpRun.state = 'stop' - AND fakeRun.state = 'stop' - AND camRun.state = 'stop' + diffRun.state = 'new' + AND warpRun.state = 'full' + AND fakeRun.state = 'full' + AND camRun.state = 'full' AND chipRun.state = 'full' ) as Foo Index: trunk/ippTools/share/difftool_pendingcleanuprun.sql =================================================================== --- trunk/ippTools/share/difftool_pendingcleanuprun.sql (revision 19092) +++ trunk/ippTools/share/difftool_pendingcleanuprun.sql (revision 19092) @@ -0,0 +1,25 @@ +-- does this result in too many entries (one for each diffInputSkyfile?) +-- all of this is just to get the camera used for the diff run +SELECT + diffRun.diff_id, + rawExp.camera, + diffRun.state +FROM diffRun +JOIN diffInputSkyfile + USING(diff_id) +JOIN warpSkyfile + ON diffInputSkyfile.warp_id = warpSkyfile.warp_id + AND diffInputSkyfile.skycell_id = warpSkyfile.skycell_id + AND diffInputSkyfile.tess_id = warpSkyfile.tess_id +JOIN warpRun + ON warpRun.warp_id = warpSkyfile.warp_id +JOIN fakeRun + USING(fake_id) +JOIN camRun + USING(cam_id) +JOIN chipRun + USING(chip_id) +JOIN rawExp + USING(exp_id) +WHERE + diffRun.state = 'goto_cleaned' Index: trunk/ippTools/share/difftool_pendingcleanupskyfile.sql =================================================================== --- trunk/ippTools/share/difftool_pendingcleanupskyfile.sql (revision 19092) +++ trunk/ippTools/share/difftool_pendingcleanupskyfile.sql (revision 19092) @@ -0,0 +1,11 @@ +SELECT + diffSkyfile.*, + diffRun.state, + diffRun.workdir, + diffRun.dvodb, + diffRun.tess_id +FROM diffRun +JOIN diffSkyfile + USING(diff_id) +WHERE + diffRun.state = 'goto_cleaned' Index: trunk/ippTools/share/difftool_skyfile.sql =================================================================== --- trunk/ippTools/share/difftool_skyfile.sql (revision 19038) +++ trunk/ippTools/share/difftool_skyfile.sql (revision 19092) @@ -9,5 +9,5 @@ JOIN diffSkyfile USING(diff_id) --- my new stuff begins here +-- WS: my new stuff begins here JOIN diffInputSkyfile ON diffInputSkyfile.diff_id = diffRun.diff_id @@ -23,7 +23,7 @@ JOIN rawExp ON chipRun.exp_id = rawExp.exp_id --- my new stuff ends here +-- WS: my new stuff ends here WHERE -- bogus test to allow appending conditionals + -- XXX EAM : this is not needed if we modify the difftool.c code : fix diffRun.diff_id IS NOT NULL - Index: trunk/ippTools/share/difftool_todiffskyfile.sql =================================================================== --- trunk/ippTools/share/difftool_todiffskyfile.sql (revision 19038) +++ trunk/ippTools/share/difftool_todiffskyfile.sql (revision 19092) @@ -25,8 +25,8 @@ ON diffInputSkyfile.diff_id = diffSkyfile.diff_id WHERE - diffRun.state = 'run' - AND warpRun.state = 'stop' - AND fakeRun.state = 'stop' - AND camRun.state = 'stop' + diffRun.state = 'new' + AND warpRun.state = 'full' + AND fakeRun.state = 'full' + AND camRun.state = 'full' AND chipRun.state = 'full' AND diffSkyfile.diff_id IS NULL Index: trunk/ippTools/share/faketool_completely_processed_exp.sql =================================================================== --- trunk/ippTools/share/faketool_completely_processed_exp.sql (revision 19038) +++ trunk/ippTools/share/faketool_completely_processed_exp.sql (revision 19092) @@ -31,5 +31,5 @@ AND rawImfile.class_id = fakeProcessedImfile.class_id WHERE - fakeRun.state = 'run' + fakeRun.state = 'new' GROUP BY fakeRun.fake_id, Index: trunk/ippTools/share/faketool_donecleanup.sql =================================================================== --- trunk/ippTools/share/faketool_donecleanup.sql (revision 19092) +++ trunk/ippTools/share/faketool_donecleanup.sql (revision 19092) @@ -0,0 +1,5 @@ +SELECT + fakeRun.* +FROM fakeRun +WHERE + fakeRun.state = 'cleaned' Index: trunk/ippTools/share/faketool_find_camrun.sql =================================================================== --- trunk/ippTools/share/faketool_find_camrun.sql (revision 19038) +++ trunk/ippTools/share/faketool_find_camrun.sql (revision 19092) @@ -32,5 +32,5 @@ using(exp_id) WHERE - camRun.state = 'stop' + camRun.state = 'full' AND chipRun.state = 'full' ) as Foo Index: trunk/ippTools/share/faketool_find_pendingexp.sql =================================================================== --- trunk/ippTools/share/faketool_find_pendingexp.sql (revision 19038) +++ trunk/ippTools/share/faketool_find_pendingexp.sql (revision 19092) @@ -25,6 +25,6 @@ ON fakeRun.label = fakeMask.label WHERE - fakeRun.state = 'run' - AND camRun.state = 'stop' + fakeRun.state = 'new' + AND camRun.state = 'full' AND chipRun.state = 'full' AND fakeMask.label IS NULL Index: trunk/ippTools/share/faketool_pendingcleanupimfile.sql =================================================================== --- trunk/ippTools/share/faketool_pendingcleanupimfile.sql (revision 19092) +++ trunk/ippTools/share/faketool_pendingcleanupimfile.sql (revision 19092) @@ -0,0 +1,15 @@ +SELECT + fakeProcessedImfile.*, + fakeRun.state, + fakeRun.workdir, + fakeRun.label, + fakeRun.reduction, + fakeRun.expgroup, + fakeRun.dvodb, + fakeRun.tess_id, + fakeRun.end_stage +FROM fakeRun +JOIN fakeProcessedImfile + USING(fake_id) +WHERE + fakeRun.state = 'goto_cleaned' Index: trunk/ippTools/share/faketool_pendingcleanuprun.sql =================================================================== --- trunk/ippTools/share/faketool_pendingcleanuprun.sql (revision 19092) +++ trunk/ippTools/share/faketool_pendingcleanuprun.sql (revision 19092) @@ -0,0 +1,13 @@ +SELECT + fakeRun.fake_id, + rawExp.camera, + fakeRun.state +FROM fakeRun +JOIN camRun +USING (cam_id) +JOIN chipRun +USING (chip_id) +JOIN rawExp +USING (exp_id) +WHERE + fakeRun.state = 'goto_cleaned' Index: trunk/ippTools/share/faketool_queue_cam_id.sql =================================================================== --- trunk/ippTools/share/faketool_queue_cam_id.sql (revision 19038) +++ trunk/ippTools/share/faketool_queue_cam_id.sql (revision 19092) @@ -14,4 +14,4 @@ FROM camRun WHERE - camRun.state = 'stop' + camRun.state = 'full' AND camRun.cam_id = %lld Index: trunk/ippTools/share/pxadmin_create_tables.sql =================================================================== --- trunk/ippTools/share/pxadmin_create_tables.sql (revision 19038) +++ trunk/ippTools/share/pxadmin_create_tables.sql (revision 19092) @@ -485,4 +485,5 @@ user_5 DOUBLE, path_base VARCHAR(255), + data_state VARCHAR(64), fault SMALLINT NOT NULL, PRIMARY KEY(det_id, exp_id, class_id), @@ -512,4 +513,5 @@ user_5 DOUBLE, path_base VARCHAR(255), + data_state VARCHAR(64), fault SMALLINT NOT NULL, PRIMARY KEY(det_id, exp_id), @@ -535,4 +537,5 @@ user_4 DOUBLE, user_5 DOUBLE, + data_state VARCHAR(64), fault SMALLINT NOT NULL, PRIMARY KEY(det_id, iteration, class_id), @@ -549,4 +552,5 @@ class_id VARCHAR(64), norm FLOAT, + data_state VARCHAR(64), fault SMALLINT NOT NULL, PRIMARY KEY(det_id, iteration, class_id), @@ -572,4 +576,5 @@ user_5 DOUBLE, path_base VARCHAR(255), + data_state VARCHAR(64), fault SMALLINT NOT NULL, PRIMARY KEY(det_id, iteration, class_id), @@ -595,4 +600,5 @@ user_5 DOUBLE, path_base VARCHAR(255), + data_state VARCHAR(64), fault SMALLINT NOT NULL, PRIMARY KEY(det_id, iteration), @@ -629,4 +635,5 @@ user_5 DOUBLE, path_base VARCHAR(255), + data_state VARCHAR(64), fault SMALLINT NOT NULL, PRIMARY KEY(det_id, iteration, exp_id, class_id), @@ -641,7 +648,77 @@ ) ENGINE=innodb DEFAULT CHARSET=latin1; -CREATE TABLE detResidExp (det_id BIGINT, iteration INT, exp_id BIGINT, recipe VARCHAR(64), bg DOUBLE, bg_stdev DOUBLE, bg_mean_stdev DOUBLE, bg_skewness DOUBLE, bg_kurtosis DOUBLE, bin_stdev DOUBLE, fringe_0 DOUBLE, fringe_1 DOUBLE, fringe_2 DOUBLE, fringe_resid_0 DOUBLE, fringe_resid_1 DOUBLE, fringe_resid_2 DOUBLE, user_1 DOUBLE, user_2 DOUBLE, user_3 DOUBLE, user_4 DOUBLE, user_5 DOUBLE, path_base VARCHAR(255), accept TINYINT, fault SMALLINT NOT NULL, PRIMARY KEY(det_id, iteration, exp_id), KEY(fault), INDEX(det_id, iteration), FOREIGN KEY (det_id, iteration, exp_id) REFERENCES detInputExp(det_id, iteration, exp_id), FOREIGN KEY (det_id, iteration, exp_id) REFERENCES detResidImfile(det_id, iteration, exp_id)) ENGINE=innodb DEFAULT CHARSET=latin1; -CREATE TABLE detRunSummary (det_id BIGINT, iteration INT, bg DOUBLE, bg_stdev DOUBLE, bg_mean_stdev DOUBLE, accept TINYINT, fault SMALLINT NOT NULL, PRIMARY KEY(det_id, iteration), KEY(fault), FOREIGN KEY (det_id, iteration) REFERENCES detInputExp(det_id, iteration), FOREIGN KEY (det_id, iteration) REFERENCES detResidExp(det_id, iteration)) ENGINE=innodb DEFAULT CHARSET=latin1; -CREATE TABLE detRegisteredImfile (det_id BIGINT, iteration INT, class_id VARCHAR(64), uri VARCHAR(255), bg DOUBLE, bg_stdev DOUBLE, bg_mean_stdev DOUBLE, user_1 DOUBLE, user_2 DOUBLE, user_3 DOUBLE, user_4 DOUBLE, user_5 DOUBLE, path_base VARCHAR(255), fault SMALLINT NOT NULL, PRIMARY KEY(det_id, iteration, class_id), KEY(fault), FOREIGN KEY (det_id, iteration) REFERENCES detRun(det_id, iteration)) ENGINE=innodb DEFAULT CHARSET=latin1; +CREATE TABLE detResidExp ( + det_id BIGINT, + iteration INT, + exp_id BIGINT, + recipe VARCHAR(64), + bg DOUBLE, + bg_stdev DOUBLE, + bg_mean_stdev DOUBLE, + bg_skewness DOUBLE, + bg_kurtosis DOUBLE, + bin_stdev DOUBLE, + fringe_0 DOUBLE, + fringe_1 DOUBLE, + fringe_2 DOUBLE, + fringe_resid_0 DOUBLE, + fringe_resid_1 DOUBLE, + fringe_resid_2 DOUBLE, + user_1 DOUBLE, + user_2 DOUBLE, + user_3 DOUBLE, + user_4 DOUBLE, + user_5 DOUBLE, + path_base VARCHAR(255), + data_state VARCHAR(64), + accept TINYINT, + fault SMALLINT NOT NULL, + PRIMARY KEY(det_id, iteration, exp_id), + KEY(fault), + INDEX(det_id, iteration), + FOREIGN KEY (det_id, iteration, exp_id) + REFERENCES detInputExp(det_id, iteration, exp_id), + FOREIGN KEY (det_id, iteration, exp_id) + REFERENCES detResidImfile(det_id, iteration, exp_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +CREATE TABLE detRunSummary ( + det_id BIGINT, + iteration INT, + data_state VARCHAR(64), + bg DOUBLE, + bg_stdev DOUBLE, + bg_mean_stdev DOUBLE, + accept TINYINT, + fault SMALLINT NOT NULL, + PRIMARY KEY(det_id, iteration), + KEY(fault), + FOREIGN KEY (det_id, iteration) + REFERENCES detInputExp(det_id, iteration), + FOREIGN KEY (det_id, iteration) + REFERENCES detResidExp(det_id, iteration) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +CREATE TABLE detRegisteredImfile ( + det_id BIGINT, + iteration INT, + class_id VARCHAR(64), + uri VARCHAR(255), + bg DOUBLE, + bg_stdev DOUBLE, + bg_mean_stdev DOUBLE, + user_1 DOUBLE, + user_2 DOUBLE, + user_3 DOUBLE, + user_4 DOUBLE, + user_5 DOUBLE, + path_base VARCHAR(255), + data_state VARCHAR(64), + fault SMALLINT NOT NULL, + PRIMARY KEY(det_id, iteration, class_id), + KEY(fault), + FOREIGN KEY (det_id, iteration) + REFERENCES detRun(det_id, iteration) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE warpRun ( Index: trunk/ippTools/share/stacktool_definebyquery_part1.sql =================================================================== --- trunk/ippTools/share/stacktool_definebyquery_part1.sql (revision 19038) +++ trunk/ippTools/share/stacktool_definebyquery_part1.sql (revision 19092) @@ -23,5 +23,5 @@ JOIN rawExp USING(exp_id, tess_id) WHERE - warpRun.state = 'stop' + warpRun.state = 'full' AND warpSkyfile.ignored = 0 AND warpSkyfile.fault = 0 Index: trunk/ippTools/share/stacktool_definebyquery_test.sql =================================================================== --- trunk/ippTools/share/stacktool_definebyquery_test.sql (revision 19038) +++ trunk/ippTools/share/stacktool_definebyquery_test.sql (revision 19092) @@ -30,5 +30,5 @@ JOIN rawExp USING(exp_id, tess_id) WHERE - warpRun.state = 'stop' + warpRun.state = 'full' AND warpSkyfile.ignored = 0 AND warpSkyfile.fault = 0 Index: trunk/ippTools/share/stacktool_donecleanup.sql =================================================================== --- trunk/ippTools/share/stacktool_donecleanup.sql (revision 19092) +++ trunk/ippTools/share/stacktool_donecleanup.sql (revision 19092) @@ -0,0 +1,5 @@ +SELECT + stackRun.* +FROM stackRun +WHERE + stackRun.state = 'cleaned' Index: trunk/ippTools/share/stacktool_find_complete_warps.sql =================================================================== --- trunk/ippTools/share/stacktool_find_complete_warps.sql (revision 19038) +++ trunk/ippTools/share/stacktool_find_complete_warps.sql (revision 19092) @@ -23,5 +23,5 @@ AND stackRun.stack_id = stackInputSkyfile.stack_id WHERE - warpRun.state = 'stop' + warpRun.state = 'full' AND warpSkyfile.ignored = 0 GROUP BY Index: trunk/ippTools/share/stacktool_inputskyfile.sql =================================================================== --- trunk/ippTools/share/stacktool_inputskyfile.sql (revision 19038) +++ trunk/ippTools/share/stacktool_inputskyfile.sql (revision 19092) @@ -22,3 +22,3 @@ ON chipProcessedImfile.exp_id = rawExp.exp_id WHERE - stackRun.state = 'run' + stackRun.state = 'new' Index: trunk/ippTools/share/stacktool_pendingcleanuprun.sql =================================================================== --- trunk/ippTools/share/stacktool_pendingcleanuprun.sql (revision 19092) +++ trunk/ippTools/share/stacktool_pendingcleanuprun.sql (revision 19092) @@ -0,0 +1,26 @@ +-- results in too many output files +-- is the camera needed for this? +-- is the camera unique for this? +SELECT + stackRun.stack_id, + rawExp.camera, + stackRun.state +FROM stackRun +JOIN stackInputSkyfile + USING(stack_id) +JOIN warpSkyfile + ON stackInputSkyfile.warp_id = warpSkyfile.warp_id + AND stackRun.skycell_id = warpSkyfile.skycell_id + AND stackRun.tess_id = warpSkyfile.tess_id +JOIN warpRun + ON warpRun.warp_id = warpSkyfile.warp_id +JOIN fakeRun + USING(fake_id) +JOIN camRun + USING(cam_id) +JOIN chipRun + USING(chip_id) +JOIN rawExp + USING (exp_id) +WHERE + stackRun.state = 'goto_cleaned' Index: trunk/ippTools/share/stacktool_pendingcleanupskyfile.sql =================================================================== --- trunk/ippTools/share/stacktool_pendingcleanupskyfile.sql (revision 19092) +++ trunk/ippTools/share/stacktool_pendingcleanupskyfile.sql (revision 19092) @@ -0,0 +1,11 @@ +SELECT + stackSumSkyfile.*, + stackRun.state, + stackRun.workdir, + stackRun.dvodb, + stackRun.tess_id +FROM stackRun +JOIN stackSumSkyfile + USING(stack_id) +WHERE + stackRun.state = 'goto_cleaned' Index: trunk/ippTools/share/stacktool_sumskyfile.sql =================================================================== --- trunk/ippTools/share/stacktool_sumskyfile.sql (revision 19038) +++ trunk/ippTools/share/stacktool_sumskyfile.sql (revision 19092) @@ -20,3 +20,4 @@ WHERE -- bogus test; just here so there there is a 'WHERE' stmt to append conditionals too +-- XXX EAM : this is not needed : fix the stacktool code. stackRun.stack_id is NOT NULL Index: trunk/ippTools/share/stacktool_tosum.sql =================================================================== --- trunk/ippTools/share/stacktool_tosum.sql (revision 19038) +++ trunk/ippTools/share/stacktool_tosum.sql (revision 19092) @@ -25,4 +25,4 @@ USING(stack_id) WHERE - stackRun.state = 'run' + stackRun.state = 'new' AND stackSumSkyfile.stack_id IS NULL Index: trunk/ippTools/share/warptool_donecleanup.sql =================================================================== --- trunk/ippTools/share/warptool_donecleanup.sql (revision 19092) +++ trunk/ippTools/share/warptool_donecleanup.sql (revision 19092) @@ -0,0 +1,5 @@ +SELECT + warpRun.* +FROM warpRun +WHERE + warpRun.state = 'cleaned' Index: trunk/ippTools/share/warptool_exp.sql =================================================================== --- trunk/ippTools/share/warptool_exp.sql (revision 19038) +++ trunk/ippTools/share/warptool_exp.sql (revision 19092) @@ -5,4 +5,4 @@ USING(fake_id) WHERE - warpRun.state = 'run' - AND fakeRun.state = 'stop' + warpRun.state = 'new' + AND fakeRun.state = 'full' Index: trunk/ippTools/share/warptool_imfile.sql =================================================================== --- trunk/ippTools/share/warptool_imfile.sql (revision 19038) +++ trunk/ippTools/share/warptool_imfile.sql (revision 19092) @@ -21,7 +21,7 @@ AND chipProcessedImfile.class_id = rawImfile.class_id WHERE - warpRun.state = 'run' - AND fakeRun.state = 'stop' - AND camRun.state = 'stop' + warpRun.state = 'new' + AND fakeRun.state = 'full' + AND camRun.state = 'full' AND chipRun.state = 'full' Index: trunk/ippTools/share/warptool_pendingcleanuprun.sql =================================================================== --- trunk/ippTools/share/warptool_pendingcleanuprun.sql (revision 19092) +++ trunk/ippTools/share/warptool_pendingcleanuprun.sql (revision 19092) @@ -0,0 +1,15 @@ +SELECT + warpRun.warp_id, + rawExp.camera, + warpRun.state +FROM warpRun +JOIN fakeRun +USING (fake_id) +JOIN camRun +USING (cam_id) +JOIN chipRun +USING (chip_id) +JOIN rawExp +USING (exp_id) +WHERE + warpRun.state = 'goto_cleaned' Index: trunk/ippTools/share/warptool_pendingcleanupskyfile.sql =================================================================== --- trunk/ippTools/share/warptool_pendingcleanupskyfile.sql (revision 19092) +++ trunk/ippTools/share/warptool_pendingcleanupskyfile.sql (revision 19092) @@ -0,0 +1,15 @@ +SELECT + warpSkyfile.*, + warpRun.state, + warpRun.workdir, + warpRun.label, + warpRun.reduction, + warpRun.expgroup, + warpRun.dvodb, + warpRun.tess_id, + warpRun.end_stage +FROM warpRun +JOIN warpSkyfile + USING(warp_id) +WHERE + warpRun.state = 'goto_cleaned' Index: trunk/ippTools/share/warptool_scmap.sql =================================================================== --- trunk/ippTools/share/warptool_scmap.sql (revision 19038) +++ trunk/ippTools/share/warptool_scmap.sql (revision 19092) @@ -19,6 +19,6 @@ AND warpSkyCellMap.class_id = chipProcessedImfile.class_id WHERE --- warpRun.state = 'run' - fakeRun.state = 'stop' - AND camRun.state = 'stop' +-- warpRun.state = 'new' + fakeRun.state = 'full' + AND camRun.state = 'full' AND chipRun.state = 'full' Index: trunk/ippTools/share/warptool_tooverlap.sql =================================================================== --- trunk/ippTools/share/warptool_tooverlap.sql (revision 19038) +++ trunk/ippTools/share/warptool_tooverlap.sql (revision 19092) @@ -23,7 +23,7 @@ ON warpRun.label = warpMask.label WHERE - warpRun.state = 'run' - AND fakeRun.state = 'stop' - AND camRun.state = 'stop' + warpRun.state = 'new' + AND fakeRun.state = 'full' + AND camRun.state = 'full' AND chipRun.state = 'full' AND warpSkyCellMap.warp_id IS NULL Index: trunk/ippTools/share/warptool_towarped.sql =================================================================== --- trunk/ippTools/share/warptool_towarped.sql (revision 19038) +++ trunk/ippTools/share/warptool_towarped.sql (revision 19092) @@ -27,7 +27,7 @@ ON warpRun.label = warpMask.label WHERE - warpRun.state = 'run' - AND fakeRun.state = 'stop' - AND camRun.state = 'stop' + warpRun.state = 'new' + AND fakeRun.state = 'full' + AND camRun.state = 'full' AND chipRun.state = 'full' AND warpSkyfile.warp_id IS NULL Index: trunk/ippTools/share/warptool_warped.sql =================================================================== --- trunk/ippTools/share/warptool_warped.sql (revision 19038) +++ trunk/ippTools/share/warptool_warped.sql (revision 19092) @@ -17,3 +17,4 @@ WHERE -- bogus test; just here so there there is a 'WHERE' stmt to append conditionals too +-- XXX EAM : not needed: fix warptool.c warpRun.warp_id is NOT NULL