Index: trunk/ippTools/share/Makefile.am =================================================================== --- trunk/ippTools/share/Makefile.am (revision 17938) +++ trunk/ippTools/share/Makefile.am (revision 18029) @@ -1,7 +1,7 @@ dist_pkgdata_DATA = \ + camtool_find_chip_id.sql \ camtool_find_pendingexp.sql \ camtool_find_pendingimfile.sql \ camtool_find_processedexp.sql \ - camtool_find_chip_id.sql \ camtool_queue_chip_id.sql \ camtool_reset_faulted_runs.sql \ @@ -18,11 +18,7 @@ detselect_search.sql \ detselect_select.sql \ - dettool_tocorrectimfile.sql \ - dettool_tocorrectexp.sql \ - dettool_stop_completed_correct_runs.sql \ dettool_find_completed_runs.sql \ dettool_normalizedstat.sql \ dettool_raw.sql \ - dettool_runs.sql \ dettool_revertdetrunsummary.sql \ dettool_revertnormalizedexp.sql \ @@ -34,5 +30,9 @@ dettool_revertresidimfile.sql\ dettool_revertstacked.sql \ + dettool_runs.sql \ dettool_start_new_iteration.sql \ + dettool_stop_completed_correct_runs.sql \ + dettool_tocorrectexp.sql \ + dettool_tocorrectimfile.sql \ dettool_todetrunsummary.sql \ dettool_tonormalizedexp.sql \ @@ -44,24 +44,32 @@ dettool_tostacked.sql \ difftool_inputskyfile.sql \ + difftool_queue.sql \ + difftool_revertdiffskyfile.sql \ difftool_skyfile.sql \ difftool_todiffskyfile.sql \ - difftool_revertdiffskyfile.sql \ - difftool_queue.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_completely_processed_chiprun.sql \ flatcorr_find_completed_floatcorruns.sql \ flatcorr_find_processedimfiles.sql \ - magictool_toprocess_inputs.sql \ - magictool_toprocess_tree.sql \ - magictool_tomask.sql \ - magictool_toskyfilemask.sql \ magictool_find_complete_diffed_exposures.sql \ magictool_find_complete_warpruns.sql \ magictool_inputskyfile.sql \ + magictool_tomask.sql \ + magictool_toprocess_inputs.sql \ + magictool_toprocess_tree.sql \ + magictool_toskyfilemask.sql \ + pxadmin_create_tables.sql \ + pxadmin_drop_tables.sql \ pztool_find_completed_exp.sql \ pztool_pendingimfile.sql \ pztool_revertcopied.sql \ - pxadmin_create_tables.sql \ - pxadmin_drop_tables.sql \ regtool_pendingexp.sql \ regtool_pendingimfile.sql \ @@ -79,5 +87,5 @@ warptool_scmap.sql \ warptool_tooverlap.sql \ + warptool_revertwarped.sql \ warptool_towarped.sql \ - warptool_warped.sql \ - warptool_revertwarped.sql + warptool_warped.sql Index: trunk/ippTools/share/camtool_find_pendingexp.sql =================================================================== --- trunk/ippTools/share/camtool_find_pendingexp.sql (revision 17938) +++ trunk/ippTools/share/camtool_find_pendingexp.sql (revision 18029) @@ -20,5 +20,5 @@ -- ON chipProcessedImfile.exp_id = rawExp.exp_id LEFT JOIN camProcessedExp - ON camRun.cam_id = camProcessedExp.cam_id + USING(cam_id) LEFT JOIN camMask ON camRun.label = camMask.label Index: trunk/ippTools/share/camtool_find_pendingimfile.sql =================================================================== --- trunk/ippTools/share/camtool_find_pendingimfile.sql (revision 17938) +++ trunk/ippTools/share/camtool_find_pendingimfile.sql (revision 18029) @@ -34,5 +34,5 @@ ON chipProcessedImfile.exp_id = rawExp.exp_id LEFT JOIN camProcessedExp - ON camRun.cam_id = camProcessedExp.cam_id + USING(cam_id) LEFT JOIN camMask ON camRun.label = camMask.label Index: trunk/ippTools/share/camtool_find_processedexp.sql =================================================================== --- trunk/ippTools/share/camtool_find_processedexp.sql (revision 17938) +++ trunk/ippTools/share/camtool_find_processedexp.sql (revision 18029) @@ -6,5 +6,7 @@ rawExp.telescope, rawExp.filelevel -FROM camProcessedExp +FROM camRun +JOIN camProcessedExp + USING(cam_id) JOIN chipRun USING(chip_id) Index: trunk/ippTools/share/difftool_inputskyfile.sql =================================================================== --- trunk/ippTools/share/difftool_inputskyfile.sql (revision 17938) +++ trunk/ippTools/share/difftool_inputskyfile.sql (revision 18029) @@ -19,14 +19,20 @@ JOIN warpRun ON diffInputSkyfile.warp_id = warpRun.warp_id - JOIN camProcessedExp - ON warpRun.cam_id = camProcessedExp.cam_id + JOIN fakeRun + USING(fake_id) + JOIN camRun + USING(cam_id) JOIN chipRun - ON camProcessedExp.chip_id = chipRun.chip_id + USING(chip_id) JOIN chipProcessedImfile - ON chipRun.chip_id = chipProcessedImfile.chip_id + USING(chip_id) JOIN rawExp - ON chipProcessedImfile.exp_id = rawExp.exp_id + ON chipRun.exp_id = rawExp.exp_id WHERE diffRun.state = 'run' + AND warpRun.state = 'stop' + AND fakeRun.state = 'stop' + AND camRun.state = 'stop' + AND chipRun.state = 'stop' UNION SELECT @@ -49,13 +55,19 @@ JOIN warpRun ON stackInputSkyfile.warp_id = warpRun.warp_id - JOIN camProcessedExp - ON warpRun.cam_id = camProcessedExp.cam_id + JOIN fakeRun + USING(fake_id) + JOIN camRun + USING(cam_id) JOIN chipRun - ON camProcessedExp.chip_id = chipRun.chip_id + USING(chip_id) JOIN chipProcessedImfile - ON chipRun.chip_id = chipProcessedImfile.chip_id + USING(chip_id) JOIN rawExp - ON chipProcessedImfile.exp_id = rawExp.exp_id + ON chipRun.exp_id = rawExp.exp_id WHERE diffRun.state = 'run' + AND warpRun.state = 'stop' + AND fakeRun.state = 'stop' + AND camRun.state = 'stop' + AND chipRun.state = 'stop' ) as Foo Index: trunk/ippTools/share/difftool_todiffskyfile.sql =================================================================== --- trunk/ippTools/share/difftool_todiffskyfile.sql (revision 17938) +++ trunk/ippTools/share/difftool_todiffskyfile.sql (revision 18029) @@ -14,4 +14,6 @@ JOIN warpRun ON warpRun.warp_id = warpSkyfile.warp_id +JOIN fakeRun + USING(fake_id) JOIN camRun USING(cam_id) @@ -24,3 +26,7 @@ WHERE diffRun.state = 'run' + AND warpRun.state = 'stop' + AND fakeRun.state = 'stop' + AND camRun.state = 'stop' + AND chipRun.state = 'stop' AND diffSkyfile.diff_id IS NULL Index: trunk/ippTools/share/faketool_find_camrun.sql =================================================================== --- trunk/ippTools/share/faketool_find_camrun.sql (revision 18029) +++ trunk/ippTools/share/faketool_find_camrun.sql (revision 18029) @@ -0,0 +1,36 @@ +SELECT + * +FROM + (SELECT DISTINCT + camRun.cam_id, + chipRun.*, + rawExp.camera, + rawExp.telescope, + rawExp.dateobs, + rawExp.exp_tag, + rawExp.exp_type, + rawExp.filelevel, + rawExp.filter, + rawExp.airmass, + rawExp.ra, + rawExp.decl, + rawExp.exp_time, + rawExp.sat_pixel_frac, + rawExp.bg, + rawExp.bg_stdev, + rawExp.bg_mean_stdev, + rawExp.alt, + rawExp.az, + rawExp.ccd_temp, + rawExp.posang, + rawExp.object, + rawExp.solang + FROM camRun + JOIN chipRun + using(chip_id) + JOIN rawExp + using(exp_id) + WHERE + camRun.state = 'stop' + AND chipRun.state = 'stop' +) as Foo Index: trunk/ippTools/share/faketool_find_pendingexp.sql =================================================================== --- trunk/ippTools/share/faketool_find_pendingexp.sql (revision 18029) +++ trunk/ippTools/share/faketool_find_pendingexp.sql (revision 18029) @@ -0,0 +1,34 @@ +-- this query is used by both camtool -pendingexp & camtool -addprocessedexp it +-- does a little more work then is necessary for -addprocessed but it seems +-- "cleaner" to use the same query for both cases +SELECT * FROM + (SELECT + fakeRun.*, + rawExp.exp_tag, + rawExp.exp_id, + rawExp.exp_name, + rawExp.camera, + rawExp.telescope, + rawExp.filelevel + FROM fakeRun + JOIN camRun + USING(cam_id) + JOIN chipRun + USING(chip_id) + JOIN chipProcessedImfile + USING(chip_id) + JOIN rawExp + ON chipRun.exp_id = rawExp.exp_id + LEFT JOIN fakeProcessedImfile + USING(fake_id) + LEFT JOIN fakeMask + ON fakeRun.label = fakeMask.label + WHERE + fakeRun.state = 'run' + AND camRun.state = 'stop' + AND chipRun.state = 'stop' + AND fakeMask.label IS NULL + AND fakeProcessedImfile.fake_id IS NULL + GROUP BY + fakeRun.fake_id + ) as Foo Index: trunk/ippTools/share/faketool_pendingimfile.sql =================================================================== --- trunk/ippTools/share/faketool_pendingimfile.sql (revision 17938) +++ trunk/ippTools/share/faketool_pendingimfile.sql (revision 18029) @@ -21,5 +21,6 @@ chipProcessedImfile.n_cr, chipProcessedImfile.n_astrom, - chipProcessedImfile.path_base, + chipProcessedImfile.path_base as chip_path_base, + camProcessedExp.path_base as cam_path_base, rawExp.exp_name, rawExp.camera, @@ -28,4 +29,6 @@ FROM fakeRun JOIN camRun + USING(cam_id) + JOIN camProcessedExp USING(cam_id) JOIN chipRun Index: trunk/ippTools/share/faketool_revertprocessedimfile.sql =================================================================== --- trunk/ippTools/share/faketool_revertprocessedimfile.sql (revision 18029) +++ trunk/ippTools/share/faketool_revertprocessedimfile.sql (revision 18029) @@ -0,0 +1,8 @@ +DELETE FROM fakeProcessedImfile +USING fakeProcessedImfile, fakeRun, camRun, chipRun, rawExp +WHERE + fakeProcessedImfile.fake_id = fakeRun.fake_id + AND fakeRun.cam_id = camRun.cam_id + AND camRun.chip_id = chipRun.chip_id + AND chipRun.exp_id = rawExp.exp_id + AND fakeProcessedImfile.fault != 0 Index: trunk/ippTools/share/faketool_unmasked.sql =================================================================== --- trunk/ippTools/share/faketool_unmasked.sql (revision 18029) +++ trunk/ippTools/share/faketool_unmasked.sql (revision 18029) @@ -0,0 +1,11 @@ +SELECT + * +FROM + (SELECT + fakeRun.label, + count(fakeRun.fake_id) as n_fakeruns + FROM fakeRun + LEFT JOIN fakeMask + USING (label) + WHERE fakeMask.label IS NULL + GROUP BY fakeRun.label) as fakeUnmask Index: trunk/ippTools/share/pxadmin_create_tables.sql =================================================================== --- trunk/ippTools/share/pxadmin_create_tables.sql (revision 17938) +++ trunk/ippTools/share/pxadmin_create_tables.sql (revision 18029) @@ -328,5 +328,4 @@ CREATE TABLE camProcessedExp ( cam_id BIGINT, - chip_id BIGINT, uri VARCHAR(255), bg FLOAT, @@ -356,8 +355,8 @@ path_base VARCHAR(255), fault SMALLINT NOT NULL, - PRIMARY KEY(cam_id, chip_id), - KEY(fault), - FOREIGN KEY (cam_id, chip_id) - REFERENCES camRun(cam_id, chip_id)) + PRIMARY KEY(cam_id), + KEY(fault), + FOREIGN KEY (cam_id) + REFERENCES camRun(cam_id)) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -646,8 +645,72 @@ 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 warpRun (warp_id BIGINT AUTO_INCREMENT, cam_id BIGINT, mode VARCHAR(64), state VARCHAR(64), workdir VARCHAR(255), workdir_state VARCHAR(64), label VARCHAR(64), dvodb VARCHAR(255), tess_id VARCHAR(64), end_stage VARCHAR(64), registered DATETIME, magiced TINYINT, PRIMARY KEY(warp_id), KEY(warp_id), KEY(cam_id), KEY(mode), KEY(state), KEY(workdir_state), KEY(label), KEY(end_stage), KEY(magiced), INDEX(warp_id, cam_id), FOREIGN KEY (cam_id) REFERENCES camProcessedExp(cam_id)) ENGINE=innodb DEFAULT CHARSET=latin1; -CREATE TABLE warpSkyCellMap (warp_id BIGINT, skycell_id VARCHAR(64), tess_id VARCHAR(64), cam_id BIGINT, class_id VARCHAR(64), fault SMALLINT, PRIMARY KEY(warp_id, skycell_id, tess_id, cam_id, class_id), KEY(fault), FOREIGN KEY (warp_id, cam_id) REFERENCES warpRun(warp_id, cam_id)) ENGINE=innodb DEFAULT CHARSET=latin1; -CREATE TABLE warpSkyfile (warp_id BIGINT, skycell_id VARCHAR(64), tess_id VARCHAR(64), uri VARCHAR(255), path_base VARCHAR(255), bg DOUBLE, bg_stdev DOUBLE, dtime_warp FLOAT, hostname VARCHAR(64), good_frac FLOAT, xmin INT, xmax INT, ymin INT, ymax INT, ignored TINYINT, fault SMALLINT, PRIMARY KEY(warp_id, skycell_id, tess_id), KEY(good_frac), KEY(ignored), KEY(fault), FOREIGN KEY (warp_id, skycell_id, tess_id) REFERENCES warpSkyCellMap(warp_id, skycell_id, tess_id)) ENGINE=innodb DEFAULT CHARSET=latin1; -CREATE TABLE warpMask (label VARCHAR(64), PRIMARY KEY(label)) ENGINE=innodb DEFAULT CHARSET=latin1; +CREATE TABLE warpRun ( + warp_id BIGINT AUTO_INCREMENT, + fake_id BIGINT, + mode VARCHAR(64), + state VARCHAR(64), + workdir VARCHAR(255), + workdir_state VARCHAR(64), + label VARCHAR(64), + dvodb VARCHAR(255), + tess_id VARCHAR(64), + end_stage VARCHAR(64), + registered DATETIME, + magiced TINYINT, + PRIMARY KEY(warp_id), + KEY(warp_id), + KEY(fake_id), + KEY(mode), + KEY(state), + KEY(workdir_state), + KEY(label), + KEY(end_stage), + KEY(magiced), + INDEX(warp_id, fake_id), + FOREIGN KEY (fake_id) + REFERENCES fakeRun(fake_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +CREATE TABLE warpSkyCellMap ( + warp_id BIGINT, + skycell_id VARCHAR(64), + tess_id VARCHAR(64), + class_id VARCHAR(64), + fault SMALLINT, + PRIMARY KEY(warp_id, skycell_id, tess_id, class_id), + KEY(fault), + FOREIGN KEY (warp_id) + REFERENCES warpRun(warp_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +CREATE TABLE warpSkyfile ( + warp_id BIGINT, + skycell_id VARCHAR(64), + tess_id VARCHAR(64), + uri VARCHAR(255), + path_base VARCHAR(255), + bg DOUBLE, + bg_stdev DOUBLE, + dtime_warp FLOAT, + hostname VARCHAR(64), + good_frac FLOAT, + xmin INT, + xmax INT, + ymin INT, + ymax INT, + ignored TINYINT, + fault SMALLINT, + PRIMARY KEY(warp_id, skycell_id, tess_id), + KEY(good_frac), + KEY(ignored), KEY(fault), + FOREIGN KEY (warp_id, skycell_id, tess_id) + REFERENCES warpSkyCellMap(warp_id, skycell_id, tess_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +CREATE TABLE warpMask ( + label VARCHAR(64), + PRIMARY KEY(label) +) ENGINE=innodb DEFAULT CHARSET=latin1; + CREATE TABLE stackRun (stack_id BIGINT AUTO_INCREMENT, state VARCHAR(64), workdir VARCHAR(255), dvodb VARCHAR(255), registered DATETIME, skycell_id VARCHAR(64), tess_id VARCHAR(64), PRIMARY KEY(stack_id), KEY(stack_id), KEY(state), KEY(skycell_id), KEY(tess_id)) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE stackInputSkyfile (stack_id BIGINT, warp_id BIGINT, PRIMARY KEY(stack_id, warp_id), FOREIGN KEY (stack_id) REFERENCES stackRun(stack_id), FOREIGN KEY (warp_id) REFERENCES warpSkyfile(warp_id)) ENGINE=innodb DEFAULT CHARSET=latin1; Index: trunk/ippTools/share/stacktool_find_complete_warps.sql =================================================================== --- trunk/ippTools/share/stacktool_find_complete_warps.sql (revision 17938) +++ trunk/ippTools/share/stacktool_find_complete_warps.sql (revision 18029) @@ -6,4 +6,6 @@ JOIN warpSkyfile USING(warp_id) + JOIN fakeRun + USING(fake_id) JOIN camRun USING(cam_id) Index: trunk/ippTools/share/stacktool_inputskyfile.sql =================================================================== --- trunk/ippTools/share/stacktool_inputskyfile.sql (revision 17938) +++ trunk/ippTools/share/stacktool_inputskyfile.sql (revision 18029) @@ -11,10 +11,12 @@ JOIN warpRun ON stackInputSkyfile.warp_id = warpRun.warp_id -JOIN camProcessedExp - ON warpRun.cam_id = camProcessedExp.cam_id +JOIN fakeRun + USING(fake_id) +JOIN camRun + USING(cam_id) JOIN chipRun - ON camProcessedExp.chip_id = chipRun.chip_id + USING(chip_id) JOIN chipProcessedImfile - ON chipRun.chip_id = chipProcessedImfile.chip_id + USING(chip_id) JOIN rawExp ON chipProcessedImfile.exp_id = rawExp.exp_id Index: trunk/ippTools/share/warptool_exp.sql =================================================================== --- trunk/ippTools/share/warptool_exp.sql (revision 17938) +++ trunk/ippTools/share/warptool_exp.sql (revision 18029) @@ -1,8 +1,8 @@ SELECT - camProcessedExp.* + fakeRun.* FROM warpRun -JOIN camProcessedExp - USING(cam_id) +JOIN fakeRun + USING(fake_id) WHERE warpRun.state = 'run' - AND camProcessedExp.fault = 0 + AND fakeRun.state = 'stop' Index: trunk/ippTools/share/warptool_imfile.sql =================================================================== --- trunk/ippTools/share/warptool_imfile.sql (revision 17938) +++ trunk/ippTools/share/warptool_imfile.sql (revision 18029) @@ -1,18 +1,26 @@ SELECT DISTINCT rawImfile.*, - warpRun.cam_id, + warpRun.fake_id, chipProcessedImfile.uri as chip_uri, chipProcessedImfile.path_base as chip_path_base, camProcessedExp.path_base as cam_path_base FROM warpRun +JOIN fakeRun + USING(fake_id) +JOIN camRun + USING(cam_id) JOIN camProcessedExp USING(cam_id) JOIN chipRun - ON camProcessedExp.chip_id = chipRun.chip_id + ON camRun.chip_id = chipRun.chip_id JOIN chipProcessedImfile - ON camProcessedExp.chip_id = chipProcessedImfile.chip_id + ON chipRun.chip_id = chipProcessedImfile.chip_id JOIN rawImfile -- is there any reason not to refer back to rawimfiles? - ON chipProcessedImfile.exp_id = rawImfile.exp_id AND chipProcessedImfile.class_id = rawImfile.class_id + ON chipProcessedImfile.exp_id = rawImfile.exp_id + AND chipProcessedImfile.class_id = rawImfile.class_id WHERE warpRun.state = 'run' + AND fakeRun.state = 'stop' + AND camRun.state = 'stop' + AND chipRun.state = 'stop' Index: trunk/ippTools/share/warptool_revertwarped.sql =================================================================== --- trunk/ippTools/share/warptool_revertwarped.sql (revision 17938) +++ trunk/ippTools/share/warptool_revertwarped.sql (revision 18029) @@ -1,7 +1,8 @@ DELETE FROM warpSkyfile -USING warpSkyfile, warpRun, camRun, chipRun, rawExp +USING warpSkyfile, warpRun, fakeRun, camRun, chipRun, rawExp WHERE warpSkyfile.warp_id = warpRun.warp_id - AND warpRun.cam_id = camRun.cam_id + AND warpRun.fake_id = fakeRun.fake_id + AND fakeRun.cam_id = camRun.cam_id AND camRun.chip_id = chipRun.chip_id AND chipRun.exp_id = rawExp.exp_id Index: trunk/ippTools/share/warptool_scmap.sql =================================================================== --- trunk/ippTools/share/warptool_scmap.sql (revision 17938) +++ trunk/ippTools/share/warptool_scmap.sql (revision 18029) @@ -7,10 +7,18 @@ JOIN warpSkyCellMap USING(warp_id) +JOIN fakeRun + USING(fake_id) +JOIN camRun + USING(cam_id) JOIN camProcessedExp - ON warpSkyCellMap.cam_id = camProcessedExp.cam_id + USING(cam_id) +JOIN chipRun + USING(chip_id) JOIN chipProcessedImfile - ON camProcessedExp.chip_id = chipProcessedImfile.chip_id + ON chipRun.chip_id = chipProcessedImfile.chip_id AND warpSkyCellMap.class_id = chipProcessedImfile.class_id --- move this as an option into the code --- WHERE +WHERE -- warpRun.state = 'run' + fakeRun.state = 'stop' + AND camRun.state = 'stop' + AND chipRun.state = 'stop' Index: trunk/ippTools/share/warptool_tooverlap.sql =================================================================== --- trunk/ippTools/share/warptool_tooverlap.sql (revision 17938) +++ trunk/ippTools/share/warptool_tooverlap.sql (revision 18029) @@ -1,5 +1,5 @@ SELECT warpRun.warp_id, - warpRun.cam_id, + warpRun.fake_id, warpRun.workdir, warpRun.tess_id, @@ -9,5 +9,7 @@ warpRun.magiced FROM warpRun -JOIN camProcessedExp +JOIN fakeRun + USING(fake_id) +JOIN camRun USING(cam_id) JOIN chipRun @@ -16,11 +18,12 @@ USING(exp_id) LEFT JOIN warpSkyCellMap - USING(warp_id, cam_id) + USING(warp_id) LEFT JOIN warpMask ON warpRun.label = warpMask.label WHERE warpRun.state = 'run' - AND camProcessedExp.fault = 0 + AND fakeRun.state = 'stop' + AND camRun.state = 'stop' + AND chipRun.state = 'stop' AND warpSkyCellMap.warp_id IS NULL - AND warpSkyCellMap.cam_id IS NULL AND warpMask.label IS NULL Index: trunk/ippTools/share/warptool_towarped.sql =================================================================== --- trunk/ippTools/share/warptool_towarped.sql (revision 17938) +++ trunk/ippTools/share/warptool_towarped.sql (revision 18029) @@ -3,5 +3,6 @@ warpSkyCellMap.skycell_id, warpSkyCellMap.tess_id, - warpSkyCellMap.cam_id, + warpRun.fake_id, + camRun.cam_id, rawExp.camera, warpRun.workdir @@ -9,12 +10,14 @@ JOIN warpSkyCellMap USING(warp_id) -JOIN camProcessedExp - ON warpSkyCellMap.cam_id = camProcessedExp.cam_id +JOIN fakeRun + USING(fake_id) +JOIN camRun + USING(cam_id) JOIN chipRun - ON camProcessedExp.chip_id = chipRun.chip_id + USING(chip_id) JOIN chipProcessedImfile - ON chipRun.chip_id = chipProcessedImfile.chip_id + USING(chip_id) JOIN rawExp - ON chipProcessedImfile.exp_id = rawExp.exp_id + ON chipRun.exp_id = rawExp.exp_id LEFT JOIN warpSkyfile ON warpRun.warp_id = warpSkyfile.warp_id @@ -25,4 +28,7 @@ WHERE warpRun.state = 'run' + AND fakeRun.state = 'stop' + AND camRun.state = 'stop' + AND chipRun.state = 'stop' AND warpSkyfile.warp_id IS NULL AND warpSkyfile.skycell_id IS NULL