Index: trunk/ippTools/src/magictoolConfig.c =================================================================== --- trunk/ippTools/src/magictoolConfig.c (revision 14481) +++ trunk/ippTools/src/magictoolConfig.c (revision 14537) @@ -1,6 +1,6 @@ /* - * warptoolConfig.c - * - * Copyright (C) 2006 Joshua Hoblitt + * magictoolConfig.c + * + * Copyright (C) 2007 Joshua Hoblitt * * This program is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ #include "pxtools.h" -#include "warptool.h" - -pxConfig *warptoolConfig(pxConfig *config, int argc, char **argv) +#include "magictool.h" + +pxConfig *magictoolConfig(pxConfig *config, int argc, char **argv) { if (!config) { @@ -51,8 +51,10 @@ // -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); + 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, "-registered", 0, "time detrend run was registered", now); @@ -60,22 +62,7 @@ "use the simple output format", false); - // -runone - psMetadata *runoneArgs = psMetadataAlloc(); - psMetadataAddStr(runoneArgs, PS_LIST_TAIL, "-mode", 0, - "define mode (required)", NULL); - psMetadataAddStr(runoneArgs, PS_LIST_TAIL, "-workdir", 0, - "define workdir (required)", NULL); - psMetadataAddStr(runoneArgs, PS_LIST_TAIL, "-registered", 0, - "time detrend run was registered", now); - psMetadataAddStr(runoneArgs, PS_LIST_TAIL, "-cam_id", 0, - "define camtool ID (required)", NULL); - psMetadataAddBool(runoneArgs, PS_LIST_TAIL, "-magiced", 0, - "has this exposure been magiced", false); - psMetadataAddBool(runoneArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - // -updaterun psMetadata *updaterunArgs = psMetadataAlloc(); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-warp_id", 0, + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-magic_id", 0, "define warptool ID (required)", NULL); psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, @@ -88,121 +75,71 @@ #endif - // -addinputexp - psMetadata *addinputexpArgs = psMetadataAlloc(); - psMetadataAddStr(addinputexpArgs, PS_LIST_TAIL, "-warp_id", 0, - "define warptool ID (required)", NULL); - psMetadataAddStr(addinputexpArgs, PS_LIST_TAIL, "-cam_id", 0, - "define camtool ID (required)", NULL); - psMetadataAddBool(addinputexpArgs, PS_LIST_TAIL, "-magiced", 0, - "has this exposure been magiced", false); - - // -exp - psMetadata *expArgs = psMetadataAlloc(); - psMetadataAddStr(expArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID", NULL); - psMetadataAddStr(expArgs, PS_LIST_TAIL, "-cam_id", 0, - "search by camtool ID", NULL); - psMetadataAddU64(expArgs, PS_LIST_TAIL, "-limit", 0, + // -addinputskyfile + psMetadata *addinputskyfileArgs = psMetadataAlloc(); + psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-magic_id", 0, + "define magictool ID (required)", NULL); + psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-diff_id", 0, + "define difftool ID (required)", NULL); + psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-node", 0, + "define symbolic node name (required)", NULL); + + // -inputtree + psMetadata *inputtreeArgs = psMetadataAlloc(); + psMetadataAddStr(inputtreeArgs, PS_LIST_TAIL, "-magic_id", 0, + "define magictool ID (required)", NULL); + psMetadataAddStr(inputtreeArgs, PS_LIST_TAIL, "-dep_file", 0, + "order of operations dep. file (required)", NULL); + + // -tooprocess + psMetadata *toprocessArgs = psMetadataAlloc(); + psMetadataAddStr(toprocessArgs, PS_LIST_TAIL, "-magic_id", 0, + "search by magic ID", NULL); + psMetadataAddU64(toprocessArgs, 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, "-warp_id", 0, - "search by warptool ID", NULL); - psMetadataAddStr(imfileArgs, PS_LIST_TAIL, "-cam_id", 0, - "search by camtool ID", NULL); - psMetadataAddU64(imfileArgs, PS_LIST_TAIL, "-limit", 0, + psMetadataAddBool(toprocessArgs, PS_LIST_TAIL, "-simple", 0, + "use the simple output format", false); + + // -addresult + psMetadata *addresultArgs = psMetadataAlloc(); + psMetadataAddStr(addresultArgs, PS_LIST_TAIL, "-magic_id", 0, + "define magictool ID (required)", NULL); + psMetadataAddStr(addresultArgs, PS_LIST_TAIL, "-node", 0, + "define symbolic node name (required)", NULL); + psMetadataAddStr(addresultArgs, PS_LIST_TAIL, "-uri", 0, + "define URI (required)", NULL); + + // -tomask + psMetadata *tomaskArgs = psMetadataAlloc(); + psMetadataAddStr(tomaskArgs, PS_LIST_TAIL, "-magic_id", 0, + "search by magic ID", NULL); + psMetadataAddU64(tomaskArgs, 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, "-warp_id", 0, - "search by warp ID", NULL); - psMetadataAddU64(tooverlapArgs, PS_LIST_TAIL, "-limit", 0, + psMetadataAddBool(tomaskArgs, PS_LIST_TAIL, "-simple", 0, + "use the simple output format", false); + + // -addmask + psMetadata *addmaskArgs = psMetadataAlloc(); + psMetadataAddStr(addmaskArgs, PS_LIST_TAIL, "-magic_id", 0, + "define magictool ID (required)", NULL); + psMetadataAddStr(addmaskArgs, PS_LIST_TAIL, "-uri", 0, + "define URI (required)", NULL); + + // -toskyfilemask + psMetadata *toskyfilemaskArgs = psMetadataAlloc(); + psMetadataAddStr(toskyfilemaskArgs, PS_LIST_TAIL, "-magic_id", 0, + "search by magic ID", NULL); + psMetadataAddU64(toskyfilemaskArgs, 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); - - // -scmap - psMetadata *scmapArgs = psMetadataAlloc(); - psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool 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, "-warp_id", 0, - "search by warptool 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, "-warp_id", 0, - "define warptool 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, "-uri", 0, - "define URI of file (required)", 0); - psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-path_base", 0, - "define base output location (required)", 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); - psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-pixel_fill", 0, - "define %% of live pixels", NAN); - psMetadataAddS16(addwarpedArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); - - - // -warped - psMetadata *warpedArgs = psMetadataAlloc(); - psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID", NULL); - psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-skycell_id", 0, - "define skycell ID", NULL); - psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-tess_id", 0, - "define tessellation ID", NULL); - psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-exp_id", 0, - "define exposure tag", NULL); - psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-cam_id", 0, - "define phase 3 version of exposure tag", NULL); - 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 - psMetadata *revertwarpedArgs = psMetadataAlloc(); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID (required)", NULL); - 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); - psMetadataAddS16(revertwarpedArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); - + psMetadataAddBool(toskyfilemaskArgs, PS_LIST_TAIL, "-simple", 0, + "use the simple output format", false); + + // -addskyfilemask + psMetadata *addskyfilemaskArgs = psMetadataAlloc(); + psMetadataAddStr(addskyfilemaskArgs, PS_LIST_TAIL, "-magic_id", 0, + "define magictool ID (required)", NULL); + psMetadataAddStr(addskyfilemaskArgs, PS_LIST_TAIL, "-diff_id", 0, + "define difftool ID (required)", NULL); + psMetadataAddStr(addskyfilemaskArgs, PS_LIST_TAIL, "-uri", 0, + "define URI (required)", NULL); psFree(now); @@ -211,17 +148,14 @@ psMetadata *modes = psMetadataAlloc(); - PXTOOL_ADD_MODE("-definerun", "", WARPTOOL_MODE_DEFINERUN, definerunArgs); - PXTOOL_ADD_MODE("-runone", "", WARPTOOL_MODE_RUNONE, runoneArgs); - PXTOOL_ADD_MODE("-updaterun", "", WARPTOOL_MODE_UPDATERUN, updaterunArgs); - PXTOOL_ADD_MODE("-addinputexp", "", WARPTOOL_MODE_ADDINPUTEXP, addinputexpArgs); - PXTOOL_ADD_MODE("-exp", "", WARPTOOL_MODE_EXP, expArgs); - PXTOOL_ADD_MODE("-imfile", "", WARPTOOL_MODE_IMFILE, imfileArgs); - PXTOOL_ADD_MODE("-tooverlap", "", WARPTOOL_MODE_TOOVERLAP, tooverlapArgs); - PXTOOL_ADD_MODE("-addoverlap", "", WARPTOOL_MODE_ADDOVERLAP, addoverlapArgs); - PXTOOL_ADD_MODE("-scmap", "", WARPTOOL_MODE_SCMAP, scmapArgs); - PXTOOL_ADD_MODE("-towarped", "", WARPTOOL_MODE_TOWARPED, towarpedArgs); - PXTOOL_ADD_MODE("-addwarped", "", WARPTOOL_MODE_ADDWARPED, addwarpedArgs); - PXTOOL_ADD_MODE("-warped", "", WARPTOOL_MODE_WARPED, warpedArgs); - PXTOOL_ADD_MODE("-revertwarped", "", WARPTOOL_MODE_REVERTWARPED, revertwarpedArgs); + PXTOOL_ADD_MODE("-definerun", "", MAGICTOOL_MODE_DEFINERUN, definerunArgs); + PXTOOL_ADD_MODE("-updaterun", "", MAGICTOOL_MODE_UPDATERUN, updaterunArgs); + PXTOOL_ADD_MODE("-addinputskyfile", "", MAGICTOOL_MODE_ADDINPUTSKYFILE, addinputskyfileArgs); + PXTOOL_ADD_MODE("-inputtree", "", MAGICTOOL_MODE_INPUTTREE, inputtreeArgs); + PXTOOL_ADD_MODE("-toprocess", "", MAGICTOOL_MODE_TOPROCESS, toprocessArgs); + PXTOOL_ADD_MODE("-addresult", "", MAGICTOOL_MODE_ADDRESULT, addresultArgs); + PXTOOL_ADD_MODE("-tomask", "", MAGICTOOL_MODE_TOMASK, tomaskArgs); + PXTOOL_ADD_MODE("-addmask", "", MAGICTOOL_MODE_ADDMASK, addmaskArgs); + PXTOOL_ADD_MODE("-toskyfilemask", "", MAGICTOOL_MODE_TOSKYFILEMASK, toskyfilemaskArgs); + PXTOOL_ADD_MODE("-addskyfilemask", "", MAGICTOOL_MODE_ADDSKYFILEMASK, addskyfilemaskArgs); if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {