Index: branches/cnb_branch_20081010/ippconfig/recipes/ppSim.config =================================================================== --- branches/sj_ippTests_branch_20080929/ippconfig/recipes/ppSim.config (revision 19785) +++ branches/cnb_branch_20081010/ippconfig/recipes/ppSim.config (revision 20043) @@ -65,7 +65,5 @@ GALAXY.GRID.DY S32 200 # Spacing between galaxies in grid in y -GALAXY.MODEL STR PS_MODEL_SERSIC - -GALAXY.MODEL STR PS_MODEL_SERSIC +GALAXY.MODEL STR PS_MODEL_GAUSS BADPIX.SEED U64 123456789 # Seed for RNG in creating deterministic bad pixels @@ -145,2 +143,32 @@ END +TEST.SHAPES METADATA + BIAS BOOL FALSE + DARK BOOL FALSE + FLAT BOOL FALSE + SKY BOOL TRUE # Sky illumination rate (e/s) + STARS.REAL BOOL FALSE # Add stars from a catalogue? + STARS.FAKE BOOL FALSE # Add stars from a catalogue? + + GALAXY.FAKE BOOL TRUE # Generate fake galaxies? + GALAXY.GRID BOOL TRUE # Generate a (regular) grid of galaxy models? + GALAXY.GRID.DX S32 500 # Spacing between galaxies in grid in x + GALAXY.GRID.DY S32 500 # Spacing between galaxies in grid in y + + GALAXY.MODEL STR PS_MODEL_GAUSS + + GALAXY.RMAJOR.MIN F32 3.0 # Minimum semi-major axis for galaxy models + GALAXY.RMAJOR.MAX F32 3.0 # Maximum semi-major axis for galaxy models + +# GALAXY.ARATIO.MIN F32 1.0 # Minimum axis ratio for galaxy models +# GALAXY.ARATIO.MAX F32 1.0 # Maximum axis ratio for galaxy models +GALAXY.ARATIO.MIN F32 0.5 # Minimum axis ratio for galaxy models +GALAXY.ARATIO.MAX F32 0.5 # Maximum axis ratio for galaxy models + + GALAXY.INDEX.MIN F32 0.25 # Minimum Sersic index for galaxy models + GALAXY.INDEX.MAX F32 0.25 # Maximum Sersic index for galaxy models + + GALAXY.THETA.MIN F32 1.0 # Minimum position angle for galaxy models + GALAXY.THETA.MAX F32 1.0 # Maximum position angle for galaxy models + +END Index: branches/cnb_branch_20081010/ippconfig/recipes/ppStats.config =================================================================== --- branches/sj_ippTests_branch_20080929/ippconfig/recipes/ppStats.config (revision 19785) +++ branches/cnb_branch_20081010/ippconfig/recipes/ppStats.config (revision 20043) @@ -33,12 +33,41 @@ HEADER STR FWHM_X # major axis FWHM (in pixels) HEADER STR FWHM_Y # minor axis FWHM (in pixels) + + HEADER STR APMIFIT + HEADER STR DAPMIFIT + HEADER STR DT_DET # elapsed time in detrend processing HEADER STR DT_PHOT # elapsed time in photometry processing - HEADER STR DT_ASTR # elapsed time in astrometry processing - HEADER STR APMIFIT - HEADER STR DAPMIFIT - HEADER STR CERROR + HEADER STR NSTARS - HEADER STR NASTRO + HEADER STR NPSFSTAR + HEADER STR IQ_NSTAR + HEADER STR NDET_EXT + HEADER STR NDET_CR + + HEADER STR IQ_M2 + HEADER STR IQ_M2_ER + HEADER STR IQ_M2_LQ + HEADER STR IQ_M2_UQ + + HEADER STR IQ_M2C + HEADER STR IQ_M2C_E + HEADER STR IQ_M2C_L + HEADER STR IQ_M2C_U + + HEADER STR IQ_M2S + HEADER STR IQ_M2S_E + HEADER STR IQ_M2S_L + HEADER STR IQ_M2S_U + + HEADER STR IQ_M3 + HEADER STR IQ_M3_ER + HEADER STR IQ_M3_LQ + HEADER STR IQ_M3_UQ + + HEADER STR IQ_M4 + HEADER STR IQ_M4_ER + HEADER STR IQ_M4_LQ + HEADER STR IQ_M4_UQ ANALYSIS MULTI # metadata blocks to search in chip/cell/readout->analysis @@ -47,4 +76,23 @@ END +# stats for camera-level analysis (astrometry, summary stats) +CAMSTATS METADATA + HEADER MULTI + HEADER STR CERROR + HEADER STR DT_ASTR # elapsed time in astrometry processing + HEADER STR NASTRO + + ANALYSIS MULTI # metadata blocks to search in chip/cell/readout->analysis + ANALYSIS STR PSPHOT.HEADER + ANALYSIS STR PSASTRO.HEADER +END + +# basic stats for output images +DETSTATS METADATA + STAT MULTI + STAT STR ROBUST_MEDIAN + STAT STR ROBUST_STDEV # Background statistics estimators +END + # basic stats for output images DARKSTATS METADATA @@ -54,21 +102,4 @@ STAT STR ROBUST_MEDIAN STAT STR ROBUST_STDEV # Background statistics estimators - - HEADER MULTI - HEADER STR OVER_VAL - HEADER STR FWHM_X # major axis FWHM (in pixels) - HEADER STR FWHM_Y # minor axis FWHM (in pixels) - HEADER STR DT_DET # elapsed time in detrend processing - HEADER STR DT_PHOT # elapsed time in photometry processing - HEADER STR DT_ASTR # elapsed time in astrometry processing - HEADER STR APMIFIT - HEADER STR DAPMIFIT - HEADER STR CERROR - HEADER STR NSTARS - HEADER STR NASTRO - - ANALYSIS MULTI # metadata blocks to search in chip/cell/readout->analysis - ANALYSIS STR PSPHOT.HEADER - ANALYSIS STR PSASTRO.HEADER END @@ -151,4 +182,29 @@ +### ppStats recipe for registration +TIMETEST METADATA + CONCEPT MULTI + + CONCEPT STR FPA.OBJECT # Object name + CONCEPT STR FPA.OBSTYPE # Observation type + CONCEPT STR FPA.FILTER # Filter + CONCEPT STR FPA.RA FPA.DEC # Telescope pointing + + CONCEPT STR FPA.LONGITUDE + CONCEPT STR FPA.LATITUDE + CONCEPT STR FPA.ELEVATION + + CONCEPT STR FPA.COMMENT # Obs Comment + + CONCEPT STR FPA.AIRMASS # Airmass + CONCEPT STR FPA.ALT FPA.AZ # Telescopy alt/az + CONCEPT STR FPA.POSANGLE # Rotator angle + CONCEPT STR FPA.TIME # Time of exposure + CONCEPT STR FPA.TELESCOPE # Telescope (eg, CFHT) + CONCEPT STR FPA.CAMERA # Instrument (eg, CFH12K) + CONCEPT STR CHIP.TEMP # Detector temperature +END + + # basic stats for warped images WARPSTATS METADATA Index: branches/cnb_branch_20081010/ippconfig/recipes/ppStatsFromMetadata.config =================================================================== --- branches/sj_ippTests_branch_20080929/ippconfig/recipes/ppStatsFromMetadata.config (revision 19785) +++ branches/cnb_branch_20081010/ippconfig/recipes/ppStatsFromMetadata.config (revision 20043) @@ -1,6 +1,143 @@ + +CHIP_IMFILE METADATA + ENTRY MULTI + TYPE VAL KEYWORD TYPE STATISTIC FLAG + ENTRY VAL ROBUST_MEDIAN F32 ROBUST_MEDIAN -bg + ENTRY VAL ROBUST_MEDIAN F32 ROBUST_STDEV -bg_mean_stdev + ENTRY VAL ROBUST_STDEV F32 RMS -bg_stdev + ENTRY VAL OVER_VAL F32 ROBUST_MEDIAN -bias + ENTRY VAL OVER_VAL F32 ROBUST_STDEV -bias_stdev + ENTRY VAL FRINGE_0 F32 RMS -fringe_0 + ENTRY VAL FRINGE_RESID_0 F32 RMS -fringe_1 + ENTRY VAL FRINGE_ERR_0 F32 RMS -fringe_2 + ENTRY VAL APMIFIT F32 ROBUST_MEDIAN -ap_resid + ENTRY VAL DAPMIFIT F32 RMS -ap_resid_stdev + ENTRY VAL FWHM_X F32 ROBUST_MEDIAN -fwhm_major + ENTRY VAL FWHM_Y F32 ROBUST_MEDIAN -fwhm_minor + ENTRY VAL DT_DET F32 SUM -dtime_detrend + ENTRY VAL DT_PHOT F32 SUM -dtime_photom + ENTRY VAL DT_TOTAL F32 SUM -dtime_total + + ENTRY VAL NSTARS S32 SUM -n_stars + ENTRY VAL NPSFSTAR S32 SUM -n_psfstars + ENTRY VAL IQ_NSTAR S32 SUM -n_iqstars + ENTRY VAL NDET_EXT S32 SUM -n_extended + ENTRY VAL NDET_CR S32 SUM -n_cr + + # the LQ and UQ values need to be defined for each camera + ENTRY VAL IQ_M2 F32 ROBUST_MEDIAN -iq_m2 + ENTRY VAL IQ_M2_ER F32 RMS -iq_m2_err + ENTRY VAL IQ_M2_LQ F32 SAMPLE_MEAN -iq_m2_uq + ENTRY VAL IQ_M2_UQ F32 SAMPLE_MEAN -iq_m2_lq + + ENTRY VAL IQ_M3 F32 ROBUST_MEDIAN -iq_m3 + ENTRY VAL IQ_M3_ER F32 RMS -iq_m3_err + ENTRY VAL IQ_M3_LQ F32 SAMPLE_MEAN -iq_m3_uq + ENTRY VAL IQ_M3_UQ F32 SAMPLE_MEAN -iq_m3_lq + + ENTRY VAL IQ_M4 F32 ROBUST_MEDIAN -iq_m4 + ENTRY VAL IQ_M4_ER F32 RMS -iq_m4_err + ENTRY VAL IQ_M4_LQ F32 SAMPLE_MEAN -iq_m4_uq + ENTRY VAL IQ_M4_UQ F32 SAMPLE_MEAN -iq_m4_lq + + ENTRY VAL IQ_M2C F32 ROBUST_MEDIAN -iq_m2c + ENTRY VAL IQ_M2C_E F32 RMS -iq_m2c_err + ENTRY VAL IQ_M2C_L F32 SAMPLE_MEAN -iq_m2c_uq + ENTRY VAL IQ_M2C_U F32 SAMPLE_MEAN -iq_m2c_lq + + ENTRY VAL IQ_M2S F32 ROBUST_MEDIAN -iq_m2s + ENTRY VAL IQ_M2S_E F32 RMS -iq_m2s_err + ENTRY VAL IQ_M2S_L F32 SAMPLE_MEAN -iq_m2s_uq + ENTRY VAL IQ_M2S_U F32 SAMPLE_MEAN -iq_m2s_lq +END + +CAMERA_EXP_IMFILE METADATA + ENTRY MULTI + TYPE VAL KEYWORD TYPE STATISTIC FLAG + ENTRY VAL bg F32 ROBUST_MEDIAN -bg + ENTRY VAL bg F32 ROBUST_STDEV -bg_mean_stdev + ENTRY VAL bg_stdev F32 RMS -bg_stdev + ENTRY VAL bias F32 ROBUST_MEDIAN -bias + ENTRY VAL bias_stdev F32 RMS -bias_stdev + ENTRY VAL fringe_0 F32 ROBUST_MEDIAN -fringe_0 + ENTRY VAL fringe_1 F32 RMS -fringe_1 + ENTRY VAL fringe_2 F32 ROBUST_STDEV -fringe_2 + ENTRY VAL ap_resid F32 ROBUST_MEDIAN -ap_resid + ENTRY VAL ap_resid_stdev F32 RMS -ap_resid_stdev + ENTRY VAL fwhm_major F32 ROBUST_MEDIAN -fwhm_major + ENTRY VAL fwhm_minor F32 ROBUST_MEDIAN -fwhm_minor + ENTRY VAL n_stars S32 SUM -n_stars + ENTRY VAL n_psfstars S32 SUM -n_psfstars + ENTRY VAL n_iqstars S32 SUM -n_iqstars + ENTRY VAL n_extended S32 SUM -n_extended + ENTRY VAL n_cr S32 SUM -n_cr + + # the LQ and UQ values need to be defined for each camera + ENTRY VAL iq_m2 F32 ROBUST_MEDIAN -iq_m2 + ENTRY VAL iq_m2_err F32 RMS -iq_m2_err + ENTRY VAL iq_m2 F32 UQ -iq_m2_uq + ENTRY VAL iq_m2 F32 LQ -iq_m2_lq + + ENTRY VAL iq_m3 F32 ROBUST_MEDIAN -iq_m3 + ENTRY VAL iq_m3_err F32 RMS -iq_m3_err + ENTRY VAL iq_m3 F32 UQ -iq_m3_uq + ENTRY VAL iq_m3 F32 LQ -iq_m3_lq + + ENTRY VAL iq_m4 F32 ROBUST_MEDIAN -iq_m4 + ENTRY VAL iq_m4_err F32 RMS -iq_m4_err + ENTRY VAL iq_m4 F32 UQ -iq_m4_uq + ENTRY VAL iq_m4 F32 LQ -iq_m4_lq + + ENTRY VAL iq_m2c F32 ROBUST_MEDIAN -iq_m2c + ENTRY VAL iq_m2c_err F32 RMS -iq_m2c_err + ENTRY VAL iq_m2c F32 UQ -iq_m2c_uq + ENTRY VAL iq_m2c F32 LQ -iq_m2c_lq + + ENTRY VAL iq_m2s F32 ROBUST_MEDIAN -iq_m2s + ENTRY VAL iq_m2s_err F32 RMS -iq_m2s_err + ENTRY VAL iq_m2s F32 UQ -iq_m2s_uq + ENTRY VAL iq_m2s F32 LQ -iq_m2s_lq +END + +CAMERA_EXP_FPA METADATA + ENTRY MULTI + TYPE VAL KEYWORD TYPE STATISTIC FLAG + ENTRY VAL CERROR F32 RMS -sigma_ra + ENTRY VAL CERROR F32 RMS -sigma_dec + ENTRY VAL DT_ASTR F32 SUM -dtime_astrom + ENTRY VAL NASTRO S32 SUM -n_astrom +END + +# values to extract from output metadata and the stats to calculate +# XXX -bg_mean_stdev should take rms of bg_mean_stdev if bg_mean_stdev != 0 (A) +# XXX -bg_mean_stdev should take stdev of bg_mean if bg_mean_stdev == 0 (B) +# XXX (A) if imfile.Ncomp > 1, (B) if imfile.Ncomp == 1 + +DETREND_PROCESS_IMFILE METADATA + ENTRY MULTI + TYPE VAL KEYWORD TYPE STATISTIC FLAG + ENTRY VAL ROBUST_MEDIAN F32 ROBUST_MEDIAN -bg + ENTRY VAL ROBUST_MEDIAN F32 ROBUST_STDEV -bg_mean_stdev + ENTRY VAL ROBUST_STDEV F32 RMS -bg_stdev +END + +DETREND_PROCESS_EXP METADATA + ENTRY MULTI + TYPE VAL KEYWORD TYPE STATISTIC FLAG + ENTRY VAL bg F64 ROBUST_MEDIAN -bg + ENTRY VAL bg F64 ROBUST_STDEV -bg_mean_stdev + ENTRY VAL bg_stdev F64 RMS -bg_stdev +END + +DETREND_STACK METADATA + ENTRY MULTI + TYPE VAL KEYWORD TYPE STATISTIC FLAG + ENTRY VAL ROBUST_MEDIAN F32 ROBUST_MEDIAN -bg + ENTRY VAL ROBUST_MEDIAN F32 ROBUST_STDEV -bg_mean_stdev + ENTRY VAL ROBUST_STDEV F32 RMS -bg_stdev +END DETREND_NORM_EXP METADATA ENTRY MULTI - TYPE VAL KEYWORD TYPE STATISTIC FLAG ENTRY VAL bg F64 ROBUST_MEDIAN -bg @@ -13,7 +150,7 @@ TYPE VAL KEYWORD TYPE STATISTIC FLAG - ENTRY VAL ROBUST_MEDIAN F64 ROBUST_MEDIAN -bg - ENTRY VAL ROBUST_MEDIAN F64 ROBUST_STDEV -bg_mean_stdev - ENTRY VAL ROBUST_STDEV F64 RMS -bg_stdev + ENTRY VAL ROBUST_MEDIAN F32 ROBUST_MEDIAN -bg + ENTRY VAL ROBUST_MEDIAN F32 ROBUST_STDEV -bg_mean_stdev + ENTRY VAL ROBUST_STDEV F32 RMS -bg_stdev END @@ -47,5 +184,5 @@ TYPE VAL KEYWORD TYPE STATISTIC FLAG ENTRY VAL bg F64 ROBUST_MEDIAN -bg - ENTRY VAL bg_mean_stdev F64 ROBUST_STDEV -bg_mean_stdev + ENTRY VAL bg F64 ROBUST_STDEV -bg_mean_stdev ENTRY VAL bg_stdev F64 RMS -bg_stdev ENTRY VAL bg_skewness F64 ROBUST_MEDIAN -bg_skewness Index: branches/cnb_branch_20081010/ippconfig/recipes/psphot.config =================================================================== --- branches/sj_ippTests_branch_20080929/ippconfig/recipes/psphot.config (revision 19785) +++ branches/cnb_branch_20081010/ippconfig/recipes/psphot.config (revision 20043) @@ -49,6 +49,6 @@ MOMENTS_SCALE F32 0.25 MOMENTS_SN_MIN F32 100.0 # min S/N to measure moments -MOMENTS_SX_MAX F32 5.0 -MOMENTS_SY_MAX F32 5.0 +MOMENTS_SX_MAX F32 50.0 +MOMENTS_SY_MAX F32 50.0 MOMENTS_AR_MAX F32 1.5 # maximum axial ratio: 1 / AR < (sx / sy) < AR @@ -60,4 +60,8 @@ PSF_MAX_NSTARS S32 200 # limit number of stars used for PSF model PSF_CLUMP_NSIGMA F32 1.5 # region of Sx,Sy plane to use for selecting PSF stars + +PSF_CLUMP_NX S32 1 # subdivide image in to NX x NY regions for +PSF_CLUMP_NY S32 1 # selecting PSF stars + PSF_MIN_DS F32 0.01 PSF_PARAM_WEIGHTS BOOL FALSE @@ -83,7 +87,7 @@ END # folder for 2D polynomial -PSF.TREND.MODE STR POLY_ORD -PSF.TREND.NX S32 0 -PSF.TREND.NY S32 0 +PSF.TREND.MODE STR MAP +PSF.TREND.NX S32 1 +PSF.TREND.NY S32 1 PSF.FAKE.ALLOW BOOL FALSE # Allow use of fake PSFs when having trouble? @@ -115,5 +119,5 @@ EXT_FIT_NSIGMA F32 1 # significance for pixel included in fit EXT_FIT_PADDING F32 5 # extra annulus to use for fit -EXT_MOMENTS_RADIUS F32 9 +EXT_MOMENTS_RADIUS F32 31 EXT_FIT_ITER S32 20 # Maximum number of fitting iterations for EXT