Index: branches/czw_branch/20100427/ippconfig/recipes/ppStats.config =================================================================== --- trunk/ippconfig/recipes/ppStats.config (revision 27728) +++ branches/czw_branch/20100427/ippconfig/recipes/ppStats.config (revision 27784) @@ -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,10 @@ ANALYSIS STR PSASTRO.HEADER ANALYSIS STR DETREND + +# ANALYSIS STR MASKFRAC_STATIC +# ANALYSIS STR MASKFRAC_MAGIC +# ANALYSIS STR MASKFRAC_ADVISORY +# ANALYSIS STR MASKFRAC_DYNAMIC +# ANALYSIS STR MASKFRAC_NPIX END @@ -103,7 +117,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 +269,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: branches/czw_branch/20100427/ippconfig/recipes/ppStatsFromMetadata.config =================================================================== --- trunk/ippconfig/recipes/ppStatsFromMetadata.config (revision 27728) +++ branches/czw_branch/20100427/ippconfig/recipes/ppStatsFromMetadata.config (revision 27784) @@ -171,4 +171,13 @@ 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 END @@ -230,4 +239,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 +264,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 @@ -261,4 +288,12 @@ 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 END @@ -288,4 +323,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 +355,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 PPSUB_V STR CONSTANT -ver_ppsub + ENTRY VAL STREAK_V STR CONSTANT -ver_streaks END