Index: trunk/ippTools/share/Makefile.am =================================================================== --- trunk/ippTools/share/Makefile.am (revision 36544) +++ trunk/ippTools/share/Makefile.am (revision 36555) @@ -190,4 +190,5 @@ disttool_definebyquery_diff.sql \ disttool_definebyquery_fake.sql \ + disttool_definebyquery_ff.sql \ disttool_definebyquery_raw.sql \ disttool_definebyquery_raw_no_magic.sql \ @@ -207,4 +208,5 @@ disttool_pending_diff.sql \ disttool_pending_fake.sql \ + disttool_pending_ff.sql \ disttool_pending_raw.sql \ disttool_pending_sky.sql \ @@ -498,4 +500,8 @@ fftool_todo.sql \ fftool_toadvance.sql \ + fftool_export_run.sql \ + fftool_export_input.sql \ + fftool_export_result.sql \ + fftool_export_summary.sql \ remotetool_definebyquery_chip.sql \ remotetool_definebyquery_cam.sql \ @@ -503,5 +509,2 @@ remotetool_definebyquery_stack.sql \ remotetool_updatepoll.sql - - - Index: trunk/ippTools/share/disttool_definebyquery_ff.sql =================================================================== --- trunk/ippTools/share/disttool_definebyquery_ff.sql (revision 36555) +++ trunk/ippTools/share/disttool_definebyquery_ff.sql (revision 36555) @@ -0,0 +1,27 @@ +SELECT DISTINCT + 'ff' as stage, + fullForceRun.ff_id AS stage_id, + CAST(0 AS SIGNED) AS magicked, + -- run tag in the form 'ff.$skycell_id.$ff_id' + CONCAT_WS('.', 'ff', stackRun.skycell_id, convert(fullForceRun.ff_id, CHAR)) as run_tag, + fullForceRun.label, + fullForceRun.data_group, + distTarget.dist_group, + distTarget.target_id, + distTarget.clean +FROM fullForceRun +JOIN skycalRun USING(skycal_id) +JOIN stackRun using(stack_id) +JOIN distTarget ON distTarget.stage = 'ff' + AND fullForceRun.dist_group = distTarget.dist_group +JOIN rcInterest USING(target_id) +LEFT JOIN distRun ON (distRun.stage_id = ff_id) + AND distRun.target_id = distTarget.target_id + -- JOIN hook %s +WHERE distTarget.state = 'enabled' + AND rcInterest.state = 'enabled' + AND distRun.dist_id IS NULL + AND fullForceRun.state = 'full' + AND stackRun.filter = distTarget.filter + -- we shouldn't need to check fault. If faulted it shouldn't be full + -- AND (skycalResult.fault = 0 AND skycalResult.quality = 0) Index: trunk/ippTools/share/disttool_pending_ff.sql =================================================================== --- trunk/ippTools/share/disttool_pending_ff.sql (revision 36555) +++ trunk/ippTools/share/disttool_pending_ff.sql (revision 36555) @@ -0,0 +1,86 @@ +-- look for fullForceResult components and a summary components +SELECT * FROM +( +SELECT + distRun.dist_id, + distRun.label, + distTarget.dist_group, + stage, + stage_id, + CONCAT_WS('.', warp_id, stackRun.skycell_id) AS component, + exp_type, + clean, + rawExp.camera, + CONCAT_WS('.', outroot, CONVERT(distRun.dist_id, CHAR)) as outdir, + fullForceResult.path_base, + CAST(NULL AS CHAR(255)) as chip_path_base, + fullForceRun.state, + 'full' AS data_state, + fullForceResult.quality, + distRun.no_magic, + warpRun.magicked, + IFNULL(Label.priority, 10000) AS priority +FROM distRun +JOIN distTarget USING(target_id, stage, clean) +JOIN fullForceRun ON stage_id = ff_id +JOIN skycalRun USING(skycal_id) +JOIN stackRun USING(stack_id) +JOIN fullForceResult USING(ff_id) +JOIN warpRun USING(warp_id) +JOIN fakeRun USING(fake_id) +JOIN camRun USING(cam_id) +JOIN chipRun ON camRun.chip_id = chipRun.chip_id +JOIN rawExp using(exp_id) +LEFT JOIN distComponent + ON distRun.dist_id = distComponent.dist_id + AND CONCAT_WS('.', warp_id, stackRun.skycell_id) = distComponent.component +LEFT JOIN Label ON distRun.label = Label.label +WHERE + distRun.state = 'new' + AND distRun.stage = 'ff' + AND distComponent.dist_id IS NULL + AND (Label.active OR Label.active IS NULL) +UNION +SELECT DISTINCT + distRun.dist_id, + distRun.label, + distTarget.dist_group, + stage, + stage_id, + 'summary' AS component, + exp_type, + clean, + rawExp.camera, + CONCAT_WS('.', outroot, CONVERT(distRun.dist_id, CHAR)) as outdir, + fullForceSummary.path_base, + CAST(NULL AS CHAR(255)) as chip_path_base, + fullForceRun.state, + 'full' AS data_state, + fullForceSummary.quality, + distRun.no_magic, + 0 AS magicked, + IFNULL(Label.priority, 10000) AS priority +FROM distRun +JOIN distTarget USING(target_id, stage, clean) +JOIN fullForceRun ON stage_id = ff_id +JOIN fullForceSummary USING(ff_id) +JOIN skycalRun USING(skycal_id) +JOIN stackRun USING(stack_id) +JOIN stackInputSkyfile USING(stack_id) +JOIN warpRun USING(warp_id) +JOIN fakeRun USING(fake_id) +JOIN camRun USING(cam_id) +JOIN chipRun ON camRun.chip_id = chipRun.chip_id +JOIN rawExp using(exp_id) +LEFT JOIN distComponent + ON distRun.dist_id = distComponent.dist_id + AND 'summary' = distComponent.component +LEFT JOIN Label ON distRun.label = Label.label +WHERE + distRun.state = 'new' + AND distRun.stage = 'ff' + AND distComponent.dist_id IS NULL + AND (Label.active OR Label.active IS NULL) +) as distRun +-- where arguments are appended here +WHERE 1 Index: trunk/ippTools/share/disttool_toadvance.sql =================================================================== --- trunk/ippTools/share/disttool_toadvance.sql (revision 36544) +++ trunk/ippTools/share/disttool_toadvance.sql (revision 36555) @@ -308,3 +308,33 @@ COUNT(diffSkyfile.skycell_id) = COUNT(distComponent.component) AND SUM(distComponent.fault) = 0 +UNION +-- ff stage +SELECT + distRun.dist_id, + stage, + stage_id, + outroot, + distRun.label, + clean + -- ,COUNT(warp_id) + -- ,COUNT(ff_id) + FROM distRun + JOIN fullForceRun ON stage_id = ff_id + JOIN fullForceResult USING(ff_id) + JOIN skycalRun USING(skycal_id) + JOIN stackRun USING(stack_id) + LEFT JOIN distComponent + ON distRun.dist_id = distComponent.dist_id + AND distComponent.component = CONCAT_WS('.', warp_id, stackRun.skycell_id) + WHERE + distRun.state = 'new' + AND distRun.fault = 0 + AND distRun.stage = 'ff' + GROUP BY + distRun.dist_id, + ff_id + HAVING + -- number of dist components is the number of warps plus 1 (for the summary component) + COUNT(fullForceResult.ff_id) = COUNT(distComponent.component) + AND SUM(distComponent.fault) = 0 ) as Foo Index: trunk/ippTools/share/fftool_export_input.sql =================================================================== --- trunk/ippTools/share/fftool_export_input.sql (revision 36555) +++ trunk/ippTools/share/fftool_export_input.sql (revision 36555) @@ -0,0 +1,3 @@ +SELECT + fullForceInput.* +FROM fullForceInput Index: trunk/ippTools/share/fftool_export_result.sql =================================================================== --- trunk/ippTools/share/fftool_export_result.sql (revision 36555) +++ trunk/ippTools/share/fftool_export_result.sql (revision 36555) @@ -0,0 +1,3 @@ +SELECT + fullForceResult.* +FROM fullForceResult Index: trunk/ippTools/share/fftool_export_run.sql =================================================================== --- trunk/ippTools/share/fftool_export_run.sql (revision 36555) +++ trunk/ippTools/share/fftool_export_run.sql (revision 36555) @@ -0,0 +1,3 @@ +SELECT + fullForceRun.* +FROM fullForceRun Index: trunk/ippTools/share/fftool_export_summary.sql =================================================================== --- trunk/ippTools/share/fftool_export_summary.sql (revision 36555) +++ trunk/ippTools/share/fftool_export_summary.sql (revision 36555) @@ -0,0 +1,3 @@ +SELECT + fullForceSummary.* +FROM fullForceSummary Index: trunk/ippTools/share/fftool_result.sql =================================================================== --- trunk/ippTools/share/fftool_result.sql (revision 36544) +++ trunk/ippTools/share/fftool_result.sql (revision 36555) @@ -1,7 +1,10 @@ SELECT fullForceResult.*, - fullForceRun.skycal_id, + fullForceRun.state, fullForceRun.label, fullForceRun.data_group, + fullForceRun.skycal_id, + fullForceRun.workdir, + CONCAT_WS('.', warp_id, skycell_id) AS dist_component, stackRun.tess_id, stackRun.skycell_id, Index: trunk/ippTools/share/fftool_summary.sql =================================================================== --- trunk/ippTools/share/fftool_summary.sql (revision 36544) +++ trunk/ippTools/share/fftool_summary.sql (revision 36555) @@ -5,4 +5,6 @@ fullForceRun.data_group, fullForceRun.skycal_id, + fullForceRun.workdir, + 'summary' AS dist_component, stackRun.tess_id, stackRun.skycell_id,