Index: branches/czw_branch/20130211/dbconfig/cam.md =================================================================== --- branches/czw_branch/20130211/dbconfig/cam.md (revision 35143) +++ branches/czw_branch/20130211/dbconfig/cam.md (revision 35144) @@ -118,4 +118,5 @@ deteff_uq F32 0 quality S16 0 + background_model S16 0 END Index: branches/czw_branch/20130211/dbconfig/changes.txt =================================================================== --- branches/czw_branch/20130211/dbconfig/changes.txt (revision 35143) +++ branches/czw_branch/20130211/dbconfig/changes.txt (revision 35144) @@ -2266,7 +2266,4 @@ UPDATE dbversion set schema_version = '1.1.73', updated= CURRENT_TIMESTAMP(); -ALTER TABLE warpBackgroundRun ADD COLUMN alt_cam_label VARCHAR(255) AFTER reduction; - -UPDATE dbversion set schema_version = '1.1.74', updated= CURRENT_TIMESTAMP(); -- new tables for managing the "release" of ipp data @@ -2285,5 +2282,5 @@ surveyID INT(8), releaseName VARCHAR(64), - release_state VARCHAR(16), -- active, pending archive drop + state VARCHAR(16), -- active, pending archive drop dataRelease INT(8), -- PSPS dataRelease PRIMARY KEY(rel_id), @@ -2315,28 +2312,9 @@ ) ENGINE=innodb DEFAULT CHARSET=latin1; -CREATE TABLE relStack ( - relstack_id BIGINT AUTO_INCREMENT, - rel_id INT(8), - skycal_id BIGINT, -- id of the sky calibration run that supplied the calibration - -- for this release. We get back to stack from here - skycell_id varchar(64), - tess_id varchar(64), - state VARCHAR(16), -- released, pending, archive, drop - flags INT UNSIGNED, - stack_type VARCHAR(16), -- nightly, deep, reference - zpt_obs FLOAT, -- calibrated zero point for this release of this skycell - zpt_stdev FLOAT, - fwhm_major FLOAT, -- seeing as measured by staticsky - path_base VARCHAR(255), -- path_base of any supporting files, - registered DATETIME, - time_stamp DATETIME, - PRIMARY KEY (relstack_id), - KEY (tess_id, skycell_id), - KEY (rel_id, tess_id, skycell_id), - FOREIGN KEY(rel_id) REFERENCES ippRelease(rel_id), - FOREIGN KEY(skycal_id) REFERENCES skycalRun(skycal_id) -) ENGINE=innodb DEFAULT CHARSET=latin1; - -ALTER TABLE warpBackgroundRun ADD COLUMN alt_cam_label VARCHAR(255) AFTER reduction; - +UPDATE dbversion set schema_version = '1.1.74', updated= CURRENT_TIMESTAMP(); + +-- Update camProcessedExp to hold a background_model value + +ALTER TABLE camProcessedExp add column background_model SMALLINT after quality; UPDATE dbversion set schema_version = '1.1.75', updated= CURRENT_TIMESTAMP(); + Index: branches/czw_branch/20130211/ippTools/share/pxadmin_create_tables.sql =================================================================== --- branches/czw_branch/20130211/ippTools/share/pxadmin_create_tables.sql (revision 35143) +++ branches/czw_branch/20130211/ippTools/share/pxadmin_create_tables.sql (revision 35144) @@ -521,4 +521,5 @@ deteff_uq FLOAT, quality SMALLINT NOT NULL DEFAULT 0, + background_model SMALLINT, PRIMARY KEY(cam_id), KEY(fault), @@ -1843,6 +1844,5 @@ data_group VARCHAR(64), -- group for data dist_group VARCHAR(64), -- group for distribution - reduction VARCHAR(64), -- reduction class (for altering recipe) - alt_cam_label VARCHAR(64), -- label for alternate version of astrometry (optional) + reduction VARCHAR(64), -- reduction class (for altering recipe) note VARCHAR(255), -- note registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered @@ -2162,11 +2162,9 @@ surveyID INT(8), releaseName VARCHAR(64), - relase_state VARCHAR(16), -- active, pending, archive, drop + state VARCHAR(16), -- active, pending archive drop dataRelease INT(8), -- PSPS dataRelease - priority INT(8), PRIMARY KEY(rel_id), KEY(releaseName), KEY(state), - KEY(priority), FOREIGN KEY(surveyID) REFERENCES survey(surveyID) ) ENGINE=Innodb DEFAULT CHARSET=latin1; @@ -2194,29 +2192,5 @@ ) ENGINE=innodb DEFAULT CHARSET=latin1; -CREATE TABLE relStack ( - relstack_id BIGINT AUTO_INCREMENT, - rel_id INT(8), - skycal_id BIGINT, -- id of the sky calibration run that supplied the calibration - -- for this release. We get back to stack from here - skycell_id varchar(64), - tess_id varchar(64), - state VARCHAR(16), -- released, pending, archive, drop - flags INT UNSIGNED, - stack_type VARCHAR(16), -- nightly, deep, reference - zpt_obs FLOAT, -- calibrated zero point for this release of this skycell - zpt_stdev FLOAT, - fwhm_major FLOAT, -- seeing as measured by staticsky - path_base VARCHAR(255), -- path_base of any supporting files, - registered DATETIME, - time_stamp DATETIME, - PRIMARY KEY (relstack_id), - KEY (tess_id, skycell_id), - KEY (rel_id, tess_id, skycell_id), - FOREIGN KEY(rel_id) REFERENCES ippRelease(rel_id), - FOREIGN KEY(skycal_id) REFERENCES skycalRun(skycal_id) -) ENGINE=innodb DEFAULT CHARSET=latin1; - - - --- These comment lines are here to avoid an 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: branches/czw_branch/20130211/ippTools/share/warptool_scmap.sql =================================================================== --- branches/czw_branch/20130211/ippTools/share/warptool_scmap.sql (revision 35143) +++ branches/czw_branch/20130211/ippTools/share/warptool_scmap.sql (revision 35144) @@ -5,4 +5,5 @@ camProcessedExp.path_base as cam_path_base, camProcessedExp.fault as cam_fault, + camProcessedExp.background_model AS cam_background_model, chipProcessedImfile.chip_id, chipRun.state, Index: branches/czw_branch/20130211/ippTools/src/camtool.c =================================================================== --- branches/czw_branch/20130211/ippTools/src/camtool.c (revision 35143) +++ branches/czw_branch/20130211/ippTools/src/camtool.c (revision 35144) @@ -500,5 +500,6 @@ PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); PXOPT_LOOKUP_S16(quality, config->args, "-quality", false, false); - + PXOPT_LOOKUP_S16(background_model, config->args, "-background_model", false, false); + PXOPT_LOOKUP_STR(ver_pslib, config->args, "-ver_pslib", false, false); PXOPT_LOOKUP_STR(ver_psmodules, config->args, "-ver_psmodules", false, false); @@ -520,5 +521,5 @@ PXOPT_LOOKUP_F32(maskfrac_max_magic, config->args, "-maskfrac_max_magic", false, false); PXOPT_LOOKUP_F32(maskfrac_max_advisory, config->args, "-maskfrac_max_advisory", false, false); - + // we store actual detection efficiency by adding in zpt_obs PXOPT_LOOKUP_F32(deteff_inst, config->args, "-deteff_inst", false, false); @@ -542,6 +543,4 @@ } -/* psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s psastro %s ppstats %s ppImage %s streaks %s\n", */ -/* ver_pslib,ver_psmodules,ver_psphot,ver_psastro,ver_ppstats,ver_ppimage,ver_streaks); */ psString software_ver = NULL; if ((ver_pslib)&&(ver_psmodules)) { @@ -692,5 +691,6 @@ deteff_lq, deteff_uq, - quality + quality, + background_model ); @@ -817,5 +817,6 @@ pxAddLabelSearchArgs (config, where, "-data_group", "camRun.data_group", "LIKE"); PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction", "=="); - + PXOPT_COPY_S16(config->args, where, "-background_model", "camProcessedExp.background_model", "=="); + psString where2 = NULL; if (!pxspaceAddWhere(config, &where2, "rawExp")) { @@ -987,18 +988,32 @@ PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false); PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", false, false); - - psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "=="); - PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); - PXOPT_COPY_STR(config->args, where, "-class", "class", "=="); - PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); - - if (!pxSetFaultCode(config->dbh, "camProcessedExp", where, fault, quality)) { + PXOPT_LOOKUP_S16(background_model, config->args, "-set_background_model", false, false); + if (background_model) { + // CZW Copied from warptool.c + psMetadata *where = psMetadataAlloc(); + psMetadata *values = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "=="); + PXOPT_COPY_S16(config->args, values, "-set_background_model", "background_model", "=="); + long rows = psDBUpdateRows(config->dbh, "camProcessedExp", where, values); + psFree(values); + psFree(where); + if (!rows) { + psError(PS_ERR_UNKNOWN, true, "no rows changed"); + } + } + else { + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); + PXOPT_COPY_STR(config->args, where, "-class", "class", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + + if (!pxSetFaultCode(config->dbh, "camProcessedExp", where, fault, quality)) { psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag"); psFree (where); return false; - } - psFree (where); - + } + psFree (where); + } return true; } Index: branches/czw_branch/20130211/ippTools/src/camtoolConfig.c =================================================================== --- branches/czw_branch/20130211/ippTools/src/camtoolConfig.c (revision 35143) +++ branches/czw_branch/20130211/ippTools/src/camtoolConfig.c (revision 35144) @@ -204,5 +204,5 @@ psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-deteff_inst_lq", 0, "define deteff_lq", NAN); psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-deteff_inst_uq", 0, "define deteff_uq", NAN); - + psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-background_model", 0, "set background_model value", 0); // -processedexp @@ -222,4 +222,5 @@ psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); + psMetadataAddS16(processedexpArgs, PS_LIST_TAIL, "-background_model", 0, "search by background_model value", 0); // -revertprocessedexp @@ -246,4 +247,5 @@ psMetadataAddS16(updateprocessedexpArgs, PS_LIST_TAIL, "-fault", 0, "set fault code (required)", INT16_MAX); psMetadataAddS16(updateprocessedexpArgs, PS_LIST_TAIL, "-set_quality", 0, "set quality", 0); + psMetadataAddS16(updateprocessedexpArgs, PS_LIST_TAIL, "-set_background_model", 0, "set background_model value", 0); // -block