Index: /trunk/ippTools/src/chiptool.c =================================================================== --- /trunk/ippTools/src/chiptool.c (revision 17590) +++ /trunk/ippTools/src/chiptool.c (revision 17591) @@ -105,4 +105,567 @@ psMetadata *where = psMetadataAlloc(); + // convert exp_id into a psS64 + if (exp_id) { + if (!psMetadataAddS64(where, PS_LIST_TAIL, "exp_id", 0, "==", (psS64)atoll(exp_id))) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); + psFree(where); + return false; + } + } + + PXOPT_COPY_STR(config->args, where, "-exp_name", "exp_name", "=="); + PXOPT_COPY_STR(config->args, where, "-inst", "camera", "=="); + PXOPT_COPY_STR(config->args, where, "-telescope", "telescope", "=="); + PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "dateobs", ">="); + PXOPT_COPY_TIME(config->args, where, "-dateobs_end", "dateobs", "<="); + PXOPT_COPY_STR(config->args, where, "-exp_tag", "exp_tag", "=="); + PXOPT_COPY_STR(config->args, where, "-filelevel", "filelevel", "=="); + 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_F64(config->args, where, "-ra_min", "ra", ">="); + PXOPT_COPY_F64(config->args, where, "-ra_max", "ra", "<"); + PXOPT_COPY_F64(config->args, where, "-decl_min", "decl", ">="); + PXOPT_COPY_F64(config->args, where, "-decl_max", "decl", "<"); + PXOPT_COPY_F32(config->args, where, "-exp_time_min", "exp_time", ">="); + PXOPT_COPY_F32(config->args, where, "-exp_time_max", "exp_time", "<"); + PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_min", "sat_pixel_frac", ">="); + PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_max", "sat_pixel_frac", "<"); + PXOPT_COPY_F64(config->args, where, "-bg_min", "bg", ">="); + PXOPT_COPY_F64(config->args, where, "-bg_max", "bg", "<"); + PXOPT_COPY_F64(config->args, where, "-bg_stdev_min", "bg_stdev", ">="); + PXOPT_COPY_F64(config->args, where, "-bg_stdev_max", "bg_stdev", "<"); + PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_min", "bg_mean_stdev", ">="); + PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_max", "bg_mean_stdev", "<"); + PXOPT_COPY_F64(config->args, where, "-alt_min", "alt", ">="); + PXOPT_COPY_F64(config->args, where, "-alt_max", "alt", "<"); + PXOPT_COPY_F64(config->args, where, "-az_min", "az", ">="); + PXOPT_COPY_F64(config->args, where, "-az_max", "az", "<"); + PXOPT_COPY_F32(config->args, where, "-ccd_temp_min", "ccd_temp", ">="); + PXOPT_COPY_F32(config->args, where, "-ccd_temp_max", "ccd_temp", "<"); + PXOPT_COPY_F64(config->args, where, "-posang_min", "posang", ">="); + PXOPT_COPY_F64(config->args, where, "-posang_max", "posang", "<"); + PXOPT_COPY_STR(config->args, where, "-object", "object", "=="); + PXOPT_COPY_F32(config->args, where, "-solang_min", "solang", ">="); + PXOPT_COPY_F32(config->args, where, "-solang_max", "solang", "<"); + + if (!psListLength(where->list) + && !psMetadataLookupBool(NULL, config->args, "-all")) { + psFree(where); + psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); + return false; + } + + PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", false, false); + PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false); + PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", false, false); + PXOPT_LOOKUP_STR(expgroup, config->args, "-set_expgroup", false, false); + PXOPT_LOOKUP_STR(dvodb, config->args, "-set_dvodb", false, false); + PXOPT_LOOKUP_STR(tess_id, config->args, "-set_tess_id", false, false); + PXOPT_LOOKUP_STR(end_stage, config->args, "-set_end_stage", false, false); + + // default + PXOPT_COPY_STR(config->args, where, "-exp_type", "exp_type", "=="); + PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); + + // find the exp_id of all the exposures that we want to queue up. + psString query = pxDataGet("chiptool_find_rawexp.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, "rawExp"); + psStringAppend(&query, " AND %s", whereClause); + psFree(whereClause); + } + + psFree(where); + + if (pretend) { + // then stop before running the query + fprintf(stderr, "%s\n", query); + psFree(query); + return true; + } + + if (!p_psDBRunQuery(config->dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + return false; + } + psFree(query); + + psArray *output = p_psDBFetchResult(config->dbh); + if (!output) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + if (!psArrayLength(output)) { + psTrace("chiptool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + // start a transaction so we don't end up with an exp without any associted + // imfiles + if (!psDBTransaction(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(output); + return false; + } + + // loop over our list of exp_ids + for (long i = 0; i < psArrayLength(output); i++) { + psMetadata *md = output->data[i]; + + bool status; + psS64 exp_id = psMetadataLookupS64(&status, md, "exp_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for exp_id"); + psFree(output); + return false; + } + + // queue the exp + if (!pxchipQueueByExpTag(config, exp_id, workdir, label, reduction, expgroup, dvodb, tess_id, end_stage)) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, + "failed to trying to queue exp_id: %" PRId64, exp_id); + psFree(output); + return false; + } + } + psFree(output); + + if (!psDBCommit(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + return true; +} + + +static bool updaterunMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + psMetadata *where = psMetadataAlloc(); + PXOPT_LOOKUP_STR(chip_id, config->args, "-chip_id", false, false); + // convert chip_id into a psS64 + if (chip_id) { + if (!psMetadataAddS64(where, PS_LIST_TAIL, "chip_id", 0, "==", (psS64)atoll(chip_id))) { + psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); + psFree(where); + return false; + } + } + + PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", false, false); + // convert exp_id into a psS64 + if (exp_id) { + if (!psMetadataAddS64(where, PS_LIST_TAIL, "exp_id", 0, "==", (psS64)atoll(exp_id))) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); + psFree(where); + return false; + } + } + + PXOPT_COPY_STR(config->args, where, "-chip_id", "chip_id", "=="); + PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_STR(config->args, where, "-exp_name", "exp_name", "=="); + PXOPT_COPY_STR(config->args, where, "-inst", "camera", "=="); + PXOPT_COPY_STR(config->args, where, "-telescope", "telescope", "=="); + PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "dateobs", ">="); + PXOPT_COPY_TIME(config->args, where, "-dateobs_end", "dateobs", "<="); + PXOPT_COPY_STR(config->args, where, "-exp_tag", "exp_tag", "=="); + PXOPT_COPY_STR(config->args, where, "-exp_type", "exp_type", "=="); + PXOPT_COPY_STR(config->args, where, "-filelevel", "filelevel", "=="); + 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_F64(config->args, where, "-ra_min", "ra", ">="); + PXOPT_COPY_F64(config->args, where, "-ra_max", "ra", "<"); + PXOPT_COPY_F64(config->args, where, "-decl_min", "decl", ">="); + PXOPT_COPY_F64(config->args, where, "-decl_max", "decl", "<"); + PXOPT_COPY_F32(config->args, where, "-exp_time_min", "exp_time", ">="); + PXOPT_COPY_F32(config->args, where, "-exp_time_max", "exp_time", "<"); + PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_min", "sat_pixel_frac", ">="); + PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_max", "sat_pixel_frac", "<"); + PXOPT_COPY_F64(config->args, where, "-bg_min", "bg", ">="); + PXOPT_COPY_F64(config->args, where, "-bg_max", "bg", "<"); + PXOPT_COPY_F64(config->args, where, "-bg_stdev_min", "bg_stdev", ">="); + PXOPT_COPY_F64(config->args, where, "-bg_stdev_max", "bg_stdev", "<"); + PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_min", "bg_mean_stdev", ">="); + PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_max", "bg_mean_stdev", "<"); + PXOPT_COPY_F64(config->args, where, "-alt_min", "alt", ">="); + PXOPT_COPY_F64(config->args, where, "-alt_max", "alt", "<"); + PXOPT_COPY_F64(config->args, where, "-az_min", "az", ">="); + PXOPT_COPY_F64(config->args, where, "-az_max", "az", "<"); + PXOPT_COPY_F32(config->args, where, "-ccd_temp_min", "ccd_temp", ">="); + PXOPT_COPY_F32(config->args, where, "-ccd_temp_max", "ccd_temp", "<"); + PXOPT_COPY_F64(config->args, where, "-posang_min", "posang", ">="); + PXOPT_COPY_F64(config->args, where, "-posang_max", "posang", "<"); + PXOPT_COPY_STR(config->args, where, "-object", "object", "=="); + PXOPT_COPY_F32(config->args, where, "-solang_min", "solang", ">="); + PXOPT_COPY_F32(config->args, where, "-solang_max", "solang", "<"); + PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); + + if (!psListLength(where->list) + && !psMetadataLookupBool(NULL, config->args, "-all")) { + psFree(where); + where = NULL; + psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); + return false; + } + + PXOPT_LOOKUP_STR(state, config->args, "-state", false, false); + PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false); + + if ((!state) && (!label)) { + psError(PXTOOLS_ERR_DATA, false, "parameters are required"); + psFree(where); + return false; + } + + if (state) { + // set chipRun.state to state + if (!pxchipRunSetStateByQuery(config, where, state)) { + psFree(where); + return false; + } + } + + if (label) { + // set chipRun.label to label + if (!pxchipRunSetLabelByQuery(config, where, label)) { + psFree(where); + return false; + } + } + + psFree(where); + + return true; +} + + +static bool pendingimfileMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + + psMetadata *where = psMetadataAlloc(); + PXOPT_LOOKUP_STR(chip_id, config->args, "-chip_id", false, false); + // convert chip_id into a psS64 + if (chip_id) { + if (!psMetadataAddS64(where, PS_LIST_TAIL, "chipRun.chip_id", 0, "==", (psS64)atoll(chip_id))) { + psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); + psFree(where); + return false; + } + } + + PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", false, false); + // convert exp_id into a psS64 + if (exp_id) { + if (!psMetadataAddS64(where, PS_LIST_TAIL, "rawExp.exp_id", 0, "==", (psS64)atoll(exp_id))) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); + psFree(where); + return false; + } + } + + PXOPT_COPY_STR(config->args, where, "-class_id", "rawImfile.class_id", "=="); + PXOPT_COPY_STR(config->args, where, "-inst", "rawExp.telescope", "=="); + PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "=="); + + psString query = pxDataGet("chiptool_pendingimfile.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + return false; + } + + if (where && psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " AND %s", whereClause); + psFree(whereClause); + } + psFree(where); + + // treat limit == 0 as "no limit" + if (limit) { + psString limitString = psDBGenerateLimitSQL(limit); + psStringAppend(&query, " %s", limitString); + psFree(limitString); + } + + if (!p_psDBRunQuery(config->dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + return false; + } + psFree(query); + + psArray *output = p_psDBFetchResult(config->dbh); + if (!output) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + if (!psArrayLength(output)) { + psTrace("chiptool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + if (!convertIdToStr(output)) { + psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings"); + psFree(output); + return false; + } + + // negative simple so the default is true + if (!ippdbPrintMetadatas(stdout, output, "chipPendingImfile", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + + psFree(output); + + return true; +} + + +static bool addprocessedimfileMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + + // chip_id, ext_tag, class_id are required + PXOPT_LOOKUP_STR(chip_id, config->args, "-chip_id", true, false); + PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false); + PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false); + + // optional + PXOPT_LOOKUP_STR(uri, config->args, "-uri", false, false); + PXOPT_LOOKUP_F32(bg, config->args, "-bg", false, false); + PXOPT_LOOKUP_F32(bg_stdev, config->args, "-bg_stdev", false, false); + PXOPT_LOOKUP_F32(bg_mean_stdev, config->args, "-bg_mean_stdev", false, false); + PXOPT_LOOKUP_F32(bias, config->args, "-bias", false, false); + PXOPT_LOOKUP_F32(bias_stdev, config->args, "-bias_stdev", false, false); + PXOPT_LOOKUP_F32(fringe_0, config->args, "-fringe_0", false, false); + PXOPT_LOOKUP_F32(fringe_1, config->args, "-fringe_1", false, false); + PXOPT_LOOKUP_F32(fringe_2, config->args, "-fringe_2", false, false); + PXOPT_LOOKUP_F32(sigma_ra, config->args, "-sigma_ra", false, false); + PXOPT_LOOKUP_F32(sigma_dec, config->args, "-sigma_dec", false, false); + PXOPT_LOOKUP_F32(ap_resid, config->args, "-ap_resid", false, false); + PXOPT_LOOKUP_F32(ap_resid_stdev, config->args, "-ap_resid_stdev", false, false); + PXOPT_LOOKUP_F32(zp_mean, config->args, "-zp_mean", false, false); + PXOPT_LOOKUP_F32(zp_stdev, config->args, "-zp_stdev", false, false); + PXOPT_LOOKUP_F32(fwhm_major, config->args, "-fwhm_major", false, false); + PXOPT_LOOKUP_F32(fwhm_minor, config->args, "-fwhm_minor", false, false); + PXOPT_LOOKUP_F32(dtime_detrend, config->args, "-dtime_detrend", false, false); + PXOPT_LOOKUP_F32(dtime_photom, config->args, "-dtime_photom", false, false); + 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); + PXOPT_LOOKUP_F32(n_cr, config->args, "-n_cr", false, false); + PXOPT_LOOKUP_F32(n_astrom, config->args, "-n_astrom", false, false); + PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", false, false); + + // default values + PXOPT_LOOKUP_S16(code, config->args, "-code", false, false); + + if (!psDBTransaction(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + if (!chipProcessedImfileInsert(config->dbh, + (psS64)atoll(chip_id), + (psS64)atoll(exp_id), + class_id, + uri, + bg, + bg_stdev, + bg_mean_stdev, + bias, + bias_stdev, + fringe_0, + fringe_1, + fringe_2, + sigma_ra, + sigma_dec, + ap_resid, + ap_resid_stdev, + zp_mean, + zp_stdev, + fwhm_major, + fwhm_minor, + dtime_detrend, + dtime_photom, + dtime_astrom, + hostname, + n_stars, + n_extended, + n_cr, + n_astrom, + path_base, + code + )) { + // rollback + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + // XXX I've decided to make the transaction cover the Exp migration as + // well. Otherwise, if the last imfile in an exp is moved and the exp + // migration fails then the data base is left in a satuation where the exp + // migration can't happen. + + if (!chipProcessedCompleteExp(config)) { + // rollback + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + if (!psDBCommit(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + return true; +} + + +static bool processedimfileMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); + + psMetadata *where = psMetadataAlloc(); + PXOPT_LOOKUP_STR(chip_id, config->args, "-chip_id", false, false); + // convert chip_id into a psS64 + if (chip_id) { + if (!psMetadataAddS64(where, PS_LIST_TAIL, "chipRun.chip_id", 0, "==", (psS64)atoll(chip_id))) { + psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); + psFree(where); + return false; + } + } + + PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", false, false); + // convert exp_id into a psS64 + if (exp_id) { + if (!psMetadataAddS64(where, PS_LIST_TAIL, "rawExp.exp_id", 0, "==", (psS64)atoll(exp_id))) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); + psFree(where); + return false; + } + } + + PXOPT_COPY_STR(config->args, where, "-class_id", "rawImfile.class_id", "=="); + PXOPT_COPY_STR(config->args, where, "-inst", "rawExp.telescope", "=="); + PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "=="); + + psString query = pxDataGet("chiptool_processedimfile.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + return false; + } + + if (where && psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "chipProcessedImfile"); + psStringAppend(&query, " AND %s", whereClause); + psFree(whereClause); + } + psFree(where); + + if (faulted) { + // list only faulted rows + psStringAppend(&query, " %s", "AND chipProcessedImfile.fault != 0"); + } else { + // don't list faulted rows + psStringAppend(&query, " %s", "AND chipProcessedImfile.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("chiptool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + if (!convertIdToStr(output)) { + psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings"); + psFree(output); + return false; + } + + // negative simple so the default is true + if (!ippdbPrintMetadatas(stdout, output, "chipProcessedImfile", !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_LOOKUP_STR(chip_id, config->args, "-chip_id", false, false); + // convert chip_id into a psS64 + if (chip_id) { + if (!psMetadataAddS64(where, PS_LIST_TAIL, "chip_id", 0, "==", (psS64)atoll(chip_id))) { + psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); + psFree(where); + return false; + } + } + + PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", false, false); // convert exp_id into a psS64 if (exp_id) { @@ -158,563 +721,4 @@ } - PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", false, false); - PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false); - PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", false, false); - PXOPT_LOOKUP_STR(expgroup, config->args, "-set_expgroup", false, false); - PXOPT_LOOKUP_STR(dvodb, config->args, "-set_dvodb", false, false); - PXOPT_LOOKUP_STR(tess_id, config->args, "-set_tess_id", false, false); - PXOPT_LOOKUP_STR(end_stage, config->args, "-set_end_stage", false, false); - - // default - PXOPT_COPY_STR(config->args, where, "-exp_type", "exp_type", "=="); - PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); - - // find the exp_id of all the exposures that we want to queue up. - psString query = pxDataGet("chiptool_find_rawexp.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, "rawExp"); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } - - psFree(where); - - if (pretend) { - // then stop before running the query - fprintf(stderr, "%s\n", query); - psFree(query); - return true; - } - - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - return false; - } - psFree(query); - - psArray *output = p_psDBFetchResult(config->dbh); - if (!output) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - if (!psArrayLength(output)) { - psTrace("chiptool", PS_LOG_INFO, "no rows found"); - psFree(output); - return true; - } - - // start a transaction so we don't end up with an exp without any associted - // imfiles - if (!psDBTransaction(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(output); - return false; - } - - // loop over our list of exp_ids - for (long i = 0; i < psArrayLength(output); i++) { - psMetadata *md = output->data[i]; - - bool status; - psS64 exp_id = psMetadataLookupS64(&status, md, "exp_id"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for exp_id"); - psFree(output); - return false; - } - - // queue the exp - if (!pxchipQueueByExpTag(config, exp_id, workdir, label, reduction, expgroup, dvodb, tess_id, end_stage)) { - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, - "failed to trying to queue exp_id: %" PRId64, exp_id); - psFree(output); - return false; - } - } - psFree(output); - - if (!psDBCommit(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - return true; -} - - -static bool updaterunMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, NULL); - - psMetadata *where = psMetadataAlloc(); - PXOPT_LOOKUP_STR(chip_id, config->args, "-chip_id", false, false); - // convert chip_id into a psS64 - if (chip_id) { - if (!psMetadataAddS64(where, PS_LIST_TAIL, "chip_id", 0, "==", (psS64)atoll(chip_id))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); - psFree(where); - return false; - } - } - - PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", false, false); - // convert exp_id into a psS64 - if (exp_id) { - if (!psMetadataAddS64(where, PS_LIST_TAIL, "exp_id", 0, "==", (psS64)atoll(exp_id))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); - psFree(where); - return false; - } - } - - PXOPT_COPY_STR(config->args, where, "-exp_name", "exp_name", "=="); - PXOPT_COPY_STR(config->args, where, "-inst", "camera", "=="); - PXOPT_COPY_STR(config->args, where, "-telescope", "telescope", "=="); - PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "dateobs", ">="); - PXOPT_COPY_TIME(config->args, where, "-dateobs_end", "dateobs", "<="); - PXOPT_COPY_STR(config->args, where, "-exp_tag", "exp_tag", "=="); - PXOPT_COPY_STR(config->args, where, "-filelevel", "filelevel", "=="); - 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_F64(config->args, where, "-ra_min", "ra", ">="); - PXOPT_COPY_F64(config->args, where, "-ra_max", "ra", "<"); - PXOPT_COPY_F64(config->args, where, "-decl_min", "decl", ">="); - PXOPT_COPY_F64(config->args, where, "-decl_max", "decl", "<"); - PXOPT_COPY_F32(config->args, where, "-exp_time_min", "exp_time", ">="); - PXOPT_COPY_F32(config->args, where, "-exp_time_max", "exp_time", "<"); - PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_min", "sat_pixel_frac", ">="); - PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_max", "sat_pixel_frac", "<"); - PXOPT_COPY_F64(config->args, where, "-bg_min", "bt", ">="); - PXOPT_COPY_F64(config->args, where, "-bg_max", "bt", "<"); - PXOPT_COPY_F64(config->args, where, "-bg_stdev_min", "bg_stdev", ">="); - PXOPT_COPY_F64(config->args, where, "-bg_stdev_max", "bg_stdev", "<"); - PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_min", "bg_mean_stdev", ">="); - PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_max", "bg_mean_stdev", "<"); - PXOPT_COPY_F64(config->args, where, "-alt_min", "alt", ">="); - PXOPT_COPY_F64(config->args, where, "-alt_max", "alt", "<"); - PXOPT_COPY_F64(config->args, where, "-az_min", "az", ">="); - PXOPT_COPY_F64(config->args, where, "-az_max", "az", "<"); - PXOPT_COPY_F32(config->args, where, "-ccd_temp_min", "ccd_temp", ">="); - PXOPT_COPY_F32(config->args, where, "-ccd_temp_max", "ccd_temp", "<"); - PXOPT_COPY_F64(config->args, where, "-posang_min", "posang", ">="); - PXOPT_COPY_F64(config->args, where, "-posang_max", "posang", "<"); - PXOPT_COPY_STR(config->args, where, "-object", "object", "=="); - PXOPT_COPY_F32(config->args, where, "-solang_min", "solang", ">="); - PXOPT_COPY_F32(config->args, where, "-solang_max", "solang", "<"); - - if (!psListLength(where->list) - && !psMetadataLookupBool(NULL, config->args, "-all")) { - psFree(where); - where = NULL; - psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); - return false; - } - - PXOPT_LOOKUP_STR(state, config->args, "-state", false, false); - PXOPT_LOOKUP_STR(label, config->args, "-label", false, false); - - if ((!state) && (!label)) { - psError(PXTOOLS_ERR_DATA, false, "parameters are required"); - psFree(where); - return false; - } - - if (state) { - // set chipRun.state to state - if (!pxchipRunSetStateByQuery(config, where, state)) { - psFree(where); - return false; - } - } - - if (label) { - // set chipRun.label to label - if (!pxchipRunSetLabelByQuery(config, where, label)) { - psFree(where); - return false; - } - } - - psFree(where); - - return true; -} - - -static bool pendingimfileMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, NULL); - - PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); - PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - - psMetadata *where = psMetadataAlloc(); - PXOPT_LOOKUP_STR(chip_id, config->args, "-chip_id", false, false); - // convert chip_id into a psS64 - if (chip_id) { - if (!psMetadataAddS64(where, PS_LIST_TAIL, "chipRun.chip_id", 0, "==", (psS64)atoll(chip_id))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); - psFree(where); - return false; - } - } - - PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", false, false); - // convert exp_id into a psS64 - if (exp_id) { - if (!psMetadataAddS64(where, PS_LIST_TAIL, "rawExp.exp_id", 0, "==", (psS64)atoll(exp_id))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); - psFree(where); - return false; - } - } - - PXOPT_COPY_STR(config->args, where, "-class_id", "rawImfile.class_id", "=="); - PXOPT_COPY_STR(config->args, where, "-inst", "rawExp.telescope", "=="); - PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "=="); - - psString query = pxDataGet("chiptool_pendingimfile.sql"); - if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); - return false; - } - - if (where && psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } - psFree(where); - - // treat limit == 0 as "no limit" - if (limit) { - psString limitString = psDBGenerateLimitSQL(limit); - psStringAppend(&query, " %s", limitString); - psFree(limitString); - } - - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - return false; - } - psFree(query); - - psArray *output = p_psDBFetchResult(config->dbh); - if (!output) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - if (!psArrayLength(output)) { - psTrace("chiptool", PS_LOG_INFO, "no rows found"); - psFree(output); - return true; - } - - if (!convertIdToStr(output)) { - psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings"); - psFree(output); - return false; - } - - // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "chipPendingImfile", !simple)) { - psError(PS_ERR_UNKNOWN, false, "failed to print array"); - psFree(output); - return false; - } - - psFree(output); - - return true; -} - - -static bool addprocessedimfileMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, false); - - // chip_id, ext_tag, class_id are required - PXOPT_LOOKUP_STR(chip_id, config->args, "-chip_id", true, false); - PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false); - PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false); - - // optional - PXOPT_LOOKUP_STR(uri, config->args, "-uri", false, false); - PXOPT_LOOKUP_F32(bg, config->args, "-bg", false, false); - PXOPT_LOOKUP_F32(bg_stdev, config->args, "-bg_stdev", false, false); - PXOPT_LOOKUP_F32(bg_mean_stdev, config->args, "-bg_mean_stdev", false, false); - PXOPT_LOOKUP_F32(bias, config->args, "-bias", false, false); - PXOPT_LOOKUP_F32(bias_stdev, config->args, "-bias_stdev", false, false); - PXOPT_LOOKUP_F32(fringe_0, config->args, "-fringe_0", false, false); - PXOPT_LOOKUP_F32(fringe_1, config->args, "-fringe_1", false, false); - PXOPT_LOOKUP_F32(fringe_2, config->args, "-fringe_2", false, false); - PXOPT_LOOKUP_F32(sigma_ra, config->args, "-sigma_ra", false, false); - PXOPT_LOOKUP_F32(sigma_dec, config->args, "-sigma_dec", false, false); - PXOPT_LOOKUP_F32(ap_resid, config->args, "-ap_resid", false, false); - PXOPT_LOOKUP_F32(ap_resid_stdev, config->args, "-ap_resid_stdev", false, false); - PXOPT_LOOKUP_F32(zp_mean, config->args, "-zp_mean", false, false); - PXOPT_LOOKUP_F32(zp_stdev, config->args, "-zp_stdev", false, false); - PXOPT_LOOKUP_F32(fwhm_major, config->args, "-fwhm_major", false, false); - PXOPT_LOOKUP_F32(fwhm_minor, config->args, "-fwhm_minor", false, false); - PXOPT_LOOKUP_F32(dtime_detrend, config->args, "-dtime_detrend", false, false); - PXOPT_LOOKUP_F32(dtime_photom, config->args, "-dtime_photom", false, false); - 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); - PXOPT_LOOKUP_F32(n_cr, config->args, "-n_cr", false, false); - PXOPT_LOOKUP_F32(n_astrom, config->args, "-n_astrom", false, false); - PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", false, false); - - // default values - PXOPT_LOOKUP_S16(code, config->args, "-code", false, false); - - if (!psDBTransaction(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - if (!chipProcessedImfileInsert(config->dbh, - (psS64)atoll(chip_id), - (psS64)atoll(exp_id), - class_id, - uri, - bg, - bg_stdev, - bg_mean_stdev, - bias, - bias_stdev, - fringe_0, - fringe_1, - fringe_2, - sigma_ra, - sigma_dec, - ap_resid, - ap_resid_stdev, - zp_mean, - zp_stdev, - fwhm_major, - fwhm_minor, - dtime_detrend, - dtime_photom, - dtime_astrom, - hostname, - n_stars, - n_extended, - n_cr, - n_astrom, - path_base, - code - )) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - // XXX I've decided to make the transaction cover the Exp migration as - // well. Otherwise, if the last imfile in an exp is moved and the exp - // migration fails then the data base is left in a satuation where the exp - // migration can't happen. - - if (!chipProcessedCompleteExp(config)) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - if (!psDBCommit(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - return true; -} - - -static bool processedimfileMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, NULL); - - PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); - PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); - - psMetadata *where = psMetadataAlloc(); - PXOPT_LOOKUP_STR(chip_id, config->args, "-chip_id", false, false); - // convert chip_id into a psS64 - if (chip_id) { - if (!psMetadataAddS64(where, PS_LIST_TAIL, "chipRun.chip_id", 0, "==", (psS64)atoll(chip_id))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); - psFree(where); - return false; - } - } - - PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", false, false); - // convert exp_id into a psS64 - if (exp_id) { - if (!psMetadataAddS64(where, PS_LIST_TAIL, "rawExp.exp_id", 0, "==", (psS64)atoll(exp_id))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); - psFree(where); - return false; - } - } - - PXOPT_COPY_STR(config->args, where, "-class_id", "rawImfile.class_id", "=="); - PXOPT_COPY_STR(config->args, where, "-inst", "rawExp.telescope", "=="); - PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "=="); - - psString query = pxDataGet("chiptool_processedimfile.sql"); - if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); - return false; - } - - if (where && psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, "chipProcessedImfile"); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } - psFree(where); - - if (faulted) { - // list only faulted rows - psStringAppend(&query, " %s", "AND chipProcessedImfile.fault != 0"); - } else { - // don't list faulted rows - psStringAppend(&query, " %s", "AND chipProcessedImfile.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("chiptool", PS_LOG_INFO, "no rows found"); - psFree(output); - return true; - } - - if (!convertIdToStr(output)) { - psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings"); - psFree(output); - return false; - } - - // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "chipProcessedImfile", !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_LOOKUP_STR(chip_id, config->args, "-chip_id", false, false); - // convert chip_id into a psS64 - if (chip_id) { - if (!psMetadataAddS64(where, PS_LIST_TAIL, "chip_id", 0, "==", (psS64)atoll(chip_id))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); - psFree(where); - return false; - } - } - - PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", false, false); - // convert exp_id into a psS64 - if (exp_id) { - if (!psMetadataAddS64(where, PS_LIST_TAIL, "exp_id", 0, "==", (psS64)atoll(exp_id))) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); - psFree(where); - return false; - } - } - - PXOPT_COPY_STR(config->args, where, "-exp_name", "exp_name", "=="); - PXOPT_COPY_STR(config->args, where, "-inst", "camera", "=="); - PXOPT_COPY_STR(config->args, where, "-telescope", "telescope", "=="); - PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "dateobs", ">="); - PXOPT_COPY_TIME(config->args, where, "-dateobs_end", "dateobs", "<="); - PXOPT_COPY_STR(config->args, where, "-exp_tag", "exp_tag", "=="); - PXOPT_COPY_STR(config->args, where, "-filelevel", "filelevel", "=="); - 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_F64(config->args, where, "-ra_min", "ra", ">="); - PXOPT_COPY_F64(config->args, where, "-ra_max", "ra", "<"); - PXOPT_COPY_F64(config->args, where, "-decl_min", "decl", ">="); - PXOPT_COPY_F64(config->args, where, "-decl_max", "decl", "<"); - PXOPT_COPY_F32(config->args, where, "-exp_time_min", "exp_time", ">="); - PXOPT_COPY_F32(config->args, where, "-exp_time_max", "exp_time", "<"); - PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_min", "sat_pixel_frac", ">="); - PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_max", "sat_pixel_frac", "<"); - PXOPT_COPY_F64(config->args, where, "-bg_min", "bt", ">="); - PXOPT_COPY_F64(config->args, where, "-bg_max", "bt", "<"); - PXOPT_COPY_F64(config->args, where, "-bg_stdev_min", "bg_stdev", ">="); - PXOPT_COPY_F64(config->args, where, "-bg_stdev_max", "bg_stdev", "<"); - PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_min", "bg_mean_stdev", ">="); - PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_max", "bg_mean_stdev", "<"); - PXOPT_COPY_F64(config->args, where, "-alt_min", "alt", ">="); - PXOPT_COPY_F64(config->args, where, "-alt_max", "alt", "<"); - PXOPT_COPY_F64(config->args, where, "-az_min", "az", ">="); - PXOPT_COPY_F64(config->args, where, "-az_max", "az", "<"); - PXOPT_COPY_F32(config->args, where, "-ccd_temp_min", "ccd_temp", ">="); - PXOPT_COPY_F32(config->args, where, "-ccd_temp_max", "ccd_temp", "<"); - PXOPT_COPY_F64(config->args, where, "-posang_min", "posang", ">="); - PXOPT_COPY_F64(config->args, where, "-posang_max", "posang", "<"); - PXOPT_COPY_STR(config->args, where, "-object", "object", "=="); - PXOPT_COPY_F32(config->args, where, "-solang_min", "solang", ">="); - PXOPT_COPY_F32(config->args, where, "-solang_max", "solang", "<"); - - if (!psListLength(where->list) - && !psMetadataLookupBool(NULL, config->args, "-all")) { - psFree(where); - psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); - return false; - } - psString query = pxDataGet("chiptool_revertprocessedimfile.sql"); if (!query) { Index: /trunk/ippTools/src/chiptoolConfig.c =================================================================== --- /trunk/ippTools/src/chiptoolConfig.c (revision 17590) +++ /trunk/ippTools/src/chiptoolConfig.c (revision 17591) @@ -47,427 +47,236 @@ psMetadata *queueArgs = psMetadataAlloc(); // XXX need to allow multiple exp_ids - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exp_id", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_name", 0, - "search by exp_name", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-inst", 0, - "search for camera", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-telescope", 0, - "search for telescope", NULL); - psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-dateobs_begin", 0, - "search for exposures by time (>=)", NULL); - psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-dateobs_end", 0, - "search for exposures by time (<)", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_tag", 0, - "search by exp_tag", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_type", 0, - "search by exp_type", "object"); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filelevel", 0, - "search by filelevel", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-reduction", 0, - "search by reduction class", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filter", 0, - "search for filter", NULL); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass_min", 0, - "define min airmass", NAN); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass_max", 0, - "define max airmass", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_min", 0, - "define min", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_max", 0, - "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_min", 0, - "define min", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_max", 0, - "define max", NAN); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time_min", 0, - "define min", NAN); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time_max", 0, - "define max", NAN); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, - "define max fraction of saturated pixels", NAN); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, - "define min fraction of saturated pixels", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_min", 0, - "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_max", 0, - "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt_min", 0, - "define min", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt_max", 0, - "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az_min", 0, - "define min", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az_max", 0, - "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, - "define min ccd tempature", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, - "define max ccd tempature", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang_min", 0, - "define min rotator position angle", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang_max", 0, - "define max rotator position angle", NAN); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-object", 0, - "search by exposure object", NULL); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-solang_min", 0, - "define min solar angle", NAN); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-solang_max", 0, - "define max solar angle", NAN); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_workdir", 0, - "define workdir", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_label", 0, - "define label", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_reduction", 0, - "define reduction class", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_expgroup", 0, - "define exposure group", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_dvodb", 0, - "define DVO db", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_tess_id", 0, - "define tessellation identifier", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_end_stage", 0, - "define end stage", NULL); - psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-pretend", 0, - "do not actually modify the database", false); - psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-all", 0, - "allow everything to be queued without search terms", false); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); + psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", "object"); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); + psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); + psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_min", 0, "define min", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_max", 0, "define max", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_min", 0, "define min", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_max", 0, "define max", NAN); + psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min", NAN); + psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max", NAN); + psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "define max fraction of saturated pixels", NAN); + psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "define min fraction of saturated pixels", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_min", 0, "define max", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_max", 0, "define max", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "define max", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "define max", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "define max", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "define max", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt_min", 0, "define min", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt_max", 0, "define max", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az_min", 0, "define min", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az_max", 0, "define max", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); + psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); + psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_workdir", 0, "define workdir", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_reduction", 0, "define reduction class", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_expgroup", 0, "define exposure group", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_dvodb", 0, "define DVO db", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_tess_id", 0, "define tessellation identifier", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_end_stage", 0, "define end stage", NULL); + psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-pretend", 0, "do not actually modify the database", false); + psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); // -updaterun psMetadata *updaterunArgs = psMetadataAlloc(); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-chip_id", 0, - "search by chip ID", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exp_id", NULL); - 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", "object"); - 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); - - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, - "set state", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, - "set label", NULL); - psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all", 0, - "allow everything to be queued without search terms", false); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip ID", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", NULL); + 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", "object"); + 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 by filter", NULL); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_min", 0, "search by min airmass", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_max", 0, "search by max airmass", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_min", 0, "search by min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_max", 0, "search by max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_min", 0, "search by min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_max", 0, "search by max", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_min", 0, "search by min", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_max", 0, "search by max", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "search by max fraction of saturated pixels", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "search by min fraction of saturated pixels", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_min", 0, "search by max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_max", 0, "search by max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "search by max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "search by max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "search by max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "search by max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_min", 0, "search by min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_max", 0, "search by max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_min", 0, "search by min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_max", 0, "search by max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "search by min ccd tempature", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "search by max ccd tempature", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_min", 0, "search by min rotator position angle", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_max", 0, "search by 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, "search by min solar angle", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_max", 0, "search by max solar angle", NAN); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL); + + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "set state", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_label", 0, "set label", NULL); + psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); // -pendingimfile psMetadata *pendingimfileArgs = psMetadataAlloc(); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-chip_id", 0, - "search by chip ID", NULL); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exposure ID", NULL); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search by class ID", NULL); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-inst", 0, - "search by camera of interest", NULL); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-filter", 0, - "search by filter of interest", NULL); - psMetadataAddU64(pendingimfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip ID", NULL); + psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", NULL); + psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); + psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-inst", 0, "search by camera of interest", NULL); + psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-filter", 0, "search by filter of interest", NULL); + psMetadataAddU64(pendingimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -addprocessedimfile psMetadata *addprocessedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-chip_id", 0, - "define chip ID (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "define exposure ID (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "define class ID (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-uri", 0, - "define URL", NULL); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bg", 0, - "define exposure background", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposure background stdev", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposure background mean stdev", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bias", 0, - "define bias", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bias_stdev", 0, - "define bias stdev", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_0", 0, - "define fringe term 0", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_1", 0, - "define fringe term 1", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_2", 0, - "define fringe term 2", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-sigma_ra", 0, - "define error in RA", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-sigma_dec", 0, - "define error in DEC", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-ap_resid", 0, - "define aperture residual", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-ap_resid_stdev", 0, - "define aperture residual stdev", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-zp_mean", 0, - "define zero point", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-zp_stdev", 0, - "define zero point stdev", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fwhm_major", 0, - "define fwhm (major axis; arcsec)", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fwhm_minor", 0, - "define fwhm (minor axis; arcsec)", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-dtime_detrend", 0, - "define elapsed time for detrend (seconds)", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-dtime_photom", 0, - "define elapsed time for photometry (seconds)", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-dtime_astrom", 0, - "define elapsed time for astrometry (seconds)", NAN); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-hostname", 0, - "define hostname", NULL); - psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_stars", 0, - "define number of stars in image", 0); - psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_extended", 0, - "define number of extended objects in image", 0); - psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_cr", 0, - "define number of cosmic rays in image", 0); - psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_astrom", 0, - "define number of astrometry stars used", 0); - - 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, "-chip_id", 0, "define chip ID (required)", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "define exposure ID (required)", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "define class ID (required)", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-uri", 0, "define URL", NULL); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background stdev", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposure background mean stdev", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bias", 0, "define bias", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bias_stdev", 0, "define bias stdev", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_0", 0, "define fringe term 0", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_1", 0, "define fringe term 1", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_2", 0, "define fringe term 2", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-sigma_ra", 0, "define error in RA", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-sigma_dec", 0, "define error in DEC", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-ap_resid", 0, "define aperture residual", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-ap_resid_stdev", 0, "define aperture residual stdev", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-zp_mean", 0, "define zero point", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-zp_stdev", 0, "define zero point stdev", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fwhm_major", 0, "define fwhm (major axis; arcsec)", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fwhm_minor", 0, "define fwhm (minor axis; arcsec)", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-dtime_detrend", 0, "define elapsed time for detrend (seconds)", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-dtime_photom", 0, "define elapsed time for photometry (seconds)", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-dtime_astrom", 0, "define elapsed time for astrometry (seconds)", NAN); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-hostname", 0, "define hostname", NULL); + psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_stars", 0, "define number of stars in image", 0); + psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_extended", 0, "define number of extended objects in image", 0); + psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_cr", 0, "define number of cosmic rays in image", 0); + psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_astrom", 0, "define number of astrometry stars used", 0); + + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", NULL); + psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); // -processedimfile psMetadata *processedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-chip_id", 0, - "define chip ID", NULL); - psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "define exposure ID", NULL); - psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "define class ID", NULL); - psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-inst", 0, - "define camera of interest", NULL); - psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-filter", 0, - "define filter of interest", NULL); - 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, "-chip_id", 0, "define chip ID", NULL); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "define exposure ID", NULL); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "define class ID", NULL); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-inst", 0, "define camera of interest", NULL); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-filter", 0, "define filter of interest", NULL); + 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); // -updateprocessedimfile psMetadata *updateprocessedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-chip_id", 0, - "search by chip ID", NULL); - psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exposure ID", NULL); - psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search by class ID", NULL); - psMetadataAddS16(updateprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, - "set fault code (required)", 0); + psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip ID", NULL); + psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", NULL); + psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); + psMetadataAddS16(updateprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); // -revertprocessedimfile psMetadata *revertprocessedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-chip_id", 0, - "search by chip ID", NULL); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exp_id", NULL); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_name", 0, - "search by exp_name", NULL); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-inst", 0, - "search for camera", NULL); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-telescope", 0, - "search for telescope", NULL); - psMetadataAddTime(revertprocessedimfileArgs, PS_LIST_TAIL, "-dateobs_begin", 0, - "search for exposures by time (>=)", NULL); - psMetadataAddTime(revertprocessedimfileArgs, PS_LIST_TAIL, "-dateobs_end", 0, - "search for exposures by time (<)", NULL); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, - "search by exp_tag", NULL); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_type", 0, - "search by exp_type", "object"); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-filelevel", 0, - "search by filelevel", NULL); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-reduction", 0, - "search by reduction class", NULL); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-filter", 0, - "search for filter", NULL); - psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-airmass_min", 0, - "define min airmass", NAN); - psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-airmass_max", 0, - "define max airmass", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ra_min", 0, - "define min", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ra_max", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-decl_min", 0, - "define min", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-decl_max", 0, - "define max", NAN); - psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_time_min", 0, - "define min", NAN); - psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_time_max", 0, - "define max", NAN); - psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, - "define max fraction of saturated pixels", NAN); - psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, - "define min fraction of saturated pixels", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_min", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_max", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-alt_min", 0, - "define min", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-alt_max", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-az_min", 0, - "define min", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-az_max", 0, - "define max", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ccd_temp_min",0, - "define min ccd tempature", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ccd_temp_max",0, - "define max ccd tempature", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-posang_min", 0, - "define min rotator position angle", NAN); - psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-posang_max", 0, - "define max rotator position angle", NAN); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-object", 0, - "search by exposure object", NULL); - psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-solang_min", 0, - "define min solar angle", NAN); - psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-solang_max", 0, - "define max solar angle", NAN); - - psMetadataAddBool(revertprocessedimfileArgs, PS_LIST_TAIL, "-all", 0, - "allow everything to be queued without search terms", false); - psMetadataAddS16(revertprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); + psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip ID", NULL); + psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", NULL); + psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); + psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); + psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); + psMetadataAddTime(revertprocessedimfileArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(revertprocessedimfileArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); + psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", "object"); + psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); + psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL); + psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); + psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); + psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ra_min", 0, "define min", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ra_max", 0, "define max", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-decl_min", 0, "define min", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-decl_max", 0, "define max", NAN); + psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min", NAN); + psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max", NAN); + psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "define max fraction of saturated pixels", NAN); + psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "define min fraction of saturated pixels", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_min", 0, "define max", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_max", 0, "define max", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "define max", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "define max", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "define max", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "define max", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-alt_min", 0, "define min", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-alt_max", 0, "define max", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-az_min", 0, "define min", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-az_max", 0, "define max", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ccd_temp_min",0, "define min ccd tempature", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ccd_temp_max",0, "define max ccd tempature", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); + psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); + psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + + psMetadataAddBool(revertprocessedimfileArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); + psMetadataAddS16(revertprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); // -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(); - psMetadataAddStr(maskedArgs, PS_LIST_TAIL, "-label", 0, - "list blocks for specified label", NULL); - psMetadataAddBool(maskedArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - psMetadataAddU64(maskedArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); + psMetadataAddStr(maskedArgs, PS_LIST_TAIL, "-label", 0, "list blocks for specified label", NULL); + psMetadataAddBool(maskedArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(maskedArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); // -unmasked psMetadata *unmaskedArgs = psMetadataAlloc(); - psMetadataAddStr(unmaskedArgs, PS_LIST_TAIL, "-label", 0, - "restrict to specified label", NULL); - psMetadataAddBool(unmaskedArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - psMetadataAddU64(unmaskedArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); + psMetadataAddStr(unmaskedArgs, PS_LIST_TAIL, "-label", 0, "restrict to specified label", NULL); + psMetadataAddBool(unmaskedArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(unmaskedArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); // -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(); psMetadata *modes = psMetadataAlloc(); - PXOPT_ADD_MODE("-queue", "create runs from raw exposures", - CHIPTOOL_MODE_QUEUE, queueArgs); - 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("-queue", "create runs from raw exposures", CHIPTOOL_MODE_QUEUE, queueArgs); + 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); Index: /trunk/ippTools/src/regtoolConfig.c =================================================================== --- /trunk/ippTools/src/regtoolConfig.c (revision 17590) +++ /trunk/ippTools/src/regtoolConfig.c (revision 17591) @@ -30,4 +30,6 @@ #include "regtool.h" +#define ADD_OPT(TYPE,TARG,NAME,COMMENT,DEFAULT) psMetadataAdd##TYPE(TARG, PS_LIST_TAIL, NAME, 0, COMMENT, DEFAULT) + pxConfig *regtoolConfig(pxConfig *config, int argc, char **argv) { @@ -50,103 +52,86 @@ // support for this options is unimplemented #if 0 - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exposure ID", NULL); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class", 0, - "search by class", NULL); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search by class ID", NULL); + ADD_OPT(Str, pendingimfileArgs, "-exp_id", "search by exposure ID", NULL); + ADD_OPT(Str, pendingimfileArgs, "-class", "search by class", NULL); + ADD_OPT(Str, pendingimfileArgs, "-class_id", "search by class ID", NULL); #endif - psMetadataAddU64(pendingimfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + ADD_OPT(U64, pendingimfileArgs, "-limit", "limit result set to N items", 0); + ADD_OPT(Bool, pendingimfileArgs, "-simple", "use the simple output format", false); // -addprocessedimfile psMetadata *addprocessedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "define exposure ID (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_name", 0, "define the exp_name (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-inst", 0, "define the camera name (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-telescope", 0, "define the telescope name (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-tmp_class_id", 0, "define temp. class 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 (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_type", 0, "define exposure type", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-filelevel", 0, "define filelevel", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-filter", 0, "define filter ", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-comment", 0, "define comment ", NULL); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-airmass", 0, "define airmass", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-ra", 0, "define RA", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-decl", 0, "define DEC", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_time", 0, "define exposure time", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-sat_pixel_frac", 0, "define fraction of saturated pixels", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg", 0, "define exposue background", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposue background stdev", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-alt", 0, "define altitute", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-az", 0, "define azimuth", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-ccd_temp", 0, "define ccd tempature", NAN); - psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-posang", 0, "define rotator position angle", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_x", 0, "define M1 X position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_y", 0, "define M1 Y position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_z", 0, "define M1 Z position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_tip", 0, "define M1 TIP position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_tilt", 0, "define M1 TILT position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_x", 0, "define M2 X position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_y", 0, "define M2 Y position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_z", 0, "define M2 Z position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_tip", 0, "define M2 TIP position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_tilt", 0, "define M2 TILT position", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-env_temperature",0, "define Environmental Temperature", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-env_humidity", 0, "define Environmental Humidity", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-env_wind_speed", 0, "define Environmental Wind Speed", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-env_wind_dir", 0, "define Environmental Wind Direction", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_m1", 0, "define Telescope Temperature : M1", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_m1cell", 0, "define Telescope Temperature : M1 Cell", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_m2", 0, "define Telescope Temperature : M2", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_spider", 0, "define Telescope Temperature : Spider", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_truss", 0, "define Telescope Temperature : Truss", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_extra", 0, "define Telescope Temperature : Extra", NAN); - psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-pon_time", 0, "define time to last Power On", 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, "-object", 0, "define exposure object", NULL); - psMetadataAddTime(addprocessedimfileArgs, PS_LIST_TAIL, "-dateobs", 0, "define observation time", NULL); - psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); + ADD_OPT(Str, addprocessedimfileArgs, "-exp_id", "define exposure ID (required)", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-exp_name", "define the exp_name (required)", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-inst", "define the camera name (required)", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-telescope", "define the telescope name (required)", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-tmp_class_id", "define temp. class ID (required)", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-class_id", "define class ID (required)", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-uri", "define URI (required)", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-exp_type", "define exposure type", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-filelevel", "define filelevel", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-filter", "define filter ", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-comment", "define comment ", NULL); + ADD_OPT(F32, addprocessedimfileArgs, "-airmass", "define airmass", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-ra", "define RA", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-decl", "define DEC", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-exp_time", "define exposure time", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-sat_pixel_frac", "define fraction of saturated pixels", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-bg", "define exposue background", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-bg_stdev", "define exposue background stdev", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-bg_mean_stdev", "define exposue background mean stdev", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-alt", "define altitute", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-az", "define azimuth", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-ccd_temp", "define ccd tempature", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-posang", "define rotator position angle", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m1_x", "define M1 X position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m1_y", "define M1 Y position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m1_z", "define M1 Z position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m1_tip", "define M1 TIP position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m1_tilt", "define M1 TILT position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m2_x", "define M2 X position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m2_y", "define M2 Y position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m2_z", "define M2 Z position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m2_tip", "define M2 TIP position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-m2_tilt", "define M2 TILT position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-env_temperature","define Environmental Temperature", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-env_humidity", "define Environmental Humidity", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-env_wind_speed", "define Environmental Wind Speed", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-env_wind_dir", "define Environmental Wind Direction", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_m1", "define Telescope Temperature : M1", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_m1cell", "define Telescope Temperature : M1 Cell", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_m2", "define Telescope Temperature : M2", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_spider", "define Telescope Temperature : Spider", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_truss", "define Telescope Temperature : Truss", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-teltemp_extra", "define Telescope Temperature : Extra", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-pon_time", "define time to last Power On", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-user_1", "define user statistic (1)", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-user_2", "define user statistic (2)", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-user_3", "define user statistic (3)", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-user_4", "define user statistic (4)", NAN); + ADD_OPT(F64, addprocessedimfileArgs, "-user_5", "define user statistic (5)", NAN); + ADD_OPT(Str, addprocessedimfileArgs, "-object", "define exposure object", NULL); + ADD_OPT(Time, addprocessedimfileArgs, "-dateobs", "define observation time", NULL); + ADD_OPT(S16, addprocessedimfileArgs, "-code", "set fault code", 0); // -processedimfile psMetadata *processedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exposure ID", NULL); - psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search by class ID", NULL); - 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); + ADD_OPT(Str, processedimfileArgs, "-exp_id", "search by exposure ID", NULL); + ADD_OPT(Str, processedimfileArgs, "-class_id", "search by class ID", NULL); + ADD_OPT(U64, processedimfileArgs, "-limit", "limit result set to N items", 0); + ADD_OPT(Bool, processedimfileArgs, "-faulted", "only return imfiles with a fault status set", false); + ADD_OPT(Bool, processedimfileArgs, "-simple", "use the simple output format", false); // -revertprocessedimfile psMetadata *revertprocessedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exposure ID (required)", NULL); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-tmp_class_id", 0, - "searcy by temp. class 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); + ADD_OPT(Str, revertprocessedimfileArgs, "-exp_id", "search by exposure ID (required)", NULL); + ADD_OPT(Str, revertprocessedimfileArgs, "-tmp_class_id", "searcy by temp. class ID", NULL); + ADD_OPT(Str, revertprocessedimfileArgs, "-class_id", "search by class ID", NULL); + ADD_OPT(S16, revertprocessedimfileArgs, "-code", "search by fault code", 0); // -updateprocessedimfile psMetadata *updateprocessedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exposure ID", NULL); - psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search by class ID", NULL); - psMetadataAddS16(updateprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, - "set fault code (required)", INT16_MAX); + ADD_OPT(Str, updateprocessedimfileArgs, "-exp_id", "search by exposure ID", NULL); + ADD_OPT(Str, updateprocessedimfileArgs, "-class_id", "search by class ID", NULL); + ADD_OPT(S16, updateprocessedimfileArgs, "-code", "set fault code (required)", INT16_MAX); // -pendingexp @@ -154,145 +139,81 @@ // support for these options in unimplemented #if 0 - psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exposure ID", NULL); - psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-inst", 0, - "search by camera", NULL); - psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-telescope", 0, - "search by telescope", NULL); - psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_type", 0, - "search by exposure type", NULL); + psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", NULL); + psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-inst", 0, "search by camera", NULL); + psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-telescope",0, "search by telescope", NULL); + psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exposure type", NULL); #endif - 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); + 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); // -addprocessedexp psMetadata *addprocessedexpArgs = psMetadataAlloc(); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_id", 0, - "exp_id to operate on (required)", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_name", 0, - "define the exp_name (required)", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-inst", 0, - "define the camera name (required)", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-telescope", 0, - "define the telescope name (required)", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_tag", 0, - "define the external exposure tag name (required)", NULL); - psMetadataAddTime(addprocessedexpArgs, PS_LIST_TAIL, "-dateobs", 0, - "define observation time", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_type", 0, - "define exposure type", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-filelevel", 0, - "define the data partitioning level of this file", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-workdir", 0, - "define the \"default\" workdir for this exposure", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-dvodb", 0, - "define the dvodb for the next processing step", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-tess_id", 0, - "define the tess_id for the next processing step", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-end_stage", 0, - "define the end goal processing step", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-reduction", 0, - "define the \"default\" reduction class for this exposure", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-filter", 0, - "define filter ", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-comment", 0, - "define comment ", NULL); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-airmass", 0, - "define airmass", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-ra", 0, - "define RA", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-decl", 0, - "define DEC", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-exp_time", 0, - "define exposure time", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-sat_pixel_frac", 0, - "define fraction of saturated pixels", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg", 0, - "define exposue background", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposue background stdev", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposue background mean stdev", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-alt", 0, - "define altitute", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-az", 0, - "define azimuth", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ccd_temp", 0, - "define ccd tempature", NAN); - psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-posang", 0, - "define rotator position angle", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m1_x", 0, - "define M1 X position", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m1_y", 0, - "define M1 Y position", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m1_z", 0, - "define M1 Z position", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m1_tip", 0, - "define M1 TIP position", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m1_tilt", 0, - "define M1 TILT position", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m2_x", 0, - "define M2 X position", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m2_y", 0, - "define M2 Y position", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m2_z", 0, - "define M2 Z position", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m2_tip", 0, - "define M2 TIP position", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m2_tilt", 0, - "define M2 TILT position", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-env_temperature", 0, - "define Environmental Temperature", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-env_humidity", 0, - "define Environmental Humidity", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-env_wind_speed", 0, - "define Environmental Wind Speed", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-env_wind_dir", 0, - "define Environmental Wind Direction", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_m1", 0, - "define Telescope Temperature : M1", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_m1cell", 0, - "define Telescope Temperature : M1 Cell", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_m2", 0, - "define Telescope Temperature : M2", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_spider", 0, - "define Telescope Temperature : Spider", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_truss", 0, - "define Telescope Temperature : Truss", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_extra", 0, - "define Telescope Temperature : Extra", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-pon_time", 0, - "define time to last Power On", 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, "-object", 0, - "define exposure object", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-label", 0, - "define label for chip stage (non-detrend data only)", NULL); - psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "exp_id to operate on (required)", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_name", 0, "define the exp_name (required)", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-inst", 0, "define the camera name (required)", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-telescope", 0, "define the telescope name (required)", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_tag", 0, "define the external exposure tag name (required)", NULL); + psMetadataAddTime(addprocessedexpArgs, PS_LIST_TAIL, "-dateobs", 0, "define observation time", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_type", 0, "define exposure type", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-filelevel", 0, "define the data partitioning level of this file", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-workdir", 0, "define the \"default\" workdir for this exposure", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-dvodb", 0, "define the dvodb for the next processing step", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-tess_id", 0, "define the tess_id for the next processing step", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-end_stage", 0, "define the end goal processing step", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-reduction", 0, "define the \"default\" reduction class for this exposure", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-filter", 0, "define filter ", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-comment", 0, "define comment ", NULL); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-airmass", 0, "define airmass", NAN); + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-ra", 0, "define RA", NAN); + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-decl", 0, "define DEC", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-exp_time", 0, "define exposure time", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-sat_pixel_frac", 0, "define fraction of saturated pixels", NAN); + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg", 0, "define exposue background", NAN); + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposue background stdev", NAN); + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-alt", 0, "define altitute", NAN); + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-az", 0, "define azimuth", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ccd_temp", 0, "define ccd tempature", NAN); + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-posang", 0, "define rotator position angle", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m1_x", 0, "define M1 X position", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m1_y", 0, "define M1 Y position", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m1_z", 0, "define M1 Z position", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m1_tip", 0, "define M1 TIP position", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m1_tilt", 0, "define M1 TILT position", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m2_x", 0, "define M2 X position", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m2_y", 0, "define M2 Y position", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m2_z", 0, "define M2 Z position", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m2_tip", 0, "define M2 TIP position", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m2_tilt", 0, "define M2 TILT position", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-env_temperature", 0, "define Environmental Temperature", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-env_humidity", 0, "define Environmental Humidity", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-env_wind_speed", 0, "define Environmental Wind Speed", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-env_wind_dir", 0, "define Environmental Wind Direction", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_m1", 0, "define Telescope Temperature : M1", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_m1cell", 0, "define Telescope Temperature : M1 Cell", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_m2", 0, "define Telescope Temperature : M2", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_spider", 0, "define Telescope Temperature : Spider", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_truss", 0, "define Telescope Temperature : Truss", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_extra", 0, "define Telescope Temperature : Extra", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-pon_time", 0, "define time to last Power On", 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, "-object", 0, "define exposure object", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-label", 0, "define label for chip stage (non-detrend data only)", NULL); + psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); /* - psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-recip", 0, - "define URL", NULL); - psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-mosiac", 0, - "define URL", NULL); + psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-recip", 0, "define URL", NULL); + psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-mosiac", 0, "define URL", NULL); */ // -processedexp psMetadata *processedexpArgs = psMetadataAlloc(); - psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", NULL); - psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); - psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); - psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", NULL); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); psMetadataAddTime(processedexpArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); psMetadataAddTime(processedexpArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); @@ -305,51 +226,43 @@ psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-airmass_max", 0, "search by max airmass", NAN); psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-ra_min", 0, "search by min", NAN); - psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-ra_max", 0, "search by max", NAN); - psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-decl_min", 0, "search by min", NAN); - psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-decl_max", 0, "search by max", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-ra_max", 0, "search by max", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-decl_min", 0, "search by min", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-decl_max", 0, "search by max", NAN); psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-exp_time_min", 0, "search by min", NAN); psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-exp_time_max", 0, "search by max", NAN); psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "search by max fraction of saturated pixels", NAN); psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "search by min fraction of saturated pixels", NAN); - psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_min", 0, "search by max", NAN); - psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_max", 0, "search by max", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_min", 0, "search by max", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_max", 0, "search by max", NAN); psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "search by max", NAN); psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "search by max", NAN); psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "search by max", NAN); psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "search by max", NAN); - psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-alt_min", 0, "search by min", NAN); - psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-alt_max", 0, "search by max", NAN); - psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-az_min", 0, "search by min", NAN); - psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-az_max", 0, "search by max", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-alt_min", 0, "search by min", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-alt_max", 0, "search by max", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-az_min", 0, "search by min", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-az_max", 0, "search by max", NAN); psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "search by min ccd tempature", NAN); psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "search by max ccd tempature", NAN); - psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-posang_min", 0, "search by min rotator position angle", NAN); - psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-posang_max", 0, "search by max rotator position angle", NAN); - psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); - psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); - psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); - - 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); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-posang_min", 0, "search by min rotator position angle", NAN); + psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-posang_max", 0, "search by max rotator position angle", NAN); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); + psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); + psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + + 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, "-exp_id", 0, - "search by exposure ID (required)", NULL); - psMetadataAddS16(revertprocessedexpArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); + psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID (required)", NULL); + psMetadataAddS16(revertprocessedexpArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); // -updatedprocessedexp psMetadata *updatedprocessedexpArgs = psMetadataAlloc(); - psMetadataAddStr(updatedprocessedexpArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exposure ID", NULL); - psMetadataAddS16(updatedprocessedexpArgs, PS_LIST_TAIL, "-code", 0, - "set fault code (required)", INT16_MAX); + psMetadataAddStr(updatedprocessedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", NULL); + psMetadataAddS16(updatedprocessedexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", INT16_MAX); - psMetadata *argSets = psMetadataAlloc(); psMetadata *modes = psMetadataAlloc();