Index: trunk/ippTools/src/difftoolConfig.c =================================================================== --- trunk/ippTools/src/difftoolConfig.c (revision 11784) +++ trunk/ippTools/src/difftoolConfig.c (revision 11787) @@ -48,6 +48,4 @@ // -definerun psMetadata *definerunArgs = psMetadataAlloc(); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-mode", 0, - "define mode (required)", NULL); psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); @@ -59,6 +57,6 @@ // -updaterun psMetadata *updaterunArgs = psMetadataAlloc(); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-p4_id", 0, - "define p4 ID (required)", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-p5_id", 0, + "define p5 ID (required)", NULL); psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "set state (required)", NULL); @@ -70,176 +68,86 @@ #endif - // -addinputexp - psMetadata *addinputexpArgs = psMetadataAlloc(); - psMetadataAddStr(addinputexpArgs, PS_LIST_TAIL, "-p4_id", 0, + // -addinputscfile + psMetadata *addinputscfileArgs = psMetadataAlloc(); + psMetadataAddStr(addinputscfileArgs, PS_LIST_TAIL, "-p5_id", 0, + "define p5 ID (required)", NULL); + psMetadataAddStr(addinputscfileArgs, PS_LIST_TAIL, "-skycell_id", 0, + "define by skycell ID", NULL); + psMetadataAddStr(addinputscfileArgs, PS_LIST_TAIL, "-tess_id", 0, + "dfine tess ID", NULL); + psMetadataAddStr(addinputscfileArgs, PS_LIST_TAIL, "-exp_tag", 0, + "define exposure tag (required)", NULL); + psMetadataAddS32(addinputscfileArgs, PS_LIST_TAIL, "-p3_version", 0, + "define phase 3 version of exposure tag (required)", 0); + psMetadataAddStr(addinputscfileArgs, PS_LIST_TAIL, "-kind", 0, + "define kind", NULL); + psMetadataAddBool(addinputscfileArgs, PS_LIST_TAIL, "-template", 0, + "this sky cell file is the subtrahend", false); + + // -inputscfile + psMetadata *inputscfileArgs = psMetadataAlloc(); + psMetadataAddStr(inputscfileArgs, PS_LIST_TAIL, "-p5_id", 0, + "search by p5 ID (required)", NULL); + psMetadataAddStr(inputscfileArgs, PS_LIST_TAIL, "-skycell_id", 0, + "search by skycell ID", NULL); + psMetadataAddStr(inputscfileArgs, PS_LIST_TAIL, "-tess_id", 0, + "search by tess ID", NULL); + psMetadataAddStr(inputscfileArgs, PS_LIST_TAIL, "-exp_tag", 0, + "search by exposure tag (required)", NULL); + psMetadataAddS32(inputscfileArgs, PS_LIST_TAIL, "-p3_version", 0, + "search by phase 3 version of exposure tag (required)", 0); + psMetadataAddStr(inputscfileArgs, PS_LIST_TAIL, "-kind", 0, + "search by kind", NULL); + psMetadataAddBool(inputscfileArgs, PS_LIST_TAIL, "-template", 0, + "search by subtrahend", false); + psMetadataAddU64(inputscfileArgs, PS_LIST_TAIL, "-limit", 0, + "limit result set to N items", 0); + psMetadataAddBool(inputscfileArgs, PS_LIST_TAIL, "-simple", 0, + "use the simple output format", false); + + // -todiffscfile + psMetadata *todiffscfileArgs = psMetadataAlloc(); + psMetadataAddStr(todiffscfileArgs, PS_LIST_TAIL, "-p5_id", 0, + "search by p5 ID", NULL); + psMetadataAddU64(todiffscfileArgs, PS_LIST_TAIL, "-limit", 0, + "limit result set to N items", 0); + psMetadataAddBool(todiffscfileArgs, PS_LIST_TAIL, "-simple", 0, + "use the simple output format", false); + + // -adddiffscfile + psMetadata *adddiffscfileArgs = psMetadataAlloc(); + psMetadataAddStr(adddiffscfileArgs, PS_LIST_TAIL, "-p5_id", 0, "define p4 ID (required)", NULL); - psMetadataAddStr(addinputexpArgs, PS_LIST_TAIL, "-exp_tag", 0, + psMetadataAddStr(adddiffscfileArgs, PS_LIST_TAIL, "-skycell_id", 0, + "define skycell ID (required)", NULL); + psMetadataAddStr(adddiffscfileArgs, PS_LIST_TAIL, "-tess_id", 0, + "define tessellation ID (required)", NULL); + psMetadataAddStr(adddiffscfileArgs, PS_LIST_TAIL, "-exp_tag", 0, "define exposure tag (required)", NULL); - psMetadataAddS32(addinputexpArgs, PS_LIST_TAIL, "-p3_version", 0, + psMetadataAddS32(adddiffscfileArgs, PS_LIST_TAIL, "-p3_version", 0, "define phase 3 version of exposure tag (required)", 0); - psMetadataAddBool(addinputexpArgs, PS_LIST_TAIL, "-magiced", 0, - "has this exposure been magiced", false); - - // -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, "-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(addwarpedArgs, PS_LIST_TAIL, "-tess_id", 0, - "define tessellation ID (required)", NULL); - 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, + psMetadataAddStr(adddiffscfileArgs, PS_LIST_TAIL, "-uri", 0, "define URI of file (required)", 0); - psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg", 0, + psMetadataAddF64(adddiffscfileArgs, PS_LIST_TAIL, "-bg", 0, "define exposue background", NAN); - psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, + psMetadataAddF64(adddiffscfileArgs, 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, + // -diffscfile + psMetadata *diffscfileArgs = psMetadataAlloc(); + psMetadataAddStr(diffscfileArgs, PS_LIST_TAIL, "-p5_id", 0, "search by p4 ID", NULL); - psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-skycell_id", 0, + psMetadataAddStr(diffscfileArgs , PS_LIST_TAIL, "-skycell_id", 0, "define skycell ID (required)", NULL); - psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-tess_id", 0, + psMetadataAddStr(diffscfileArgs, PS_LIST_TAIL, "-tess_id", 0, "define tessellation ID (required)", NULL); - psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-exp_tag", 0, + psMetadataAddStr(diffscfileArgs, PS_LIST_TAIL, "-exp_tag", 0, "define exposure tag (required)", NULL); - psMetadataAddS32(warpedArgs, PS_LIST_TAIL, "-p3_version", 0, + psMetadataAddS32(diffscfileArgs, PS_LIST_TAIL, "-p3_version", 0, "define phase 3 version of exposure tag (required)", 0); - psMetadataAddU64(warpedArgs, PS_LIST_TAIL, "-limit", 0, + psMetadataAddU64(diffscfileArgs, 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(); - psMetadataAddStr(tostackedimfileArgs, PS_LIST_TAIL, "-p4_id", 0, - "search by p4 ID", NULL); - psMetadataAddBool(tostackedimfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - - // -addstackedimfile - psMetadata *addstackedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(addstackedimfileArgs, PS_LIST_TAIL, "-p4_id", 0, - "define p4 ID (required)", NULL); - psMetadataAddStr(addstackedimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, - "define exposure tag (required)", NULL); - psMetadataAddS32(addstackedimfileArgs, PS_LIST_TAIL, "-p3_version", 0, - "define phase 3 version of exposure tag (required)", 0); - psMetadataAddStr(addstackedimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "define class ID (required)", 0); - psMetadataAddStr(addstackedimfileArgs, PS_LIST_TAIL, "-uri", 0, - "define URI of file (required)", 0); - psMetadataAddStr(addstackedimfileArgs, PS_LIST_TAIL, "-b1_uri", 0, - "define banana 1", NULL); - psMetadataAddStr(addstackedimfileArgs, PS_LIST_TAIL, "-b2_uri", 0, - "define banana 2", NULL); - - // -stackedimfile - psMetadata *stackedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(stackedimfileArgs, PS_LIST_TAIL, "-p4_id", 0, - "search by p4 ID", NULL); - psMetadataAddBool(stackedimfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - - // -todiffimfile - psMetadata *todiffimfileArgs = psMetadataAlloc(); - psMetadataAddStr(todiffimfileArgs, PS_LIST_TAIL, "-p4_id", 0, - "search by p4 ID", NULL); - psMetadataAddBool(todiffimfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - - // -adddiffimfile - psMetadata *adddiffimfileArgs = psMetadataAlloc(); - psMetadataAddStr(adddiffimfileArgs, PS_LIST_TAIL, "-p4_id", 0, - "define p4 ID (required)", NULL); - psMetadataAddStr(adddiffimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, - "define exposure tag (required)", NULL); - psMetadataAddS32(adddiffimfileArgs, PS_LIST_TAIL, "-p3_version", 0, - "define phase 3 version of exposure tag (required)", 0); - psMetadataAddStr(adddiffimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "define class ID (required)", 0); - psMetadataAddStr(adddiffimfileArgs, PS_LIST_TAIL, "-uri", 0, - "define URI of file (required)", 0); - psMetadataAddStr(adddiffimfileArgs, PS_LIST_TAIL, "-b1_uri", 0, - "define banana 1", NULL); - psMetadataAddStr(adddiffimfileArgs, PS_LIST_TAIL, "-b2_uri", 0, - "define banana 2", NULL); - - // -diffimfile - psMetadata *diffimfileArgs = psMetadataAlloc(); - psMetadataAddStr(diffimfileArgs, PS_LIST_TAIL, "-p4_id", 0, - "search by p4 ID", NULL); - psMetadataAddBool(diffimfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); -#endif + psMetadataAddBool(diffscfileArgs, PS_LIST_TAIL, "-simple", 0, + "use the simple output format", false); psFree(now); @@ -265,26 +173,14 @@ psMetadata *argSets = psMetadataAlloc(); // find which mode we're running under - PXTOOL_MODE("-definerun", P4TOOL_MODE_DEFINERUN, definerunArgs); - PXTOOL_MODE("-updaterun", P4TOOL_MODE_UPDATERUN, updaterunArgs); - PXTOOL_MODE("-addinputexp", P4TOOL_MODE_ADDINPUTEXP, addinputexpArgs); - 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); - PXTOOL_MODE("-stackedimfile", P4TOOL_MODE_STACKEDIMFILE, stackedimfileArgs); - PXTOOL_MODE("-todiffimfile", P4TOOL_MODE_TODIFFIMFILE, todiffimfileArgs); - PXTOOL_MODE("-adddiffimfile", P4TOOL_MODE_ADDDIFFIMFILE, adddiffimfileArgs); - PXTOOL_MODE("-diffimfile", P4TOOL_MODE_DIFFIMFILE, diffimfileArgs); -#endif + PXTOOL_MODE("-definerun", P5TOOL_MODE_DEFINERUN, definerunArgs); + PXTOOL_MODE("-updaterun", P5TOOL_MODE_UPDATERUN, updaterunArgs); + PXTOOL_MODE("-addinputscfile", P5TOOL_MODE_ADDINPUTSCFILE, addinputscfileArgs); + PXTOOL_MODE("-inputscfile", P5TOOL_MODE_INPUTSCFILE, inputscfileArgs); + PXTOOL_MODE("-todiffscfile", P5TOOL_MODE_TODIFFSCFILE, todiffscfileArgs); + PXTOOL_MODE("-adddiffscfile", P5TOOL_MODE_ADDDIFFSCFILE, adddiffscfileArgs); + PXTOOL_MODE("-diffscfile", P5TOOL_MODE_DIFFSCFILE, diffscfileArgs); bool argErr = false; - if (config->mode == P4TOOL_MODE_NONE) { + if (config->mode == P5TOOL_MODE_NONE) { argErr = true; fprintf (stderr, "mode argument is required\n");