Index: branches/eam_branches/ipp-20121130/ippTools/share/Makefile.am =================================================================== --- branches/eam_branches/ipp-20121130/ippTools/share/Makefile.am (revision 34755) +++ branches/eam_branches/ipp-20121130/ippTools/share/Makefile.am (revision 34839) @@ -88,4 +88,5 @@ chiptool_listrun.sql \ chiptool_pendingcleanupimfile.sql \ + chiptool_pendingcleanupimfile_all.sql \ chiptool_pendingcleanuprun.sql \ chiptool_pendingimfile.sql \ @@ -172,4 +173,5 @@ difftool_pendingcleanuprun.sql \ difftool_pendingcleanupskyfile.sql \ + difftool_pendingcleanupskyfile_all.sql \ difftool_revertdiffskyfile_delete.sql \ difftool_revertdiffskyfile_updated.sql \ @@ -391,4 +393,5 @@ stacktool_sassskyfile.sql \ stacktool_tosum.sql \ + stacktool_tobkg.sql \ stacktool_tosummary.sql \ stacktool_addsummary.sql \ @@ -423,4 +426,5 @@ warptool_pendingcleanuprun.sql \ warptool_pendingcleanupskyfile.sql \ + warptool_pendingcleanupskyfile_all.sql \ warptool_revertoverlap.sql \ warptool_revertwarped_delete.sql \ Index: branches/eam_branches/ipp-20121130/ippTools/share/camtool_pendingcleanuprun.sql =================================================================== --- branches/eam_branches/ipp-20121130/ippTools/share/camtool_pendingcleanuprun.sql (revision 34755) +++ branches/eam_branches/ipp-20121130/ippTools/share/camtool_pendingcleanuprun.sql (revision 34839) @@ -2,4 +2,6 @@ camRun.cam_id, rawExp.camera, + rawExp.exp_tag, + camRun.workdir, camRun.state FROM camRun Index: branches/eam_branches/ipp-20121130/ippTools/share/chiptool_pendingcleanupimfile_all.sql =================================================================== --- branches/eam_branches/ipp-20121130/ippTools/share/chiptool_pendingcleanupimfile_all.sql (revision 34839) +++ branches/eam_branches/ipp-20121130/ippTools/share/chiptool_pendingcleanupimfile_all.sql (revision 34839) @@ -0,0 +1,16 @@ +-- list of chipProcessedImfiles for runs in a goto_cleaned like state without regard to +-- data_state or quality. Used for confirming that a run is really in the cleaned state +SELECT + chipProcessedImfile.*, + chipRun.state, + chipRun.workdir, + chipRun.label, + chipRun.reduction, + chipRun.expgroup, + chipRun.dvodb, + chipRun.tess_id, + chipRun.end_stage +FROM chipRun +JOIN chipProcessedImfile + USING(chip_id) +WHERE ( chipRun.state = 'goto_cleaned' OR chipRun.state = 'goto_scrubbed' OR chipRun.state = 'goto_purged' ) Index: branches/eam_branches/ipp-20121130/ippTools/share/chiptool_pendingcleanuprun.sql =================================================================== --- branches/eam_branches/ipp-20121130/ippTools/share/chiptool_pendingcleanuprun.sql (revision 34755) +++ branches/eam_branches/ipp-20121130/ippTools/share/chiptool_pendingcleanuprun.sql (revision 34839) @@ -1,6 +1,8 @@ -SELECT +SELECT DISTINCT chipRun.chip_id, rawExp.camera, - chipRun.state + rawExp.exp_tag, + chipRun.state, + chipRun.workdir FROM chipRun JOIN rawExp Index: branches/eam_branches/ipp-20121130/ippTools/share/difftool_pendingcleanuprun.sql =================================================================== --- branches/eam_branches/ipp-20121130/ippTools/share/difftool_pendingcleanuprun.sql (revision 34755) +++ branches/eam_branches/ipp-20121130/ippTools/share/difftool_pendingcleanuprun.sql (revision 34839) @@ -6,4 +6,6 @@ rawExp.camera, diffRun.state, + diffRun.workdir, + diffRun.tess_id, diffRun.label FROM diffRun @@ -35,4 +37,6 @@ rawExp.camera, diffRun.state, + diffRun.workdir, + diffRun.tess_id, diffRun.label FROM diffRun @@ -64,4 +68,6 @@ rawExp.camera, diffRun.state, + diffRun.workdir, + diffRun.tess_id, diffRun.label FROM diffRun @@ -93,4 +99,6 @@ rawExp.camera, diffRun.state, + diffRun.workdir, + diffRun.tess_id, diffRun.label FROM diffRun Index: branches/eam_branches/ipp-20121130/ippTools/share/difftool_pendingcleanupskyfile_all.sql =================================================================== --- branches/eam_branches/ipp-20121130/ippTools/share/difftool_pendingcleanupskyfile_all.sql (revision 34839) +++ branches/eam_branches/ipp-20121130/ippTools/share/difftool_pendingcleanupskyfile_all.sql (revision 34839) @@ -0,0 +1,10 @@ +SELECT + diffSkyfile.*, + diffRun.state, + diffRun.workdir, + diffRun.dvodb, + diffRun.tess_id +FROM diffRun +JOIN diffSkyfile + USING(diff_id) +WHERE ( diffRun.state = 'goto_cleaned' OR diffRun.state = 'goto_scrubbed' OR diffRun.state = 'goto_purged') Index: branches/eam_branches/ipp-20121130/ippTools/share/pstamptool_revertdependent.sql =================================================================== --- branches/eam_branches/ipp-20121130/ippTools/share/pstamptool_revertdependent.sql (revision 34755) +++ branches/eam_branches/ipp-20121130/ippTools/share/pstamptool_revertdependent.sql (revision 34839) @@ -4,4 +4,6 @@ SET pstampDependent.fault = 0 -- fault count hook %s -WHERE pstampDependent.state = 'new' +WHERE pstampRequest.state ='run' + AND pstampJob.state ='run' + AND pstampDependent.state = 'new' AND (pstampDependent.fault > 0) Index: branches/eam_branches/ipp-20121130/ippTools/share/pxadmin_create_tables.sql =================================================================== --- branches/eam_branches/ipp-20121130/ippTools/share/pxadmin_create_tables.sql (revision 34755) +++ branches/eam_branches/ipp-20121130/ippTools/share/pxadmin_create_tables.sql (revision 34839) @@ -2119,4 +2119,5 @@ n_detections INT, n_extended INT, + n_forced INT, zpt_obs FLOAT, zpt_stdev FLOAT, Index: branches/eam_branches/ipp-20121130/ippTools/share/stacktool_inputskyfile.sql =================================================================== --- branches/eam_branches/ipp-20121130/ippTools/share/stacktool_inputskyfile.sql (revision 34755) +++ branches/eam_branches/ipp-20121130/ippTools/share/stacktool_inputskyfile.sql (revision 34839) @@ -4,4 +4,5 @@ rawExp.exp_id, rawExp.exp_name, + rawExp.exp_time, rawExp.object, rawExp.dateobs, Index: branches/eam_branches/ipp-20121130/ippTools/share/stacktool_pendingcleanuprun.sql =================================================================== --- branches/eam_branches/ipp-20121130/ippTools/share/stacktool_pendingcleanuprun.sql (revision 34755) +++ branches/eam_branches/ipp-20121130/ippTools/share/stacktool_pendingcleanuprun.sql (revision 34839) @@ -8,6 +8,8 @@ stackRun.stack_id, rawExp.camera, - stackRun.state + stackRun.state, + stackSumSkyfile.path_base FROM stackRun +JOIN stackSumSkyfile using(stack_id) JOIN stackInputSkyfile USING(stack_id) Index: branches/eam_branches/ipp-20121130/ippTools/share/stacktool_tobkg.sql =================================================================== --- branches/eam_branches/ipp-20121130/ippTools/share/stacktool_tobkg.sql (revision 34839) +++ branches/eam_branches/ipp-20121130/ippTools/share/stacktool_tobkg.sql (revision 34839) @@ -0,0 +1,29 @@ +SELECT + stackRun.stack_id, + stackRun.tess_id, + stackRun.skycell_id, + stackRun.workdir, + stackRun.reduction, + stackRun.label, + stackRun.state, + stackSumSkyfile.path_base, + rawExp.camera, + IFNULL(Label.priority, 10000) AS priority +FROM stackRun +JOIN stackInputSkyfile USING(stack_id) +JOIN warpRun USING(warp_id) +JOIN warpSkyfile USING(warp_id,skycell_id) +JOIN fakeRun USING(fake_id) +JOIN camRun USING(cam_id) +JOIN chipRun USING(chip_id) +JOIN rawExp USING(exp_id) +LEFT JOIN stackSumSkyfile USING(stack_id) +LEFT JOIN Label ON Label.label = stackRun.label +WHERE + ((stackRun.state = 'full' AND stackSumSkyfile.fault = 0 AND stackSumSkyfile.quality = 0 AND stackSumSkyfile.background_model != 1)) + AND (Label.active OR Label.active IS NULL) + -- WHERE hook %s +GROUP BY stack_id +HAVING (SUM(IF(warpRun.state = 'full', 1, 0)) = COUNT(stackInputSkyfile.warp_id) AND + SUM(IF(warpSkyfile.background_model = 1, 1, 0)) = COUNT(stackInputSkyfile.warp_id)) + Index: branches/eam_branches/ipp-20121130/ippTools/share/staticskytool_defineskycalrun.sql =================================================================== --- branches/eam_branches/ipp-20121130/ippTools/share/staticskytool_defineskycalrun.sql (revision 34755) +++ branches/eam_branches/ipp-20121130/ippTools/share/staticskytool_defineskycalrun.sql (revision 34839) @@ -2,4 +2,6 @@ sky_id, stack_id, + skycell_id, + filter, staticskyRun.workdir, staticskyRun.label, @@ -11,4 +13,5 @@ JOIN stackRun USING(stack_id) JOIN stackSumSkyfile USING(stack_id) + JOIN skycell USING(tess_id, skycell_id) LEFT JOIN skycalRun USING(sky_id, stack_id) WHERE staticskyRun.state = 'full' Index: branches/eam_branches/ipp-20121130/ippTools/share/staticskytool_pendingskycalrun.sql =================================================================== --- branches/eam_branches/ipp-20121130/ippTools/share/staticskytool_pendingskycalrun.sql (revision 34755) +++ branches/eam_branches/ipp-20121130/ippTools/share/staticskytool_pendingskycalrun.sql (revision 34839) @@ -6,5 +6,5 @@ staticskyResult.path_base, rawExp.camera, - 0 AS singlefilter + staticskyResult.num_inputs = 1 AS singlefilter FROM skycalRun JOIN staticskyRun USING (sky_id) Index: branches/eam_branches/ipp-20121130/ippTools/share/warptool_pendingcleanuprun.sql =================================================================== --- branches/eam_branches/ipp-20121130/ippTools/share/warptool_pendingcleanuprun.sql (revision 34755) +++ branches/eam_branches/ipp-20121130/ippTools/share/warptool_pendingcleanuprun.sql (revision 34839) @@ -1,5 +1,7 @@ SELECT warpRun.warp_id, + warpRun.workdir, rawExp.camera, + rawExp.exp_tag, warpRun.state FROM warpRun Index: branches/eam_branches/ipp-20121130/ippTools/share/warptool_pendingcleanupskyfile_all.sql =================================================================== --- branches/eam_branches/ipp-20121130/ippTools/share/warptool_pendingcleanupskyfile_all.sql (revision 34839) +++ branches/eam_branches/ipp-20121130/ippTools/share/warptool_pendingcleanupskyfile_all.sql (revision 34839) @@ -0,0 +1,11 @@ +SELECT + warpSkyfile.*, + warpRun.state, + warpRun.workdir, + warpRun.label, + warpRun.dvodb, + warpRun.end_stage +FROM warpRun +JOIN warpSkyfile + USING(warp_id) +WHERE (warpRun.state = 'goto_cleaned' OR warpRun.state = 'goto_scrubbed' OR warpRun.state = 'goto_purged')