Index: /tags/ipp-20170121/ippconfig/gpc1/psphot.config =================================================================== --- /tags/ipp-20170121/ippconfig/gpc1/psphot.config (revision 40197) +++ /tags/ipp-20170121/ippconfig/gpc1/psphot.config (revision 40198) @@ -50,5 +50,5 @@ BACKGROUND.YBIN S32 128 # size of background superpixels DIFF_STATS BOOL TRUE # Calculate diff-specific stats - OUTPUT.FORMAT STR PS1_DV3 # Format of output file + OUTPUT.FORMAT STR PS1_DV5 # Format of output file PSPHOT.EXT.NSIGMA.LIMIT F32 0.0 @@ -89,4 +89,18 @@ END +SSTF_WS_DIFF METADATA + PSPHOT.EXT.NSIGMA.LIMIT F32 0.0 + PSPHOT.EXT.DIFF.ALTERNATE BOOL TRUE + PSPHOT.EXT.DIFF.ALTERNATE.THRESH F32 1.25 + + PSPHOT.EXT.FIT.ALL.SOURCES BOOL TRUE + PSPHOT.EXT.FIT.ALL.THRESH F32 1000 +# Lower threshold as requested by MOPS + EXTENDED_SOURCE_MODELS METADATA + TYPE EXTENDED_SOURCE_MODEL MODEL SNLIM PSF_CONVOLVED + TRAIL_RAW EXTENDED_SOURCE_MODEL PS_MODEL_TRAIL 4.75 FALSE + END +END + # Recipe overrides for PR reduction PR METADATA Index: /tags/ipp-20170121/ippconfig/recipes/psphot.config =================================================================== --- /tags/ipp-20170121/ippconfig/recipes/psphot.config (revision 40197) +++ /tags/ipp-20170121/ippconfig/recipes/psphot.config (revision 40198) @@ -90,4 +90,7 @@ # calculate difference stats? DIFF_STATS BOOL FALSE + +# add backward chip mapping +CHIP_PARAMS BOOL TRUE # basic object statistics @@ -665,4 +668,7 @@ # Recipe overrides for CHIP CHIP METADATA + ## + PSF_FIT_MODEL_SUM_FRAC_CUT F32 0.5 + PSF_FIT_MASKED_SUM_FRAC_CUT F32 0.1 END @@ -687,5 +693,8 @@ DIFF METADATA DIFF_STATS BOOL TRUE # Calculate diff-specific stats - OUTPUT.FORMAT STR PS1_DV3 # Format of output file + OUTPUT.FORMAT STR PS1_DV5 # Format of output file + + PSF_FIT_MODEL_SUM_FRAC_CUT F32 0.5 + PSF_FIT_MASKED_SUM_FRAC_CUT F32 0.1 # Extended source fit parameters @@ -701,4 +710,28 @@ END +# Recipe overrides for STACK-STACK DIFF +STACK_DIFF METADATA + DIFF_STATS BOOL TRUE # Calculate diff-specific stats + OUTPUT.FORMAT STR PS1_DV5 # Format of output file + + CHIP_PARAMS BOOL FALSE + + PSF_FIT_MODEL_SUM_FRAC_CUT F32 0.5 + PSF_FIT_MASKED_SUM_FRAC_CUT F32 0.1 + + # Extended source fit parameters + # these models are used for high-quality shape analysis after all sources have been removed + EXTENDED_SOURCE_FITS BOOL TRUE # perform the detailed extended sourc fits? + EXT_MODEL STR PS_MODEL_TRAIL + + # extended source models applied to sources + EXTENDED_SOURCE_MODELS METADATA + TYPE EXTENDED_SOURCE_MODEL MODEL SNLIM PSF_CONVOLVED + TRAIL_RAW EXTENDED_SOURCE_MODEL PS_MODEL_TRAIL 10.0 FALSE + END +END + + + # Recipe overrides for DIFF_PV3 DIFF_PV3 METADATA @@ -721,8 +754,8 @@ PEAKS_NSIGMA_LIMIT_2 F32 3.5 # peak significance threshold -- MOPS would like to see 4.0->3.5 since ppMops fixed DIFF_STATS BOOL TRUE # Calculate diff-specific stats - OUTPUT.FORMAT STR PS1_DV3 # Format of output file + OUTPUT.FORMAT STR PS1_DV5 # Format of output file PSF_FIT_MODEL_SUM_FRAC_CUT F32 0.5 - PSF_FIT_MASKED_SUM_FRAC_CUT F32 0.5 + PSF_FIT_MASKED_SUM_FRAC_CUT F32 0.1 # Extended source fit parameters @@ -737,4 +770,25 @@ END END + +SSTF_WS_DIFF METADATA + PEAKS_NSIGMA_LIMIT_2 F32 3.5 # peak significance threshold -- MOPS would like to see 4.0->3.5 since ppMops fixed + DIFF_STATS BOOL TRUE # Calculate diff-specific stats + OUTPUT.FORMAT STR PS1_DV5 # Format of output file + + PSF_FIT_MODEL_SUM_FRAC_CUT F32 0.5 + PSF_FIT_MASKED_SUM_FRAC_CUT F32 0.1 + + # Extended source fit parameters + # these models are used for high-quality shape analysis after all sources have been removed + EXTENDED_SOURCE_FITS BOOL TRUE # perform the detailed extended sourc fits? + EXT_MODEL STR PS_MODEL_TRAIL + + # extended source models applied to sources + EXTENDED_SOURCE_MODELS METADATA + TYPE EXTENDED_SOURCE_MODEL MODEL SNLIM PSF_CONVOLVED + TRAIL_RAW EXTENDED_SOURCE_MODEL PS_MODEL_TRAIL 10.0 FALSE + END +END + # Recipe overrides for PR reduction @@ -805,2 +859,7 @@ OUTPUT.FORMAT STR PS1_V5 END + +CHIP_SHALLOW METADATA + PEAKS_NSIGMA_LIMIT F32 25.0 # peak significance threshold + PEAKS_NSIGMA_LIMIT_2 F32 15.0 # peak significance threshold +END Index: /tags/ipp-20170121/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /tags/ipp-20170121/ippconfig/recipes/reductionClasses.mdc (revision 40197) +++ /tags/ipp-20170121/ippconfig/recipes/reductionClasses.mdc (revision 40198) @@ -444,5 +444,5 @@ STACK_PSPHOT STR STACK DIFF_PPSUB STR WARPSTACK - DIFF_PSPHOT STR SSTF_DIFF + DIFF_PSPHOT STR SSTF_WS_DIFF JPEG_BIN1 STR PPIMAGE_J1 JPEG_BIN2 STR PPIMAGE_J2 @@ -665,8 +665,8 @@ END -# reduction class specifically for warpwarp diffs: +# reduction class specifically for stackstack diffs: STACKSTACK METADATA DIFF_PPSUB STR STACKSTACK - DIFF_PSPHOT STR DIFF + DIFF_PSPHOT STR STACK_DIFF JPEG_BIN1 STR PPIMAGE_J1 JPEG_BIN2 STR PPIMAGE_J2 @@ -1453,4 +1453,28 @@ BACKGROUND_PPBACKGROUND STR BACKGROUND BACKGROUND_PSWARP STR BACKGROUND + PSVIDEOPHOT STR PSVIDEOPHOT + STATICSKY_CALIBRATION STR STATICSKY_CAL +END + +BG_PRESERVE_SHALLOW METADATA + CHIP_PPIMAGE STR CHIP_PRESERVE_BG + CHIP_PSPHOT STR CHIP_SHALLOW + WARP_PSWARP STR WARP + STACK_PPSTACK STR STACK + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK + DIFF_PPSUB STR DIFF + DIFF_PSPHOT STR DIFF + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT + ADDSTAR STR ADDSTAR + PSASTRO STR DEFAULT_RECIPE + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND PSVIDEOPHOT STR PSVIDEOPHOT STATICSKY_CALIBRATION STR STATICSKY_CAL