Index: trunk/ippconfig/gpc1/camera.config =================================================================== --- trunk/ippconfig/gpc1/camera.config (revision 28020) +++ trunk/ippconfig/gpc1/camera.config (revision 28043) @@ -150,4 +150,7 @@ PHOTCODE.RULE STR {DETECTOR}.{FILTER.ID}.{CHIP.NAME} # Rule for generating photcode -BURNTOOL.STATE.GOOD S16 14 # Value for burntool_state with the most recent bt version. -BURNTOOL.STATE.GOOD.UPDATE S16 13 # for upddate processing accept earlier version +BURNTOOL.STATE.GOOD S16 14 # Value for burntool_state with the most recent bt version. +BURNTOOL.STATE.GOOD.UPDATE S16 13 # for upddate processing accept earlier version + +FOV F32 15000 # Field of view of unvignetted region in FPA pixels. +NPIX_INTERCHIP S32 0 Index: trunk/ippconfig/recipes/ppImage.config =================================================================== --- trunk/ippconfig/recipes/ppImage.config (revision 28020) +++ trunk/ippconfig/recipes/ppImage.config (revision 28043) @@ -35,5 +35,5 @@ USE.BEST.BURNTOOL BOOL FALSE # require the best burntooled data TILTYSTREAK.APPLY BOOL FALSE # apply the 'tiltystreak' tool - +MASK.STATS BOOL FALSE # calculate mask statistics. GAIN.OVERRIDE BOOL TRUE # Override a non-finite gain? @@ -67,4 +67,9 @@ # Which regions identified by burntool to mask. 0x01 : only unfit trails, 0x02 "up" trails, 0x04 "down" trails BURNTOOL.TRAILS U16 0x07 + +MASKSTAT.STATIC U32 0x01f +MASKSTAT.DYNAMIC U32 0x060 +MASKSTAT.MAGIC U32 0x800 +MASKSTAT.ADVISORY U32 0x080 # Non-linearity correction @@ -169,4 +174,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? + MASK.STATS BOOL TRUE # Calculate Mask statistics. END @@ -1822,4 +1828,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL FALSE # Subtract background? + MASK.STATS BOOL TRUE # Calculate Mask statistics END @@ -1846,4 +1853,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? + MASK.STATS BOOL TRUE # Calculate Mask statistics END @@ -1870,4 +1878,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? + MASK.STATS BOOL TRUE # Calculate Mask statistics PATTERN.ROW BOOL TRUE # Subtract pattern noise PATTERN.CELL BOOL FALSE # Subtract pattern noise Index: trunk/ippconfig/recipes/ppStats.config =================================================================== --- trunk/ippconfig/recipes/ppStats.config (revision 28020) +++ trunk/ippconfig/recipes/ppStats.config (revision 28043) @@ -85,4 +85,12 @@ HEADER STR IQ_M4_UQ + HEADER STR PSLIB_V + HEADER STR MODULE_V + HEADER STR PHOT_V + HEADER STR ASTRO_V + HEADER STR STATS_V + HEADER STR IMAGE_V + HEADER STR STREAK_V + HEADER STR DETREND.MASK DETREND.BIAS DETREND.DARK DETREND.SHUTTER DETREND.FLAT DETREND.FRINGE @@ -91,4 +99,11 @@ ANALYSIS STR PSASTRO.HEADER ANALYSIS STR DETREND + + SUMMARY STR MASKFRAC_STATIC + SUMMARY STR MASKFRAC_MAGIC + SUMMARY STR MASKFRAC_ADVISORY + SUMMARY STR MASKFRAC_DYNAMIC + SUMMARY STR MASKFRAC_NPIX + END @@ -103,7 +118,21 @@ HEADER STR ZPT_ERR + HEADER STR PSLIB_V + HEADER STR MODULE_V + HEADER STR PHOT_V + HEADER STR ASTRO_V + HEADER STR STATS_V + HEADER STR IMAGE_V + HEADER STR STREAK_V + ANALYSIS MULTI # metadata blocks to search in chip/cell/readout->analysis ANALYSIS STR PSPHOT.HEADER ANALYSIS STR PSASTRO.HEADER + + ANALYSIS STR MASKFRAC_STATIC + ANALYSIS STR MASKFRAC_MAGIC + ANALYSIS STR MASKFRAC_ADVISORY + ANALYSIS STR MASKFRAC_DYNAMIC + ANALYSIS STR MASKFRAC_NPIX END @@ -241,7 +270,75 @@ SUMMARY MULTI + HEADER STR PSLIB_V + HEADER STR MODULE_V + HEADER STR PHOT_V + HEADER STR STATS_V + HEADER STR WARP_V + HEADER STR STREAK_V + STAT STR ROBUST_MEDIAN STAT STR ROBUST_STDEV # Background statistics estimators SUMMARY STR GOOD_PIXEL_NUM # Number of good pixels SUMMARY STR GOOD_PIXEL_FRAC # Fraction of good pixels -END + + ANALYSIS MULTI + ANALYSIS STR MASKFRAC_STATIC + ANALYSIS STR MASKFRAC_MAGIC + ANALYSIS STR MASKFRAC_ADVISORY + ANALYSIS STR MASKFRAC_DYNAMIC + ANALYSIS STR MASKFRAC_NPIX +END + +# Based on WARPSTATS +# basic stats for stacked images +STACKSTATS METADATA + HEADER MULTI + CONCEPT MULTI + STAT MULTI + SUMMARY MULTI + + HEADER STR PSLIB_V + HEADER STR MODULE_V + HEADER STR PHOT_V + HEADER STR STATS_V + HEADER STR STACK_V + + STAT STR ROBUST_MEDIAN + STAT STR ROBUST_STDEV # Background statistics estimators + SUMMARY STR GOOD_PIXEL_NUM # Number of good pixels + SUMMARY STR GOOD_PIXEL_FRAC # Fraction of good pixels + + ANALYSIS MULTI + ANALYSIS STR MASKFRAC_STATIC + ANALYSIS STR MASKFRAC_MAGIC + ANALYSIS STR MASKFRAC_ADVISORY + ANALYSIS STR MASKFRAC_DYNAMIC + ANALYSIS STR MASKFRAC_NPIX +END + +# basic stats for diffed images +DIFFSTATS METADATA + HEADER MULTI + CONCEPT MULTI + STAT MULTI + SUMMARY MULTI + + HEADER STR PSLIB_V + HEADER STR MODULE_V + HEADER STR PHOT_V + HEADER STR STATS_V + HEADER STR PPSUB_V + HEADER STR STREAK_V + + STAT STR ROBUST_MEDIAN + STAT STR ROBUST_STDEV # Background statistics estimators + SUMMARY STR GOOD_PIXEL_NUM # Number of good pixels + SUMMARY STR GOOD_PIXEL_FRAC # Fraction of good pixels + + ANALYSIS MULTI + ANALYSIS STR MASKFRAC_STATIC + ANALYSIS STR MASKFRAC_MAGIC + ANALYSIS STR MASKFRAC_ADVISORY + ANALYSIS STR MASKFRAC_DYNAMIC + ANALYSIS STR MASKFRAC_NPIX +END Index: trunk/ippconfig/recipes/ppStatsFromMetadata.config =================================================================== --- trunk/ippconfig/recipes/ppStatsFromMetadata.config (revision 28020) +++ trunk/ippconfig/recipes/ppStatsFromMetadata.config (revision 28043) @@ -171,4 +171,20 @@ ENTRY VAL IQ_M2S_U F32 SAMPLE_MEAN -iq_m2s_uq ENTRY VAL QUALITY S32 CONSTANT -quality # Bad quality flag + + # Revision values + ENTRY VAL PSLIB_V STR CONSTANT -ver_pslib + ENTRY VAL MODULE_V STR CONSTANT -ver_psmodules + ENTRY VAL PHOT_V STR CONSTANT -ver_psphot + ENTRY VAL ASTRO_V STR CONSTANT -ver_psastro + ENTRY VAL STATS_V STR CONSTANT -ver_ppstats + ENTRY VAL IMAGE_V STR CONSTANT -ver_ppimage + ENTRY VAL STREAK_V STR CONSTANT -ver_streaks + + # Mask stats values + ENTRY VAL MASKFRAC_NPIX S32 CONSTANT -maskfrac_npix + ENTRY VAL MASKFRAC_STATIC F32 CONSTANT -maskfrac_static + ENTRY VAL MASKFRAC_DYNAMIC F32 CONSTANT -maskfrac_dynamic + ENTRY VAL MASKFRAC_MAGIC F32 CONSTANT -maskfrac_magic + ENTRY VAL MASKFRAC_ADVISORY F32 CONSTANT -maskfrac_advisory END @@ -230,4 +246,13 @@ ENTRY VAL QUALITY S32 CONSTANT -quality # Bad quality flag + + # Revision values + ENTRY VAL PSLIB_V STR CONSTANT -ver_pslib + ENTRY VAL MODULE_V STR CONSTANT -ver_psmodules + ENTRY VAL PHOT_V STR CONSTANT -ver_psphot + ENTRY VAL ASTRO_V STR CONSTANT -ver_psastro + ENTRY VAL STATS_V STR CONSTANT -ver_ppstats + ENTRY VAL IMAGE_V STR CONSTANT -ver_ppimage + ENTRY VAL STREAK_V STR CONSTANT -ver_streaks END @@ -246,4 +271,20 @@ ENTRY VAL QUALITY S32 CONSTANT -quality # Bad quality flag + + # Revision values + ENTRY VAL PSLIB_V STR CONSTANT -ver_pslib + ENTRY VAL MODULE_V STR CONSTANT -ver_psmodules + ENTRY VAL PHOT_V STR CONSTANT -ver_psphot + ENTRY VAL ASTRO_V STR CONSTANT -ver_psastro + ENTRY VAL STATS_V STR CONSTANT -ver_ppstats + ENTRY VAL IMAGE_V STR CONSTANT -ver_ppimage + ENTRY VAL STREAK_V STR CONSTANT -ver_streaks + + # Mask stats values + ENTRY VAL MASKFRAC_NPIX S32 CONSTANT -maskfrac_npix + ENTRY VAL MASKFRAC_STATIC F32 CONSTANT -maskfrac_static + ENTRY VAL MASKFRAC_DYNAMIC F32 CONSTANT -maskfrac_dynamic + ENTRY VAL MASKFRAC_MAGIC F32 CONSTANT -maskfrac_magic + ENTRY VAL MASKFRAC_ADVISORY F32 CONSTANT -maskfrac_advisory END @@ -261,4 +302,20 @@ ENTRY VAL ACCEPT BOOL CONSTANT -accept ENTRY VAL QUALITY S32 CONSTANT -quality # Bad quality flag + + # Revision values + ENTRY VAL PSLIB_V STR CONSTANT -ver_pslib + ENTRY VAL MODULE_V STR CONSTANT -ver_psmodules + ENTRY VAL PHOT_V STR CONSTANT -ver_psphot + ENTRY VAL STATS_V STR CONSTANT -ver_ppstats + ENTRY VAL WARP_V STR CONSTANT -ver_pswarp + ENTRY VAL STREAK_V STR CONSTANT -ver_streaks + + # Mask stats values + ENTRY VAL MASKFRAC_NPIX S32 CONSTANT -maskfrac_npix + ENTRY VAL MASKFRAC_STATIC F32 CONSTANT -maskfrac_static + ENTRY VAL MASKFRAC_DYNAMIC F32 CONSTANT -maskfrac_dynamic + ENTRY VAL MASKFRAC_MAGIC F32 CONSTANT -maskfrac_magic + ENTRY VAL MASKFRAC_ADVISORY F32 CONSTANT -maskfrac_advisory + END @@ -288,4 +345,12 @@ ENTRY VAL GOOD_PIXEL_FRAC F32 MEAN -good_frac ENTRY VAL QUALITY S32 CONSTANT -quality # Bad quality flag + + # Revision values + ENTRY VAL PSLIB_V STR CONSTANT -ver_pslib + ENTRY VAL MODULE_V STR CONSTANT -ver_psmodules + ENTRY VAL PHOT_V STR CONSTANT -ver_psphot + ENTRY VAL STATS_V STR CONSTANT -ver_ppstats + ENTRY VAL STACK_V STR CONSTANT -ver_ppstack + ENTRY VAL STREAK_V STR CONSTANT -ver_streaks END @@ -312,4 +377,19 @@ ENTRY VAL GOOD_PIXEL_FRAC F32 MEAN -good_frac ENTRY VAL QUALITY S32 CONSTANT -quality # Bad quality flag + + # Revision values + ENTRY VAL PSLIB_V STR CONSTANT -ver_pslib + ENTRY VAL MODULE_V STR CONSTANT -ver_psmodules + ENTRY VAL PHOT_V STR CONSTANT -ver_psphot + ENTRY VAL STATS_V STR CONSTANT -ver_ppstats + ENTRY VAL PPSUB_V STR CONSTANT -ver_ppsub + ENTRY VAL STREAK_V STR CONSTANT -ver_streaks + + # Mask stats values + ENTRY VAL MASKFRAC_NPIX S32 CONSTANT -maskfrac_npix + ENTRY VAL MASKFRAC_STATIC F32 CONSTANT -maskfrac_static + ENTRY VAL MASKFRAC_DYNAMIC F32 CONSTANT -maskfrac_dynamic + ENTRY VAL MASKFRAC_MAGIC F32 CONSTANT -maskfrac_magic + ENTRY VAL MASKFRAC_ADVISORY F32 CONSTANT -maskfrac_advisory END Index: trunk/ippconfig/recipes/ppSub.config =================================================================== --- trunk/ippconfig/recipes/ppSub.config (revision 28020) +++ trunk/ippconfig/recipes/ppSub.config (revision 28043) @@ -21,4 +21,11 @@ MASK.BAD STR CONV.BAD # Mask value to give bad pixels MASK.POOR STR CONV.POOR # Mask value to give poor pixels + +MASK.STATS BOOL TRUE # calculate mask statistics. +MASKSTAT.STATIC U32 0x01f +MASKSTAT.DYNAMIC U32 0x060 +MASKSTAT.MAGIC U32 0x800 +MASKSTAT.ADVISORY U32 0x080 + LOW.THRESHOLD F32 4.0 # Mask pixels below this threshold (std dev) Index: trunk/ippconfig/recipes/psastro.config =================================================================== --- trunk/ippconfig/recipes/psastro.config (revision 28020) +++ trunk/ippconfig/recipes/psastro.config (revision 28043) @@ -163,4 +163,12 @@ EXTRACT_MAX_MAG F32 -15.0 +MASK.STATS BOOL TRUE +MASKSTAT.STATIC U32 0x01f +MASKSTAT.DYNAMIC U32 0x060 +MASKSTAT.MAGIC U32 0x800 +MASKSTAT.ADVISORY U32 0x080 + + + # 2MASS default configuration (use 2MASS_J as ref magnitude) PSASTRO.CATDIR STR 2MASS Index: trunk/ippconfig/recipes/pswarp.config =================================================================== --- trunk/ippconfig/recipes/pswarp.config (revision 28020) +++ trunk/ippconfig/recipes/pswarp.config (revision 28043) @@ -12,4 +12,11 @@ PSF BOOL TRUE # Measure PSF for warped image? +MASK.STATS BOOL TRUE # calculate mask statistics. +MASKSTAT.STATIC U32 0x01f +MASKSTAT.DYNAMIC U32 0x060 +MASKSTAT.MAGIC U32 0x800 +MASKSTAT.ADVISORY U32 0x080 + + # Default recipe for warping WARP METADATA