Index: /trunk/dbconfig/changes.txt =================================================================== --- /trunk/dbconfig/changes.txt (revision 20607) +++ /trunk/dbconfig/changes.txt (revision 20608) @@ -683,2 +683,5 @@ ALTER TABLE flatcorrChipLink ADD COLUMN include tinyint after chip_id; ALTER TABLE flatcorrCamLink ADD COLUMN include tinyint after cam_id; + +ALTER TABLE rawImfile ADD COLUMN ignored TINYINT AFTER moon_phase; + Index: /trunk/dbconfig/tasks.md =================================================================== --- /trunk/dbconfig/tasks.md (revision 20607) +++ /trunk/dbconfig/tasks.md (revision 20608) @@ -1,3 +1,3 @@ -# $Id: tasks.md,v 1.157 2008-10-22 02:39:15 bills Exp $ +# $Id: tasks.md,v 1.158 2008-11-09 23:51:01 price Exp $ # this table records all exposure ID ever seen from the summit @@ -235,4 +235,5 @@ moon_alt F32 0.0 moon_phase F32 0.0 + ignored BOOL FALSE hostname STR 64 fault S16 0 # Key NOT NULL Index: /trunk/ippTools/share/chiptool_completely_processed_exp.sql =================================================================== --- /trunk/ippTools/share/chiptool_completely_processed_exp.sql (revision 20607) +++ /trunk/ippTools/share/chiptool_completely_processed_exp.sql (revision 20608) @@ -13,5 +13,5 @@ end_stage FROM - (SELECT + (SELECT chipRun.*, rawImfile.class_id as rawimfile_class_id, @@ -19,5 +19,6 @@ FROM chipRun JOIN rawImfile - USING(exp_id) + ON chipRun.exp_id = rawImfile.exp_id + AND rawImfile.ignored = 0 LEFT JOIN chipProcessedImfile ON chipRun.chip_id = chipProcessedImfile.chip_id Index: /trunk/ippTools/share/chiptool_pendingimfile.sql =================================================================== --- /trunk/ippTools/share/chiptool_pendingimfile.sql (revision 20607) +++ /trunk/ippTools/share/chiptool_pendingimfile.sql (revision 20608) @@ -12,5 +12,6 @@ USING(exp_id) JOIN rawImfile - USING(exp_id) + ON rawExp.exp_id = rawImfile.exp_id + AND rawImfile.ignored = 0 LEFT JOIN chipProcessedImfile ON chipRun.chip_id = chipProcessedImfile.chip_id Index: /trunk/ippTools/share/faketool_completely_processed_exp.sql =================================================================== --- /trunk/ippTools/share/faketool_completely_processed_exp.sql (revision 20607) +++ /trunk/ippTools/share/faketool_completely_processed_exp.sql (revision 20608) @@ -13,5 +13,5 @@ epoch FROM - (SELECT + (SELECT fakeRun.*, rawImfile.class_id as rawimfile_class_id, @@ -25,5 +25,6 @@ USING(exp_id) JOIN rawImfile - USING(exp_id) + ON rawImfile.exp_id = rawExp.exp_id + AND rawImfile.ignored = 0 LEFT JOIN fakeProcessedImfile ON fakeRun.fake_id = fakeProcessedImfile.fake_id Index: /trunk/ippTools/share/pxadmin_create_tables.sql =================================================================== --- /trunk/ippTools/share/pxadmin_create_tables.sql (revision 20607) +++ /trunk/ippTools/share/pxadmin_create_tables.sql (revision 20608) @@ -234,4 +234,5 @@ moon_alt FLOAT, moon_phase FLOAT, + ignored TINYINT DEFAULT 0, hostname VARCHAR(64), fault SMALLINT NOT NULL, @@ -1081,7 +1082,7 @@ det_type VARCHAR(64), dvodb VARCHAR(64), - camera VARCHAR(64), - telescope VARCHAR(64), - epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + camera VARCHAR(64), + telescope VARCHAR(64), + epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP, filter VARCHAR(64), state VARCHAR(64), @@ -1100,5 +1101,5 @@ corr_id BIGINT, chip_id BIGINT, - include TINYINT, + include TINYINT, PRIMARY KEY(corr_id, chip_id), FOREIGN KEY (corr_id) REFERENCES flatcorrRun(corr_id), @@ -1110,5 +1111,5 @@ chip_id BIGINT, cam_id BIGINT, - include TINYINT, + include TINYINT, PRIMARY KEY(corr_id, cam_id), FOREIGN KEY (corr_id) REFERENCES flatcorrRun(corr_id), Index: /trunk/ippTools/share/regtool_pendingexp.sql =================================================================== --- /trunk/ippTools/share/regtool_pendingexp.sql (revision 20607) +++ /trunk/ippTools/share/regtool_pendingexp.sql (revision 20608) @@ -39,4 +39,5 @@ newExp.state = 'run' AND rawExp.exp_id IS NULL + AND rawImfile.ignored = 0 -- where hook %s GROUP BY Index: /trunk/ippTools/share/regtool_processedimfile.sql =================================================================== --- /trunk/ippTools/share/regtool_processedimfile.sql (revision 20607) +++ /trunk/ippTools/share/regtool_processedimfile.sql (revision 20608) @@ -7,4 +7,3 @@ JOIN newExp USING(exp_id) --- bogus conditional so there is a where clause to append to -WHERE rawImfile.exp_id is NOT NULL +WHERE rawImfile.ignored = 0 Index: /trunk/ippTools/share/warptool_imfile.sql =================================================================== --- /trunk/ippTools/share/warptool_imfile.sql (revision 20607) +++ /trunk/ippTools/share/warptool_imfile.sql (revision 20608) @@ -19,5 +19,6 @@ 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 + AND chipProcessedImfile.class_id = rawImfile.class_id + AND rawImfile.ignored = 0 WHERE warpRun.state = 'new' Index: /trunk/ippTools/src/regtool.c =================================================================== --- /trunk/ippTools/src/regtool.c (revision 20607) +++ /trunk/ippTools/src/regtool.c (revision 20608) @@ -231,4 +231,5 @@ PXOPT_LOOKUP_F32(moon_alt, config->args, "-moon_alt", false, false); PXOPT_LOOKUP_F32(moon_phase, config->args, "-moon_phase", false, false); + PXOPT_LOOKUP_BOOL(ignored, config->args, "-ignore", false); PXOPT_LOOKUP_TIME(dateobs, config->args, "-dateobs", false, false); PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false); @@ -290,9 +291,10 @@ user_5, object, - sun_angle, - sun_alt, - moon_angle, - moon_alt, - moon_phase, + sun_angle, + sun_alt, + moon_angle, + moon_alt, + moon_phase, + ignored, hostname, code, @@ -404,5 +406,5 @@ if (!query) { psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); - psFree(where); + psFree(where); return false; } @@ -443,5 +445,5 @@ if (!pxSetFaultCode(config->dbh, "rawImfile", where, code)) { psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag"); - psFree (where); + psFree (where); return false; } @@ -750,9 +752,9 @@ user_5, object, - sun_angle, - sun_alt, - moon_angle, - moon_alt, - moon_phase, + sun_angle, + sun_alt, + moon_angle, + moon_alt, + moon_phase, hostname, code, @@ -954,5 +956,5 @@ if (!query) { psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); - psFree(where); + psFree(where); return false; } @@ -961,5 +963,5 @@ psString whereClause = psDBGenerateWhereConditionSQL(where, "rawExp"); psStringAppend(&query, " AND %s", whereClause); - psFree(where); + psFree(where); psFree(whereClause); } @@ -993,5 +995,5 @@ if (!pxSetFaultCode(config->dbh, "rawExp", where, code)) { psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag"); - psFree(where); + psFree(where); return false; } Index: /trunk/ippTools/src/regtoolConfig.c =================================================================== --- /trunk/ippTools/src/regtoolConfig.c (revision 20607) +++ /trunk/ippTools/src/regtoolConfig.c (revision 20608) @@ -119,4 +119,5 @@ ADD_OPT(F32, addprocessedimfileArgs, "-moon_alt", "define moon altitude (neg = below horizon)", NAN); ADD_OPT(F32, addprocessedimfileArgs, "-moon_phase", "define moon phase (0.0 = new)", NAN); + ADD_OPT(Bool, addprocessedimfileArgs, "-ignore", "ignore this imfile?", false); ADD_OPT(Time, addprocessedimfileArgs, "-dateobs", "define observation time", NULL); ADD_OPT(Str, addprocessedimfileArgs, "-hostname", "define host name", NULL); @@ -159,6 +160,6 @@ psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-filelevel", 0, "define the data partitioning level of this file (required)", NULL); - ADD_OPT(F32, addprocessedexpArgs, "-longitude", "specify the observatory longitude (NOTE: not saved in db)", 0.0); - ADD_OPT(F32, addprocessedexpArgs, "-latitude", "specify the observatory latitude (NOTE: not saved in db)", 0.0); + ADD_OPT(F32, addprocessedexpArgs, "-longitude", "specify the observatory longitude (NOTE: not saved in db)", 0.0); + ADD_OPT(F32, addprocessedexpArgs, "-latitude", "specify the observatory latitude (NOTE: not saved in db)", 0.0); ADD_OPT(Time, addprocessedexpArgs, "-dateobs", "define observation time", NULL);