Index: /tags/ipp-mdpv3-20141104/ippconfig/gpc1/ppStack.config =================================================================== --- /tags/ipp-mdpv3-20141104/ippconfig/gpc1/ppStack.config (revision 37615) +++ /tags/ipp-mdpv3-20141104/ippconfig/gpc1/ppStack.config (revision 37616) @@ -277,4 +277,165 @@ + + +STACK_CNP_PV3_IQ_1DG METADATA ## revised -- based on STACK_THREEPI/STACK_MD_DEEP_1DG -- not complete + OUTPUT.NOCOMP BOOL FALSE + OUTPUT.LOGFLUX BOOL TRUE + STACK.TYPE STR DEEP_STACK + PSF.INPUT.CLIP.SIMPLE BOOL True + PSF.INPUT.MAX F32 10.0 # + PSF.INPUT.CLIP.NSIGMA F32 100.0 + PSF.INPUT.THRESH F32 NAN + PSF.INPUT.ASYMMETRY F32 NAN + MATCH.REJ F32 4.0 + SAFE BOOL F + PSF.TARGET.AS.MAX.EPSILON F32 0.1 + ## also unclear what rej mods needed + ## + 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 FALSE # MUST be FALSE for PV3 +END + +STACK_CNP_PV3_REF_1DG METADATA ## revised CNP PV3 REF stack -- not complete + OUTPUT.NOCOMP BOOL TRUE # unclear if this necessary for CNP REF + OUTPUT.LOGFLUX BOOL FALSE # + OUTPUT.REPLICATE BOOL TRUE + STACK.TYPE STR DEEP_STACK + PSF.INPUT.CLIP.SIMPLE BOOL True + PSF.INPUT.MAX F32 10.0 # CNP large FWHM, center/edge vary 1-2 pix? + PSF.INPUT.CLIP.NSIGMA F32 1.0 # sample typically on rising side of distribution (set smaller?) + PSF.INPUT.THRESH F32 NAN + PSF.INPUT.ASYMMETRY F32 NAN + MATCH.REJ F32 4.0 # need ot tune? + SAFE BOOL FALSE + 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 # set the target PSF FWHM larger than the maximum input. Target = eps + max(input) + ## extra rej -- turn default for initial test run + #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 FALSE # MUST be FALSE for PV3 +END + +STACK_CNP_PV3_DEEP_1DG METADATA ## -- not complete + 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 FALSE # MUST be FALSE for PV3 +END + + +STACK_MD_PV3_NIGHT_1DG METADATA ## Revised MD 8 input NIGHT stacks for PV3 -- not complete + OUTPUT.NOCOMP BOOL FALSE + OUTPUT.LOGFLUX BOOL FALSE + PSF.INPUT.CLIP.SIMPLE BOOL True + PSF.INPUT.MAX F32 12.0 # what FWHM does diffim become mostly useless, if any? + PSF.INPUT.CLIP.NSIGMA F32 1000.0 # want to use up to MAX, but sig could possibly be small? + PSF.INPUT.THRESH F32 NAN + PSF.INPUT.ASYMMETRY F32 NAN + MATCH.REJ F32 4.0 # need ot tune? + SAFE BOOL FALSE + ## + 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 FALSE # MUST be FALSE for PV3 +END + +STACK_MD_PV3_IQ_1DG METADATA ## revised config for MD PV3 IQ stacks -- not complete + OUTPUT.NOCOMP BOOL TRUE + OUTPUT.LOGFLUX BOOL FALSE + OUTPUT.REPLICATE BOOL TRUE + STACK.TYPE STR DEEP_STACK ## needed? + PSF.INPUT.CLIP.SIMPLE BOOL True + PSF.INPUT.MAX F32 10.0 # center/edge can vary 1-2 pix, prefer <6 pix but needs to be <10 pix for edges until code improved.. + PSF.INPUT.CLIP.NSIGMA F32 100.0 # any change to inputs can greatly impact edge filling factor.. + PSF.INPUT.THRESH F32 NAN + PSF.INPUT.ASYMMETRY F32 NAN + MATCH.REJ F32 4.0 # need ot tune? + SAFE BOOL FALSE + 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 FALSE # MUST be FALSE for PV3 +END + +STACK_MD_PV3_REF_1DG METADATA ## revised config for MD PV3 refstacks -- not complete + OUTPUT.NOCOMP BOOL TRUE + OUTPUT.LOGFLUX BOOL FALSE + OUTPUT.REPLICATE BOOL TRUE + STACK.TYPE STR DEEP_STACK ## needed? + PSF.INPUT.CLIP.SIMPLE BOOL True + 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 + PSF.INPUT.ASYMMETRY F32 NAN + MATCH.REJ F32 4.0 # need ot tune? + SAFE BOOL FALSE + 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 FALSE # MUST be FALSE for PV3 +END + +STACK_MD_PV3_DEEP_1DG METADATA ## revised config for MD PV3 deepstack -- not complete + OUTPUT.NOCOMP BOOL TRUE + OUTPUT.LOGFLUX BOOL FALSE + OUTPUT.REPLICATE BOOL TRUE + STACK.TYPE STR DEEP_STACK + PSF.INPUT.CLIP.SIMPLE BOOL True + PSF.INPUT.MAX F32 10.0 # + PSF.INPUT.CLIP.NSIGMA F32 100.0 + PSF.INPUT.THRESH F32 NAN + PSF.INPUT.ASYMMETRY F32 NAN + MATCH.REJ F32 4.0 # need ot tune? + SAFE BOOL FALSE + PSF.TARGET.AS.MAX BOOL TRUE + PSF.TARGET.AS.MAX.EPSILON F32 0.1 + 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 30 # 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 FALSE # MUST be FALSE for PV3 +END + + + # Recipe overrides for STACK STACKPHOT METADATA Index: /tags/ipp-mdpv3-20141104/ippconfig/gpc1/psastro.config =================================================================== --- /tags/ipp-mdpv3-20141104/ippconfig/gpc1/psastro.config (revision 37615) +++ /tags/ipp-mdpv3-20141104/ippconfig/gpc1/psastro.config (revision 37616) @@ -407,5 +407,5 @@ DVO.GETSTAR.MAX.RHO F32 5000.0 # globally changed to 10k, huge numbers in soln and larger sigma DVO.GETSTAR.MIN.MAG F32 8.0 # can go brighter in marginal nights (like MD done every night as possible) - PSASTRO.GRID.NREF.MAX S32 1600 # defaults for now + PSASTRO.GRID.NREF.MAX S32 1600 # defaults PSASTRO.GRID.NRAW.MAX S32 800 PSASTRO.MIN.INST.MAG.RAW F32 -15.0 # min instrumental magnitude for stars accepted for fitting @@ -420,5 +420,5 @@ REFSTAR_CLAMP_MAG_MAX F32 20.0 REFSTAR.ZP.MIN.MAG F32 8.0 - REFSTAR.ZP.MAX.MAG F32 20.0 + REFSTAR.ZP.MAX.MAG F32 19.0 ## for ZP need extra restriction by filter to avoid poorer photometry scatter on faint end ## -- ZP is by exposure so can easily reduce numbers @@ -457,16 +457,16 @@ ZERO.POINT.BY.EXPOSURE BOOL TRUE ZERO.POINT.USE.MEAN BOOL TRUE - DVO.GETSTAR.MAX.RHO F32 6000.0 # was globally changed to 10k, problem w/ fainter refcat sources in MD - PSASTRO.GRID.NREF.MAX S32 1000 # max stars for grid search from ref catalog (5-600 typically matched, some brighter lost) - PSASTRO.GRID.NRAW.MAX S32 1200 # max stars for grid search from raw image (account for junk?),limited by NRAW.MAX to 1k? + DVO.GETSTAR.MAX.RHO F32 6000.0 # was globally changed to 10k + PSASTRO.GRID.NREF.MAX S32 1600 # max stars for grid search from ref catalog + PSASTRO.GRID.NRAW.MAX S32 800 # max stars for grid search from raw/image DVO.GETSTAR.MIN.MAG F32 12.0 # leave similar to default, MD in marginal weather and can lose 1-3 mags 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 + ## refcat may be okay astrom but not faint 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 ## -- CLAMP will limit both astrom and zp -- - REFSTAR_CLAMP_MAG_MAX F32 20.0 + REFSTAR_CLAMP_MAG_MAX F32 22.0 REFSTAR.ZP.MIN.MAG F32 12.0 - REFSTAR.ZP.MAX.MAG F32 20.0 + REFSTAR.ZP.MAX.MAG F32 19.0 ## for ZP need extra limit by filter to avoid poorer photometry scatter on faint end ## -- cannot restrict on bright end due to possible marginal nights @@ -500,4 +500,5 @@ END END + TEST_REFCAT METADATA @@ -632,5 +633,5 @@ ## -- 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 +STATICSKY_MD_PV3_DEEPCAL METADATA PSASTRO.CATDIR STR PS1.REF.20140713 REFSTAR_MASK BOOL FALSE Index: /tags/ipp-mdpv3-20141104/ippconfig/recipes/ppStack.config =================================================================== --- /tags/ipp-mdpv3-20141104/ippconfig/recipes/ppStack.config (revision 37615) +++ /tags/ipp-mdpv3-20141104/ippconfig/recipes/ppStack.config (revision 37616) @@ -169,4 +169,5 @@ STACK_THREEPI_ALT METADATA END + STACK_CNP METADATA END @@ -199,4 +200,28 @@ STACK_MDTHREEPI_DEEP_1DG METADATA END + +STACK_MD_PV3_IQ_1DG METADATA +END + +STACK_MD_PV3_REF_1DG METADATA +END + +STACK_MD_PV3_DEEP_1DG METADATA +END + +STACK_MD_PV3_NIGHT_1DG METADATA + STACK.TYPE STR NIGHTLY_STACK +END + +STACK_CNP_PV3_IQ_1DG METADATA +END + +STACK_CNP_PV3_REF_1DG METADATA +END + +STACK_CNP_PV3_DEEP_1DG METADATA +END + + Index: /tags/ipp-mdpv3-20141104/ippconfig/recipes/psastro.config =================================================================== --- /tags/ipp-mdpv3-20141104/ippconfig/recipes/psastro.config (revision 37615) +++ /tags/ipp-mdpv3-20141104/ippconfig/recipes/psastro.config (revision 37616) @@ -312,4 +312,4 @@ END -STATICSKY_MD_DEEPCAL_PV3 METADATA -END +STATICSKY_MD_PV3_DEEPCAL METADATA +END Index: /tags/ipp-mdpv3-20141104/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /tags/ipp-mdpv3-20141104/ippconfig/recipes/reductionClasses.mdc (revision 37615) +++ /tags/ipp-mdpv3-20141104/ippconfig/recipes/reductionClasses.mdc (revision 37616) @@ -1,3 +1,3 @@ -# These reduction classes define recipes that go together as a group + These reduction classes define recipes that go together as a group DETREND METADATA @@ -716,4 +716,83 @@ STATICSKY_CALIBRATION STR STATICSKY_MD_DEEPCAL END + +## MD stacks -- PV3 version (NO bscale correction and other changes) +MD_PV3_NIGHT_STACK_1DG METADATA + STACK_PPSTACK STR STACK_MD_PV3_NIGHT_1DG + STACK_PPSUB STR STACK_1DG + STACK_PSPHOT STR STACK + STACKPHOT_PSPHOT STR STACKPHOT + STATICSKY_CALIBRATION STR STATICSKY_NIGHTCAL +END + +MD_PV3_IQ_STACK_1DG METADATA + STACK_PPSTACK STR STACK_MD_PV3_IQ_1DG + STACK_PPSUB STR STACK_1DG + STACK_PSPHOT STR STACK + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT_1DG + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + STATICSKY_CALIBRATION STR STATICSKY_MD_PV3_DEEPCAL +END + +MD_PV3_REF_STACK_1DG METADATA + STACK_PPSTACK STR STACK_MD_PV3_REF_1DG + STACK_PPSUB STR STACK_1DG + STACK_PSPHOT STR STACK + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT_1DG + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + STATICSKY_CALIBRATION STR STATICSKY_MD_PV3_DEEPCAL +END + +MD_PV3_DEEP_STACK_1DG METADATA + STACK_PPSTACK STR STACK_MD_PV3_DEEP_1DG + STACK_PPSUB STR STACK_1DG + STACK_PSPHOT STR STACK + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT_1DG + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + STATICSKY_CALIBRATION STR STATICSKY_MD_PV3_DEEPCAL +END + +## CNP stacks -- PV3 version (NO bscale correction and other changes) +CNP_PV3_IQ_STACK_1DG METADATA + STACK_PPSTACK STR STACK_CNP_PV3_IQ_1DG + STACK_PPSUB STR STACK_1DG + STACK_PSPHOT STR STACK + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT_1DG + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + STATICSKY_CALIBRATION STR STATICSKY_MD_PV3_DEEPCAL +END + +CNP_PV3_REF_STACK_1DG METADATA + STACK_PPSTACK STR STACK_CNP_PV3_REF_1DG + STACK_PPSUB STR STACK_1DG + STACK_PSPHOT STR STACK + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT_1DG + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + STATICSKY_CALIBRATION STR STATICSKY_MD_PV3_DEEPCAL +END + +CNP_PV3_DEEP_STACK_1DG METADATA + STACK_PPSTACK STR STACK_CNP_PV3_DEEP_1DG + STACK_PPSUB STR STACK_1DG + STACK_PSPHOT STR STACK + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT_1DG + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + STATICSKY_CALIBRATION STR STATICSKY_MD_PV3_DEEPCAL +END + + + @@ -1342,5 +1421,5 @@ STACK_PPSTACK STR STACK_1DG STACK_PPSUB STR STACK - STACK_PSPHOT STR STACK_!DG + STACK_PSPHOT STR STACK_1DG DIFF_PPSUB STR DIFF DIFF_PSPHOT STR DIFF @@ -1350,4 +1429,28 @@ 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 + +MD_PV3_FIX 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_1DG + 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_FIX STACKPHOT_PSPHOT STR STACKPHOT STACKPHOT_PPSUB STR STACKPHOT