Index: trunk/ippTools/share/chiptool_completely_processed_exp.sql =================================================================== --- trunk/ippTools/share/chiptool_completely_processed_exp.sql (revision 23661) +++ trunk/ippTools/share/chiptool_completely_processed_exp.sql (revision 23688) @@ -35,3 +35,4 @@ COUNT(rawImfile.class_id) = COUNT(chipProcessedImfile.class_id) AND SUM(chipProcessedImfile.fault) = 0 + AND SUM(chipProcessedImfile.quality > 0) != COUNT(*) ) as Foo Index: trunk/ippTools/share/difftool_definebyquery.sql =================================================================== --- trunk/ippTools/share/difftool_definebyquery.sql (revision 23661) +++ trunk/ippTools/share/difftool_definebyquery.sql (revision 23688) @@ -38,5 +38,5 @@ WHERE warpSkyfile.fault = 0 - AND warpSkyfile.ignored = 0 + AND warpSkyfile.quality = 0 -- warpsToDiff WHERE hook %s ) AS warpsToDiff @@ -51,4 +51,5 @@ WHERE stackRun.state = 'full' AND stackSumSkyfile.fault = 0 + AND stackSumSkyfile.quality = 0 -- stacksForDiff WHERE hook %s GROUP BY Index: trunk/ippTools/share/difftool_definebyquery_part1.sql =================================================================== --- trunk/ippTools/share/difftool_definebyquery_part1.sql (revision 23661) +++ trunk/ippTools/share/difftool_definebyquery_part1.sql (revision 23688) @@ -1,22 +1,21 @@ - SELECT - exp_id, - warp_id, - rawExp.filter, - warpRun.label, - warpRun.tess_id, - count(skycell_id) as skycell_count - FROM warpRun - JOIN warpSkyfile USING(warp_id) - JOIN fakeRun USING(fake_id) - JOIN camRun USING(cam_id) - JOIN chipRun USING (chip_id) - JOIN rawExp USING(exp_id) - LEFT JOIN diffRun USING(exp_id) - - WHERE - warpSkyfile.ignored = 0 - -- warp where hook %s - -- exp where hook %s - -- diff where hook %s - - GROUP BY exp_id, warp_id DESC +SELECT + exp_id, + warp_id, + rawExp.filter, + warpRun.label, + warpRun.tess_id, + COUNT(skycell_id) as skycell_count +FROM warpRun +JOIN warpSkyfile USING(warp_id) +JOIN fakeRun USING(fake_id) +JOIN camRun USING(cam_id) +JOIN chipRun USING(chip_id) +JOIN rawExp USING(exp_id) +LEFT JOIN diffRun USING(exp_id) +WHERE + warpSkyfile.fault = 0 + AND warpSkyfile.quality = 0 + -- warp where hook %s + -- exp where hook %s + -- diff where hook %s +GROUP BY exp_id, warp_id DESC Index: trunk/ippTools/share/difftool_definebyquery_part2.sql =================================================================== --- trunk/ippTools/share/difftool_definebyquery_part2.sql (revision 23661) +++ trunk/ippTools/share/difftool_definebyquery_part2.sql (revision 23688) @@ -1,36 +1,36 @@ -- insert skycells to diff INSERT INTO skycellsToDiff +SELECT + 0, -- diff_id + warpSkyfile.skycell_id, + warpSkyfile.warp_id, -- warp1 + NULL, -- stack1 + NULL, -- warp2 + max_stack_id, -- stack2 + warpSkyfile.tess_id, + 0 +FROM warpSkyfile +JOIN warpRun USING(warp_id) +LEFT JOIN ( SELECT - 0, -- diff_id - warpSkyfile.skycell_id, - warpSkyfile.warp_id, -- warp1 - NULL, -- stack1 - NULL, -- warp2 - max_stack_id, -- stack2 - warpSkyfile.tess_id, - 0 - FROM warpSkyfile - JOIN warpRun USING(warp_id) - LEFT JOIN ( - SELECT - MAX(stack_id) AS max_stack_id, -- most recent stack, by virtue of auto-increment - stackRun.skycell_id, - stackRun.tess_id, - filter - FROM stackRun - JOIN stackSumSkyfile USING(stack_id) - WHERE stackSumSkyfile.fault = 0 - AND stackRun.state = 'full' - -- stacks where hook %s - GROUP BY - skycell_id, - filter - ) as bestStacks - USING(skycell_id) - WHERE - warpSkyfile.warp_id = %lld - AND ignored = 0 - AND filter = '%s' - AND warpSkyfile.tess_id = bestStacks.tess_id - -- (good fraction test goes here for example also above) - -- warp where hook %s + MAX(stack_id) AS max_stack_id, -- most recent stack, by virtue of auto-increment + stackRun.skycell_id, + stackRun.tess_id, + filter + FROM stackRun + JOIN stackSumSkyfile USING(stack_id) + WHERE stackSumSkyfile.fault = 0 + AND stackSumSkyfile.quality = 0 + AND stackRun.state = 'full' + -- stacks where hook %s + GROUP BY + skycell_id, + filter + ) as bestStacks USING(skycell_id) +WHERE + warpSkyfile.warp_id = %lld + AND warpSkyfile.fault = 0 + AND warpSkyfile.quality = 0 + AND filter = '%s' + AND warpSkyfile.tess_id = bestStacks.tess_id +-- warp where hook %s Index: trunk/ippTools/share/difftool_definewarpwarp_insert.sql =================================================================== --- trunk/ippTools/share/difftool_definewarpwarp_insert.sql (revision 23661) +++ trunk/ippTools/share/difftool_definewarpwarp_insert.sql (revision 23688) @@ -11,6 +11,6 @@ FROM warpSkyfile AS inputWarpSkyfile JOIN warpSkyfile AS templateWarpSkyfile USING(skycell_id, tess_id) -WHERE inputWarpSkyfile.ignored = 0 - AND templateWarpSkyfile.ignored = 0 +WHERE inputWarpSkyfile.quality = 0 + AND templateWarpSkyfile.quality = 0 AND inputWarpSkyfile.warp_id = %s AND templateWarpSkyfile.warp_id = %s Index: trunk/ippTools/share/difftool_todiffskyfile.sql =================================================================== --- trunk/ippTools/share/difftool_todiffskyfile.sql (revision 23661) +++ trunk/ippTools/share/difftool_todiffskyfile.sql (revision 23688) @@ -63,5 +63,6 @@ AND diffSkyfile.diff_id IS NULL) OR (diffRun.state = 'update' - AND diffSkyfile.fault = 0) + AND diffSkyfile.fault = 0 + AND diffSkyfile.quality = 0) ) -- Ensure input warps are available @@ -69,18 +70,20 @@ OR (warpRun.state = 'full' AND warpSkyfile.fault = 0 - AND warpSkyfile.ignored = 0)) + AND warpSkyfile.quality = 0)) -- Ensure input stacks are available AND (diffInputSkyfile.stack1 IS NULL OR (stackRun.state = 'full' - AND stackSumSkyfile.fault = 0)) + AND stackSumSkyfile.fault = 0 + AND stackSumSkyfile.quality = 0)) -- Ensure template warps are available AND (diffInputSkyfile.warp2 IS NULL OR (warpTemplateRun.state = 'full' AND warpTemplateSkyfile.fault = 0 - AND warpTemplateSkyfile.ignored = 0)) + AND warpTemplateSkyfile.quality = 0)) -- Ensure template stacks are available AND (diffInputSkyfile.stack2 IS NULL OR (stackTemplateRun.state = 'full' - AND stackTemplateSkyfile.fault = 0)) + AND stackTemplateSkyfile.fault = 0 + AND stackTemplateSkyfile.quality = 0)) Index: trunk/ippTools/share/disttool_toadvance.sql =================================================================== --- trunk/ippTools/share/disttool_toadvance.sql (revision 23661) +++ trunk/ippTools/share/disttool_toadvance.sql (revision 23688) @@ -7,5 +7,5 @@ ( -- raw stage -SELECT +SELECT distRun.dist_id, stage, @@ -29,5 +29,5 @@ UNION -- chip stage -SELECT +SELECT distRun.dist_id, stage, @@ -51,5 +51,5 @@ UNION -- warp stage -SELECT +SELECT distRun.dist_id, stage, @@ -66,5 +66,5 @@ AND distRun.stage = 'warp' -- AND warpSkyfile.fault = 0 --- AND warpSkyfile.ignored = 0 +-- AND warpSkyfile.quality = 0 GROUP BY distRun.dist_id, @@ -99,5 +99,5 @@ UNION -- stack stage -SELECT +SELECT distRun.dist_id, stage, Index: trunk/ippTools/share/flatcorr_completely_processed_chiprun.sql =================================================================== --- trunk/ippTools/share/flatcorr_completely_processed_chiprun.sql (revision 23661) +++ trunk/ippTools/share/flatcorr_completely_processed_chiprun.sql (revision 23688) @@ -14,5 +14,5 @@ dvodb FROM - (SELECT + (SELECT chipRun.*, rawImfile.class_id as rawimfile_class_id, @@ -33,4 +33,5 @@ COUNT(rawImfile.class_id) = COUNT(chipProcessedImfile.class_id) AND SUM(chipProcessedImfile.fault) = 0 - ) as Foo + AND SUM(chipProcessedImfile.quality > 0) != COUNT(*) + ) as Foo ) as Bar Index: trunk/ippTools/share/flatcorr_pending.sql =================================================================== --- trunk/ippTools/share/flatcorr_pending.sql (revision 23661) +++ trunk/ippTools/share/flatcorr_pending.sql (revision 23688) @@ -1,3 +1,3 @@ -SELECT +SELECT * FROM @@ -21,4 +21,4 @@ HAVING COUNT(rawImfile.class_id) = COUNT(chipProcessedImfile.class_id) - AND SUM(chipProcessedImfile.fault) = 0 + AND SUM(chipProcessedImfile.fault > 0) = 0 Index: trunk/ippTools/share/magicdstool_completed_runs.sql =================================================================== --- trunk/ippTools/share/magicdstool_completed_runs.sql (revision 23661) +++ trunk/ippTools/share/magicdstool_completed_runs.sql (revision 23688) @@ -4,5 +4,5 @@ ( -- raw stage -SELECT +SELECT magicDSRun.magic_ds_id FROM magicDSRun @@ -22,5 +22,5 @@ UNION -- chip stage -SELECT +SELECT magicDSRun.magic_ds_id FROM magicDSRun @@ -40,5 +40,5 @@ UNION -- warp stage -SELECT +SELECT magicDSRun.magic_ds_id FROM magicDSRun @@ -51,5 +51,5 @@ AND magicDSRun.stage = 'warp' AND warpSkyfile.fault = 0 - AND warpSkyfile.ignored = 0 + AND warpSkyfile.quality = 0 GROUP BY magicDSRun.magic_ds_id, @@ -75,4 +75,5 @@ AND magicDSRun.stage = 'diff' AND diffSkyfile.fault = 0 + AND diffSkyfile.quality = 0 GROUP BY magicDSRun.magic_ds_id, Index: trunk/ippTools/share/magicdstool_getskycells.sql =================================================================== --- trunk/ippTools/share/magicdstool_getskycells.sql (revision 23661) +++ trunk/ippTools/share/magicdstool_getskycells.sql (revision 23688) @@ -21,6 +21,7 @@ ON warpSkyfile.warp_id = warpSkyCellMap.warp_id AND warpSkyfile.skycell_id = warpSkyCellMap.skycell_id - AND warpSkyfile.ignored = 0 + AND warpSkyfile.quality = 0 WHERE diffSkyfile.fault = 0 + AND diffSkyfile.quality = 0 AND magic_ds_id = %lld Index: trunk/ippTools/share/magicdstool_todestreak.sql =================================================================== --- trunk/ippTools/share/magicdstool_todestreak.sql (revision 23661) +++ trunk/ippTools/share/magicdstool_todestreak.sql (revision 23688) @@ -61,4 +61,5 @@ AND chipRun.state = 'full' AND chipProcessedImfile.fault = 0 + AND chipProcessedImfile.quality = 0 AND magicDSFile.component IS NULL UNION @@ -95,5 +96,5 @@ AND warpRun.state = 'full' AND warpSkyfile.fault = 0 - AND warpSkyfile.ignored = 0 + AND warpSkyfile.quality = 0 AND magicDSFile.component IS NULL UNION @@ -130,4 +131,5 @@ AND magicDSRun.stage = 'diff' AND diffSkyfile.fault = 0 + AND diffSkyfile.quality = 0 AND magicDSFile.component IS NULL ) as Foo Index: trunk/ippTools/share/magictool_chipprocessedimfile.sql =================================================================== --- trunk/ippTools/share/magictool_chipprocessedimfile.sql (revision 23661) +++ trunk/ippTools/share/magictool_chipprocessedimfile.sql (revision 23688) @@ -26,4 +26,5 @@ chipRun.state = 'full' AND chipProcessedImfile.fault = 0 + AND chipProcessedImfile.quality = 0 -- AND magicRun.state = 'full' -- AND magicMask.fault = 0 Index: trunk/ippTools/share/magictool_definebyquery.sql =================================================================== --- trunk/ippTools/share/magictool_definebyquery.sql (revision 23661) +++ trunk/ippTools/share/magictool_definebyquery.sql (revision 23688) @@ -45,7 +45,8 @@ WHERE diffSkyfile.fault = 0 + AND diffSkyfile.quality = 0 -- WHERE hook %s -AND exp_id = 36475 -AND diffRun.label = 'magic_2008-11-12' + AND exp_id = 36475 + AND diffRun.label = 'magic_2008-11-12' GROUP BY exp_id, @@ -79,5 +80,5 @@ JOIN diffRun USING(diff_id) WHERE - warpSkyfile.ignored = 0 + warpSkyfile.quality = 0 -- magicSkycellNums WHERE hook %s AND exp_id = 36475 Index: trunk/ippTools/share/magictool_definebyquery_insert.sql =================================================================== --- trunk/ippTools/share/magictool_definebyquery_insert.sql (revision 23661) +++ trunk/ippTools/share/magictool_definebyquery_insert.sql (revision 23688) @@ -9,2 +9,3 @@ diff_id = @DIFF_ID@ -- Update this with the appropriate diff_id AND fault = 0 + AND quality = 0 Index: trunk/ippTools/share/magictool_definebyquery_select_test.sql =================================================================== --- trunk/ippTools/share/magictool_definebyquery_select_test.sql (revision 23661) +++ trunk/ippTools/share/magictool_definebyquery_select_test.sql (revision 23688) @@ -25,5 +25,5 @@ JOIN warpSkyfile USING(warp_id, skycell_id) WHERE - warpSkyfile.ignored = 0 + warpSkyfile.quality = 0 AND warpRun.state = 'full' -- INSERT HERE any additional restrictions (e.g., exp_id, warpSkyfile.good_frac) Index: trunk/ippTools/share/magictool_definebyquery_temp_insert.sql =================================================================== --- trunk/ippTools/share/magictool_definebyquery_temp_insert.sql (revision 23661) +++ trunk/ippTools/share/magictool_definebyquery_temp_insert.sql (revision 23688) @@ -20,4 +20,5 @@ WHERE diffSkyfile.fault = 0 + AND diffSkyfile.quality = 0 -- WHERE hook %s GROUP BY Index: trunk/ippTools/share/magictool_diffskyfile.sql =================================================================== --- trunk/ippTools/share/magictool_diffskyfile.sql (revision 23661) +++ trunk/ippTools/share/magictool_diffskyfile.sql (revision 23688) @@ -20,8 +20,9 @@ ON warpSkyfile.warp_id = warpSkyCellMap.warp_id AND warpSkyfile.skycell_id = warpSkyCellMap.skycell_id - AND warpSkyfile.ignored = 0 + AND warpSkyfile.quality = 0 WHERE diffRun.state = 'full' AND diffSkyfile.fault = 0 + AND diffSkyfile.quality = 0 -- AND magicRun.state = 'full' -- AND magicMask.fault = 0 Index: trunk/ippTools/share/magictool_inputs.sql =================================================================== --- trunk/ippTools/share/magictool_inputs.sql (revision 23661) +++ trunk/ippTools/share/magictool_inputs.sql (revision 23688) @@ -10,4 +10,5 @@ diffSkyfile.path_base, diffSkyfile.fault + diffSkyfile.quality FROM magicRun JOIN magicInputSkyfile @@ -35,2 +36,3 @@ WHERE fault = 0 + AND quality = 0 Index: trunk/ippTools/share/magictool_warpskyfile.sql =================================================================== --- trunk/ippTools/share/magictool_warpskyfile.sql (revision 23661) +++ trunk/ippTools/share/magictool_warpskyfile.sql (revision 23688) @@ -21,4 +21,5 @@ warpRun.state = 'full' AND warpSkyfile.fault = 0 + AND warpSkyfile.quality = 0 -- AND magicRun.state = 'full' -- AND magicMask.fault = 0 Index: trunk/ippTools/share/pxadmin_create_tables.sql =================================================================== --- trunk/ippTools/share/pxadmin_create_tables.sql (revision 23661) +++ trunk/ippTools/share/pxadmin_create_tables.sql (revision 23688) @@ -18,6 +18,6 @@ epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY(exp_name, camera, telescope), - KEY(fault)) -ENGINE=innodb DEFAULT CHARSET=latin1; + KEY(fault) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE summitImfile ( @@ -34,7 +34,6 @@ PRIMARY KEY(exp_name, camera, telescope, class, class_id), KEY(file_id), - FOREIGN KEY (exp_name, camera, telescope) - REFERENCES summitExp(exp_name, camera, telescope)) -ENGINE=innodb DEFAULT CHARSET=latin1; + FOREIGN KEY(exp_name, camera, telescope) REFERENCES summitExp(exp_name, camera, telescope) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE pzDownloadExp ( @@ -46,7 +45,6 @@ PRIMARY KEY(exp_name, camera, telescope), KEY(state), - FOREIGN KEY (exp_name, camera, telescope) - REFERENCES summitExp(exp_name, camera, telescope)) -ENGINE=innodb DEFAULT CHARSET=latin1; + FOREIGN KEY(exp_name, camera, telescope) REFERENCES summitExp(exp_name, camera, telescope) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE pzDownloadImfile ( @@ -62,8 +60,7 @@ PRIMARY KEY(exp_name, camera, telescope, class, class_id), KEY(fault), - FOREIGN KEY (exp_name, camera, telescope) - REFERENCES pzDownloadExp(exp_name, camera, telescope), - FOREIGN KEY (exp_name, camera, telescope, class, class_id) - REFERENCES summitImfile(exp_name, camera, telescope, class, class_id)) ENGINE=innodb DEFAULT CHARSET=latin1; + FOREIGN KEY (exp_name, camera, telescope) REFERENCES pzDownloadExp(exp_name, camera, telescope), + FOREIGN KEY(exp_name, camera, telescope, class, class_id) REFERENCES summitImfile(exp_name, camera, telescope, class, class_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE newExp ( @@ -98,7 +95,6 @@ epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY(exp_id, tmp_class_id), - FOREIGN KEY (exp_id) - REFERENCES newExp(exp_id)) -ENGINE=innodb DEFAULT CHARSET=latin1; + FOREIGN KEY(exp_id) REFERENCES newExp(exp_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE rawExp ( @@ -172,7 +168,6 @@ KEY(end_stage), KEY(fault), - FOREIGN KEY (exp_id) - REFERENCES newExp(exp_id)) -ENGINE=innodb DEFAULT CHARSET=latin1; + FOREIGN KEY(exp_id) REFERENCES newExp(exp_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE rawImfile ( @@ -237,4 +232,5 @@ ignored TINYINT DEFAULT 0, hostname VARCHAR(64), + quality SMALLINT NOT NULL DEFAULT 0, fault SMALLINT NOT NULL, epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP, @@ -245,10 +241,8 @@ KEY(fault), KEY(raw_image_id), + KEY(quality), UNIQUE KEY(exp_id, tmp_class_id), - FOREIGN KEY (exp_id, tmp_class_id) - REFERENCES newImfile(exp_id, tmp_class_id)) -ENGINE=innodb DEFAULT CHARSET=latin1; - -CREATE TABLE guidePendingExp (guide_id BIGINT AUTO_INCREMENT, exp_id BIGINT, recipe VARCHAR(64), PRIMARY KEY(guide_id), KEY(guide_id), KEY(exp_id)) ENGINE=innodb DEFAULT CHARSET=latin1; + FOREIGN KEY(exp_id, tmp_class_id) REFERENCES newImfile(exp_id, tmp_class_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE chipRun ( @@ -273,7 +267,6 @@ KEY(end_stage), INDEX(chip_id, exp_id), - FOREIGN KEY (exp_id) - REFERENCES rawExp(exp_id)) -ENGINE=innodb DEFAULT CHARSET=latin1; + FOREIGN KEY(exp_id) REFERENCES rawExp(exp_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE chipImfile ( @@ -283,6 +276,6 @@ PRIMARY KEY(chip_id, class_id), KEY(chip_imfile_id), - FOREIGN KEY (chip_id) REFERENCES chipRun(chip_id)) -ENGINE=innodb DEFAULT CHARSET=latin1; + FOREIGN KEY(chip_id) REFERENCES chipRun(chip_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE chipProcessedImfile ( @@ -343,4 +336,5 @@ n_cr INT, path_base VARCHAR(255), + quality SMALLINT NOT NULL DEFAULT 0, fault SMALLINT NOT NULL, magicked BIGINT, @@ -348,14 +342,13 @@ KEY(data_state), KEY(fault), - FOREIGN KEY (chip_id, exp_id) - REFERENCES chipRun(chip_id, exp_id), - FOREIGN KEY (exp_id, class_id) - REFERENCES rawImfile(exp_id, class_id)) -ENGINE=innodb DEFAULT CHARSET=latin1; + KEY(quality), + FOREIGN KEY(chip_id, exp_id) REFERENCES chipRun(chip_id, exp_id), + FOREIGN KEY(exp_id, class_id) REFERENCES rawImfile(exp_id, class_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE chipMask ( label VARCHAR(64), - PRIMARY KEY(label)) -ENGINE=innodb DEFAULT CHARSET=latin1; + PRIMARY KEY(label) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE camRun ( @@ -380,7 +373,6 @@ KEY(end_stage), INDEX(cam_id, chip_id), - FOREIGN KEY (chip_id) - REFERENCES chipRun(chip_id)) -ENGINE=innodb DEFAULT CHARSET=latin1; + FOREIGN KEY(chip_id) REFERENCES chipRun(chip_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE camProcessedExp ( @@ -444,15 +436,16 @@ n_astrom INT, path_base VARCHAR(255), + quality SMALLINT NOT NULL DEFAULT 0, fault SMALLINT NOT NULL, PRIMARY KEY(cam_id), KEY(fault), - FOREIGN KEY (cam_id) - REFERENCES camRun(cam_id)) -ENGINE=innodb DEFAULT CHARSET=latin1; + KEY(quality), + FOREIGN KEY(cam_id) REFERENCES camRun(cam_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE camMask ( label VARCHAR(64), - PRIMARY KEY(label)) -ENGINE=innodb DEFAULT CHARSET=latin1; + PRIMARY KEY(label) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE fakeRun ( @@ -475,7 +468,6 @@ KEY(end_stage), INDEX(fake_id, cam_id), - FOREIGN KEY (cam_id) - REFERENCES camRun(cam_id)) -ENGINE=innodb DEFAULT CHARSET=latin1; + FOREIGN KEY(cam_id) REFERENCES camRun(cam_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE fakeProcessedImfile ( @@ -493,14 +485,12 @@ PRIMARY KEY(fake_id, exp_id, class_id), KEY(fault), - FOREIGN KEY (fake_id) - REFERENCES fakeRun(fake_id), - FOREIGN KEY (exp_id, class_id) - REFERENCES rawImfile(exp_id, class_id)) -ENGINE=innodb DEFAULT CHARSET=latin1; + FOREIGN KEY(fake_id) REFERENCES fakeRun(fake_id), + FOREIGN KEY(exp_id, class_id) REFERENCES rawImfile(exp_id, class_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE fakeMask ( label VARCHAR(64), - PRIMARY KEY(label)) -ENGINE=innodb DEFAULT CHARSET=latin1; + PRIMARY KEY(label) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE detRun ( @@ -535,5 +525,4 @@ ref_det_id BIGINT, ref_iter INT, - -- parent INT, :: dropping this PRIMARY KEY(det_id), KEY(det_id), @@ -543,21 +532,18 @@ KEY(state), KEY(label), - -- KEY(parent), :: dropping this - INDEX(det_id, iteration)) -ENGINE=innodb DEFAULT CHARSET=latin1; + INDEX(det_id, iteration) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE detInputExp ( -det_id BIGINT, -iteration INT, -exp_id BIGINT, -include TINYINT, -PRIMARY KEY(det_id, iteration, exp_id), -INDEX(det_id, exp_id), -INDEX(det_id, iteration), -FOREIGN KEY (det_id) -REFERENCES detRun(det_id), -FOREIGN KEY (exp_id) -REFERENCES rawExp(exp_id)) -ENGINE=innodb DEFAULT CHARSET=latin1; + det_id BIGINT, + iteration INT, + exp_id BIGINT, + include TINYINT, + PRIMARY KEY(det_id, iteration, exp_id), + INDEX(det_id, exp_id), + INDEX(det_id, iteration), + FOREIGN KEY(det_id) REFERENCES detRun(det_id), + FOREIGN KEY(exp_id) REFERENCES rawExp(exp_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE detProcessedImfile ( @@ -585,8 +571,6 @@ INDEX(det_id, class_id), INDEX(det_id, exp_id), - FOREIGN KEY (det_id, exp_id) - REFERENCES detInputExp(det_id, exp_id), - FOREIGN KEY (exp_id, class_id) - REFERENCES rawImfile(exp_id, class_id) + FOREIGN KEY(det_id, exp_id) REFERENCES detInputExp(det_id, exp_id), + FOREIGN KEY(exp_id, class_id) REFERENCES rawImfile(exp_id, class_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -611,8 +595,6 @@ PRIMARY KEY(det_id, exp_id), KEY(fault), - FOREIGN KEY (det_id, exp_id) - REFERENCES detInputExp(det_id, exp_id), - FOREIGN KEY (det_id, exp_id) - REFERENCES detProcessedImfile(det_id, exp_id) + FOREIGN KEY(det_id, exp_id) REFERENCES detInputExp(det_id, exp_id), + FOREIGN KEY(det_id, exp_id) REFERENCES detProcessedImfile(det_id, exp_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -635,8 +617,6 @@ PRIMARY KEY(det_id, iteration, class_id), KEY(fault), - FOREIGN KEY (det_id, iteration) - REFERENCES detInputExp(det_id, iteration), - FOREIGN KEY (det_id, class_id) - REFERENCES detProcessedImfile(det_id, class_id) + FOREIGN KEY(det_id, iteration) REFERENCES detInputExp(det_id, iteration), + FOREIGN KEY(det_id, class_id) REFERENCES detProcessedImfile(det_id, class_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -650,8 +630,6 @@ PRIMARY KEY(det_id, iteration, class_id), KEY(fault), - FOREIGN KEY (det_id, iteration) - REFERENCES detInputExp(det_id, iteration), - FOREIGN KEY (det_id, iteration, class_id) - REFERENCES detStackedImfile(det_id, iteration, class_id) + FOREIGN KEY(det_id, iteration) REFERENCES detInputExp(det_id, iteration), + FOREIGN KEY(det_id, iteration, class_id) REFERENCES detStackedImfile(det_id, iteration, class_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -675,8 +653,6 @@ KEY(fault), INDEX(det_id, iteration), - FOREIGN KEY (det_id) - REFERENCES detInputExp(det_id), - FOREIGN KEY (det_id, iteration, class_id) - REFERENCES detNormalizedStatImfile(det_id, iteration, class_id) + FOREIGN KEY(det_id) REFERENCES detInputExp(det_id), + FOREIGN KEY(det_id, iteration, class_id) REFERENCES detNormalizedStatImfile(det_id, iteration, class_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -698,8 +674,6 @@ PRIMARY KEY(det_id, iteration), KEY(fault), - FOREIGN KEY (det_id, iteration) - REFERENCES detInputExp(det_id, iteration), - FOREIGN KEY (det_id, iteration) - REFERENCES detNormalizedImfile(det_id, iteration) + FOREIGN KEY(det_id, iteration) REFERENCES detInputExp(det_id, iteration), + FOREIGN KEY(det_id, iteration) REFERENCES detNormalizedImfile(det_id, iteration) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -736,8 +710,6 @@ KEY(fault), INDEX(det_id, iteration, exp_id), - FOREIGN KEY (det_id, iteration, exp_id) - REFERENCES detInputExp(det_id, iteration, exp_id), - FOREIGN KEY (det_id, exp_id, class_id) - REFERENCES detProcessedImfile(det_id, exp_id, class_id) + FOREIGN KEY (det_id, iteration, exp_id) REFERENCES detInputExp(det_id, iteration, exp_id), + FOREIGN KEY (det_id, exp_id, class_id) REFERENCES detProcessedImfile(det_id, exp_id, class_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -771,8 +743,6 @@ KEY(fault), INDEX(det_id, iteration), - FOREIGN KEY (det_id, iteration, exp_id) - REFERENCES detInputExp(det_id, iteration, exp_id), - FOREIGN KEY (det_id, iteration, exp_id) - REFERENCES detResidImfile(det_id, iteration, exp_id) + FOREIGN KEY(det_id, iteration, exp_id) REFERENCES detInputExp(det_id, iteration, exp_id), + FOREIGN KEY(det_id, iteration, exp_id) REFERENCES detResidImfile(det_id, iteration, exp_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -788,8 +758,6 @@ PRIMARY KEY(det_id, iteration), KEY(fault), - FOREIGN KEY (det_id, iteration) - REFERENCES detInputExp(det_id, iteration), - FOREIGN KEY (det_id, iteration) - REFERENCES detResidExp(det_id, iteration) + FOREIGN KEY(det_id, iteration) REFERENCES detInputExp(det_id, iteration), + FOREIGN KEY(det_id, iteration) REFERENCES detResidExp(det_id, iteration) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -812,6 +780,5 @@ PRIMARY KEY(det_id, iteration, class_id), KEY(fault), - FOREIGN KEY (det_id, iteration) - REFERENCES detRun(det_id, iteration) + FOREIGN KEY(det_id, iteration) REFERENCES detRun(det_id, iteration) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -838,6 +805,5 @@ KEY(end_stage), INDEX(warp_id, fake_id), - FOREIGN KEY (fake_id) - REFERENCES fakeRun(fake_id) + FOREIGN KEY(fake_id) REFERENCES fakeRun(fake_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -850,6 +816,5 @@ PRIMARY KEY(warp_id, skycell_id, tess_id, class_id), KEY(fault), - FOREIGN KEY (warp_id) - REFERENCES warpRun(warp_id) + FOREIGN KEY(warp_id) REFERENCES warpRun(warp_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -860,6 +825,6 @@ PRIMARY KEY(warp_id, skycell_id), KEY(warp_skyfile_id), - FOREIGN KEY (warp_id) REFERENCES warpRun(warp_id)) -ENGINE=innodb DEFAULT CHARSET=latin1; + FOREIGN KEY(warp_id) REFERENCES warpRun(warp_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -881,12 +846,12 @@ ymin INT, ymax INT, - ignored TINYINT, + quality SMALLINT NOT NULL DEFAULT 0, fault SMALLINT, magicked TINYINT, 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) + KEY(fault), + KEY(quality), + FOREIGN KEY(warp_id, skycell_id, tess_id) REFERENCES warpSkyCellMap(warp_id, skycell_id, tess_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -918,6 +883,6 @@ 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) + FOREIGN KEY(stack_id) REFERENCES stackRun(stack_id), + FOREIGN KEY(warp_id) REFERENCES warpSkyfile(warp_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -948,4 +913,5 @@ hostname VARCHAR(64), good_frac FLOAT, + quality SMALLINT NOT NULL DEFAULT 0, fault SMALLINT, PRIMARY KEY(stack_id), @@ -953,5 +919,6 @@ KEY(good_frac), KEY(fault), - FOREIGN KEY (stack_id) REFERENCES stackRun(stack_id) + KEY(quality), + FOREIGN KEY(stack_id) REFERENCES stackRun(stack_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -971,5 +938,5 @@ KEY(state), KEY(tess_id), - FOREIGN KEY (exp_id) REFERENCES rawExp(exp_id) + FOREIGN KEY(exp_id) REFERENCES rawExp(exp_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -991,9 +958,9 @@ KEY(skycell_id), KEY(tess_id), - FOREIGN KEY (diff_id) REFERENCES diffRun(diff_id), - FOREIGN KEY (warp1, skycell_id, tess_id) REFERENCES warpSkyfile(warp_id, skycell_id, tess_id), - FOREIGN KEY (warp2, skycell_id, tess_id) REFERENCES warpSkyfile(warp_id, skycell_id, tess_id), - FOREIGN KEY (stack1) REFERENCES stackSumSkyfile(stack_id), - FOREIGN KEY (stack2) REFERENCES stackSumSkyfile(stack_id) + FOREIGN KEY(diff_id) REFERENCES diffRun(diff_id), + FOREIGN KEY(warp1, skycell_id, tess_id) REFERENCES warpSkyfile(warp_id, skycell_id, tess_id), + FOREIGN KEY(warp2, skycell_id, tess_id) REFERENCES warpSkyfile(warp_id, skycell_id, tess_id), + FOREIGN KEY(stack1) REFERENCES stackSumSkyfile(stack_id), + FOREIGN KEY(stack2) REFERENCES stackSumSkyfile(stack_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -1022,4 +989,5 @@ hostname VARCHAR(64), good_frac FLOAT, + quality SMALLINT NOT NULL DEFAULT 0, fault SMALLINT, magicked TINYINT, @@ -1027,5 +995,6 @@ KEY(good_frac), KEY(fault), - FOREIGN KEY (diff_id) REFERENCES diffRun(diff_id) + KEY(quality), + FOREIGN KEY(diff_id) REFERENCES diffRun(diff_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -1047,6 +1016,6 @@ KEY(label), KEY(fault), - FOREIGN KEY (exp_id) REFERENCES rawExp(exp_id), - FOREIGN KEY (diff_id) REFERENCES diffRun(diff_id) + FOREIGN KEY(exp_id) REFERENCES rawExp(exp_id), + FOREIGN KEY(diff_id) REFERENCES diffRun(diff_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -1056,6 +1025,6 @@ node VARCHAR(64), PRIMARY KEY(magic_id, diff_id, node), - FOREIGN KEY (magic_id) REFERENCES magicRun(magic_id), - FOREIGN KEY (diff_id) REFERENCES diffRun(diff_id) + FOREIGN KEY(magic_id) REFERENCES magicRun(magic_id), + FOREIGN KEY(diff_id) REFERENCES diffRun(diff_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -1068,5 +1037,5 @@ KEY(dep), INDEX(magic_id, node), - FOREIGN KEY (magic_id) REFERENCES magicRun(magic_id) + FOREIGN KEY(magic_id) REFERENCES magicRun(magic_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -1077,6 +1046,6 @@ fault SMALLINT, PRIMARY KEY(magic_id, node), - FOREIGN KEY (magic_id) REFERENCES magicRun(magic_id), - FOREIGN KEY (magic_id, node) REFERENCES magicTree(magic_id, node), + FOREIGN KEY(magic_id) REFERENCES magicRun(magic_id), + FOREIGN KEY(magic_id, node) REFERENCES magicTree(magic_id, node), KEY(fault) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -1088,5 +1057,5 @@ fault SMALLINT, PRIMARY KEY(magic_id), - FOREIGN KEY (magic_id) REFERENCES magicRun(magic_id), + FOREIGN KEY(magic_id) REFERENCES magicRun(magic_id), KEY(fault) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -1109,5 +1078,5 @@ KEY(magic_id), KEY(label), - FOREIGN KEY (magic_id) REFERENCES magicRun(magic_id) + FOREIGN KEY(magic_id) REFERENCES magicRun(magic_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -1120,5 +1089,5 @@ PRIMARY KEY(magic_ds_id, component), KEY(fault), - FOREIGN KEY (magic_ds_id) REFERENCES magicDSRun(magic_ds_id) + FOREIGN KEY(magic_ds_id) REFERENCES magicDSRun(magic_ds_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -1139,5 +1108,5 @@ KEY(cal_id), KEY(last_step), - FOREIGN KEY (cal_id) REFERENCES calDB(cal_id) + FOREIGN KEY(cal_id) REFERENCES calDB(cal_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -1167,6 +1136,6 @@ include TINYINT, PRIMARY KEY(corr_id, chip_id), - FOREIGN KEY (corr_id) REFERENCES flatcorrRun(corr_id), - FOREIGN KEY (chip_id) REFERENCES chipRun(chip_id) + FOREIGN KEY(corr_id) REFERENCES flatcorrRun(corr_id), + FOREIGN KEY(chip_id) REFERENCES chipRun(chip_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -1177,7 +1146,7 @@ include TINYINT, PRIMARY KEY(corr_id, cam_id), - FOREIGN KEY (corr_id) REFERENCES flatcorrRun(corr_id), - FOREIGN KEY (chip_id) REFERENCES chipRun(chip_id), - FOREIGN KEY (cam_id) REFERENCES camRun(cam_id) + FOREIGN KEY(corr_id) REFERENCES flatcorrRun(corr_id), + FOREIGN KEY(chip_id) REFERENCES chipRun(chip_id), + FOREIGN KEY(cam_id) REFERENCES camRun(cam_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; @@ -1231,9 +1200,9 @@ PRIMARY KEY(job_id, req_id), KEY(job_id), - FOREIGN KEY (req_id) REFERENCES pstampRequest(req_id) + FOREIGN KEY(req_id) REFERENCES pstampRequest(req_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; CREATE TABLE distTarget ( - target_id BIGINT AUTO_INCREMENT, + target_id BIGINT AUTO_INCREMENT, obs_mode VARCHAR(64), stage VARCHAR(64), @@ -1263,5 +1232,5 @@ CREATE TABLE distComponent ( - dist_id BIGINT, + dist_id BIGINT, component VARCHAR(64), bytes INT, @@ -1335,4 +1304,4 @@ --- This comment line is here to avoid empty query error. +-- This comment line is here to avoid empty query error. -- Another way to avoid that problem is to omit the semicolon above but I think that is untidy. Index: trunk/ippTools/share/pxadmin_drop_tables.sql =================================================================== --- trunk/ippTools/share/pxadmin_drop_tables.sql (revision 23661) +++ trunk/ippTools/share/pxadmin_drop_tables.sql (revision 23688) @@ -1,3 +1,4 @@ SET FOREIGN_KEY_CHECKS=0; + DROP TABLE IF EXISTS pzDataStore; DROP TABLE IF EXISTS summitExp; @@ -9,5 +10,4 @@ DROP TABLE IF EXISTS rawExp; DROP TABLE IF EXISTS rawImfile; -DROP TABLE IF EXISTS guidePendingExp; DROP TABLE IF EXISTS chipRun; DROP TABLE IF EXISTS chipProcessedImfile; Index: trunk/ippTools/share/stacktool_definebyquery_insert.sql =================================================================== --- trunk/ippTools/share/stacktool_definebyquery_insert.sql (revision 23661) +++ trunk/ippTools/share/stacktool_definebyquery_insert.sql (revision 23688) @@ -21,3 +21,3 @@ AND rawExp.filter = '%s' AND warpSkyfile.fault = 0 - AND warpSkyfile.ignored = 0 + AND warpSkyfile.quality = 0 Index: trunk/ippTools/share/stacktool_definebyquery_insert_random_part1.sql =================================================================== --- trunk/ippTools/share/stacktool_definebyquery_insert_random_part1.sql (revision 23661) +++ trunk/ippTools/share/stacktool_definebyquery_insert_random_part1.sql (revision 23688) @@ -28,5 +28,5 @@ AND rawExp.filter = '%s' -- the result of the query is grouped by filter and inserted for one at a time AND warpSkyfile.fault = 0 - AND warpSkyfile.ignored = 0 + AND warpSkyfile.quality = 0 -- Put additional constraints here -- stacktool_definebyquery_insert_random_part2.sql goes here Index: trunk/ippTools/share/stacktool_definebyquery_part1.sql =================================================================== --- trunk/ippTools/share/stacktool_definebyquery_part1.sql (revision 23661) +++ trunk/ippTools/share/stacktool_definebyquery_part1.sql (revision 23688) @@ -17,13 +17,13 @@ COUNT(warpSkyfile.skycell_id) AS num_warp -- number of warps that can be stacked FROM warpRun - JOIN warpSkyfile USING(warp_id) - JOIN fakeRun USING(fake_id) - JOIN camRun USING(cam_id) - JOIN chipRun USING(chip_id) - JOIN rawExp USING(exp_id) + JOIN warpSkyfile USING(warp_id) + JOIN fakeRun USING(fake_id) + JOIN camRun USING(cam_id) + JOIN chipRun USING(chip_id) + JOIN rawExp USING(exp_id) WHERE warpRun.state = 'full' - AND warpSkyfile.ignored = 0 - AND warpSkyfile.fault = 0 + AND warpSkyfile.fault = 0 + AND warpSkyfile.quality = 0 -- Here should follow the SQL in stacktool_definebyquery_part2.sql, -- after any additional WHERE conditions have been added Index: trunk/ippTools/share/stacktool_definebyquery_test.sql =================================================================== --- trunk/ippTools/share/stacktool_definebyquery_test.sql (revision 23661) +++ trunk/ippTools/share/stacktool_definebyquery_test.sql (revision 23688) @@ -31,5 +31,5 @@ WHERE warpRun.state = 'full' - AND warpSkyfile.ignored = 0 + AND warpSkyfile.quality = 0 AND warpSkyfile.fault = 0 -- Any additional selection on warps/exposures goes here Index: trunk/ippTools/share/stacktool_find_complete_warps.sql =================================================================== --- trunk/ippTools/share/stacktool_find_complete_warps.sql (revision 23661) +++ trunk/ippTools/share/stacktool_find_complete_warps.sql (revision 23688) @@ -6,5 +6,5 @@ COUNT(stackRun.stack_id) AS num_extant FROM warpRun -JOIN warpSkyfile +JOIN warpSkyfile USING(warp_id) JOIN fakeRun @@ -23,5 +23,6 @@ WHERE warpRun.state = 'full' - AND warpSkyfile.ignored = 0 + AND warpSkyfile.fault = 0 + AND warpSkyfile.quality = 0 GROUP BY warpSkyfile.skycell_id, stackRun.stack_id Index: trunk/ippTools/share/stacktool_tosum.sql =================================================================== --- trunk/ippTools/share/stacktool_tosum.sql (revision 23661) +++ trunk/ippTools/share/stacktool_tosum.sql (revision 23688) @@ -12,7 +12,4 @@ USING(stack_id) WHERE - ((stackRun.state = 'new' - AND stackSumSkyfile.stack_id IS NULL) - OR - (stackRun.state = 'update' - AND stackSumSkyfile.fault = 0)) + ((stackRun.state = 'new' AND stackSumSkyfile.stack_id IS NULL) + OR (stackRun.state = 'update' AND stackSumSkyfile.fault = 0 AND stackSumSkyfile.quality = 0)) Index: trunk/ippTools/share/warptool_finished_run_select.sql =================================================================== --- trunk/ippTools/share/warptool_finished_run_select.sql (revision 23661) +++ trunk/ippTools/share/warptool_finished_run_select.sql (revision 23688) @@ -19,4 +19,4 @@ HAVING COUNT(warpSkyCellMap.warp_id) = COUNT(warpSkyfile.warp_id) - AND SUM(warpSkyfile.fault) = 0 + AND SUM(warpSkyfile.fault > 0) = 0 ) as Foo Index: trunk/ippTools/share/warptool_imfile.sql =================================================================== --- trunk/ippTools/share/warptool_imfile.sql (revision 23661) +++ trunk/ippTools/share/warptool_imfile.sql (revision 23688) @@ -26,3 +26,5 @@ AND camRun.state = 'full' AND chipRun.state = 'full' + AND chipProcessedImfile.quality = 0 + and camProcessedExp.quality = 0 Index: trunk/ippTools/share/warptool_revertwarped_delete.sql =================================================================== --- trunk/ippTools/share/warptool_revertwarped_delete.sql (revision 23661) +++ trunk/ippTools/share/warptool_revertwarped_delete.sql (revision 23688) @@ -7,2 +7,3 @@ AND chipRun.exp_id = rawExp.exp_id AND warpSkyfile.fault != 0 +