Index: /trunk/ippTools/src/camtool.c =================================================================== --- /trunk/ippTools/src/camtool.c (revision 16247) +++ /trunk/ippTools/src/camtool.c (revision 16248) @@ -385,10 +385,20 @@ PXOPT_LOOKUP_F32(bg_stdev, config->args, "-bg_stdev", false, false); PXOPT_LOOKUP_F32(bg_mean_stdev, config->args, "-bg_mean_stdev", false, false); + PXOPT_LOOKUP_F32(bias, config->args, "-bias", false, false); + PXOPT_LOOKUP_F32(bias_stdev, config->args, "-bias_stdev", false, false); + PXOPT_LOOKUP_F32(fringe_0, config->args, "-fringe_0", false, false); + PXOPT_LOOKUP_F32(fringe_1, config->args, "-fringe_1", false, false); + PXOPT_LOOKUP_F32(fringe_2, config->args, "-fringe_2", false, false); PXOPT_LOOKUP_F32(sigma_ra, config->args, "-sigma_ra", false, false); PXOPT_LOOKUP_F32(sigma_dec, config->args, "-sigma_dec", false, false); + PXOPT_LOOKUP_F32(ap_resid, config->args, "-ap_resid", false, false); + PXOPT_LOOKUP_F32(ap_resid_stdev, config->args, "-ap_resid_stdev", false, false); PXOPT_LOOKUP_F32(zp_mean, config->args, "-zp_mean", false, false); PXOPT_LOOKUP_F32(zp_stdev, config->args, "-zp_stdev", false, false); - PXOPT_LOOKUP_F32(fwhm, config->args, "-fwhm", false, false); - PXOPT_LOOKUP_F32(fwhm_range, config->args, "-fwhm_range", false, false); + PXOPT_LOOKUP_F32(fwhm_major, config->args, "-fwhm_major", false, false); + PXOPT_LOOKUP_F32(fwhm_minor, config->args, "-fwhm_minor", false, false); + PXOPT_LOOKUP_F32(dtime_detrend, config->args, "-dime_detrend", false, false); + PXOPT_LOOKUP_F32(dtime_photom, config->args, "-dime_photom", false, false); + PXOPT_LOOKUP_F32(dtime_astrom, config->args, "-dime_astrom", false, false); PXOPT_LOOKUP_F32(n_stars, config->args, "-n_stars", false, false); PXOPT_LOOKUP_F32(n_extended, config->args, "-n_extended", false, false); @@ -467,23 +477,33 @@ psFree(output); camProcessedExpRow *row = camProcessedExpRowAlloc( - pendingRow->cam_id, - pendingRow->chip_id, - uri, - bg, - bg_stdev, - bg_mean_stdev, - sigma_ra, - sigma_dec, - zp_mean, - zp_stdev, - fwhm, - fwhm_range, - n_stars, - n_extended, - n_cr, - n_astrom, - path_base, - code - ); + pendingRow->cam_id, + pendingRow->chip_id, + uri, + bg, + bg_stdev, + bg_mean_stdev, + bias, + bias_stdev, + fringe_0, + fringe_1, + fringe_2, + sigma_ra, + sigma_dec, + ap_resid, + ap_resid_stdev, + zp_mean, + zp_stdev, + fwhm_major, + fwhm_minor, + dtime_detrend, + dtime_photom, + dtime_astrom, + n_stars, + n_extended, + n_cr, + n_astrom, + path_base, + code + ); if (!camProcessedExpInsertObject(config->dbh, row)) { Index: /trunk/ippTools/src/camtoolConfig.c =================================================================== --- /trunk/ippTools/src/camtoolConfig.c (revision 16247) +++ /trunk/ippTools/src/camtoolConfig.c (revision 16248) @@ -181,16 +181,36 @@ psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposure background mean stdev", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-bias", 0, + "define bias", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-bias_stdev", 0, + "define bias stdev", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fringe_0", 0, + "define fringe term 0", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fringe_1", 0, + "define fringe term 1", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fringe_2", 0, + "define fringe term 2", NAN); psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-sigma_ra", 0, "define exposure E ra", NAN); psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-sigma_dec", 0, "define exposure E dec", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ap_resid", 0, + "define aperture residual", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ap_resid_stdev", 0, + "define aperture residual stdev", NAN); psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zp_mean", 0, "define zero point mean", NAN); psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zp_stdev", 0, "define zero point stdev", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fwhm", 0, - "define FWHM in arcsec", NAN); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fwhm_range", 0, - "define FWHM range in arcsec", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fwhm_major", 0, + "define FWHM (major axis; arcsec)", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fwhm_minor", 0, + "define FWHM (minor axis; arcsec)", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-dtime_detrend", 0, + "define elapsed detrend processing time (seconds)", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-dtime_photom", 0, + "define elapsed photometry processing time (seconds)", NAN); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-dtime_astrom", 0, + "define elapsed astrometry processing time (seconds)", NAN); psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_stars", 0, "define number of stars", 0); Index: /trunk/ippTools/src/chiptool.c =================================================================== --- /trunk/ippTools/src/chiptool.c (revision 16247) +++ /trunk/ippTools/src/chiptool.c (revision 16248) @@ -309,19 +309,24 @@ // optional - PXOPT_LOOKUP_STR(uri, config->args, "-uri", false, false); - PXOPT_LOOKUP_F32(bg, config->args, "-bg", false, false); - PXOPT_LOOKUP_F32(bg_stdev, config->args, "-bg_stdev", false, false); - PXOPT_LOOKUP_F32(bg_mean_stdev, config->args, "-bg_mean_stdev", false, false); - PXOPT_LOOKUP_F32(bias, config->args, "-bias", false, false); - PXOPT_LOOKUP_F32(bias_stdev, config->args, "-bias_stdev", false, false); - PXOPT_LOOKUP_F32(fringe_0, config->args, "-fringe_0", false, false); - PXOPT_LOOKUP_F32(fringe_1, config->args, "-fringe_1", false, false); - PXOPT_LOOKUP_F32(fringe_2, config->args, "-fringe_2", false, false); - PXOPT_LOOKUP_F32(sigma_ra, config->args, "-sigma_ra", false, false); - PXOPT_LOOKUP_F32(sigma_dec, config->args, "-sigma_dec", false, false); - PXOPT_LOOKUP_F32(ap_resid, config->args, "-ap_resid", false, false); + PXOPT_LOOKUP_STR(uri, config->args, "-uri", false, false); + PXOPT_LOOKUP_F32(bg, config->args, "-bg", false, false); + PXOPT_LOOKUP_F32(bg_stdev, config->args, "-bg_stdev", false, false); + PXOPT_LOOKUP_F32(bg_mean_stdev, config->args, "-bg_mean_stdev", false, false); + PXOPT_LOOKUP_F32(bias, config->args, "-bias", false, false); + PXOPT_LOOKUP_F32(bias_stdev, config->args, "-bias_stdev", false, false); + PXOPT_LOOKUP_F32(fringe_0, config->args, "-fringe_0", false, false); + PXOPT_LOOKUP_F32(fringe_1, config->args, "-fringe_1", false, false); + PXOPT_LOOKUP_F32(fringe_2, config->args, "-fringe_2", false, false); + PXOPT_LOOKUP_F32(sigma_ra, config->args, "-sigma_ra", false, false); + PXOPT_LOOKUP_F32(sigma_dec, config->args, "-sigma_dec", false, false); + PXOPT_LOOKUP_F32(ap_resid, config->args, "-ap_resid", false, false); PXOPT_LOOKUP_F32(ap_resid_stdev, config->args, "-ap_resid_stdev", false, false); - PXOPT_LOOKUP_F32(fwhm, config->args, "-fwhm", false, false); - PXOPT_LOOKUP_F32(fwhm_range, config->args, "-fwhm_range", false, false); + PXOPT_LOOKUP_F32(zp_mean, config->args, "-zp_mean", false, false); + PXOPT_LOOKUP_F32(zp_stdev, config->args, "-zp_stdev", false, false); + PXOPT_LOOKUP_F32(fwhm_major, config->args, "-fwhm_major", false, false); + PXOPT_LOOKUP_F32(fwhm_minor, config->args, "-fwhm_minor", false, false); + PXOPT_LOOKUP_F32(dtime_detrend, config->args, "-dtime_detrend", false, false); + PXOPT_LOOKUP_F32(dtime_photom, config->args, "-dtime_photom", false, false); + PXOPT_LOOKUP_F32(dtime_astrom, config->args, "-dtime_astrom", false, false); PXOPT_LOOKUP_F32(n_stars, config->args, "-n_stars", false, false); PXOPT_LOOKUP_F32(n_extended, config->args, "-n_extended", false, false); @@ -339,29 +344,34 @@ if (!chipProcessedImfileInsert(config->dbh, - (psS64)atoll(chip_id), - (psS64)atoll(exp_id), - class_id, - uri, - bg, - 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 - )) { + (psS64)atoll(chip_id), + (psS64)atoll(exp_id), + class_id, + uri, + bg, + bg_stdev, + bg_mean_stdev, + bias, + bias_stdev, + fringe_0, + fringe_1, + fringe_2, + sigma_ra, + sigma_dec, + ap_resid, + ap_resid_stdev, + zp_mean, + zp_stdev, + fwhm_major, + fwhm_minor, + dtime_detrend, + dtime_photom, + dtime_astrom, + n_stars, + n_extended, + n_cr, + n_astrom, + path_base, + code + )) { // rollback if (!psDBRollback(config->dbh)) { Index: /trunk/ippTools/src/chiptoolConfig.c =================================================================== --- /trunk/ippTools/src/chiptoolConfig.c (revision 16247) +++ /trunk/ippTools/src/chiptoolConfig.c (revision 16248) @@ -170,5 +170,4 @@ 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); @@ -189,9 +188,18 @@ 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); - + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-zp_mean", 0, + "define zero point", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-zp_stdev", 0, + "define zero point stdev", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fwhm_major", 0, + "define fwhm (major axis; arcsec)", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fwhm_minor", 0, + "define fwhm (minor axis; arcsec)", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-dtime_detrend", 0, + "define elapsed time for detrend (seconds)", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-dtime_photom", 0, + "define elapsed time for photometry (seconds)", NAN); + psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-dtime_astrom", 0, + "define elapsed time for astrometry (seconds)", NAN); psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_stars", 0, "define number of stars in image", 0); Index: /trunk/ippTools/src/difftool.c =================================================================== --- /trunk/ippTools/src/difftool.c (revision 16247) +++ /trunk/ippTools/src/difftool.c (revision 16248) @@ -450,5 +450,6 @@ PXOPT_LOOKUP_F64(bg, config->args, "-bg", false, false); PXOPT_LOOKUP_F64(bg_stdev, config->args, "-bg_stdev", false, false); - PXOPT_LOOKUP_F64(good_frac, config->args, "-good_frac", false, false); + PXOPT_LOOKUP_F32(dtime_diff, config->args, "-dtime_diff", false, false); + PXOPT_LOOKUP_F32(good_frac, config->args, "-good_frac", false, false); if (!psDBTransaction(config->dbh)) { @@ -463,4 +464,5 @@ bg, bg_stdev, + dtime_diff, good_frac, code Index: /trunk/ippTools/src/difftoolConfig.c =================================================================== --- /trunk/ippTools/src/difftoolConfig.c (revision 16247) +++ /trunk/ippTools/src/difftoolConfig.c (revision 16248) @@ -124,5 +124,7 @@ psMetadataAddF64(adddiffskyfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background mean stdev", NAN); - psMetadataAddF64(adddiffskyfileArgs, PS_LIST_TAIL, "-good_frac", 0, + psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-dtime_diff", 0, + "define elapsed processing time", NAN); + psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-good_frac", 0, "define %% of good pixels", NAN); psMetadataAddS16(adddiffskyfileArgs, PS_LIST_TAIL, "-code", 0, Index: /trunk/ippTools/src/stacktool.c =================================================================== --- /trunk/ippTools/src/stacktool.c (revision 16247) +++ /trunk/ippTools/src/stacktool.c (revision 16248) @@ -381,5 +381,6 @@ PXOPT_LOOKUP_F64(bg, config->args, "-bg", false, false); PXOPT_LOOKUP_F64(bg_stdev, config->args, "-bg_stdev", false, false); - PXOPT_LOOKUP_F64(good_frac, config->args, "-good_frac", false, false); + PXOPT_LOOKUP_F32(dtime_stack, config->args, "-dtime_stack", false, false); + PXOPT_LOOKUP_F32(good_frac, config->args, "-good_frac", false, false); // default values @@ -395,12 +396,13 @@ // constrants if (!stackSumSkyfileInsert(config->dbh, - (psS64)atoll(stack_id), - uri, - path_base, - bg, - bg_stdev, - good_frac, - code - )) { + (psS64)atoll(stack_id), + uri, + path_base, + bg, + bg_stdev, + dtime_stack, + good_frac, + code + )) { if (!psDBRollback(config->dbh)) { psError(PS_ERR_UNKNOWN, false, "database error"); Index: /trunk/ippTools/src/stacktoolConfig.c =================================================================== --- /trunk/ippTools/src/stacktoolConfig.c (revision 16247) +++ /trunk/ippTools/src/stacktoolConfig.c (revision 16248) @@ -116,5 +116,7 @@ psMetadataAddF64(addsumskyfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposue background mean stdev", NAN); - psMetadataAddF64(addsumskyfileArgs, PS_LIST_TAIL, "-good_frac", 0, + psMetadataAddF32(addsumskyfileArgs, PS_LIST_TAIL, "-dtime_stack", 0, + "define elapsed processing time", NAN); + psMetadataAddF32(addsumskyfileArgs, PS_LIST_TAIL, "-good_frac", 0, "define %% of good pixels", NAN); psMetadataAddS16(addsumskyfileArgs, PS_LIST_TAIL, "-code", 0, Index: /trunk/ippTools/src/warptool.c =================================================================== --- /trunk/ippTools/src/warptool.c (revision 16247) +++ /trunk/ippTools/src/warptool.c (revision 16248) @@ -735,5 +735,6 @@ PXOPT_LOOKUP_F64(bg, config->args, "-bg", false, false); PXOPT_LOOKUP_F64(bg_stdev, config->args, "-bg_stdev", false, false); - PXOPT_LOOKUP_F64(good_frac, config->args, "-good_frac", false, false); + PXOPT_LOOKUP_F32(dtime_warp, config->args, "-dtime_warp", false, false); + PXOPT_LOOKUP_F32(good_frac, config->args, "-good_frac", false, false); PXOPT_LOOKUP_BOOL(ignore, config->args, "-ignore", false); @@ -750,14 +751,15 @@ // XXX need to validate that this coresponds to an warpInputImfile if (!warpSkyfileInsert(config->dbh, - (psS64)atoll(warp_id), - skycell_id, - tess_id, - uri, - path_base, - bg, - bg_stdev, - good_frac, - ignore, - code + (psS64)atoll(warp_id), + skycell_id, + tess_id, + uri, + path_base, + bg, + bg_stdev, + dtime_warp, + good_frac, + ignore, + code )) { if (!psDBRollback(config->dbh)) { Index: /trunk/ippTools/src/warptoolConfig.c =================================================================== --- /trunk/ippTools/src/warptoolConfig.c (revision 16247) +++ /trunk/ippTools/src/warptoolConfig.c (revision 16248) @@ -175,5 +175,7 @@ psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background stdev", NAN); - psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-good_frac", 0, + psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-dtime_warp", 0, + "define elapsed processing time", NAN); + psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-good_frac", 0, "define %% of good pixels", NAN); psMetadataAddBool(addwarpedArgs, PS_LIST_TAIL, "-ignore", 0,