Index: /tags/ipp-test-20130502/ippconfig/gpc1/ppStack.config =================================================================== --- /tags/ipp-test-20130502/ippconfig/gpc1/ppStack.config (revision 35581) +++ /tags/ipp-test-20130502/ippconfig/gpc1/ppStack.config (revision 35582) @@ -81,8 +81,45 @@ END -STACK_ALLDEEP METADATA # N>>20 inputs, typically MD fields, no cuts + +STACK_MD_REF METADATA ## revised config for MD refstacks vs PS1_REFERENCE above after ppStack mods 5/03/13 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 6.0 # never really want >6 pixels in refstack + 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 +END + +STACK_MD_DEEP METADATA ## revised config for MD deepstack above after ppStack mods 5/03/13 + 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 +END + +STACK_ALLDEEP METADATA # no cuts, everything in changes after ppStack mods 5/03/13 + 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 100.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 END Index: /tags/ipp-test-20130502/ippconfig/recipes/ppStack.config =================================================================== --- /tags/ipp-test-20130502/ippconfig/recipes/ppStack.config (revision 35581) +++ /tags/ipp-test-20130502/ippconfig/recipes/ppStack.config (revision 35582) @@ -90,8 +90,9 @@ -PSF.INPUT.MAX F32 NAN -PSF.INPUT.CLIP.NSIGMA F32 NAN -PSF.INPUT.THRESH F32 NAN -PSF.INPUT.ASYMMETRY F32 NAN +PSF.INPUT.CLIP.SIMPLE BOOL F # Should we do a simple sigma clip (T, requires CLIP.NSIGMA) or the mixture model (F, requires all parameters) +PSF.INPUT.MAX F32 NAN # Set maximum limit on input FWHM (defaults to inf) +PSF.INPUT.CLIP.NSIGMA F32 NAN # Set n-sigma cut limit for input rejection +PSF.INPUT.THRESH F32 NAN # Set minimum limit below which we do not exclude an input (defaults to 0.0) +PSF.INPUT.ASYMMETRY F32 NAN # Set difference in mixture model populations to consider equal. TEMP.IMAGE STR conv.im.fits # Suffix for temporary convolved images @@ -163,6 +164,15 @@ END +STACK_MD_REF METADATA +END + +STACK_MD_DEEP METADATA +END + STACK_ALLDEEP METADATA END + + + TEST1 METADATA Index: /tags/ipp-test-20130502/ippconfig/recipes/ppSub.config =================================================================== --- /tags/ipp-test-20130502/ippconfig/recipes/ppSub.config (revision 35581) +++ /tags/ipp-test-20130502/ippconfig/recipes/ppSub.config (revision 35582) @@ -108,4 +108,19 @@ END +# test setup for nodual case +DIFF_NODUAL METADATA + DUAL BOOL FALSE # Dual convolution? + INVERSE BOOL TRUE # Generate inverse subtraction? + PHOTOMETRY BOOL TRUE # Perform photometry? + CONVOLVE.TARGET STR SINGLE_AUTO + + @ISIS.WIDTHS F32 1.5 3.0 6.0 # Gaussian kernel FWHM values + @ISIS.ORDERS S32 6 4 2 # Polynomial orders for ISIS kernels + + SCALE.REF F32 5.0 # FWHM reference for kernel parameter scaling + KERNEL.SIZE S32 20 # Kernel half-size (pixels) + STAMP.FOOTPRINT S32 20 # Size of stamps (pixels) +END + # Difference of two warps WARPWARP METADATA Index: /tags/ipp-test-20130502/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /tags/ipp-test-20130502/ippconfig/recipes/reductionClasses.mdc (revision 35581) +++ /tags/ipp-test-20130502/ippconfig/recipes/reductionClasses.mdc (revision 35582) @@ -299,4 +299,11 @@ END +# sweetspot no dual test case +SWEETSPOT_NODUAL METADATA + DIFF_PPSUB STR DIFF_NODUAL + DIFF_PSPHOT STR SSTF_DIFF + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 +END CONSTANT_WEIGHTPHOT METADATA @@ -544,4 +551,21 @@ END +## MD refstack +MD_REF_STACK METADATA + STACK_PPSTACK STR STACK_MD_REF + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK + STACKPHOT_PSPHOT STR STACKPHOT + STATICSKY_CALIBRATION STR STATICSKY_DEEPCAL +END + +## MD deepstack +MD_DEEP_STACK METADATA + STACK_PPSTACK STR STACK_MD_DEEP + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK + STACKPHOT_PSPHOT STR STACKPHOT + STATICSKY_CALIBRATION STR STATICSKY_DEEPCAL +END # quick stacks @@ -1007,5 +1031,5 @@ STS_DATASET METADATA - CHIP_PPIMAGE STR CHIP + CHIP_PPIMAGE STR CHIP_AUXMASK CHIP_PSPHOT STR CHIP WARP_PSWARP STR WARP @@ -1023,4 +1047,28 @@ END +M31_DATASET METADATA + CHIP_PPIMAGE STR CHIP_AUXMASK + 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 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 +END + CNP_DATASET METADATA CHIP_PPIMAGE STR CHIP