Index: /trunk/ippTools/scripts/camtest.sh =================================================================== --- /trunk/ippTools/scripts/camtest.sh (revision 12057) +++ /trunk/ippTools/scripts/camtest.sh (revision 12058) @@ -8,4 +8,4 @@ camtool -pendingimfile || exit 1 -camtool -addprocessedexp -exp_tag t10.1 -uri file://camp -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -sigma_ra 1 -sigma_dec 2 -nastro 42 -b1_uri file:///foo -b2_uri file://bar -zp_mean 1 -zp_stdev 2 || exit 1 -camtool -addprocessedexp -exp_tag t11.2 -uri file://camp -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -sigma_ra 1 -sigma_dec 2 -nastro 42 -b1_uri file:///foo -b2_uri file://bar -zp_mean 1 -zp_stdev 2 || exit 1 +camtool -addprocessedexp -exp_tag t10.1 -uri file://camp -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -sigma_ra 1 -sigma_dec 2 -nastro 42 -path_base file:///foo -zp_mean 1 -zp_stdev 2 || exit 1 +camtool -addprocessedexp -exp_tag t11.2 -uri file://camp -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -sigma_ra 1 -sigma_dec 2 -nastro 42 -path_base file:///foo -zp_mean 1 -zp_stdev 2 || exit 1 Index: /trunk/ippTools/scripts/chiptest.sh =================================================================== --- /trunk/ippTools/scripts/chiptest.sh (revision 12057) +++ /trunk/ippTools/scripts/chiptest.sh (revision 12058) @@ -8,9 +8,9 @@ for ID in `seq 0 3`; do - chiptool -addprocessedimfile -exp_tag t10.1 -class_id $ID -uri file://chipp-t10.$ID -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri file:///foo -b2_uri file://bar || exit 1 + chiptool -addprocessedimfile -exp_tag t10.1 -class_id $ID -uri file://chipp-t10.$ID -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -path_base file:///foo || exit 1 done; for ID in `seq 0 3`; do - chiptool -addprocessedimfile -exp_tag t11.2 -class_id $ID -uri file://chipp-t11.$ID -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri file:///foo -b2_uri file://bar || exit 1 + chiptool -addprocessedimfile -exp_tag t11.2 -class_id $ID -uri file://chipp-t11.$ID -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -path_base file:///foo || exit 1 done; Index: /trunk/ippTools/scripts/dettest.sh =================================================================== --- /trunk/ippTools/scripts/dettest.sh (revision 12057) +++ /trunk/ippTools/scripts/dettest.sh (revision 12058) @@ -34,9 +34,9 @@ dettool -tonormalize || exit 1 for ID in `seq 0 3` ; do - dettool -addnormalizedimfile -det_id $det_id -class_id $ID -uri file://normalized-$ID -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri banana1 -b2_uri banannnnnaaa2 || exit 1 + dettool -addnormalizedimfile -det_id $det_id -class_id $ID -uri file://normalized-$ID -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -path_base banana1 || exit 1 done; dettool -tonormalizedexp || exit 1 -dettool -addnormalizedexp -det_id $det_id -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri file://normalizedexp -b2_uri file://normlalizedexp|| exit 1 +dettool -addnormalizedexp -det_id $det_id -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -path_base file://normalizedexp || exit 1 dettool -toresidimfile || exit 1 @@ -47,6 +47,6 @@ dettool -toresidexp || exit 1 -dettool -addresidexp -det_id $det_id -exp_tag t11.2 -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri jpeg1 -b2_uri jpeg2 || exit 1 -#dettool -addresidexp -det_id $det_id -exp_tag t11.2 -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri jpeg1 -b2_uri jpeg2 -reject || exit 1 +dettool -addresidexp -det_id $det_id -exp_tag t11.2 -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -path_base jpeg1 || exit 1 +#dettool -addresidexp -det_id $det_id -exp_tag t11.2 -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -path_base jpeg1 -reject || exit 1 dettool -residdetrun || exit 1 Index: /trunk/ippTools/scripts/mapfile.txt =================================================================== --- /trunk/ippTools/scripts/mapfile.txt (revision 12057) +++ /trunk/ippTools/scripts/mapfile.txt (revision 12058) @@ -8,4 +8,5 @@ cam_version S32 0 class_id STR quix1 + fault S16 0 END @@ -17,3 +18,4 @@ cam_version S32 0 class_id STR quix2 + fault S16 0 END Index: /trunk/ippTools/src/camtool.c =================================================================== --- /trunk/ippTools/src/camtool.c (revision 12057) +++ /trunk/ippTools/src/camtool.c (revision 12058) @@ -331,12 +331,7 @@ // optional - psString b1_uri = psMetadataLookupStr(&status, config->args, "-b1_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b1_uri"); - return false; - } - psString b2_uri = psMetadataLookupStr(&status, config->args, "-b2_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b2_uri"); + psString path_base = psMetadataLookupStr(&status, config->args, "-path_base"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -path_base"); return false; } @@ -401,6 +396,5 @@ sigma_dec, nastro, - b1_uri, - b2_uri, + path_base, zp_mean, zp_stdev, Index: /trunk/ippTools/src/camtoolConfig.c =================================================================== --- /trunk/ippTools/src/camtoolConfig.c (revision 12057) +++ /trunk/ippTools/src/camtoolConfig.c (revision 12058) @@ -94,8 +94,6 @@ psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zp_stdev", 0, "define zero point stdev (required)", NAN); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-b1_uri", 0, + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-b2_uri", 0, - "define banana 2", NULL); psMetadataAddS8(addprocessedexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); Index: /trunk/ippTools/src/chiptool.c =================================================================== --- /trunk/ippTools/src/chiptool.c (revision 12057) +++ /trunk/ippTools/src/chiptool.c (revision 12058) @@ -831,13 +831,7 @@ // optional - psString b1_uri = psMetadataLookupStr(&status, config->args, "-b1_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b1_uri"); - return false; - } - - psString b2_uri = psMetadataLookupStr(&status, config->args, "-b2_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b2_uri"); + psString path_base = psMetadataLookupStr(&status, config->args, "-path_base"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -path_base"); return false; } @@ -860,6 +854,5 @@ bg_stdev, bg_mean_stdev, - b1_uri, - b2_uri, + path_base, code ); Index: /trunk/ippTools/src/chiptoolConfig.c =================================================================== --- /trunk/ippTools/src/chiptoolConfig.c (revision 12057) +++ /trunk/ippTools/src/chiptoolConfig.c (revision 12058) @@ -124,8 +124,6 @@ psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-b1_uri", 0, + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-b2_uri", 0, - "define banana 2", NULL); psMetadataAddS8(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); Index: /trunk/ippTools/src/dettool.c =================================================================== --- /trunk/ippTools/src/dettool.c (revision 12057) +++ /trunk/ippTools/src/dettool.c (revision 12058) @@ -2087,12 +2087,7 @@ } // optional - psString b1_uri = psMetadataLookupStr(&status, config->args, "-b1_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b1_uri"); - return false; - } - psString b2_uri = psMetadataLookupStr(&status, config->args, "-b2_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b2_uri"); + psString path_base = psMetadataLookupStr(&status, config->args, "-path_base"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -path_base"); return false; } @@ -2136,6 +2131,5 @@ bg_stdev, bg_mean_stdev, - b1_uri, - b2_uri, + path_base, code ); @@ -2345,12 +2339,7 @@ } // optional - psString b1_uri = psMetadataLookupStr(&status, config->args, "-b1_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b1_uri"); - return false; - } - psString b2_uri = psMetadataLookupStr(&status, config->args, "-b2_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b2_uri"); + psString path_base = psMetadataLookupStr(&status, config->args, "-path_base"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -path_base"); return false; } @@ -2427,6 +2416,5 @@ bg_stdev, bg_mean_stdev, - b1_uri, - b2_uri, + path_base, code ); @@ -3740,12 +3728,7 @@ // optional - psString b1_uri = psMetadataLookupStr(&status, config->args, "-b1_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b1_uri"); - return false; - } - psString b2_uri = psMetadataLookupStr(&status, config->args, "-b2_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b2_uri"); + psString path_base = psMetadataLookupStr(&status, config->args, "-path_base"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -path_base"); return false; } @@ -3818,6 +3801,5 @@ bg_stdev, bg_mean_stdev, - b1_uri, - b2_uri, + path_base, code ); @@ -3968,12 +3950,7 @@ } // optional - psString b1_uri = psMetadataLookupStr(&status, config->args, "-b1_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b1_uri"); - return false; - } - psString b2_uri = psMetadataLookupStr(&status, config->args, "-b2_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b2_uri"); + psString path_base = psMetadataLookupStr(&status, config->args, "-path_base"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -path_base"); return false; } @@ -3994,6 +3971,5 @@ bg_stdev, bg_mean_stdev, - b1_uri, - b2_uri, + path_base, code ); @@ -4281,6 +4257,5 @@ " 0.0 as bg_stdev,\n" " 0.0 as bg_mean_stdev,\n" - " 'NULL' as b1_uri,\n" - " 'NULL' as b2_uri,\n" + " 'NULL' as path_base,\n" " 0 as fault\n" " FROM detRun\n" @@ -4502,12 +4477,7 @@ } // optional - psString b1_uri = psMetadataLookupStr(&status, config->args, "-b1_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b1_uri"); - return false; - } - psString b2_uri = psMetadataLookupStr(&status, config->args, "-b2_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b2_uri"); + psString path_base = psMetadataLookupStr(&status, config->args, "-path_base"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -path_base"); return false; } @@ -4531,6 +4501,5 @@ bg_stdev, bg_mean_stdev, - b1_uri, - b2_uri, + path_base, code ); @@ -5028,18 +4997,14 @@ return false; } - psString b1_uri = psMetadataLookupStr(&status, config->args, "-b1_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b1_uri"); - return false; - } - if (!b1_uri) { - psError(PS_ERR_UNKNOWN, true, "-b1_uri is required"); - return false; - } - psString b2_uri = psMetadataLookupStr(&status, config->args, "-b2_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b2_uri"); - return false; - } + psString path_base = psMetadataLookupStr(&status, config->args, "-path_base"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -path_base"); + return false; + } + if (!path_base) { + psError(PS_ERR_UNKNOWN, true, "-path_base is required"); + return false; + } + // default values psS8 code = psMetadataLookupS8(&status, config->args, "-code"); @@ -5058,6 +5023,5 @@ bg_stdev, bg_mean_stdev, - b1_uri, - b2_uri, + path_base, !reject, code @@ -5387,30 +5351,14 @@ } - psString b1_uri = psMetadataLookupStr(&status, config->args, "-b1_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b1_uri"); + psString path_base = psMetadataLookupStr(&status, config->args, "-path_base"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -path_base"); psFree(set); psFree(where); return false; } - if (b1_uri) { - if (!psMetadataAddStr(set, PS_LIST_TAIL, "b1_uri", 0, "==", b1_uri)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri"); - psFree(set); - psFree(where); - return false; - } - } - - psString b2_uri = psMetadataLookupStr(&status, config->args, "-b2_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b2_uri"); - psFree(set); - psFree(where); - return false; - } - if (b2_uri) { - if (!psMetadataAddStr(set, PS_LIST_TAIL, "b2_uri", 0, "==", b2_uri)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri"); + if (path_base) { + if (!psMetadataAddStr(set, PS_LIST_TAIL, "path_base", 0, "==", path_base)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item path_base"); psFree(set); psFree(where); @@ -6434,13 +6382,7 @@ } - psString b1_uri = psMetadataLookupStr(&status, config->args, "-b1_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b1_uri"); - return false; - } - - psString b2_uri = psMetadataLookupStr(&status, config->args, "-b2_uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b2_uri"); + psString path_base = psMetadataLookupStr(&status, config->args, "-path_base"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -path_base"); return false; } @@ -6458,6 +6400,5 @@ bg_stdev, bg_mean_stdev, - b1_uri, - b2_uri, + path_base, 0 // fault code )) { Index: /trunk/ippTools/src/dettoolConfig.c =================================================================== --- /trunk/ippTools/src/dettoolConfig.c (revision 12057) +++ /trunk/ippTools/src/dettoolConfig.c (revision 12058) @@ -287,8 +287,6 @@ psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-b1_uri", 0, + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-b2_uri", 0, - "define banana 2", NULL); psMetadataAddS8(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); @@ -336,8 +334,6 @@ psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-b1_uri", 0, + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-b2_uri", 0, - "define banana 2", NULL); psMetadataAddS8(addprocessedexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); @@ -444,8 +440,6 @@ psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); - psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-b1_uri", 0, + psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-b2_uri", 0, - "define banana 2", NULL); psMetadataAddS8(addnormalizedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); @@ -472,8 +466,6 @@ psMetadataAddF64(addnormalizedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); - psMetadataAddStr(addnormalizedexpArgs, PS_LIST_TAIL, "-b1_uri", 0, + psMetadataAddStr(addnormalizedexpArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddStr(addnormalizedexpArgs, PS_LIST_TAIL, "-b2_uri", 0, - "define banana 2", NULL); psMetadataAddS8(addnormalizedexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); @@ -493,8 +485,6 @@ psMetadataAddF64(normalizedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); - psMetadataAddStr(normalizedexpArgs, PS_LIST_TAIL, "-b1_uri", 0, + psMetadataAddStr(normalizedexpArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddStr(normalizedexpArgs, PS_LIST_TAIL, "-b2_uri", 0, - "define banana 2", NULL); psMetadataAddU64(normalizedexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); @@ -555,8 +545,6 @@ psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); - psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-b1_uri", 0, + psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-b2_uri", 0, - "define banana 2", NULL); psMetadataAddS8(addresidimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); @@ -597,8 +585,6 @@ psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); - psMetadataAddStr(addresidexpArgs, PS_LIST_TAIL, "-b1_uri", 0, + psMetadataAddStr(addresidexpArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddStr(addresidexpArgs, PS_LIST_TAIL, "-b2_uri", 0, - "define banana 2", NULL); psMetadataAddS8(addresidexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); @@ -648,8 +634,6 @@ psMetadataAddF64(updateresidexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); - psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-b1_uri", 0, + psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-b2_uri", 0, - "define banana 2", NULL); psMetadataAddBool(updateresidexpArgs, PS_LIST_TAIL, "-reject", 0, "exposure is not to be stacked in the next iteration", false); @@ -768,8 +752,6 @@ psMetadataAddF64(register_detrend_imfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); - psMetadataAddStr(register_detrend_imfileArgs, PS_LIST_TAIL, "-b1_uri", 0, + psMetadataAddStr(register_detrend_imfileArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddStr(register_detrend_imfileArgs, PS_LIST_TAIL, "-b2_uri", 0, - "define banana 2", NULL); psFree(now);