Index: trunk/ippTools/src/dettoolConfig.c =================================================================== --- trunk/ippTools/src/dettoolConfig.c (revision 18088) +++ trunk/ippTools/src/dettoolConfig.c (revision 18093) @@ -121,101 +121,101 @@ // -definebyquery - psMetadata *definebyqueryArgs = psMetadataAlloc(); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-det_type", 0, + psMetadata *definebydefinebyqueryArgs = psMetadataAlloc(); + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-det_type", 0, "define the type of detrend run (required)", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-mode", 0, + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-mode", 0, "define the mode of this detrend run", "master"); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filelevel", 0, + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-filelevel", 0, "define filelevel", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-workdir", 0, + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-inst", 0, + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-inst", 0, "define camera (required)", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-telescope", 0, + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-telescope", 0, "define telescope", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter", 0, + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-filter", 0, "define filter ", NULL); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-airmass_min", 0, + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-airmass_max", 0, + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_min", 0, + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min exposure time", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_max", 0, + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max exposure time", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_min", 0, + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_max", 0, + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-solang_min", 0, + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-solang_max", 0, + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-registered", 0, + psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-time_begin", 0, + psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-time_begin", 0, "detrend applies to exposures taken during this period", NULL); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-time_end", 0, + psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-time_end", 0, "detrend applies to exposures taken during this period", NULL); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-use_begin", 0, + psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-use_begin", 0, "start of detrend run applicable period", NULL); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-use_end", 0, + psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-use_end", 0, "end of detrend run applicable period", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_type", 0, + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_exp_type", 0, "search for exp_type", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_inst", 0, + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_inst", 0, "search for camera", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_telescope", 0, + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_telescope", 0, "search for telescope", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_filter", 0, + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_filter", 0, "search for filter", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_uri", 0, + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_uri", 0, "search for uri", NULL); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_begin", 0, + psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_begin", 0, "search for exposures by time (>=)", NULL); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_end", 0, + psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_end", 0, "search for exposures by time (<)", NULL); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_airmass_min", 0, + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_airmass_min", 0, "define min airmass", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_airmass_max", 0, + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_airmass_max", 0, "define max airmass", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_sat_pixel_frac_max", 0, + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_sat_pixel_frac_max", 0, "define max fraction of saturated pixels", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_min", 0, + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_min", 0, "define min exposure time", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_max", 0, + psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_max", 0, "define max exposure time", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_min", 0, + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_min", 0, "define min ccd tempature", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_max", 0, + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_max", 0, "define max ccd tempature", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_pon_time_min", 0, + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_pon_time_min", 0, "define min power-on time", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_pon_time_max", 0, + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_pon_time_max", 0, "define max power-on time", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_min", 0, + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_posang_min", 0, "define min rotator position angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_max", 0, + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_posang_max", 0, "define max rotator position angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_solang_min", 0, + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_solang_min", 0, "define min solar angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_solang_max", 0, + psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_solang_max", 0, "define max solar angle", NAN); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend", 0, + psMetadataAddBool(definebydefinebyqueryArgs, PS_LIST_TAIL, "-pretend", 0, "print the exposures that would be included in the detrend run and exit", false); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, "define reduction class for processing", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label", 0, + psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-label", 0, "define detrun label", NULL); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-random_subset", 0, + psMetadataAddBool(definebydefinebyqueryArgs, PS_LIST_TAIL, "-simple", 0, + "use the simple output format", false); + + psMetadataAddBool(definebydefinebyqueryArgs, PS_LIST_TAIL, "-random_subset", 0, "use a random subset of elements", false); - psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-random_limit", 0, + psMetadataAddS32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-random_limit", 0, "use this number of random elements", 20); @@ -1139,5 +1139,5 @@ PXOPT_ADD_MODE("-pending", "list active detruns", DETTOOL_MODE_PENDING, pendingArgs); PXOPT_ADD_MODE("-definebytag", "", DETTOOL_MODE_DEFINEBYTAG, definebytagArgs); - PXOPT_ADD_MODE("-definebyquery", "", DETTOOL_MODE_DEFINEBYQUERY, definebyqueryArgs); + PXOPT_ADD_MODE("-definebyquery", "", DETTOOL_MODE_DEFINEBYQUERY, definebydefinebyqueryArgs); PXOPT_ADD_MODE("-definebydetrun", "", DETTOOL_MODE_DEFINEBYDETRUN, definebydetrunArgs); PXOPT_ADD_MODE("-makecorrection", "", DETTOOL_MODE_MAKECORRECTION, makecorrectionArgs);