Index: trunk/ippTools/src/regtoolConfig.c =================================================================== --- trunk/ippTools/src/regtoolConfig.c (revision 10988) +++ trunk/ippTools/src/regtoolConfig.c (revision 11047) @@ -41,4 +41,85 @@ } + // -pendingimfile + psMetadata *pendingimfileArgs = psMetadataAlloc(); + psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, + "search by exposure ID", NULL); + psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class", 0, + "search by class", NULL); + psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class_id", 0, + "search by class ID", NULL); + psMetadataAddU64(pendingimfileArgs, PS_LIST_TAIL, "-limit", 0, + "limit result set to N items", 0); + psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple", 0, + "use the simple output format", false); + + // -addprocessedimfile + psMetadata *addprocessedimfileArgs = psMetadataAlloc(); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, + "search by exposure ID", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class", 0, + "search by class", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, + "search by class ID", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_type", 0, + "define exposure type", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-filter", 0, + "define filter ", NULL); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-airmass", 0, + "define airmass", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-ra", 0, + "define RA", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-decl", 0, + "define DEC", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_time", 0, + "define exposure time", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg", 0, + "define exposue background", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, + "define exposue background stdev", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, + "define exposue background mean stdev", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-alt", 0, + "define altitute", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-az", 0, + "define azimuth", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-ccd_temp", 0, + "define ccd tempature", NAN); + psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-posang", 0, + "define rotator position angle", NAN); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-object", 0, + "define exposure object", NULL); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-dateobs", 0, + "define observation time", NULL); + psMetadataAddS8(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, + "set fault code (required)", 0); + + // -processedimfile + psMetadata *processedimfileArgs = psMetadataAlloc(); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, + "search by exposure ID", NULL); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class", 0, + "search by class", NULL); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class_id", 0, + "search by class ID", NULL); + psMetadataAddU64(processedimfileArgs, PS_LIST_TAIL, "-limit", 0, + "limit result set to N items", 0); + psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-faulted", 0, + "only return imfiles with a fault status set", false); + psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-simple", 0, + "use the simple output format", false); + + // -updateprocessedimfile + psMetadata *updateprocessedimfileArgs = psMetadataAlloc(); + psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, + "search by exposure ID", NULL); + psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class", 0, + "search by class", NULL); + psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, + "search by class ID", NULL); + psMetadataAddS8(updateprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, + "set fault code (required)", 0); + + // -pendingexp psMetadata *pendingexpArgs = psMetadataAlloc(); @@ -55,61 +136,45 @@ psMetadataAddU64(pendingexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); - psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-faulted", 0, - "only return imfiles with a fault status set", false); psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - - // -pendingimfile - psMetadata *pendingimfileArgs = psMetadataAlloc(); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, - "search by exposure ID", NULL); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class", 0, - "search by class", NULL); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search by class ID", NULL); - psMetadataAddU64(pendingimfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-faulted", 0, - "only return imfiles with a fault status set", false); - psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - - - // -updateexp - psMetadata *updateexpArgs = psMetadataAlloc(); - psMetadataAddStr(updateexpArgs, PS_LIST_TAIL, "-exp_tag", 0, + + // -addprocessedexp + psMetadata *addprocessedexpArgs = psMetadataAlloc(); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_tag", 0, "exp_tag to operate on (required)", NULL); - psMetadataAddStr(updateexpArgs, PS_LIST_TAIL, "-exp_type", 0, + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_type", 0, "define exposure type", NULL); - psMetadataAddStr(updateexpArgs, PS_LIST_TAIL, "-filter", 0, + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-filter", 0, "define filter ", NULL); - psMetadataAddF32(updateexpArgs, PS_LIST_TAIL, "-airmass", 0, + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-airmass", 0, "define airmass", NAN); - psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-ra", 0, + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-ra", 0, "define RA", NAN); - psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-decl", 0, + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-decl", 0, "define DEC", NAN); - psMetadataAddF32(updateexpArgs, PS_LIST_TAIL, "-exp_time", 0, + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-exp_time", 0, "define exposure time", NAN); - psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-bg", 0, + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg", 0, "define exposue background", NAN); - psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposue background stdev", NAN); - psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); - psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-alt", 0, + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-alt", 0, "define altitute", NAN); - psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-az", 0, + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-az", 0, "define azimuth", NAN); - psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-ccd_temp", 0, + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-ccd_temp", 0, "define ccd tempature", NAN); - psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-posang", 0, + psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-posang", 0, "define rotator position angle", NAN); - psMetadataAddStr(updateexpArgs, PS_LIST_TAIL, "-object", 0, + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-object", 0, "define exposure object", NULL); - psMetadataAddStr(updateexpArgs, PS_LIST_TAIL, "-dateobs", 0, + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-dateobs", 0, "define observation time", NULL); - psMetadataAddStr(updateexpArgs, PS_LIST_TAIL, "-label", 0, + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-label", 0, "define label for phase 2 processing (non-detrend data only)", NULL); + psMetadataAddS8(addprocessedexpArgs, PS_LIST_TAIL, "-code", 0, + "set fault code (required)", 0); /* psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-recip", 0, @@ -118,72 +183,25 @@ "define URL", NULL); */ - psMetadataAddBool(updateexpArgs, PS_LIST_TAIL, "-detrend", 0, + psMetadataAddBool(addprocessedexpArgs, PS_LIST_TAIL, "-detrend", 0, "declare this as detrend data", false); - // -faultexp - psMetadata *faultexpArgs = psMetadataAlloc(); - psMetadataAddStr(faultexpArgs, PS_LIST_TAIL, "-exp_tag", 0, - "search by exposure ID", NULL); - psMetadataAddS8(faultexpArgs, PS_LIST_TAIL, "-code", 0, + // -processedexp + psMetadata *processedexpArgs = psMetadataAlloc(); + psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_tag", 0, + "search by exposure ID", NULL); + psMetadataAddU64(processedexpArgs, PS_LIST_TAIL, "-limit", 0, + "limit result set to N items", 0); + psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-faulted", 0, + "only return imfiles with a fault status set", false); + psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-simple", 0, + "use the simple output format", false); + + // -updatedprocessedexp + psMetadata *updatedprocessedexpArgs = psMetadataAlloc(); + psMetadataAddStr(updatedprocessedexpArgs, PS_LIST_TAIL, "-exp_tag", 0, + "search by exposure ID", NULL); + psMetadataAddS8(updatedprocessedexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); - // -updateimfile - psMetadata *updateimfileArgs = psMetadataAlloc(); - psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, - "search by exposure ID", NULL); - psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-class", 0, - "search by class", NULL); - psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search by class ID", NULL); - psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-exp_type", 0, - "define exposure type", NULL); - psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-filter", 0, - "define filter ", NULL); - psMetadataAddF32(updateimfileArgs, PS_LIST_TAIL, "-airmass", 0, - "define airmass", NAN); - psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-ra", 0, - "define RA", NAN); - psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-decl", 0, - "define DEC", NAN); - psMetadataAddF32(updateimfileArgs, PS_LIST_TAIL, "-exp_time", 0, - "define exposure time", NAN); - psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-bg", 0, - "define exposue background", NAN); - psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposue background stdev", NAN); - psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposue background mean stdev", NAN); - psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-alt", 0, - "define altitute", NAN); - psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-az", 0, - "define azimuth", NAN); - psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-ccd_temp", 0, - "define ccd tempature", NAN); - psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-posang", 0, - "define rotator position angle", NAN); - psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-object", 0, - "define exposure object", NULL); - psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-dateobs", 0, - "define observation time", NULL); - - // -faultimfile - psMetadata *faultimfileArgs = psMetadataAlloc(); - psMetadataAddStr(faultimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, - "search by exposure ID", NULL); - psMetadataAddStr(faultimfileArgs, PS_LIST_TAIL, "-class", 0, - "search by class", NULL); - psMetadataAddStr(faultimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search by class ID", NULL); - psMetadataAddS8(faultimfileArgs, PS_LIST_TAIL, "-code", 0, - "set fault code (required)", 0); - - // -rawimfile - psMetadata *rawimfileArgs = psMetadataAlloc(); - psMetadataAddStr(rawimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, - "search by exposure ID", NULL); - psMetadataAddStr(rawimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search by class ID", NULL); - psMetadataAddBool(rawimfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); #define PXTOOL_MODE(option, modeval, argset) \ @@ -207,11 +225,12 @@ psMetadata *argSets = psMetadataAlloc(); // find which mode we're running under - PXTOOL_MODE("-pendingexp", P0TOOL_MODE_PENDINGEXP, pendingexpArgs); - PXTOOL_MODE("-pendingimfile",P0TOOL_MODE_PENDINGIMFILE, pendingimfileArgs); - PXTOOL_MODE("-updateexp", P0TOOL_MODE_UPDATEEXP, updateexpArgs); - PXTOOL_MODE("-faultexp", P0TOOL_MODE_FAULTEXP, faultexpArgs); - PXTOOL_MODE("-updateimfile", P0TOOL_MODE_UPDATEIMFILE, updateimfileArgs); - PXTOOL_MODE("-faultimfile", P0TOOL_MODE_FAULTIMFILE, faultimfileArgs); - PXTOOL_MODE("-rawimfile", P0TOOL_MODE_RAWIMFILE, rawimfileArgs); + 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); bool argErr = false;