Index: /trunk/ippTools/src/Makefile.am =================================================================== --- /trunk/ippTools/src/Makefile.am (revision 11996) +++ /trunk/ippTools/src/Makefile.am (revision 11997) @@ -3,10 +3,10 @@ detselect \ dettool \ - p0tool \ - p2tool \ - p3tool \ - p4tool \ - p5tool \ - p6tool \ + regtool \ + chiptool \ + camtool \ + warptool \ + difftool \ + stacktool \ pxadmin \ pxinject \ @@ -57,43 +57,43 @@ pztoolConfig.c -p0tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) -p0tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la -p0tool_SOURCES = \ +regtool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) +regtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la +regtool_SOURCES = \ p0tool.c \ p0toolConfig.c -p1tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) -p1tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la -p1tool_SOURCES = \ +guidetool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) +guidetool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la +guidetool_SOURCES = \ p1tool.c \ p1toolConfig.c -p2tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) -p2tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la -p2tool_SOURCES = \ +chiptool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) +chiptool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la +chiptool_SOURCES = \ p2tool.c \ p2toolConfig.c -p3tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) -p3tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la -p3tool_SOURCES = \ +camtool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) +camtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la +camtool_SOURCES = \ p3tool.c \ p3toolConfig.c -p4tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) -p4tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la -p4tool_SOURCES = \ +warptool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) +warptool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la +warptool_SOURCES = \ p4tool.c \ p4toolConfig.c -p5tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) -p5tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la -p5tool_SOURCES = \ +difftool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) +difftool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la +difftool_SOURCES = \ p5tool.c \ p5toolConfig.c -p6tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) -p6tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la -p6tool_SOURCES = \ +stacktool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) +stacktool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la +stacktool_SOURCES = \ p6tool.c \ p6toolConfig.c Index: /trunk/ippTools/src/camtool.c =================================================================== --- /trunk/ippTools/src/camtool.c (revision 11996) +++ /trunk/ippTools/src/camtool.c (revision 11997) @@ -47,5 +47,5 @@ psLibInit(NULL); - pxConfig *config = p3toolConfig(NULL, argc, argv); + pxConfig *config = camtoolConfig(NULL, argc, argv); if (!config) { psError(PXTOOLS_ERR_CONFIG, false, "failed to configure"); @@ -54,12 +54,12 @@ switch (config->mode) { - MODECASE(P3TOOL_MODE_PENDINGEXP, pendingexpMode); - MODECASE(P3TOOL_MODE_PENDINGIMFILE, pendingimfileMode); - MODECASE(P3TOOL_MODE_ADDPROCESSEDEXP, addprocessedexpMode); - MODECASE(P3TOOL_MODE_PROCESSEDEXP, processedexpMode); - MODECASE(P3TOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpMode); - MODECASE(P3TOOL_MODE_BLOCK, blockMode); - MODECASE(P3TOOL_MODE_MASKED, maskedMode); - MODECASE(P3TOOL_MODE_UNBLOCK, unblockMode); + MODECASE(CAMTOOL_MODE_PENDINGEXP, pendingexpMode); + MODECASE(CAMTOOL_MODE_PENDINGIMFILE, pendingimfileMode); + MODECASE(CAMTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpMode); + MODECASE(CAMTOOL_MODE_PROCESSEDEXP, processedexpMode); + MODECASE(CAMTOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpMode); + MODECASE(CAMTOOL_MODE_BLOCK, blockMode); + MODECASE(CAMTOOL_MODE_MASKED, maskedMode); + MODECASE(CAMTOOL_MODE_UNBLOCK, unblockMode); default: psAbort("invalid option (this should not happen)"); Index: /trunk/ippTools/src/camtool.h =================================================================== --- /trunk/ippTools/src/camtool.h (revision 11996) +++ /trunk/ippTools/src/camtool.h (revision 11997) @@ -18,22 +18,22 @@ */ -#ifndef P3TOOL_H -#define P3TOOL_H 1 +#ifndef CAMTOOL_H +#define CAMTOOL_H 1 #include "pxtools.h" typedef enum { - P3TOOL_MODE_NONE = 0x0, - P3TOOL_MODE_PENDINGEXP, - P3TOOL_MODE_PENDINGIMFILE, - P3TOOL_MODE_ADDPROCESSEDEXP, - P3TOOL_MODE_PROCESSEDEXP, - P3TOOL_MODE_UPDATEPROCESSEDEXP, - P3TOOL_MODE_BLOCK, - P3TOOL_MODE_MASKED, - P3TOOL_MODE_UNBLOCK -} p3toolMode; + CAMTOOL_MODE_NONE = 0x0, + CAMTOOL_MODE_PENDINGEXP, + CAMTOOL_MODE_PENDINGIMFILE, + CAMTOOL_MODE_ADDPROCESSEDEXP, + CAMTOOL_MODE_PROCESSEDEXP, + CAMTOOL_MODE_UPDATEPROCESSEDEXP, + CAMTOOL_MODE_BLOCK, + CAMTOOL_MODE_MASKED, + CAMTOOL_MODE_UNBLOCK +} camtoolMode; -pxConfig *p3toolConfig(pxConfig *config, int argc, char **argv); +pxConfig *camtoolConfig(pxConfig *config, int argc, char **argv); -#endif // P3TOOL_H +#endif // CAMTOOL_H Index: /trunk/ippTools/src/camtoolConfig.c =================================================================== --- /trunk/ippTools/src/camtoolConfig.c (revision 11996) +++ /trunk/ippTools/src/camtoolConfig.c (revision 11997) @@ -28,5 +28,5 @@ #include "p3tool.h" -pxConfig *p3toolConfig(pxConfig *config, int argc, char **argv) +pxConfig *camtoolConfig(pxConfig *config, int argc, char **argv) { if (!config) { @@ -165,15 +165,15 @@ psMetadata *argSets = psMetadataAlloc(); // find which mode we're running under - PXTOOL_MODE("-pendingexp", P3TOOL_MODE_PENDINGEXP, pendingexpArgs); - PXTOOL_MODE("-pendingimfile",P3TOOL_MODE_PENDINGIMFILE, pendingimfileArgs); - PXTOOL_MODE("-addprocessedexp", P3TOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs); - PXTOOL_MODE("-processedexp", P3TOOL_MODE_PROCESSEDEXP, processedexpArgs); - PXTOOL_MODE("-updateprocessedexp", P3TOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpArgs); - PXTOOL_MODE("-block", P3TOOL_MODE_BLOCK, blockArgs); - PXTOOL_MODE("-masked", P3TOOL_MODE_MASKED, maskedArgs); - PXTOOL_MODE("-unblock", P3TOOL_MODE_UNBLOCK, unblockArgs); + PXTOOL_MODE("-pendingexp", CAMTOOL_MODE_PENDINGEXP, pendingexpArgs); + PXTOOL_MODE("-pendingimfile",CAMTOOL_MODE_PENDINGIMFILE, pendingimfileArgs); + PXTOOL_MODE("-addprocessedexp", CAMTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs); + PXTOOL_MODE("-processedexp", CAMTOOL_MODE_PROCESSEDEXP, processedexpArgs); + PXTOOL_MODE("-updateprocessedexp", CAMTOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpArgs); + PXTOOL_MODE("-block", CAMTOOL_MODE_BLOCK, blockArgs); + PXTOOL_MODE("-masked", CAMTOOL_MODE_MASKED, maskedArgs); + PXTOOL_MODE("-unblock", CAMTOOL_MODE_UNBLOCK, unblockArgs); bool argErr = false; - if (config->mode == P3TOOL_MODE_NONE) { + if (config->mode == CAMTOOL_MODE_NONE) { argErr = true; fprintf (stderr, "mode argument is required\n"); @@ -184,5 +184,5 @@ if (argErr) { - printf("\nPan-STARRS Phase 3 Tool\n"); + printf("\nPan-STARRS Camera Tool\n"); printf("Usage: %s []\n\n", argv[0]); printf(" :\n\n"); Index: /trunk/ippTools/src/chiptool.c =================================================================== --- /trunk/ippTools/src/chiptool.c (revision 11996) +++ /trunk/ippTools/src/chiptool.c (revision 11997) @@ -53,5 +53,5 @@ psLibInit(NULL); - pxConfig *config = p2toolConfig(NULL, argc, argv); + pxConfig *config = chiptoolConfig(NULL, argc, argv); if (!config) { psError(PXTOOLS_ERR_CONFIG, false, "failed to configure"); @@ -60,12 +60,12 @@ switch (config->mode) { - MODECASE(P2TOOL_MODE_QUEUERAWEXP, queuerawexpMode); - MODECASE(P2TOOL_MODE_PENDINGIMFILE, pendingimfileMode); - MODECASE(P2TOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileMode); - MODECASE(P2TOOL_MODE_PROCESSEDIMFILE, processedimfileMode); - MODECASE(P2TOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileMode); - MODECASE(P2TOOL_MODE_BLOCK, blockMode); - MODECASE(P2TOOL_MODE_MASKED, maskedMode); - MODECASE(P2TOOL_MODE_UNBLOCK, unblockMode); + MODECASE(CHIPTOOL_MODE_QUEUERAWEXP, queuerawexpMode); + MODECASE(CHIPTOOL_MODE_PENDINGIMFILE, pendingimfileMode); + MODECASE(CHIPTOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileMode); + MODECASE(CHIPTOOL_MODE_PROCESSEDIMFILE, processedimfileMode); + MODECASE(CHIPTOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileMode); + MODECASE(CHIPTOOL_MODE_BLOCK, blockMode); + MODECASE(CHIPTOOL_MODE_MASKED, maskedMode); + MODECASE(CHIPTOOL_MODE_UNBLOCK, unblockMode); default: psAbort("invalid option (this should not happen)"); Index: /trunk/ippTools/src/chiptool.h =================================================================== --- /trunk/ippTools/src/chiptool.h (revision 11996) +++ /trunk/ippTools/src/chiptool.h (revision 11997) @@ -18,22 +18,22 @@ */ -#ifndef P2TOOL_H -#define P2TOOL_H 1 +#ifndef CHIPTOOL_H +#define CHIPTOOL_H 1 #include "pxtools.h" typedef enum { - P2TOOL_MODE_NONE = 0x0, - P2TOOL_MODE_QUEUERAWEXP, - P2TOOL_MODE_PENDINGIMFILE, - P2TOOL_MODE_ADDPROCESSEDIMFILE, - P2TOOL_MODE_PROCESSEDIMFILE, - P2TOOL_MODE_UPDATEPROCESSEDIMFILE, - P2TOOL_MODE_BLOCK, - P2TOOL_MODE_MASKED, - P2TOOL_MODE_UNBLOCK -} p2toolMode; + CHIPTOOL_MODE_NONE = 0x0, + CHIPTOOL_MODE_QUEUERAWEXP, + CHIPTOOL_MODE_PENDINGIMFILE, + CHIPTOOL_MODE_ADDPROCESSEDIMFILE, + CHIPTOOL_MODE_PROCESSEDIMFILE, + CHIPTOOL_MODE_UPDATEPROCESSEDIMFILE, + CHIPTOOL_MODE_BLOCK, + CHIPTOOL_MODE_MASKED, + CHIPTOOL_MODE_UNBLOCK +} chiptoolMode; -pxConfig *p2toolConfig(pxConfig *config, int argc, char **argv); +pxConfig *chiptoolConfig(pxConfig *config, int argc, char **argv); -#endif // P2TOOL_H +#endif // CHIPTOOL_H Index: /trunk/ippTools/src/chiptoolConfig.c =================================================================== --- /trunk/ippTools/src/chiptoolConfig.c (revision 11996) +++ /trunk/ippTools/src/chiptoolConfig.c (revision 11997) @@ -27,5 +27,5 @@ #include "p2tool.h" -pxConfig *p2toolConfig(pxConfig *config, int argc, char **argv) { +pxConfig *chiptoolConfig(pxConfig *config, int argc, char **argv) { if (!config) { config = pxConfigAlloc(); @@ -199,15 +199,15 @@ psMetadata *argSets = psMetadataAlloc(); - PXTOOL_MODE("-queuerawexp", P2TOOL_MODE_QUEUERAWEXP, queuerawexpArgs); - PXTOOL_MODE("-pendingimfile", P2TOOL_MODE_PENDINGIMFILE, pendingimfileArgs); - PXTOOL_MODE("-addprocessedimfile",P2TOOL_MODE_ADDPROCESSEDIMFILE,addprocessedimfileArgs); - PXTOOL_MODE("-processedimfile",P2TOOL_MODE_PROCESSEDIMFILE, processedimfileArgs); - PXTOOL_MODE("-updateprocessedimfile",P2TOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileArgs); - PXTOOL_MODE("-block", P2TOOL_MODE_BLOCK, blockArgs); - PXTOOL_MODE("-masked", P2TOOL_MODE_MASKED, maskedArgs); - PXTOOL_MODE("-unblock", P2TOOL_MODE_UNBLOCK, unblockArgs); + PXTOOL_MODE("-queuerawexp", CHIPTOOL_MODE_QUEUERAWEXP, queuerawexpArgs); + PXTOOL_MODE("-pendingimfile", CHIPTOOL_MODE_PENDINGIMFILE, pendingimfileArgs); + PXTOOL_MODE("-addprocessedimfile",CHIPTOOL_MODE_ADDPROCESSEDIMFILE,addprocessedimfileArgs); + PXTOOL_MODE("-processedimfile",CHIPTOOL_MODE_PROCESSEDIMFILE, processedimfileArgs); + PXTOOL_MODE("-updateprocessedimfile",CHIPTOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileArgs); + PXTOOL_MODE("-block", CHIPTOOL_MODE_BLOCK, blockArgs); + PXTOOL_MODE("-masked", CHIPTOOL_MODE_MASKED, maskedArgs); + PXTOOL_MODE("-unblock", CHIPTOOL_MODE_UNBLOCK, unblockArgs); bool argErr = false; - if (config->mode == P2TOOL_MODE_NONE) { + if (config->mode == CHIPTOOL_MODE_NONE) { argErr = true; fprintf (stderr, "mode argument is required\n"); @@ -218,5 +218,5 @@ if (argErr) { - printf("\nPan-STARRS Phase 2 Search Tool\n\n"); + printf("\nPan-STARRS Chip Tool\n\n"); printf("Usage: %s []\n\n", argv[0]); printf(" :\n\n"); Index: /trunk/ippTools/src/difftool.c =================================================================== --- /trunk/ippTools/src/difftool.c (revision 11996) +++ /trunk/ippTools/src/difftool.c (revision 11997) @@ -52,5 +52,5 @@ psLibInit(NULL); - pxConfig *config = p5toolConfig(NULL, argc, argv); + pxConfig *config = difftoolConfig(NULL, argc, argv); if (!config) { psError(PXTOOLS_ERR_CONFIG, false, "failed to configure"); @@ -59,11 +59,11 @@ switch (config->mode) { - MODECASE(P5TOOL_MODE_DEFINERUN, definerunMode); - MODECASE(P5TOOL_MODE_UPDATERUN, updaterunMode); - MODECASE(P5TOOL_MODE_ADDINPUTSKYFILE, addinputskyfileMode); - MODECASE(P5TOOL_MODE_INPUTSKYFILE, inputskyfileMode); - MODECASE(P5TOOL_MODE_TODIFFSKYFILE, todiffskyfileMode); - MODECASE(P5TOOL_MODE_ADDDIFFSKYFILE, adddiffskyfileMode); - MODECASE(P5TOOL_MODE_DIFFSKYFILE, diffskyfileMode); + MODECASE(DIFFTOOL_MODE_DEFINERUN, definerunMode); + MODECASE(DIFFTOOL_MODE_UPDATERUN, updaterunMode); + MODECASE(DIFFTOOL_MODE_ADDINPUTSKYFILE, addinputskyfileMode); + MODECASE(DIFFTOOL_MODE_INPUTSKYFILE, inputskyfileMode); + MODECASE(DIFFTOOL_MODE_TODIFFSKYFILE, todiffskyfileMode); + MODECASE(DIFFTOOL_MODE_ADDDIFFSKYFILE, adddiffskyfileMode); + MODECASE(DIFFTOOL_MODE_DIFFSKYFILE, diffskyfileMode); default: psAbort("invalid option (this should not happen)"); Index: /trunk/ippTools/src/difftool.h =================================================================== --- /trunk/ippTools/src/difftool.h (revision 11996) +++ /trunk/ippTools/src/difftool.h (revision 11997) @@ -18,21 +18,21 @@ */ -#ifndef P5TOOL_H -#define P5TOOL_H 1 +#ifndef DIFFTOOL_H +#define DIFFTOOL_H 1 #include "pxtools.h" typedef enum { - P5TOOL_MODE_NONE = 0x0, - P5TOOL_MODE_DEFINERUN, - P5TOOL_MODE_UPDATERUN, - P5TOOL_MODE_ADDINPUTSKYFILE, - P5TOOL_MODE_INPUTSKYFILE, - P5TOOL_MODE_TODIFFSKYFILE, - P5TOOL_MODE_ADDDIFFSKYFILE, - P5TOOL_MODE_DIFFSKYFILE, -} p5toolMode; + DIFFTOOL_MODE_NONE = 0x0, + DIFFTOOL_MODE_DEFINERUN, + DIFFTOOL_MODE_UPDATERUN, + DIFFTOOL_MODE_ADDINPUTSKYFILE, + DIFFTOOL_MODE_INPUTSKYFILE, + DIFFTOOL_MODE_TODIFFSKYFILE, + DIFFTOOL_MODE_ADDDIFFSKYFILE, + DIFFTOOL_MODE_DIFFSKYFILE, +} difftoolMode; -pxConfig *p5toolConfig(pxConfig *config, int argc, char **argv); +pxConfig *difftoolConfig(pxConfig *config, int argc, char **argv); -#endif // P5TOOL_H +#endif // DIFFTOOL_H Index: /trunk/ippTools/src/difftoolConfig.c =================================================================== --- /trunk/ippTools/src/difftoolConfig.c (revision 11996) +++ /trunk/ippTools/src/difftoolConfig.c (revision 11997) @@ -27,5 +27,5 @@ #include "p5tool.h" -pxConfig *p5toolConfig(pxConfig *config, int argc, char **argv) +pxConfig *difftoolConfig(pxConfig *config, int argc, char **argv) { if (!config) { @@ -163,14 +163,14 @@ psMetadata *argSets = psMetadataAlloc(); // find which mode we're running under - PXTOOL_MODE("-definerun", P5TOOL_MODE_DEFINERUN, definerunArgs); - PXTOOL_MODE("-updaterun", P5TOOL_MODE_UPDATERUN, updaterunArgs); - PXTOOL_MODE("-addinputskyfile", P5TOOL_MODE_ADDINPUTSKYFILE, addinputskyfileArgs); - PXTOOL_MODE("-inputskyfile", P5TOOL_MODE_INPUTSKYFILE, inputskyfileArgs); - PXTOOL_MODE("-todiffskyfile", P5TOOL_MODE_TODIFFSKYFILE, todiffskyfileArgs); - PXTOOL_MODE("-adddiffskyfile", P5TOOL_MODE_ADDDIFFSKYFILE, adddiffskyfileArgs); - PXTOOL_MODE("-diffskyfile", P5TOOL_MODE_DIFFSKYFILE, diffskyfileArgs); + PXTOOL_MODE("-definerun", DIFFTOOL_MODE_DEFINERUN, definerunArgs); + PXTOOL_MODE("-updaterun", DIFFTOOL_MODE_UPDATERUN, updaterunArgs); + PXTOOL_MODE("-addinputskyfile", DIFFTOOL_MODE_ADDINPUTSKYFILE, addinputskyfileArgs); + PXTOOL_MODE("-inputskyfile", DIFFTOOL_MODE_INPUTSKYFILE, inputskyfileArgs); + PXTOOL_MODE("-todiffskyfile", DIFFTOOL_MODE_TODIFFSKYFILE, todiffskyfileArgs); + PXTOOL_MODE("-adddiffskyfile", DIFFTOOL_MODE_ADDDIFFSKYFILE, adddiffskyfileArgs); + PXTOOL_MODE("-diffskyfile", DIFFTOOL_MODE_DIFFSKYFILE, diffskyfileArgs); bool argErr = false; - if (config->mode == P5TOOL_MODE_NONE) { + if (config->mode == DIFFTOOL_MODE_NONE) { argErr = true; fprintf (stderr, "mode argument is required\n"); @@ -181,5 +181,5 @@ if (argErr) { - printf("\nPan-STARRS Phase 4 Tool\n"); + printf("\nPan-STARRS Difference Tool\n"); printf("Usage: %s []\n\n", argv[0]); printf(" :\n\n"); Index: /trunk/ippTools/src/guidetool.c =================================================================== --- /trunk/ippTools/src/guidetool.c (revision 11996) +++ /trunk/ippTools/src/guidetool.c (revision 11997) @@ -33,5 +33,5 @@ int main(int argc, char **argv) { - pxConfig *config = p1toolConfig(NULL, argc, argv); + pxConfig *config = guidetoolConfig(NULL, argc, argv); switch (config->mode) { Index: /trunk/ippTools/src/guidetool.h =================================================================== --- /trunk/ippTools/src/guidetool.h (revision 11996) +++ /trunk/ippTools/src/guidetool.h (revision 11997) @@ -18,10 +18,10 @@ */ -#ifndef P1TOOL_H -#define P1TOOL_H 1 +#ifndef GUIDETOOL_H +#define GUIDETOOL_H 1 #include "pxtools.h" -pxConfig *p1toolConfig(pxConfig *config, int argc, char **argv); +pxConfig *guidetoolConfig(pxConfig *config, int argc, char **argv); -#endif // P1TOOL_H +#endif // GUIDETOOL_H Index: /trunk/ippTools/src/guidetoolConfig.c =================================================================== --- /trunk/ippTools/src/guidetoolConfig.c (revision 11996) +++ /trunk/ippTools/src/guidetoolConfig.c (revision 11997) @@ -28,5 +28,5 @@ // this function can not fail -- exits on error -pxConfig *p1toolConfig(pxConfig *config, int argc, char **argv) { +pxConfig *guidetoolConfig(pxConfig *config, int argc, char **argv) { if (!config) { config = pxConfigAlloc(); @@ -129,5 +129,5 @@ if (argErr) { - printf("\nPan-STARRS Phase 1 Search Tool\n"); + printf("\nPan-STARRS Guide Star Tool\n"); printf("Usage: %s []\n\n", argv[0]); printf(" : -pending | -define\n\n"); Index: /trunk/ippTools/src/regtool.c =================================================================== --- /trunk/ippTools/src/regtool.c (revision 11996) +++ /trunk/ippTools/src/regtool.c (revision 11997) @@ -58,5 +58,5 @@ psLibInit(NULL); - pxConfig *config = p0toolConfig(NULL, argc, argv); + pxConfig *config = regtoolConfig(NULL, argc, argv); if (!config) { psError(PXTOOLS_ERR_CONFIG, false, "failed to configure"); @@ -65,12 +65,12 @@ switch (config->mode) { - MODECASE(P0TOOL_MODE_PENDINGIMFILE, pendingimfileMode); - MODECASE(P0TOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileMode); - MODECASE(P0TOOL_MODE_PROCESSEDIMFILE, processedimfileMode); - MODECASE(P0TOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileMode); - MODECASE(P0TOOL_MODE_PENDINGEXP, pendingexpMode); - MODECASE(P0TOOL_MODE_ADDPROCESSEDEXP, addprocessedexpMode); - MODECASE(P0TOOL_MODE_PROCESSEDEXP, processedexpMode); - MODECASE(P0TOOL_MODE_UPDATEPROCESSEDEXP, updateprocessedexpMode); + MODECASE(REGTOOL_MODE_PENDINGIMFILE, pendingimfileMode); + MODECASE(REGTOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileMode); + MODECASE(REGTOOL_MODE_PROCESSEDIMFILE, processedimfileMode); + MODECASE(REGTOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileMode); + MODECASE(REGTOOL_MODE_PENDINGEXP, pendingexpMode); + MODECASE(REGTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpMode); + MODECASE(REGTOOL_MODE_PROCESSEDEXP, processedexpMode); + MODECASE(REGTOOL_MODE_UPDATEPROCESSEDEXP, updateprocessedexpMode); default: psAbort("invalid option (this should not happen)"); Index: /trunk/ippTools/src/regtool.h =================================================================== --- /trunk/ippTools/src/regtool.h (revision 11996) +++ /trunk/ippTools/src/regtool.h (revision 11997) @@ -18,22 +18,22 @@ */ -#ifndef P0TOOL_H -#define P0TOOL_H 1 +#ifndef REGTOOL_H +#define REGTOOL_H 1 #include "pxtools.h" typedef enum { - P0TOOL_MODE_NONE = 0x0, - P0TOOL_MODE_PENDINGIMFILE, - P0TOOL_MODE_ADDPROCESSEDIMFILE, - P0TOOL_MODE_PROCESSEDIMFILE, - P0TOOL_MODE_UPDATEPROCESSEDIMFILE, - P0TOOL_MODE_PENDINGEXP, - P0TOOL_MODE_ADDPROCESSEDEXP, - P0TOOL_MODE_PROCESSEDEXP, - P0TOOL_MODE_UPDATEPROCESSEDEXP, -} p0toolMode; + REGTOOL_MODE_NONE = 0x0, + REGTOOL_MODE_PENDINGIMFILE, + REGTOOL_MODE_ADDPROCESSEDIMFILE, + REGTOOL_MODE_PROCESSEDIMFILE, + REGTOOL_MODE_UPDATEPROCESSEDIMFILE, + REGTOOL_MODE_PENDINGEXP, + REGTOOL_MODE_ADDPROCESSEDEXP, + REGTOOL_MODE_PROCESSEDEXP, + REGTOOL_MODE_UPDATEPROCESSEDEXP, +} regtoolMode; -pxConfig *p0toolConfig(pxConfig *config, int argc, char **argv); +pxConfig *regtoolConfig(pxConfig *config, int argc, char **argv); -#endif // P0TOOL_H +#endif // REGTOOL_H Index: /trunk/ippTools/src/regtoolConfig.c =================================================================== --- /trunk/ippTools/src/regtoolConfig.c (revision 11996) +++ /trunk/ippTools/src/regtoolConfig.c (revision 11997) @@ -28,5 +28,5 @@ #include "p0tool.h" -pxConfig *p0toolConfig(pxConfig *config, int argc, char **argv) +pxConfig *regtoolConfig(pxConfig *config, int argc, char **argv) { if (!config) { @@ -229,15 +229,15 @@ psMetadata *argSets = psMetadataAlloc(); // find which mode we're running under - PXTOOL_MODE("-pendingimfile", P0TOOL_MODE_PENDINGIMFILE, pendingimfileArgs); - PXTOOL_MODE("-addprocessedimfile", P0TOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileArgs); - PXTOOL_MODE("-processedimfile", P0TOOL_MODE_PROCESSEDIMFILE, processedimfileArgs); - PXTOOL_MODE("-updateprocessedimfile", P0TOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileArgs); - PXTOOL_MODE("-pendingexp", P0TOOL_MODE_PENDINGEXP,pendingexpArgs); - PXTOOL_MODE("-addprocessedexp", P0TOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs); - PXTOOL_MODE("-processedexp", P0TOOL_MODE_PROCESSEDEXP, processedexpArgs); - PXTOOL_MODE("-updateprocessedexp", P0TOOL_MODE_UPDATEPROCESSEDEXP, updatedprocessedexpArgs); + PXTOOL_MODE("-pendingimfile", REGTOOL_MODE_PENDINGIMFILE, pendingimfileArgs); + PXTOOL_MODE("-addprocessedimfile", REGTOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileArgs); + PXTOOL_MODE("-processedimfile", REGTOOL_MODE_PROCESSEDIMFILE, processedimfileArgs); + PXTOOL_MODE("-updateprocessedimfile", REGTOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileArgs); + PXTOOL_MODE("-pendingexp", REGTOOL_MODE_PENDINGEXP,pendingexpArgs); + PXTOOL_MODE("-addprocessedexp", REGTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs); + PXTOOL_MODE("-processedexp", REGTOOL_MODE_PROCESSEDEXP, processedexpArgs); + PXTOOL_MODE("-updateprocessedexp", REGTOOL_MODE_UPDATEPROCESSEDEXP, updatedprocessedexpArgs); bool argErr = false; - if (config->mode == P0TOOL_MODE_NONE) { + if (config->mode == REGTOOL_MODE_NONE) { psError(PXTOOLS_ERR_CONFIG, false, "missing mode argument"); fprintf (stderr, "mode argument is required\n"); @@ -250,5 +250,5 @@ if (argErr) { - printf("\nPan-STARRS Phase 0 Tool\n"); + printf("\nPan-STARRS Registration Tool\n"); printf("Usage: %s []\n\n", argv[0]); printf(" :\n\n"); Index: /trunk/ippTools/src/stacktool.c =================================================================== --- /trunk/ippTools/src/stacktool.c (revision 11996) +++ /trunk/ippTools/src/stacktool.c (revision 11997) @@ -52,5 +52,5 @@ psLibInit(NULL); - pxConfig *config = p6toolConfig(NULL, argc, argv); + pxConfig *config = stacktoolConfig(NULL, argc, argv); if (!config) { psError(PXTOOLS_ERR_CONFIG, false, "failed to configure"); @@ -59,11 +59,11 @@ switch (config->mode) { - MODECASE(P6TOOL_MODE_DEFINERUN, definerunMode); - MODECASE(P6TOOL_MODE_UPDATERUN, updaterunMode); - MODECASE(P6TOOL_MODE_ADDINPUTSKYFILE, addinputskyfileMode); - MODECASE(P6TOOL_MODE_INPUTSKYFILE, inputskyfileMode); - MODECASE(P6TOOL_MODE_TOSUM, tosumMode); - MODECASE(P6TOOL_MODE_ADDSUMSKYFILE, addsumskyfileMode); - MODECASE(P6TOOL_MODE_SUMSKYFILE, sumskyfileMode); + MODECASE(STACKTOOL_MODE_DEFINERUN, definerunMode); + MODECASE(STACKTOOL_MODE_UPDATERUN, updaterunMode); + MODECASE(STACKTOOL_MODE_ADDINPUTSKYFILE, addinputskyfileMode); + MODECASE(STACKTOOL_MODE_INPUTSKYFILE, inputskyfileMode); + MODECASE(STACKTOOL_MODE_TOSUM, tosumMode); + MODECASE(STACKTOOL_MODE_ADDSUMSKYFILE, addsumskyfileMode); + MODECASE(STACKTOOL_MODE_SUMSKYFILE, sumskyfileMode); default: psAbort("invalid option (this should not happen)"); Index: /trunk/ippTools/src/stacktool.h =================================================================== --- /trunk/ippTools/src/stacktool.h (revision 11996) +++ /trunk/ippTools/src/stacktool.h (revision 11997) @@ -18,21 +18,21 @@ */ -#ifndef P6TOOL_H -#define P6TOOL_H 1 +#ifndef STACKTOOL_H +#define STACKTOOL_H 1 #include "pxtools.h" typedef enum { - P6TOOL_MODE_NONE = 0x0, - P6TOOL_MODE_DEFINERUN, - P6TOOL_MODE_UPDATERUN, - P6TOOL_MODE_ADDINPUTSKYFILE, - P6TOOL_MODE_INPUTSKYFILE, - P6TOOL_MODE_TOSUM, - P6TOOL_MODE_ADDSUMSKYFILE, - P6TOOL_MODE_SUMSKYFILE, -} p6toolMode; + STACKTOOL_MODE_NONE = 0x0, + STACKTOOL_MODE_DEFINERUN, + STACKTOOL_MODE_UPDATERUN, + STACKTOOL_MODE_ADDINPUTSKYFILE, + STACKTOOL_MODE_INPUTSKYFILE, + STACKTOOL_MODE_TOSUM, + STACKTOOL_MODE_ADDSUMSKYFILE, + STACKTOOL_MODE_SUMSKYFILE, +} stacktoolMode; -pxConfig *p6toolConfig(pxConfig *config, int argc, char **argv); +pxConfig *stacktoolConfig(pxConfig *config, int argc, char **argv); -#endif // P6TOOL_H +#endif // STACKTOOL_H Index: /trunk/ippTools/src/stacktoolConfig.c =================================================================== --- /trunk/ippTools/src/stacktoolConfig.c (revision 11996) +++ /trunk/ippTools/src/stacktoolConfig.c (revision 11997) @@ -27,5 +27,5 @@ #include "p6tool.h" -pxConfig *p6toolConfig(pxConfig *config, int argc, char **argv) { +pxConfig *stacktoolConfig(pxConfig *config, int argc, char **argv) { if (!config) { config = pxConfigAlloc(); @@ -150,14 +150,14 @@ psMetadata *argSets = psMetadataAlloc(); // find which mode we're running under - PXTOOL_MODE("-definerun", P6TOOL_MODE_DEFINERUN, definerunArgs); - PXTOOL_MODE("-updaterun", P6TOOL_MODE_UPDATERUN, updaterunArgs); - PXTOOL_MODE("-addinputskyfile", P6TOOL_MODE_ADDINPUTSKYFILE, addinputskyfileArgs); - PXTOOL_MODE("-inputskyfile", P6TOOL_MODE_INPUTSKYFILE, inputskyfileArgs); - PXTOOL_MODE("-tosum", P6TOOL_MODE_TOSUM, tosumArgs); - PXTOOL_MODE("-addsumskyfile", P6TOOL_MODE_ADDSUMSKYFILE, addsumskyfileArgs); - PXTOOL_MODE("-sumskyfile", P6TOOL_MODE_SUMSKYFILE, sumskyfileArgs); + PXTOOL_MODE("-definerun", STACKTOOL_MODE_DEFINERUN, definerunArgs); + PXTOOL_MODE("-updaterun", STACKTOOL_MODE_UPDATERUN, updaterunArgs); + PXTOOL_MODE("-addinputskyfile", STACKTOOL_MODE_ADDINPUTSKYFILE, addinputskyfileArgs); + PXTOOL_MODE("-inputskyfile", STACKTOOL_MODE_INPUTSKYFILE, inputskyfileArgs); + PXTOOL_MODE("-tosum", STACKTOOL_MODE_TOSUM, tosumArgs); + PXTOOL_MODE("-addsumskyfile", STACKTOOL_MODE_ADDSUMSKYFILE, addsumskyfileArgs); + PXTOOL_MODE("-sumskyfile", STACKTOOL_MODE_SUMSKYFILE, sumskyfileArgs); bool argErr = false; - if (config->mode == P6TOOL_MODE_NONE) { + if (config->mode == STACKTOOL_MODE_NONE) { argErr = true; fprintf (stderr, "mode argument is required\n"); @@ -168,5 +168,5 @@ if (argErr) { - printf("\nPan-STARRS Phase 4 Tool\n"); + printf("\nPan-STARRS Stack Tool\n"); printf("Usage: %s []\n\n", argv[0]); printf(" :\n\n"); Index: /trunk/ippTools/src/warptool.c =================================================================== --- /trunk/ippTools/src/warptool.c (revision 11996) +++ /trunk/ippTools/src/warptool.c (revision 11997) @@ -59,5 +59,5 @@ psLibInit(NULL); - pxConfig *config = p4toolConfig(NULL, argc, argv); + pxConfig *config = warptoolConfig(NULL, argc, argv); if (!config) { psError(PXTOOLS_ERR_CONFIG, false, "failed to configure"); @@ -66,15 +66,15 @@ switch (config->mode) { - MODECASE(P4TOOL_MODE_DEFINERUN, definerunMode); - MODECASE(P4TOOL_MODE_UPDATERUN, updaterunMode); - MODECASE(P4TOOL_MODE_ADDINPUTEXP, addinputexpMode); - MODECASE(P4TOOL_MODE_EXP, expMode); - MODECASE(P4TOOL_MODE_IMFILE, imfileMode); - MODECASE(P4TOOL_MODE_TOOVERLAP, tooverlapMode); - MODECASE(P4TOOL_MODE_ADDOVERLAP, addoverlapMode); - MODECASE(P4TOOL_MODE_SCMAP, scmapMode); - MODECASE(P4TOOL_MODE_TOWARPED, towarpedMode); - MODECASE(P4TOOL_MODE_ADDWARPED, addwarpedMode); - MODECASE(P4TOOL_MODE_WARPED, warpedMode); + MODECASE(WARPTOOL_MODE_DEFINERUN, definerunMode); + MODECASE(WARPTOOL_MODE_UPDATERUN, updaterunMode); + MODECASE(WARPTOOL_MODE_ADDINPUTEXP, addinputexpMode); + MODECASE(WARPTOOL_MODE_EXP, expMode); + MODECASE(WARPTOOL_MODE_IMFILE, imfileMode); + MODECASE(WARPTOOL_MODE_TOOVERLAP, tooverlapMode); + MODECASE(WARPTOOL_MODE_ADDOVERLAP, addoverlapMode); + MODECASE(WARPTOOL_MODE_SCMAP, scmapMode); + MODECASE(WARPTOOL_MODE_TOWARPED, towarpedMode); + MODECASE(WARPTOOL_MODE_ADDWARPED, addwarpedMode); + MODECASE(WARPTOOL_MODE_WARPED, warpedMode); default: psAbort("invalid option (this should not happen)"); Index: /trunk/ippTools/src/warptool.h =================================================================== --- /trunk/ippTools/src/warptool.h (revision 11996) +++ /trunk/ippTools/src/warptool.h (revision 11997) @@ -18,25 +18,25 @@ */ -#ifndef P4TOOL_H -#define P4TOOL_H 1 +#ifndef WARPTOOL_H +#define WARPTOOL_H 1 #include "pxtools.h" typedef enum { - P4TOOL_MODE_NONE = 0x0, - P4TOOL_MODE_DEFINERUN, - P4TOOL_MODE_UPDATERUN, - P4TOOL_MODE_ADDINPUTEXP, - P4TOOL_MODE_EXP, - P4TOOL_MODE_IMFILE, - P4TOOL_MODE_TOOVERLAP, - P4TOOL_MODE_ADDOVERLAP, - P4TOOL_MODE_SCMAP, - P4TOOL_MODE_TOWARPED, - P4TOOL_MODE_ADDWARPED, - P4TOOL_MODE_WARPED, -} p4toolMode; + WARPTOOL_MODE_NONE = 0x0, + WARPTOOL_MODE_DEFINERUN, + WARPTOOL_MODE_UPDATERUN, + WARPTOOL_MODE_ADDINPUTEXP, + WARPTOOL_MODE_EXP, + WARPTOOL_MODE_IMFILE, + WARPTOOL_MODE_TOOVERLAP, + WARPTOOL_MODE_ADDOVERLAP, + WARPTOOL_MODE_SCMAP, + WARPTOOL_MODE_TOWARPED, + WARPTOOL_MODE_ADDWARPED, + WARPTOOL_MODE_WARPED, +} warptoolMode; -pxConfig *p4toolConfig(pxConfig *config, int argc, char **argv); +pxConfig *warptoolConfig(pxConfig *config, int argc, char **argv); -#endif // P4TOOL_H +#endif // WARPTOOL_H Index: /trunk/ippTools/src/warptoolConfig.c =================================================================== --- /trunk/ippTools/src/warptoolConfig.c (revision 11996) +++ /trunk/ippTools/src/warptoolConfig.c (revision 11997) @@ -27,5 +27,5 @@ #include "p4tool.h" -pxConfig *p4toolConfig(pxConfig *config, int argc, char **argv) { +pxConfig *warptoolConfig(pxConfig *config, int argc, char **argv) { if (!config) { config = pxConfigAlloc(); @@ -198,26 +198,26 @@ 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); + PXTOOL_MODE("-definerun", WARPTOOL_MODE_DEFINERUN, definerunArgs); + PXTOOL_MODE("-updaterun", WARPTOOL_MODE_UPDATERUN, updaterunArgs); + PXTOOL_MODE("-addinputexp", WARPTOOL_MODE_ADDINPUTEXP, addinputexpArgs); + PXTOOL_MODE("-exp", WARPTOOL_MODE_EXP, expArgs); + PXTOOL_MODE("-imfile", WARPTOOL_MODE_IMFILE, imfileArgs); + PXTOOL_MODE("-tooverlap", WARPTOOL_MODE_TOOVERLAP, tooverlapArgs); + PXTOOL_MODE("-addoverlap", WARPTOOL_MODE_ADDOVERLAP, addoverlapArgs); + PXTOOL_MODE("-scmap", WARPTOOL_MODE_SCMAP, scmapArgs); + PXTOOL_MODE("-towarped", WARPTOOL_MODE_TOWARPED, towarpedArgs); + PXTOOL_MODE("-addwarped", WARPTOOL_MODE_ADDWARPED, addwarpedArgs); + PXTOOL_MODE("-warped", WARPTOOL_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); + PXTOOL_MODE("-tostackedimfile", WARPTOOL_MODE_TOSTACKEDIMFILE, tostackedimfileArgs); + PXTOOL_MODE("-addstackedimfile", WARPTOOL_MODE_ADDSTACKEDIMFILE, addstackedimfileArgs); + PXTOOL_MODE("-stackedimfile", WARPTOOL_MODE_STACKEDIMFILE, stackedimfileArgs); + PXTOOL_MODE("-todiffimfile", WARPTOOL_MODE_TODIFFIMFILE, todiffimfileArgs); + PXTOOL_MODE("-adddiffimfile", WARPTOOL_MODE_ADDDIFFIMFILE, adddiffimfileArgs); + PXTOOL_MODE("-diffimfile", WARPTOOL_MODE_DIFFIMFILE, diffimfileArgs); #endif bool argErr = false; - if (config->mode == P4TOOL_MODE_NONE) { + if (config->mode == WARPTOOL_MODE_NONE) { argErr = true; fprintf (stderr, "mode argument is required\n"); @@ -228,5 +228,5 @@ if (argErr) { - printf("\nPan-STARRS Phase 4 Tool\n"); + printf("\nPan-STARRS Warp Tool\n"); printf("Usage: %s []\n\n", argv[0]); printf(" :\n\n");