Index: branches/eam_branches/ipp-20140610/ippconfig/gpc1/ppStack.config =================================================================== --- branches/eam_branches/ipp-20140610/ippconfig/gpc1/ppStack.config (revision 36845) +++ branches/eam_branches/ipp-20140610/ippconfig/gpc1/ppStack.config (revision 36884) @@ -160,5 +160,5 @@ STACK.TYPE STR DEEP_STACK ## needed? PSF.INPUT.CLIP.SIMPLE BOOL True - PSF.INPUT.MAX F32 6.0 # never really want >6 pixels in refstack, even on edges + PSF.INPUT.MAX F32 7.0 # center/edge can vary 1-2 pix, prefer <6 pix but needs to be <7 pix for edges PSF.INPUT.CLIP.NSIGMA F32 1.0 # sample typically on rising side of distribution (set even smaller?) PSF.INPUT.THRESH F32 NAN @@ -168,4 +168,14 @@ PSF.TARGET.AS.MAX BOOL TRUE # Set the target PSF FWHM as the maximum of accepted input FWHM values. PSF.TARGET.AS.MAX.EPSILON F32 0.1 # Amount to set the target PSF FWHM larger than the maximum input. Target = eps + max(input) + THRESHOLD.MASK F32 0.1 # Threshold for mask deconvolution (0..1) + COMBINE.ITER F32 0.5 # Number of rejection iterations per input + COMBINE.REJ F32 3.0 # Rejection threshold in combination (sigma) + COMBINE.SYS F32 0.1 # Relative systematic error in combination + COMBINE.DISCARD F32 0.2 # Discard fraction for Olympic weighted mean + IMAGE.REJ F32 0.1 # Rejected pixel fraction threshold for rejecting entire image + NMINPIX S32 4 # Minimum input per pixel + MASK.VAL STR SUSPECT,MASK.VALUE,CONV.BAD,GHOST # Mask value of input bad pixels + MASK.BLANKBORDER S32 20 # Mask blank border in final stack output + BSCALEOFFSET BOOL TRUE # HACK for removing bscale offset from input warps because of compression (0.5*BSCALE) END @@ -193,4 +203,5 @@ MASK.VAL STR SUSPECT,MASK.VALUE,CONV.BAD,GHOST # Mask value of input bad pixels MASK.BLANKBORDER S32 20 # Mask blank border in final stack output + BSCALEOFFSET BOOL TRUE # HACK for removing bscale offset from input warps because of compression (0.5*BSCALE) END Index: branches/eam_branches/ipp-20140610/ippconfig/gpc1/psastro.config =================================================================== --- branches/eam_branches/ipp-20140610/ippconfig/gpc1/psastro.config (revision 36845) +++ branches/eam_branches/ipp-20140610/ippconfig/gpc1/psastro.config (revision 36884) @@ -122,6 +122,6 @@ # PSASTRO.CATDIR STR SYNTH.GRIZY # PSASTRO.CATDIR STR PS1.REF.20120503 -PSASTRO.CATDIR STR PS1.REF.20120524 - +# PSASTRO.CATDIR STR PS1.REF.20120524 +PSASTRO.CATDIR STR PS1.REF.20140605 DVO.GETSTAR.PHOTCODE STR i @@ -362,6 +362,7 @@ DEFAULT_RECIPE METADATA -# PSASTRO.CATDIR STR PS1.REF.20120503 - PSASTRO.CATDIR STR PS1.REF.20120524 +# PSASTRO.CATDIR STR PS1.REF.20120503 +# PSASTRO.CATDIR STR PS1.REF.20120524 + PSASTRO.CATDIR STR PS1.REF.20140605 ZERO.POINT.USE.MEAN BOOL TRUE END @@ -374,7 +375,8 @@ LAP_ASTRO METADATA # PSASTRO.CATDIR STR 3PI.20110505.REFCAT -# PSASTRO.CATDIR STR SYNTH.GRIZY -# PSASTRO.CATDIR STR PS1.REF.20120503 - PSASTRO.CATDIR STR PS1.REF.20120524 +# PSASTRO.CATDIR STR SYNTH.GRIZY +# PSASTRO.CATDIR STR PS1.REF.20120503 +# PSASTRO.CATDIR STR PS1.REF.20120524 + PSASTRO.CATDIR STR PS1.REF.20140605 ZERO.POINT.USE.MEAN BOOL TRUE END @@ -405,5 +407,6 @@ DVO.GETSTAR.FIXED.ZEROPT F32 25.0 - PSASTRO.CATDIR STR PS1.REF.20120524 + PSASTRO.CATDIR STR PS1.REF.20140605 +# PSASTRO.CATDIR STR PS1.REF.20120524 ZERO.POINT.USE.MEAN BOOL TRUE PSASTRO.MAX.NRAW S32 0 @@ -424,5 +427,6 @@ DVO.GETSTAR.FIXED.ZEROPT F32 25.0 DVO.GETSTAR.MIN.MAG.INST F32 -15.0 - PSASTRO.CATDIR STR PS1.REF.20120524 +# PSASTRO.CATDIR STR PS1.REF.20120524 + PSASTRO.CATDIR STR PS1.REF.20140605 ZERO.POINT.USE.MEAN BOOL TRUE @@ -443,5 +447,6 @@ # - similar to DEEPCAL except for MIN.NSTAR 5 to attemp more edge skycells if poorer STATICSKY_NIGHTCAL METADATA - PSASTRO.CATDIR STR PS1.REF.20120524 # reset here to ensure same catalog is used when reprocessing set uniformly +# PSASTRO.CATDIR STR PS1.REF.20120524 # reset here to ensure same catalog is used when reprocessing set uniformly + PSASTRO.CATDIR STR PS1.REF.20140605 REFSTAR_MASK BOOL FALSE PSASTRO.SAVE.REFMATCH BOOL FALSE @@ -479,5 +484,6 @@ # revised setup for DEEP/MDS stacks with range of inputs, should work for N~2(edges)--500 inputs with large MIN/MAX.INST.MAG.RAW STATICSKY_DEEPCAL METADATA - PSASTRO.CATDIR STR PS1.REF.20120524 # reset here to ensure same catalog is used when reprocessing set uniformly + #PSASTRO.CATDIR STR PS1.REF.20120524 # reset here to ensure same catalog is used when reprocessing set uniformly + PSASTRO.CATDIR STR PS1.REF.20140605 # ensure same catalog is used when reprocessing MD set uniformly REFSTAR_MASK BOOL FALSE PSASTRO.SAVE.REFMATCH BOOL FALSE @@ -498,6 +504,6 @@ DVO.GETSTAR.MAX.RHO F32 6000.0 # N/sqdeg, slightly larger than MAX.NREF DVO.GETSTAR.MIN.MAG.INST F32 -25.0 # set absurd range to cover large range of exptime, then clamp... - DVO.GETSTAR.MIN.MAG F32 15.0 # only used if keyword problem so also using CLAMP_MAG_MIN - REFSTAR_CLAMP_MAG_MIN F32 15.0 # saturation in MD ~14 even in y-band, so toss out brighter in the list + DVO.GETSTAR.MIN.MAG F32 16.5 # only used if keyword problem so also using CLAMP_MAG_MIN + REFSTAR_CLAMP_MAG_MIN F32 16.5 # saturation in MD ~14 even in y-band, so toss out brighter in the list. seeing offset in brighter stars DVO.GETSTAR.FIXED.ZEROPT F32 0.0 # not really needed, exptime overly dominates Index: branches/eam_branches/ipp-20140610/ippconfig/recipes/ppStack.config =================================================================== --- branches/eam_branches/ipp-20140610/ippconfig/recipes/ppStack.config (revision 36845) +++ branches/eam_branches/ipp-20140610/ippconfig/recipes/ppStack.config (revision 36884) @@ -34,4 +34,5 @@ TARGET.MINMAG F32 3.0 # Minimum magnitude difference to tolerate in stamp NMINPIX S32 1 # Minimum input per pixel +BSCALEOFFSET BOOL FALSE # HACK for removing offset from input warps because of compression (0.5*BSCALE) BACKGROUND.MODEL BOOL FALSE # Construct a stacked version of the warp stage background Index: branches/eam_branches/ipp-20140610/ippconfig/recipes/psphot.config =================================================================== --- branches/eam_branches/ipp-20140610/ippconfig/recipes/psphot.config (revision 36845) +++ branches/eam_branches/ipp-20140610/ippconfig/recipes/psphot.config (revision 36884) @@ -15,5 +15,5 @@ # format for output CMF files -OUTPUT.FORMAT STR PS1_V3 +OUTPUT.FORMAT STR PS1_V5 # the zero point is used to set a basic scale for DVO @@ -238,4 +238,6 @@ EXTENDED_SOURCE_MODELS_SELECTION STR ALL + +LENSING_PARAMETERS BOOL FALSE # extended source models applied to sources @@ -492,5 +494,5 @@ RADIAL_APERTURES BOOL T # calculate flux in circular radial apertures? RADIAL_APERTURES_SN_LIM F32 0.0 # S/N limit for radial aperture calculation - OUTPUT.FORMAT STR PS1_SV2 + OUTPUT.FORMAT STR PS1_SV3 # subtract radial profiles for extremely bright stars? @@ -524,5 +526,5 @@ RADIAL_APERTURES BOOL F # calculate flux in circular radial apertures? RADIAL_APERTURES_SN_LIM F32 0.0 # S/N limit for radial aperture calculation - OUTPUT.FORMAT STR PS1_SV1 + OUTPUT.FORMAT STR PS1_SV3 EXT_FIT_MAX_RADIUS F32 50.0 @@ -731,4 +733,4 @@ SAVE.BACKMDL BOOL FALSE SAVE.RESID BOOL FALSE - OUTPUT.FORMAT STR PS1_SV2 -END + OUTPUT.FORMAT STR PS1_SV3 +END