Index: trunk/ippTools/src/camtool.c =================================================================== --- trunk/ippTools/src/camtool.c (revision 13633) +++ trunk/ippTools/src/camtool.c (revision 13649) @@ -483,14 +483,4 @@ } - psS32 nastro = psMetadataLookupS32(&status, config->args, "-nastro"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -nastro"); - return false; - } - if (nastro < 0) { - psError(PS_ERR_UNKNOWN, true, "-nastro is required"); - return false; - } - psF32 zp_mean = psMetadataLookupF32(&status, config->args, "-zp_mean"); if (!status) { @@ -510,4 +500,64 @@ if (isnan(zp_stdev)) { psError(PS_ERR_UNKNOWN, true, "-zp_stdev is required"); + return false; + } + + psF32 fwhm = psMetadataLookupF32(&status, config->args, "-fwhm"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fwhm"); + return false; + } + if (isnan(fwhm)) { + psError(PS_ERR_UNKNOWN, true, "-fwhm is required"); + return false; + } + + psF32 fwhm_range = psMetadataLookupF32(&status, config->args, "-fwhm_range"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fwhm_range"); + return false; + } + if (isnan(fwhm_range)) { + psError(PS_ERR_UNKNOWN, true, "-fwhm_range is required"); + return false; + } + + psS32 n_stars = psMetadataLookupS32(&status, config->args, "-n_stars"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_stars"); + return false; + } + if (n_stars < 0) { + psError(PS_ERR_UNKNOWN, true, "-n_stars is required"); + return false; + } + + psS32 n_extended = psMetadataLookupS32(&status, config->args, "-n_extended"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_extended"); + return false; + } + if (n_extended < 0) { + psError(PS_ERR_UNKNOWN, true, "-n_extended is required"); + return false; + } + + psS32 n_cr = psMetadataLookupS32(&status, config->args, "-n_cr"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_cr"); + return false; + } + if (n_cr < 0) { + psError(PS_ERR_UNKNOWN, true, "-n_cr is required"); + return false; + } + + psS32 n_astrom = psMetadataLookupS32(&status, config->args, "-n_astrom"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_astrom"); + return false; + } + if (n_astrom < 0) { + psError(PS_ERR_UNKNOWN, true, "-n_astrom is required"); return false; } @@ -576,8 +626,13 @@ sigma_ra, sigma_dec, - nastro, - path_base, zp_mean, zp_stdev, + fwhm, + fwhm_range, + n_stars, + n_extended, + n_cr, + n_astrom, + path_base, code ); Index: trunk/ippTools/src/camtoolConfig.c =================================================================== --- trunk/ippTools/src/camtoolConfig.c (revision 13633) +++ trunk/ippTools/src/camtoolConfig.c (revision 13649) @@ -77,9 +77,9 @@ "search by exposure time", NAN); psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg", 0, - "search by exposue background", NAN); + "search by exposure background", NAN); psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "search by exposue background stdev", NAN); + "search by exposure background stdev", NAN); psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "search by exposue background mean stdev", NAN); + "search by exposure background mean stdev", NAN); psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt", 0, "search by altitute", NAN); @@ -136,19 +136,29 @@ "define URI (required)", NULL); psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg", 0, - "define exposue background", NAN); + "define exposure background", NAN); psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposue background stdev", NAN); + "define exposure background stdev", NAN); psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposue background mean stdev", NAN); + "define exposure background mean stdev", NAN); psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-sigma_ra", 0, "define exposure E ra (required)", NAN); psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-sigma_dec", 0, "define exposure E dec (required)", NAN); - psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-nastro", 0, - "define number of objects (required)", -1); psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zp_mean", 0, "define zero point mean (required)", NAN); psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zp_stdev", 0, "define zero point stdev (required)", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fwhm", 0, + "define FWHM in arcsec (required)", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fhwm_range", 0, + "define FWHM range in arcsec (required)", NAN); + psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_stars", 0, + "define number of stars (required)", -1); + psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_extended", 0, + "define number of extended objects (required)", -1); + psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_cr", 0, + "define number of cosmic rays (required)", -1); + psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_astrom", 0, + "define number of astrometry reference objects (required)", -1); psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); Index: trunk/ippTools/src/chiptool.c =================================================================== --- trunk/ippTools/src/chiptool.c (revision 13633) +++ trunk/ippTools/src/chiptool.c (revision 13649) @@ -145,7 +145,7 @@ ADDPARAMF(config->args, where, F32, "decl"); ADDPARAMF(config->args, where, F32, "exp_time"); - ADDPARAMF(config->args, where, F64, "bg"); - ADDPARAMF(config->args, where, F64, "bg_stdev"); - ADDPARAMF(config->args, where, F64, "bg_mean_stdev"); + ADDPARAMF(config->args, where, F32, "bg"); + ADDPARAMF(config->args, where, F32, "bg_stdev"); + ADDPARAMF(config->args, where, F32, "bg_mean_stdev"); ADDPARAMF(config->args, where, F64, "alt"); ADDPARAMF(config->args, where, F64, "az"); @@ -838,5 +838,5 @@ } - psF64 bg = psMetadataLookupF64(&status, config->args, "-bg"); + psF32 bg = psMetadataLookupF32(&status, config->args, "-bg"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg"); @@ -844,5 +844,5 @@ } - psF64 bg_stdev = psMetadataLookupF64(&status, config->args, "-bg_stdev"); + psF32 bg_stdev = psMetadataLookupF32(&status, config->args, "-bg_stdev"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_stdev"); @@ -850,7 +850,97 @@ } - psF64 bg_mean_stdev = psMetadataLookupF64(&status, config->args, "-bg_mean_stdev"); + psF32 bg_mean_stdev = psMetadataLookupF32(&status, config->args, "-bg_mean_stdev"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_mean_stdev"); + return false; + } + + psF32 bias = psMetadataLookupF32(&status, config->args, "-bias"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bias"); + return false; + } + + psF32 bias_stdev = psMetadataLookupF32(&status, config->args, "-bias_stdev"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bias_stdev"); + return false; + } + + psF32 fringe_0 = psMetadataLookupF32(&status, config->args, "-fringe_0"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_0"); + return false; + } + + psF32 fringe_1 = psMetadataLookupF32(&status, config->args, "-fringe_1"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_1"); + return false; + } + + psF32 fringe_2 = psMetadataLookupF32(&status, config->args, "-fringe_2"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_2"); + return false; + } + + psF32 sigma_ra = psMetadataLookupF32(&status, config->args, "-sigma_ra"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -sigma_ra"); + return false; + } + + psF32 sigma_dec = psMetadataLookupF32(&status, config->args, "-sigma_dec"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -sigma_dec"); + return false; + } + + psF32 ap_resid = psMetadataLookupF32(&status, config->args, "-ap_resid"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -ap_resid"); + return false; + } + + psF32 ap_resid_stdev = psMetadataLookupF32(&status, config->args, "-ap_resid_stdev"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -ap_resid_stdev"); + return false; + } + + psF32 fwhm = psMetadataLookupF32(&status, config->args, "-fwhm"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fwhm"); + return false; + } + + psF32 fwhm_range = psMetadataLookupF32(&status, config->args, "-fwhm_range"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fwhm_range"); + return false; + } + + psS32 n_stars = psMetadataLookupS32(&status, config->args, "-n_stars"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_stars"); + return false; + } + + psS32 n_extended = psMetadataLookupS32(&status, config->args, "-n_extended"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_extended"); + return false; + } + + psS32 n_cr = psMetadataLookupS32(&status, config->args, "-n_cr"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_cr"); + return false; + } + + psS32 n_astrom = psMetadataLookupS32(&status, config->args, "-n_astrom"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_astrom"); return false; } @@ -877,7 +967,22 @@ bg_stdev, bg_mean_stdev, + bias, + bias_stdev, + fringe_0, + fringe_1, + fringe_2, + sigma_ra, + sigma_dec, + ap_resid, + ap_resid_stdev, + fwhm, + fwhm_range, + n_stars, + n_extended, + n_cr, + n_astrom, path_base, code - ); + ); } Index: trunk/ippTools/src/chiptoolConfig.c =================================================================== --- trunk/ippTools/src/chiptoolConfig.c (revision 13633) +++ trunk/ippTools/src/chiptoolConfig.c (revision 13649) @@ -72,10 +72,12 @@ psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time", 0, "search by exposure time", NAN); + + // XXX EAM : are these selecting based on the rawExp value or the chipImfile value? psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg", 0, - "search by exposue background", NAN); + "search by exposure background", NAN); psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "search by exposue background stdev", NAN); + "search by exposure background stdev", NAN); psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "search by exposue background mean stdev", NAN); + "search by exposure background mean stdev", NAN); psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt", 0, "search by altitute", NAN); @@ -129,12 +131,45 @@ psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-uri", 0, "define URL", NULL); - 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); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bg", 0, + "define exposure background", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, + "define exposure background stdev", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, + "define exposure background mean stdev", NAN); + + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bias", 0, + "define bias", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bias_stdev", 0, + "define bias stdev", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_0", 0, + "define fringe term 0", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_1", 0, + "define fringe term 1", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_2", 0, + "define fringe term 2", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-sigma_ra", 0, + "define error in RA", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-sigma_dec", 0, + "define error in DEC", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-ap_resid", 0, + "define aperture residual", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-ap_resid_stdev", 0, + "define aperture residual stdev", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fwhm", 0, + "define fwhm (arcsec)", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fwhm_range", 0, + "define fwhm range (min to max)", NAN); + + psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_stars", 0, + "define number of stars in image", 0); + psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_extended", 0, + "define number of extended objects in image", 0); + psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_cr", 0, + "define number of cosmic rays in image", 0); + psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_astrom", 0, + "define number of astrometry stars used", 0); + psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-path_base", 0, - "define banana 1", NULL); + "define base output location", NULL); psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0);