Index: /branches/eam_branch_20080706/ippTools/share/dettool_addprocessedexp.sql =================================================================== --- /branches/eam_branch_20080706/ippTools/share/dettool_addprocessedexp.sql (revision 18468) +++ /branches/eam_branch_20080706/ippTools/share/dettool_addprocessedexp.sql (revision 18468) @@ -0,0 +1,34 @@ +SELECT DISTINCT + detProcessedImfile.det_id, + detRun.iteration, + detRun.det_type, + detProcessedImfile.exp_id +FROM detRun +JOIN detInputExp + ON detRun.det_id = detInputExp.det_id + AND detRun.iteration = detInputExp.iteration +JOIN rawExp + ON detInputExp.exp_id = rawExp.exp_id +JOIN detProcessedImfile + ON detInputExp.det_id = detProcessedImfile.det_id + AND detInputExp.exp_id = detProcessedImfile.exp_id +LEFT JOIN detProcessedExp + ON detInputExp.det_id = detProcessedExp.det_id + AND detProcessedImfile.exp_id= detProcessedExp.exp_id +LEFT JOIN rawImfile + ON detInputExp.exp_id = rawImfile.exp_id + AND detProcessedImfile.class_id = rawImfile.class_id +WHERE + detRun.state = 'run' + AND detRun.mode = 'master' + AND detProcessedExp.det_id IS NULL + AND detProcessedExp.exp_id IS NULL + AND detInputExp.include = 1 + AND detRun.det_id = %s + AND detProcessedImfile.exp_id = '%s' +GROUP BY + detProcessedImfile.class_id, + rawImfile.class_id, + detRun.det_id +HAVING + COUNT(detProcessedImfile.class_id) = COUNT(rawImfile.class_id) Index: /branches/eam_branch_20080706/ippTools/share/dettool_childlessrun.sql =================================================================== --- /branches/eam_branch_20080706/ippTools/share/dettool_childlessrun.sql (revision 18468) +++ /branches/eam_branch_20080706/ippTools/share/dettool_childlessrun.sql (revision 18468) @@ -0,0 +1,11 @@ +-- dettool -childlessrun + +SELECT DISTINCT + detRun.* + FROM detRun + LEFT JOIN detRun as foo + ON foo.parent = detRun.det_id + WHERE + detRun.state = 'stop' + AND detRun.mode = 'master' + AND foo.det_id IS NULL Index: /branches/eam_branch_20080706/ippTools/share/dettool_definebydetrun.sql =================================================================== --- /branches/eam_branch_20080706/ippTools/share/dettool_definebydetrun.sql (revision 18468) +++ /branches/eam_branch_20080706/ippTools/share/dettool_definebydetrun.sql (revision 18468) @@ -0,0 +1,12 @@ +-- dettool -definebydetrun + +INSERT INTO detInputExp + SELECT + %d, + 0, + detResidExp.exp_id, + detResidExp.accept + FROM detResidExp + JOIN rawExp + USING(exp_id) + WHERE det_id = %d Index: /branches/eam_branch_20080706/ippTools/share/dettool_input.sql =================================================================== --- /branches/eam_branch_20080706/ippTools/share/dettool_input.sql (revision 18468) +++ /branches/eam_branch_20080706/ippTools/share/dettool_input.sql (revision 18468) @@ -0,0 +1,4 @@ +SELECT DISTINCT * + FROM detInputExp + JOIN rawExp + USING(exp_id) Index: /branches/eam_branch_20080706/ippTools/share/dettool_normalizedimfile.sql =================================================================== --- /branches/eam_branch_20080706/ippTools/share/dettool_normalizedimfile.sql (revision 18468) +++ /branches/eam_branch_20080706/ippTools/share/dettool_normalizedimfile.sql (revision 18468) @@ -0,0 +1,8 @@ +SELECT + detNormalizedImfile.* + FROM detNormalizedImfile + JOIN detRun + USING(det_id, iteration) + WHERE + detRun.state = 'run' + AND detRun.mode = 'master' Index: /branches/eam_branch_20080706/ippTools/share/dettool_pending.sql =================================================================== --- /branches/eam_branch_20080706/ippTools/share/dettool_pending.sql (revision 18468) +++ /branches/eam_branch_20080706/ippTools/share/dettool_pending.sql (revision 18468) @@ -0,0 +1,10 @@ +-- dettool -pending : not sure this is still used (EAM : 2008.07.10) + +SELECT + rawExp.* + FROM rawExp + LEFT JOIN detInputExp + ON rawExp.exp_id = detInputExp.exp_id + WHERE + detInputExp.exp_id IS NULL + AND rawExp.object != 'object' Index: /branches/eam_branch_20080706/ippTools/share/dettool_processedimfile.sql =================================================================== --- /branches/eam_branch_20080706/ippTools/share/dettool_processedimfile.sql (revision 18468) +++ /branches/eam_branch_20080706/ippTools/share/dettool_processedimfile.sql (revision 18468) @@ -0,0 +1,13 @@ +SELECT DISTINCT + detRun.det_type, + rawExp.exp_time, + detProcessedImfile.* +FROM detProcessedImfile +JOIN detRun + USING(det_id) +JOIN detInputExp + ON detRun.det_id = detInputExp.det_id + AND detRun.iteration = detInputExp.iteration + AND detProcessedImfile.exp_id = detInputExp.exp_id +JOIN rawExp + ON rawExp.exp_id = detProcessedImfile.exp_id Index: /branches/eam_branch_20080706/ippTools/share/dettool_stacked.sql =================================================================== --- /branches/eam_branch_20080706/ippTools/share/dettool_stacked.sql (revision 18468) +++ /branches/eam_branch_20080706/ippTools/share/dettool_stacked.sql (revision 18468) @@ -0,0 +1,12 @@ +-- select detStackedImfile.* +-- by: +-- where det_id, iteration, class_id is not in detNormalizedImfile + +SELECT + detStackedImfile.* + FROM detStackedImfile + JOIN detRun + USING(det_id, iteration) + WHERE + detRun.state = 'run' + AND detRun.mode = 'master' Index: /branches/eam_branch_20080706/ippTools/share/dettool_tonormalize.sql =================================================================== --- /branches/eam_branch_20080706/ippTools/share/dettool_tonormalize.sql (revision 18468) +++ /branches/eam_branch_20080706/ippTools/share/dettool_tonormalize.sql (revision 18468) @@ -0,0 +1,27 @@ +SELECT DISTINCT + detRun.det_type, + detRun.workdir, + rawExp.camera, + detStackedImfile.uri, + detNormalizedStatImfile.* + FROM detRun + JOIN detStackedImfile + USING(det_id, iteration) + JOIN detInputExp + USING(det_id, iteration) + JOIN rawExp + ON detInputExp.exp_id = rawExp.exp_id + JOIN detNormalizedStatImfile + ON detStackedImfile.det_id = detNormalizedStatImfile.det_id + AND detStackedImfile.iteration = detNormalizedStatImfile.iteration + AND detStackedImfile.class_id = detNormalizedStatImfile.class_id + LEFT JOIN detNormalizedImfile + ON detNormalizedStatImfile.det_id = detNormalizedImfile.det_id + AND detNormalizedStatImfile.iteration = detNormalizedImfile.iteration + AND detNormalizedStatImfile.class_id = detNormalizedImfile.class_id + WHERE + detNormalizedImfile.det_id IS NULL + AND detNormalizedImfile.iteration IS NULL + AND detNormalizedImfile.class_id IS NULL + AND detNormalizedStatImfile.fault = 0 + AND detRun.state = 'run' Index: /branches/eam_branch_20080706/ippTools/src/caltoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/caltoolConfig.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/caltoolConfig.c (revision 18468) @@ -106,48 +106,10 @@ psFree(modes); - // setup search criterion -#define addWhereStr(name) \ -{ \ - psString str = NULL; \ - bool status = false; \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - // generate SQL where clause config->where = psMetadataAlloc(); - addWhereStr(det_id); - { - // XXX this is broke because you can't specify -iteration 0 - psMetadataItem *item = psMetadataLookup(config->args, "-iteration"); - if (item && psStrcasestr(item->comment, "found")) { - if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "iteration", 0, "==", item->data.S32)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item iteration"); - psFree(config); - return NULL; - } - } - } - - addWhereStr(det_id); - - // convert '-code' to 'fault' - { - psS16 fault = 0; - bool status = false; - if ((fault = psMetadataLookupS16(&status, config->args, "-code"))) { - if (!psMetadataAddS16(config->where, PS_LIST_TAIL, "fault", 0, "==", fault)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); - psFree(config); - return NULL; - } - } - } + PXOPT_ADD_WHERE_STR(det_id); + PXOPT_ADD_WHERE_S32(iteration); + PXOPT_ADD_WHERE_S16_ALIAS("-code", "fault"); if (config->where->list->n < 1) { Index: /branches/eam_branch_20080706/ippTools/src/camtool.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/camtool.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/camtool.c (revision 18468) @@ -110,5 +110,4 @@ PXOPT_COPY_STR(config->args, where, "-reduction", "reduction", "=="); PXOPT_COPY_STR(config->args, where, "-filter", "filter", "=="); - PXOPT_COPY_F64(config->args, where, "-airmass_min", "airmass", ">="); PXOPT_COPY_F64(config->args, where, "-airmass_max", "airmass", "<"); @@ -162,4 +161,5 @@ } + // use psDBGenerateWhereSQL because the SQL yields an intermediate table if (where && psListLength(where->list)) { psString whereClause = psDBGenerateWhereSQL(where, NULL); @@ -263,5 +263,4 @@ PXOPT_COPY_STR(config->args, where, "-reduction", "reduction", "=="); PXOPT_COPY_STR(config->args, where, "-filter", "filter", "=="); - PXOPT_COPY_F64(config->args, where, "-airmass_min", "airmass", ">="); PXOPT_COPY_F64(config->args, where, "-airmass_max", "airmass", "<"); @@ -334,4 +333,8 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -343,9 +346,11 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereSQL(config->where, NULL); - psStringAppend(&query, " %s", whereClause); + // use psDBGenerateWhereSQL because the SQL yields an intermediate table + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereSQL(where, NULL); + psStringAppend(&query, "%s", whereClause); psFree(whereClause); } + psFree(where); // treat limit == 0 as "no limit" @@ -390,4 +395,10 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); + PXOPT_COPY_STR(config->args, where, "-class", "class", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -398,9 +409,11 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereSQL(config->where, NULL); - psStringAppend(&query, " %s", whereClause); + // use psDBGenerateWhereSQL because the SQL yields an intermediate table + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereSQL(where, NULL); + psStringAppend(&query, "%s", whereClause); psFree(whereClause); } + psFree(where); if (!p_psDBRunQuery(config->dbh, query)) { @@ -463,25 +476,14 @@ PXOPT_LOOKUP_F32(dtime_astrom, config->args, "-dtime_astrom", false, false); PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false); - PXOPT_LOOKUP_F32(n_stars, config->args, "-n_stars", false, false); - PXOPT_LOOKUP_F32(n_extended, config->args, "-n_extended", false, false); - if (n_extended < 0) { - psError(PS_ERR_UNKNOWN, true, "-n_extended is required"); - return false; - } - PXOPT_LOOKUP_F32(n_cr, config->args, "-n_cr", false, false); - if (n_cr < 0) { - psError(PS_ERR_UNKNOWN, true, "-n_cr is required"); - return false; - } - PXOPT_LOOKUP_F32(n_astrom, config->args, "-n_astrom", false, false); - if (n_astrom < 0) { - psError(PS_ERR_UNKNOWN, true, "-n_astrom is required"); - return false; - } - + PXOPT_LOOKUP_S32(n_stars, config->args, "-n_stars", 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); - - // default PXOPT_LOOKUP_S16(code, config->args, "-code", false, false); + + // generate restrictions + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "=="); psString query = pxDataGet("camtool_find_pendingexp.sql"); @@ -491,24 +493,11 @@ } - { - // build a query to search by cam_id - psMetadata *where = psMetadataAlloc(); - if (cam_id) { - if (!psMetadataAddS64(where, PS_LIST_TAIL, "cam_id", 0, "==", cam_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item cam_id"); - psFree(where); - psFree(query); - return false; - } - } - + // use psDBGenerateWhereSQL because the SQL yields an intermediate table + if (psListLength(where->list)) { psString whereClaus = psDBGenerateWhereSQL(where, NULL); - psFree(where); - if (whereClaus) { - psStringAppend(&query, " %s", whereClaus); - psFree(whereClaus); - } - - } + psStringAppend(&query, "%s", whereClaus); + psFree(whereClaus); + } + psFree(where); if (!p_psDBRunQuery(config->dbh, query)) { @@ -640,4 +629,9 @@ PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); + // generate restrictions + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); + psString query = pxDataGet("camtool_find_processedexp.sql"); if (!query) { @@ -646,9 +640,11 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, NULL); + // use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); if (faulted) { @@ -716,7 +712,6 @@ PXOPT_COPY_STR(config->args, where, "-reduction", "reduction", "=="); PXOPT_COPY_STR(config->args, where, "-filter", "filter", "=="); - - PXOPT_COPY_F64(config->args, where, "-airmass_min", "airmass", ">="); - PXOPT_COPY_F64(config->args, where, "-airmass_max", "airmass", "<"); + PXOPT_COPY_F32(config->args, where, "-airmass_min", "airmass", ">="); + PXOPT_COPY_F32(config->args, where, "-airmass_max", "airmass", "<"); PXOPT_COPY_F64(config->args, where, "-ra_min", "ra", ">="); PXOPT_COPY_F64(config->args, where, "-ra_max", "ra", "<"); @@ -745,6 +740,5 @@ PXOPT_COPY_F32(config->args, where, "-solang_max", "solang", "<"); - if (!psListLength(where->list) - && !psMetadataLookupBool(NULL, config->args, "-all")) { + if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) { psFree(where); psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); @@ -758,61 +752,63 @@ } -{ - psString query = pxDataGet("camtool_reset_faulted_runs.sql"); - if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); - psFree(where); - return false; - } - - if (where && psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } - - if (!p_psDBRunQuery(config->dbh, query)) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - psFree(where); - return false; - } - psFree(query); -} - -{ - psString query = pxDataGet("camtool_revertprocessedexp.sql"); - if (!query) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); - psFree(where); - return false; - } - - if (where && psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, NULL); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } - - if (!p_psDBRunQuery(config->dbh, query)) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - psFree(where); - return false; - } - psFree(query); -} + { + psString query = pxDataGet("camtool_reset_faulted_runs.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psFree(where); + return false; + } + + // use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE + if (where && psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " AND %s", whereClause); + psFree(whereClause); + } + + if (!p_psDBRunQuery(config->dbh, query)) { + // rollback + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + psFree(where); + return false; + } + psFree(query); + } + + { + psString query = pxDataGet("camtool_revertprocessedexp.sql"); + if (!query) { + // rollback + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psFree(where); + return false; + } + + // use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE + if (where && psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " AND %s", whereClause); + psFree(whereClause); + } + + if (!p_psDBRunQuery(config->dbh, query)) { + // rollback + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + psFree(where); + return false; + } + psFree(query); + } psFree(where); @@ -832,8 +828,16 @@ PXOPT_LOOKUP_S16(code, config->args, "-code", true, false); - if (!pxSetFaultCode(config->dbh, "camProcessedExp", config->where, code)) { + 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, code)) { psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag"); - return false; - } + psFree (where); + return false; + } + psFree (where); return true; Index: /branches/eam_branch_20080706/ippTools/src/camtoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/camtoolConfig.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/camtoolConfig.c (revision 18468) @@ -47,415 +47,230 @@ // -definebyquery + // XXX need to allow multiple chip_ids + // XXX need to allow multiple exp_ids psMetadata *definebydefinebyqueryArgs = psMetadataAlloc(); + psMetadataAddS64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip_id", 0); + psMetadataAddS64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); + psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", NULL); + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL); + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ra_min", 0, "define min", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ra_max", 0, "define max", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-decl_min", 0, "define min", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-decl_max", 0, "define max", NAN); + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min", NAN); + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max", NAN); + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "define max fraction of saturated pixels", NAN); + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "define min fraction of saturated pixels", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_min", 0, "define max", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_max", 0, "define max", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "define max", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "define max", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "define max", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "define max", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-alt_min", 0, "define min", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-alt_max", 0, "define max", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-az_min", 0, "define min", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-az_max", 0, "define max", NAN); + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_workdir", 0, "define workdir", NULL); + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL); + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_reduction", 0, "define reduction class", NULL); + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_expgroup", 0, "define exposure group", NULL); + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_dvodb", 0, "define DVO db", NULL); + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_tess_id", 0, "define tess ID", NULL); + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_end_stage", 0, "define end stage", NULL); + psMetadataAddBool(definebydefinebyqueryArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); + + // -updaterun + // XXX need to allow multiple cam_ids // XXX need to allow multiple chip_ids - psMetadataAddS64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-chip_id", 0, - "search by chip_id", 0); // XXX need to allow multiple exp_ids - psMetadataAddS64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exp_id", 0); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_name", 0, - "search by exp_name", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-inst", 0, - "search for camera", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-telescope", 0, - "search for telescope", NULL); - psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-dateobs_begin", 0, - "search for exposures by time (>=)", NULL); - psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-dateobs_end", 0, - "search for exposures by time (<)", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_tag", 0, - "search by exp_tag", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_type", 0, - "search by exp_type", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-filelevel", 0, - "search by filelevel", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, - "search by reduction class", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-filter", 0, - "search for filter", NULL); - psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-airmass_min", 0, - "define min airmass", NAN); - psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-airmass_max", 0, - "define max airmass", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ra_min", 0, - "define min", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ra_max", 0, - "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-decl_min", 0, - "define min", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-decl_max", 0, - "define max", NAN); - psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_time_min", 0, - "define min", NAN); - psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_time_max", 0, - "define max", NAN); - psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, - "define max fraction of saturated pixels", NAN); - psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, - "define min fraction of saturated pixels", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_min", 0, - "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_max", 0, - "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-alt_min", 0, - "define min", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-alt_max", 0, - "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-az_min", 0, - "define min", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-az_max", 0, - "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, - "define min ccd tempature", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, - "define max ccd tempature", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-posang_min", 0, - "define min rotator position angle", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-posang_max", 0, - "define max rotator position angle", NAN); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-object", 0, - "search by exposure object", NULL); - psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-solang_min", 0, - "define min solar angle", NAN); - psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-solang_max", 0, - "define max solar angle", NAN); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_workdir", 0, - "define workdir", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_label", 0, - "define label", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_reduction", 0, - "define reduction class", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_expgroup", 0, - "define exposure group", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_dvodb", 0, - "define DVO db", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_tess_id", 0, - "define tess ID", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_end_stage", 0, - "define end stage", NULL); - psMetadataAddBool(definebydefinebyqueryArgs, PS_LIST_TAIL, "-all", 0, - "allow everything to be queued without search terms", false); - - // -updaterun psMetadata *updaterunArgs = psMetadataAlloc(); - // XXX need to allow multiple cam_ids - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-cam_id", 0, - "search by cam_id", 0); - // XXX need to allow multiple chip_ids - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-chip_id", 0, - "search by chip_id", 0); - // XXX need to allow multiple exp_ids - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exp_id", 0); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_name", 0, - "search by exp_name", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-inst", 0, - "search for camera", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-telescope", 0, - "search for telescope", NULL); - psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_begin", 0, - "search for exposures by time (>=)", NULL); - psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_end", 0, - "search for exposures by time (<)", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_tag", 0, - "search by exp_tag", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_type", 0, - "search by exp_type", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filelevel", 0, - "search by filelevel", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction", 0, - "search by reduction class", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filter", 0, - "search for filter", NULL); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_min", 0, - "define min airmass", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_max", 0, - "define max airmass", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_min", 0, - "define min", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_min", 0, - "define min", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_max", 0, - "define max", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_min", 0, - "define min", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_max", 0, - "define max", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, - "define max fraction of saturated pixels", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, - "define min fraction of saturated pixels", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_min", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_min", 0, - "define min", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_min", 0, - "define min", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, - "define min ccd tempature", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, - "define max ccd tempature", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_min", 0, - "define min rotator position angle", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_max", 0, - "define max rotator position angle", NAN); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-object", 0, - "search by exposure object", NULL); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_min", 0, - "define min solar angle", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_max", 0, - "define max solar angle", NAN); - - psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all", 0, - "allow everything to be queued without search terms", false); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, - "set state", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, - "set label", NULL); - + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-cam_id", 0, "search by cam_id", 0); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip_id", 0); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); + psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_min", 0, "define min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_min", 0, "define min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_max", 0, "define max", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "define max fraction of saturated pixels", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "define min fraction of saturated pixels", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_min", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_min", 0, "define min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_min", 0, "define min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_max", 0, "define max", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + + psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "set state", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "set label", NULL); // -pendingexp psMetadata *pendingexpArgs = psMetadataAlloc(); - psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-cam_id", 0, - "search by camtool ID", 0); - psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-chip_id", 0, - "search by chiptool ID", 0); - 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); - + psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-cam_id", 0, "search by camtool ID", 0); + psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chiptool ID", 0); + 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); // -pendingimfile psMetadata *pendingimfileArgs = psMetadataAlloc(); - psMetadataAddS64(pendingimfileArgs, PS_LIST_TAIL, "-cam_id", 0, - "search by camtool ID", 0); - psMetadataAddS64(pendingimfileArgs, PS_LIST_TAIL, "-chip_id", 0, - "search by chiptool ID", 0); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class", 0, - "search by 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); - + psMetadataAddS64(pendingimfileArgs, PS_LIST_TAIL, "-cam_id", 0, "search by camtool ID", 0); + psMetadataAddS64(pendingimfileArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chiptool ID", 0); + psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class", 0, "search by 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); // -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); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zp_mean", 0, - "define zero point mean", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zp_stdev", 0, - "define zero point stdev", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fwhm_major", 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, "-dtime_detrend", 0, - "define elapsed detrend processing time (seconds)", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-dtime_photom", 0, - "define elapsed photometry processing time (seconds)", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-dtime_astrom", 0, - "define elapsed astrometry processing time (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_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, "-code", 0, - "set fault code", 0); - psMetadataAddBool(addprocessedexpArgs, PS_LIST_TAIL, "-faulted", 0, - "only return imfiles with a fault status set", false); + 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); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zp_mean", 0, "define zero point mean", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zp_stdev", 0, "define zero point stdev", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fwhm_major", 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, "-dtime_detrend", 0, "define elapsed detrend processing time (seconds)", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-dtime_photom", 0, "define elapsed photometry processing time (seconds)", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-dtime_astrom", 0, "define elapsed astrometry processing time (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_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, "-code", 0, "set fault code", 0); + psMetadataAddBool(addprocessedexpArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); // -processedexp psMetadata *processedexpArgs = psMetadataAlloc(); - psMetadataAddS64(processedexpArgs, PS_LIST_TAIL, "-cam_id", 0, - "search by camtool ID", 0); - psMetadataAddS64(processedexpArgs, PS_LIST_TAIL, "-chip_id", 0, - "search by chiptool ID", 0); - psMetadataAddU64(processedexpArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - 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); + psMetadataAddS64(processedexpArgs, PS_LIST_TAIL, "-cam_id", 0, "search by camtool ID", 0); + psMetadataAddS64(processedexpArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chiptool ID", 0); + psMetadataAddU64(processedexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + 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); // -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(); - // XXX need to allow multiple cam_ids - psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-cam_id", 0, - "search by cam_id", 0); - // XXX need to allow multiple chip_ids - psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-chip_id", 0, - "search by chip_id", 0); - // XXX need to allow multiple exp_ids - psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exp_id", 0); - psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_name", 0, - "search by exp_name", NULL); - psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-inst", 0, - "search for camera", NULL); - psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-telescope", 0, - "search for telescope", NULL); - psMetadataAddTime(revertprocessedexpArgs, PS_LIST_TAIL, "-dateobs_begin", 0, - "search for exposures by time (>=)", NULL); - psMetadataAddTime(revertprocessedexpArgs, PS_LIST_TAIL, "-dateobs_end", 0, - "search for exposures by time (<)", NULL); - psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_tag", 0, - "search by exp_tag", NULL); - psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_type", 0, - "search by exp_type", NULL); - psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-filelevel", 0, - "search by filelevel", NULL); - psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-reduction", 0, - "search by reduction class", NULL); - psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-filter", 0, - "search for filter", NULL); - psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-airmass_min", 0, - "define min airmass", NAN); - psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-airmass_max", 0, - "define max airmass", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-ra_min", 0, - "define min", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-ra_max", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-decl_min", 0, - "define min", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-decl_max", 0, - "define max", NAN); - psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_time_min", 0, - "define min", NAN); - psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_time_max", 0, - "define max", NAN); - psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, - "define max fraction of saturated pixels", NAN); - psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, - "define min fraction of saturated pixels", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-bg_min", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-bg_max", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-alt_min", 0, - "define min", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-alt_max", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-az_min", 0, - "define min", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-az_max", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, - "define min ccd tempature", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, - "define max ccd tempature", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-posang_min", 0, - "define min rotator position angle", NAN); - psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-posang_max", 0, - "define max rotator position angle", NAN); - psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-object", 0, - "search by exposure object", NULL); - psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-solang_min", 0, - "define min solar angle", NAN); - psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-solang_max", 0, - "define max solar angle", NAN); - - psMetadataAddBool(revertprocessedexpArgs, PS_LIST_TAIL, "-all", 0, - "allow everything to be queued without search terms", false); - psMetadataAddS16(revertprocessedexpArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); + psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-cam_id", 0, "search by cam_id", 0); + psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip_id", 0); + psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); + psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); + psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); + psMetadataAddTime(revertprocessedexpArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(revertprocessedexpArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); + psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", NULL); + psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); + psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL); + psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); + psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); + psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); + psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-ra_min", 0, "define min", NAN); + psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-ra_max", 0, "define max", NAN); + psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-decl_min", 0, "define min", NAN); + psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-decl_max", 0, "define max", NAN); + psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min", NAN); + psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max", NAN); + psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "define max fraction of saturated pixels", NAN); + psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "define min fraction of saturated pixels", NAN); + psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-bg_min", 0, "define max", NAN); + psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-bg_max", 0, "define max", NAN); + psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "define max", NAN); + psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "define max", NAN); + psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "define max", NAN); + psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "define max", NAN); + psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-alt_min", 0, "define min", NAN); + psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-alt_max", 0, "define max", NAN); + psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-az_min", 0, "define min", NAN); + psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-az_max", 0, "define max", NAN); + psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); + psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); + psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(revertprocessedexpArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); + psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); + psMetadataAddF32(revertprocessedexpArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + + psMetadataAddBool(revertprocessedexpArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); + psMetadataAddS16(revertprocessedexpArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); // -updateprocessedexp 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); - psMetadataAddS16(updateprocessedexpArgs, PS_LIST_TAIL, "-code", 0, - "set fault code (required)", INT16_MAX); + 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); + psMetadataAddS16(updateprocessedexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", INT16_MAX); // -block psMetadata *blockArgs = psMetadataAlloc(); - psMetadataAddStr(blockArgs, PS_LIST_TAIL, "-label", 0, - "name of a label to mask out (required)", NULL); + psMetadataAddStr(blockArgs, PS_LIST_TAIL, "-label", 0, "name of a label to mask out (required)", NULL); // -masked psMetadata *maskedArgs = psMetadataAlloc(); - psMetadataAddBool(maskedArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddBool(maskedArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -unblock psMetadata *unblockArgs = psMetadataAlloc(); - psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label", 0, - "name of a label to unmask (required)", NULL); + psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label", 0, "name of a label to unmask (required)", NULL); psMetadata *argSets = psMetadataAlloc(); @@ -485,90 +300,19 @@ psFree(modes); - // setup search criterion -#define addWhereStr(name) \ -{ \ - psString str = NULL; \ - bool status = false; \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - // generate SQL where clause - config->where = psMetadataAlloc(); - -{ - psS64 cam_id = -1; - bool status = false; - if ((cam_id = psMetadataLookupS64(&status, config->args, "-cam_id"))) { - if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "cam_id", 0, "==", cam_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item cam_id"); - psFree(config); - return NULL; - } - } -} - -{ - psString str = NULL; - bool status = false; - if ((str = psMetadataLookupStr(&status, config->args, "-chip_id"))) { - if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "chip_id", 0, "==", (psS64)atoll(str))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); - psFree(config); - return NULL; - } - } -} - - // convert '-inst' to 'camera' - { - psString str = NULL; - bool status = false; - if ((str = psMetadataLookupStr(&status, config->args, "-inst"))) { - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, "camera", 0, "==", str)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item camera"); - psFree(config); - return NULL; - } - } - } - addWhereStr(telescope); - addWhereStr(exp_type); - { - int imfiles = 0; - bool status = false; - if ((imfiles = psMetadataLookupS32(&status, config->args, "-imfiles"))) { - if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "imfiles", 0, "==", imfiles)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles"); - psFree(config); - return NULL; - } - } - } - addWhereStr(class_id); - addWhereStr(filter); - - // convert '-code' to 'fault' - { - psS16 fault = 0; - bool status = false; - if ((fault = psMetadataLookupS16(&status, config->args, "-code"))) { - if (!psMetadataAddS16(config->where, PS_LIST_TAIL, "fault", 0, "==", fault)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); - psFree(config); - return NULL; - } - } - } - - if (psListLength(config->where->list) < 1) { - psFree(config->where); - config->where = NULL; - } + // XXX config->where = psMetadataAlloc(); + // XXX PXOPT_ADD_WHERE_S64(cam_id); + // XXX PXOPT_ADD_WHERE_S64(chip_id); + // XXX PXOPT_ADD_WHERE_STR_ALIAS("-inst","camera"); + // XXX PXOPT_ADD_WHERE_S32(imfiles); + // XXX PXOPT_ADD_WHERE_STR(telescope); + // XXX PXOPT_ADD_WHERE_STR(exp_type); + // XXX PXOPT_ADD_WHERE_STR(class_id); + // XXX PXOPT_ADD_WHERE_STR(filter); + // XXX PXOPT_ADD_WHERE_STR_ALIAS("-code","fault"); + // XXX if (psListLength(config->where->list) < 1) { + // XXX psFree(config->where); + // XXX config->where = NULL; + // XXX } Index: /branches/eam_branch_20080706/ippTools/src/chiptoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/chiptoolConfig.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/chiptoolConfig.c (revision 18468) @@ -304,34 +304,19 @@ psMetadata *modes = psMetadataAlloc(); - PXOPT_ADD_MODE("-definebyquery", "create runs from raw exposures", - CHIPTOOL_MODE_DEFINEBYQUERY, definebyqueryArgs); - PXOPT_ADD_MODE("-updaterun", "change chip run properties", - CHIPTOOL_MODE_UPDATERUN, updaterunArgs); - PXOPT_ADD_MODE("-pendingimfile", "show pending imfiles", - CHIPTOOL_MODE_PENDINGIMFILE, pendingimfileArgs); - PXOPT_ADD_MODE("-addprocessedimfile", "add a processed imfile", - CHIPTOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileArgs); - PXOPT_ADD_MODE("-processedimfile", "show processed imfiles", - CHIPTOOL_MODE_PROCESSEDIMFILE, processedimfileArgs); - PXOPT_ADD_MODE("-updateprocessedimfile","change procesed imfile properties", - CHIPTOOL_MODE_UPDATEPROCESSEDIMFILE,updateprocessedimfileArgs); - PXOPT_ADD_MODE("-revertprocessedimfile","undo a processed imfile", - CHIPTOOL_MODE_REVERTPROCESSEDIMFILE,revertprocessedimfileArgs); - PXOPT_ADD_MODE("-block", "set a label block", - CHIPTOOL_MODE_BLOCK, blockArgs); - PXOPT_ADD_MODE("-masked", "show blocked labels", - CHIPTOOL_MODE_MASKED, maskedArgs); - PXOPT_ADD_MODE("-unmasked", "", - CHIPTOOL_MODE_UNMASKED, unmaskedArgs); - PXOPT_ADD_MODE("-unblock", "remove a label block", - CHIPTOOL_MODE_UNBLOCK, unblockArgs); - PXOPT_ADD_MODE("-pendingcleanuprun", "show runs that need to be cleaned up", - CHIPTOOL_MODE_PENDINGCLEANUPRUN, pendingcleanuprunArgs); - PXOPT_ADD_MODE("-pendingcleanupimfile", "show runs that need to be cleaned up", - CHIPTOOL_MODE_PENDINGCLEANUPIMFILE, pendingcleanupimfileArgs); - PXOPT_ADD_MODE("-donecleanup", "show runs that have been cleaned", - CHIPTOOL_MODE_DONECLEANUP, donecleanupArgs); - PXOPT_ADD_MODE("-run", "show runs", - CHIPTOOL_MODE_RUN, runArgs); + PXOPT_ADD_MODE("-definebyquery", "create runs from raw exposures", CHIPTOOL_MODE_DEFINEBYQUERY, definebyqueryArgs); + PXOPT_ADD_MODE("-updaterun", "change chip run properties", CHIPTOOL_MODE_UPDATERUN, updaterunArgs); + PXOPT_ADD_MODE("-pendingimfile", "show pending imfiles", CHIPTOOL_MODE_PENDINGIMFILE, pendingimfileArgs); + PXOPT_ADD_MODE("-addprocessedimfile", "add a processed imfile", CHIPTOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileArgs); + PXOPT_ADD_MODE("-processedimfile", "show processed imfiles", CHIPTOOL_MODE_PROCESSEDIMFILE, processedimfileArgs); + PXOPT_ADD_MODE("-updateprocessedimfile","change procesed imfile properties", CHIPTOOL_MODE_UPDATEPROCESSEDIMFILE,updateprocessedimfileArgs); + PXOPT_ADD_MODE("-revertprocessedimfile","undo a processed imfile", CHIPTOOL_MODE_REVERTPROCESSEDIMFILE,revertprocessedimfileArgs); + PXOPT_ADD_MODE("-block", "set a label block", CHIPTOOL_MODE_BLOCK, blockArgs); + PXOPT_ADD_MODE("-masked", "show blocked labels", CHIPTOOL_MODE_MASKED, maskedArgs); + PXOPT_ADD_MODE("-unmasked", "", CHIPTOOL_MODE_UNMASKED, unmaskedArgs); + PXOPT_ADD_MODE("-unblock", "remove a label block", CHIPTOOL_MODE_UNBLOCK, unblockArgs); + PXOPT_ADD_MODE("-pendingcleanuprun", "show runs that need to be cleaned up", CHIPTOOL_MODE_PENDINGCLEANUPRUN, pendingcleanuprunArgs); + PXOPT_ADD_MODE("-pendingcleanupimfile", "show runs that need to be cleaned up", CHIPTOOL_MODE_PENDINGCLEANUPIMFILE, pendingcleanupimfileArgs); + PXOPT_ADD_MODE("-donecleanup", "show runs that have been cleaned", CHIPTOOL_MODE_DONECLEANUP, donecleanupArgs); + PXOPT_ADD_MODE("-run", "show runs", CHIPTOOL_MODE_RUN, runArgs); if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) { Index: /branches/eam_branch_20080706/ippTools/src/detselect.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/detselect.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/detselect.c (revision 18468) @@ -81,4 +81,10 @@ psMetadata *where = psMetadataAlloc(); + + PXOPT_COPY_STR(config->args, where, "-inst", "camera", "=="); + PXOPT_COPY_STR(config->args, where, "-telescope", "telescope", "=="); + PXOPT_COPY_STR(config->args, where, "-det_type", "det_type", "=="); + PXOPT_COPY_STR(config->args, where, "-type", "det_type", "=="); + PXOPT_COPY_STR(config->args, where, "-filter", "filter", "=="); // airmass_min < airmass < airmass_max @@ -111,18 +117,11 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, NULL); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } - - { + // use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE + if (where && psListLength(where->list)) { psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psFree(where); - if (whereClause) { - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } - } + psStringAppend(&query, " AND %s", whereClause); + psFree(whereClause); + } + psFree(where); // we choose the single detrend image which matches all criteria and has @@ -171,4 +170,9 @@ PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + psString query = pxDataGet("detselect_select.sql"); if (!query) { @@ -177,10 +181,11 @@ } - - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, NULL); + // use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE + if (where && psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); if (!p_psDBRunQuery(config->dbh, query)) { Index: /branches/eam_branch_20080706/ippTools/src/detselect.h =================================================================== --- /branches/eam_branch_20080706/ippTools/src/detselect.h (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/detselect.h (revision 18468) @@ -31,98 +31,3 @@ pxConfig *detselectConfig(pxConfig *config, int argc, char **argv); -#define addWhereStr(name) \ -{ \ - psString str = NULL; \ - bool status = false; \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - -#define addWhereStrAlias(name,realname) \ -{ \ - psString str = NULL; \ - bool status = false; \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #realname, 0, "==", str)) {\ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - -#define addWhereS32(name) \ -{ \ - psS32 s32 = 0; \ - bool status = false; \ - if ((s32= psMetadataLookupS32(&status, config->args, "-" #name))) { \ - if (!psMetadataAddS32(config->where, PS_LIST_TAIL, #name, 0, "==", s32)) { \ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - -#define addWhereF32(name) \ -{ \ - psF32 var = 0; \ - bool status = false; \ - if ((var = psMetadataLookupF32(&status, config->args, "-" #name))) { \ - if (!isnan(var)) { \ - if (!psMetadataAddF32(config->where, PS_LIST_TAIL, #name, 0, "==", var)) { \ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ - } \ -} - -#define addWhereF64(name) \ -{ \ - psF64 var = 0; \ - bool status = false; \ - if ((var = psMetadataLookupF64(&status, config->args, "-" #name))) { \ - if (!isnan(var)) { \ - if (!psMetadataAddF64(config->where, PS_LIST_TAIL, #name, 0, "==", var)) { \ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ - } \ -} - -#define addWhereTimeStr(name) \ -{ \ - psString str = NULL; \ - bool status = false; \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - psTime *time = psTimeFromISO(str, PS_TIME_UTC); \ - if (!time) { \ - psError(PS_ERR_UNKNOWN, false, "failed to convert " #name " into a psTime object"); \ - psFree(config); \ - return NULL; \ - } \ - psMetadataItem *item = psMetadataLookup(config->args, "-" #name); \ - if (item) { \ - str = item->comment; \ - } else { \ - str = NULL; \ - } \ - if (!psMetadataAddTime(config->where, PS_LIST_TAIL, #name, 0, str, time)) {\ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - psFree(time); \ - } \ -} - #endif // DETSELECT_H Index: /branches/eam_branch_20080706/ippTools/src/detselectConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/detselectConfig.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/detselectConfig.c (revision 18468) @@ -46,39 +46,23 @@ // -search psMetadata *searchArgs = psMetadataAlloc(); - psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-inst", 0, - "search by camera", NULL); - psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-telescope", 0, - "search by telescope", NULL); - psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-det_type", 0, - "search by detrend type", NULL); - psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-type", 0, - "search by detrend type (alias for -det_type)", NULL); - psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-filter", 0, - "search by filter", NULL); - psMetadataAddF32(searchArgs, PS_LIST_TAIL, "-airmass", 0, - "define airmass", NAN); - psMetadataAddF32(searchArgs, PS_LIST_TAIL, "-exp_time", 0, - "search by exposure time", NAN); - psMetadataAddF32(searchArgs, PS_LIST_TAIL, "-ccd_temp", 0, - "search by ccd tempature", NAN); - psMetadataAddF64(searchArgs, PS_LIST_TAIL, "-posang", 0, - "search by rotator position angle", NAN); - psMetadataAddTime(searchArgs, PS_LIST_TAIL, "-time", 0, - "define time for desired detrend data", NULL); - psMetadataAddBool(searchArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - psMetadataAddBool(searchArgs, PS_LIST_TAIL, "-unlimit", 0, - "list all possible detruns, not just the best match", false); + psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-inst", 0, "search by camera", NULL); + psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-telescope", 0, "search by telescope", NULL); + psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-det_type", 0, "search by detrend type", NULL); + psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-type", 0, "search by detrend type (alias for -det_type)", NULL); + psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-filter", 0, "search by filter", NULL); + psMetadataAddF32(searchArgs, PS_LIST_TAIL, "-airmass", 0, "define airmass", NAN); + psMetadataAddF32(searchArgs, PS_LIST_TAIL, "-exp_time", 0, "search by exposure time", NAN); + psMetadataAddF32(searchArgs, PS_LIST_TAIL, "-ccd_temp", 0, "search by ccd tempature", NAN); + psMetadataAddF64(searchArgs, PS_LIST_TAIL, "-posang", 0, "search by rotator position angle", NAN); + psMetadataAddTime(searchArgs, PS_LIST_TAIL, "-time", 0, "define time for desired detrend data", NULL); + psMetadataAddBool(searchArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddBool(searchArgs, PS_LIST_TAIL, "-unlimit", 0, "list all possible detruns, not just the best match", false); // -select psMetadata *selectArgs = psMetadataAlloc(); - psMetadataAddStr(selectArgs, PS_LIST_TAIL, "-det_id", 0, - "search by detrend ID", NULL); - psMetadataAddS32(selectArgs, PS_LIST_TAIL, "-iteration", 0, - "search by iteration number", 0); - psMetadataAddStr(selectArgs, PS_LIST_TAIL, "-class_id", 0, - "search by class ID", NULL); - psMetadataAddBool(selectArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(selectArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID", NULL); + psMetadataAddS32(selectArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); + psMetadataAddStr(selectArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); + psMetadataAddBool(selectArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); psMetadata *argSets = psMetadataAlloc(); @@ -101,31 +85,29 @@ // setup search criterion // generate SQL where clause - config->where = psMetadataAlloc(); + // config->where = psMetadataAlloc(); - addWhereStr(det_id); - addWhereS32(iteration); - addWhereStr(exp_id); - addWhereStrAlias(inst,camera); + // PXOPT_ADD_WHERE_STR(det_id); + // PXOPT_ADD_WHERE_S32(iteration); + // PXOPT_ADD_WHERE_STR(exp_id); + // PXOPT_ADD_WHERE_STR_ALIAS("-inst","camera"); + // PXOPT_ADD_WHERE_STR(telescope); + // PXOPT_ADD_WHERE_STR(det_type); + // PXOPT_ADD_WHERE_STR_ALIAS("-type","det_type"); + // PXOPT_ADD_WHERE_STR(exp_type); + // PXOPT_ADD_WHERE_S32(imfiles); + // PXOPT_ADD_WHERE_STR(class); + // PXOPT_ADD_WHERE_STR(class_id); + // PXOPT_ADD_WHERE_STR(filter); - addWhereStr(telescope); - addWhereStr(det_type); - addWhereStrAlias(type,det_type); + // PXOPT_ADD_WHERE_F32(exp_time); + // PXOPT_ADD_WHERE_F64(ccd_temp); + // PXOPT_ADD_WHERE_F32(airmass); + // PXOPT_ADD_WHERE_TIME_STR(use_begin); + // PXOPT_ADD_WHERE_TIME_STR(use_end); - addWhereStr(exp_type); - addWhereS32(imfiles); - addWhereStr(class); - addWhereStr(class_id); - addWhereStr(filter); - - // addWhereF32(exp_time); - // addWhereF64(ccd_temp); - // addWhereF32(airmass); - // addWhereTimeStr(use_begin); - // addWhereTimeStr(use_end); - - if (config->where->list->n < 1) { - psFree(config->where); - config->where = NULL; - } + // if (config->where->list->n < 1) { + // psFree(config->where); + // config->where = NULL; + // } Index: /branches/eam_branch_20080706/ippTools/src/dettool.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/dettool.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/dettool.c (revision 18468) @@ -214,20 +214,23 @@ PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - psString query = psStringCopy( - "SELECT" - " rawExp.*" - " FROM rawExp" - " LEFT JOIN detInputExp" - " ON rawExp.exp_id = detInputExp.exp_id" - " WHERE" - " detInputExp.exp_id IS NULL" - " AND rawExp.object != 'object'" - ); - - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "rawExp"); + psString query = pxDataGet("dettool_pending.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + return false; + } + + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_STR(config->args, where, "-exp_type", "exp_type", "=="); + PXOPT_COPY_STR(config->args, where, "-inst", "camera", "=="); + PXOPT_COPY_STR(config->args, where, "-telescope", "telescope", "=="); + PXOPT_COPY_STR(config->args, where, "-filter", "filter", "=="); + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "rawExp"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); if (!p_psDBRunQuery(config->dbh, query)) { @@ -315,4 +318,5 @@ // make sure that -exp_id was parsed correctly // XXX this can be removed someday + // XXX Special case for a multi : move into a macro? if (item->type == PS_DATA_METADATA_MULTI) { psListIterator *iter = psListIteratorAlloc(item->data.list, 0, false); @@ -472,5 +476,5 @@ #if 0 // This function is used to convert the det_id from an int, as it is used -// internally, to be a string for external use. The rational being that we may +// internally, to be a string for external use. The rationale being that we may // want to change how det_id is generated in the future and don't want to // external programs to become depending on this value being an int. @@ -543,5 +547,4 @@ psMetadata *where = psMetadataAlloc(); PXOPT_COPY_STR(config->args, where, "-select_exp_type", "exp_type", "=="); - // map -inst -> camera PXOPT_COPY_STR(config->args, where, "-select_inst", "camera", "=="); PXOPT_COPY_STR(config->args, where, "-select_telescope", "telescope", "=="); @@ -555,12 +558,12 @@ PXOPT_COPY_F32(config->args, where, "-select_exp_time_min", "exp_time", ">="); PXOPT_COPY_F32(config->args, where, "-select_exp_time_max", "exp_time", "<="); - PXOPT_COPY_F32(config->args, where, "-select_ccd_temp_min", "ccd_temp", ">="); - PXOPT_COPY_F32(config->args, where, "-select_ccd_temp_max", "ccd_temp", "<="); - PXOPT_COPY_F32(config->args, where, "-select_pon_time_min", "pon_time", ">="); - PXOPT_COPY_F32(config->args, where, "-select_pon_time_max", "pon_time", "<="); - PXOPT_COPY_F32(config->args, where, "-select_posang_min", "posang", ">="); - PXOPT_COPY_F32(config->args, where, "-select_posang_max", "posang", "<="); - PXOPT_COPY_F32(config->args, where, "-select_solang_min", "solang", ">="); - PXOPT_COPY_F32(config->args, where, "-select_solang_max", "solang", "<="); + PXOPT_COPY_F64(config->args, where, "-select_ccd_temp_min", "ccd_temp", ">="); + PXOPT_COPY_F64(config->args, where, "-select_ccd_temp_max", "ccd_temp", "<="); + PXOPT_COPY_F64(config->args, where, "-select_pon_time_min", "pon_time", ">="); + PXOPT_COPY_F64(config->args, where, "-select_pon_time_max", "pon_time", "<="); + PXOPT_COPY_F64(config->args, where, "-select_posang_min", "posang", ">="); + PXOPT_COPY_F64(config->args, where, "-select_posang_max", "posang", "<="); + PXOPT_COPY_F64(config->args, where, "-select_solang_min", "solang", ">="); + PXOPT_COPY_F64(config->args, where, "-select_solang_max", "solang", "<="); if (!psListLength(where->list)) { @@ -571,5 +574,5 @@ // there is some namespace overlap between the names of the fields we'd // like to search by to setup a detrun and the names of the fields we'd - // like to assign values to so I've seperated them but prepending set- to + // like to assign values to so I've separated them but prepending set- to // the assigned values @@ -731,34 +734,22 @@ PS_ASSERT_PTR_NON_NULL(config, false); - // required - PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); - - // optional - PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - PXOPT_LOOKUP_STR(det_type, config->args, "-set_det_type", false, false); - PXOPT_LOOKUP_STR(mode, config->args, "-set_mode", false, false); - // check mode - if (mode && !isValidMode(config, mode)) { - psError(PS_ERR_UNKNOWN, false, "invalud mode"); - return false; - } - PXOPT_LOOKUP_STR(camera, config->args, "-set_inst", false, false); - PXOPT_LOOKUP_STR(telescope, config->args, "-set_telescope", false, false); + + PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); // required + PXOPT_LOOKUP_STR(det_type, config->args, "-set_det_type", false, false); // optional + PXOPT_LOOKUP_STR(mode, config->args, "-set_mode", false, false); // optional PXOPT_LOOKUP_STR(exp_type, config->args, "-set_exp_type", false, false); PXOPT_LOOKUP_STR(filelevel, config->args, "-set_filelevel", false, false); PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", false, false); PXOPT_LOOKUP_STR(filter, config->args, "-set_filter", false, false); - PXOPT_LOOKUP_F32(airmass_min, config->args, "-set_airmass_min", false, false); PXOPT_LOOKUP_F32(airmass_max, config->args, "-set_airmass_max", false, false); PXOPT_LOOKUP_F32(exp_time_min, config->args, "-set_exp_time_min", false, false); PXOPT_LOOKUP_F32(exp_time_max, config->args, "-set_exp_time_max", false, false); - PXOPT_LOOKUP_F32(ccd_temp_min, config->args, "-set_ccd_temp_min", false, false); - PXOPT_LOOKUP_F32(ccd_temp_max, config->args, "-set_ccd_temp_max", false, false); - PXOPT_LOOKUP_F32(posang_min, config->args, "-set_posang_min", false, false); - PXOPT_LOOKUP_F32(posang_max, config->args, "-set_posang_max", false, false); - PXOPT_LOOKUP_F32(solang_min, config->args, "-set_solang_min", false, false); - PXOPT_LOOKUP_F32(solang_max, config->args, "-set_solang_max", false, false); - PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false); + PXOPT_LOOKUP_F64(ccd_temp_min, config->args, "-set_ccd_temp_min", false, false); + PXOPT_LOOKUP_F64(ccd_temp_max, config->args, "-set_ccd_temp_max", false, false); + PXOPT_LOOKUP_F64(posang_min, config->args, "-set_posang_min", false, false); + PXOPT_LOOKUP_F64(posang_max, config->args, "-set_posang_max", false, false); + PXOPT_LOOKUP_F64(solang_min, config->args, "-set_solang_min", false, false); + PXOPT_LOOKUP_F64(solang_max, config->args, "-set_solang_max", false, false); PXOPT_LOOKUP_TIME(registered, config->args, "-set_registered", false, false); PXOPT_LOOKUP_TIME(time_begin, config->args, "-set_time_begin", false, false); @@ -767,5 +758,12 @@ PXOPT_LOOKUP_TIME(use_end, config->args, "-use_end", false, false); PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", false, false); - + PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); // optional + + // check mode + if (mode && !isValidMode(config, mode)) { + psError(PS_ERR_UNKNOWN, false, "invalud mode"); + return false; + } // lookup the detRun that we will be basing this one on @@ -925,6 +923,6 @@ // XXX: possible mem leak: PXOPT_COPY* will free time_filter but NOTHING // that has previously been allocated - PXOPT_COPY_TIME(config->args, time_filter, "-filter_input_begin", "dateobs", ">="); - PXOPT_COPY_TIME(config->args, time_filter, "-filter_input_end", "dateobs", "<"); + PXOPT_COPY_TIME(config->args, time_filter, "-set_input_begin", "dateobs", ">="); + PXOPT_COPY_TIME(config->args, time_filter, "-set_input_end", "dateobs", "<"); // start a transaction so we don't end up with childlessed det_ids @@ -951,16 +949,9 @@ psS64 newDet_id = psDBLastInsertID(config->dbh); - psString query = psStringCopy( - "INSERT INTO detInputExp" - " SELECT" - " %d," - " 0," - " detResidExp.exp_id," - " detResidExp.accept" - " FROM detResidExp" - " JOIN rawExp" - " USING(exp_id)" - " WHERE det_id = %d" - ); + psString query = pxDataGet("dettool_definebydetrun.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + return false; + } if (time_filter->list->n) { @@ -1017,27 +1008,31 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-det_type", "det_type", "=="); + PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + + PXOPT_COPY_STR(config->args, where, "-inst", "camera", "=="); + PXOPT_COPY_STR(config->args, where, "-telescope", "telescope", "=="); + PXOPT_COPY_STR(config->args, where, "-filter", "filter", "=="); + + // airmass_min < airmass < airmass_max + PXOPT_COPY_F32(config->args, where, "-airmass", "airmass_min", "<="); + PXOPT_COPY_F32(config->args, where, "-airmass", "airmass_max", ">="); + + // exp_time_min < exp_time < exp_time_max + PXOPT_COPY_F32(config->args, where, "-exp_time", "exp_time_min", "<="); + PXOPT_COPY_F32(config->args, where, "-exp_time", "exp_time_max", ">="); + + // ccd_temp_min < ccd_temp < ccd_temp_max + PXOPT_COPY_F32(config->args, where, "-ccd_temp", "ccd_temp_min", "<="); + PXOPT_COPY_F32(config->args, where, "-ccd_temp", "ccd_temp_max", ">="); + + PXOPT_COPY_F64(config->args, where, "-posang", "posang_min", "<="); + PXOPT_COPY_F64(config->args, where, "-posang", "posang_max", ">="); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); PXOPT_LOOKUP_BOOL(active, config->args, "-active", false); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); - PXOPT_COPY_STR(config->args, config->where, "-inst", "camera", "=="); - PXOPT_COPY_STR(config->args, config->where, "-telescope", "telescope", "=="); - PXOPT_COPY_STR(config->args, config->where, "-filter", "filter", "=="); - - // airmass_min < airmass < airmass_max - PXOPT_COPY_F32(config->args, config->where, "-airmass", "airmass_min", "<="); - PXOPT_COPY_F32(config->args, config->where, "-airmass", "airmass_max", ">="); - - // exp_time_min < exp_time < exp_time_max - PXOPT_COPY_F32(config->args, config->where, "-exp_time", "exp_time_min", "<="); - PXOPT_COPY_F32(config->args, config->where, "-exp_time", "exp_time_max", ">="); - - // ccd_temp_min < ccd_temp < ccd_temp_max - PXOPT_COPY_F32(config->args, config->where, "-ccd_temp", "ccd_temp_min", "<="); - PXOPT_COPY_F32(config->args, config->where, "-ccd_temp", "ccd_temp_max", ">="); - - PXOPT_COPY_F64(config->args, config->where, "-posang", "posang_min", "<="); - PXOPT_COPY_F64(config->args, config->where, "-posang", "posang_max", ">="); - psString query = pxDataGet("dettool_runs.sql"); if (!query) { @@ -1046,17 +1041,18 @@ } - if (config->where && active) { - psString whereClause = psDBGenerateWhereSQL(config->where, "detRun"); + if (psListLength(where->list) && active) { + psString whereClause = psDBGenerateWhereSQL(where, "detRun"); psStringAppend(&query, " %s AND (detRun.state = 'run' OR detRun.state = 'stop' OR detRun.state = 'register')", whereClause); psFree(whereClause); } - if (config->where && !active) { - psString whereClause = psDBGenerateWhereSQL(config->where, "detRun"); + if (psListLength(where->list) && !active) { + psString whereClause = psDBGenerateWhereSQL(where, "detRun"); psStringAppend(&query, " %s", whereClause); psFree(whereClause); } - if (!config->where && active) { + if (!psListLength(where->list) && active) { psStringAppend(&query, " WHERE (detRun.state = 'run' OR detRun.state = 'stop' OR detRun.state = 'register')"); } + psFree (where); // treat limit == 0 as "no limit" @@ -1080,14 +1076,4 @@ } -// XXX old version -# if 0 - // XXX fix the hard coding of the table name - psArray *runs = psDBSelectRows(config->dbh, "detRun", config->where, 0); - if (!runs) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } -# endif - if (!psArrayLength(runs)) { psTrace("dettool", PS_LOG_INFO, "no rows found"); @@ -1112,24 +1098,24 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-det_type", "det_type", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - psString query = psStringCopy( - "SELECT DISTINCT\n" - " detRun.*\n" - " FROM detRun\n" - " LEFT JOIN detRun as foo\n" - " ON foo.parent = detRun.det_id\n" - " WHERE\n" - " detRun.state = 'stop'\n" - " AND detRun.mode = 'master'\n" - " AND foo.det_id IS NULL\n" - ); - - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detRun"); + // find the exp_id of all the exposures that we want to queue up. + psString query = pxDataGet("dettool_childlessrun.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psFree(where); + return false; + } + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "detRun"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree (where); // treat limit == 0 as "no limit" @@ -1188,21 +1174,22 @@ PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - // select detInputExp.* - // select rawExp.* - // by: - // exp_id - - psString query = psStringCopy( - "SELECT DISTINCT *" - " FROM detInputExp" - " JOIN rawExp" - " USING(exp_id)" - ); - - if (config->where) { - psString whereClause = psDBGenerateWhereSQL(config->where, "detInputExp"); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); + + psString query = pxDataGet("dettool_input.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psFree(where); + return false; + } + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereSQL(where, "detInputExp"); psStringAppend(&query, " %s", whereClause); psFree(whereClause); } + psFree (where); if (!p_psDBRunQuery(config->dbh, query)) { @@ -1242,4 +1229,6 @@ PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + psMetadata *where = psMetadataAlloc(); + psString query = pxDataGet("dettool_raw.sql"); if (!query) { @@ -1248,9 +1237,10 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "rawImfile"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "rawImfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree (where); if (!p_psDBRunQuery(config->dbh, query)) { @@ -1288,4 +1278,9 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -1297,9 +1292,10 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "rawImfile"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "rawImfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree (where); // treat limit == 0 as "no limit" @@ -1340,55 +1336,9 @@ } -static psArray *searchRawImfiles(pxConfig *config, psMetadata *where) -{ - PS_ASSERT_PTR_NON_NULL(config, NULL); - - // use the default where if "where" is NULL - if (!where) { - where = config->where; - } - - // select exp_ids from detInputExp matching det_idp - // where query should be pre-generated - psArray *detInputExp = - detInputExpSelectRowObjects(config->dbh, where, 0); - if (!detInputExp) { - psError(PS_ERR_UNKNOWN, false, "no rawExp rows found"); - return NULL; - } - - // generate where query with just the exp_ids - psMetadata *where_exp_ids = psMetadataAlloc(); - for (long i = 0; i < psArrayLength(detInputExp); i++) { - detInputExpRow *row = detInputExp->data[i]; - if (!psMetadataAddS64(where_exp_ids, PS_LIST_TAIL, "exp_id", - PS_META_DUPLICATE_OK, "==", row->exp_id) - ) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); - psFree(detInputExp); - psFree(where_exp_ids); - return NULL; - } - } - psFree(detInputExp); - - // select rawImfiles with matching exp_ids - psArray *rawImfiles = - rawImfileSelectRowObjects(config->dbh, where_exp_ids, 0); - psFree(where_exp_ids); - if (!rawImfiles) { - psError(PS_ERR_UNKNOWN, false, "no rawImfile rows found"); - return NULL; - } - - return rawImfiles; -} - static bool addprocessedimfileMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); - // det_id, exp_id, class_id, uri, recipe, -bg, -bg_stdev - // are required + // det_id, exp_id, class_id, uri, recipe, -bg, -bg_stdev are required PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false); @@ -1416,25 +1366,16 @@ PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", false, false); - // find the matching rawImfile by exp_id/class_id psMetadata *where = psMetadataAlloc(); - if (!psMetadataAddStr(where, PS_LIST_TAIL, "exp_id", 0, "==", exp_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); - psFree(where); - return false; - } - if (!psMetadataAddStr(where, PS_LIST_TAIL, "class_id", 0, "==", class_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class_id"); - psFree(where); - return false; - } + PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); psArray *rawImfiles = rawImfileSelectRowObjects(config->dbh, where, 0); psFree(where); + if (!rawImfiles) { psError(PS_ERR_UNKNOWN, false, "no rawImfile rows found "); return false; } - // create a new detProcessedImfile object @@ -1473,4 +1414,138 @@ } +static bool processedimfileMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + + char *value = NULL; + + PXOPT_LOOKUP_BOOL(included, config->args, "-included", false); + PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); + 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, "-det_id", "det_id", "=="); + PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + + psString query = pxDataGet("dettool_processedimfile.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psFree(where); + return false; + } + + // add the two required restrictions: detRun.state and detRun.mode + // NOTE the above query requires one of the following two WHERE statements + { + bool status; + if ((value = psMetadataLookupStr(&status, config->args, "-select_state"))) { + psStringAppend(&query, " WHERE detRun.state = '%s'", value); + } else { + psStringAppend(&query, " WHERE detRun.state = 'run'"); + } + if ((value = psMetadataLookupStr(&status, config->args, "-select_mode"))) { + psStringAppend(&query, " AND detRun.mode = '%s'", value); + } else { + psStringAppend(&query, " AND detRun.mode = 'master'"); + } + } + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "detProcessedImfile"); + psStringAppend(&query, " AND %s", whereClause); + psFree(whereClause); + } + psFree (where); + + // restrict search to included imfiles + if (included) { + psStringAppend(&query, " AND detInputExp.include = 1"); + } + + if (faulted) { + // list only faulted rows + psStringAppend(&query, " %s", "AND detProcessedImfile.fault != 0"); + } else { + // don't list faulted rows + psStringAppend(&query, " %s", "AND detProcessedImfile.fault = 0"); + } + + // 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("dettool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + // negative simple so the default is true + if (!ippdbPrintMetadatas(stdout, output, "rawImfile", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + + psFree(output); + + return true; +} + +static bool revertprocessedimfileMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + PXOPT_COPY_S16(config->args, where, "-code", "fault", "=="); + + psString query = pxDataGet("dettool_revertprocessedimfile.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + return false; + } + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "detProcessedImfile"); + 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 (psDBAffectedRows(config->dbh) < 1) { + psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row"); + return false; + } + + return true; +} + static bool toprocessedexpMode(pxConfig *config) { @@ -1485,13 +1560,4 @@ return false; } - - // XXX does it make sense to accept any search params? -#if 0 - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } -#endif // treat limit == 0 as "no limit" @@ -1561,41 +1627,10 @@ PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", true, false); - - psString query = psStringCopy( - " SELECT DISTINCT" - " detProcessedImfile.det_id," - " detRun.iteration," - " detRun.det_type," - " detProcessedImfile.exp_id" - " FROM detRun" - " JOIN detInputExp" - " ON detRun.det_id = detInputExp.det_id" - " AND detRun.iteration = detInputExp.iteration" - " JOIN rawExp" - " ON detInputExp.exp_id = rawExp.exp_id" - " JOIN detProcessedImfile" - " ON detInputExp.det_id = detProcessedImfile.det_id" - " AND detInputExp.exp_id = detProcessedImfile.exp_id" - " LEFT JOIN detProcessedExp" - " ON detInputExp.det_id = detProcessedExp.det_id" - " AND detProcessedImfile.exp_id= detProcessedExp.exp_id" - " LEFT JOIN rawImfile" - " ON detInputExp.exp_id = rawImfile.exp_id" - " AND detProcessedImfile.class_id = rawImfile.class_id" - " WHERE" - " detRun.state = 'run'" - " AND detRun.mode = 'master'" - " AND detProcessedExp.det_id IS NULL" - " AND detProcessedExp.exp_id IS NULL" - " AND detInputExp.include = 1" - " AND detRun.det_id = %s" - " AND detProcessedImfile.exp_id = '%s'" - " GROUP BY" - " detProcessedImfile.class_id," - " rawImfile.class_id," - " detRun.det_id" - " HAVING" - " COUNT(detProcessedImfile.class_id) = COUNT(rawImfile.class_id)" - ); + psString query = pxDataGet("dettool_addprocessedexp.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psFree(where); + return false; + } if (!p_psDBRunQuery(config->dbh, query, det_id, exp_id)) { @@ -1654,15 +1689,20 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); psString query = psStringCopy("SELECT * FROM detProcessedExp"); - if (config->where) { - psString whereClause = psDBGenerateWhereSQL(config->where, NULL); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereSQL(where, NULL); psStringAppend(&query, " %s", whereClause); psFree(whereClause); } + psFree(where); if (faulted) { @@ -1716,4 +1756,9 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S16(config->args, where, "-code", "fault", "=="); + psString query = pxDataGet("dettool_revertprocessedexp.sql"); if (!query) { @@ -1722,9 +1767,10 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detProcessedExp"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "detProcessedExp"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); if (!p_psDBRunQuery(config->dbh, query)) { @@ -1756,13 +1802,4 @@ return false; } - - // XXX does it make sense to accept any search params? -#if 0 - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } -#endif // treat limit == 0 as "no limit" @@ -1803,143 +1840,49 @@ } -static bool processedimfileMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, false); - - char *value = NULL; - - 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); - - psString query = psStringCopy( - " SELECT DISTINCT" - " detRun.det_type," - " rawExp.exp_time," - " detProcessedImfile.*" - " FROM detProcessedImfile" - " JOIN detRun" - " USING(det_id)" - " JOIN detInputExp" - " ON detRun.det_id = detInputExp.det_id" - " AND detRun.iteration = detInputExp.iteration" - " AND detProcessedImfile.exp_id = detInputExp.exp_id" - " JOIN rawExp" - " ON rawExp.exp_id = detProcessedImfile.exp_id" - " WHERE" - ); - // NOTE the above WHERE is completed with the following line: - - // add the two required restrictions: detRun.state and detRun.mode - { - bool status; - if ((value = psMetadataLookupStr(&status, config->args, "-select_state"))) { - psStringAppend(&query, " detRun.state = '%s'", value); - } else { - psStringAppend(&query, " detRun.state = 'run'"); +// this is NOT a command-line mode : it is used by 'addstackedMode' +static psArray *searchRawImfiles(pxConfig *config, psMetadata *where) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); + + // select exp_ids from detInputExp matching det_id & iteration + // where query should be pre-generated + psArray *detInputExp = detInputExpSelectRowObjects(config->dbh, where, 0); + psFree (where); + + if (!detInputExp) { + psError(PS_ERR_UNKNOWN, false, "no rawExp rows found"); + return NULL; + } + + // generate where query with just the exp_ids + psMetadata *where_exp_ids = psMetadataAlloc(); + for (long i = 0; i < psArrayLength(detInputExp); i++) { + detInputExpRow *row = detInputExp->data[i]; + if (!psMetadataAddS64(where_exp_ids, PS_LIST_TAIL, "exp_id", + PS_META_DUPLICATE_OK, "==", row->exp_id) + ) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); + psFree(detInputExp); + psFree(where_exp_ids); + return NULL; } - if ((value = psMetadataLookupStr(&status, config->args, "-select_mode"))) { - psStringAppend(&query, " AND detRun.mode = '%s'", value); - } else { - psStringAppend(&query, " AND detRun.mode = 'master'"); - } - } - - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detProcessedImfile"); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } - - { - bool status = false; - bool included = psMetadataLookupBool(&status, config->args, "-included"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple"); - return false; - } - // restrict search to included imfiles - if (included) { - psStringAppend(&query, " AND detInputExp.include = 1"); - } - } - - if (faulted) { - // list only faulted rows - psStringAppend(&query, " %s", "AND detProcessedImfile.fault != 0"); - } else { - // don't list faulted rows - psStringAppend(&query, " %s", "AND detProcessedImfile.fault = 0"); - } - - // 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("dettool", PS_LOG_INFO, "no rows found"); - psFree(output); - return true; - } - - // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "rawImfile", !simple)) { - psError(PS_ERR_UNKNOWN, false, "failed to print array"); - psFree(output); - return false; - } - - psFree(output); - - return true; -} - - -static bool revertprocessedimfileMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, false); - - psString query = pxDataGet("dettool_revertprocessedimfile.sql"); - if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); - return false; - } - - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detProcessedImfile"); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } - - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - return false; - } - psFree(query); - - if (psDBAffectedRows(config->dbh) < 1) { - psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row"); - return false; - } - - return true; -} - + } + psFree(detInputExp); + + // select rawImfiles with matching exp_ids + psArray *rawImfiles = + rawImfileSelectRowObjects(config->dbh, where_exp_ids, 0); + psFree(where_exp_ids); + if (!rawImfiles) { + psError(PS_ERR_UNKNOWN, false, "no rawImfile rows found"); + return NULL; + } + + return rawImfiles; +} static bool addstackedMode(pxConfig *config) @@ -1947,6 +1890,7 @@ PS_ASSERT_PTR_NON_NULL(config, false); - // det_id, class_id, uri, & recipe are required + // det_id, iteration, class_id, uri, & recipe are required PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); + PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", true, false); PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false); @@ -1967,21 +1911,7 @@ PXOPT_LOOKUP_F64(user_5, config->args, "-user_5", false, false); - // default values - PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", false, false); - // correlate the class_id against the input exposure(s) - - // we have to generate our own where clause as we want to search only by the - // det_id - psMetadata *where = psMetadataAlloc(); - if (!psMetadataAddS64(where, PS_LIST_TAIL, "det_id", 0, "==", - (psS64)atoll(det_id))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); - psFree(where); - return false; - } - - psArray *rawImfiles = searchRawImfiles(config, where); - psFree(where); + // searchRawImfiles defines a where clause to search by det_id and iteration + psArray *rawImfiles = searchRawImfiles(config); if (!rawImfiles) { @@ -2045,28 +1975,27 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + PXOPT_COPY_STR(config->args, where, "-recip", "recipe", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); - - // select detStackedImfile.* - // by: - // where det_id, iteration, class_id is not in detNormalizedImfile - - psString query = psStringCopy( - "SELECT" - " detStackedImfile.*" - " FROM detStackedImfile" - " JOIN detRun" - " USING(det_id, iteration)" - " WHERE" - " detRun.state = 'run'" - " AND detRun.mode = 'master'" - ); - - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detStackedImfile"); + + psString query = pxDataGet("dettool_stacked.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psFree(where); + return false; + } + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "detStackedImfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); if (faulted) { @@ -2120,4 +2049,10 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + PXOPT_COPY_S16(config->args, where, "-code", "fault", "=="); + psString query = pxDataGet("dettool_revertstacked.sql"); if (!query) { @@ -2126,9 +2061,10 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detStackedImfile"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "detStackedImfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); if (!p_psDBRunQuery(config->dbh, query)) { @@ -2159,13 +2095,4 @@ return false; } - - // XXX does it make sense to accept any search params? -#if 0 - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } -#endif // treat limit == 0 as "no limit" @@ -2240,7 +2167,12 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); psString query = pxDataGet("dettool_normalizedstat.sql"); @@ -2258,9 +2190,10 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, NULL); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); // treat limit == 0 as "no limit" @@ -2305,4 +2238,10 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + PXOPT_COPY_S16(config->args, where, "-code", "fault", "=="); + psString query = pxDataGet("dettool_revertnormalizedstat.sql"); if (!query) { @@ -2311,9 +2250,10 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detNormalizedStatImfile"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "detNormalizedStatImfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); if (!p_psDBRunQuery(config->dbh, query)) { @@ -2339,46 +2279,9 @@ PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - // select detNormalizedStatImfile.* - // by: - // where det_id, iteration, class_id is not in detNormalizedImfile - - psString query = psStringCopy( - "SELECT DISTINCT" - " detRun.det_type," - " detRun.workdir," - " rawExp.camera," - " detStackedImfile.uri," - " detNormalizedStatImfile.*" - " FROM detRun" - " JOIN detStackedImfile" - " USING(det_id, iteration)" - " JOIN detInputExp" - " USING(det_id, iteration)" - " JOIN rawExp" - " ON detInputExp.exp_id = rawExp.exp_id" - " JOIN detNormalizedStatImfile" - " ON detStackedImfile.det_id = detNormalizedStatImfile.det_id" - " AND detStackedImfile.iteration = detNormalizedStatImfile.iteration" - " AND detStackedImfile.class_id = detNormalizedStatImfile.class_id" - " LEFT JOIN detNormalizedImfile" - " ON detNormalizedStatImfile.det_id = detNormalizedImfile.det_id" - " AND detNormalizedStatImfile.iteration = detNormalizedImfile.iteration" - " AND detNormalizedStatImfile.class_id = detNormalizedImfile.class_id" - " WHERE" - " detNormalizedImfile.det_id IS NULL" - " AND detNormalizedImfile.iteration IS NULL" - " AND detNormalizedImfile.class_id IS NULL" - " AND detNormalizedStatImfile.fault = 0" - " AND detRun.state = 'run'" - ); - - // XXX does it make sense to accept any search params? -#if 0 - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } -#endif + psString query = pxDataGet("dettool_tonormalize.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + return false; + } // treat limit == 0 as "no limit" @@ -2419,95 +2322,4 @@ } -#if 0 -// XXX this function was left in commented as this method may be useful in the -// future -static psArray *validDetInputClassIds(pxConfig *config, const char *det_id) -{ - PS_ASSERT_PTR_NON_NULL(config, NULL); - // det_id is input as a string because the fact that it is an integer - // is just a database impliementation detail. - PS_ASSERT_PTR_NON_NULL(det_id, NULL); - - psArray *rawImfiles = searchInputImfiles(config, det_id); - if (!rawImfiles) { - return NULL; - } - - psArray *valid_class_ids = NULL; - { - // All this jumping through hoops is so that we end up with unique - // values. PP thinks that making multiple passes through this array and - // deleting matched elements would end up being more expensive then a - // double sort and stagger scheme. JH thinks it would be cheaper to - // just do a unqiue sort and delete. So this is really just a cheap - // hack to avoid implimenting a unique sort function but at least it's - // stable. - psHash *hash = psHashAlloc(psArrayLength(rawImfiles)); - for (long i = 0; i < psArrayLength(rawImfiles); i++) { - psHashAdd(hash, - ((rawImfileRow *)rawImfiles->data[i])->class_id, - ((rawImfileRow *)rawImfiles->data[i])->class_id - ); - } - valid_class_ids = psHashToArray(hash); - psFree(hash); - } - psFree(rawImfiles); - - return valid_class_ids; -} - -static psArray *searchInputImfiles(pxConfig *config, const char *det_id) -{ - PS_ASSERT_PTR_NON_NULL(config, NULL); - // det_id is input as a string because the fact that it is an integer - // is just a database impliementation detail. - PS_ASSERT_PTR_NON_NULL(det_id, NULL); - - psArray *inputExps = NULL; - { - psMetadata *where = psMetadataAlloc(); - if (!psMetadataAddS32(where, PS_LIST_TAIL, "det_id", 0, "==", - (psS32)atoi(det_id))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); - psFree(where); - return NULL; - } - inputExps = detInputExpSelectRowObjects(config->dbh, where, 0); - psFree(where); - } - if (!inputExps) { - psError(PS_ERR_UNKNOWN, false, "no detInputExp rows found"); - return NULL; - } - - // find rawImfiles associated with detInputExps - psArray *rawImfiles = NULL; - { - psMetadata *where = psMetadataAlloc(); - for (long i = 0; i < psArrayLength(inputExps); i++) { - if (!psMetadataAddStr(where, PS_LIST_TAIL, "exp_id", - PS_META_DUPLICATE_OK, "==", - ((detInputExpRow *)inputExps->data[i])->exp_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); - psFree(inputExps); - psFree(where); - return NULL; - } - } - psFree(inputExps); - rawImfiles = rawImfileSelectRowObjects(config->dbh, where, 0); - // XXX this really should be sorted for uniqueness - psFree(where); - } - if (!rawImfiles) { - psError(PS_ERR_UNKNOWN, false, "no rawImfile rows found"); - return NULL; - } - - return rawImfiles; -} -#endif - static bool addnormalizedimfileMode(pxConfig *config) { @@ -2516,4 +2328,5 @@ // required PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); + PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", false, false); PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false); @@ -2533,7 +2346,4 @@ PXOPT_LOOKUP_F64(user_5, config->args, "-user_5", false, false); PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", false, false); - - // default values - PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", false, false); if (!detNormalizedImfileInsert(config->dbh, @@ -2560,8 +2370,13 @@ } - static bool normalizedimfileMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); + + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + PXOPT_COPY_S16(config->args, where, "-code", "fault", "=="); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); @@ -2569,26 +2384,16 @@ PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); - psString query = psStringCopy( - "SELECT" - " detNormalizedImfile.*" - " FROM detNormalizedImfile" - " JOIN detRun" - " USING(det_id, iteration)" - " WHERE" - " detRun.state = 'run'" - " AND detRun.mode = 'master'" - ); - - if (config->where) { - bool status; - int iteration = psMetadataLookupS32 (&status, config->where, "iteration"); - if (status) { - psMetadataRemoveKey (config->where, "iteration"); - psMetadataAddS32 (config->where, PS_LIST_TAIL, "iteration", 0, "==", iteration); - } - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detNormalizedImfile"); + psString query = pxDataGet("dettool_revertstacked.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + return false; + } + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "detNormalizedImfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); if (faulted) { @@ -2642,4 +2447,10 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + PXOPT_COPY_S16(config->args, where, "-code", "fault", "=="); + psString query = pxDataGet("dettool_revertnormalizedimfile.sql"); if (!query) { @@ -2648,9 +2459,10 @@ } - if (config->where) { + if (psListLength(where->list)) { psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detNormalizedImfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); if (!p_psDBRunQuery(config->dbh, query)) { @@ -2668,5 +2480,4 @@ return true; } - static bool tonormalizedexpMode(pxConfig *config) @@ -2682,13 +2493,4 @@ return false; } - - // XXX does it make sense to accept any search params? -#if 0 - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } -#endif // treat limit == 0 as "no limit" @@ -4389,2 +4191,95 @@ return true; } + + +#if 0 +// XXX this function was left in commented as this method may be useful in the +// future +static psArray *validDetInputClassIds(pxConfig *config, const char *det_id) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + // det_id is input as a string because the fact that it is an integer + // is just a database impliementation detail. + PS_ASSERT_PTR_NON_NULL(det_id, NULL); + + psArray *rawImfiles = searchInputImfiles(config, det_id); + if (!rawImfiles) { + return NULL; + } + + psArray *valid_class_ids = NULL; + { + // All this jumping through hoops is so that we end up with unique + // values. PP thinks that making multiple passes through this array and + // deleting matched elements would end up being more expensive then a + // double sort and stagger scheme. JH thinks it would be cheaper to + // just do a unqiue sort and delete. So this is really just a cheap + // hack to avoid implimenting a unique sort function but at least it's + // stable. + psHash *hash = psHashAlloc(psArrayLength(rawImfiles)); + for (long i = 0; i < psArrayLength(rawImfiles); i++) { + psHashAdd(hash, + ((rawImfileRow *)rawImfiles->data[i])->class_id, + ((rawImfileRow *)rawImfiles->data[i])->class_id + ); + } + valid_class_ids = psHashToArray(hash); + psFree(hash); + } + psFree(rawImfiles); + + return valid_class_ids; +} + +static psArray *searchInputImfiles(pxConfig *config, const char *det_id) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + // det_id is input as a string because the fact that it is an integer + // is just a database impliementation detail. + PS_ASSERT_PTR_NON_NULL(det_id, NULL); + + psArray *inputExps = NULL; + { + psMetadata *where = psMetadataAlloc(); + if (!psMetadataAddS32(where, PS_LIST_TAIL, "det_id", 0, "==", + (psS32)atoi(det_id))) { + psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); + psFree(where); + return NULL; + } + inputExps = detInputExpSelectRowObjects(config->dbh, where, 0); + psFree(where); + } + if (!inputExps) { + psError(PS_ERR_UNKNOWN, false, "no detInputExp rows found"); + return NULL; + } + + // find rawImfiles associated with detInputExps + psArray *rawImfiles = NULL; + { + psMetadata *where = psMetadataAlloc(); + for (long i = 0; i < psArrayLength(inputExps); i++) { + if (!psMetadataAddStr(where, PS_LIST_TAIL, "exp_id", + PS_META_DUPLICATE_OK, "==", + ((detInputExpRow *)inputExps->data[i])->exp_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); + psFree(inputExps); + psFree(where); + return NULL; + } + } + psFree(inputExps); + rawImfiles = rawImfileSelectRowObjects(config->dbh, where, 0); + // XXX this really should be sorted for uniqueness + psFree(where); + } + if (!rawImfiles) { + psError(PS_ERR_UNKNOWN, false, "no rawImfile rows found"); + return NULL; + } + + return rawImfiles; +} +#endif + Index: /branches/eam_branch_20080706/ippTools/src/dettoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/dettoolConfig.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/dettoolConfig.c (revision 18468) @@ -46,1098 +46,635 @@ // -pending + // XXX EAM : is this used? does it make sense? psMetadata *pendingArgs = psMetadataAlloc(); - psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exposure ID", NULL); - psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_type", 0, - "search by exposure type", NULL); - psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-inst", 0, - "search by camera", NULL); - psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-telescope", 0, - "search by telescope", NULL); - psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-filter", 0, - "search by filter", NULL); - psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-uri", 0, - "search by URL", NULL); - psMetadataAddBool(pendingArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", NULL); + psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exposure type", NULL); + psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-inst", 0, "search by camera", NULL); + psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-telescope", 0, "search by telescope", NULL); + psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-filter", 0, "search by filter", NULL); + psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-uri", 0, "search by URL", NULL); + psMetadataAddBool(pendingArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -definebytag psMetadata *definebytagArgs = psMetadataAlloc(); - psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-exp_id", - PS_META_DUPLICATE_OK, - "include this exposure (multiple OK, required)", NULL); - psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-det_type", 0, - "define the type of detrend run (required)", NULL); - psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-mode", 0, - "define the mode of this detrend run", "master"); - psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-filelevel", 0, - "define filelevel", NULL); - psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-workdir", 0, - "define workdir (required)", NULL); - psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-inst", 0, - "define camera", NULL); - psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-telescope", 0, - "define telescope", NULL); - psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-exp_type", 0, - "define exposure type", NULL); - psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-filter", 0, - "define filter ", NULL); - psMetadataAddF32(definebytagArgs, PS_LIST_TAIL, "-airmass_min", 0, - "define min airmass", NAN); - psMetadataAddF32(definebytagArgs, PS_LIST_TAIL, "-airmass_max", 0, - "define max airmass", NAN); - psMetadataAddF32(definebytagArgs, PS_LIST_TAIL, "-exp_time_min", 0, - "define min exposure time", NAN); - psMetadataAddF32(definebytagArgs, PS_LIST_TAIL, "-exp_time_max", 0, - "define max exposure time", NAN); - psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, - "define min ccd tempature", NAN); - psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, - "define max ccd tempature", NAN); - psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-posang_min", 0, - "define min rotator position angle", NAN); - psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-posang_max", 0, - "define max rotator position angle", NAN); - psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-solang_min", 0, - "define min solar angle", NAN); - psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-solang_max", 0, - "define max solar angle", NAN); - psMetadataAddTime(definebytagArgs, PS_LIST_TAIL, "-registered", 0, - "time detrend run was registered", now); - psMetadataAddTime(definebytagArgs, PS_LIST_TAIL, "-time_begin", 0, - "detrend applies to exposures taken during this period", NULL); - psMetadataAddTime(definebytagArgs, PS_LIST_TAIL, "-time_end", 0, - "detrend applies to exposures taken during this period", NULL); - psMetadataAddTime(definebytagArgs, PS_LIST_TAIL, "-use_begin", 0, - "start of detrend run applicable period", NULL); - psMetadataAddTime(definebytagArgs, PS_LIST_TAIL, "-use_end", 0, - "end of detrend run applicable period", NULL); - psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-reduction", 0, - "define reduction class for processing", NULL); - psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-label", 0, - "define detrun label", NULL); - psMetadataAddBool(definebytagArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-exp_id", PS_META_DUPLICATE_OK, "include this exposure (multiple OK, required)", NULL); + psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-det_type", 0, "define the type of detrend run (required)", NULL); + psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-mode", 0, "define the mode of this detrend run", "master"); + psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-filelevel", 0, "define filelevel", NULL); + psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); + psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-inst", 0, "define camera", NULL); + psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-telescope", 0, "define telescope", NULL); + psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-exp_type", 0, "define exposure type", NULL); + psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-filter", 0, "define filter ", NULL); + psMetadataAddF32(definebytagArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); + psMetadataAddF32(definebytagArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); + psMetadataAddF32(definebytagArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min exposure time", NAN); + psMetadataAddF32(definebytagArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max exposure time", NAN); + psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); + psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); + psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); + psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + psMetadataAddTime(definebytagArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); + psMetadataAddTime(definebytagArgs, PS_LIST_TAIL, "-time_begin", 0, "detrend applies to exposures taken during this period", NULL); + psMetadataAddTime(definebytagArgs, PS_LIST_TAIL, "-time_end", 0, "detrend applies to exposures taken during this period", NULL); + psMetadataAddTime(definebytagArgs, PS_LIST_TAIL, "-use_begin", 0, "start of detrend run applicable period", NULL); + psMetadataAddTime(definebytagArgs, PS_LIST_TAIL, "-use_end", 0, "end of detrend run applicable period", NULL); + psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-reduction", 0, "define reduction class for processing", NULL); + psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-label", 0, "define detrun label", NULL); + psMetadataAddBool(definebytagArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -definebyquery psMetadata *definebyqueryArgs = psMetadataAlloc(); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-det_type", 0, - "define the type of detrend run (required)", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-mode", 0, - "define the mode of this detrend run", "master"); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filelevel", 0, - "define filelevel", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-workdir", 0, - "define workdir (required)", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-inst", 0, - "define camera (required)", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-telescope", 0, - "define telescope", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter", 0, - "define filter ", NULL); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-airmass_min", 0, - "define min airmass", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-airmass_max", 0, - "define max airmass", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_min", 0, - "define min exposure time", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_max", 0, - "define max exposure time", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, - "define min ccd tempature", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, - "define max ccd tempature", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_min", 0, - "define min rotator position angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_max", 0, - "define max rotator position angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-solang_min", 0, - "define min solar angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-solang_max", 0, - "define max solar angle", NAN); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-registered", 0, - "time detrend run was registered", now); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-time_begin", 0, - "detrend applies to exposures taken during this period", NULL); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-time_end", 0, - "detrend applies to exposures taken during this period", NULL); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-use_begin", 0, - "start of detrend run applicable period", NULL); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-use_end", 0, - "end of detrend run applicable period", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_type", 0, - "search for exp_type", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_inst", 0, - "search for camera", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_telescope", 0, - "search for telescope", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_filter", 0, - "search for filter", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_uri", 0, - "search for uri", NULL); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_begin", 0, - "search for exposures by time (>=)", NULL); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_end", 0, - "search for exposures by time (<)", NULL); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_airmass_min", 0, - "define min airmass", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_airmass_max", 0, - "define max airmass", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_sat_pixel_frac_max", 0, - "define max fraction of saturated pixels", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_min", 0, - "define min exposure time", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_max", 0, - "define max exposure time", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_min", 0, - "define min ccd tempature", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_max", 0, - "define max ccd tempature", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_pon_time_min", 0, - "define min power-on time", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_pon_time_max", 0, - "define max power-on time", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_min", 0, - "define min rotator position angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_max", 0, - "define max rotator position angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_solang_min", 0, - "define min solar angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_solang_max", 0, - "define max solar angle", NAN); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend", 0, - "print the exposures that would be included in the detrend run and exit", false); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, - "define reduction class for processing", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label", 0, - "define detrun label", NULL); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-random_subset", 0, - "use a random subset of elements", false); - psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-random_limit", 0, - "use this number of random elements", 20); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-det_type", 0, "define the type of detrend run (required)", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-mode", 0, "define the mode of this detrend run", "master"); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filelevel", 0, "define filelevel", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-inst", 0, "define camera (required)", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-telescope", 0, "define telescope", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter", 0, "define filter ", NULL); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min exposure time", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max exposure time", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); + psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-time_begin", 0, "detrend applies to exposures taken during this period", NULL); + psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-time_end", 0, "detrend applies to exposures taken during this period", NULL); + psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-use_begin", 0, "start of detrend run applicable period", NULL); + psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-use_end", 0, "end of detrend run applicable period", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_type", 0, "search for exp_type", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_inst", 0, "search for camera", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_telescope", 0, "search for telescope", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_filter", 0, "search for filter", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_uri", 0, "search for uri", NULL); + psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_airmass_min", 0, "define min airmass", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_airmass_max", 0, "define max airmass", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_sat_pixel_frac_max", 0, "define max fraction of saturated pixels", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_min", 0, "define min exposure time", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_max", 0, "define max exposure time", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_min", 0, "define min ccd tempature", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_max", 0, "define max ccd tempature", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_pon_time_min", 0, "define min power-on time", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_pon_time_max", 0, "define max power-on time", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_solang_min", 0, "define min solar angle", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_solang_max", 0, "define max solar angle", NAN); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend", 0, "print the exposures that would be included in the detrend run and exit", false); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, "define reduction class for processing", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label", 0, "define detrun label", NULL); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-random_subset", 0, "use a random subset of elements", false); + psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-random_limit", 0, "use this number of random elements", 20); // -definebydetrun psMetadata *definebydetrunArgs = psMetadataAlloc(); - psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-det_id", 0, - "det ID to base a new detRun on (required)", NULL); - psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_det_type", 0, - "define the type of detrend run", NULL); - psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_mode", 0, - "define the mode of this detrend run", "master"); - psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_exp_type", 0, - "define exposure type", NULL); - psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_filelevel", 0, - "define filelevel", NULL); - psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_workdir", 0, - "define workdir", NULL); - psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_filter", 0, - "define filter ", NULL); - psMetadataAddF32(definebydetrunArgs, PS_LIST_TAIL, "-set_airmass_min", 0, - "define airmass", NAN); - psMetadataAddF32(definebydetrunArgs, PS_LIST_TAIL, "-set_airmass_max", 0, - "define airmass", NAN); - psMetadataAddF32(definebydetrunArgs, PS_LIST_TAIL, "-set_exp_time_min", 0, - "define exposure time", NAN); - psMetadataAddF32(definebydetrunArgs, PS_LIST_TAIL, "-set_exp_time_max", 0, - "define exposure time", NAN); - psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_ccd_temp_min", 0, - "define ccd tempature", NAN); - psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_ccd_temp_max", 0, - "define ccd tempature", NAN); - psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_posang_min", 0, - "define rotator position angle", NAN); - psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_posang_max", 0, - "define rotator position angle", NAN); - psMetadataAddTime(definebydetrunArgs, PS_LIST_TAIL, "-set_registered", 0, - "time detrend run was registered", now); - psMetadataAddTime(definebydetrunArgs, PS_LIST_TAIL, "-set_time_begin", 0, - "start of period to apply detrend too", NULL); - psMetadataAddTime(definebydetrunArgs, PS_LIST_TAIL, "-set_time_end", 0, - "end of period to apply detrend too", NULL); - psMetadataAddTime(definebydetrunArgs, PS_LIST_TAIL, "-set_use_begin", 0, - "start of detrend run applicable period", NULL); - psMetadataAddTime(definebydetrunArgs, PS_LIST_TAIL, "-set_use_end", 0, - "end of detrend run applicable period", NULL); - psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_solang_min", 0, - "define solar angle", NAN); - psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_solang_max", 0, - "define solar angle", NAN); - psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-filter_input_begin", 0, - "filter input detrun exp to be in this period", NULL); - psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-filter_input_end", 0, - "filter input detrun exp to be in this period", NULL); - psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_reduction", 0, - "define reduction class for processing", NULL); - psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_label", 0, - "define detrun label", NULL); - psMetadataAddBool(definebydetrunArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - + psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-det_id", 0, "det ID to base a new detRun on (required)", NULL); + psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_det_type", 0, "define the type of detrend run", NULL); + psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_mode", 0, "define the mode of this detrend run", "master"); + psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_exp_type", 0, "define exposure type", NULL); + psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_filelevel", 0, "define filelevel", NULL); + psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_workdir", 0, "define workdir", NULL); + psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_filter", 0, "define filter ", NULL); + psMetadataAddF32(definebydetrunArgs, PS_LIST_TAIL, "-set_airmass_min", 0, "define airmass", NAN); + psMetadataAddF32(definebydetrunArgs, PS_LIST_TAIL, "-set_airmass_max", 0, "define airmass", NAN); + psMetadataAddF32(definebydetrunArgs, PS_LIST_TAIL, "-set_exp_time_min", 0, "define exposure time", NAN); + psMetadataAddF32(definebydetrunArgs, PS_LIST_TAIL, "-set_exp_time_max", 0, "define exposure time", NAN); + psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_ccd_temp_min", 0, "define ccd tempature", NAN); + psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_ccd_temp_max", 0, "define ccd tempature", NAN); + psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_posang_min", 0, "define rotator position angle", NAN); + psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_posang_max", 0, "define rotator position angle", NAN); + psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_solang_min", 0, "define solar angle", NAN); + psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_solang_max", 0, "define solar angle", NAN); + psMetadataAddTime(definebydetrunArgs, PS_LIST_TAIL, "-set_registered", 0, "time detrend run was registered", now); + psMetadataAddTime(definebydetrunArgs, PS_LIST_TAIL, "-set_time_begin", 0, "start of period to apply detrend too", NULL); + psMetadataAddTime(definebydetrunArgs, PS_LIST_TAIL, "-set_time_end", 0, "end of period to apply detrend too", NULL); + psMetadataAddTime(definebydetrunArgs, PS_LIST_TAIL, "-set_use_begin", 0, "start of detrend run applicable period", NULL); + psMetadataAddTime(definebydetrunArgs, PS_LIST_TAIL, "-set_use_end", 0, "end of detrend run applicable period", NULL); + psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_reduction", 0, "define reduction class for processing", NULL); + psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_label", 0, "define detrun label", NULL); + psMetadataAddBool(definebydetrunArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_input_begin", 0, "require input exp to be in this period", NULL); + psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_input_end", 0, "require input exp to be in this period", NULL); + + // XXX EAM : it looks like the corresponding dettool functions don't exist: // -makecorrection psMetadata *makecorrectionArgs = psMetadataAlloc(); - psMetadataAddStr(makecorrectionArgs, PS_LIST_TAIL, "-det_id", 0, - "det ID to be corrected (required)", NULL); - psMetadataAddBool(makecorrectionArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(makecorrectionArgs, PS_LIST_TAIL, "-det_id", 0, "det ID to be corrected (required)", NULL); + psMetadataAddBool(makecorrectionArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -tocorrectexp psMetadata *tocorrectexpArgs = psMetadataAlloc(); - psMetadataAddU64(tocorrectexpArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(tocorrectexpArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddU64(tocorrectexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(tocorrectexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -tocorrectimfile psMetadata *tocorrectimfileArgs = psMetadataAlloc(); - psMetadataAddStr(tocorrectimfileArgs, PS_LIST_TAIL, "-det_id", 0, - "search for detrend ID", NULL); - psMetadataAddU64(tocorrectimfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(tocorrectimfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(tocorrectimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddU64(tocorrectimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(tocorrectimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -addcorrectimfile psMetadata *addcorrectimfileArgs = psMetadataAlloc(); - psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-det_id", 0, - "define detrend ID (required)", NULL); - psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search for class ID (required)", NULL); - psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-uri", 0, - "define resid file URI", NULL); - psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-bg", 0, - "define exposure background", NAN); - psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposure background stdev", NAN); - psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposure background mean stdev", NAN); - psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-user_1", 0, - "define user statistic (1)", NAN); - psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-user_2", 0, - "define user statistic (2)", NAN); - psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-user_3", 0, - "define user statistic (3)", NAN); - psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-user_4", 0, - "define user statistic (4)", NAN); - psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-user_5", 0, - "define user statistic (5)", NAN); - psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-path_base", 0, - "define base output location", NULL); + psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID (required)", NULL); + psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-uri", 0, "define resid file URI", NULL); + psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); + psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background stdev", NAN); + psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposure background mean stdev", NAN); + psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-user_1", 0, "define user statistic (1)", NAN); + psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-user_2", 0, "define user statistic (2)", NAN); + psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-user_3", 0, "define user statistic (3)", NAN); + psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-user_4", 0, "define user statistic (4)", NAN); + psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-user_5", 0, "define user statistic (5)", NAN); + psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", NULL); // -runs psMetadata *runsArgs = psMetadataAlloc(); - psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-det_type", 0, - "search for type of detrend run", NULL); - psMetadataAddBool(runsArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - psMetadataAddBool(runsArgs, PS_LIST_TAIL, "-active", 0, - "only return active detRuns", false); - psMetadataAddU64(runsArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-det_id", 0, - "search for detrend ID", NULL); - - psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-inst", 0, - "search for camera (instrument)", NULL); - psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-telescope", 0, - "search for telescope", NULL); - psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-filter", 0, - "search for filter", NULL); - - psMetadataAddF32(runsArgs, PS_LIST_TAIL, "-airmass", 0, - "match airmass", NAN); - psMetadataAddF32(runsArgs, PS_LIST_TAIL, "-exp_time", 0, - "match exp time", NAN); - psMetadataAddF32(runsArgs, PS_LIST_TAIL, "-ccd_temp", 0, - "match ccd temp", NAN); - psMetadataAddF64(runsArgs, PS_LIST_TAIL, "-posang", 0, - "match posang", NAN); + psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-det_type", 0, "search for type of detrend run", NULL); + psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-inst", 0, "search for camera (instrument)", NULL); + psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); + psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); + psMetadataAddF32(runsArgs, PS_LIST_TAIL, "-airmass", 0, "match airmass", NAN); + psMetadataAddF32(runsArgs, PS_LIST_TAIL, "-exp_time", 0, "match exp time", NAN); + psMetadataAddF32(runsArgs, PS_LIST_TAIL, "-ccd_temp", 0, "match ccd temp", NAN); + psMetadataAddF64(runsArgs, PS_LIST_TAIL, "-posang", 0, "match posang", NAN); + psMetadataAddBool(runsArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddBool(runsArgs, PS_LIST_TAIL, "-active", 0, "only return active detRuns", false); + psMetadataAddU64(runsArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); // -childlessrun psMetadata *childlessrunArgs = psMetadataAlloc(); - psMetadataAddStr(childlessrunArgs, PS_LIST_TAIL, "-det_type", 0, - "search for type of detrend run", NULL); - psMetadataAddU64(childlessrunArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(childlessrunArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(childlessrunArgs, PS_LIST_TAIL, "-det_type", 0, "search for type of detrend run", NULL); + psMetadataAddU64(childlessrunArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(childlessrunArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -input psMetadata *inputArgs = psMetadataAlloc(); - psMetadataAddStr(inputArgs, PS_LIST_TAIL, "-det_id", 0, - "search for detrend ID", NULL); - psMetadataAddS32(inputArgs, PS_LIST_TAIL, "-iteration", 0, - "define iteration number", 0); - psMetadataAddStr(inputArgs, PS_LIST_TAIL, "-exp_id", 0, - "search for exp ID", NULL); - psMetadataAddBool(inputArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(inputArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddS32(inputArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); + psMetadataAddS64(inputArgs, PS_LIST_TAIL, "-exp_id", 0, "search for exp ID", NULL); + psMetadataAddBool(inputArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -raw psMetadata *rawArgs = psMetadataAlloc(); - psMetadataAddBool(rawArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddBool(rawArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -toprocessedimfile psMetadata *toprocessedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(toprocessedimfileArgs, PS_LIST_TAIL, "-det_id", 0, - "search for detrend ID", NULL); - psMetadataAddStr(toprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "search for exp ID", NULL); - psMetadataAddStr(toprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search for class ID", NULL); - psMetadataAddU64(toprocessedimfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(toprocessedimfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(toprocessedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddStr(toprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search for exp ID", NULL); + psMetadataAddStr(toprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID", NULL); + psMetadataAddU64(toprocessedimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(toprocessedimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -addprocessedimfile psMetadata *addprocessedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-det_id", 0, - "define detrend ID (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "define exp ID (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "define class ID (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-uri", 0, - "define URI", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-recip", 0, - "define recipe", NULL); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg", 0, - "define exposure background", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposure background stdev", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposure background mean stdev", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_0", 0, - "define fringe slope (0th term)", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_1", 0, - "define fringe slope (1st term)", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_2", 0, - "define fringe slope (2nd term)", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_1", 0, - "define user statistic (1)", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_2", 0, - "define user statistic (2)", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_3", 0, - "define user statistic (3)", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_4", 0, - "define user statistic (4)", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_5", 0, - "define user statistic (5)", NAN); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-path_base", 0, - "define base output location", NULL); - psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "define exp ID (required)", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "define class ID (required)", NULL); + psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-uri", 0, "define URI", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-recip", 0, "define recipe", NULL); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background stdev", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposure background mean stdev", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_0", 0, "define fringe slope (0th term)", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_1", 0, "define fringe slope (1st term)", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_2", 0, "define fringe slope (2nd term)", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_1", 0, "define user statistic (1)", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_2", 0, "define user statistic (2)", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_3", 0, "define user statistic (3)", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_4", 0, "define user statistic (4)", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-user_5", 0, "define user statistic (5)", NAN); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", NULL); // -processedimfile psMetadata *processedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-det_id", 0, - "search for detrend ID", NULL); - psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "search for exp ID", NULL); - psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search for class ID", NULL); - psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-select_state", 0, - "search for state", NULL); - psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-select_mode", 0, - "search for mode", NULL); - psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-chip", 0, - "restrict results to completed 'chip' sets", false); - psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-exp", 0, - "restrict results to complete 'exposures'", false); - psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-included", 0, - "restrict results to exposures 'includeded' in the current iteration", false); - psMetadataAddU64(processedimfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-faulted", 0, - "only return imfiles with a fault status set", false); - psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search for exp ID", NULL); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID", NULL); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-select_state", 0, "search for state", NULL); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-select_mode", 0, "search for mode", NULL); + psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-included", 0, "restrict results to exposures 'includeded' in the current iteration", false); + psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); + psMetadataAddU64(processedimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + + // XXX these don't seem to be used anymore + // psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-chip", 0, "restrict results to completed 'chip' sets", false); + // psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-exp", 0, "restrict results to complete 'exposures'", false); // -revertprocessedimfile psMetadata *revertprocessedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-det_id", 0, - "search for detrend ID (required)", NULL); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exposure ID", NULL); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search by class ID", NULL); - psMetadataAddS16(revertprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); + psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID (required)", NULL); + psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", NULL); + psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); + psMetadataAddS16(revertprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); // -toprocessedexp psMetadata *toprocessedexpArgs = psMetadataAlloc(); - psMetadataAddU64(toprocessedexpArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(toprocessedexpArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddU64(toprocessedexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(toprocessedexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -addproccessedexp psMetadata *addprocessedexpArgs = psMetadataAlloc(); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-det_id", 0, - "define detrend ID (required)", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_id", 0, - "define detrend ID (required)", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-recip", 0, - "define recipe", 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); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-fringe_0", 0, - "define fringe slope (0th term)", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-fringe_1", 0, - "define fringe slope (1st term)", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-fringe_2", 0, - "define fringe slope (2nd term)", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_1", 0, - "define user statistic (1)", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_2", 0, - "define user statistic (2)", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_3", 0, - "define user statistic (3)", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_4", 0, - "define user statistic (4)", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_5", 0, - "define user statistic (5)", NAN); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-path_base", 0, - "define base output location", NULL); - psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "define detrend ID (required)", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-recip", 0, "define recipe", 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); + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-fringe_0", 0, "define fringe slope (0th term)", NAN); + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-fringe_1", 0, "define fringe slope (1st term)", NAN); + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-fringe_2", 0, "define fringe slope (2nd term)", NAN); + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_1", 0, "define user statistic (1)", NAN); + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_2", 0, "define user statistic (2)", NAN); + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_3", 0, "define user statistic (3)", NAN); + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_4", 0, "define user statistic (4)", NAN); + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-user_5", 0, "define user statistic (5)", NAN); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", NULL); + psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); // -proccessedexp psMetadata *processedexpArgs = psMetadataAlloc(); - psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-det_id", 0, - "define detrend ID", NULL); - psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_id", 0, - "define detrend ID", NULL); - psMetadataAddU64(processedexpArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-faulted", 0, - "only return imfiles with a fault status set", false); - psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID", NULL); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp ID", NULL); + psMetadataAddU64(processedexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); + psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -revertprocessedexp psMetadata *revertprocessedexpArgs = psMetadataAlloc(); - psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-det_id", 0, - "search by detrend ID (required)", NULL); - psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exposure ID", NULL); - psMetadataAddS16(revertprocessedexpArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); + psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", NULL); + psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", NULL); + psMetadataAddS16(revertprocessedexpArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); // -tostacked psMetadata *tostackedArgs = psMetadataAlloc(); - psMetadataAddU64(tostackedArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(tostackedArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddU64(tostackedArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(tostackedArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -addstacked psMetadata *addstackedArgs = psMetadataAlloc(); - psMetadataAddStr(addstackedArgs, PS_LIST_TAIL, "-det_id", 0, - "define detrend ID (required)", NULL); - psMetadataAddS32(addstackedArgs, PS_LIST_TAIL, "-iteration", 0, - "define iteration number", 0); - psMetadataAddStr(addstackedArgs, PS_LIST_TAIL, "-class_id", 0, - "define class ID (required)", NULL); - psMetadataAddStr(addstackedArgs, PS_LIST_TAIL, "-recip", 0, - "define recipe", NULL); - psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-bg", 0, - "define exposure background", NAN); - psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposure background stdev", NAN); - psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposure background mean stdev", NAN); - psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-user_1", 0, - "define user statistic (1)", NAN); - psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-user_2", 0, - "define user statistic (2)", NAN); - psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-user_3", 0, - "define user statistic (3)", NAN); - psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-user_4", 0, - "define user statistic (4)", NAN); - psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-user_5", 0, - "define user statistic (5)", NAN); - psMetadataAddStr(addstackedArgs, PS_LIST_TAIL, "-uri", 0, - "define URI", NULL); - psMetadataAddS16(addstackedArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); + psMetadataAddStr(addstackedArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS32(addstackedArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number (required)", 0); + psMetadataAddStr(addstackedArgs, PS_LIST_TAIL, "-class_id", 0, "define class ID (required)", NULL); + psMetadataAddS16(addstackedArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); + psMetadataAddStr(addstackedArgs, PS_LIST_TAIL, "-uri", 0, "define URI", NULL); + psMetadataAddStr(addstackedArgs, PS_LIST_TAIL, "-recip", 0, "define recipe", NULL); + psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); + psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background stdev", NAN); + psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposure background mean stdev", NAN); + psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-user_1", 0, "define user statistic (1)", NAN); + psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-user_2", 0, "define user statistic (2)", NAN); + psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-user_3", 0, "define user statistic (3)", NAN); + psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-user_4", 0, "define user statistic (4)", NAN); + psMetadataAddF64(addstackedArgs, PS_LIST_TAIL, "-user_5", 0, "define user statistic (5)", NAN); // -stacked psMetadata *stackedArgs = psMetadataAlloc(); - psMetadataAddStr(stackedArgs, PS_LIST_TAIL, "-det_id", 0, - "search for detrend ID", NULL); - psMetadataAddS32(stackedArgs, PS_LIST_TAIL, "-iteration", 0, - "search for iteration number", 0); - psMetadataAddStr(stackedArgs, PS_LIST_TAIL, "-class_id", 0, - "search for class ID", NULL); - psMetadataAddStr(stackedArgs, PS_LIST_TAIL, "-recip", 0, - "search for recipe", NULL); - psMetadataAddU64(stackedArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(stackedArgs, PS_LIST_TAIL, "-faulted", 0, - "only return imfiles with a fault status set", false); - psMetadataAddBool(stackedArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(stackedArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddS32(stackedArgs, PS_LIST_TAIL, "-iteration", 0, "search for iteration number", 0); + psMetadataAddStr(stackedArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID", NULL); + psMetadataAddStr(stackedArgs, PS_LIST_TAIL, "-recip", 0, "search for recipe", NULL); + psMetadataAddU64(stackedArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(stackedArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); + psMetadataAddBool(stackedArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -revertstacked psMetadata *revertstackedArgs= psMetadataAlloc(); - psMetadataAddStr(revertstackedArgs, PS_LIST_TAIL, "-det_id", 0, - "search for detrend ID (required)", NULL); - psMetadataAddS32(revertstackedArgs, PS_LIST_TAIL, "-iteration", 0, - "search by iteration number", 0); - psMetadataAddStr(revertstackedArgs, PS_LIST_TAIL, "-class_id", 0, - "search by class ID", NULL); - psMetadataAddS16(revertstackedArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); + psMetadataAddStr(revertstackedArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID (required)", NULL); + psMetadataAddS32(revertstackedArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); + psMetadataAddStr(revertstackedArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); + psMetadataAddS16(revertstackedArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); + + // -tonormalizedstat + psMetadata *tonormalizedstatArgs = psMetadataAlloc(); + psMetadataAddU64(tonormalizedstatArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(tonormalizedstatArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + + // -addnormalizedstat + psMetadata *addnormstatArgs = psMetadataAlloc(); + psMetadataAddStr(addnormstatArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS32(addnormstatArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); + psMetadataAddStr(addnormstatArgs, PS_LIST_TAIL, "-class_id", 0, "define class ID (required)", NULL); + psMetadataAddF32(addnormstatArgs, PS_LIST_TAIL, "-norm", 0, "define normal value (required)", NAN); + psMetadataAddS16(addnormstatArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); + + // -normalizedstat + psMetadata *normalizedstatArgs = psMetadataAlloc(); + psMetadataAddStr(normalizedstatArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID", NULL); + psMetadataAddS32(normalizedstatArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); + psMetadataAddStr(normalizedstatArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); + psMetadataAddU64(normalizedstatArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(normalizedstatArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); + psMetadataAddBool(normalizedstatArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + + // -revertnormalizedstat + psMetadata *revertnormalizedstatArgs= psMetadataAlloc(); + psMetadataAddStr(revertnormalizedstatArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", NULL); + psMetadataAddS32(revertnormalizedstatArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); + psMetadataAddStr(revertnormalizedstatArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); + psMetadataAddS16(revertnormalizedstatArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); // -tonormalize psMetadata *tonormalizeArgs = psMetadataAlloc(); - psMetadataAddU64(tonormalizeArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(tonormalizeArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - - // -addnormalizedstat - psMetadata *addnormstatArgs = psMetadataAlloc(); - psMetadataAddStr(addnormstatArgs, PS_LIST_TAIL, "-det_id", 0, - "define detrend ID (required)", NULL); - psMetadataAddS32(addnormstatArgs, PS_LIST_TAIL, "-iteration", 0, - "define iteration number", 0); - psMetadataAddStr(addnormstatArgs, PS_LIST_TAIL, "-class_id", 0, - "define class ID (required)", NULL); - psMetadataAddF32(addnormstatArgs, PS_LIST_TAIL, "-norm", 0, - "define normal value (required)", NAN); - psMetadataAddS16(addnormstatArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); - - // -normalizedstat - psMetadata *normalizedstatArgs = psMetadataAlloc(); - psMetadataAddStr(normalizedstatArgs, PS_LIST_TAIL, "-det_id", 0, - "search by detrend ID", NULL); - psMetadataAddS32(normalizedstatArgs, PS_LIST_TAIL, "-iteration", 0, - "search by iteration number", 0); - psMetadataAddStr(normalizedstatArgs, PS_LIST_TAIL, "-class_id", 0, - "search by class ID", NULL); - psMetadataAddU64(normalizedstatArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(normalizedstatArgs, PS_LIST_TAIL, "-faulted", 0, - "only return imfiles with a fault status set", false); - psMetadataAddBool(normalizedstatArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - - // -revertnormalizedstat - psMetadata *revertnormalizedstatArgs= psMetadataAlloc(); - psMetadataAddStr(revertnormalizedstatArgs, PS_LIST_TAIL, "-det_id", 0, - "search by detrend ID (required)", NULL); - psMetadataAddS32(revertnormalizedstatArgs, PS_LIST_TAIL, "-iteration", 0, - "search by iteration number", 0); - psMetadataAddStr(revertnormalizedstatArgs, PS_LIST_TAIL, "-class_id", 0, - "search by class ID", NULL); - psMetadataAddS16(revertnormalizedstatArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); - - // -tonormstat - psMetadata *tonormstatArgs = psMetadataAlloc(); - psMetadataAddU64(tonormstatArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(tonormstatArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddU64(tonormalizeArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(tonormalizeArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -addnormalizedimfile psMetadata *addnormalizedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-det_id", 0, - "define detrend ID (required)", NULL); - psMetadataAddS32(addnormalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0, - "define iteration number", 0); - psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "define class ID (required)", NULL); - psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-uri", 0, - "define URI", NULL); - psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-bg", 0, - "define exposure background", NAN); - psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposure background stdev", NAN); - psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposure background mean stdev", NAN); - psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-user_1", 0, - "define user statistic (1)", NAN); - psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-user_2", 0, - "define user statistic (2)", NAN); - psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-user_3", 0, - "define user statistic (3)", NAN); - psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-user_4", 0, - "define user statistic (4)", NAN); - psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-user_5", 0, - "define user statistic (5)", NAN); - psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-path_base", 0, - "define base output location", NULL); - psMetadataAddS16(addnormalizedimfileArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); + psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS32(addnormalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); + psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "define class ID (required)", NULL); + psMetadataAddS16(addnormalizedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); + psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-uri", 0, "define URI", NULL); + psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); + psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background stdev", NAN); + psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposure background mean stdev", NAN); + psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-user_1", 0, "define user statistic (1)", NAN); + psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-user_2", 0, "define user statistic (2)", NAN); + psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-user_3", 0, "define user statistic (3)", NAN); + psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-user_4", 0, "define user statistic (4)", NAN); + psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-user_5", 0, "define user statistic (5)", NAN); + psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", NULL); // -normalizedimfile psMetadata *normalizedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(normalizedimfileArgs, PS_LIST_TAIL, "-det_id", 0, - "search for detrend ID", NULL); - psMetadataAddS32(normalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0, - "search for iteration number", 0); - psMetadataAddStr(normalizedimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search for class ID", NULL); - psMetadataAddStr(normalizedimfileArgs, PS_LIST_TAIL, "-recip", 0, - "search for recipe", NULL); - psMetadataAddU64(normalizedimfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(normalizedimfileArgs, PS_LIST_TAIL, "-faulted", 0, - "only return imfiles with a fault status set", false); - psMetadataAddBool(normalizedimfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(normalizedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddS32(normalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0, "search for iteration number", 0); + psMetadataAddStr(normalizedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID", NULL); + psMetadataAddStr(normalizedimfileArgs, PS_LIST_TAIL, "-recip", 0, "search for recipe", NULL); + psMetadataAddU64(normalizedimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(normalizedimfileArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); + psMetadataAddBool(normalizedimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -revertnormalizedimfile psMetadata *revertnormalizedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(revertnormalizedimfileArgs, PS_LIST_TAIL, "-det_id", 0, - "search by detrend ID (required)", NULL); - psMetadataAddS32(revertnormalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0, - "search by iteration number", 0); - psMetadataAddStr(revertnormalizedimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search by class ID", NULL); - psMetadataAddS16(revertnormalizedimfileArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); + psMetadataAddStr(revertnormalizedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", NULL); + psMetadataAddS32(revertnormalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); + psMetadataAddStr(revertnormalizedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); + psMetadataAddS16(revertnormalizedimfileArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); + + XXX EAM : cleaned to this point + break into separate files // -tonormalizedexp psMetadata *tonormalizedexpArgs = psMetadataAlloc(); - psMetadataAddU64(tonormalizedexpArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(tonormalizedexpArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddU64(tonormalizedexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(tonormalizedexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -addnormalizedexp psMetadata *addnormalizedexpArgs = psMetadataAlloc(); - psMetadataAddStr(addnormalizedexpArgs, PS_LIST_TAIL, "-det_id", 0, - "define detrend ID (required)", NULL); - psMetadataAddS32(addnormalizedexpArgs, PS_LIST_TAIL, "-iteration", 0, - "define iteration number", 0); - psMetadataAddStr(addnormalizedexpArgs, PS_LIST_TAIL, "-recip", 0, - "search for recipe", NULL); - psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-bg", 0, - "define exposure background", NAN); - psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposure background stdev", NAN); - psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposure background mean stdev", NAN); - - psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-user_1", 0, - "define user statistic (1)", NAN); - psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-user_2", 0, - "define user statistic (2)", NAN); - psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-user_3", 0, - "define user statistic (3)", NAN); - psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-user_4", 0, - "define user statistic (4)", NAN); - psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-user_5", 0, - "define user statistic (5)", NAN); - - psMetadataAddStr(addnormalizedexpArgs, PS_LIST_TAIL, "-path_base", 0, - "define base output location", NULL); - psMetadataAddS16(addnormalizedexpArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); + psMetadataAddStr(addnormalizedexpArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS32(addnormalizedexpArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); + psMetadataAddStr(addnormalizedexpArgs, PS_LIST_TAIL, "-recip", 0, "search for recipe", NULL); + psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); + psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background stdev", NAN); + psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposure background mean stdev", NAN); + psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-user_1", 0, "define user statistic (1)", NAN); + psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-user_2", 0, "define user statistic (2)", NAN); + psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-user_3", 0, "define user statistic (3)", NAN); + psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-user_4", 0, "define user statistic (4)", NAN); + psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-user_5", 0, "define user statistic (5)", NAN); + psMetadataAddStr(addnormalizedexpArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", NULL); + psMetadataAddS16(addnormalizedexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); // -normalizedexp psMetadata *normalizedexpArgs = psMetadataAlloc(); - psMetadataAddStr(normalizedexpArgs, PS_LIST_TAIL, "-det_id", 0, - "define detrend ID", NULL); - psMetadataAddS32(normalizedexpArgs, PS_LIST_TAIL, "-iteration", 0, - "define iteration number", 0); - psMetadataAddStr(normalizedexpArgs, PS_LIST_TAIL, "-recip", 0, - "search for recipe", NULL); - psMetadataAddF64(normalizedexpArgs, PS_LIST_TAIL, "-bg", 0, - "define exposure background", NAN); - psMetadataAddF64(normalizedexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposure background stdev", NAN); - psMetadataAddF64(normalizedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposure background mean stdev", NAN); - psMetadataAddStr(normalizedexpArgs, PS_LIST_TAIL, "-path_base", 0, - "define base output location", NULL); - psMetadataAddU64(normalizedexpArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(normalizedexpArgs, PS_LIST_TAIL, "-faulted", 0, - "only return imfiles with a fault status set", false); - psMetadataAddBool(normalizedexpArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(normalizedexpArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID", NULL); + psMetadataAddS32(normalizedexpArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); + psMetadataAddStr(normalizedexpArgs, PS_LIST_TAIL, "-recip", 0, "search for recipe", NULL); + psMetadataAddF64(normalizedexpArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); + psMetadataAddF64(normalizedexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background stdev", NAN); + psMetadataAddF64(normalizedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposure background mean stdev", NAN); + psMetadataAddStr(normalizedexpArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", NULL); + psMetadataAddU64(normalizedexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(normalizedexpArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); + psMetadataAddBool(normalizedexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -revertnormalizedexp psMetadata *revertnormalizedexpArgs = psMetadataAlloc(); - psMetadataAddStr(revertnormalizedexpArgs, PS_LIST_TAIL, "-det_id", 0, - "search by detrend ID (required)", NULL); - psMetadataAddS32(revertnormalizedexpArgs, PS_LIST_TAIL, "-iteration", 0, - "search by iteration number", 0); - psMetadataAddS16(revertnormalizedexpArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); + psMetadataAddStr(revertnormalizedexpArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", NULL); + psMetadataAddS32(revertnormalizedexpArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); + psMetadataAddS16(revertnormalizedexpArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); // -toresidimfile psMetadata *toresidimfileArgs = psMetadataAlloc(); - psMetadataAddU64(toresidimfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(toresidimfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddU64(toresidimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(toresidimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -toresidexp psMetadata *toresidexpArgs = psMetadataAlloc(); - psMetadataAddU64(toresidexpArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(toresidexpArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddU64(toresidexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(toresidexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -addresidimfile psMetadata *addresidimfileArgs = psMetadataAlloc(); - psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-det_id", 0, - "define detrend ID (required)", NULL); - psMetadataAddS32(addresidimfileArgs, PS_LIST_TAIL, "-iteration", 0, - "define iteration number", 0); - psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "define detrend ID (required)", NULL); - psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "define class ID (required)", NULL); - psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-uri", 0, - "define resid file URI", NULL); - psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-recip", 0, - "define recipe", NULL); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg", 0, - "define exposure background", NAN); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposure background stdev", NAN); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposure background mean stdev", NAN); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg_skewness", 0, - "define exposure background skewness", NAN); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg_kurtosis", 0, - "define exposure background kurtosis", NAN); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bin_stdev", 0, - "define exposure background binned stdev", NAN); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_0", 0, - "define fringe slope (0th term)", NAN); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_1", 0, - "define fringe slope (1st term)", NAN); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_2", 0, - "define fringe slope (2nd term)", NAN); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_resid_0", 0, - "define fringe residual (0th term)", NAN); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_resid_1", 0, - "define fringe residual (1st term)", NAN); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_resid_2", 0, - "define fringe residual (2nd term)", NAN); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-user_1", 0, - "define user statistic (1)", NAN); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-user_2", 0, - "define user statistic (2)", NAN); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-user_3", 0, - "define user statistic (3)", NAN); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-user_4", 0, - "define user statistic (4)", NAN); - psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-user_5", 0, - "define user statistic (5)", NAN); - psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-path_base", 0, - "define base output location", NULL); - psMetadataAddS16(addresidimfileArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); + psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS32(addresidimfileArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); + psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "define detrend ID (required)", NULL); + psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-class_id", 0, "define class ID (required)", NULL); + psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-uri", 0, "define resid file URI", NULL); + psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-recip", 0, "define recipe", NULL); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background stdev", NAN); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposure background mean stdev", NAN); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg_skewness", 0, "define exposure background skewness", NAN); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg_kurtosis", 0, "define exposure background kurtosis", NAN); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bin_stdev", 0, "define exposure background binned stdev", NAN); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_0", 0, "define fringe slope (0th term)", NAN); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_1", 0, "define fringe slope (1st term)", NAN); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_2", 0, "define fringe slope (2nd term)", NAN); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_resid_0", 0, "define fringe residual (0th term)", NAN); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_resid_1", 0, "define fringe residual (1st term)", NAN); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_resid_2", 0, "define fringe residual (2nd term)", NAN); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-user_1", 0, "define user statistic (1)", NAN); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-user_2", 0, "define user statistic (2)", NAN); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-user_3", 0, "define user statistic (3)", NAN); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-user_4", 0, "define user statistic (4)", NAN); + psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-user_5", 0, "define user statistic (5)", NAN); + psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", NULL); + psMetadataAddS16(addresidimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); // -residimfile psMetadata *residimfileArgs = psMetadataAlloc(); - psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-det_id", 0, - "search for detrend ID", NULL); - psMetadataAddS32(residimfileArgs, PS_LIST_TAIL, "-iteration", 0, - "search for iteration number", 0); - psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "define detrend ID", NULL); - psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search for class ID", NULL); - psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-recip", 0, - "search for recipe", NULL); - psMetadataAddU64(residimfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(residimfileArgs, PS_LIST_TAIL, "-faulted", 0, - "only return imfiles with a fault status set", false); - psMetadataAddBool(residimfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-select_state", 0, - "search for state", NULL); + psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddS32(residimfileArgs, PS_LIST_TAIL, "-iteration", 0, "search for iteration number", 0); + psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "define detrend ID", NULL); + psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID", NULL); + psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-recip", 0, "search for recipe", NULL); + psMetadataAddU64(residimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(residimfileArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); + psMetadataAddBool(residimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-select_state", 0, "search for state", NULL); // -revertresidimfile psMetadata *revertresidimfileArgs = psMetadataAlloc(); - psMetadataAddStr(revertresidimfileArgs, PS_LIST_TAIL, "-det_id", 0, - "search by detrend ID (required)", NULL); - psMetadataAddS32(revertresidimfileArgs, PS_LIST_TAIL, "-iteration", 0, - "search by iteration number", 0); - psMetadataAddStr(revertresidimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by detrend ID", NULL); - psMetadataAddStr(revertresidimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search for class ID", NULL); - psMetadataAddS16(revertresidimfileArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); + psMetadataAddStr(revertresidimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", NULL); + psMetadataAddS32(revertresidimfileArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); + psMetadataAddStr(revertresidimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by detrend ID", NULL); + psMetadataAddStr(revertresidimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID", NULL); + psMetadataAddS16(revertresidimfileArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); // -addresidexp psMetadata *addresidexpArgs = psMetadataAlloc(); - psMetadataAddStr(addresidexpArgs, PS_LIST_TAIL, "-det_id", 0, - "define detrend ID (required)", NULL); - psMetadataAddS32(addresidexpArgs, PS_LIST_TAIL, "-iteration", 0, - "define iteration number", 0); - psMetadataAddStr(addresidexpArgs, PS_LIST_TAIL, "-exp_id", 0, - "define detrend ID (required)", NULL); - psMetadataAddStr(addresidexpArgs, PS_LIST_TAIL, "-recip", 0, - "define recipe", NULL); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bg", 0, - "define exposure background", NAN); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposure background stdev", NAN); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposure background mean stdev", NAN); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bg_skewness", 0, - "define exposure background skewness", NAN); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bg_kurtosis", 0, - "define exposure background kurtosis", NAN); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bin_stdev", 0, - "define exposure background binned stdev", NAN); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-fringe_0", 0, - "define fringe slope (0th term)", NAN); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-fringe_1", 0, - "define fringe slope (1st term)", NAN); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-fringe_2", 0, - "define fringe slope (2nd term)", NAN); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-fringe_resid_0", 0, - "define fringe residual (0th term)", NAN); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-fringe_resid_1", 0, - "define fringe residual (1st term)", NAN); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-fringe_resid_2", 0, - "define fringe residual (2nd term)", NAN); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-user_1", 0, - "define user statistic (1)", NAN); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-user_2", 0, - "define user statistic (2)", NAN); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-user_3", 0, - "define user statistic (3)", NAN); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-user_4", 0, - "define user statistic (4)", NAN); - psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-user_5", 0, - "define user statistic (5)", NAN); - psMetadataAddStr(addresidexpArgs, PS_LIST_TAIL, "-path_base", 0, - "define base output location", NULL); - psMetadataAddS16(addresidexpArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); - psMetadataAddBool(addresidexpArgs, PS_LIST_TAIL, "-reject", 0, - "exposure is not to be stacked in the next iteration", false); + psMetadataAddStr(addresidexpArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS32(addresidexpArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); + psMetadataAddStr(addresidexpArgs, PS_LIST_TAIL, "-exp_id", 0, "define detrend ID (required)", NULL); + psMetadataAddStr(addresidexpArgs, PS_LIST_TAIL, "-recip", 0, "define recipe", NULL); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background stdev", NAN); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposure background mean stdev", NAN); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bg_skewness", 0, "define exposure background skewness", NAN); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bg_kurtosis", 0, "define exposure background kurtosis", NAN); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bin_stdev", 0, "define exposure background binned stdev", NAN); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-fringe_0", 0, "define fringe slope (0th term)", NAN); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-fringe_1", 0, "define fringe slope (1st term)", NAN); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-fringe_2", 0, "define fringe slope (2nd term)", NAN); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-fringe_resid_0", 0, "define fringe residual (0th term)", NAN); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-fringe_resid_1", 0, "define fringe residual (1st term)", NAN); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-fringe_resid_2", 0, "define fringe residual (2nd term)", NAN); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-user_1", 0, "define user statistic (1)", NAN); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-user_2", 0, "define user statistic (2)", NAN); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-user_3", 0, "define user statistic (3)", NAN); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-user_4", 0, "define user statistic (4)", NAN); + psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-user_5", 0, "define user statistic (5)", NAN); + psMetadataAddStr(addresidexpArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", NULL); + psMetadataAddS16(addresidexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); + psMetadataAddBool(addresidexpArgs, PS_LIST_TAIL, "-reject", 0, "exposure is not to be stacked in the next iteration", false); // -residexp psMetadata *residexpArgs = psMetadataAlloc(); - psMetadataAddStr(residexpArgs, PS_LIST_TAIL, "-det_id", 0, - "search for detrend ID", NULL); - psMetadataAddS32(residexpArgs, PS_LIST_TAIL, "-iteration", 0, - "search for iteration number", 0); - psMetadataAddStr(residexpArgs, PS_LIST_TAIL, "-exp_id", 0, - "search for exp ID", NULL); - psMetadataAddStr(residexpArgs, PS_LIST_TAIL, "-recip", 0, - "search for recipe", NULL); - psMetadataAddU64(residexpArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(residexpArgs, PS_LIST_TAIL, "-faulted", 0, - "only return imfiles with a fault status set", false); - psMetadataAddBool(residexpArgs, PS_LIST_TAIL, "-reject", 0, - "search for acceptable residuals", false); - psMetadataAddBool(residexpArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(residexpArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddS32(residexpArgs, PS_LIST_TAIL, "-iteration", 0, "search for iteration number", 0); + psMetadataAddStr(residexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search for exp ID", NULL); + psMetadataAddStr(residexpArgs, PS_LIST_TAIL, "-recip", 0, "search for recipe", NULL); + psMetadataAddU64(residexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(residexpArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); + psMetadataAddBool(residexpArgs, PS_LIST_TAIL, "-reject", 0, "search for acceptable residuals", false); + psMetadataAddBool(residexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -revertresidexp psMetadata *revertresidexpArgs = psMetadataAlloc(); - psMetadataAddStr(revertresidexpArgs, PS_LIST_TAIL, "-det_id", 0, - "search by detrend ID (required)", NULL); - psMetadataAddS32(revertresidexpArgs, PS_LIST_TAIL, "-iteration", 0, - "search by iteration number", 0); - psMetadataAddStr(revertresidexpArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by detrend ID", NULL); - psMetadataAddS16(revertresidexpArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); + psMetadataAddStr(revertresidexpArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", NULL); + psMetadataAddS32(revertresidexpArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); + psMetadataAddStr(revertresidexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by detrend ID", NULL); + psMetadataAddS16(revertresidexpArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); // -todetrunsummary psMetadata *todetrunsummaryArgs = psMetadataAlloc(); - psMetadataAddBool(todetrunsummaryArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - psMetadataAddU64(todetrunsummaryArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); + psMetadataAddBool(todetrunsummaryArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(todetrunsummaryArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); // -updateresidexp psMetadata *updateresidexpArgs = psMetadataAlloc(); - psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-det_id", 0, - "define detrend ID", NULL); - psMetadataAddS32(updateresidexpArgs, PS_LIST_TAIL, "-iteration", 0, - "define iteration number", 0); - psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-exp_id", 0, - "define exp ID", NULL); - psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-recip", 0, - "define recipe", NULL); - psMetadataAddF64(updateresidexpArgs, PS_LIST_TAIL, "-bg", 0, - "define exposure background", NAN); - psMetadataAddF64(updateresidexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposure background stdev", NAN); - psMetadataAddF64(updateresidexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposure background mean stdev", NAN); - psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-path_base", 0, - "define base output location", NULL); - psMetadataAddBool(updateresidexpArgs, PS_LIST_TAIL, "-reject", 0, - "exposure is not to be stacked in the next iteration", false); + psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID", NULL); + psMetadataAddS32(updateresidexpArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); + psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-exp_id", 0, "define exp ID", NULL); + psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-recip", 0, "define recipe", NULL); + psMetadataAddF64(updateresidexpArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); + psMetadataAddF64(updateresidexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background stdev", NAN); + psMetadataAddF64(updateresidexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposure background mean stdev", NAN); + psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", NULL); + psMetadataAddBool(updateresidexpArgs, PS_LIST_TAIL, "-reject", 0, "exposure is not to be stacked in the next iteration", false); // -adddetrunsummary psMetadata *adddetrunsummaryArgs = psMetadataAlloc(); - psMetadataAddStr(adddetrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0, - "define detrend ID (required)", NULL); - psMetadataAddS32(adddetrunsummaryArgs, PS_LIST_TAIL, "-iteration", 0, - "define iteration number", 0); - psMetadataAddF64(adddetrunsummaryArgs, PS_LIST_TAIL, "-bg", 0, - "define exposure background", NAN); - psMetadataAddF64(adddetrunsummaryArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposure background stdev", NAN); - psMetadataAddF64(adddetrunsummaryArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposure background mean stdev", NAN); - psMetadataAddS16(adddetrunsummaryArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); - psMetadataAddBool(adddetrunsummaryArgs, PS_LIST_TAIL, "-accept", 0, - "declare that this detrun iteration is accepted as a master", false); - psMetadataAddBool(adddetrunsummaryArgs, PS_LIST_TAIL, "-again", 0, - "start a new iteration of this detrend run", false); + psMetadataAddStr(adddetrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS32(adddetrunsummaryArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); + psMetadataAddF64(adddetrunsummaryArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); + psMetadataAddF64(adddetrunsummaryArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background stdev", NAN); + psMetadataAddF64(adddetrunsummaryArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposure background mean stdev", NAN); + psMetadataAddS16(adddetrunsummaryArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); + psMetadataAddBool(adddetrunsummaryArgs, PS_LIST_TAIL, "-accept", 0, "declare that this detrun iteration is accepted as a master", false); + psMetadataAddBool(adddetrunsummaryArgs, PS_LIST_TAIL, "-again", 0, "start a new iteration of this detrend run", false); // -detrunsummary psMetadata *detrunsummaryArgs = psMetadataAlloc(); - psMetadataAddStr(detrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0, - "search for detrend ID", NULL); - psMetadataAddU64(detrunsummaryArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddS32(detrunsummaryArgs, PS_LIST_TAIL, "-iteration", 0, - "search for iteration number", 0); - psMetadataAddBool(detrunsummaryArgs, PS_LIST_TAIL, "-faulted", 0, - "only return imfiles with a fault status set", false); - psMetadataAddBool(detrunsummaryArgs, PS_LIST_TAIL, "-reject", 0, - "search for acceptable residuals", false); - psMetadataAddBool(detrunsummaryArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(detrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddU64(detrunsummaryArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddS32(detrunsummaryArgs, PS_LIST_TAIL, "-iteration", 0, "search for iteration number", 0); + psMetadataAddBool(detrunsummaryArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); + psMetadataAddBool(detrunsummaryArgs, PS_LIST_TAIL, "-reject", 0, "search for acceptable residuals", false); + psMetadataAddBool(detrunsummaryArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -revertdetrunsummary psMetadata *revertdetrunsummaryArgs = psMetadataAlloc(); - psMetadataAddStr(revertdetrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0, - "search by detrend ID (required)", NULL); - psMetadataAddS32(revertdetrunsummaryArgs, PS_LIST_TAIL, "-iteration", 0, - "search by iteration number", 0); - psMetadataAddS16(revertdetrunsummaryArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); + psMetadataAddStr(revertdetrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", NULL); + psMetadataAddS32(revertdetrunsummaryArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); + psMetadataAddS16(revertdetrunsummaryArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); // -updatedetrunsummary psMetadata *updatedetrunsummaryArgs = psMetadataAlloc(); - psMetadataAddStr(updatedetrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0, - "search for detrend master for detrend ID (required)", NULL); - psMetadataAddBool(updatedetrunsummaryArgs, PS_LIST_TAIL, "-accept", 0, - "declare that this detrun iteration is accepted as a master", false); - psMetadataAddBool(updatedetrunsummaryArgs, PS_LIST_TAIL, "-reject", 0, - "reject this detrun iteration as a master", false); + psMetadataAddStr(updatedetrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend master for detrend ID (required)", NULL); + psMetadataAddBool(updatedetrunsummaryArgs, PS_LIST_TAIL, "-accept", 0, "declare that this detrun iteration is accepted as a master", false); + psMetadataAddBool(updatedetrunsummaryArgs, PS_LIST_TAIL, "-reject", 0, "reject this detrun iteration as a master", false); // -updatedetrun psMetadata *updatedetrunArgs = psMetadataAlloc(); - psMetadataAddStr(updatedetrunArgs, PS_LIST_TAIL, "-det_id", 0, - "search for detrend master for detrend ID (required)", NULL); - psMetadataAddBool(updatedetrunArgs, PS_LIST_TAIL, "-again", 0, - "start a new iteration of this detrend run", false); - psMetadataAddStr(updatedetrunArgs, PS_LIST_TAIL, "-state", 0, - "set the state of this detrend run", false); + psMetadataAddStr(updatedetrunArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend master for detrend ID (required)", NULL); + psMetadataAddBool(updatedetrunArgs, PS_LIST_TAIL, "-again", 0, "start a new iteration of this detrend run", false); + psMetadataAddStr(updatedetrunArgs, PS_LIST_TAIL, "-state", 0, "set the state of this detrend run", false); // -rerun psMetadata *rerunArgs = psMetadataAlloc(); - psMetadataAddStr(rerunArgs, PS_LIST_TAIL, "-det_id", 0, - "search for detrend master for detrend ID (required)", NULL); - psMetadataAddStr(rerunArgs, PS_LIST_TAIL, "-exp_id", PS_META_DUPLICATE_OK, - "include this exposure (multiple OK, required)", NULL); + psMetadataAddStr(rerunArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend master for detrend ID (required)", NULL); + psMetadataAddStr(rerunArgs, PS_LIST_TAIL, "-exp_id", PS_META_DUPLICATE_OK, "include this exposure (multiple OK, required)", NULL); // -register_detrend psMetadata *register_detrendArgs = psMetadataAlloc(); - psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-det_type", 0, - "define the type of detrend run (required)", NULL); - psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-mode", 0, - "define the mode of this detrend run", "master"); - psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-filelevel", 0, - "define filelevel (required)", NULL); - psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-workdir", 0, - "define workdir", NULL); - psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-inst", 0, - "define camera", NULL); - psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-telescope", 0, - "define telescope", NULL); - psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-exp_type", 0, - "define exposure type", NULL); - psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-filter", 0, - "define filter ", NULL); - psMetadataAddF32(register_detrendArgs, PS_LIST_TAIL, "-airmass_min", 0, - "define min airmass", NAN); - psMetadataAddF32(register_detrendArgs, PS_LIST_TAIL, "-airmass_max", 0, - "define max airmass", NAN); - psMetadataAddF32(register_detrendArgs, PS_LIST_TAIL, "-exp_time_min", 0, - "define min exposure time", NAN); - psMetadataAddF32(register_detrendArgs, PS_LIST_TAIL, "-exp_time_max", 0, - "define max exposure time", NAN); - psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, - "define min ccd tempature", NAN); - psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, - "define max ccd tempature", NAN); - psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-posang_min", 0, - "define min rotator position angle", NAN); - psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-posang_max", 0, - "define max rotator position angle", NAN); - psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-solang_min", 0, - "define min solar angle", NAN); - psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-solang_max", 0, - "define max solar angle", NAN); - psMetadataAddTime(register_detrendArgs, PS_LIST_TAIL, "-registered", 0, - "time detrend run was registered", now); - psMetadataAddTime(register_detrendArgs, PS_LIST_TAIL, "-time_begin", 0, - "detrend applies to exposures taken during this period", NULL); - psMetadataAddTime(register_detrendArgs, PS_LIST_TAIL, "-time_end", 0, - "detrend applies to exposures taken during this period", NULL); - psMetadataAddTime(register_detrendArgs, PS_LIST_TAIL, "-use_begin", 0, - "start of detrend run applicable period", NULL); - psMetadataAddTime(register_detrendArgs, PS_LIST_TAIL, "-use_end", 0, - "end of detrend run applicable period", NULL); - psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-parent", 0, - "define parent det_id", NULL); - psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-label", 0, - "define detrun label", NULL); - psMetadataAddBool(register_detrendArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-det_type", 0, "define the type of detrend run (required)", NULL); + psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-mode", 0, "define the mode of this detrend run", "master"); + psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-filelevel", 0, "define filelevel (required)", NULL); + psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir", NULL); + psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-inst", 0, "define camera", NULL); + psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-telescope", 0, "define telescope", NULL); + psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-exp_type", 0, "define exposure type", NULL); + psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-filter", 0, "define filter ", NULL); + psMetadataAddF32(register_detrendArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); + psMetadataAddF32(register_detrendArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); + psMetadataAddF32(register_detrendArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min exposure time", NAN); + psMetadataAddF32(register_detrendArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max exposure time", NAN); + psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); + psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); + psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); + psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + psMetadataAddTime(register_detrendArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); + psMetadataAddTime(register_detrendArgs, PS_LIST_TAIL, "-time_begin", 0, "detrend applies to exposures taken during this period", NULL); + psMetadataAddTime(register_detrendArgs, PS_LIST_TAIL, "-time_end", 0, "detrend applies to exposures taken during this period", NULL); + psMetadataAddTime(register_detrendArgs, PS_LIST_TAIL, "-use_begin", 0, "start of detrend run applicable period", NULL); + psMetadataAddTime(register_detrendArgs, PS_LIST_TAIL, "-use_end", 0, "end of detrend run applicable period", NULL); + psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-parent", 0, "define parent det_id", NULL); + psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-label", 0, "define detrun label", NULL); + psMetadataAddBool(register_detrendArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -register_detrend_imfile psMetadata *register_detrend_imfileArgs = psMetadataAlloc(); - psMetadataAddStr(register_detrend_imfileArgs, PS_LIST_TAIL, "-det_id", 0, - "define detrend ID (required)", NULL); - psMetadataAddStr(register_detrend_imfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search for class ID (required)", NULL); - psMetadataAddStr(register_detrend_imfileArgs, PS_LIST_TAIL, "-uri", 0, - "define resid file URI (required)", NULL); - psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-bg", 0, - "define exposure background", NAN); - psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposure background stdev", NAN); - psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposure background mean stdev", NAN); - psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-user_1", 0, - "define user statistic (1)", NAN); - psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-user_2", 0, - "define user statistic (2)", NAN); - psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-user_3", 0, - "define user statistic (3)", NAN); - psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-user_4", 0, - "define user statistic (4)", NAN); - psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-user_5", 0, - "define user statistic (5)", NAN); - psMetadataAddStr(register_detrend_imfileArgs, PS_LIST_TAIL, "-path_base", 0, - "define base output location", NULL); + psMetadataAddStr(register_detrend_imfileArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddStr(register_detrend_imfileArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID (required)", NULL); + psMetadataAddStr(register_detrend_imfileArgs, PS_LIST_TAIL, "-uri", 0, "define resid file URI (required)", NULL); + psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); + psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background stdev", NAN); + psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposure background mean stdev", NAN); + psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-user_1", 0, "define user statistic (1)", NAN); + psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-user_2", 0, "define user statistic (2)", NAN); + psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-user_3", 0, "define user statistic (3)", NAN); + psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-user_4", 0, "define user statistic (4)", NAN); + psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-user_5", 0, "define user statistic (5)", NAN); + psMetadataAddStr(register_detrend_imfileArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", NULL); psFree(now); @@ -1175,5 +712,5 @@ PXOPT_ADD_MODE("-revertnormalizedstat", "", DETTOOL_MODE_REVERTNORMALIZEDSTAT, revertnormalizedstatArgs); - PXOPT_ADD_MODE("-tonormalizedstat", "", DETTOOL_MODE_TONORMALIZEDSTAT, tonormstatArgs); + PXOPT_ADD_MODE("-tonormalizedstat", "", DETTOOL_MODE_TONORMALIZEDSTAT, tonormalizedstatArgs); PXOPT_ADD_MODE("-addnormalizedimfile", "", DETTOOL_MODE_ADDNORMALIZEDIMFILE,addnormalizedimfileArgs); PXOPT_ADD_MODE("-normalizedimfile","", DETTOOL_MODE_NORMALIZEDIMFILE, normalizedimfileArgs); @@ -1213,100 +750,21 @@ psFree(modes); - // setup search criterion -#define addWhereStr(name) \ -{ \ - psString str = NULL; \ - bool status = false; \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - // generate SQL where clause config->where = psMetadataAlloc(); addWhereStr(det_id); - { - // XXX this is broke because you can't specify -iteration 0 - psMetadataItem *item = psMetadataLookup(config->args, "-iteration"); - if (item && psStrcasestr(item->comment, "found")) { - if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "iteration", 0, "==", item->data.S32)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item iteration"); - psFree(config); - return NULL; - } - } - } - addWhereStr(det_type); - addWhereStr(exp_id); - addWhereStr(class_id); - // convert '-inst' to 'camera' - { - psString str = NULL; - bool status = false; - if ((str = psMetadataLookupStr(&status, config->args, "-inst"))) { - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, "camera", 0, "==", str)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item camera"); - psFree(config); - return NULL; - } - } - } - addWhereStr(telescope); - addWhereStr(exp_type); - { - int n = 0; - bool status = false; - if ((n = psMetadataLookupS32(&status, config->args, "-imfiles"))) { - if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "imfiles", 0, "==", n)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles"); - psFree(config); - return NULL; - } - } - } - addWhereStr(filter); - addWhereStr(recipe); - { - int n = 0; - bool status = false; - if ((n = psMetadataLookupS32(&status, config->args, "-guide_version"))) { - if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "guide_version", 0, "==", n)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item guide_version"); - psFree(config); - return NULL; - } - } - } - { - bool boolean = false; - bool status = false; - - // map reject -> !accept - if ((boolean = psMetadataLookupBool(&status, config->args, "-reject"))) { - if (!psMetadataAddBool(config->where, PS_LIST_TAIL, "accept", 0, "==", !boolean)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item reject"); - psFree(config); - return NULL; - } - } - } - - // convert '-code' to 'fault' - { - psS16 fault = 0; - bool status = false; - if ((fault = psMetadataLookupS16(&status, config->args, "-code"))) { - if (!psMetadataAddS16(config->where, PS_LIST_TAIL, "fault", 0, "==", fault)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); - psFree(config); - return NULL; - } - } - } + PXOPT_ADD_WHERE_S32(iteration); + PXOPT_ADD_WHERE_STR(det_type); + PXOPT_ADD_WHERE_STR(exp_id); + PXOPT_ADD_WHERE_STR(class_id); + PXOPT_ADD_WHERE_STR_ALIAS("-inst","camera"); + PXOPT_ADD_WHERE_STR(telescope); + PXOPT_ADD_WHERE_STR(exp_type); + PXOPT_ADD_WHERE_S32(imfiles); + PXOPT_ADD_WHERE_STR(filter); + PXOPT_ADD_WHERE_STR(recipe); + PXOPT_ADD_WHERE_S32(guide_version); + PXOPT_ADD_WHERE_BOOL_ALIAS_INVERT("-reject", "accept"); + PXOPT_ADD_WHERE_S16_ALIAS("-code", "fault"); if (config->where->list->n < 1) { Index: /branches/eam_branch_20080706/ippTools/src/difftoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/difftoolConfig.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/difftoolConfig.c (revision 18468) @@ -216,72 +216,12 @@ psFree(modes); - // setup search criterion -#define addWhereStr(name) \ -{ \ - psString str = NULL; \ - bool status = false; \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - -#define addWhereS32(name) \ -{ \ - psS32 s32 = 0; \ - bool status = false; \ - if ((s32= psMetadataLookupS32(&status, config->args, "-" #name))) { \ - if (!psMetadataAddS32(config->where, PS_LIST_TAIL, #name, 0, "==", s32)) { \ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - - // generate SQL where clause config->where = psMetadataAlloc(); -{ - psString str = NULL; - bool status = false; - if ((str = psMetadataLookupStr(&status, config->args, "-diff_id"))) { - if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "diff_id", 0, "==", (psS64)atoll(str))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item diff_id"); - psFree(config); - return NULL; - } - } -} -{ - psString str = NULL; - bool status = false; - if ((str = psMetadataLookupStr(&status, config->args, "-warp_id"))) { - if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "warp_id", 0, "==", (psS64)atoll(str))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id"); - psFree(config); - return NULL; - } - } -} - addWhereStr(skycell_id); - addWhereStr(tess_id); - - // convert '-code' to 'fault' - { - psS16 fault = 0; - bool status = false; - if ((fault = psMetadataLookupS16(&status, config->args, "-code"))) { - if (!psMetadataAddS16(config->where, PS_LIST_TAIL, "fault", 0, "==", fault)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); - psFree(config); - return NULL; - } - } - } + PXOPT_ADD_WHERE_S64(diff_id); + PXOPT_ADD_WHERE_S64(warp_id); + PXOPT_ADD_WHERE_STR(skycell_id); + PXOPT_ADD_WHERE_STR(tess_id); + PXOPT_ADD_WHERE_STR_ALIAS("-code", "fault"); if (config->where->list->n < 1) { Index: /branches/eam_branch_20080706/ippTools/src/flatcorrConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/flatcorrConfig.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/flatcorrConfig.c (revision 18468) @@ -214,32 +214,8 @@ psFree(modes); - // setup search criterion -#define addWhereStr(name) \ -{ \ - psString str = NULL; \ - bool status = false; \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - // generate SQL where clause config->where = psMetadataAlloc(); -{ - psString str = NULL; - bool status = false; - if ((str = psMetadataLookupStr(&status, config->args, "-corr_id"))) { - if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "corr_id", 0, "==", (psS64)atoll(str))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item corr_id"); - psFree(config); - return NULL; - } - } -} + PXOPT_ADD_WHERE_S64(corr_id); if (config->where->list->n < 1) { Index: /branches/eam_branch_20080706/ippTools/src/guidetoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/guidetoolConfig.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/guidetoolConfig.c (revision 18468) @@ -146,47 +146,15 @@ psFree(defineArgs); - // setup search criterion -#define addWhereStr(name) \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - exit(EXIT_FAILURE); \ - } \ - } - // generate SQL where clause config->where = psMetadataAlloc(); -{ - psString str = NULL; - int n = 0; - bool status = false; - - addWhereStr(exp_id); - // convert '-inst' to 'camera' - if ((str = psMetadataLookupStr(&status, config->args, "-inst"))) { - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, "camera", 0, "==", str)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item camera"); - exit(EXIT_FAILURE); - } - } - addWhereStr(telescope); - addWhereStr(exp_type); - if ((n = psMetadataLookupS32(&status, config->args, "-imfiles"))) { - if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "imfiles", 0, "==", n)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles"); - exit(EXIT_FAILURE); - } - } - addWhereStr(filter); - addWhereStr(stats); - addWhereStr(recipe); - if ((n = psMetadataLookupS32(&status, config->args, "-guide_version"))) { - if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "guide_version", 0, "==", n)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item guide_version"); - exit(EXIT_FAILURE); - } - } -} + PXOPT_ADD_WHERE_STR_ALIAS("-inst","camera"); + PXOPT_ADD_WHERE_STR(telescope); + PXOPT_ADD_WHERE_STR(exp_type); + PXOPT_ADD_WHERE_S32(imfiles); + PXOPT_ADD_WHERE_STR(filter); + PXOPT_ADD_WHERE_STR(stats); + PXOPT_ADD_WHERE_STR(recipe); + PXOPT_ADD_WHERE_S32(guide_version); if (config->where->list->n < 1) { Index: /branches/eam_branch_20080706/ippTools/src/magictoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/magictoolConfig.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/magictoolConfig.c (revision 18468) @@ -184,62 +184,12 @@ psFree(modes); - // setup search criterion -#define addWhereStr(name) \ -{ \ - psString str = NULL; \ - bool status = false; \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - -#define addWhereS32(name) \ -{ \ - psS32 s32 = 0; \ - bool status = false; \ - if ((s32= psMetadataLookupS32(&status, config->args, "-" #name))) { \ - if (!psMetadataAddS32(config->where, PS_LIST_TAIL, #name, 0, "==", s32)) { \ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - - // generate SQL where clause config->where = psMetadataAlloc(); -{ - psString str = NULL; - bool status = false; - if ((str = psMetadataLookupStr(&status, config->args, "-warp_id"))) { - if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "warp_id", 0, "==", (psS64)atoll(str))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id"); - psFree(config); - return NULL; - } - } -} - addWhereStr(skycell_id); - addWhereStr(tess_id); - addWhereStr(exp_id); - - // convert '-code' to 'fault' - { - psS16 fault = 0; - bool status = false; - if ((fault = psMetadataLookupS16(&status, config->args, "-code"))) { - if (!psMetadataAddS16(config->where, PS_LIST_TAIL, "fault", 0, "==", fault)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); - psFree(config); - return NULL; - } - } - } + PXOPT_ADD_WHERE_S64(warp_id); + PXOPT_ADD_WHERE_STR(skycell_id); + PXOPT_ADD_WHERE_STR(tess_id); + PXOPT_ADD_WHERE_STR(exp_id); + PXOPT_ADD_WHERE_STR_ALIAS("-code", "fault"); if (config->where->list->n < 1) { Index: /branches/eam_branch_20080706/ippTools/src/pstamptoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/pstamptoolConfig.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/pstamptoolConfig.c (revision 18468) @@ -208,23 +208,9 @@ psFree(modes); - // setup search criterion -#define addWhereStr(name) \ -{ \ - psString str = NULL; \ - bool status = false; \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - // generate SQL where clause config->where = psMetadataAlloc(); - addWhereStr(req_id); - addWhereStr(job_id); + PXOPT_ADD_WHERE_STR(req_id); + PXOPT_ADD_WHERE_STR(job_id); if (config->where->list->n < 1) { Index: /branches/eam_branch_20080706/ippTools/src/pxconfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/pxconfig.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/pxconfig.c (revision 18468) @@ -43,5 +43,5 @@ config->dbh = NULL; config->modules = NULL; - config->where = NULL; + // XXX config->where = NULL; config->args = NULL; @@ -54,5 +54,5 @@ psFree(config->dbh); psFree(config->modules); - psFree(config->where); + // XXX psFree(config->where); psFree(config->args); } Index: /branches/eam_branch_20080706/ippTools/src/pxconfig.h =================================================================== --- /branches/eam_branch_20080706/ippTools/src/pxconfig.h (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/pxconfig.h (revision 18468) @@ -30,5 +30,5 @@ psDB *dbh; psMetadata *args; - psMetadata *where; + // XXX deprecate psMetadata *where; int argc; char **argv; Index: /branches/eam_branch_20080706/ippTools/src/pxinjectConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/pxinjectConfig.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/pxinjectConfig.c (revision 18468) @@ -101,86 +101,10 @@ psFree(modes); - // setup search criterion -#define addWhereStr(name) \ -{ \ - psString str = NULL; \ - bool status = false; \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - // generate SQL where clause config->where = psMetadataAlloc(); - addWhereStr(det_id); - { - int n = 0; - bool status = false; - if ((n = psMetadataLookupS32(&status, config->args, "-iteration"))) { - if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "iteration", 0, "==", n)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item iteration"); - psFree(config); - return NULL; - } - } - } - addWhereStr(det_type); - addWhereStr(exp_id); - addWhereStr(class_id); - // convert '-inst' to 'camera' - { - psString str = NULL; - bool status = false; - if ((str = psMetadataLookupStr(&status, config->args, "-inst"))) { - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, "camera", 0, "==", str)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item camera"); - psFree(config); - return NULL; - } - } - } - addWhereStr(telescope); - { - int n = 0; - bool status = false; - if ((n = psMetadataLookupS32(&status, config->args, "-imfiles"))) { - if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "imfiles", 0, "==", n)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles"); - psFree(config); - return NULL; - } - } - } - addWhereStr(filter); - addWhereStr(stats); - addWhereStr(recipe); - { - int n = 0; - bool status = false; - if ((n = psMetadataLookupS32(&status, config->args, "-guide_version"))) { - if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "guide_version", 0, "==", n)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item guide_version"); - psFree(config); - return NULL; - } - } - } - { - bool boolean = false; - bool status = false; - - if ((boolean = psMetadataLookupBool(&status, config->args, "-accept"))) { - if (!psMetadataAddBool(config->where, PS_LIST_TAIL, "accept", 0, "==", boolean)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item accept"); - psFree(config); - return NULL; - } - } - } + // XXXX this funciton had a large number of bogus entries + PXOPT_ADD_WHERE_S64(exp_id); + PXOPT_ADD_WHERE_STR(class_id); if (config->where->list->n < 1) { Index: /branches/eam_branch_20080706/ippTools/src/pxtools.h =================================================================== --- /branches/eam_branch_20080706/ippTools/src/pxtools.h (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/pxtools.h (revision 18468) @@ -253,3 +253,222 @@ PXOPT_COPY_PRIMITIVE(from, to, psU64, U64, oldname, newname, comment) + +/*** these PXOPT_ADD_WHERE macros are used to construct the default sql elements ***/ + +#define PXOPT_ADD_WHERE_STR(name) \ +{ \ + psString str = NULL; \ + bool status = false; \ + if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ + if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\ + psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ + psFree(config); \ + return NULL; \ + } \ + } \ +} + +#define PXOPT_ADD_WHERE_STR_ALIAS(name,realname) \ +{ \ + psString str = NULL; \ + bool status = false; \ + if ((str = psMetadataLookupStr(&status, config->args, name))) { \ + if (!psMetadataAddStr(config->where, PS_LIST_TAIL, realname, 0, "==", str)) {\ + psError(PS_ERR_UNKNOWN, false, "failed to add item %s", name); \ + psFree(config); \ + return NULL; \ + } \ + } \ +} + +#define PXOPT_ADD_WHERE_S16(name) \ +{ \ + psS16 s16 = 0; \ + bool status = false; \ + if ((s16= psMetadataLookupS16(&status, config->args, "-" #name))) { \ + if (!psMetadataAddS16(config->where, PS_LIST_TAIL, #name, 0, "==", s16)) { \ + psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ + psFree(config); \ + return NULL; \ + } \ + } \ +} + +#define PXOPT_ADD_WHERE_BOOL(name) \ +{ \ + bool value = false; \ + bool status = false; \ + if ((value = psMetadataLookupBool(&status, config->args, "-" #name))) { \ + if (!psMetadataAddBool(config->where, PS_LIST_TAIL, #name, 0, "==", value)) { \ + psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ + psFree(config); \ + return NULL; \ + } \ + } \ +} + +#define PXOPT_ADD_WHERE_S32(name) \ +{ \ + psS32 s32 = 0; \ + bool status = false; \ + if ((s32= psMetadataLookupS32(&status, config->args, "-" #name))) { \ + if (!psMetadataAddS32(config->where, PS_LIST_TAIL, #name, 0, "==", s32)) { \ + psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ + psFree(config); \ + return NULL; \ + } \ + } \ +} + +#define PXOPT_ADD_WHERE_S64(name) \ +{ \ + psS64 s64 = 0; \ + bool status = false; \ + if ((s64= psMetadataLookupS64(&status, config->args, "-" #name))) { \ + if (!psMetadataAddS64(config->where, PS_LIST_TAIL, #name, 0, "==", s64)) { \ + psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ + psFree(config); \ + return NULL; \ + } \ + } \ +} + +#define PXOPT_ADD_WHERE_F32(name) \ +{ \ + psF32 var = 0; \ + bool status = false; \ + if ((var = psMetadataLookupF32(&status, config->args, "-" #name))) { \ + if (!isnan(var)) { \ + if (!psMetadataAddF32(config->where, PS_LIST_TAIL, #name, 0, "==", var)) { \ + psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ + psFree(config); \ + return NULL; \ + } \ + } \ + } \ +} + +#define PXOPT_ADD_WHERE_F64(name) \ +{ \ + psF64 var = 0; \ + bool status = false; \ + if ((var = psMetadataLookupF64(&status, config->args, "-" #name))) { \ + if (!isnan(var)) { \ + if (!psMetadataAddF64(config->where, PS_LIST_TAIL, #name, 0, "==", var)) { \ + psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ + psFree(config); \ + return NULL; \ + } \ + } \ + } \ +} + +#define PXOPT_ADD_WHERE_BOOL_ALIAS(flag,name) \ +{ \ + bool value = 0; \ + bool status = false; \ + if ((value = psMetadataLookupBool(&status, config->args, flag))) { \ + if (!psMetadataAddBOOL(config->where, PS_LIST_TAIL, name, 0, "==", value)) { \ + psError(PS_ERR_UNKNOWN, false, "failed to add item %s", flag); \ + psFree(config); \ + return NULL; \ + } \ + } \ +} + +#define PXOPT_ADD_WHERE_S16_ALIAS(flag,name) \ +{ \ + psS16 s16 = 0; \ + bool status = false; \ + if ((s16= psMetadataLookupS16(&status, config->args, flag))) { \ + if (!psMetadataAddS16(config->where, PS_LIST_TAIL, name, 0, "==", s16)) { \ + psError(PS_ERR_UNKNOWN, false, "failed to add item %s", flag); \ + psFree(config); \ + return NULL; \ + } \ + } \ +} + +#define PXOPT_ADD_WHERE_S32_ALIAS(flag,name) \ +{ \ + psS32 s32 = 0; \ + bool status = false; \ + if ((s32= psMetadataLookupS32(&status, config->args, flag))) { \ + if (!psMetadataAddS32(config->where, PS_LIST_TAIL, name, 0, "==", s32)) { \ + psError(PS_ERR_UNKNOWN, false, "failed to add item %s", flag); \ + psFree(config); \ + return NULL; \ + } \ + } \ +} + +#define PXOPT_ADD_WHERE_S64_ALIAS(flag,name) \ +{ \ + psS64 s64 = 0; \ + bool status = false; \ + if ((s64= psMetadataLookupS64(&status, config->args, flag))) { \ + if (!psMetadataAddS64(config->where, PS_LIST_TAIL, name, 0, "==", s64)) { \ + psError(PS_ERR_UNKNOWN, false, "failed to add item %s", flag); \ + psFree(config); \ + return NULL; \ + } \ + } \ +} + +#define PXOPT_ADD_WHERE_F32_ALIAS(flag,name) \ +{ \ + psF32 var = 0; \ + bool status = false; \ + if ((var = psMetadataLookupF32(&status, config->args, flag))) { \ + if (!isnan(var)) { \ + if (!psMetadataAddF32(config->where, PS_LIST_TAIL, name, 0, "==", var)) { \ + psError(PS_ERR_UNKNOWN, false, "failed to add item %s", flag); \ + psFree(config); \ + return NULL; \ + } \ + } \ + } \ +} + +#define PXOPT_ADD_WHERE_F64_ALIAS(flag,name) \ +{ \ + psF64 var = 0; \ + bool status = false; \ + if ((var = psMetadataLookupF64(&status, config->args, flag))) { \ + if (!isnan(var)) { \ + if (!psMetadataAddF64(config->where, PS_LIST_TAIL, name, 0, "==", var)) { \ + psError(PS_ERR_UNKNOWN, false, "failed to add item %s", flag); \ + psFree(config); \ + return NULL; \ + } \ + } \ + } \ +} + +#define PXOPT_ADD_WHERE_TIME_STR(name) \ +{ \ + psString str = NULL; \ + bool status = false; \ + if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ + psTime *time = psTimeFromISO(str, PS_TIME_UTC); \ + if (!time) { \ + psError(PS_ERR_UNKNOWN, false, "failed to convert " #name " into a psTime object"); \ + psFree(config); \ + return NULL; \ + } \ + psMetadataItem *item = psMetadataLookup(config->args, "-" #name); \ + if (item) { \ + str = item->comment; \ + } else { \ + str = NULL; \ + } \ + if (!psMetadataAddTime(config->where, PS_LIST_TAIL, #name, 0, str, time)) {\ + psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ + psFree(config); \ + return NULL; \ + } \ + psFree(time); \ + } \ +} + #endif // PXTOOLS_H Index: /branches/eam_branch_20080706/ippTools/src/pztoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/pztoolConfig.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/pztoolConfig.c (revision 18468) @@ -222,38 +222,13 @@ psFree(modes); - // setup search criterion -#define addWhereStr(name) \ -{ \ - psString str = NULL; \ - bool status = false; \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - // generate SQL where clause config->where = psMetadataAlloc(); - addWhereStr(exp_name); - addWhereStr(telescope); - // convert '-inst' to 'camera' - { - psString str = NULL; - bool status = false; - if ((str = psMetadataLookupStr(&status, config->args, "-inst"))) { - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, "camera", 0, "==", str)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item camera"); - psFree(config); - return NULL; - } - } - } - addWhereStr(exp_type); - addWhereStr(class); - addWhereStr(class_id); + PXOPT_ADD_WHERE_STR(exp_name); + PXOPT_ADD_WHERE_STR(telescope); + PXOPT_ADD_WHERE_STR_ALIAS("-inst", "camera"); + PXOPT_ADD_WHERE_STR(exp_type); + PXOPT_ADD_WHERE_STR(class); + PXOPT_ADD_WHERE_STR(class_id); if (config->where->list->n < 1) { Index: /branches/eam_branch_20080706/ippTools/src/regtoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/regtoolConfig.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/regtoolConfig.c (revision 18468) @@ -297,55 +297,17 @@ psFree(modes); - // setup search criterion -#define addWhereStr(name) \ -{ \ - psString str = NULL; \ - bool status = false; \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\ - psError(PXTOOLS_ERR_PROG, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - // generate SQL where clause config->where = psMetadataAlloc(); - addWhereStr(exp_id); - addWhereStr(exp_name); - // convert '-inst' to 'camera' - { - psString str = NULL; - bool status = false; - if ((str = psMetadataLookupStr(&status, config->args, "-inst"))) { - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, "camera", 0, "==", str)) { - psError(PXTOOLS_ERR_PROG, false, "failed to add item camera"); - psFree(config); - return NULL; - } - } - } - - addWhereStr(telescope); - addWhereStr(exp_type); - addWhereStr(class); - addWhereStr(class_id); - addWhereStr(tmp_class_id); - addWhereStr(filter); - - // convert '-code' to 'fault' - { - psS16 fault = 0; - bool status = false; - if ((fault = psMetadataLookupS16(&status, config->args, "-code"))) { - if (!psMetadataAddS16(config->where, PS_LIST_TAIL, "fault", 0, "==", fault)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); - psFree(config); - return NULL; - } - } - } + PXOPT_ADD_WHERE_S64(exp_id); + PXOPT_ADD_WHERE_STR(exp_name); + PXOPT_ADD_WHERE_STR_ALIAS("-inst", "camera"); + PXOPT_ADD_WHERE_STR(telescope); + PXOPT_ADD_WHERE_STR(exp_type); + PXOPT_ADD_WHERE_STR(class); + PXOPT_ADD_WHERE_STR(class_id); + PXOPT_ADD_WHERE_STR(tmp_class_id); + PXOPT_ADD_WHERE_STR(filter); + PXOPT_ADD_WHERE_S16_ALIAS("-code", "fault"); if (config->where->list->n < 1) { @@ -353,5 +315,4 @@ config->where = NULL; } - // define Database handle, if used Index: /branches/eam_branch_20080706/ippTools/src/stacktoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/stacktoolConfig.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/stacktoolConfig.c (revision 18468) @@ -226,74 +226,12 @@ psFree(modes); - // setup search criterion -#define addWhereStr(name) \ -{ \ - psString str = NULL; \ - bool status = false; \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - -#define addWhereS32(name) \ -{ \ - psS32 s32 = 0; \ - bool status = false; \ - if ((s32= psMetadataLookupS32(&status, config->args, "-" #name))) { \ - if (!psMetadataAddS32(config->where, PS_LIST_TAIL, #name, 0, "==", s32)) { \ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - - // generate SQL where clause config->where = psMetadataAlloc(); -{ - psString str = NULL; - bool status = false; - if ((str = psMetadataLookupStr(&status, config->args, "-warp_id"))) { - if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "warp_id", 0, "==", (psS64)atoll(str))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id"); - psFree(config); - return NULL; - } - } -} - -{ - psString str = NULL; - bool status = false; - if ((str = psMetadataLookupStr(&status, config->args, "-stack_id"))) { - if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "stack_id", 0, "==", (psS64)atoll(str))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item stack_id"); - psFree(config); - return NULL; - } - } -} - - addWhereStr(skycell_id); - addWhereStr(tess_id); - - // convert '-code' to 'fault' - { - psS16 fault = 0; - bool status = false; - if ((fault = psMetadataLookupS16(&status, config->args, "-code"))) { - if (!psMetadataAddS16(config->where, PS_LIST_TAIL, "fault", 0, "==", fault)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); - psFree(config); - return NULL; - } - } - } + PXOPT_ADD_WHERE_S64(warp_id); + PXOPT_ADD_WHERE_S64(stack_id); + PXOPT_ADD_WHERE_STR(skycell_id); + PXOPT_ADD_WHERE_STR(tess_id); + PXOPT_ADD_WHERE_S16_ALIAS("-code","fault"); if (config->where->list->n < 1) { Index: /branches/eam_branch_20080706/ippTools/src/warptoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/warptoolConfig.c (revision 18467) +++ /branches/eam_branch_20080706/ippTools/src/warptoolConfig.c (revision 18468) @@ -429,62 +429,12 @@ psFree(modes); - // setup search criterion -#define addWhereStr(name) \ -{ \ - psString str = NULL; \ - bool status = false; \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - -#define addWhereS32(name) \ -{ \ - psS32 s32 = 0; \ - bool status = false; \ - if ((s32= psMetadataLookupS32(&status, config->args, "-" #name))) { \ - if (!psMetadataAddS32(config->where, PS_LIST_TAIL, #name, 0, "==", s32)) { \ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - - // generate SQL where clause config->where = psMetadataAlloc(); -{ - psS64 warp_id = -1; - bool status = false; - if ((warp_id = psMetadataLookupS64(&status, config->args, "-warp_id"))) { - if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "warp_id", 0, "==", warp_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id"); - psFree(config); - return NULL; - } - } -} - addWhereStr(skycell_id); - addWhereStr(tess_id); - addWhereStr(exp_id); - - // convert '-code' to 'fault' - { - psS16 fault = 0; - bool status = false; - if ((fault = psMetadataLookupS16(&status, config->args, "-code"))) { - if (!psMetadataAddS16(config->where, PS_LIST_TAIL, "fault", 0, "==", fault)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); - psFree(config); - return NULL; - } - } - } + PXOPT_ADD_WHERE_S64(warp_id); + PXOPT_ADD_WHERE_STR(skycell_id); + PXOPT_ADD_WHERE_STR(tess_id); + PXOPT_ADD_WHERE_STR(exp_id); + PXOPT_ADD_WHERE_S16_ALIAS("-code", "fault"); if (config->where->list->n < 1) {