Index: /branches/eam_branches/ipp-20220316/ippTools/share/Makefile.am =================================================================== --- /branches/eam_branches/ipp-20220316/ippTools/share/Makefile.am (revision 42196) +++ /branches/eam_branches/ipp-20220316/ippTools/share/Makefile.am (revision 42197) @@ -543,3 +543,12 @@ remotetool_listcomponent.sql \ remotetool_doneprep.sql \ - remotetool_updatepoll.sql + remotetool_updatepoll.sql \ + fpcamtool_addprocessedexp.sql \ + fpcamtool_find_cam_and_chip_id.sql \ + fpcamtool_find_cam_id.sql \ + fpcamtool_find_processedexp.sql \ + fpcamtool_pendingexp.sql \ + fpcamtool_queue_cam_id.sql \ + fpcamtool_revertprocessedexp.sql \ + fpcamtool_revertupdatedexp.sql + Index: /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_find_cam_and_chip_id.sql =================================================================== --- /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_find_cam_and_chip_id.sql (revision 42196) +++ /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_find_cam_and_chip_id.sql (revision 42197) @@ -4,7 +4,6 @@ ( SELECT - chipRun.chip_id, - rawExp.ra, - rawExp.decl + exp_id, + chip_id, FROM chipRun JOIN rawExp @@ -12,13 +11,23 @@ WHERE chipRun.state = 'full' - -- AND exp_id = 162 - -- AND chip_id = 140 + -- WHERE HOOK for chip: + AND %s ) AS myChip JOIN ( SELECT + exp_id, + camRun.chip_id as cam_chip_id, camRun.cam_id, - rawExp.ra, - rawExp.decl + camRun.state, + camRun.workdir, + camRun.workdir_state, + camRun.label, + camRun.data_group, + camRun.dist_group, + camRun.reduction, + camRun.dvodb, + camRun.software_ver, + camRun.note FROM camRun JOIN chipRun @@ -28,8 +37,6 @@ WHERE camRun.state = 'full' --- AND exp_id = 162 --- AND cam_id = 234 +-- WHERE HOOK for cam: + AND %s ) AS myCam USING(exp_id) - - Index: /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_find_cam_id.sql =================================================================== --- /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_find_cam_id.sql (revision 42197) +++ /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_find_cam_id.sql (revision 42197) @@ -0,0 +1,25 @@ +-- this needs to join a table of chipRuns and a table of camRuns based on exp_id + +SELECT + exp_id, + chip_id, + cam_id, + camRun.state, + camRun.workdir, + camRun.workdir_state, + camRun.label, + camRun.data_group, + camRun.dist_group, + camRun.reduction, + camRun.dvodb, + camRun.software_ver, + camRun.note +FROM camRun +JOIN chipRun + USING(chip_id) +JOIN rawExp + USING(exp_id) +WHERE + camRun.state = 'full' +-- WHERE HOOK for cam: + AND %s Index: /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_find_processedexp.sql =================================================================== --- /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_find_processedexp.sql (revision 42197) +++ /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_find_processedexp.sql (revision 42197) @@ -0,0 +1,27 @@ +SELECT + fpcamProcessedExp.*, + fpcamRun.workdir, + fpcamRun.label, + fpcamRun.data_group, + fpcamRun.state, + camRun.state as cam_state, + chipRun.state as chip_state, + rawExp.exp_tag, + rawExp.exp_name, + rawExp.exp_time, + rawExp.exp_id, + rawExp.camera, + rawExp.telescope, + rawExp.dateobs, + rawExp.filter, + rawExp.filelevel, + rawExp.comment +FROM fpcamRun +JOIN fpcamProcessedExp + USING(fpcam_id) +JOIN camRun + USING(cam_id) +JOIN chipRun + ON(fpcamRun.chip_id = chipRun.chip_id) +JOIN rawExp + ON chipRun.exp_id = rawExp.exp_id Index: /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_pendingexp.sql =================================================================== --- /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_pendingexp.sql (revision 42197) +++ /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_pendingexp.sql (revision 42197) @@ -0,0 +1,30 @@ +SELECT + fpcamRun.*, + rawExp.exp_tag, + rawExp.exp_id, + rawExp.exp_name, + rawExp.camera, + rawExp.telescope, + rawExp.filelevel, + fpcamProcessedExp.path_base, + IFNULL(Label.priority, 10000) AS priority +FROM fpcamRun +JOIN camRun + USING(cam_id) +JOIN chipRun + ON(fpcamRun.chip_id = chipRun.chip_id) +JOIN rawExp + USING(exp_id) +LEFT JOIN fpcamProcessedExp + USING(fpcam_id) +LEFT JOIN fpcamMask + ON fpcamRun.label = fpcamMask.label +LEFT JOIN Label + ON fpcamRun.label = Label.label +WHERE + chipRun.state = 'full' + AND camRun.state = 'full' + AND ((fpcamRun.state = 'new' AND fpcamProcessedExp.cam_id IS NULL) OR + (fpcamRun.state = 'update' AND fpcamProcessedExp.fault = 0 AND fpcamProcessedExp.quality = 0)) + AND fpcamMask.label IS NULL + AND (Label.active OR Label.active IS NULL) Index: /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_queue_cam_id.sql =================================================================== --- /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_queue_cam_id.sql (revision 42197) +++ /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_queue_cam_id.sql (revision 42197) @@ -0,0 +1,32 @@ +-- fpcamtool only operates on exposures so we can safely queue more then one at a +-- time without worrying about losing the track of the generated cam_id +INSERT INTO fpcamRun + ( fpcam_id, + chip_id, + cam_id, + state, + workdir, + workdir_state, + label, + data_group, + dist_group, + reduction, + dvodb, + software_ver, + note) + VALUES + ( + 0, -- fpcam_id + %lld, -- chip_id + %lld, -- cam_id + '%s', -- state + '%s', -- workdir + '%s', -- workdir_state + '%s', -- label + '%s', -- data_group + '%s', -- dist_group + '%s', -- reduction + '%s', -- dvodb + 0, -- software ver + '%s' -- note + ) Index: /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_revertprocessedexp.sql =================================================================== --- /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_revertprocessedexp.sql (revision 42197) +++ /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_revertprocessedexp.sql (revision 42197) @@ -0,0 +1,9 @@ +DELETE FROM fpcamProcessedExp +USING fpcamProcessedExp, fpcamRun, camRun, chipRun, rawExp +WHERE + fpcamRun.cam_id = fpcamProcessedExp.cam_id + AND fpcamRun.cam_id = camRun.cam_id + AND fpcamRun.chip_id = chipRun.chip_id + AND chipRun.exp_id = rawExp.exp_id + AND fpcamProcessedExp.fault != 0 + AND fpcamRun.state = 'new' Index: /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_revertupdatedexp.sql =================================================================== --- /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_revertupdatedexp.sql (revision 42197) +++ /branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_revertupdatedexp.sql (revision 42197) @@ -0,0 +1,9 @@ +UPDATE fpcamProcessedExp + JOIN fpcamRun USING(fpcam_id) + JOIN camRun USING(cam_id) + JOIN chipRun ON(fpcamRun.chip_id = chipRun.chip_id) + JOIN rawExp USING(exp_id) +SET fpcamProcessedExp.fault = 0 +WHERE + fpcamRun.state = 'update' + AND fpcamProcessedExp.fault != 0 Index: /branches/eam_branches/ipp-20220316/ippTools/src/Makefile.am =================================================================== --- /branches/eam_branches/ipp-20220316/ippTools/src/Makefile.am (revision 42196) +++ /branches/eam_branches/ipp-20220316/ippTools/src/Makefile.am (revision 42197) @@ -35,4 +35,5 @@ releasetool \ fftool \ + fpcamtool \ remotetool @@ -55,4 +56,5 @@ pxtoolsErrorCodes.h \ pxtree.h \ + pxfpcam.h \ pxwarp.h @@ -91,4 +93,5 @@ releasetool.h \ fftool.h \ + fpcamtool.h \ remotetool.h @@ -116,4 +119,5 @@ pxtoolsErrorCodes.c \ pxtree.c \ + pxfpcam.c \ pxwarp.c @@ -174,4 +178,10 @@ camtool.c \ camtoolConfig.c + +fpcamtool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) +fpcamtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la +fpcamtool_SOURCES = \ + fpcamtool.c \ + fpcamtoolConfig.c faketool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) Index: /branches/eam_branches/ipp-20220316/ippTools/src/fpcamtool.c =================================================================== --- /branches/eam_branches/ipp-20220316/ippTools/src/fpcamtool.c (revision 42196) +++ /branches/eam_branches/ipp-20220316/ippTools/src/fpcamtool.c (revision 42197) @@ -27,5 +27,5 @@ #include "pxtools.h" -#include "pxcam.h" +#include "pxfpcam.h" #include "fpcamtool.h" @@ -40,16 +40,6 @@ static bool maskedMode(pxConfig *config); static bool unblockMode(pxConfig *config); -static bool pendingcleanuprunMode(pxConfig *config); -static bool pendingcleanupexpMode(pxConfig *config); -static bool donecleanupMode(pxConfig *config); -static bool exportrunMode(pxConfig *config); -static bool importrunMode(pxConfig *config); - -# define MODECASE(caseName, func) \ - case caseName: \ - if (!func(config)) { \ - goto FAIL; \ - } \ - break; + +# define MODECASE(caseName, func) case caseName: if (!func(config)) { goto FAIL; } break; int main(int argc, char **argv) @@ -57,5 +47,5 @@ psLibInit(NULL); - pxConfig *config = camtoolConfig(NULL, argc, argv); + pxConfig *config = fpcamtoolConfig(NULL, argc, argv); if (!config) { psError(PXTOOLS_ERR_CONFIG, false, "failed to configure"); @@ -64,19 +54,14 @@ switch (config->mode) { - MODECASE(CAMTOOL_MODE_DEFINEBYQUERY, definebyqueryMode); - MODECASE(CAMTOOL_MODE_UPDATERUN, updaterunMode); - MODECASE(CAMTOOL_MODE_PENDINGEXP, pendingexpMode); - MODECASE(CAMTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpMode); - MODECASE(CAMTOOL_MODE_PROCESSEDEXP, processedexpMode); - MODECASE(CAMTOOL_MODE_REVERTPROCESSEDEXP, revertprocessedexpMode); - MODECASE(CAMTOOL_MODE_UPDATEPROCESSEDEXP, updateprocessedexpMode); - MODECASE(CAMTOOL_MODE_BLOCK, blockMode); - MODECASE(CAMTOOL_MODE_MASKED, maskedMode); - MODECASE(CAMTOOL_MODE_UNBLOCK, unblockMode); - MODECASE(CAMTOOL_MODE_PENDINGCLEANUPRUN, pendingcleanuprunMode); - MODECASE(CAMTOOL_MODE_PENDINGCLEANUPEXP, pendingcleanupexpMode); - MODECASE(CAMTOOL_MODE_DONECLEANUP, donecleanupMode); - MODECASE(CAMTOOL_MODE_EXPORTRUN, exportrunMode); - MODECASE(CAMTOOL_MODE_IMPORTRUN, importrunMode); + MODECASE(FPCAMTOOL_MODE_DEFINEBYQUERY, definebyqueryMode); + MODECASE(FPCAMTOOL_MODE_UPDATERUN, updaterunMode); + MODECASE(FPCAMTOOL_MODE_PENDINGEXP, pendingexpMode); + MODECASE(FPCAMTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpMode); + MODECASE(FPCAMTOOL_MODE_PROCESSEDEXP, processedexpMode); + MODECASE(FPCAMTOOL_MODE_REVERTPROCESSEDEXP, revertprocessedexpMode); + MODECASE(FPCAMTOOL_MODE_UPDATEPROCESSEDEXP, updateprocessedexpMode); + MODECASE(FPCAMTOOL_MODE_BLOCK, blockMode); + MODECASE(FPCAMTOOL_MODE_MASKED, maskedMode); + MODECASE(FPCAMTOOL_MODE_UNBLOCK, unblockMode); default: psAbort("invalid option (this should not happen)"); @@ -104,57 +89,98 @@ PS_ASSERT_PTR_NON_NULL(config, NULL); - psMetadata *where = psMetadataAlloc(); - pxcamGetSearchArgs (config, where); - pxAddLabelSearchArgs (config, where, "-chip-label", "chipRun.label", "=="); // define using chipRun label - pxAddLabelSearchArgs (config, where, "-cam-label", "camRun.label", "=="); // define using chipRun label - PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); - PXOPT_COPY_STR(config->args, where, "-reduction", "chipRun.reduction", "=="); // use camRun here? - PXOPT_COPY_STR(config->args, where, "-data_group", "chipRun.data_group", "=="); // use camRun here? - PXOPT_COPY_STR(config->args, where, "-obs_mode", "rawExp.obs_mode", "=="); + psMetadata *whereChp = psMetadataAlloc(); + psMetadata *whereCam = psMetadataAlloc(); + + // The user can specify the chipRun and camRun independently + + // selections for the relevant chip-stage + pxfpcamGetSearchArgs (config, whereChp); + pxAddLabelSearchArgs (config, whereChp, "-chip_label", "chipRun.label", "=="); + PXOPT_COPY_S64(config->args, whereChp, "-chip_id", "chipRun.chip_id", "=="); + PXOPT_COPY_STR(config->args, whereChp, "-chip_reduction", "chipRun.reduction", "=="); + PXOPT_COPY_STR(config->args, whereChp, "-chip_data_group", "chipRun.data_group", "=="); - // pxcam provides rawExp constraints to select the exposures - // It also adds chip_id => chipRun.chip_id - // The user can specify the chipRun and camRun independently - - if (!psListLength(where->list) && - !psMetadataLookupBool(NULL, config->args, "-all")) { - psFree(where); - psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); + // selections for the relevant cam-stage + pxfpcamGetSearchArgs (config, whereCam); + pxAddLabelSearchArgs (config, whereCam, "-cam_label", "camRun.label", "=="); + PXOPT_COPY_S64(config->args, whereCam, "-cam_id", "camRun.cam_id", "=="); + PXOPT_COPY_STR(config->args, whereCam, "-cam_reduction", "camRun.reduction", "=="); + PXOPT_COPY_STR(config->args, whereCam, "-cam_data_group", "camRun.data_group", "=="); + + // pxfpcam provides rawExp constraints to select the exposures + + if (!psListLength(whereCam->list)) { + psFree(whereCam); + psFree(whereChp); + psError(PXTOOLS_ERR_CONFIG, false, "search parameters (at least for camRun) are required"); return false; } - PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", false, false); - PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false); + PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", false, false); + PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false); PXOPT_LOOKUP_STR(data_group, config->args, "-set_data_group", false, false); PXOPT_LOOKUP_STR(dist_group, config->args, "-set_dist_group", false, false); - PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", false, false); - PXOPT_LOOKUP_STR(dvodb, config->args, "-set_dvodb", false, false); - PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false); + PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", false, false); + PXOPT_LOOKUP_STR(dvodb, config->args, "-set_dvodb", false, false); + PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false); // default PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); - PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); // find the exp_id of all the exposures that we want to queue up. - psString query = pxDataGet("fpcamtool_find_cam_and_chip_id.sql"); - if (!query) { - psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - psFree(where); - return false; - } - - if (psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } - psFree(where); - - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - return false; - } - psFree(query); + + if (psListLength(whereChp->list)) { + // if selections are set for chip (and cam), use query set for both where strings + psString query = pxDataGet("fpcamtool_find_cam_and_chip_id.sql"); + if (!query) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + psFree(whereChp); + psFree(whereCam); + return false; + } + psString whereChpStr = psDBGenerateWhereConditionSQL(whereChp, NULL); + psString whereCamStr = psDBGenerateWhereConditionSQL(whereCam, NULL); + + // XXX add limits to the chip & cam queries? + if (!p_psDBRunQueryF(config->dbh, query, whereChpStr, whereCamStr)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + psFree(whereChp); + psFree(whereCam); + psFree(whereChpStr); + psFree(whereCamStr); + return false; + } + psFree(query); + psFree(whereChp); + psFree(whereCam); + psFree(whereChpStr); + psFree(whereCamStr); + } else { + // if we are not selecting the chipRun explicitly, use the camRun selection for both + psString query = pxDataGet("fpcamtool_find_cam_id.sql"); + if (!query) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + psFree(whereChp); + psFree(whereCam); + return false; + } + psString whereCamStr = psDBGenerateWhereConditionSQL(whereCam, NULL); + + // XXX add limits to the chip & cam queries? + if (!p_psDBRunQueryF(config->dbh, query, whereCamStr)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + psFree(whereChp); + psFree(whereCam); + psFree(whereCamStr); + return false; + } + psFree(query); + psFree(whereChp); + psFree(whereCam); + psFree(whereCamStr); + } psArray *output = p_psDBFetchResult(config->dbh); @@ -171,5 +197,5 @@ if (pretend) { // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "chipRun", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "fpcamRun", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -188,16 +214,11 @@ } - // would could do this "all in the database" if we didn't want the option - // of changing the label/reduction/expgroup/dvodb/etc. So we're pulling the - // data out so we have the option of changing these values or leaving the - // old values in place (i.e., passing the values through). - - // loop over our list of chipRun rows + // loop over our list of fpcamRun rows for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - chipRunRow *row = chipRunObjectFromMetadata(md); + fpcamInsertRow *row = fpcamInsertObjectFromMetadata(md); if (!row) { - psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into chipRun"); + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into fpcamInsert object"); psFree(output); return false; @@ -205,6 +226,7 @@ // queue the exp - if (!pxcamQueueByChipID(config, + if (!pxfpcamQueueByCamAndChipID(config, row->chip_id, + row->cam_id, workdir ? workdir : row->workdir, label ? label : row->label, @@ -212,9 +234,5 @@ dist_group ? dist_group: row->dist_group, reduction ? reduction : row->reduction, - expgroup ? expgroup : row->expgroup, dvodb ? dvodb : row->dvodb, - tess_id ? tess_id : row->tess_id, - end_stage ? end_stage : row->end_stage, - row->magicked, note )) { @@ -223,5 +241,5 @@ } psError(PS_ERR_UNKNOWN, false, - "failed to trying to queue chip_id: %" PRId64, row->chip_id); + "failed to trying to queue cam_id: %lld, chip_id: %lld", (long long) row->cam_id, (long long) row->chip_id); psFree(row); psFree(output); @@ -240,5 +258,4 @@ } - static bool updaterunMode(pxConfig *config) { @@ -246,10 +263,12 @@ psMetadata *where = psMetadataAlloc(); - pxcamGetSearchArgs (config, where); - PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); - PXOPT_COPY_STR(config->args, where, "-label", "camRun.label", "=="); - PXOPT_COPY_STR(config->args, where, "-data_group","camRun.data_group", "=="); - PXOPT_COPY_STR(config->args, where, "-state", "camRun.state", "=="); - PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction", "=="); + pxfpcamGetSearchArgs (config, where); + PXOPT_COPY_S64(config->args, where, "-fpcam_id", "fpcamRun.fpcam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-cam_id", "fpcamRun.cam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-chip_id", "fpcamRun.chip_id", "=="); + PXOPT_COPY_STR(config->args, where, "-label", "fpcamRun.label", "=="); + PXOPT_COPY_STR(config->args, where, "-data_group","fpcamRun.data_group", "=="); + PXOPT_COPY_STR(config->args, where, "-state", "fpcamRun.state", "=="); + PXOPT_COPY_STR(config->args, where, "-reduction", "fpcamRun.reduction", "=="); if (!psListLength(where->list)) { @@ -258,8 +277,8 @@ return false; } - psString query = psStringCopy("UPDATE camRun JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id)"); + psString query = psStringCopy("UPDATE fpcamRun JOIN camRun USING(cam_id) JOIN chipRun ON(chipRun.chip_id = camRun.chip_id) JOIN rawExp USING(exp_id)"); // pxUpdateRun gets parameters from config->args and updates - bool result = pxUpdateRun(config, where, &query, "camRun", "cam_id", "camProcessedExp", true, true); + bool result = pxUpdateRun(config, where, &query, "fpcamRun", "fpcam_id", "fpcamProcessedExp", true, false); if (!result) { psError(psErrorCodeLast(), false, "pxUpdateRun failed"); @@ -271,5 +290,4 @@ return result; } - static bool pendingexpMode(pxConfig *config) @@ -282,10 +300,12 @@ psMetadata *where = psMetadataAlloc(); - pxcamGetSearchArgs (config, where); - PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); - pxAddLabelSearchArgs (config, where, "-label", "camRun.label", "=="); - PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction", "=="); - - psString query = pxDataGet("camtool_pendingexp.sql"); + pxfpcamGetSearchArgs (config, where); + pxAddLabelSearchArgs (config, where, "-label", "fpcamRun.label", "=="); + PXOPT_COPY_S64(config->args, where, "-fpcam_id", "fpcamRun.fpcam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-cam_id", "fpcamRun.cam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-chip_id", "fpcamRun.chip_id", "=="); + PXOPT_COPY_STR(config->args, where, "-reduction", "fpcamRun.reduction", "=="); + + psString query = pxDataGet("fpcamtool_pendingexp.sql"); if (!query) { psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); @@ -306,5 +326,5 @@ psFree(where); - psStringAppend(&query, "\nORDER BY priority DESC, cam_id"); + psStringAppend(&query, "\nORDER BY priority DESC, fpcam_id"); // treat limit == 0 as "no limit" @@ -328,5 +348,5 @@ } if (!psArrayLength(output)) { - psTrace("camtool", PS_LOG_INFO, "no rows found"); + psTrace("fpcamtool", PS_LOG_INFO, "no rows found"); psFree(output); return true; @@ -334,5 +354,5 @@ // negate simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "camPendingExp", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "fpcamPendingExp", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -345,68 +365,4 @@ } -static bool pendingimfileMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, false); - - psMetadata *where = psMetadataAlloc(); - pxcamGetSearchArgs (config, where); - PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); - pxAddLabelSearchArgs (config, where, "-label", "camRun.label", "=="); - PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction", "=="); - PXOPT_COPY_S64(config->args, where, "-chip_id", "camRun.chip_id", "=="); - PXOPT_COPY_STR(config->args, where, "-class_id", "camProcessedExp.class_id", "=="); - - PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - PXOPT_LOOKUP_BOOL(all, config->args, "-all", false); - - psString query = pxDataGet("camtool_find_pendingimfile.sql"); - if (!query) { - psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - return false; - } - - // use psDBGenerateWhereSQL because the SQL yields an intermediate table - if (psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } else { - if (!all) { - psError(PXTOOLS_ERR_SYS, false, "unrestricted query not allowed (try -all)"); - return false; - } - } - psFree(where); - - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - return false; - } - psFree(query); - - psArray *output = p_psDBFetchResult(config->dbh); - if (!output) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - if (!psArrayLength(output)) { - psTrace("camtool", PS_LOG_INFO, "no rows found"); - psFree(output); - return true; - } - - // negate simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "camProcessedExp", !simple)) { - psError(PS_ERR_UNKNOWN, false, "failed to print array"); - psFree(output); - return false; - } - - psFree(output); - - return true; -} - static bool addprocessedexpMode(pxConfig *config) { @@ -414,21 +370,8 @@ // required - PXOPT_LOOKUP_S64(cam_id, config->args, "-cam_id", true, false); - PXOPT_LOOKUP_STR(uri, config->args, "-uri", true, false); + PXOPT_LOOKUP_S64(fpcam_id, config->args, "-fpcam_id", true, false); + PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", true, false); // optional - PXOPT_LOOKUP_F32(bg, config->args, "-bg", false, false); - PXOPT_LOOKUP_F32(bg_stdev, config->args, "-bg_stdev", false, false); - PXOPT_LOOKUP_F32(bg_mean_stdev, config->args, "-bg_mean_stdev", false, false); - PXOPT_LOOKUP_F32(bias, config->args, "-bias", false, false); - PXOPT_LOOKUP_F32(bias_stdev, config->args, "-bias_stdev", false, false); - PXOPT_LOOKUP_F32(fringe_0, config->args, "-fringe_0", false, false); - PXOPT_LOOKUP_F32(fringe_1, config->args, "-fringe_1", false, false); - PXOPT_LOOKUP_F32(fringe_2, config->args, "-fringe_2", false, false); - PXOPT_LOOKUP_F32(sigma_ra, config->args, "-sigma_ra", false, false); - PXOPT_LOOKUP_F32(sigma_dec, config->args, "-sigma_dec", false, false); - PXOPT_LOOKUP_F32(ap_resid, config->args, "-ap_resid", false, false); - PXOPT_LOOKUP_F32(ap_resid_stdev, config->args, "-ap_resid_stdev", false, false); - PXOPT_LOOKUP_F32(zpt_obs, config->args, "-zpt_obs", false, false); PXOPT_LOOKUP_F32(zpt_err, config->args, "-zpt_err", false, false); @@ -436,94 +379,17 @@ PXOPT_LOOKUP_F32(zpt_lq, config->args, "-zpt_lq", false, false); - PXOPT_LOOKUP_F32(fwhm_major, config->args, "-fwhm_major", false, false); - PXOPT_LOOKUP_F32(fwhm_major_lq, config->args, "-fwhm_major_lq", false, false); - PXOPT_LOOKUP_F32(fwhm_major_uq, config->args, "-fwhm_major_uq", false, false); - - PXOPT_LOOKUP_F32(fwhm_minor, config->args, "-fwhm_minor", false, false); - PXOPT_LOOKUP_F32(fwhm_minor_lq, config->args, "-fwhm_minor_lq", false, false); - PXOPT_LOOKUP_F32(fwhm_minor_uq, config->args, "-fwhm_minor_uq", false, false); - - PXOPT_LOOKUP_F32(iq_fwhm_major, config->args, "-iq_fwhm_major", false, false); - PXOPT_LOOKUP_F32(iq_fwhm_major_err, config->args, "-iq_fwhm_major_err", false, false); - PXOPT_LOOKUP_F32(iq_fwhm_minor, config->args, "-iq_fwhm_minor", false, false); - PXOPT_LOOKUP_F32(iq_fwhm_minor_err, config->args, "-iq_fwhm_minor_err", false, false); - - PXOPT_LOOKUP_F32(iq_m2, config->args, "-iq_m2", false, false); - PXOPT_LOOKUP_F32(iq_m2_err, config->args, "-iq_m2_err", false, false); - PXOPT_LOOKUP_F32(iq_m2_uq, config->args, "-iq_m2_uq", false, false); - PXOPT_LOOKUP_F32(iq_m2_lq, config->args, "-iq_m2_lq", false, false); - - PXOPT_LOOKUP_F32(iq_m2c, config->args, "-iq_m2c", false, false); - PXOPT_LOOKUP_F32(iq_m2c_err, config->args, "-iq_m2c_err", false, false); - PXOPT_LOOKUP_F32(iq_m2c_uq, config->args, "-iq_m2c_uq", false, false); - PXOPT_LOOKUP_F32(iq_m2c_lq, config->args, "-iq_m2c_lq", false, false); - - PXOPT_LOOKUP_F32(iq_m2s, config->args, "-iq_m2s", false, false); - PXOPT_LOOKUP_F32(iq_m2s_err, config->args, "-iq_m2s_err", false, false); - PXOPT_LOOKUP_F32(iq_m2s_uq, config->args, "-iq_m2s_uq", false, false); - PXOPT_LOOKUP_F32(iq_m2s_lq, config->args, "-iq_m2s_lq", false, false); - - PXOPT_LOOKUP_F32(iq_m3, config->args, "-iq_m3", false, false); - PXOPT_LOOKUP_F32(iq_m3_err, config->args, "-iq_m3_err", false, false); - PXOPT_LOOKUP_F32(iq_m3_uq, config->args, "-iq_m3_uq", false, false); - PXOPT_LOOKUP_F32(iq_m3_lq, config->args, "-iq_m3_lq", false, false); - - PXOPT_LOOKUP_F32(iq_m4, config->args, "-iq_m4", false, false); - PXOPT_LOOKUP_F32(iq_m4_err, config->args, "-iq_m4_err", false, false); - PXOPT_LOOKUP_F32(iq_m4_uq, config->args, "-iq_m4_uq", false, false); - PXOPT_LOOKUP_F32(iq_m4_lq, config->args, "-iq_m4_lq", false, false); - PXOPT_LOOKUP_F32(dtime_script, config->args, "-dtime_script", false, false); - PXOPT_LOOKUP_F32(dtime_astrom, config->args, "-dtime_astrom", false, false); - PXOPT_LOOKUP_F32(dtime_addstar, config->args, "-dtime_addstar", false, false); - PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false); PXOPT_LOOKUP_S32(n_stars, config->args, "-n_stars", false, false); - PXOPT_LOOKUP_S32(n_psfstars, config->args, "-n_psfstars", false, false); - PXOPT_LOOKUP_S32(n_iqstars, config->args, "-n_iqstars", false, false); - PXOPT_LOOKUP_S32(n_extended, config->args, "-n_extended", false, false); - PXOPT_LOOKUP_S32(n_cr, config->args, "-n_cr", false, false); - PXOPT_LOOKUP_S32(n_astrom, config->args, "-n_astrom", false, false); - - PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", false, false); - 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_S64(astrom_chips, config->args, "-astrom_chips", false, false); - - - PXOPT_LOOKUP_STR(ver_pslib, config->args, "-ver_pslib", false, false); - PXOPT_LOOKUP_STR(ver_psmodules, config->args, "-ver_psmodules", false, false); - PXOPT_LOOKUP_STR(ver_psphot, config->args, "-ver_psphot", false, false); - PXOPT_LOOKUP_STR(ver_psastro, config->args, "-ver_psastro", false, false); - PXOPT_LOOKUP_STR(ver_ppstats, config->args, "-ver_ppstats", false, false); - PXOPT_LOOKUP_STR(ver_ppimage, config->args, "-ver_ppimage", false, false); - PXOPT_LOOKUP_STR(ver_streaks, config->args, "-ver_streaks", false, false); - - PXOPT_LOOKUP_S32(maskfrac_ref_npix, config->args, "-maskfrac_ref_npix", false, false); - PXOPT_LOOKUP_F32(maskfrac_ref_static, config->args, "-maskfrac_ref_static", false, false); - PXOPT_LOOKUP_F32(maskfrac_ref_dynamic, config->args, "-maskfrac_ref_dynamic", false, false); - PXOPT_LOOKUP_F32(maskfrac_ref_magic, config->args, "-maskfrac_ref_magic", false, false); - PXOPT_LOOKUP_F32(maskfrac_ref_advisory, config->args, "-maskfrac_ref_advisory", false, false); - - PXOPT_LOOKUP_S32(maskfrac_max_npix, config->args, "-maskfrac_max_npix", false, false); - PXOPT_LOOKUP_F32(maskfrac_max_static, config->args, "-maskfrac_max_static", false, false); - PXOPT_LOOKUP_F32(maskfrac_max_dynamic, config->args, "-maskfrac_max_dynamic", false, false); - 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); - - PXOPT_LOOKUP_F32(ast_r0, config->args, "-ast_r0", false, false); - PXOPT_LOOKUP_F32(ast_d0, config->args, "-ast_d0", false, false); - PXOPT_LOOKUP_F32(ast_t0, config->args, "-ast_t0", false, false); - PXOPT_LOOKUP_F32(ast_s0, config->args, "-ast_s0", false, false); - PXOPT_LOOKUP_F32(ast_rs, config->args, "-ast_rs", false, false); - PXOPT_LOOKUP_F32(ast_ds, config->args, "-ast_ds", false, false); + + PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); + PXOPT_LOOKUP_S16(quality, config->args, "-quality", false, false); // we store actual detection efficiency by adding in zpt_obs - PXOPT_LOOKUP_F32(deteff_inst, config->args, "-deteff_inst", false, false); + PXOPT_LOOKUP_F32(deteff_inst, config->args, "-deteff_inst", false, false); PXOPT_LOOKUP_F32(deteff_inst_lq, config->args, "-deteff_inst_lq", false, false); PXOPT_LOOKUP_F32(deteff_inst_uq, config->args, "-deteff_inst_uq", false, false); - // error is dd - PXOPT_LOOKUP_F32(deteff_err, config->args, "-deteff_inst_err", false, false); + PXOPT_LOOKUP_F32(deteff_err, config->args, "-deteff_inst_err", false, false); + psF32 deteff = NAN; psF32 deteff_uq = NAN; @@ -541,165 +407,42 @@ } - psString software_ver = NULL; - if ((ver_pslib)&&(ver_psmodules)) { - software_ver = pxMergeCodeVersions(ver_pslib,ver_psmodules); - } - if (ver_psphot) { - software_ver = pxMergeCodeVersions(software_ver,ver_psphot); - } - if (ver_psastro) { - software_ver = pxMergeCodeVersions(software_ver,ver_psastro); - } - if (ver_ppstats) { - software_ver = pxMergeCodeVersions(software_ver,ver_ppstats); - } - if (ver_ppimage) { - software_ver = pxMergeCodeVersions(software_ver,ver_ppimage); - } - if (ver_streaks) { - software_ver = pxMergeCodeVersions(software_ver,ver_streaks); - } - -// Get this from the chipRun -// PXOPT_LOOKUP_S64(magicked, config->args, "-magicked", false, false); + PXOPT_LOOKUP_STR(ver_pslib, config->args, "-ver_pslib", false, false); + PXOPT_LOOKUP_STR(ver_psmodules, config->args, "-ver_psmodules", false, false); + PXOPT_LOOKUP_STR(ver_psphot, config->args, "-ver_psphot", false, false); + PXOPT_LOOKUP_STR(ver_ppstats, config->args, "-ver_ppstats", false, false); + PXOPT_LOOKUP_STR(ver_fpcamera, config->args, "-ver_fpcamera", false, false); + + psString software_ver = pxMergeCodeVersions(ver_pslib,ver_psmodules); + software_ver = pxMergeCodeVersions(software_ver,ver_psphot); + software_ver = pxMergeCodeVersions(software_ver,ver_ppstats); + software_ver = pxMergeCodeVersions(software_ver,ver_fpcamera); // generate restrictions - psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); - - psString query = pxDataGet("camtool_addprocessedexp.sql"); - if (!query) { - psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - return false; - } - - // use psDBGenerateWhereSQL because the SQL yields an intermediate table - if (psListLength(where->list)) { - psString whereClaus = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClaus); - psFree(whereClaus); - } - psFree(where); - - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - return false; - } - psFree(query); - - psArray *output = p_psDBFetchResult(config->dbh); - if (!output) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - if (!psArrayLength(output)) { - psTrace("camtool", PS_LOG_INFO, "no rows found"); - psFree(output); - return false; - } - if (!psDBTransaction(config->dbh)) { psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(output); - return false; - } - - bool status; - psS64 chip_magicked = psMetadataLookupS64(&status, output->data[0], "chip_magicked"); - - camRunRow *pendingRow = camRunObjectFromMetadata(output->data[0]); - psFree(output); - camProcessedExpRow *row = camProcessedExpRowAlloc( - pendingRow->cam_id, - uri, - bg, - bg_stdev, - bg_mean_stdev, - bias, - bias_stdev, - fringe_0, - fringe_1, - fringe_2, - sigma_ra, - sigma_dec, - ap_resid, - ap_resid_stdev, + return false; + } + + fpcamProcessedExpRow *row = fpcamProcessedExpRowAlloc( + fpcam_id, + path_base, zpt_obs, zpt_err, zpt_lq, zpt_uq, - fwhm_major, - fwhm_major_lq, - fwhm_major_uq, - fwhm_minor, - fwhm_minor_lq, - fwhm_minor_uq, - - iq_fwhm_major, - iq_fwhm_major_err, - iq_fwhm_minor, - iq_fwhm_minor_err, - - iq_m2, - iq_m2_err, - iq_m2_lq, - iq_m2_uq, - iq_m2c, - iq_m2c_err, - iq_m2c_lq, - iq_m2c_uq, - iq_m2s, - iq_m2s_err, - iq_m2s_lq, - iq_m2s_uq, - iq_m3, - iq_m3_err, - iq_m3_lq, - iq_m3_uq, - iq_m4, - iq_m4_err, - iq_m4_lq, - iq_m4_uq, dtime_script, - dtime_astrom, - dtime_addstar, hostname, n_stars, - n_psfstars, - n_iqstars, - n_extended, - n_cr, - n_astrom, - path_base, fault, + NULL, // XXX : this should be epoch software_ver, - maskfrac_ref_npix, - maskfrac_ref_static, - maskfrac_ref_dynamic, - maskfrac_ref_magic, - maskfrac_ref_advisory, - maskfrac_max_npix, - maskfrac_max_static, - maskfrac_max_dynamic, - maskfrac_max_magic, - maskfrac_max_advisory, deteff, deteff_err, deteff_lq, deteff_uq, - quality, - background_model, - astrom_chips, - - ast_r0, - ast_d0, - ast_t0, - ast_s0, - ast_rs, - ast_ds + quality ); - if (!camProcessedExpInsertObject(config->dbh, row)) { + if (!fpcamProcessedExpInsertObject(config->dbh, row)) { // rollback if (!psDBRollback(config->dbh)) { @@ -708,5 +451,4 @@ psError(PS_ERR_UNKNOWN, false, "database error"); psFree(row); - psFree(pendingRow); return false; } @@ -714,5 +456,4 @@ if (fault) { psFree(row); - psFree(pendingRow); if (!psDBCommit(config->dbh)) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -723,38 +464,8 @@ // else continue on... - - // Set camRun.software_ver to the appropriate value - if (!pxSetRunSoftware(config, "camRun", "cam_id", cam_id, software_ver)) { - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "failed to set camRun.software_ver for cam_id: %" PRId64, - cam_id); - psFree(output); - return(false); - } - // Set chipRun.maskfrac* to the appropriate values. - if (maskfrac_ref_npix) { - if (!pxCamSetRunMaskfrac(config, "camRun", "cam_id",cam_id, - (float) maskfrac_ref_npix, maskfrac_ref_static, - maskfrac_ref_dynamic, maskfrac_ref_magic, maskfrac_ref_advisory, - (float) maskfrac_max_npix, maskfrac_max_static, - maskfrac_max_dynamic, maskfrac_max_magic, maskfrac_max_advisory)) { - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "failed to set camRun.maskstats for cam_id: %" PRId64, - cam_id); - psFree(output); - return(false); - } - } - // since there is only one exp per 'new' set camRun.state = 'full' - // propagate magicked state from chipRun - if (!pxcamRunSetState(config, row->cam_id, "full", chip_magicked)) { - psError(PS_ERR_UNKNOWN, false, "failed to change camRun.state for cam_id: %" PRId64, row->cam_id); + if (!pxfpcamRunSetState(config, row->fpcam_id, "full")) { + psError(PS_ERR_UNKNOWN, false, "failed to change fpcamRun.state for fpcam_id: %" PRId64, row->fpcam_id); psFree(row); - psFree(pendingRow); return false; } @@ -762,39 +473,5 @@ psFree(row); - // EAM: NULL for end_stage means go as far as possible - // Also, we can run fake even if tess_id is not defined - // but stop if quality is non-zero. - if ((quality > 0) || (pendingRow->end_stage && psStrcasestr(pendingRow->end_stage, "cam"))) { - psFree(pendingRow); - if (!psDBCommit(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - return true; - } - - if (!pxfakeQueueByCamID(config, - pendingRow->cam_id, - pendingRow->workdir, - pendingRow->label, - pendingRow->data_group, - pendingRow->dist_group, - pendingRow->reduction, - pendingRow->expgroup, - pendingRow->dvodb, - pendingRow->tess_id, - pendingRow->end_stage, - NULL // note does not propagate - )) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "failed to queue new fakeRun"); - psFree(pendingRow); - return false; - } - - psFree(pendingRow); + // fpcam is a stand-alone stage: it does not trigger another stage to follow if (!psDBCommit(config->dbh)) { @@ -802,8 +479,6 @@ return false; } - - return true; -} - + return true; +} static bool processedexpMode(pxConfig *config) @@ -811,17 +486,18 @@ PS_ASSERT_PTR_NON_NULL(config, false); + // some options PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); - PXOPT_LOOKUP_BOOL(pstamp_order, config->args, "-pstamp_order", false); // generate restrictions psMetadata *where = psMetadataAlloc(); - pxcamGetSearchArgs (config, where); - PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); - pxAddLabelSearchArgs (config, where, "-label", "camRun.label", "=="); - 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", "=="); + pxfpcamGetSearchArgs (config, where); + PXOPT_COPY_S64(config->args, where, "-fpcam_id", "fpcamRun.fpcam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-cam_id", "fpcamRun.cam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-chip_id", "fpcamRun.chip_id", "=="); + pxAddLabelSearchArgs (config, where, "-label", "fpcamRun.label", "=="); + pxAddLabelSearchArgs (config, where, "-data_group", "fpcamRun.data_group", "LIKE"); + PXOPT_COPY_STR(config->args, where, "-reduction", "fpcamRun.reduction", "=="); psString where2 = NULL; @@ -830,16 +506,11 @@ return false; } - if (!pxmagicAddWhere(config, &where2, "chipRun")) { - psError(psErrorCodeLast(), false, "pxSpaceAddWhere failed"); - return false; - } - if (!psListLength(where->list) && !where2 && - !psMetadataLookupBool(NULL, config->args, "-all")) { + if (!psListLength(where->list) && !where2) { psFree(where); - psError(PXTOOLS_ERR_CONFIG, false, "search parameters (or -all) are required"); - return false; - } - - psString query = pxDataGet("camtool_find_processedexp.sql"); + psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); + return false; + } + + psString query = pxDataGet("fpcamtool_find_processedexp.sql"); if (!query) { psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); @@ -856,17 +527,17 @@ if (where->list && faulted) { // list only faulted rows - psStringAppend(&query, " %s", " AND camProcessedExp.fault != 0"); + psStringAppend(&query, " %s", " AND fpcamProcessedExp.fault != 0"); } if (where->list && !faulted) { // don't list faulted rows - psStringAppend(&query, " %s", " AND camProcessedExp.fault = 0"); + psStringAppend(&query, " %s", " AND fpcamProcessedExp.fault = 0"); } if (!where->list && faulted) { // list only faulted rows - psStringAppend(&query, " %s", " WHERE camProcessedExp.fault != 0"); + psStringAppend(&query, " %s", " WHERE fpcamProcessedExp.fault != 0"); } if (!where->list && !faulted) { // don't list faulted rows - psStringAppend(&query, " %s", " WHERE camProcessedExp.fault = 0"); + psStringAppend(&query, " %s", " WHERE fpcamProcessedExp.fault = 0"); } psFree(where); @@ -874,11 +545,4 @@ psStringAppend(&query, " %s", where2); psFree(where2); - } - - - if (pstamp_order) { - // put runs in order of exposure id with newest chip Runs first - // The postage stamp parser depends on this behavior - psStringAppend(&query, " ORDER BY exp_id, cam_id DESC"); } @@ -903,5 +567,5 @@ } if (!psArrayLength(output)) { - psTrace("camtool", PS_LOG_INFO, "no rows found"); + psTrace("fpcamtool", PS_LOG_INFO, "no rows found"); psFree(output); return true; @@ -909,5 +573,5 @@ // negate simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "camProcessedExp", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "fpcamProcessedExp", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -926,11 +590,16 @@ psMetadata *where = psMetadataAlloc(); - pxcamGetSearchArgs (config, where); - PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); - pxAddLabelSearchArgs (config, where, "-label", "camRun.label", "=="); - PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction", "=="); - PXOPT_COPY_S16(config->args, where, "-fault", "camProcessedExp.fault", "=="); - - if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) { + pxfpcamGetSearchArgs (config, where); + + PXOPT_COPY_S64(config->args, where, "-fpcam_id", "fpcamRun.fpcam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-cam_id", "fpcamRun.cam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-chip_id", "fpcamRun.chip_id", "=="); + PXOPT_COPY_STR(config->args, where, "-reduction", "fpcamRun.reduction", "=="); + PXOPT_COPY_S16(config->args, where, "-fault", "fpcamProcessedExp.fault", "=="); + + pxAddLabelSearchArgs (config, where, "-label", "fpcamRun.label", "=="); + pxAddLabelSearchArgs (config, where, "-data_group", "fpcamRun.data_group", "LIKE"); + + if (!psListLength(where->list)) { psFree(where); psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); @@ -946,5 +615,5 @@ psString whereClause = NULL; { - psString query = pxDataGet("camtool_revertprocessedexp.sql"); + psString query = pxDataGet("fpcamtool_revertprocessedexp.sql"); if (!query) { // rollback @@ -982,8 +651,8 @@ return false; } - psLogMsg("camtool", PS_LOG_INFO, "Deleted %d camProcessedExps", numDeleted); + psLogMsg("fpcamtool", PS_LOG_INFO, "Deleted %d fpcamProcessedExps", numDeleted); { - psString query = pxDataGet("camtool_revertupdatedexp.sql"); + psString query = pxDataGet("fpcamtool_revertupdatedexp.sql"); if (!query) { psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); @@ -1004,5 +673,5 @@ } int numUpdated = psDBAffectedRows(config->dbh); - psLogMsg("camtool", PS_LOG_INFO, "Updated %d camProcessedExps", numUpdated); + psLogMsg("fpcamtool", PS_LOG_INFO, "Updated %d fpcamProcessedExps", numUpdated); return true; @@ -1016,35 +685,18 @@ PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false); PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", false, false); - 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"); + + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-fpcam_id", "fpcam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); + + if (!pxSetFaultCode(config->dbh, "fpcamProcessedExp", where, fault, quality)) { + psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag"); psFree (where); return false; - } - psFree (where); - } - return true; -} - + } + psFree (where); + return true; +} static bool blockMode(pxConfig *config) @@ -1054,12 +706,10 @@ PXOPT_LOOKUP_STR(label, config->args, "-label", true, false); - if (!camMaskInsert(config->dbh, label)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - return true; -} - + if (!fpcamMaskInsert(config->dbh, label)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + return true; +} static bool maskedMode(pxConfig *config) @@ -1069,5 +719,5 @@ PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - psString query = psStringCopy("SELECT * FROM camMask"); + psString query = psStringCopy("SELECT * FROM fpcamMask"); if (!p_psDBRunQuery(config->dbh, query)) { @@ -1084,5 +734,5 @@ } if (!psArrayLength(output)) { - psTrace("camtool", PS_LOG_INFO, "no rows found"); + psTrace("fpcamtool", PS_LOG_INFO, "no rows found"); psFree(output); return true; @@ -1090,5 +740,5 @@ // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "camMask", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "fpcamMask", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -1097,8 +747,6 @@ psFree(output); - - return true; -} - + return true; +} static bool unblockMode(pxConfig *config) @@ -1108,5 +756,5 @@ PXOPT_LOOKUP_STR(label, config->args, "-label", true, false); - char *query = "DELETE FROM camMask WHERE label = '%s'"; + char *query = "DELETE FROM fpcamMask WHERE label = '%s'"; if (!p_psDBRunQueryF(config->dbh, query, label)) { @@ -1118,347 +766,2 @@ } -static bool pendingcleanuprunMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, NULL); - - PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); - PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - PXOPT_LOOKUP_BOOL(all, config->args, "-all", false); - - psMetadata *where = psMetadataAlloc(); - pxAddLabelSearchArgs (config, where, "-label", "camRun.label", "=="); - - psString query = pxDataGet("camtool_pendingcleanuprun.sql"); - if (!query) { - psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - return false; - } - - if (psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } else { - if (!all) { - psError(PXTOOLS_ERR_SYS, false, "unrestricted query not allowed (try -all)"); - return false; - } - } - psFree(where); - - // treat limit == 0 as "no limit" - if (limit) { - psString limitString = psDBGenerateLimitSQL(limit); - psStringAppend(&query, " %s", limitString); - psFree(limitString); - } - - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - return false; - } - psFree(query); - - psArray *output = p_psDBFetchResult(config->dbh); - if (!output) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - if (!psArrayLength(output)) { - psTrace("camtool", PS_LOG_INFO, "no rows found"); - psFree(output); - return true; - } - - // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "camPendingCleanupRun", !simple)) { - psError(PS_ERR_UNKNOWN, false, "failed to print array"); - psFree(output); - return false; - } - - psFree(output); - - return true; -} - - -static bool pendingcleanupexpMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, NULL); - - PXOPT_LOOKUP_S64(cam_id, config->args, "-cam_id", false, false); - PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); - PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - PXOPT_LOOKUP_BOOL(all, config->args, "-all", false); - - psMetadata *where = psMetadataAlloc(); - if (cam_id) { - PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "=="); - } - pxAddLabelSearchArgs (config, where, "-label", "label", "=="); - - psString query = pxDataGet("camtool_pendingcleanupexp.sql"); - if (!query) { - psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - return false; - } - - if (psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } else { - if (!all) { - psError(PXTOOLS_ERR_SYS, false, "unrestricted query not allowed (try -all)"); - return false; - } - } - psFree(where); - - // treat limit == 0 as "no limit" - if (limit) { - psString limitString = psDBGenerateLimitSQL(limit); - psStringAppend(&query, " %s", limitString); - psFree(limitString); - } - - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - return false; - } - psFree(query); - - psArray *output = p_psDBFetchResult(config->dbh); - if (!output) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - if (!psArrayLength(output)) { - psTrace("chiptool", PS_LOG_INFO, "no rows found"); - psFree(output); - return true; - } - - // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "camPendingCleanupExp", !simple)) { - psError(PS_ERR_UNKNOWN, false, "failed to print array"); - psFree(output); - return false; - } - - psFree(output); - - return true; -} - - -static bool donecleanupMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, NULL); - - PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); - PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - - psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); - - psString query = pxDataGet("camtool_donecleanup.sql"); - if (!query) { - psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - return false; - } - - if (where && psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } - psFree(where); - - // treat limit == 0 as "no limit" - if (limit) { - psString limitString = psDBGenerateLimitSQL(limit); - psStringAppend(&query, " %s", limitString); - psFree(limitString); - } - - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - return false; - } - psFree(query); - - psArray *output = p_psDBFetchResult(config->dbh); - if (!output) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - if (!psArrayLength(output)) { - psTrace("camtool", PS_LOG_INFO, "no rows found"); - psFree(output); - return true; - } - - // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "camDoneCleanup", !simple)) { - psError(PS_ERR_UNKNOWN, false, "failed to print array"); - psFree(output); - return false; - } - - psFree(output); - - return true; -} - -bool exportrunMode(pxConfig *config) -{ - typedef struct ExportTable { - char tableName[80]; - char sqlFilename[80]; - } ExportTable; - - int numExportTables = 2; - - PS_ASSERT_PTR_NON_NULL(config, NULL); - - // PXOPT_LOOKUP_S64(det_id, config->args, "-cam_id", true, false); - PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true, false); - PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); - PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false); - - FILE *f = fopen (outfile, "w"); - if (f == NULL) { - psError(PS_ERR_UNKNOWN, false, "failed to open output file"); - return false; - } - - if (!pxExportVersion(config, f)) { - psError(PS_ERR_UNKNOWN, false, "failed to write dbversion output file"); - return false; - } - - psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "=="); - - ExportTable tables [] = { - {"camRun", "camtool_export_run.sql"}, - {"camProcessedExp", "camtool_export_processed_exp.sql"}, - }; - - for (int i=0; i < numExportTables; i++) { - psString query = pxDataGet(tables[i].sqlFilename); - if (!query) { - psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - return false; - } - - if (where && psListLength(where->list)) { - psString whereClause = psDBGenerateWhereSQL(where, NULL); - psStringAppend(&query, " %s", whereClause); - psFree(whereClause); - } - - // treat limit == 0 as "no limit" - if (limit) { - psString limitString = psDBGenerateLimitSQL(limit); - psStringAppend(&query, " %s", limitString); - psFree(limitString); - } - - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - return false; - } - psFree(query); - - psArray *output = p_psDBFetchResult(config->dbh); - if (!output) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - if (!psArrayLength(output)) { - psError(PS_ERR_UNKNOWN, true, "no rows found"); - psFree(output); - return false; - } - - if (clean) { - if (!strcmp(tables[i].tableName, "camRun")) { - if (!pxSetStateCleaned("camRun", "state", output)) { - psFree(output); - psError(PS_ERR_UNKNOWN, false, "pxSetStateClean failed for table %s", tables[i].tableName); - return false; - } - } - } - - // we must write the export table in non-simple (true) format - if (!ippdbPrintMetadatas(f, output, tables[i].tableName, true)) { - psError(PS_ERR_UNKNOWN, false, "failed to print array"); - psFree(output); - return false; - } - psFree(output); - } - - fclose (f); - - return true; -} - -bool importrunMode(pxConfig *config) -{ - unsigned int nFail; - - PS_ASSERT_PTR_NON_NULL(config, NULL); - - PXOPT_LOOKUP_STR(infile, config->args, "-infile", true, false); - - psMetadata *input = psMetadataConfigRead (NULL, &nFail, infile, false); - -#ifdef notdef - fprintf (stderr, "---- input ----\n"); - psMetadataPrint (stderr, input, 1); -#endif - - if (!pxCheckImportVersion(config, input)) { - psError(PS_ERR_UNKNOWN, false, "pxCheckImportVersion failed"); - return false; - } - - psMetadataItem *item = psMetadataLookup (input, "camRun"); - psAssert (item, "entry not in input?"); - psAssert (item->type == PS_DATA_METADATA_MULTI, "entry not multi?"); - - psMetadataItem *entry = psListGet (item->data.list, 0); - assert (entry); - assert (entry->type == PS_DATA_METADATA); - camRunRow *camRun = camRunObjectFromMetadata (entry->data.md); - camRunInsertObject (config->dbh, camRun); - - // fprintf (stdout, "---- cam run ----\n"); - // psMetadataPrint (stderr, entry->data.md, 1); - - item = psMetadataLookup (input, "camProcessedExp"); - psAssert (item, "entry not in input?"); - psAssert (item->type == PS_DATA_METADATA_MULTI, "entry not multi?"); - - for (int i = 0; i < item->data.list->n; i++) { - psMetadataItem *entry = psListGet (item->data.list, i); - assert (entry); - assert (entry->type == PS_DATA_METADATA); - camProcessedExpRow *camProcessedExp = camProcessedExpObjectFromMetadata (entry->data.md); - camProcessedExpInsertObject (config->dbh, camProcessedExp); - - // fprintf (stdout, "---- row %d ----\n", i); - // psMetadataPrint (stderr, entry->data.md, 1); - } - - return true; -} Index: /branches/eam_branches/ipp-20220316/ippTools/src/fpcamtool.h =================================================================== --- /branches/eam_branches/ipp-20220316/ippTools/src/fpcamtool.h (revision 42197) +++ /branches/eam_branches/ipp-20220316/ippTools/src/fpcamtool.h (revision 42197) @@ -0,0 +1,41 @@ +/* + * fpcamtool.h + * + * Copyright (C) 2006 Joshua Hoblitt + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * program; see the file COPYING. If not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef FPCAMTOOL_H +#define FPCAMTOOL_H 1 + +#include "pxtools.h" + +typedef enum { + FPCAMTOOL_MODE_NONE = 0x0, + FPCAMTOOL_MODE_DEFINEBYQUERY, + FPCAMTOOL_MODE_UPDATERUN, + FPCAMTOOL_MODE_PENDINGEXP, + FPCAMTOOL_MODE_ADDPROCESSEDEXP, + FPCAMTOOL_MODE_PROCESSEDEXP, + FPCAMTOOL_MODE_REVERTPROCESSEDEXP, + FPCAMTOOL_MODE_UPDATEPROCESSEDEXP, + FPCAMTOOL_MODE_BLOCK, + FPCAMTOOL_MODE_MASKED, + FPCAMTOOL_MODE_UNBLOCK, +} fpcamtoolMode; + +pxConfig *fpcamtoolConfig(pxConfig *config, int argc, char **argv); + +#endif // FPCAMTOOL_H Index: /branches/eam_branches/ipp-20220316/ippTools/src/fpcamtoolConfig.c =================================================================== --- /branches/eam_branches/ipp-20220316/ippTools/src/fpcamtoolConfig.c (revision 42196) +++ /branches/eam_branches/ipp-20220316/ippTools/src/fpcamtoolConfig.c (revision 42197) @@ -1,4 +1,4 @@ /* - * camtoolConfig.c + * fpcamtoolConfig.c * * Copyright (C) 2006 Joshua Hoblitt @@ -28,8 +28,8 @@ #include "pxtools.h" -#include "pxcam.h" -#include "camtool.h" - -pxConfig *camtoolConfig(pxConfig *config, int argc, char **argv) +#include "pxfpcam.h" +#include "fpcamtool.h" + +pxConfig *fpcamtoolConfig(pxConfig *config, int argc, char **argv) { if (!config) { @@ -48,22 +48,18 @@ // -definebyquery - // XXX need to allow multiple chip_ids - // XXX need to allow multiple exp_ids psMetadata *definebyqueryArgs = psMetadataAlloc(); - pxcamSetSearchArgs(definebyqueryArgs); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by chipRun label", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, "search by chipRun reduction class", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-data_group", 0, "search by chipRun data_group", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-obs_mode", 0, "search by rawExp obs_mode", NULL); - + pxfpcamSetSearchArgs(definebyqueryArgs); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-chip_label", PS_META_DUPLICATE_OK, "search by chipRun label", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-chip_reduction", 0, "search by chipRun reduction class", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-chip_data_group", 0, "search by chipRun data_group", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-cam_label", PS_META_DUPLICATE_OK, "search by camRun label", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-cam_reduction", 0, "search by camRun reduction class", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-cam_data_group", 0, "search by camRun data_group", NULL); psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_workdir", 0, "define workdir", NULL); psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_reduction", 0, "define reduction class", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_expgroup", 0, "define exposure group", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_dvodb", 0, "define DVO db", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_tess_id", 0, "define tess ID", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_end_stage", 0, "define end stage", NULL); psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_data_group", 0, "define data group", NULL); psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_dist_group", 0, "define dist group", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_reduction", 0, "define reduction class", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_dvodb", 0, "define DVO db", NULL); psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_note", 0, "define note", NULL); psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend", 0, "do not actual modify the database", false); @@ -71,60 +67,32 @@ // -updaterun - // XXX need to allow multiple cam_ids - // XXX need to allow multiple chip_ids - // XXX need to allow multiple exp_ids psMetadata *updaterunArgs = psMetadataAlloc(); - pxcamSetSearchArgs(updaterunArgs); - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-cam_id", 0, "search by cam_id", 0); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "search by camRun label", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-data_group", 0, "search by camRun data_group", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "search by camRun state", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction", 0, "search by camRun reduction class", NULL); - psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); + pxfpcamSetSearchArgs(updaterunArgs); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-fpcam_id", 0, "search by fpcam_id", 0); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "search by fpcamRun state", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "search by fpcamRun label", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-data_group", 0, "search by fpcamRun data_group", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-dist_group", 0, "search by fpcamRun dist_group", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction", 0, "search by fpcamRun reduction class", NULL); psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_state", 0, "set state", NULL); psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_label", 0, "set label", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_data_group", 0, "define new data_group", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_dist_group", 0, "define new dist_group", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_note", 0, "define new note", NULL); - pxmagicAddArguments(updaterunArgs); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_data_group", 0, "define new data_group", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_dist_group", 0, "define new dist_group", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_note", 0, "define new note", NULL); // -pendingexp psMetadata *pendingexpArgs = psMetadataAlloc(); - pxcamSetSearchArgs(pendingexpArgs); - psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-cam_id", 0, "search by cam_id", 0); - psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by camRun label", NULL); - psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-reduction", 0, "search by camRun reduction class", NULL); + pxfpcamSetSearchArgs(pendingexpArgs); + psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-fpcam_id", 0, "search by fpcam_id", 0); + psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by fpcamRun label", NULL); + psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-reduction", 0, "search by fpcamRun reduction class", NULL); psMetadataAddU64(pendingexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); - // -pendingimfile - psMetadata *pendingimfileArgs = psMetadataAlloc(); - pxcamSetSearchArgs(pendingimfileArgs); - psMetadataAddS64(pendingimfileArgs, PS_LIST_TAIL, "-cam_id", 0, "search by camtool ID", 0); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by camRun label", NULL); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-reduction",0, "search by camRun reduction class", NULL); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); - psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); - - // XXX is this used? psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class", 0, "search by class", NULL); - // -addprocessedexp psMetadata *addprocessedexpArgs = psMetadataAlloc(); - psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-cam_id", 0, "define camtool ID (required)", 0); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-uri", 0, "define URI (required)", NULL); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background stdev", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposure background mean stdev", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-bias", 0, "define bias", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-bias_stdev", 0, "define bias stdev", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fringe_0", 0, "define fringe term 0", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fringe_1", 0, "define fringe term 1", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fringe_2", 0, "define fringe term 2", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-sigma_ra", 0, "define exposure E ra", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-sigma_dec", 0, "define exposure E dec", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ap_resid", 0, "define aperture residual", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ap_resid_stdev", 0, "define aperture residual stdev", NAN); + psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-fpcam_id", 0, "define fpcamtool ID (required)", 0); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", NULL); psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zpt_obs", 0, "define observed zero point", 0); @@ -133,72 +101,10 @@ psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zpt_lq", 0, "define observed zero point lower quartile", 0); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fwhm_major", 0, "define fwhm (major axis; arcsec)", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fwhm_major_lq", 0, "define fwhm (major axis; arcsec)", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fwhm_major_uq", 0, "define fwhm (major axis; arcsec)", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fwhm_minor", 0, "define fwhm (minor axis; arcsec)", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fwhm_minor_lq", 0, "define fwhm (minor axis; arcsec)", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fwhm_minor_uq", 0, "define fwhm (minor axis; arcsec)", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_fwhm_major", 0, "define moment value m2 mean", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_fwhm_major_err", 0, "define moment value m2 mean", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_fwhm_minor", 0, "define moment value m2 mean", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_fwhm_minor_err", 0, "define moment value m2 mean", NAN); - - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m2", 0, "define moment value m2 mean", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m2_err", 0, "define moment value m2 stdev", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m2_lq", 0, "define moment value m2 lower quartile", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m2_uq", 0, "define moment value m2 upper quartile", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m2c", 0, "define moment value m2c mean", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m2c_err", 0, "define moment value m2c stdev", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m2c_lq", 0, "define moment value m2c lower quartile", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m2c_uq", 0, "define moment value m2c upper quartile", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m2s", 0, "define moment value m2s mean", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m2s_err", 0, "define moment value m2s stdev", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m2s_lq", 0, "define moment value m2s lower quartile", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m2s_uq", 0, "define moment value m2s upper quartile", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m3", 0, "define moment value m3 mean", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m3_err", 0, "define moment value m3 stdev", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m3_lq", 0, "define moment value m3 lower quartile", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m3_uq", 0, "define moment value m3 upper quartile", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m4", 0, "define moment value m4 mean", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m4_err", 0, "define moment value m4 stdev", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m4_lq", 0, "define moment value m4 lower quartile", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-iq_m4_uq", 0, "define moment value m4 upper quartile", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-dtime_script", 0, "define elapsed time in script (seconds)", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-dtime_astrom", 0, "define elapsed time for astrometry (seconds)", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-dtime_addstar", 0, "define elapsed time for DVO insertion (seconds)", NAN); psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-hostname", 0, "define hostname", NULL); psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_stars", 0, "define number of stars", 0); - psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_psfstars", 0, "define number of PSF stars", 0); - psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_iqstars", 0, "define number of IQ stars", 0); - psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_extended", 0, "define number of extended objects", 0); - psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_cr", 0, "define number of cosmic rays", 0); - psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_astrom", 0, "define number of astrometry reference objects", 0); - - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", NULL); + psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-fault", 0, "set fault code", 0); psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-quality", 0, "set quality", 0); - psMetadataAddBool(addprocessedexpArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); - psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-magicked", 0, "set magicked", 0); - - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_pslib", 0, "define psLib version", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_psmodules", 0, "define psModules version", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_psphot", 0, "define psphot version", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_psastro", 0, "define psastro version", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_ppstats", 0, "define ppStats version", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_ppimage", 0, "define ppImage version", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_streaks", 0, "define streaksremove version", NULL); - - psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_ref_npix", 0, "define number of pixels used for maskstats", 0); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_ref_static", 0, "define static mask fraction", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_ref_dynamic", 0, "define dynamic mask fraction", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_ref_magic", 0, "define magic mask fraction", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_ref_advisory", 0, "define advisory mask fraction", NAN); - - psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_max_npix", 0, "define number of pixels used for maskstats", 0); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_max_static", 0, "define static mask fraction", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_max_dynamic", 0, "define dynamic mask fraction", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_max_magic", 0, "define magic mask fraction", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_max_advisory", 0, "define advisory mask fraction", NAN); psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-deteff_inst", 0, "define deteff", NAN); @@ -206,41 +112,30 @@ 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); - psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-astrom_chips", 0, "chips with successful astrom", 0); - - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_r0", 0, "define boresite offset in RA", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_d0", 0, "define boresite offset in DEC", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_t0", 0, "define boresite angle", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_s0", 0, "define bosite scale", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_rs", 0, "define bosite scatter in RA", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_ds", 0, "define bosite scatter in DEC", NAN); + + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_pslib", 0, "define psLib version", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_psmodules", 0, "define psModules version", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_psphot", 0, "define psphot version", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_ppstats", 0, "define ppStats version", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_fpcamera", 0, "define ppImage version", NULL); // -processedexp psMetadata *processedexpArgs = psMetadataAlloc(); - pxcamSetSearchArgs(processedexpArgs); - psMetadataAddS64(processedexpArgs, PS_LIST_TAIL, "-cam_id", 0, "search by cam_id", 0); - psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by camRun label", NULL); - psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by camRun data_group (LIKE comparison)", NULL); - psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-reduction",0, "search by camRun reduction class", NULL); + pxfpcamSetSearchArgs(processedexpArgs); + psMetadataAddS64(processedexpArgs, PS_LIST_TAIL, "-fpcam_id", 0, "search by fpcam_id", 0); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by fpcamRun label", NULL); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by fpcamRun data_group (LIKE comparison)", NULL); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-reduction",0, "search by fpcamRun reduction class", NULL); pxspaceAddArguments(processedexpArgs); - pxmagicAddArguments(processedexpArgs); - - psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-pstamp_order", 0, "order the results for the postage stamp server", false); psMetadataAddU64(processedexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); - psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-all", 0, "list everything without restriction", false); 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 - // XXX need to allow multiple cam_ids - // XXX need to allow multiple chip_ids - // XXX need to allow multiple exp_ids psMetadata *revertprocessedexpArgs = psMetadataAlloc(); - pxcamSetSearchArgs(revertprocessedexpArgs); + pxfpcamSetSearchArgs(revertprocessedexpArgs); psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-cam_id", 0, "search by cam_id", 0); - psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by camRun label", NULL); - psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-reduction",0, "search by camRun reduction class", NULL); + psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by fpcamRun label", NULL); + psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-reduction",0, "search by fpcamRun reduction class", NULL); psMetadataAddS16(revertprocessedexpArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); @@ -249,13 +144,10 @@ // -updateprocessedexp - // XXX allow full search options? psMetadata *updateprocessedexpArgs = psMetadataAlloc(); - psMetadataAddS64(updateprocessedexpArgs, PS_LIST_TAIL, "-cam_id", 0, "search by camtool ID", 0); - psMetadataAddS64(updateprocessedexpArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chiptool ID", 0); - psMetadataAddStr(updateprocessedexpArgs, PS_LIST_TAIL, "-class", 0, "search by class", NULL); - psMetadataAddStr(updateprocessedexpArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); + psMetadataAddS64(updateprocessedexpArgs, PS_LIST_TAIL, "-fpcam_id", 0, "search by fpcamRun ID", 0); + psMetadataAddS64(updateprocessedexpArgs, PS_LIST_TAIL, "-cam_id", 0, "search by camRun ID", 0); + psMetadataAddS64(updateprocessedexpArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chipRun ID", 0); 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 @@ -271,59 +163,21 @@ psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label", 0, "name of a label to unmask (required)", NULL); - // -pendingcleanuprun - // XXX allow full search options? - psMetadata *pendingcleanuprunArgs = psMetadataAlloc(); - psMetadataAddStr(pendingcleanuprunArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "list blocks for specified label", NULL); - psMetadataAddBool(pendingcleanuprunArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - psMetadataAddU64(pendingcleanuprunArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); - psMetadataAddBool(pendingcleanuprunArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); - - // -pendingcleanupexp - // XXX allow full search options? - psMetadata *pendingcleanupexpArgs = psMetadataAlloc(); - psMetadataAddStr(pendingcleanupexpArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "list blocks for specified label", NULL); - psMetadataAddS64(pendingcleanupexpArgs, PS_LIST_TAIL, "-cam_id", 0, "search by camera ID", 0); - psMetadataAddStr(pendingcleanupexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", NULL); - psMetadataAddBool(pendingcleanupexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - psMetadataAddU64(pendingcleanupexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); - psMetadataAddBool(pendingcleanupexpArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); - - // -donecleanup - psMetadata *donecleanupArgs = psMetadataAlloc(); - psMetadataAddStr(donecleanupArgs, PS_LIST_TAIL, "-label", 0, "list blocks for specified label", NULL); - psMetadataAddBool(donecleanupArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - psMetadataAddU64(donecleanupArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); - - // -exportrun - psMetadata *exportrunArgs = psMetadataAlloc(); - psMetadataAddS64(exportrunArgs, PS_LIST_TAIL, "-cam_id", 0, "export this camera ID (required)", 0); - psMetadataAddStr(exportrunArgs, PS_LIST_TAIL, "-outfile", 0, "export to this file (required)", NULL); - psMetadataAddU64(exportrunArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); - psMetadataAddBool(exportrunArgs, PS_LIST_TAIL, "-clean", 0, "export tables as cleaned", false); - - // -importrun - psMetadata *importrunArgs = psMetadataAlloc(); - psMetadataAddStr(importrunArgs, PS_LIST_TAIL, "-infile", 0, "import from this file (required)", NULL); - + /* cleanup and export stages ignored for now. + see camtool.c & camtoolConfig.c for examples + */ psMetadata *argSets = psMetadataAlloc(); psMetadata *modes = psMetadataAlloc(); - PXOPT_ADD_MODE("-definebyquery", "create runs from chip stage", CAMTOOL_MODE_DEFINEBYQUERY, definebyqueryArgs); - PXOPT_ADD_MODE("-updaterun", "change cam run properties", CAMTOOL_MODE_UPDATERUN, updaterunArgs); - PXOPT_ADD_MODE("-pendingexp", "show pending exposures", CAMTOOL_MODE_PENDINGEXP, pendingexpArgs); - PXOPT_ADD_MODE("-pendingimfile", "show pending imfiles", CAMTOOL_MODE_PENDINGIMFILE, pendingimfileArgs); - PXOPT_ADD_MODE("-addprocessedexp", "add a processed exposure", CAMTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs); - PXOPT_ADD_MODE("-processedexp", "show processed exposures", CAMTOOL_MODE_PROCESSEDEXP, processedexpArgs); - PXOPT_ADD_MODE("-revertprocessedexp", "undo a processed exposure", CAMTOOL_MODE_REVERTPROCESSEDEXP, revertprocessedexpArgs); - PXOPT_ADD_MODE("-updateprocessedexp", "changed processed exp properties", CAMTOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpArgs); - PXOPT_ADD_MODE("-block", "set a label block", CAMTOOL_MODE_BLOCK, blockArgs); - PXOPT_ADD_MODE("-masked", "show blocked labels", CAMTOOL_MODE_MASKED, maskedArgs); - PXOPT_ADD_MODE("-unblock", "remove a label block", CAMTOOL_MODE_UNBLOCK, unblockArgs); - PXOPT_ADD_MODE("-pendingcleanuprun", "show runs that need to be cleaned up", CAMTOOL_MODE_PENDINGCLEANUPRUN, pendingcleanuprunArgs); - PXOPT_ADD_MODE("-pendingcleanupexp", "show exposures for cleanup runs", CAMTOOL_MODE_PENDINGCLEANUPEXP, pendingcleanupexpArgs); - PXOPT_ADD_MODE("-donecleanup", "show runs that have been cleaned", CAMTOOL_MODE_DONECLEANUP, donecleanupArgs); - PXOPT_ADD_MODE("-exportrun", "export run for import on other database", CAMTOOL_MODE_EXPORTRUN, exportrunArgs); - PXOPT_ADD_MODE("-importrun", "import run from metadata file", CAMTOOL_MODE_IMPORTRUN, importrunArgs); + PXOPT_ADD_MODE("-definebyquery", "create runs from chip stage", FPCAMTOOL_MODE_DEFINEBYQUERY, definebyqueryArgs); + PXOPT_ADD_MODE("-updaterun", "change cam run properties", FPCAMTOOL_MODE_UPDATERUN, updaterunArgs); + PXOPT_ADD_MODE("-pendingexp", "show pending exposures", FPCAMTOOL_MODE_PENDINGEXP, pendingexpArgs); + PXOPT_ADD_MODE("-addprocessedexp", "add a processed exposure", FPCAMTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs); + PXOPT_ADD_MODE("-processedexp", "show processed exposures", FPCAMTOOL_MODE_PROCESSEDEXP, processedexpArgs); + PXOPT_ADD_MODE("-revertprocessedexp", "undo a processed exposure", FPCAMTOOL_MODE_REVERTPROCESSEDEXP, revertprocessedexpArgs); + PXOPT_ADD_MODE("-updateprocessedexp", "changed processed exp properties", FPCAMTOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpArgs); + PXOPT_ADD_MODE("-block", "set a label block", FPCAMTOOL_MODE_BLOCK, blockArgs); + PXOPT_ADD_MODE("-masked", "show blocked labels", FPCAMTOOL_MODE_MASKED, maskedArgs); + PXOPT_ADD_MODE("-unblock", "remove a label block", FPCAMTOOL_MODE_UNBLOCK, unblockArgs); if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) { Index: /branches/eam_branches/ipp-20220316/ippTools/src/pxfpcam.c =================================================================== --- /branches/eam_branches/ipp-20220316/ippTools/src/pxfpcam.c (revision 42197) +++ /branches/eam_branches/ipp-20220316/ippTools/src/pxfpcam.c (revision 42197) @@ -0,0 +1,306 @@ +/* + * pxfpcam.c + * + * Copyright (C) 2007 Joshua Hoblitt + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * program; see the file COPYING. If not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "pxtools.h" +#include "pxfpcam.h" + +bool pxfpcamSetSearchArgs (psMetadata *md) { + + // standard query options for fpcamera + psMetadataAddS64(md, PS_LIST_TAIL, "-chip_id", 0, "search by chip_id", 0); + psMetadataAddS64(md, PS_LIST_TAIL, "-cam_id", 0, "search by cam_id", 0); + psMetadataAddS64(md, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(md, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); + psMetadataAddStr(md, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); + psMetadataAddStr(md, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); + psMetadataAddTime(md, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(md, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddStr(md, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); + psMetadataAddStr(md, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", NULL); + psMetadataAddStr(md, PS_LIST_TAIL, "-comment", 0, "search by comment", NULL); + psMetadataAddStr(md, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); + psMetadataAddStr(md, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); + psMetadataAddF64(md, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-ra_min", 0, "define min RA (degrees) ", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-ra_max", 0, "define max RA (degrees) ", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-decl_min", 0, "define min DEC (degrees)", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-decl_max", 0, "define max DEC (degrees)", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-exp_time_min", 0, "define min exposure time", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-exp_time_max", 0, "define max exposure time", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "define max fraction of saturated pixels", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "define max fraction of saturated pixels", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-bg_min", 0, "define min background", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-bg_max", 0, "define max background", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-bg_stdev_min", 0, "define min background standard deviation", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-bg_stdev_max", 0, "define max background standard deviation", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "define min background mean standard deviation (across imfiles)", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "define max background mean standard deviation (across imfiles)", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-alt_min", 0, "define min altitude", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-alt_max", 0, "define max altitude", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-az_min", 0, "define min azimuth ", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-az_max", 0, "define max azimuth ", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(md, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddStr(md, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); + psMetadataAddF32(md, PS_LIST_TAIL, "-sun_angle_min", 0, "define min solar angle", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-sun_angle_max", 0, "define max solar angle", NAN); + + return true; +} + +bool pxfpcamGetSearchArgs (pxConfig *config, psMetadata *where) { + + // only add the rawExp constraints to the where MD + // chip and cam constraints are added independently to two different where MDs + PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "=="); + PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "=="); + PXOPT_COPY_STR(config->args, where, "-inst", "rawExp.camera", "=="); + PXOPT_COPY_STR(config->args, where, "-telescope", "rawExp.telescope", "=="); + PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "rawExp.dateobs", ">="); + PXOPT_COPY_TIME(config->args, where, "-dateobs_end", "rawExp.dateobs", "<="); + PXOPT_COPY_STR(config->args, where, "-exp_tag", "rawExp.exp_tag", "=="); + PXOPT_COPY_STR(config->args, where, "-exp_type", "rawExp.exp_type", "=="); + PXOPT_COPY_STR(config->args, where, "-obs_mode", "rawExp.obs_mode", "=="); + PXOPT_COPY_STR(config->args, where, "-comment", "rawExp.comment", "LIKE"); + PXOPT_COPY_STR(config->args, where, "-filelevel", "rawExp.filelevel", "=="); + PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "LIKE"); + PXOPT_COPY_F64(config->args, where, "-airmass_min", "rawExp.airmass", ">="); + PXOPT_COPY_F64(config->args, where, "-airmass_max", "rawExp.airmass", "<"); + PXOPT_COPY_RADEC(config->args, where, "-ra_min", "rawExp.ra", ">="); + PXOPT_COPY_RADEC(config->args, where, "-ra_max", "rawExp.ra", "<"); + PXOPT_COPY_RADEC(config->args, where, "-decl_min", "rawExp.decl", ">="); + PXOPT_COPY_RADEC(config->args, where, "-decl_max", "rawExp.decl", "<"); + PXOPT_COPY_F32(config->args, where, "-exp_time_min", "rawExp.exp_time", ">="); + PXOPT_COPY_F32(config->args, where, "-exp_time_max", "rawExp.exp_time", "<"); + PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_min", "rawExp.sat_pixel_frac", ">="); + PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_max", "rawExp.sat_pixel_frac", "<"); + PXOPT_COPY_F64(config->args, where, "-bg_min", "rawExp.bg", ">="); + PXOPT_COPY_F64(config->args, where, "-bg_max", "rawExp.bg", "<"); + PXOPT_COPY_F64(config->args, where, "-bg_stdev_min", "rawExp.bg_stdev", ">="); + PXOPT_COPY_F64(config->args, where, "-bg_stdev_max", "rawExp.bg_stdev", "<"); + PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_min", "rawExp.bg_mean_stdev", ">="); + PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_max", "rawExp.bg_mean_stdev", "<"); + PXOPT_COPY_F64(config->args, where, "-alt_min", "rawExp.alt", ">="); + PXOPT_COPY_F64(config->args, where, "-alt_max", "rawExp.alt", "<"); + PXOPT_COPY_F64(config->args, where, "-az_min", "rawExp.az", ">="); + PXOPT_COPY_F64(config->args, where, "-az_max", "rawExp.az", "<"); + PXOPT_COPY_F32(config->args, where, "-ccd_temp_min", "rawExp.ccd_temp", ">="); + PXOPT_COPY_F32(config->args, where, "-ccd_temp_max", "rawExp.ccd_temp", "<"); + PXOPT_COPY_F64(config->args, where, "-posang_min", "rawExp.posang", ">="); + PXOPT_COPY_F64(config->args, where, "-posang_max", "rawExp.posang", "<"); + PXOPT_COPY_STR(config->args, where, "-object", "rawExp.object", "=="); + PXOPT_COPY_F32(config->args, where, "-sun_angle_min", "rawExp.sun_angle", ">="); + PXOPT_COPY_F32(config->args, where, "-sun_angle_max", "rawExp.sun_angle", "<"); + + return true; +} + + +bool pxfpcamRunSetState(pxConfig *config, psS64 fpcam_id, const char *state) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PS_ASSERT_PTR_NON_NULL(state, false); + + // check that state is a valid string value + if (!pxIsValidState(state)) { + psError(PS_ERR_UNKNOWN, false, "invalid fpcamRun state: %s", state); + return false; + } + + char *query = "UPDATE fpcamRun SET state = '%s' WHERE fpcam_id = %" PRId64; + if (!p_psDBRunQueryF(config->dbh, query, state, fpcam_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to change state for fpcam_id %" PRId64, fpcam_id); + return false; + } + + return true; +} + +bool pxfpcamQueueByCamAndChipID(pxConfig *config, + psS64 chip_id, + psS64 cam_id, + char *workdir, + char *label, + char *data_group, + char *dist_group, + char *reduction, + char *dvodb, + char *note) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + + // load the SQL to enqueue our exp_ids from disk once + static psString query = NULL; + if (!query) { + query = pxDataGet("fpcamtool_queue_cam_id.sql"); + psMemSetPersistent(query, true); + if (!query) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + return false; + } + } + + // queue the exposure + if (!p_psDBRunQueryF(config->dbh, query, + (long long) chip_id, + (long long) cam_id, + "new", // state + workdir ? workdir : "NULL", + "dirty", // workdir_state + label ? label : "NULL", + data_group ? data_group : "NULL", + dist_group ? dist_group : "NULL", + reduction ? reduction : "NULL", + dvodb ? dvodb : "NULL", + note ? note : "NULL" + )) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + // just to be safe, we should have changed at least one row + if (psDBAffectedRows(config->dbh) < 1) { + psError(PS_ERR_UNKNOWN, false, + "no rows affected - should have changed at least one row"); + return false; + } + + return true; +} + +/** fpcamInsertRow tools **/ + +static void fpcamInsertRowFree(fpcamInsertRow *object) +{ + psFree(object->state); + psFree(object->workdir); + psFree(object->workdir_state); + psFree(object->label); + psFree(object->data_group); + psFree(object->dist_group); + psFree(object->reduction); + psFree(object->dvodb); + psFree(object->software_ver); + psFree(object->note); +} + +static fpcamInsertRow *fpcamInsertRowAlloc(psS64 chip_id, psS64 cam_id, + const char *state, const char *workdir, const char *workdir_state, + const char *label, const char *data_group, const char *dist_group, + const char *reduction, const char *dvodb, const char *software_ver, const char *note) +{ + fpcamInsertRow *_object; + + _object = psAlloc(sizeof(fpcamInsertRow)); + psMemSetDeallocator(_object, (psFreeFunc)fpcamInsertRowFree); + + _object->chip_id = chip_id; + _object->cam_id = cam_id; + _object->state = psStringCopy(state); + _object->workdir = psStringCopy(workdir); + _object->workdir_state = psStringCopy(workdir_state); + _object->label = psStringCopy(label); + _object->data_group = psStringCopy(data_group); + _object->dist_group = psStringCopy(dist_group); + _object->reduction = psStringCopy(reduction); + _object->dvodb = psStringCopy(dvodb); + _object->software_ver = psStringCopy(software_ver); + _object->note = psStringCopy(note); + + return _object; +} + +fpcamInsertRow *fpcamInsertObjectFromMetadata(psMetadata *md) +{ + +bool status = false; + psS64 chip_id = psMetadataLookupS64(&status, md, "chip_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item chip_id"); + return false; + } + psS64 cam_id = psMetadataLookupS64(&status, md, "cam_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item cam_id"); + return false; + } + char* state = psMetadataLookupPtr(&status, md, "state"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item state"); + return false; + } + char* workdir = psMetadataLookupPtr(&status, md, "workdir"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item workdir"); + return false; + } + char* workdir_state = psMetadataLookupPtr(&status, md, "workdir_state"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item workdir_state"); + return false; + } + char* label = psMetadataLookupPtr(&status, md, "label"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item label"); + return false; + } + char* data_group = psMetadataLookupPtr(&status, md, "data_group"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item data_group"); + return false; + } + char* dist_group = psMetadataLookupPtr(&status, md, "dist_group"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dist_group"); + return false; + } + char* reduction = psMetadataLookupPtr(&status, md, "reduction"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item reduction"); + return false; + } + char* dvodb = psMetadataLookupPtr(&status, md, "dvodb"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dvodb"); + return false; + } + char* software_ver = psMetadataLookupPtr(&status, md, "software_ver"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item software_ver"); + return false; + } + char* note = psMetadataLookupPtr(&status, md, "note"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item note"); + return false; + } + + return fpcamInsertRowAlloc(chip_id, cam_id, state, workdir, workdir_state, label, data_group, dist_group, reduction, dvodb, software_ver, note); +} Index: /branches/eam_branches/ipp-20220316/ippTools/src/pxfpcam.h =================================================================== --- /branches/eam_branches/ipp-20220316/ippTools/src/pxfpcam.h (revision 42197) +++ /branches/eam_branches/ipp-20220316/ippTools/src/pxfpcam.h (revision 42197) @@ -0,0 +1,65 @@ +/* + * pxfpcam.h + * + * Copyright (C) 2007 Joshua Hoblitt + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * program; see the file COPYING. If not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef PXFPCAM_H +#define PXFPCAM_H 1 + +#include + +#include "pxtools.h" + +bool pxfpcamSetSearchArgs (psMetadata *md); +bool pxfpcamGetSearchArgs (pxConfig *config, psMetadata *where); + +bool pxfpcamRunSetState(pxConfig *config, psS64 cam_id, const char *state); + +bool pxfpcamQueueByCamAndChipID(pxConfig *config, + psS64 chip_id, + psS64 cam_id, + char *workdir, + char *label, + char *data_group, + char *dist_group, + char *reduction, + char *dvodb, + char *note); + +/* Structure for fpcamInsertRow. The fpcamRun is different from most because it merges the + fields of possibly different chipRun and camRuns. We cannot use the standard camRunRow + tools because those functions refer to the linked chip_id. + */ + +typedef struct { + psS64 chip_id; + psS64 cam_id; + char *state; + char *workdir; + char *workdir_state; + char *label; + char *data_group; + char *dist_group; + char *reduction; + char *dvodb; + char *software_ver; + char *note; +} fpcamInsertRow; + +fpcamInsertRow *fpcamInsertObjectFromMetadata(psMetadata *md); + +#endif // PXFPCAM_H