Index: trunk/ippconfig/gpc1/psastro.config =================================================================== --- trunk/ippconfig/gpc1/psastro.config (revision 37529) +++ trunk/ippconfig/gpc1/psastro.config (revision 37552) @@ -398,4 +398,62 @@ END +CNP_ASTRO_PV3 METADATA + ZERO.POINT.USE.MEAN BOOL TRUE + PSASTRO.MAX.ALLOWED.FWHM F32 25 + PSASTRO.CATDIR STR PS1.REF.20140713 + ZERO.POINT.USE.MEAN BOOL TRUE + PSASTRO.GRID.MIN.ANGLE F32 -20 + PSASTRO.GRID.MAX.ANGLE F32 +20 + PSASTRO.GRID.DEL.ANGLE F32 0.5 + PSASTRO.FIELD.PADDING F32 0.5 + ## -- cannot clamp mag max as may be need for astrom + #REFSTAR_CLAMP_MAG_MAX F32 20.0 +END + +MD_ASTRO_PV3 METADATA + ZERO.POINT.BY.EXPOSURE BOOL TRUE + ZERO.POINT.USE.MEAN BOOL TRUE + DVO.GETSTAR.MAX.RHO F32 3000.0 # was globally changed to 10k, way to much and problem for fainter refcat in MD + PSASTRO.GRID.NREF.MAX S32 800 # max stars accepted for grid search from ref catalog (3-500 typically matched, lose some bright end) + PSASTRO.GRID.NRAW.MAX S32 1200 # max stars accepted for grid search from raw image to account for junk also + DVO.GETSTAR.MIN.MAG F32 12.0 # leave similar to default as MD done in marginal weather and can lose 1-3 mags at times + DVO.GETSTAR.MIN.MAG.INST F32 -25.0 + PSASTRO.CATDIR STR PS1.REF.20140713 + ## refcat may be okay astrom but not phot -- so need to be able to further limit by ZP + ## -- concern w/ new refcat >20 extra sources w/ larger merr over-dominating scatter in ZP + REFSTAR_CLAMP_MAG_MAX F32 20.0 + REFSTAR.ZP.MIN.MAG F32 12.0 + REFSTAR.ZP.MAX.MAG F32 21.0 + ## for ZP need extra clamp by filter to avoid poorer photometry scatter on faint end + ## -- cannot restrict on bright end due to possible marginal nights +# PHOTCODE.DATA MULTI UPDATE + PHOTCODE.DATA MULTI + PHOTCODE.DATA METADATA + FILTER STR g + PHOTCODE STR g + REFSTAR.ZP.MAX.MAG F32 20.0 + END + PHOTCODE.DATA METADATA + FILTER STR r + PHOTCODE STR r + REFSTAR.ZP.MAX.MAG F32 20.0 + END + PHOTCODE.DATA METADATA + FILTER STR i + PHOTCODE STR i + REFSTAR.ZP.MAX.MAG F32 20.0 + END + PHOTCODE.DATA METADATA + FILTER STR z + PHOTCODE STR z + REFSTAR.ZP.MAX.MAG F32 19.5 + END + PHOTCODE.DATA METADATA + FILTER STR y + PHOTCODE STR y + REFSTAR.ZP.MAX.MAG F32 18.0 + END +END + TEST_REFCAT METADATA PSASTRO.CATDIR STR /data/ipp064.0/ipp/ippRefs/catdir.refcat.20120524.v0 @@ -527,7 +585,7 @@ ## if defined for MD, needs to have MD name in group so shouldn't be modified except for MD work -## -- ad hoc limit for NREF due to issues fainter than 19 mag in all filters and brighter than 17.0 mag (except y ~16.5) in MD -## -- better solution and other issues need to really be dealt with for PV3 -STATICSKY_MD_DEEPCAL METADATA +## -- was ad hoc limit for NREF~150, rho~6000 due to issues fainter than 19 mag in all filters and brighter than 17.0 mag (except y ~16.5) in MD +## -- for PV3 add refcat min/max mag REFSTAR.ZP.MIN.MAG for ZP range only +STATICSKY_MD_DEEPCAL_PV3 METADATA PSASTRO.CATDIR STR PS1.REF.20140713 REFSTAR_MASK BOOL FALSE @@ -539,5 +597,5 @@ PSASTRO.FIELD.PADDING F32 0.01 # skycells are well defined, don't need large padding. 1% of 6400 is 64 pixels PSASTRO.MAX.NRAW S32 1500 # include more than MAX.NREF to account for extras like false-positives - PSASTRO.MAX.NREF S32 150 # if edge skycell ~10% then try ~50 to match. increase to help odd bulk offsets + PSASTRO.MAX.NREF S32 500 # if edge skycell ~10% then try ~50 to match. increase to help odd bulk offsets PSASTRO.MIN.INST.MAG.RAW F32 -25.0 # PSASTRO.MAX.INST.MAG.RAW F32 -5.0 @@ -546,6 +604,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 17.0 # only used if keyword problem so also using CLAMP_MAG_MIN - REFSTAR_CLAMP_MAG_MIN F32 17.0 # saturation in MD ~14 even in y-band, so toss out brighter in the list. seeing offset in brighter stars + 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. offset in brighter stars DVO.GETSTAR.FIXED.ZEROPT F32 0.0 # not really needed, exptime overly dominates @@ -559,4 +617,40 @@ PSASTRO.MIN.NSTAR S32 10 # edges may not have many and require special treatment - KH.CORRECT.APPLY BOOL FALSE -END + KH.CORRECT.APPLY BOOL FALSE + + REFSTAR.ZP.MIN.MAG F32 15.0 # general refcat zp min/max setting -- need to use photcode below + REFSTAR.ZP.MAX.MAG F32 19.0 + +# PHOTCODE.DATA MULTI UPDATE + PHOTCODE.DATA MULTI + PHOTCODE.DATA METADATA + FILTER STR g + PHOTCODE STR g + REFSTAR.ZP.MIN.MAG F32 17.0 # + REFSTAR.ZP.MAX.MAG F32 20.0 # + END + PHOTCODE.DATA METADATA + FILTER STR r + PHOTCODE STR r + REFSTAR.ZP.MIN.MAG F32 17.0 # + REFSTAR.ZP.MAX.MAG F32 19.0 # + END + PHOTCODE.DATA METADATA + FILTER STR i + PHOTCODE STR i + REFSTAR.ZP.MIN.MAG F32 17.0 # + REFSTAR.ZP.MAX.MAG F32 19.0 # + END + PHOTCODE.DATA METADATA + FILTER STR z + PHOTCODE STR z + REFSTAR.ZP.MIN.MAG F32 16.0 # + REFSTAR.ZP.MAX.MAG F32 18.0 # + END + PHOTCODE.DATA METADATA + FILTER STR y + PHOTCODE STR y + REFSTAR.ZP.MIN.MAG F32 15.0 # + REFSTAR.ZP.MAX.MAG F32 17.0 # + END +END Index: trunk/ippconfig/recipes/psastro.config =================================================================== --- trunk/ippconfig/recipes/psastro.config (revision 37529) +++ trunk/ippconfig/recipes/psastro.config (revision 37552) @@ -174,4 +174,9 @@ REFSTAR_CLAMP_MAG_MAX F32 30.0 +# restrict ref catalog for zero point determination +# -- can be put into photcode groups as well +REFSTAR.ZP.MAX.MAG F32 30.0 +REFSTAR.ZP.MIN.MAG F32 -3.0 + EXTRACT_MAX_MAG F32 -15.0 @@ -276,4 +281,10 @@ END +CNP_ASTRO_PV3 METADATA +END + +MD_ASTRO_PV3 METADATA +END + SYNTH_CAT METADATA END @@ -301,2 +312,4 @@ END +STATICSKY_MD_DEEPCAL_PV3 METADATA +END Index: trunk/ippconfig/recipes/reductionClasses.mdc =================================================================== --- trunk/ippconfig/recipes/reductionClasses.mdc (revision 37529) +++ trunk/ippconfig/recipes/reductionClasses.mdc (revision 37552) @@ -1311,4 +1311,53 @@ STATICSKY_CALIBRATION STR STATICSKY_CAL END + +CNP_PV3 METADATA + CHIP_PPIMAGE STR CHIP + CHIP_PSPHOT STR CHIP + 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 CNP_ASTRO_PV3 + 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 +END + +MD_PV3 METADATA + CHIP_PPIMAGE STR CHIP + CHIP_PSPHOT STR CHIP + WARP_PSWARP STR WARP + STACK_PPSTACK STR STACK_1DG + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK_!DG + 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 MD_ASTRO_PV3 + 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_MD_DEEPCAL_PV3 +END + # random user tests (may not be stable or consistent)