Index: trunk/ippTools/share/Makefile.am =================================================================== --- trunk/ippTools/share/Makefile.am (revision 28429) +++ trunk/ippTools/share/Makefile.am (revision 28486) @@ -4,334 +4,349 @@ dist_pkgdata_DATA = \ - addtool_checkminidvodbaddrun.sql \ - addtool_donecleanup.sql \ - addtool_find_cam_id.sql \ - addtool_find_pendingexp.sql \ - addtool_find_pendingmergeprocess.sql \ - addtool_find_processedexp.sql \ - addtool_find_minidvodbprocessed.sql \ - addtool_find_minidvodbrun.sql \ - addtool_pendingcleanupexp.sql \ - addtool_pendingcleanuprun.sql \ - addtool_queue_cam_id.sql \ - addtool_queue_minidvodbrun.sql \ - addtool_revertminidvodbprocessed.sql \ - addtool_revertprocessedexp.sql \ - camtool_addprocessedexp.sql \ - camtool_donecleanup.sql \ - camtool_find_chip_id.sql \ - camtool_pendingexp.sql \ - camtool_find_pendingimfile.sql \ - camtool_find_processedexp.sql \ - camtool_pendingcleanupexp.sql \ - camtool_pendingcleanuprun.sql \ - camtool_queue_chip_id.sql \ - camtool_revertprocessedexp.sql \ - camtool_export_run.sql \ - camtool_export_processed_exp.sql \ - chiptool_change_exp_state.sql \ - chiptool_change_imfile_data_state.sql \ - chiptool_completely_processed_exp.sql \ - chiptool_coalesce_run.sql \ - chiptool_definecopy.sql \ - chiptool_donecleanup.sql \ - chiptool_find_rawexp.sql \ - chiptool_listrun.sql \ - chiptool_pendingcleanupimfile.sql \ - chiptool_pendingcleanuprun.sql \ - chiptool_pendingimfile.sql \ - chiptool_processedimfile.sql \ - chiptool_revertprocessedimfile.sql \ - chiptool_revertupdatedimfile.sql \ - chiptool_run.sql \ - chiptool_runstate.sql \ - chiptool_setimfiletoupdate.sql \ - chiptool_export_run.sql \ - chiptool_export_imfile.sql \ - chiptool_export_processed_imfile.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_detrunsummary.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_change_skyfile_data_state.sql \ - difftool_change_run_state.sql \ - difftool_completed_runs.sql \ - difftool_coalesce_run.sql \ - difftool_definewarpstack_part1.sql \ - difftool_definewarpstack_part2.sql \ - difftool_definewarpstack_temp_create.sql \ - difftool_definewarpwarp_temp_create.sql \ - difftool_definewarpwarp_temp_insert.sql \ - difftool_definewarpwarp_select.sql \ - difftool_definewarpwarp_insert.sql \ - difftool_definestackstack_part0.sql \ - difftool_definestackstack_part1.sql \ - difftool_donecleanup.sql \ - difftool_export_input_skyfile.sql \ - difftool_export_run.sql \ - difftool_export_skyfile.sql \ - difftool_inputskyfile.sql \ - difftool_listrun.sql \ - difftool_pendingcleanuprun.sql \ - difftool_pendingcleanupskyfile.sql \ - difftool_revertdiffskyfile_delete.sql \ - difftool_revertdiffskyfile_updated.sql \ - difftool_setskyfiletoupdate.sql \ - difftool_skyfile.sql \ - difftool_todiffskyfile.sql \ - difftool_tosummary.sql \ - difftool_addsummary.sql \ - disttool_definebyquery_camera.sql \ - disttool_definebyquery_chip.sql \ - disttool_definebyquery_diff.sql \ - disttool_definebyquery_fake.sql \ - disttool_definebyquery_raw.sql \ - disttool_definebyquery_stack.sql \ - disttool_definebyquery_warp.sql \ - disttool_definebyquery_SSdiff.sql \ - disttool_defineinterest.sql \ - disttool_listfilesets.sql \ - disttool_listinterests.sql \ - disttool_pending_camera.sql \ - disttool_pending_chip.sql \ - disttool_pending_diff.sql \ - disttool_pending_fake.sql \ - disttool_pending_raw.sql \ - disttool_pending_stack.sql \ - disttool_pending_warp.sql \ - disttool_pending_SSdiff.sql \ - disttool_pendingfileset.sql \ - disttool_pendingdest.sql \ - disttool_pendingcleanup.sql \ - disttool_processedcomponent.sql \ - disttool_queuercrun.sql \ - disttool_revertrcrun.sql \ - disttool_revertrun.sql \ - disttool_revertcomponent.sql \ - disttool_revertfileset.sql \ - disttool_toadvance.sql \ - disttool_updateinterest.sql \ - disttool_updatercrun.sql \ - dqstatstool_createbundle.sql \ - dqstatstool_definebyquery.sql \ - dqstatstool_get_contents.sql \ - dqstatstool_get_run.sql \ - faketool_change_exp_state.sql \ - faketool_change_imfile_data_state.sql \ - faketool_completely_processed_exp.sql \ - faketool_donecleanup.sql \ - faketool_export_processed_imfile.sql \ - faketool_export_run.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_chiprundone.sql \ - flatcorr_camerarundone.sql \ - flatcorr_pendingprocess.sql \ - flatcorr_inputimfile.sql \ - flatcorr_dropchip.sql \ - flatcorr_dropcamera.sql \ - magictool_addmask.sql \ - magictool_restore_camera.sql \ - magictool_restore_chip.sql \ - magictool_restore_diff.sql \ - magictool_restore_raw.sql \ - magictool_restore_warp.sql \ - magictool_create_tmp_warpcomplete.sql \ - magictool_definebyquery_insert.sql \ - magictool_definebyquery_select.sql \ - magictool_inputs.sql \ - magictool_inputskyfile.sql \ - magictool_mask.sql \ - magictool_tomask.sql \ - magictool_toprocess_inputs.sql \ - magictool_toprocess_runs.sql \ - magictool_toprocess_tree.sql \ - magictool_toskyfilemask.sql \ - magictool_totree.sql \ - magictool_diffskyfile.sql \ - magictool_warpskyfile.sql \ - magictool_chipprocessedimfile.sql \ - magictool_rawimfile.sql \ - magictool_revertnode.sql \ - magictool_exposure.sql \ - magicdstool_clearstatefaults.sql \ - magicdstool_completed_runs.sql \ - magicdstool_completedrevert.sql \ - magicdstool_definebyquery_raw.sql \ - magicdstool_definebyquery_chip.sql \ - magicdstool_definebyquery_camera.sql \ - magicdstool_definebyquery_warp.sql \ - magicdstool_definebyquery_diff.sql \ - magicdstool_definecopy_chip.sql \ - magicdstool_definecopy_warp.sql \ - magicdstool_getrunids.sql \ - magicdstool_getskycells.sql \ - magicdstool_revertdestreakedfile.sql \ - magicdstool_tocleanup.sql \ - magicdstool_todestreak_camera.sql \ - magicdstool_todestreak_chip.sql \ - magicdstool_todestreak_diff.sql \ - magicdstool_todestreak_raw.sql \ - magicdstool_todestreak_warp.sql \ - magicdstool_toremove.sql \ - magicdstool_torevert_raw.sql \ - magicdstool_torevert_chip.sql \ - magicdstool_torevert_camera.sql \ - magicdstool_torevert_warp.sql \ - magicdstool_torevert_diff.sql \ - pstamptool_completedreq.sql \ - pstamptool_datastore.sql \ - pstamptool_getdependent.sql \ - pstamptool_listjob.sql \ - pstamptool_pendingcleanup.sql \ - pstamptool_pendingdependent.sql \ - pstamptool_pendingjob.sql \ - pstamptool_pendingreq.sql \ - pstamptool_project.sql \ - pstamptool_revertdependent.sql \ - pstamptool_revertjob.sql \ - pstamptool_revertreq.sql \ - pstamptool_revertreq_deletejobs.sql \ - pstamptool_updatejob.sql \ - pxadmin_create_tables.sql \ - pxadmin_create_mirror_tables.sql \ - pxadmin_drop_tables.sql \ - pxadmin_update_version.sql \ - pubtool_definerun.sql \ - pubtool_pending.sql \ - pubtool_revert.sql \ - pztool_find_completed_exp.sql \ - pztool_pendingimfile.sql \ - pztool_revert_downloadimfile_faults.sql \ - pztool_revert_fileset_faults.sql \ - pztool_revertcopied.sql \ - receivetool_list.sql \ - receivetool_addfileset.sql \ - receivetool_pendingfileset.sql \ - receivetool_pendingfile.sql \ - receivetool_revert.sql \ - receivetool_toadvance.sql \ - regtool_create_dup_table.sql \ - regtool_export_exp.sql \ - regtool_export_imfile.sql \ - regtool_pendingexp.sql \ - regtool_pendingimfile.sql \ - regtool_populate_dup_table.sql \ - regtool_processedexp.sql \ - regtool_processedimfile.sql \ - regtool_revertprocessedexp.sql \ - regtool_revertprocessedimfile.sql \ - regtool_updateprocessedimfile.sql \ - regtool_pendingcompressimfile.sql \ - regtool_finishcompressexp.sql \ - regtool_updatebyquery.sql \ - regtool_updatebyqueryimfile.sql \ - stacktool_associationdefine_select.sql \ - stacktool_definebyquery_insert.sql \ - stacktool_definebyquery_insert_random_part1.sql \ - stacktool_definebyquery_insert_random_part2.sql \ - stacktool_definebyquery_select.sql \ - stacktool_definebyquery_test.sql \ - stacktool_donecleanup.sql \ - stacktool_export_input_skyfile.sql \ - stacktool_export_run.sql \ - stacktool_export_sum_skyfile.sql \ - stacktool_find_complete_warps.sql \ - stacktool_inputskyfile.sql \ - stacktool_pendingcleanuprun.sql \ - stacktool_pendingcleanupskyfile.sql \ - stacktool_revertsumskyfile_delete.sql \ - stacktool_sumskyfile.sql \ - stacktool_sassskyfile.sql \ - stacktool_tosum.sql \ - stacktool_tosummary.sql \ - stacktool_addsummary.sql \ - staticskytool_definebyquery_select.sql \ - staticskytool_definebyquery_inputs.sql \ - staticskytool_inputs.sql \ - staticskytool_todo.sql \ - staticskytool_result.sql \ - staticskytool_revert.sql \ - warptool_change_skyfile_data_state.sql \ - warptool_change_run_state.sql \ - warptool_definebyquery.sql \ - warptool_donecleanup.sql \ - warptool_exp.sql \ - warptool_export_imfile.sql \ - warptool_export_run.sql \ - warptool_export_skyfile.sql \ - warptool_export_skycell_map.sql \ - warptool_finished_run_select.sql \ - warptool_finish_run.sql \ - warptool_coalesce_run.sql \ - warptool_imfile.sql \ - warptool_listrun.sql \ - warptool_pendingcleanuprun.sql \ - warptool_pendingcleanupskyfile.sql \ - warptool_revertoverlap.sql \ - warptool_revertwarped_delete.sql \ - warptool_revertwarped_updated.sql \ - warptool_runstate.sql \ - warptool_scmap.sql \ - warptool_setskyfiletoupdate.sql \ - warptool_tooverlap.sql \ - warptool_towarped.sql \ - warptool_updateskyfile.sql \ - warptool_warped.sql \ - warptool_tosummary.sql \ - warptool_addsummary.sql \ + addtool_checkminidvodbaddrun.sql \ + addtool_donecleanup.sql \ + addtool_find_cam_id.sql \ + addtool_find_pendingexp.sql \ + addtool_find_pendingmergeprocess.sql \ + addtool_find_processedexp.sql \ + addtool_find_minidvodbprocessed.sql \ + addtool_find_minidvodbrun.sql \ + addtool_pendingcleanupexp.sql \ + addtool_pendingcleanuprun.sql \ + addtool_queue_cam_id.sql \ + addtool_queue_minidvodbrun.sql \ + addtool_revertminidvodbprocessed.sql \ + addtool_revertprocessedexp.sql \ + bgtool_advancechip.sql \ + bgtool_advancewarp.sql \ + bgtool_chipinputs.sql \ + bgtool_chip.sql \ + bgtool_cleanedchip.sql \ + bgtool_cleanedwarp.sql \ + bgtool_definechip.sql \ + bgtool_definewarp.sql \ + bgtool_revertchip.sql \ + bgtool_revertwarp.sql \ + bgtool_tochip.sql \ + bgtool_tocleanchip.sql \ + bgtool_tocleanwarp.sql \ + bgtool_towarp.sql \ + bgtool_warpinputs.sql \ + bgtool_warp.sql \ + camtool_donecleanup.sql \ + camtool_find_chip_id.sql \ + camtool_pendingexp.sql \ + camtool_find_pendingimfile.sql \ + camtool_find_processedexp.sql \ + camtool_pendingcleanupexp.sql \ + camtool_pendingcleanuprun.sql \ + camtool_queue_chip_id.sql \ + camtool_revertprocessedexp.sql \ + camtool_export_run.sql \ + camtool_export_processed_exp.sql \ + chiptool_change_exp_state.sql \ + chiptool_change_imfile_data_state.sql \ + chiptool_completely_processed_exp.sql \ + chiptool_coalesce_run.sql \ + chiptool_definecopy.sql \ + chiptool_donecleanup.sql \ + chiptool_find_rawexp.sql \ + chiptool_listrun.sql \ + chiptool_pendingcleanupimfile.sql \ + chiptool_pendingcleanuprun.sql \ + chiptool_pendingimfile.sql \ + chiptool_processedimfile.sql \ + chiptool_revertprocessedimfile.sql \ + chiptool_revertupdatedimfile.sql \ + chiptool_run.sql \ + chiptool_runstate.sql \ + chiptool_setimfiletoupdate.sql \ + chiptool_export_run.sql \ + chiptool_export_imfile.sql \ + chiptool_export_processed_imfile.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_detrunsummary.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_change_skyfile_data_state.sql \ + difftool_change_run_state.sql \ + difftool_completed_runs.sql \ + difftool_coalesce_run.sql \ + difftool_definewarpstack_part1.sql \ + difftool_definewarpstack_part2.sql \ + difftool_definewarpstack_temp_create.sql \ + difftool_definewarpwarp_temp_create.sql \ + difftool_definewarpwarp_temp_insert.sql \ + difftool_definewarpwarp_select.sql \ + difftool_definewarpwarp_insert.sql \ + difftool_definestackstack_part0.sql \ + difftool_definestackstack_part1.sql \ + difftool_donecleanup.sql \ + difftool_export_input_skyfile.sql \ + difftool_export_run.sql \ + difftool_export_skyfile.sql \ + difftool_inputskyfile.sql \ + difftool_listrun.sql \ + difftool_pendingcleanuprun.sql \ + difftool_pendingcleanupskyfile.sql \ + difftool_revertdiffskyfile_delete.sql \ + difftool_revertdiffskyfile_updated.sql \ + difftool_setskyfiletoupdate.sql \ + difftool_skyfile.sql \ + difftool_todiffskyfile.sql \ + difftool_tosummary.sql \ + difftool_addsummary.sql \ + disttool_definebyquery_camera.sql \ + disttool_definebyquery_chip.sql \ + disttool_definebyquery_diff.sql \ + disttool_definebyquery_fake.sql \ + disttool_definebyquery_raw.sql \ + disttool_definebyquery_stack.sql \ + disttool_definebyquery_warp.sql \ + disttool_definebyquery_SSdiff.sql \ + disttool_defineinterest.sql \ + disttool_listfilesets.sql \ + disttool_listinterests.sql \ + disttool_pending_camera.sql \ + disttool_pending_chip.sql \ + disttool_pending_diff.sql \ + disttool_pending_fake.sql \ + disttool_pending_raw.sql \ + disttool_pending_stack.sql \ + disttool_pending_warp.sql \ + disttool_pending_SSdiff.sql \ + disttool_pendingfileset.sql \ + disttool_pendingdest.sql \ + disttool_pendingcleanup.sql \ + disttool_processedcomponent.sql \ + disttool_queuercrun.sql \ + disttool_revertrcrun.sql \ + disttool_revertrun.sql \ + disttool_revertcomponent.sql \ + disttool_revertfileset.sql \ + disttool_toadvance.sql \ + disttool_updateinterest.sql \ + disttool_updatercrun.sql \ + dqstatstool_createbundle.sql \ + dqstatstool_definebyquery.sql \ + dqstatstool_get_contents.sql \ + dqstatstool_get_run.sql \ + faketool_change_exp_state.sql \ + faketool_change_imfile_data_state.sql \ + faketool_completely_processed_exp.sql \ + faketool_donecleanup.sql \ + faketool_export_processed_imfile.sql \ + faketool_export_run.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_chiprundone.sql \ + flatcorr_camerarundone.sql \ + flatcorr_pendingprocess.sql \ + flatcorr_inputimfile.sql \ + flatcorr_dropchip.sql \ + flatcorr_dropcamera.sql \ + magictool_addmask.sql \ + magictool_restore_camera.sql \ + magictool_restore_chip.sql \ + magictool_restore_diff.sql \ + magictool_restore_raw.sql \ + magictool_restore_warp.sql \ + magictool_create_tmp_warpcomplete.sql \ + magictool_definebyquery_insert.sql \ + magictool_definebyquery_select.sql \ + magictool_inputs.sql \ + magictool_inputskyfile.sql \ + magictool_mask.sql \ + magictool_tomask.sql \ + magictool_toprocess_inputs.sql \ + magictool_toprocess_runs.sql \ + magictool_toprocess_tree.sql \ + magictool_toskyfilemask.sql \ + magictool_totree.sql \ + magictool_diffskyfile.sql \ + magictool_warpskyfile.sql \ + magictool_chipprocessedimfile.sql \ + magictool_rawimfile.sql \ + magictool_revertnode.sql \ + magictool_exposure.sql \ + magicdstool_clearstatefaults.sql \ + magicdstool_completed_runs.sql \ + magicdstool_completedrevert.sql \ + magicdstool_definebyquery_raw.sql \ + magicdstool_definebyquery_chip.sql \ + magicdstool_definebyquery_camera.sql \ + magicdstool_definebyquery_warp.sql \ + magicdstool_definebyquery_diff.sql \ + magicdstool_definecopy_chip.sql \ + magicdstool_definecopy_warp.sql \ + magicdstool_getrunids.sql \ + magicdstool_getskycells.sql \ + magicdstool_revertdestreakedfile.sql \ + magicdstool_tocleanup.sql \ + magicdstool_todestreak_camera.sql \ + magicdstool_todestreak_chip.sql \ + magicdstool_todestreak_diff.sql \ + magicdstool_todestreak_raw.sql \ + magicdstool_todestreak_warp.sql \ + magicdstool_toremove.sql \ + magicdstool_torevert_raw.sql \ + magicdstool_torevert_chip.sql \ + magicdstool_torevert_camera.sql \ + magicdstool_torevert_warp.sql \ + magicdstool_torevert_diff.sql \ + pstamptool_completedreq.sql \ + pstamptool_datastore.sql \ + pstamptool_getdependent.sql \ + pstamptool_listjob.sql \ + pstamptool_pendingcleanup.sql \ + pstamptool_pendingdependent.sql \ + pstamptool_pendingjob.sql \ + pstamptool_pendingreq.sql \ + pstamptool_project.sql \ + pstamptool_revertdependent.sql \ + pstamptool_revertjob.sql \ + pstamptool_revertreq.sql \ + pstamptool_revertreq_deletejobs.sql \ + pstamptool_updatejob.sql \ + pxadmin_create_tables.sql \ + pxadmin_create_mirror_tables.sql \ + pxadmin_drop_tables.sql \ + pxadmin_update_version.sql \ + pubtool_definerun.sql \ + pubtool_pending.sql \ + pubtool_revert.sql \ + pztool_find_completed_exp.sql \ + pztool_pendingimfile.sql \ + pztool_revert_downloadimfile_faults.sql \ + pztool_revert_fileset_faults.sql \ + pztool_revertcopied.sql \ + receivetool_list.sql \ + receivetool_addfileset.sql \ + receivetool_pendingfileset.sql \ + receivetool_pendingfile.sql \ + receivetool_revert.sql \ + receivetool_toadvance.sql \ + regtool_create_dup_table.sql \ + regtool_export_exp.sql \ + regtool_export_imfile.sql \ + regtool_pendingexp.sql \ + regtool_pendingimfile.sql \ + regtool_populate_dup_table.sql \ + regtool_processedexp.sql \ + regtool_processedimfile.sql \ + regtool_revertprocessedexp.sql \ + regtool_revertprocessedimfile.sql \ + regtool_updateprocessedimfile.sql \ + regtool_pendingcompressimfile.sql \ + regtool_finishcompressexp.sql \ + regtool_updatebyquery.sql \ + regtool_updatebyqueryimfile.sql \ + stacktool_associationdefine_select.sql \ + stacktool_definebyquery_insert.sql \ + stacktool_definebyquery_insert_random_part1.sql \ + stacktool_definebyquery_insert_random_part2.sql \ + stacktool_definebyquery_select.sql \ + stacktool_definebyquery_test.sql \ + stacktool_donecleanup.sql \ + stacktool_export_input_skyfile.sql \ + stacktool_export_run.sql \ + stacktool_export_sum_skyfile.sql \ + stacktool_find_complete_warps.sql \ + stacktool_inputskyfile.sql \ + stacktool_pendingcleanuprun.sql \ + stacktool_pendingcleanupskyfile.sql \ + stacktool_revertsumskyfile_delete.sql \ + stacktool_sumskyfile.sql \ + stacktool_sassskyfile.sql \ + stacktool_tosum.sql \ + stacktool_tosummary.sql \ + stacktool_addsummary.sql \ + staticskytool_definebyquery_select.sql \ + staticskytool_definebyquery_inputs.sql \ + staticskytool_inputs.sql \ + staticskytool_todo.sql \ + staticskytool_result.sql \ + staticskytool_revert.sql \ + warptool_change_skyfile_data_state.sql \ + warptool_change_run_state.sql \ + warptool_definebyquery.sql \ + warptool_donecleanup.sql \ + warptool_exp.sql \ + warptool_export_imfile.sql \ + warptool_export_run.sql \ + warptool_export_skyfile.sql \ + warptool_export_skycell_map.sql \ + warptool_finished_run_select.sql \ + warptool_finish_run.sql \ + warptool_coalesce_run.sql \ + warptool_imfile.sql \ + warptool_listrun.sql \ + warptool_pendingcleanuprun.sql \ + warptool_pendingcleanupskyfile.sql \ + warptool_revertoverlap.sql \ + warptool_revertwarped_delete.sql \ + warptool_revertwarped_updated.sql \ + warptool_runstate.sql \ + warptool_scmap.sql \ + warptool_setskyfiletoupdate.sql \ + warptool_tooverlap.sql \ + warptool_towarped.sql \ + warptool_updateskyfile.sql \ + warptool_warped.sql \ + warptool_tosummary.sql \ + warptool_addsummary.sql \ diffphottool_definerun.sql \ diffphottool_input.sql \ Index: trunk/ippTools/share/bgtool_advancechip.sql =================================================================== --- trunk/ippTools/share/bgtool_advancechip.sql (revision 28486) +++ trunk/ippTools/share/bgtool_advancechip.sql (revision 28486) @@ -0,0 +1,15 @@ +SELECT DISTINCT + chipBackgroundRun.chip_bg_id, + chipBackgroundImfile.magicked +FROM chipBackgroundRun +JOIN chipProcessedImfile USING(chip_id) +LEFT JOIN chipBackgroundImfile USING(chip_bg_id, class_id) +WHERE chipBackgroundRun.state = 'new' + AND chipProcessedImfile.quality = 0 + AND chipProcessedImfile.fault = 0 +-- WHERE hook %s +GROUP BY chip_bg_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: trunk/ippTools/share/bgtool_advancewarp.sql =================================================================== --- trunk/ippTools/share/bgtool_advancewarp.sql (revision 28486) +++ trunk/ippTools/share/bgtool_advancewarp.sql (revision 28486) @@ -0,0 +1,15 @@ +SELECT DISTINCT + warpBackgroundRun.warp_bg_id, + warpBackgroundSkyfile.magicked +FROM warpBackgroundRun +JOIN warpSkyfile USING(warp_id) +LEFT JOIN warpBackgroundSkyfile USING(warp_bg_id, skycell_id) +WHERE warpBackgroundRun.state = 'new' + AND warpSkyfile.quality = 0 + AND warpSkyfile.fault = 0 +-- WHERE hook %s +GROUP BY warp_bg_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(*) Index: trunk/ippTools/share/bgtool_chip.sql =================================================================== --- trunk/ippTools/share/bgtool_chip.sql (revision 28486) +++ trunk/ippTools/share/bgtool_chip.sql (revision 28486) @@ -0,0 +1,17 @@ +SELECT + chipBackgroundImfile.*, + chipBackgroundRun.state, + chipBackgroundRun.workdir, + chipBackgroundRun.label, + rawExp.exp_id, + rawExp.exp_name, + rawExp.camera, + rawExp.filter, + rawExp.dateobs, + rawExp.ra, + rawExp.decl, + rawExp.exp_time +FROM chipBackgroundRun +JOIN chipBackgroundImfile USING(chip_bg_id) +JOIN chipRun USING(chip_id) +JOIN rawExp USING(exp_id) Index: trunk/ippTools/share/bgtool_chipinputs.sql =================================================================== --- trunk/ippTools/share/bgtool_chipinputs.sql (revision 28486) +++ trunk/ippTools/share/bgtool_chipinputs.sql (revision 28486) @@ -0,0 +1,8 @@ +SELECT + chipProcessedImfile.* +FROM chipBackgroundRun +JOIN chipRun USING(chip_id) +JOIN chipProcessedImfile USING(chip_id) +WHERE chipRun.state = 'full' + AND chipProcessedImfile.fault = 0 + AND chipProcessedImfile.quality = 0 Index: trunk/ippTools/share/bgtool_cleanedchip.sql =================================================================== --- trunk/ippTools/share/bgtool_cleanedchip.sql (revision 28486) +++ trunk/ippTools/share/bgtool_cleanedchip.sql (revision 28486) @@ -0,0 +1,3 @@ +UPDATE chipBackgroundRun +SET state = '%s' +WHERE state IN ('goto_cleaned', 'goto_scrubbed', 'goto_purged') Index: trunk/ippTools/share/bgtool_cleanedwarp.sql =================================================================== --- trunk/ippTools/share/bgtool_cleanedwarp.sql (revision 28486) +++ trunk/ippTools/share/bgtool_cleanedwarp.sql (revision 28486) @@ -0,0 +1,3 @@ +UPDATE warpBackgroundRun +SET state = '%s' +WHERE state IN ('goto_cleaned', 'goto_scrubbed', 'goto_purged') Index: trunk/ippTools/share/bgtool_definechip.sql =================================================================== --- trunk/ippTools/share/bgtool_definechip.sql (revision 28486) +++ trunk/ippTools/share/bgtool_definechip.sql (revision 28486) @@ -0,0 +1,6 @@ +SELECT + chipRun.* +FROM chipRun +JOIN rawExp USING(exp_id) +LEFT JOIN chipBackgroundRun USING(chip_id) +WHERE chipRun.state = 'full' Index: trunk/ippTools/share/bgtool_definewarp.sql =================================================================== --- trunk/ippTools/share/bgtool_definewarp.sql (revision 28486) +++ trunk/ippTools/share/bgtool_definewarp.sql (revision 28486) @@ -0,0 +1,11 @@ +SELECT + warpRun.*, + chipBackgroundRun.chip_bg_id +FROM warpRun +JOIN fakeRun USING(fake_id) +JOIN camRun USING(cam_id) +JOIN chipRun USING(chip_id) +JOIN chipBackgroundRun USING(chip_id) +JOIN rawExp USING(exp_id) +LEFT JOIN warpBackgroundRun USING(chip_bg_id) +WHERE chipBackgroundRun.state = 'full' Index: trunk/ippTools/share/bgtool_revertchip.sql =================================================================== --- trunk/ippTools/share/bgtool_revertchip.sql (revision 28486) +++ trunk/ippTools/share/bgtool_revertchip.sql (revision 28486) @@ -0,0 +1,4 @@ +DELETE chipBackgroundImfile +FROM chipBackgroundRun +JOIN chipBackgroundImfile USING(chip_bg_id) +WHERE chipBackgroundImfile.fault != 0 Index: trunk/ippTools/share/bgtool_revertwarp.sql =================================================================== --- trunk/ippTools/share/bgtool_revertwarp.sql (revision 28486) +++ trunk/ippTools/share/bgtool_revertwarp.sql (revision 28486) @@ -0,0 +1,4 @@ +DELETE warpBackgroundSkyfile +FROM warpBackgroundRun +JOIN warpBackgroundSkyfile USING(warp_bg_id) +WHERE warpBackgroundSkyfile.fault != 0 Index: trunk/ippTools/share/bgtool_tochip.sql =================================================================== --- trunk/ippTools/share/bgtool_tochip.sql (revision 28486) +++ trunk/ippTools/share/bgtool_tochip.sql (revision 28486) @@ -0,0 +1,18 @@ +SELECT + chipBackgroundRun.*, + class_id, + rawExp.exp_tag, + rawExp.camera +FROM chipBackgroundRun +JOIN chipRun USING(chip_id) +JOIN rawExp USING(exp_id) +JOIN chipProcessedImfile USING(chip_id) +LEFT JOIN chipBackgroundImfile USING(chip_bg_id, class_id) +LEFT JOIN Label ON chipBackgroundRun.label = Label.label +WHERE chipBackgroundImfile.chip_bg_id IS NULL + AND chipRun.state = 'full' + AND chipProcessedImfile.fault = 0 + AND chipProcessedImfile.quality = 0 + AND (Label.active OR Label.active IS NULL) +-- WHERE hook %s +ORDER BY priority DESC, chip_bg_id Index: trunk/ippTools/share/bgtool_tocleanchip.sql =================================================================== --- trunk/ippTools/share/bgtool_tocleanchip.sql (revision 28486) +++ trunk/ippTools/share/bgtool_tocleanchip.sql (revision 28486) @@ -0,0 +1,9 @@ +SELECT + chipBackgroundRun.chip_bg_id, + chipBackgroundRun.state, + rawExp.camera +FROM chipBackgroundRun +JOIN chipRun USING(chip_id) +JOIN rawExp USING(exp_id) +WHERE chipBackgroundRun.state IN ('goto_cleaned', 'goto_scrubbed', 'goto_purged') + Index: trunk/ippTools/share/bgtool_tocleanwarp.sql =================================================================== --- trunk/ippTools/share/bgtool_tocleanwarp.sql (revision 28486) +++ trunk/ippTools/share/bgtool_tocleanwarp.sql (revision 28486) @@ -0,0 +1,12 @@ +SELECT + warpBackgroundRun.warp_bg_id, + warpBackgroundRun.state, + rawExp.camera +FROM warpBackgroundRun +JOIN warpRun USING(warp_id) +JOIN fakeRun USING(fake_id) +JOIN camRun USING(cam_id) +JOIN chipRun USING(chip_id) +JOIN rawExp USING(exp_id) +WHERE warpBackgroundRun.state IN ('goto_cleaned', 'goto_scrubbed', 'goto_purged') + Index: trunk/ippTools/share/bgtool_towarp.sql =================================================================== --- trunk/ippTools/share/bgtool_towarp.sql (revision 28486) +++ trunk/ippTools/share/bgtool_towarp.sql (revision 28486) @@ -0,0 +1,23 @@ +SELECT + warpBackgroundRun.*, + warpRun.tess_id, + skycell_id, + rawExp.exp_tag, + rawExp.camera +FROM warpBackgroundRun +JOIN warpRun USING(warp_id) +JOIN warpSkyCellMap USING(warp_id) +JOIN warpSkyfile USING(warp_id, skycell_id) +JOIN chipBackgroundRun USING(chip_bg_id) +JOIN chipBackgroundImfile USING(chip_bg_id, class_id) +JOIN chipRun USING(chip_id) +JOIN rawExp USING(exp_id) +LEFT JOIN warpBackgroundSkyfile USING(warp_bg_id, skycell_id) +LEFT JOIN Label ON Label.label = warpBackgroundRun.label +WHERE warpBackgroundSkyfile.warp_bg_id IS NULL + AND chipBackgroundRun.state = 'full' + AND chipBackgroundImfile.fault = 0 + AND chipBackgroundImfile.quality = 0 + AND (Label.active OR Label.active IS NULL) +-- WHERE hook %s +ORDER BY priority DESC, chip_bg_id Index: trunk/ippTools/share/bgtool_warp.sql =================================================================== --- trunk/ippTools/share/bgtool_warp.sql (revision 28486) +++ trunk/ippTools/share/bgtool_warp.sql (revision 28486) @@ -0,0 +1,20 @@ +SELECT + warpBackgroundSkyfile.*, + warpBackgroundRun.state, + warpBackgroundRun.workdir, + warpBackgroundRun.label, + rawExp.exp_id, + rawExp.exp_name, + rawExp.camera, + rawExp.filter, + rawExp.dateobs, + rawExp.ra, + rawExp.decl, + rawExp.exp_time +FROM warpBackgroundRun +JOIN warpBackgroundImfile USING(warp_bg_id) +JOIN warpRun USING(warp_id) +JOIN fakeRun USING(fake_id) +JOIN camRun USING(cam_id) +JOIN chipRun USING(chip_id) +JOIN rawExp USING(exp_id) Index: trunk/ippTools/share/bgtool_warpinputs.sql =================================================================== --- trunk/ippTools/share/bgtool_warpinputs.sql (revision 28486) +++ trunk/ippTools/share/bgtool_warpinputs.sql (revision 28486) @@ -0,0 +1,17 @@ +SELECT + chipBackgroundImfile.path_base AS chip_path_base, + camProcessedExp.path_base AS cam_path_base +FROM warpBackgroundRun +JOIN warpRun USING(warp_id) +JOIN warpSkyCellMap USING(warp_id) +JOIN warpSkyfile USING(warp_id, skycell_id) +JOIN chipBackgroundRun USING(chip_bg_id) +JOIN chipBackgroundImfile USING(chip_bg_id, class_id) +JOIN fakeRun USING(fake_id) +JOIN camProcessedExp USING(cam_id) +WHERE warpRun.state = 'full' + AND warpSkyfile.fault = 0 + AND warpSkyfile.quality = 0 + AND chipBackgroundRun.state = 'full' + AND chipBackgroundImfile.fault = 0 + AND chipBackgroundImfile.quality = 0 Index: trunk/ippTools/share/pxadmin_create_tables.sql =================================================================== --- trunk/ippTools/share/pxadmin_create_tables.sql (revision 28429) +++ trunk/ippTools/share/pxadmin_create_tables.sql (revision 28486) @@ -1715,4 +1715,6 @@ ) ENGINE=innodb DEFAULT CHARSET=latin1; + +-- Processing labels with their priorities CREATE TABLE Label ( label VARCHAR(64), @@ -1723,4 +1725,101 @@ KEY(priority), KEY(active) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +-- Tables to support background restoration + +-- Background replacement on a chipRun +CREATE TABLE chipBackgroundRun ( + chip_bg_id BIGINT AUTO_INCREMENT, -- unique identifier + chip_id BIGINT NOT NULL, -- link to chipRun + state VARCHAR(64) NOT NULL, -- state of run (new, full, etc.) + workdir VARCHAR(255) NOT NULL, -- working directory + label VARCHAR(64), -- processing label + data_group VARCHAR(64), -- group for data + dist_group VARCHAR(64), -- group for distribution + reduction VARCHAR(64), -- reduction class (for altering recipe) + note VARCHAR(255), -- note + registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered + magicked BIGINT DEFAULT 0 NOT NULL, -- magic status + PRIMARY KEY(chip_bg_id), + KEY(chip_id), + KEY(state), + KEY(label), + KEY(data_group), + KEY(dist_group), + FOREIGN KEY(chip_id) REFERENCES chipRun(chip_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +-- Results of background replacement from chipBackgroundRun +CREATE TABLE chipBackgroundImfile ( + chip_bg_id BIGINT NOT NULL, -- unique identifier + class_id VARCHAR(64) NOT NULL, -- class (component) identifier + path_base VARCHAR(255) NOT NULL, -- root name for outputs + magicked BIGINT, -- magic_id if magicked + dtime_script FLOAT, -- elapsed time for script + hostname VARCHAR(64) NOT NULL, -- host that executed script + quality SMALLINT NOT NULL, -- bad quality flag + fault SMALLINT NOT NULL, -- fault code + software_ver VARCHAR(16), -- software version + bg FLOAT, -- background level + bg_stdev FLOAT, -- stdev of background + maskfrac_npix FLOAT, -- Number of pixels masked + maskfrac_static FLOAT, -- Fraction masked static + maskfrac_dynamic FLOAT, -- Fraction masked dynamic + maskfrac_magic FLOAT, -- Fraction masked magic + maskfrac_advisory FLOAT, -- Fraction masked advisory + PRIMARY KEY(chip_bg_id,class_id), + KEY(fault), + KEY(quality), + FOREIGN KEY(chip_bg_id) REFERENCES chipBackgroundRun(chip_bg_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +-- Background replacement on a warpRun (utilising chipBackgroundRun) +CREATE TABLE warpBackgroundRun ( + warp_bg_id BIGINT AUTO_INCREMENT, -- unique identifier + warp_id BIGINT NOT NULL, -- link to warpRun + chip_bg_id BIGINT NOT NULL, -- link to chipBackgroundRun + state VARCHAR(64) NOT NULL, -- state of run (new, full, etc.) + workdir VARCHAR(255) NOT NULL, -- working directory + label VARCHAR(64), -- processing label + data_group VARCHAR(64), -- group for data + dist_group VARCHAR(64), -- group for distribution + reduction VARCHAR(64), -- reduction class (for altering recipe) + note VARCHAR(255), -- note + registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered + magicked BIGINT DEFAULT 0 NOT NULL, -- magic status + PRIMARY KEY(warp_bg_id), + KEY(warp_id), + KEY(chip_bg_id), + KEY(state), + KEY(label), + KEY(data_group), + KEY(dist_group), + FOREIGN KEY(warp_id) REFERENCES warpRun(warp_id), + FOREIGN KEY(chip_bg_id) REFERENCES chipBackgroundRun(chip_bg_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +-- Results of background replacement from warpBackgroundRun +CREATE TABLE warpBackgroundSkyfile ( + warp_bg_id BIGINT NOT NULL, -- unique identifier + skycell_id VARCHAR(64) NOT NULL, -- skycell identifier + path_base VARCHAR(255) NOT NULL, -- root name for outputs + magicked BIGINT, -- magic_id if magicked + dtime_script FLOAT, -- elapsed time for script + hostname VARCHAR(64) NOT NULL, -- host that executed script + quality SMALLINT NOT NULL, -- bad quality flag + fault SMALLINT NOT NULL, -- fault code + software_ver VARCHAR(16), -- software version + bg FLOAT, -- background level + bg_stdev FLOAT, -- stdev of background + maskfrac_npix FLOAT, -- Number of pixels masked + maskfrac_static FLOAT, -- Fraction masked static + maskfrac_dynamic FLOAT, -- Fraction masked dynamic + maskfrac_magic FLOAT, -- Fraction masked magic + maskfrac_advisory FLOAT, -- Fraction masked advisory + PRIMARY KEY(warp_bg_id,skycell_id), + KEY(fault), + KEY(quality), + FOREIGN KEY(warp_bg_id) REFERENCES warpBackgroundRun(warp_bg_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; Index: trunk/ippTools/share/pxadmin_drop_tables.sql =================================================================== --- trunk/ippTools/share/pxadmin_drop_tables.sql (revision 28429) +++ trunk/ippTools/share/pxadmin_drop_tables.sql (revision 28486) @@ -91,4 +91,8 @@ DROP TABLE IF EXISTS Label; DROP TABLE IF EXISTS pstampWebRequest; +DROP TABLE IF EXISTS chipBackgroundRun; +DROP TABLE IF EXISTS chipBackgroundImfile; +DROP TABLE IF EXISTS warpBackgroundRun; +DROP TABLE IF EXISTS warpBackgroundSkyfile; DROP TABLE IF EXISTS diffPhotRun; DROP TABLE IF EXISTS diffPhotSkyfile;