Index: trunk/ippTools/src/camtoolConfig.c =================================================================== --- trunk/ippTools/src/camtoolConfig.c (revision 19092) +++ trunk/ippTools/src/camtoolConfig.c (revision 19158) @@ -49,53 +49,53 @@ // XXX need to allow multiple chip_ids // XXX need to allow multiple exp_ids - psMetadata *definebydefinebyqueryArgs = psMetadataAlloc(); - psMetadataAddS64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip_id", 0); - psMetadataAddS64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); - psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); - psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ra_min", 0, "define min", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ra_max", 0, "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-decl_min", 0, "define min", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-decl_max", 0, "define max", NAN); - psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min", NAN); - psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max", NAN); - psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "define max fraction of saturated pixels", NAN); - psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "define min fraction of saturated pixels", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_min", 0, "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_max", 0, "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-alt_min", 0, "define min", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-alt_max", 0, "define max", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-az_min", 0, "define min", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-az_max", 0, "define max", NAN); - psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); - psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); - psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); - psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); - psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); - - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_workdir", 0, "define workdir", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_reduction", 0, "define reduction class", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_expgroup", 0, "define exposure group", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_dvodb", 0, "define DVO db", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_tess_id", 0, "define tess ID", NULL); - psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_end_stage", 0, "define end stage", NULL); - psMetadataAddBool(definebydefinebyqueryArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); + psMetadata *definebyqueryArgs = psMetadataAlloc(); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip_id", 0); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); + psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ra_min", 0, "define min", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ra_max", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-decl_min", 0, "define min", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-decl_max", 0, "define max", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "define max fraction of saturated pixels", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "define min fraction of saturated pixels", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_min", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_max", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-alt_min", 0, "define min", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-alt_max", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-az_min", 0, "define min", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-az_max", 0, "define max", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_workdir", 0, "define workdir", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_reduction", 0, "define reduction class", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_expgroup", 0, "define exposure group", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_dvodb", 0, "define DVO db", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_tess_id", 0, "define tess ID", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_end_stage", 0, "define end stage", NULL); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); // -updaterun @@ -297,5 +297,5 @@ psMetadata *modes = psMetadataAlloc(); - PXOPT_ADD_MODE("-definebyquery", "create runs from chip stage", CAMTOOL_MODE_DEFINEBYQUERY, definebydefinebyqueryArgs); + PXOPT_ADD_MODE("-definebyquery", "create runs from chip stage", CAMTOOL_MODE_DEFINEBYQUERY, definebyqueryArgs); PXOPT_ADD_MODE("-updaterun", "change cam run properties", CAMTOOL_MODE_UPDATERUN, updaterunArgs); PXOPT_ADD_MODE("-pendingexp", "show pending exposures", CAMTOOL_MODE_PENDINGEXP, pendingexpArgs);