Index: /trunk/ippconfig/gpc1/dvo.config =================================================================== --- /trunk/ippconfig/gpc1/dvo.config (revision 30624) +++ /trunk/ippconfig/gpc1/dvo.config (revision 30625) @@ -52,5 +52,5 @@ IMAGE_OFFSET 0.100 # mark images POOR if abs(delta(Mcal)) > IMAGE_OFFSET STAR_CHISQ 10.0 # mark stars POOR if Xm > STAR_CHISQ -STAR_TOOFEW 3 # mark star FEW if N(good) < STAR_TOOFEW +STAR_TOOFEW 2 # mark star FEW if N(good) < STAR_TOOFEW GRID_TOOFEW 10 # keep grid FROZEN if N(good) < GRID_TOOFEW IMAGE_TOOFEW 10 # mark image FEW if N(good) < IMAGE_TOOFEW Index: /trunk/ippconfig/recipes/filerules-simple.mdc =================================================================== --- /trunk/ippconfig/recipes/filerules-simple.mdc (revision 30624) +++ /trunk/ippconfig/recipes/filerules-simple.mdc (revision 30625) @@ -195,10 +195,10 @@ # outputs for psphotStack: -PSPHOT.CHISQ.IMAGE OUTPUT {OUTPUT}.chisq.im.fits IMAGE NONE FPA TRUE SIMPLE -PSPHOT.CHISQ.MASK OUTPUT {OUTPUT}.chisq.mk.fits MASK NONE FPA TRUE SIMPLE -PSPHOT.CHISQ.VARIANCE OUTPUT {OUTPUT}.chisq.wt.fits VARIANCE NONE FPA TRUE SIMPLE -PSPHOT.STACK.OUTPUT.IMAGE OUTPUT {OUTPUT}.{FILE.ID}.im.fits IMAGE NONE FPA TRUE SIMPLE -PSPHOT.STACK.OUTPUT.MASK OUTPUT {OUTPUT}.{FILE.ID}.mk.fits MASK NONE FPA TRUE SIMPLE -PSPHOT.STACK.OUTPUT.VARIANCE OUTPUT {OUTPUT}.{FILE.ID}.wt.fits VARIANCE NONE FPA TRUE SIMPLE +PSPHOT.CHISQ.IMAGE OUTPUT {OUTPUT}.chisq.im.fits IMAGE NONE FPA TRUE NONE +PSPHOT.CHISQ.MASK OUTPUT {OUTPUT}.chisq.mk.fits MASK NONE FPA TRUE NONE +PSPHOT.CHISQ.VARIANCE OUTPUT {OUTPUT}.chisq.wt.fits VARIANCE NONE FPA TRUE NONE +PSPHOT.STACK.OUTPUT.IMAGE OUTPUT {OUTPUT}.{FILE.ID}.im.fits IMAGE NONE FPA TRUE NONE +PSPHOT.STACK.OUTPUT.MASK OUTPUT {OUTPUT}.{FILE.ID}.mk.fits MASK NONE FPA TRUE NONE +PSPHOT.STACK.OUTPUT.VARIANCE OUTPUT {OUTPUT}.{FILE.ID}.wt.fits VARIANCE NONE FPA TRUE NONE PSPHOT.STACK.OUTPUT OUTPUT {OUTPUT}.{FILE.ID}.cmf CMF NONE FPA TRUE NONE Index: /trunk/ippconfig/recipes/ppSim.config =================================================================== --- /trunk/ippconfig/recipes/ppSim.config (revision 30624) +++ /trunk/ippconfig/recipes/ppSim.config (revision 30625) @@ -128,4 +128,7 @@ ZEROPOINT F32 NAN # exposure time (seconds) SKY.MAGS F32 NAN # exposure time (seconds) + +SEEING.MAX F32 NAN # exposure time (seconds) +SEEING.RAMP BOOL F # exposure time (seconds) FILTER STR NONE # exposure time (seconds) Index: /trunk/ippconfig/recipes/ppSub.config =================================================================== --- /trunk/ippconfig/recipes/ppSub.config (revision 30624) +++ /trunk/ippconfig/recipes/ppSub.config (revision 30625) @@ -2,10 +2,10 @@ KERNEL.TYPE STR ISIS # Kernel type to use (POIS|ISIS|SPAM|FRIES|GUNK|RINGS) -KERNEL.SIZE S32 15 # Kernel half-size (pixels) +KERNEL.SIZE S32 20 # Kernel half-size (pixels) SPATIAL.ORDER S32 1 # Spatial polynomial order REGION.SIZE F32 0 # Iso-kernel region size (pixels) SOURCE.RADIUS F32 3.0 # Source matching radius (pixels) -STAMP.SPACING F32 300 # Typical spacing between stamps (pixels) -STAMP.FOOTPRINT S32 15 # Size of stamps (pixels) +STAMP.SPACING F32 200 # Typical spacing between stamps (pixels) +STAMP.FOOTPRINT S32 20 # Size of stamps (pixels) STAMP.THRESHOLD F32 5 # Flux threshold for stamps (stdev above background) STRIDE S32 128 # Size of convolution patches (pixels) @@ -32,4 +32,6 @@ INPUT.MATCH.MIN.SN F32 10.0 +ADD.NOT.SUBTRACT BOOL FALSE # add the images instead of subtracting (ie, image + ref, not image - ref) + LOW.THRESHOLD F32 20.0 # Mask pixels below this threshold (std dev) POOR.FRACTION F32 0.20 # Maximum fraction of bad weight for poor pixels @@ -40,7 +42,10 @@ @ISIS.ORDERS S32 6 4 2 # Polynomial orders for ISIS kernels +#@ISIS.WIDTHS F32 2.4 5.0 10.0 # Gaussian kernel FWHM values +#@ISIS.ORDERS S32 6 4 2 # Polynomial orders for ISIS kernels + # for autoscaling, the above kernel widths are multiplied by the factor max(FWHM_1,FWHM_2) / SCALE.REF SCALE BOOL TRUE # Scale kernel parameters by the seeing? -SCALE.REF F32 6.0 # FWHM reference for kernel parameter scaling +SCALE.REF F32 5.0 # FWHM reference for kernel parameter scaling SCALE.MIN F32 0.5 # Minimum scale value SCALE.MAX F32 2.0 # Maximum scale value @@ -93,10 +98,13 @@ # DUAL convolution is more sensitive to the number of kernels # do not provide as many orders as for SINGLE - @ISIS.WIDTHS F32 2.5 4.0 7.0 # Gaussian kernel FWHM values + # @ISIS.WIDTHS F32 2.4 5.0 10.0 # Gaussian kernel FWHM values + @ISIS.WIDTHS F32 1.5 3.0 6.0 # Gaussian kernel FWHM values + # @ISIS.WIDTHS F32 2.0 3.0 5.0 # Gaussian kernel FWHM values + # @ISIS.WIDTHS F32 2.1 4.2 8.4 # Gaussian kernel FWHM values @ISIS.ORDERS S32 2 2 2 # Polynomial orders for ISIS kernels - SCALE.REF F32 12.0 # FWHM reference for kernel parameter scaling - KERNEL.SIZE S32 24 # Kernel half-size (pixels) - STAMP.FOOTPRINT S32 24 # Size of stamps (pixels) + SCALE.REF F32 5.0 # FWHM reference for kernel parameter scaling + KERNEL.SIZE S32 15 # Kernel half-size (pixels) + STAMP.FOOTPRINT S32 15 # Size of stamps (pixels) END Index: /trunk/ippconfig/recipes/psphot.config =================================================================== --- /trunk/ippconfig/recipes/psphot.config (revision 30624) +++ /trunk/ippconfig/recipes/psphot.config (revision 30625) @@ -199,7 +199,15 @@ # @RADIAL.ANNULAR.BINS.UPPER F32 5.0 10.0 20.0 40.0 80.0 160.0 -# SDSS values: -@RADIAL.ANNULAR.BINS.LOWER F32 0.00 0.56 1.69 2.59 4.41 7.51 11.58 18.58 28.55 45.50 70.51 110.53 172.49 269.52 420.51 -@RADIAL.ANNULAR.BINS.UPPER F32 0.56 1.69 2.59 4.41 7.51 11.58 18.58 28.55 45.50 70.51 110.53 172.49 269.52 420.51 652.50 +# SDSS values (in SDSS pixels) +#@RADIAL.ANNULAR.BINS.LOWER F32 0.00 0.56 1.69 2.59 4.41 7.51 11.58 18.58 28.55 45.50 70.51 110.53 172.49 269.52 420.51 +#@RADIAL.ANNULAR.BINS.UPPER F32 0.56 1.69 2.59 4.41 7.51 11.58 18.58 28.55 45.50 70.51 110.53 172.49 269.52 420.51 652.50 + +# PS1 values? (all SDSS @ PS1 0.2 arcsec pixel scales) +# @RADIAL.ANNULAR.BINS.LOWER F32 0.0 1.2 3.4 5.2 8.8 15.0 23.2 37.2 57.1 91.0 141.0 221.1 345.0 539.1 841.0 +# @RADIAL.ANNULAR.BINS.UPPER F32 1.2 3.4 5.2 8.8 15.0 23.2 37.2 57.1 91.0 141.0 221.1 345.0 539.1 841.0 1305.0 + +# PS1 values? +@RADIAL.ANNULAR.BINS.LOWER F32 0.0 1.2 3.4 5.2 8.8 15.0 23.2 37.2 57.1 91.0 141.0 +@RADIAL.ANNULAR.BINS.UPPER F32 1.2 3.4 5.2 8.8 15.0 23.2 37.2 57.1 91.0 141.0 221.1 # Extended source fit parameters @@ -311,6 +319,7 @@ PSPHOT.STACK.MATCH.PSF BOOL T # convolved input images to common target PSF PSPHOT.STACK.MATCH.PSF.SOURCE STR AUTO # which inputs to convolve? (RAW, CNV, AUTO) -PSPHOT.STACK.TARGET.PSF.AUTO BOOL T # automatically determine target PSF size? -PSPHOT.STACK.TARGET.PSF.FWHM F32 5.0 # FWHM of target PSF (if NOT AUTO sized; pixels) +PSPHOT.STACK.TARGET.PSF.AUTO BOOL F # automatically determine target PSF size? +@PSPHOT.STACK.TARGET.PSF.FWHM F32 6.5 9.0 # FWHM of target PSF (if NOT AUTO sized; pixels) +PSPHOT.STACK.USE.RAW BOOL T RADIAL_APERTURES BOOL F # calculate flux in circular radial apertures? @@ -338,6 +347,6 @@ EXTENDED_SOURCE_ANNULI BOOL TRUE PSPHOT.STACK.MATCH.PSF.SOURCE STR AUTO # which inputs to convolve? (RAW, CNV, AUTO) - PSPHOT.STACK.TARGET.PSF.AUTO BOOL T # automatically determine target PSF size? - PSPHOT.STACK.TARGET.PSF.FWHM F32 7.5 # FWHM of target PSF (if NOT AUTO sized; pixels) + PSPHOT.STACK.TARGET.PSF.AUTO BOOL F # automatically determine target PSF size? + @PSPHOT.STACK.TARGET.PSF.FWHM F32 5.0 6.5 8.0 # FWHM of target PSF (if NOT AUTO sized; pixels) RADIAL_APERTURES BOOL T # calculate flux in circular radial apertures? RADIAL_APERTURES_SN_LIM F32 0.0 # S/N limit for radial aperture calculation Index: /trunk/ippconfig/simtest/camera.config =================================================================== --- /trunk/ippconfig/simtest/camera.config (revision 30624) +++ /trunk/ippconfig/simtest/camera.config (revision 30625) @@ -64,4 +64,5 @@ CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT? CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT? + CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT? CMF.DETEFF STR {CHIP.NAME}.deteff Index: /trunk/ippconfig/simtest/ppSub.config =================================================================== --- /trunk/ippconfig/simtest/ppSub.config (revision 30624) +++ /trunk/ippconfig/simtest/ppSub.config (revision 30625) @@ -1,9 +1,5 @@ ### Recipe file for ppSub -STAMP.SPACING F32 100 # Typical spacing between stamps (pixels) - -RENORM BOOL FALSE # Renormalize weight maps? - -DUAL BOOL FALSE # Dual convolution? +STAMP.SPACING F32 25 # Typical spacing between stamps (pixels) TEST.RADIAL METADATA @@ -50,6 +46,2 @@ END -SPATIAL.ORDER S32 0 # Spatial polynomial order - -#STAMP.FOOTPRINT S32 25 # Size of stamps (pixels) -#KERNEL.SIZE S32 25 # Kernel half-size (pixels)