Index: trunk/ippTools/src/warptoolConfig.c =================================================================== --- trunk/ippTools/src/warptoolConfig.c (revision 18461) +++ trunk/ippTools/src/warptoolConfig.c (revision 18561) @@ -49,353 +49,205 @@ // -definerun psMetadata *definerunArgs = psMetadataAlloc(); - psMetadataAddS64(definerunArgs, PS_LIST_TAIL, "-fake_id", 0, - "define camtool ID (required)", 0); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-mode", 0, - "define mode (required)", NULL); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0, - "define workdir (required)", NULL); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-label", 0, - "define label", NULL); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-dvodb", 0, - "define dvodb", NULL); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id", 0, - "define tess_id", NULL); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-end_stage", 0, - "define end stage", NULL); - psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-registered", 0, - "time detrend run was registered", now); - psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-magiced", 0, - "has this exposure been magiced", false); - psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(definerunArgs, PS_LIST_TAIL, "-fake_id", 0, "define camtool ID (required)", 0); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-mode", 0, "define mode (required)", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-label", 0, "define label", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-dvodb", 0, "define dvodb", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id", 0, "define tess_id", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-end_stage", 0, "define end stage", NULL); + psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); + psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-magiced", 0, "has this exposure been magiced", false); + psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -updaterun + // XXX need to allow multiple fake_ids + // XXX need to allow multiple fake_ids + // XXX need to allow multiple chip_ids + // XXX need to allow multiple exp_ids psMetadata *updaterunArgs = psMetadataAlloc(); - // XXX need to allow multiple fake_ids - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID", 0); - // XXX need to allow multiple fake_ids - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-fake_id", 0, - "search by fake_id", 0); - // XXX need to allow multiple chip_ids - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-chip_id", 0, - "search by chip_id", 0); - // XXX need to allow multiple exp_ids - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exp_id", 0); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_name", 0, - "search by exp_name", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-inst", 0, - "search for camera", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-telescope", 0, - "search for telescope", NULL); - psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_begin", 0, - "search for exposures by time (>=)", NULL); - psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_end", 0, - "search for exposures by time (<)", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_tag", 0, - "search by exp_tag", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_type", 0, - "search by exp_type", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filelevel", 0, - "search by filelevel", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction", 0, - "search by reduction class", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filter", 0, - "search for filter", NULL); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_min", 0, - "define min airmass", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_max", 0, - "define max airmass", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_min", 0, - "define min", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_min", 0, - "define min", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_max", 0, - "define max", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_min", 0, - "define min", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_max", 0, - "define max", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, - "define max fraction of saturated pixels", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, - "define min fraction of saturated pixels", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_min", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_min", 0, - "define min", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_min", 0, - "define min", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, - "define min ccd tempature", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, - "define max ccd tempature", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_min", 0, - "define min rotator position angle", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_max", 0, - "define max rotator position angle", NAN); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-object", 0, - "search by exposure object", NULL); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_min", 0, - "define min solar angle", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_max", 0, - "define max solar angle", NAN); - - psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all", 0, - "allow everything to be queued without search terms", false); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, - "set state", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, - "set label", NULL); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-fake_id", 0, "search by fake_id", 0); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip_id", 0); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); + psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_min", 0, "define min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_min", 0, "define min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_max", 0, "define max", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "define max fraction of saturated pixels", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "define min fraction of saturated pixels", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_min", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_min", 0, "define min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_min", 0, "define min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + + psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "set state", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "set label", NULL); + #if 0 - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-workdir", 0, - "define workdir (required)", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-registered", 0, - "time detrend run was registered", now); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); #endif // -exp psMetadata *expArgs = psMetadataAlloc(); - psMetadataAddS64(expArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID", 0); - psMetadataAddS64(expArgs, PS_LIST_TAIL, "-fake_id", 0, - "search by camtool ID", 0); - psMetadataAddU64(expArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(expArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(expArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); + psMetadataAddS64(expArgs, PS_LIST_TAIL, "-fake_id", 0, "search by camtool ID", 0); + psMetadataAddU64(expArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(expArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -imfile psMetadata *imfileArgs = psMetadataAlloc(); - psMetadataAddS64(imfileArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID", 0); - psMetadataAddS64(imfileArgs, PS_LIST_TAIL, "-fake_id", 0, - "search by camtool ID", 0); - psMetadataAddU64(imfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(imfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(imfileArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); + psMetadataAddS64(imfileArgs, PS_LIST_TAIL, "-fake_id", 0, "search by camtool ID", 0); + psMetadataAddU64(imfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(imfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -tooverlap psMetadata *tooverlapArgs = psMetadataAlloc(); - psMetadataAddS64(tooverlapArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warp ID", 0); - psMetadataAddU64(tooverlapArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(tooverlapArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(tooverlapArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warp ID", 0); + psMetadataAddU64(tooverlapArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(tooverlapArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -addoverlap psMetadata *addoverlapArgs = psMetadataAlloc(); - psMetadataAddStr(addoverlapArgs, PS_LIST_TAIL, "-mapfile", 0, - "path to skycell <-> imfile mapping file", NULL); - psMetadataAddS64(addoverlapArgs, PS_LIST_TAIL, "-warp_id", 0, - "set warp ID", 0); - psMetadataAddS16(addoverlapArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); + psMetadataAddStr(addoverlapArgs, PS_LIST_TAIL, "-mapfile", 0, "path to skycell <-> imfile mapping file", NULL); + psMetadataAddS64(addoverlapArgs, PS_LIST_TAIL, "-warp_id", 0, "set warp ID", 0); + psMetadataAddS16(addoverlapArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); // -scmap psMetadata *scmapArgs = psMetadataAlloc(); - psMetadataAddS64(scmapArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID", 0); - psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-skycell_id", 0, - "search by skycell ID", NULL); - psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-tess_id", 0, - "search by tess ID", NULL); - psMetadataAddU64(scmapArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(scmapArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(scmapArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); + psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", NULL); + psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID", NULL); + psMetadataAddU64(scmapArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(scmapArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -towarped psMetadata *towarpedArgs = psMetadataAlloc(); - psMetadataAddS64(towarpedArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID", 0); - psMetadataAddU64(towarpedArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(towarpedArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(towarpedArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); + psMetadataAddU64(towarpedArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(towarpedArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -addwarped psMetadata *addwarpedArgs = psMetadataAlloc(); - psMetadataAddS64(addwarpedArgs, PS_LIST_TAIL, "-warp_id", 0, - "define warptool ID (required)", 0); - psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-skycell_id", 0, - "define skycell ID (required)", NULL); - psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-tess_id", 0, - "define tessellation ID (required)", NULL); - psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-uri", 0, - "define URI of file", 0); - psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-path_base", 0, - "define base output location", 0); - psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg", 0, - "define exposure background", NAN); - psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposure background stdev", NAN); - psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-dtime_warp", 0, - "define elapsed processing time", NAN); - psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-xmin", 0, - "define minimum x value", INT_MAX); - psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-xmax", 0, - "define maximum x value", -INT_MAX); - psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-ymin", 0, - "define minimum y value", INT_MAX); - psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-ymax", 0, - "define maximum y value", -INT_MAX); - psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-hostname", 0, - "define hostname", 0); - psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-good_frac", 0, - "define %% of good pixels", NAN); - psMetadataAddBool(addwarpedArgs, PS_LIST_TAIL, "-ignore", 0, - "define if this skycell should be ignored", false); - psMetadataAddS16(addwarpedArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); + psMetadataAddS64(addwarpedArgs, PS_LIST_TAIL, "-warp_id", 0, "define warptool ID (required)", 0); + psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-skycell_id", 0, "define skycell ID (required)", NULL); + psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-tess_id", 0, "define tessellation ID (required)", NULL); + psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-uri", 0, "define URI of file", 0); + psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", 0); + psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); + psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background stdev", NAN); + psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-dtime_warp", 0, "define elapsed processing time", NAN); + psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-xmin", 0, "define minimum x value", INT_MAX); + psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-xmax", 0, "define maximum x value", -INT_MAX); + psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-ymin", 0, "define minimum y value", INT_MAX); + psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-ymax", 0, "define maximum y value", -INT_MAX); + psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-hostname", 0, "define hostname", 0); + psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-good_frac", 0, "define %% of good pixels", NAN); + psMetadataAddBool(addwarpedArgs, PS_LIST_TAIL, "-ignore", 0, "define if this skycell should be ignored", false); + psMetadataAddS16(addwarpedArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); // -warped psMetadata *warpedArgs = psMetadataAlloc(); - psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID", 0); - psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-skycell_id", 0, - "define skycell ID", NULL); - psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-tess_id", 0, - "define tessellation ID", NULL); - psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-exp_id", 0, - "define exposure tag", 0); - psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-fake_id", 0, - "define phase 3 version of exposure tag", 0); - psMetadataAddU64(warpedArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); + psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-skycell_id", 0, "define skycell ID", NULL); + psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-tess_id", 0, "define tessellation ID", NULL); + psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-exp_id", 0, "define exposure tag", 0); + psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-fake_id", 0, "define phase 3 version of exposure tag", 0); + psMetadataAddU64(warpedArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -revertwarped + // XXX need to allow multiple fake_ids + // XXX need to allow multiple fake_ids + // XXX need to allow multiple chip_ids + // XXX need to allow multiple exp_ids psMetadata *revertwarpedArgs = psMetadataAlloc(); - // XXX need to allow multiple fake_ids - psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID", 0); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-skycell_id", 0, - "search by skycell ID", NULL); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-tess_id", 0, - "searcy by tessellation ID", NULL); - // XXX need to allow multiple fake_ids - psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-fake_id", 0, - "search by fake_id", 0); - // XXX need to allow multiple chip_ids - psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-chip_id", 0, - "search by chip_id", 0); - // XXX need to allow multiple exp_ids - psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exp_id", 0); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_name", 0, - "search by exp_name", NULL); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-inst", 0, - "search for camera", NULL); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-telescope", 0, - "search for telescope", NULL); - psMetadataAddTime(revertwarpedArgs, PS_LIST_TAIL, "-dateobs_begin", 0, - "search for exposures by time (>=)", NULL); - psMetadataAddTime(revertwarpedArgs, PS_LIST_TAIL, "-dateobs_end", 0, - "search for exposures by time (<)", NULL); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_tag", 0, - "search by exp_tag", NULL); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_type", 0, - "search by exp_type", NULL); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-filelevel", 0, - "search by filelevel", NULL); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-reduction", 0, - "search by reduction class", NULL); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-filter", 0, - "search for filter", NULL); - psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-airmass_min", 0, - "define min airmass", NAN); - psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-airmass_max", 0, - "define max airmass", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ra_min", 0, - "define min", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ra_max", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-decl_min", 0, - "define min", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-decl_max", 0, - "define max", NAN); - psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-exp_time_min", 0, - "define min", NAN); - psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-exp_time_max", 0, - "define max", NAN); - psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, - "define max fraction of saturated pixels", NAN); - psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, - "define min fraction of saturated pixels", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_min", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_max", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-alt_min", 0, - "define min", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-alt_max", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-az_min", 0, - "define min", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-az_max", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, - "define min ccd tempature", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, - "define max ccd tempature", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-posang_min", 0, - "define min rotator position angle", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-posang_max", 0, - "define max rotator position angle", NAN); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-object", 0, - "search by exposure object", NULL); - psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-solang_min", 0, - "define min solar angle", NAN); - psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-solang_max", 0, - "define max solar angle", NAN); - - psMetadataAddS16(revertwarpedArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); - psMetadataAddBool(revertwarpedArgs, PS_LIST_TAIL, "-all", 0, - "allow everything to be queued without search terms", false); + psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", NULL); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-tess_id", 0, "searcy by tessellation ID", NULL); + psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-fake_id", 0, "search by fake_id", 0); + psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip_id", 0); + psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); + psMetadataAddTime(revertwarpedArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(revertwarpedArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", NULL); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); + psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); + psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ra_min", 0, "define min", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ra_max", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-decl_min", 0, "define min", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-decl_max", 0, "define max", NAN); + psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min", NAN); + psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max", NAN); + psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "define max fraction of saturated pixels", NAN); + psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "define min fraction of saturated pixels", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_min", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_max", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-alt_min", 0, "define min", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-alt_max", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-az_min", 0, "define min", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-az_max", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); + psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); + psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + + psMetadataAddS16(revertwarpedArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); + psMetadataAddBool(revertwarpedArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); // -block psMetadata *blockArgs = psMetadataAlloc(); - psMetadataAddStr(blockArgs, PS_LIST_TAIL, "-label", 0, - "name of a label to mask out (required)", NULL); + psMetadataAddStr(blockArgs, PS_LIST_TAIL, "-label", 0, "name of a label to mask out (required)", NULL); // -masked psMetadata *maskedArgs = psMetadataAlloc(); - psMetadataAddBool(maskedArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddBool(maskedArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -unblock psMetadata *unblockArgs = psMetadataAlloc(); - psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label", 0, - "name of a label to unmask (required)", NULL); + psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label", 0, "name of a label to unmask (required)", NULL); psFree(now); @@ -429,68 +281,4 @@ psFree(modes); - // setup search criterion -#define addWhereStr(name) \ -{ \ - psString str = NULL; \ - bool status = false; \ - if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \ - if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - -#define addWhereS32(name) \ -{ \ - psS32 s32 = 0; \ - bool status = false; \ - if ((s32= psMetadataLookupS32(&status, config->args, "-" #name))) { \ - if (!psMetadataAddS32(config->where, PS_LIST_TAIL, #name, 0, "==", s32)) { \ - psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \ - psFree(config); \ - return NULL; \ - } \ - } \ -} - - - // generate SQL where clause - config->where = psMetadataAlloc(); - -{ - psS64 warp_id = -1; - bool status = false; - if ((warp_id = psMetadataLookupS64(&status, config->args, "-warp_id"))) { - if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "warp_id", 0, "==", warp_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id"); - psFree(config); - return NULL; - } - } -} - addWhereStr(skycell_id); - addWhereStr(tess_id); - addWhereStr(exp_id); - - // convert '-code' to 'fault' - { - psS16 fault = 0; - bool status = false; - if ((fault = psMetadataLookupS16(&status, config->args, "-code"))) { - if (!psMetadataAddS16(config->where, PS_LIST_TAIL, "fault", 0, "==", fault)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); - psFree(config); - return NULL; - } - } - } - - if (config->where->list->n < 1) { - psFree(config->where); - config->where = NULL; - } - // define Database handle, if used // do this last so we don't setup a connection before CLI options are