Index: trunk/ippTools/src/warptoolConfig.c =================================================================== --- trunk/ippTools/src/warptoolConfig.c (revision 11731) +++ trunk/ippTools/src/warptoolConfig.c (revision 11763) @@ -80,46 +80,106 @@ psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-magiced", 0, "has this exposure been magiced", false); - - // -toscfile - psMetadata *toscfileArgs = psMetadataAlloc(); - psMetadataAddStr(toscfileArgs, PS_LIST_TAIL, "-p4_id", 0, - "search by p4 ID", NULL); - psMetadataAddBool(toscfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - - // -addscfile - psMetadata *addscfileArgs = psMetadataAlloc(); - psMetadataAddStr(addscfileArgs, PS_LIST_TAIL, "-p4_id", 0, - "define p4 ID (required)", NULL); - psMetadataAddStr(addscfileArgs, PS_LIST_TAIL, "-skycell_id", 0, + + // -exp + psMetadata *expArgs = psMetadataAlloc(); + psMetadataAddStr(expArgs, PS_LIST_TAIL, "-p4_id", 0, + "define p4 ID (required)", NULL); + psMetadataAddStr(expArgs, PS_LIST_TAIL, "-exp_tag", 0, + "define exposure tag (required)", NULL); + psMetadataAddS32(expArgs, PS_LIST_TAIL, "-p3_version", 0, + "define phase 3 version of exposure tag (required)", 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(); + psMetadataAddStr(imfileArgs, PS_LIST_TAIL, "-p4_id", 0, + "define p4 ID (required)", NULL); + psMetadataAddStr(imfileArgs, PS_LIST_TAIL, "-exp_tag", 0, + "define exposure tag (required)", NULL); + psMetadataAddS32(imfileArgs, PS_LIST_TAIL, "-p3_version", 0, + "define phase 3 version of exposure tag (required)", 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(); + psMetadataAddStr(tooverlapArgs, PS_LIST_TAIL, "-p4_id", 0, + "search by p4 ID", NULL); + 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, "-p4_id", 0, + "search by p4 ID", NULL); + psMetadataAddStr(addoverlapArgs, PS_LIST_TAIL, "-mapfile", 0, + "skycell <-> imfile mapping description", NULL); + + // -scmap + psMetadata *scmapArgs = psMetadataAlloc(); + psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-p4_id", 0, + "search by p4 ID", NULL); + psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-skycell_id", 0, + "searcy by skycell ID", NULL); + psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-tess_id", 0, + "searcy 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(); + psMetadataAddStr(towarpedArgs, PS_LIST_TAIL, "-p4_id", 0, + "search by p4 ID", NULL); + 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(); + psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-p4_id", 0, + "define p4 ID (required)", NULL); + psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-skycell_id", 0, "define skycell ID (required)", NULL); - psMetadataAddStr(addscfileArgs, PS_LIST_TAIL, "-tess_id", 0, + psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-tess_id", 0, "define tessellation ID (required)", NULL); - psMetadataAddStr(addscfileArgs, PS_LIST_TAIL, "-exp_tag", 0, - "define exposure tag (required)", NULL); - psMetadataAddS32(addscfileArgs, PS_LIST_TAIL, "-p3_version", 0, - "define phase 3 version of exposure tag (required)", 0); - psMetadataAddStr(addscfileArgs, PS_LIST_TAIL, "-uri", 0, + psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-exp_tag", 0, + "define exposure tag (required)", NULL); + psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-p3_version", 0, + "define phase 3 version of exposure tag (required)", 0); + psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-uri", 0, "define URI of file (required)", 0); - psMetadataAddF64(addscfileArgs, PS_LIST_TAIL, "-bg", 0, + psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg", 0, "define exposue background", NAN); - psMetadataAddF64(addscfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); - - - // -scfile - psMetadata *scfileArgs = psMetadataAlloc(); - psMetadataAddStr(scfileArgs, PS_LIST_TAIL, "-p4_id", 0, - "search by p4 ID", NULL); - psMetadataAddStr(scfileArgs, PS_LIST_TAIL, "-skycell_id", 0, + psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, + "define exposue background mean stdev", NAN); + + // -warped + psMetadata *warpedArgs = psMetadataAlloc(); + psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-p4_id", 0, + "search by p4 ID", NULL); + psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-skycell_id", 0, "define skycell ID (required)", NULL); - psMetadataAddStr(scfileArgs, PS_LIST_TAIL, "-tess_id", 0, + psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-tess_id", 0, "define tessellation ID (required)", NULL); - psMetadataAddStr(scfileArgs, PS_LIST_TAIL, "-exp_tag", 0, - "define exposure tag (required)", NULL); - psMetadataAddS32(scfileArgs, PS_LIST_TAIL, "-p3_version", 0, - "define phase 3 version of exposure tag (required)", 0); - psMetadataAddBool(scfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - + psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-exp_tag", 0, + "define exposure tag (required)", NULL); + psMetadataAddS32(warpedArgs, PS_LIST_TAIL, "-p3_version", 0, + "define phase 3 version of exposure tag (required)", 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); + +#if 0 // -tostackedimfile psMetadata *tostackedimfileArgs = psMetadataAlloc(); @@ -183,4 +243,5 @@ psMetadataAddBool(diffimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); +#endif psFree(now); @@ -209,7 +270,13 @@ PXTOOL_MODE("-updaterun", P4TOOL_MODE_UPDATERUN, updaterunArgs); PXTOOL_MODE("-addinputexp", P4TOOL_MODE_ADDINPUTEXP, addinputexpArgs); - PXTOOL_MODE("-toscfile", P4TOOL_MODE_TOSCFILE, toscfileArgs); - PXTOOL_MODE("-addscfile", P4TOOL_MODE_ADDSCFILE, addscfileArgs); - PXTOOL_MODE("-scfile", P4TOOL_MODE_SCFILE, scfileArgs); + PXTOOL_MODE("-exp", P4TOOL_MODE_EXP, expArgs); + PXTOOL_MODE("-imfile", P4TOOL_MODE_IMFILE, imfileArgs); + PXTOOL_MODE("-tooverlap", P4TOOL_MODE_TOOVERLAP, tooverlapArgs); + PXTOOL_MODE("-addoverlap", P4TOOL_MODE_ADDOVERLAP, addoverlapArgs); + PXTOOL_MODE("-scmap", P4TOOL_MODE_SCMAP, scmapArgs); + PXTOOL_MODE("-towarped", P4TOOL_MODE_TOWARPED, towarpedArgs); + PXTOOL_MODE("-addwarped", P4TOOL_MODE_ADDWARPED, addwarpedArgs); + PXTOOL_MODE("-warped", P4TOOL_MODE_WARPED, warpedArgs); +#if 0 PXTOOL_MODE("-tostackedimfile", P4TOOL_MODE_TOSTACKEDIMFILE, tostackedimfileArgs); PXTOOL_MODE("-addstackedimfile", P4TOOL_MODE_ADDSTACKEDIMFILE, addstackedimfileArgs); @@ -218,4 +285,5 @@ PXTOOL_MODE("-adddiffimfile", P4TOOL_MODE_ADDDIFFIMFILE, adddiffimfileArgs); PXTOOL_MODE("-diffimfile", P4TOOL_MODE_DIFFIMFILE, diffimfileArgs); +#endif bool argErr = false;