Index: trunk/ippTools/share/Makefile.am =================================================================== --- trunk/ippTools/share/Makefile.am (revision 14018) +++ trunk/ippTools/share/Makefile.am (revision 14023) @@ -9,5 +9,4 @@ chiptool_pendingimfile.sql \ chiptool_processedimfile.sql \ - chiptool_queuerawexp.sql \ chiptool_queuerawimfile.sql \ detselect_search.sql \ Index: trunk/ippTools/share/camtool_find_pendingexp.sql =================================================================== --- trunk/ippTools/share/camtool_find_pendingexp.sql (revision 14018) +++ trunk/ippTools/share/camtool_find_pendingexp.sql (revision 14023) @@ -4,6 +4,6 @@ SELECT camRun.*, - rawExp.exp_tag, rawExp.exp_id, + rawExp.exp_name, rawExp.camera, rawExp.telescope, @@ -15,5 +15,5 @@ USING(chip_id) JOIN rawExp - ON chipProcessedImfile.exp_tag = rawExp.exp_tag + ON chipProcessedImfile.exp_id = rawExp.exp_id LEFT JOIN camProcessedExp ON camRun.cam_id = camProcessedExp.cam_id Index: trunk/ippTools/share/camtool_find_pendingimfile.sql =================================================================== --- trunk/ippTools/share/camtool_find_pendingimfile.sql (revision 14018) +++ trunk/ippTools/share/camtool_find_pendingimfile.sql (revision 14023) @@ -4,5 +4,5 @@ (SELECT camPendingExp.*, - chipProcessedExp.exp_tag, + chipProcessedExp.exp_id, chipProcessedExp.guide_id, chipProcessedImfile.class_id, @@ -12,5 +12,5 @@ chipProcessedImfile.bg_mean_stdev, chipProcessedImfile.path_base, - rawExp.exp_id, + rawExp.exp_name, rawExp.camera, rawExp.telescope, @@ -22,5 +22,5 @@ USING(chip_id) JOIN rawExp - ON chipProcessedExp.exp_tag = rawExp.exp_tag + ON chipProcessedExp.exp_id = rawExp.exp_id LEFT JOIN camProcessedExp ON camPendingExp.cam_id = camProcessedExp.cam_id Index: trunk/ippTools/share/camtool_find_processedexp.sql =================================================================== --- trunk/ippTools/share/camtool_find_processedexp.sql (revision 14018) +++ trunk/ippTools/share/camtool_find_processedexp.sql (revision 14023) @@ -1,5 +1,5 @@ SELECT camProcessedExp.*, - rawExp.exp_id, + rawExp.exp_name, rawExp.camera, rawExp.telescope, @@ -9,5 +9,5 @@ USING(chip_id) JOIN rawExp - ON chipProcessedExp.exp_tag = rawExp.exp_tag + ON chipProcessedExp.exp_id = rawExp.exp_id WHERE -- bogus condition so there is a pre-existing where to append to camProcessedExp.cam_id IS NOT NULL Index: trunk/ippTools/share/chiptool_completely_processed_exp.sql =================================================================== --- trunk/ippTools/share/chiptool_completely_processed_exp.sql (revision 14018) +++ trunk/ippTools/share/chiptool_completely_processed_exp.sql (revision 14023) @@ -18,8 +18,8 @@ USING(chip_id) JOIN rawExp - ON chipInputImfile.exp_tag = rawExp.exp_tag + ON chipInputImfile.exp_id = rawExp.exp_id JOIN chipProcessedImfile ON chipInputImfile.chip_id = chipProcessedImfile.chip_id - AND chipInputImfile.exp_tag = chipProcessedImfile.exp_tag + AND chipInputImfile.exp_id = chipProcessedImfile.exp_id AND chipInputImfile.class_id = chipProcessedImfile.class_id WHERE @@ -28,4 +28,4 @@ GROUP BY chipInputImfile.chip_id, - chipInputImfile.exp_tag + chipInputImfile.exp_id HAVING rawExp.imfiles = COUNT(chipProcessedImfile.class_id)) as Foo Index: trunk/ippTools/share/chiptool_find_rawexp.sql =================================================================== --- trunk/ippTools/share/chiptool_find_rawexp.sql (revision 14018) +++ trunk/ippTools/share/chiptool_find_rawexp.sql (revision 14023) @@ -2,5 +2,5 @@ -- processeing SELECT - exp_tag + exp_id FROM rawExp WHERE Index: trunk/ippTools/share/chiptool_pendingimfile.sql =================================================================== --- trunk/ippTools/share/chiptool_pendingimfile.sql (revision 14018) +++ trunk/ippTools/share/chiptool_pendingimfile.sql (revision 14023) @@ -1,8 +1,8 @@ SELECT chipRun.*, - chipInputImfile.exp_tag, + chipInputImfile.exp_id, chipInputImfile.class_id, rawImfile.uri, - rawExp.exp_id, + rawExp.exp_name, rawExp.camera, rawExp.telescope, @@ -13,11 +13,11 @@ LEFT JOIN chipProcessedImfile ON chipInputImfile.chip_id = chipProcessedImfile.chip_id - AND chipInputImfile.exp_tag = chipProcessedImfile.exp_tag + AND chipInputImfile.exp_id = chipProcessedImfile.exp_id AND chipInputImfile.class_id = chipProcessedImfile.class_id JOIN rawImfile - ON chipInputImfile.exp_tag = rawImfile.exp_tag + ON chipInputImfile.exp_id = rawImfile.exp_id AND chipInputImfile.class_id = rawImfile.class_id JOIN rawExp - ON rawImfile.exp_tag = rawExp.exp_tag + ON rawImfile.exp_id = rawExp.exp_id LEFT JOIN chipMask ON chipRun.label = chipMask.label @@ -25,5 +25,5 @@ chipRun.state = 'run' AND chipProcessedImfile.chip_id IS NULL - AND chipProcessedImfile.exp_tag IS NULL + AND chipProcessedImfile.exp_id IS NULL AND chipProcessedImfile.class_id IS NULL AND chipMask.label IS NULL Index: trunk/ippTools/share/chiptool_processedimfile.sql =================================================================== --- trunk/ippTools/share/chiptool_processedimfile.sql (revision 14018) +++ trunk/ippTools/share/chiptool_processedimfile.sql (revision 14023) @@ -7,5 +7,5 @@ chipProcessedImfile.bg_mean_stdev, chipProcessedImfile.path_base, - rawExp.exp_id, + rawExp.exp_name, rawExp.camera, rawExp.telescope, @@ -15,7 +15,7 @@ USING(chip_id) JOIN rawExp - ON chipProcessedExp.exp_tag = rawExp.exp_tag + ON chipProcessedExp.exp_id = rawExp.exp_id WHERE -- bogus test; just here so there there is a 'WHERE' stmt to append conditionals too - chipProcessedImfile.exp_tag is NOT NULL + chipProcessedImfile.exp_id is NOT NULL Index: trunk/ippTools/share/chiptool_queuerawimfile.sql =================================================================== --- trunk/ippTools/share/chiptool_queuerawimfile.sql (revision 14018) +++ trunk/ippTools/share/chiptool_queuerawimfile.sql (revision 14023) @@ -2,12 +2,12 @@ SELECT LAST_INSERT_ID(), - rawImfile.exp_tag, + rawImfile.exp_id, rawImfile.class_id FROM rawImfile JOIN newExp - USING(exp_tag) + USING(exp_id) WHERE rawImfile.fault = 0 AND newExp.state = 'stop' - AND rawImfile.exp_tag = '%s' + AND rawImfile.exp_id = '%s' Index: trunk/ippTools/share/dettool_find_completed_runs.sql =================================================================== --- trunk/ippTools/share/dettool_find_completed_runs.sql (revision 14018) +++ trunk/ippTools/share/dettool_find_completed_runs.sql (revision 14023) @@ -6,5 +6,5 @@ detRun.det_id, detRun.iteration, - detInputExp.exp_tag + detInputExp.exp_id FROM detRun LEFT JOIN detInputExp @@ -12,9 +12,9 @@ AND detRun.iteration = detInputExp.iteration LEFT JOIN rawExp - ON detInputExp.exp_tag = rawExp.exp_tag + ON detInputExp.exp_id = rawExp.exp_id LEFT JOIN detResidExp ON detRun.det_id = detResidExp.det_id AND detRun.iteration = detResidExp.iteration - AND detInputExp.exp_tag = detResidExp.exp_tag + AND detInputExp.exp_id = detResidExp.exp_id WHERE detRun.state = 'run' @@ -23,4 +23,4 @@ detRun.iteration HAVING - COUNT(detResidExp.exp_tag) = COUNT(detInputExp.exp_tag) + COUNT(detResidExp.exp_id) = COUNT(detInputExp.exp_id) ) AS residdetrun Index: trunk/ippTools/share/difftool_inputskyfile.sql =================================================================== --- trunk/ippTools/share/difftool_inputskyfile.sql (revision 14018) +++ trunk/ippTools/share/difftool_inputskyfile.sql (revision 14023) @@ -17,5 +17,5 @@ ON camProcessedExp.chip_id = chipProcessedExp.chip_id JOIN rawExp - ON chipProcessedExp.exp_tag = rawExp.exp_tag + ON chipProcessedExp.exp_id = rawExp.exp_id WHERE diffRun.state = 'run' Index: trunk/ippTools/share/regtool_find_unprocessed_exp.sql =================================================================== --- trunk/ippTools/share/regtool_find_unprocessed_exp.sql (revision 14018) +++ trunk/ippTools/share/regtool_find_unprocessed_exp.sql (revision 14023) @@ -4,13 +4,13 @@ FROM newExp JOIN newImfile - USING(exp_tag) + USING(exp_id) LEFT JOIN rawExp - USING(exp_tag) + USING(exp_id) WHERE newExp.state = 'run' - AND rawExp.exp_tag IS NULL + AND rawExp.exp_id IS NULL AND newExp.imfiles = - (SELECT COUNT(exp_tag) FROM rawImfile - WHERE rawImfile.exp_tag = newExp.exp_tag)) as Foo + (SELECT COUNT(exp_id) FROM rawImfile + WHERE rawImfile.exp_id = newExp.exp_id)) as Foo WHERE - exp_tag = '%s' + exp_id = '%s' Index: trunk/ippTools/share/regtool_find_unprocessed_imfile.sql =================================================================== --- trunk/ippTools/share/regtool_find_unprocessed_imfile.sql (revision 14018) +++ (revision ) @@ -1,11 +1,0 @@ -SELECT DISTINCT * FROM - (SELECT - newImfile.* - FROM newImfile - JOIN newExp - USING(exp_tag) - LEFT JOIN rawExp - USING(exp_tag) - WHERE - newExp.state = 'run' - AND rawExp.exp_tag IS NULL) as Foo Index: trunk/ippTools/share/regtool_pendingexp.sql =================================================================== --- trunk/ippTools/share/regtool_pendingexp.sql (revision 14018) +++ trunk/ippTools/share/regtool_pendingexp.sql (revision 14023) @@ -3,13 +3,13 @@ FROM newExp JOIN newImfile - USING(exp_tag) + USING(exp_id) LEFT JOIN rawExp - USING(exp_tag) + USING(exp_id) WHERE newExp.state = 'run' - AND rawExp.exp_tag IS NULL + AND rawExp.exp_id IS NULL AND newExp.imfiles = - (SELECT COUNT(exp_tag) FROM rawImfile + (SELECT COUNT(exp_id) FROM rawImfile WHERE - rawImfile.exp_tag = newExp.exp_tag + rawImfile.exp_id = newExp.exp_id AND rawImfile.fault = 0) Index: trunk/ippTools/share/regtool_pendingimfile.sql =================================================================== --- trunk/ippTools/share/regtool_pendingimfile.sql (revision 14018) +++ trunk/ippTools/share/regtool_pendingimfile.sql (revision 14023) @@ -1,11 +1,18 @@ -SELECT - newImfile.*, - newExp.workdir -FROM newImfile -LEFT JOIN newExp - USING(exp_tag) -LEFT JOIN rawExp - USING(exp_tag) -WHERE - newExp.exp_tag is NOT NULL - AND rawExp.exp_tag IS NULL +SELECT DISTINCT * FROM + (SELECT + newExp.exp_id, + newExp.tmp_exp_name, + newExp.tmp_camera, + newExp.tmp_telescope, + newExp.workdir, + newImfile.tmp_class_id, + newImfile.uri + FROM newImfile + JOIN newExp + USING(exp_id) + LEFT JOIN rawImfile + ON newExp.exp_id = rawImfile.exp_id + AND newImfile.tmp_class_id = rawImfile.tmp_class_id + WHERE + newExp.state = 'run' + AND rawImfile.tmp_class_id IS NULL) as Foo Index: trunk/ippTools/share/regtool_processedimfile.sql =================================================================== --- trunk/ippTools/share/regtool_processedimfile.sql (revision 14018) +++ trunk/ippTools/share/regtool_processedimfile.sql (revision 14023) @@ -1,10 +1,10 @@ SELECT rawImfile.*, - newExp.exp_id, + newExp.exp_name, newExp.camera, newExp.telescope FROM rawImfile JOIN newExp - USING(exp_tag) + USING(exp_id) -- bogus conditional so there is a where clause to append to -WHERE rawImfile.exp_tag is NOT NULL +WHERE rawImfile.exp_id is NOT NULL Index: trunk/ippTools/share/stacktool_inputskyfile.sql =================================================================== --- trunk/ippTools/share/stacktool_inputskyfile.sql (revision 14018) +++ trunk/ippTools/share/stacktool_inputskyfile.sql (revision 14023) @@ -16,5 +16,5 @@ ON camProcessedExp.chip_id = chipProcessedExp.chip_id JOIN rawExp - ON chipProcessedExp.exp_tag = rawExp.exp_tag + ON chipProcessedExp.exp_id = rawExp.exp_id WHERE stackRun.state = 'run' Index: trunk/ippTools/share/warptool_imfile.sql =================================================================== --- trunk/ippTools/share/warptool_imfile.sql (revision 14018) +++ trunk/ippTools/share/warptool_imfile.sql (revision 14023) @@ -14,5 +14,5 @@ ON camProcessedExp.chip_id = chipProcessedImfile.chip_id JOIN rawImfile -- is there any reason not to refer back to rawimfiles? - ON chipProcessedExp.exp_tag = rawImfile.exp_tag + ON chipProcessedExp.exp_id = rawImfile.exp_id WHERE warpRun.state = 'run' Index: trunk/ippTools/share/warptool_tooverlap.sql =================================================================== --- trunk/ippTools/share/warptool_tooverlap.sql (revision 14018) +++ trunk/ippTools/share/warptool_tooverlap.sql (revision 14023) @@ -12,5 +12,5 @@ ON camProcessedExp.chip_id = chipProcessedExp.chip_id JOIN rawExp - ON chipProcessedExp.exp_tag = rawExp.exp_tag + ON chipProcessedExp.exp_id = rawExp.exp_id LEFT JOIN warpSkyCellMap ON warpInputExp.warp_id = warpSkyCellMap.warp_id Index: trunk/ippTools/share/warptool_towarped.sql =================================================================== --- trunk/ippTools/share/warptool_towarped.sql (revision 14018) +++ trunk/ippTools/share/warptool_towarped.sql (revision 14023) @@ -14,5 +14,5 @@ ON camProcessedExp.chip_id = chipProcessedExp.chip_id JOIN rawExp - ON chipProcessedExp.exp_tag = rawExp.exp_tag + ON chipProcessedExp.exp_id = rawExp.exp_id LEFT JOIN warpSkyfile ON warpRun.warp_id = warpSkyfile.warp_id