Index: trunk/ippconfig/gpc1/psastro.config =================================================================== --- trunk/ippconfig/gpc1/psastro.config (revision 29434) +++ trunk/ippconfig/gpc1/psastro.config (revision 29554) @@ -161,6 +161,6 @@ REFSTAR_MASK BOOL TRUE REFSTAR_MASK_MAX_MAG F32 -15.0 -REFSTAR_MASK_SATSTAR_MAG_MAX F32 -17.40 -REFSTAR_MASK_SATSTAR_MAG_SLOPE F32 13.45 +REFSTAR_MASK_SATSTAR_MAG_MAX F32 -15.0 +REFSTAR_MASK_SATSTAR_MAG_SLOPE F32 10.15 REFSTAR_MASK_SATSTAR_POS_ZERO F32 -0.798 Index: trunk/ippconfig/gpc1/psphot.config =================================================================== --- trunk/ippconfig/gpc1/psphot.config (revision 29434) +++ trunk/ippconfig/gpc1/psphot.config (revision 29554) @@ -37,5 +37,5 @@ BACKGROUND.YBIN S32 32 # size of background superpixels DIFF_STATS BOOL TRUE # Calculate diff-specific stats - OUTPUT.FORMAT STR PS1_DV1 # Format of output file + OUTPUT.FORMAT STR PS1_DV2 # Format of output file END Index: trunk/ippconfig/recipes/filerules-simple.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-simple.mdc (revision 29434) +++ trunk/ippconfig/recipes/filerules-simple.mdc (revision 29554) @@ -6,4 +6,7 @@ PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF PSPHOT.PSF.SAVE STR PSPHOT.PSF.RAW.SAVE + +PPSTACK.OUTPUT STR PPSTACK.OUTPUT.RAW +PPSTACK.UNCONV STR PPSTACK.UNCONV.RAW ### input file definitions @@ -242,5 +245,6 @@ PPSUB.REF.CONV.VARIANCE OUTPUT {OUTPUT}.refConv.wt.fits VARIANCE NONE FPA TRUE NONE -PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE +PPSTACK.OUTPUT.COMP OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE +PPSTACK.OUTPUT.RAW OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK COMP_MASK FPA TRUE NONE PPSTACK.OUTPUT.VARIANCE OUTPUT {OUTPUT}.weight.fits VARIANCE COMP_WT FPA TRUE NONE @@ -248,5 +252,7 @@ PPSTACK.OUTPUT.EXPNUM OUTPUT {OUTPUT}.num.fits MASK EXPNUM FPA TRUE NONE PPSTACK.OUTPUT.EXPWT OUTPUT {OUTPUT}.expwt.fits VARIANCE EXP FPA TRUE NONE -PPSTACK.UNCONV OUTPUT {OUTPUT}.unconv.fits IMAGE COMP_IMG FPA TRUE NONE + +PPSTACK.UNCONV.COMP OUTPUT {OUTPUT}.unconv.fits IMAGE COMP_IMG FPA TRUE NONE +PPSTACK.UNCONV.RAW OUTPUT {OUTPUT}.unconv.fits IMAGE NONE FPA TRUE NONE PPSTACK.UNCONV.MASK OUTPUT {OUTPUT}.unconv.mask.fits MASK COMP_MASK FPA TRUE NONE PPSTACK.UNCONV.VARIANCE OUTPUT {OUTPUT}.unconv.wt.fits VARIANCE COMP_WT FPA TRUE NONE Index: trunk/ippconfig/recipes/jpeg.mdc =================================================================== --- trunk/ippconfig/recipes/jpeg.mdc (revision 29434) +++ trunk/ippconfig/recipes/jpeg.mdc (revision 29554) @@ -5,4 +5,5 @@ # * SCALE.MIN: Minimum for scaling # * SCALE.MAX: Maximum for scaling +# * OPTIONS: comma-separated list : -SB,+SB,+X,+Y,-X,-Y PPIMAGE.JPEG1 METADATA @@ -11,4 +12,5 @@ SCALE.MIN F32 -5.0 SCALE.MAX F32 +10.0 + OPTIONS STR +SB,-X,+Y END @@ -18,4 +20,5 @@ SCALE.MIN F32 0.95 SCALE.MAX F32 1.05 + OPTIONS STR +SB,-X,+Y END @@ -25,4 +28,5 @@ SCALE.MIN F32 -5.0 SCALE.MAX F32 +10.0 + OPTIONS STR -SB,-X,+Y END @@ -30,6 +34,7 @@ COLORMAP STR -greyscale SCALE.MODE STR RANGE - SCALE.MIN F32 -5.0 - SCALE.MAX F32 +10.0 + SCALE.MIN F32 -8.0 + SCALE.MAX F32 +8.0 + OPTIONS STR +SB,-X,+Y END @@ -37,6 +42,7 @@ COLORMAP STR -greyscale SCALE.MODE STR RANGE - SCALE.MIN F32 -5.0 - SCALE.MAX F32 +10.0 + SCALE.MIN F32 -8.0 + SCALE.MAX F32 +8.0 + OPTIONS STR -SB,-X,+Y END @@ -44,24 +50,24 @@ COLORMAP STR -greyscale SCALE.MODE STR RANGE - SCALE.MIN F32 -5.0 - SCALE.MAX F32 +5.0 + SCALE.MIN F32 -8.0 + SCALE.MAX F32 +8.0 + OPTIONS STR +SB,-X,+Y END PPSTACK.OUTPUT.JPEG1 METADATA COLORMAP STR -greyscale - SCALE.MODE STR FRACTION - SCALE.MIN F32 0.90 - SCALE.MAX F32 1.10 + SCALE.MODE STR RANGE + SCALE.MIN F32 -5.0 + SCALE.MAX F32 +10.0 + OPTIONS STR +SB,-X,+Y END PPSTACK.OUTPUT.JPEG2 METADATA COLORMAP STR -greyscale - SCALE.MODE STR FRACTION - SCALE.MIN F32 0.95 - SCALE.MAX F32 1.05 -END - - - + SCALE.MODE STR RANGE + SCALE.MIN F32 -5.0 + SCALE.MAX F32 +10.0 + OPTIONS STR -SB,-X,+Y +END BIAS METADATA @@ -71,4 +77,5 @@ SCALE.MIN F32 -5.0 SCALE.MAX F32 +5.0 + OPTIONS STR +SB,-X,+Y END @@ -78,4 +85,5 @@ SCALE.MIN F32 -5.0 SCALE.MAX F32 +5.0 + OPTIONS STR -SB,-X,+Y END END @@ -88,4 +96,5 @@ SCALE.MIN F32 -5.0 SCALE.MAX F32 +5.0 + OPTIONS STR +SB,-X,+Y END @@ -95,4 +104,5 @@ SCALE.MIN F32 -5.0 SCALE.MAX F32 +5.0 + OPTIONS STR -SB,-X,+Y END END @@ -105,4 +115,5 @@ SCALE.MIN F32 -2.0 SCALE.MAX F32 +3.0 + OPTIONS STR +SB,-X,+Y END @@ -112,4 +123,5 @@ SCALE.MIN F32 -2.0 SCALE.MAX F32 +3.0 + OPTIONS STR -SB,-X,+Y END END @@ -122,4 +134,5 @@ SCALE.MIN F32 0.90 SCALE.MAX F32 1.10 + OPTIONS STR +SB,-X,+Y END @@ -129,4 +142,5 @@ SCALE.MIN F32 0.95 SCALE.MAX F32 1.05 + OPTIONS STR -SB,-X,+Y END END @@ -138,11 +152,13 @@ SCALE.MIN F32 -5.0 SCALE.MAX F32 +5.0 - END - - PPIMAGE.JPEG2 METADATA - COLORMAP STR -greyscale - SCALE.MODE STR VALUE - SCALE.MIN F32 -5.0 - SCALE.MAX F32 +5.0 + OPTIONS STR +SB,-X,+Y + END + + PPIMAGE.JPEG2 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR VALUE + SCALE.MIN F32 -5.0 + SCALE.MAX F32 +5.0 + OPTIONS STR -SB,-X,+Y END END @@ -154,4 +170,5 @@ SCALE.MIN F32 0.99 SCALE.MAX F32 1.01 + OPTIONS STR +SB,-X,+Y END @@ -161,4 +178,5 @@ SCALE.MIN F32 0.99 SCALE.MAX F32 1.01 + OPTIONS STR -SB,-X,+Y END END @@ -171,11 +189,13 @@ SCALE.MIN F32 -2.0 SCALE.MAX F32 +3.0 - END - - PPIMAGE.JPEG2 METADATA - COLORMAP STR -greyscale - SCALE.MODE STR RANGE - SCALE.MIN F32 -2.0 - SCALE.MAX F32 +3.0 + OPTIONS STR +SB,-X,+Y + END + + PPIMAGE.JPEG2 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR RANGE + SCALE.MIN F32 -2.0 + SCALE.MAX F32 +3.0 + OPTIONS STR -SB,-X,+Y END END @@ -187,4 +207,5 @@ SCALE.MIN F32 0.95 SCALE.MAX F32 1.05 + OPTIONS STR +SB,-X,+Y END @@ -194,4 +215,5 @@ SCALE.MIN F32 0.95 SCALE.MAX F32 1.05 + OPTIONS STR -SB,-X,+Y END END @@ -203,4 +225,5 @@ SCALE.MIN F32 0.0 SCALE.MAX F32 5.0 + OPTIONS STR +SB,-X,+Y END @@ -210,4 +233,5 @@ SCALE.MIN F32 0.0 SCALE.MAX F32 5.0 + OPTIONS STR -SB,-X,+Y END END @@ -216,14 +240,16 @@ PPSKYCELL.JPEG1 METADATA COLORMAP STR -greyscale - SCALE.MODE STR FRACTION - SCALE.MIN F32 0.95 - SCALE.MAX F32 1.05 + SCALE.MODE STR RANGE + SCALE.MIN F32 -8.0 + SCALE.MAX F32 +8.0 + OPTIONS STR +SB,-X,+Y END PPSKYCELL.JPEG2 METADATA COLORMAP STR -greyscale - SCALE.MODE STR FRACTION - SCALE.MIN F32 0.95 - SCALE.MAX F32 1.05 -END - + SCALE.MODE STR RANGE + SCALE.MIN F32 -8.0 + SCALE.MAX F32 +8.0 + OPTIONS STR -SB,-X,+Y +END + Index: trunk/ippconfig/recipes/ppStack.config =================================================================== --- trunk/ippconfig/recipes/ppStack.config (revision 29434) +++ trunk/ippconfig/recipes/ppStack.config (revision 29554) @@ -9,8 +9,12 @@ COMBINE.DISCARD F32 0.2 # Discard fraction for Olympic weighted mean -MASK.VAL STR MASK.VALUE,CONV.BAD,GHOST # Mask value of input bad pixels -MASK.SUSPECT STR SUSPECT,CONV.POOR # Mask value of suspect pixels +MASK.VAL STR MASK.VALUE,CONV.BAD,GHOST # Mask value of input bad pixels +MASK.SUSPECT STR SUSPECT,BURNTOOL,SPIKE,STREAK,STARCORE,CONV.POOR # Mask value of suspect pixels MASK.BAD STR BLANK # Mask value to give bad pixels MASK.POOR STR CONV.POOR # Mask value to give poor pixels + +# we are in some danger of inconsistency in the definition of a 'bad' vs a 'suspect' pixel +# these distinctions are also defined in psModules/src/config/pmConfigMask.c + POOR.FRACTION F32 0.25 # Maximum fraction of bad variance for poor pixels THRESHOLD.MASK F32 0.5 # Threshold for mask deconvolution (0..1) @@ -76,4 +80,7 @@ PSF.MODEL STR PS_MODEL_GAUSS # Model for PSF generation +PSF.AUTOSIZE BOOL TRUE # Determine output PSF size from input PSFs? +PSF.OUTPUT.FWHM F32 5.0 # Target size for output PSF (if not auto-sized) + TEMP.IMAGE STR conv.im.fits # Suffix for temporary convolved images TEMP.MASK STR conv.mk.fits # Suffix for temporary convolved masks Index: trunk/ippconfig/recipes/ppSub.config =================================================================== --- trunk/ippconfig/recipes/ppSub.config (revision 29434) +++ trunk/ippconfig/recipes/ppSub.config (revision 29554) @@ -2,10 +2,10 @@ KERNEL.TYPE STR ISIS # Kernel type to use (POIS|ISIS|SPAM|FRIES|GUNK|RINGS) -KERNEL.SIZE S32 20 # Kernel half-size (pixels) +KERNEL.SIZE S32 10 # 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 25 # Size of stamps (pixels) +STAMP.FOOTPRINT S32 10 # Size of stamps (pixels) STAMP.THRESHOLD F32 5 # Flux threshold for stamps (stdev above background) STRIDE S32 100 # Size of convolution patches (pixels) @@ -15,5 +15,5 @@ SYS.ERR F32 0.1 # Relative systematic error in images SKY.ERR F32 0.0 # Relative systematic error in images -NORM.FRAC F32 0.01 # Fraction of window for normalisation window +NORM.FRAC F32 0.02 # Fraction of window for normalisation window COVAR.FRAC F32 0.01 # Fraction of kernel to truncate before calculating covariance @@ -21,4 +21,5 @@ MASK.BAD STR CONV.BAD # Mask value to give bad pixels MASK.POOR STR CONV.POOR # Mask value to give poor pixels +MASK.BLANK STR BLANK # Mask value to give empty pixels MASK.STATS BOOL TRUE # calculate mask statistics. @@ -28,5 +29,5 @@ MASKSTAT.ADVISORY U32 0x080 -INPUT.MATCH.RADIUS F32 20.0 +INPUT.MATCH.RADIUS F32 50.0 INPUT.MATCH.MIN.SN F32 10.0 @@ -35,29 +36,18 @@ BADFRAC F32 0.95 # Maximum fraction of bad pixels -# Gene's choice: multiplying by 1.75 -#@ISIS.WIDTHS F32 1.8 3.3 5.8 10.2 17.9 # Gaussian FWHMs for ISIS kernels -#@ISIS.ORDERS S32 2 2 2 2 2 # Polynomial orders for ISIS kernels -# (pi/2)^i -#@ISIS.WIDTHS F32 1.6 2.5 3.9 6.1 9.6 15.0 # Gaussian FWHMs for ISIS kernels -#@ISIS.ORDERS S32 2 2 2 2 2 2 # Polynomial orders for ISIS kernels -# (e/2)^i for even i -#@ISIS.WIDTHS F32 1.4 3.4 6.3 11.6 # Gaussian FWHMs for ISIS kernels -#@ISIS.ORDERS S32 6 4 4 2 # Polynomial orders for ISIS kernels -# 1.69^i -#@ISIS.WIDTHS F32 2.9 4.8 8.2 13.8 23.3 # Gaussian FWHMs for ISIS kernels -#@ISIS.ORDERS S32 4 2 2 2 2 # Polynomial orders for ISIS kernels +# photpipe kernels +@ISIS.WIDTHS F32 1.5 3.0 6.0 # Gaussian kernel FWHM values +@ISIS.ORDERS S32 6 4 2 # Polynomial orders for ISIS kernels -# Paul's values -# @ISIS.WIDTHS F32 2.9 4.8 8.2 13.8 # Gaussian FWHMs for ISIS kernels -# @ISIS.ORDERS S32 4 2 2 2 # Polynomial orders for ISIS kernels - -# Gene's values -@ISIS.WIDTHS F32 2.9 4.8 8.2 # Gaussian FWHMs for ISIS kernels -@ISIS.ORDERS S32 4 2 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.MIN F32 0.5 # Minimum scale value +SCALE.MAX F32 2.0 # Maximum scale value SPAM.BINNING S32 2 # Binning in outer region for SPAM kernels INNER S32 5 # Inner half-size for SPAM and FRIES kernels RINGS.ORDER S32 2 # Polynomial order for RINGS kernels -PENALTY F32 16.0 # Penalty for wideness +PENALTY F32 5.0e-7 # 4.0e-6 for the updated code from 2010.09.19 BIN1 S32 4 # Binning factor for first level BIN2 S32 4 # Binning factor for second level @@ -75,12 +65,8 @@ RENORM.MAX F32 5.0 # Maximum value for renormalization -SCALE BOOL TRUE # Scale kernel parameters by the seeing? -SCALE.REF F32 9.0 # Reference for kernel parameter scaling -SCALE.MIN F32 0.7 # Minimum scale value -SCALE.MAX F32 1.2 # Maximum scale value - INTERPOLATION STR LANCZOS3 # Interpolation mode for bad pixels DUAL BOOL TRUE # Dual convolution? +CONVOLVE.TARGET STR SINGLE1 # convolution direction INVERSE BOOL FALSE # Generate inverse subtraction? PHOTOMETRY BOOL FALSE # Perform photometry? @@ -90,9 +76,20 @@ STACK METADATA KERNEL.TYPE STR ISIS # Kernel type - SCALE.REF F32 9.0 # Reference for kernel parameter scaling END # Recipe overrides for DIFF DIFF METADATA +END + +# Recipe overrides for DIFF +DIFF.SINGLE1 METADATA + DUAL BOOL FALSE # Dual convolution? + CONVOLVE.TARGET STR SINGLE1 # convolution direction +END + +# Recipe overrides for DIFF +DIFF.SINGLE2 METADATA + DUAL BOOL FALSE # Dual convolution? + CONVOLVE.TARGET STR SINGLE2 # convolution direction END @@ -127,2 +124,42 @@ TEST.DECON METADATA END + +# Gene's choice: multiplying by 1.75 +#@ISIS.WIDTHS F32 1.8 3.3 5.8 10.2 17.9 # Gaussian FWHMs for ISIS kernels +#@ISIS.ORDERS S32 2 2 2 2 2 # Polynomial orders for ISIS kernels +# (pi/2)^i +#@ISIS.WIDTHS F32 1.6 2.5 3.9 6.1 9.6 15.0 # Gaussian FWHMs for ISIS kernels +#@ISIS.ORDERS S32 2 2 2 2 2 2 # Polynomial orders for ISIS kernels +# (e/2)^i for even i +#@ISIS.WIDTHS F32 1.4 3.4 6.3 11.6 # Gaussian FWHMs for ISIS kernels +#@ISIS.ORDERS S32 6 4 4 2 # Polynomial orders for ISIS kernels +# 1.69^i +#@ISIS.WIDTHS F32 2.9 4.8 8.2 13.8 23.3 # Gaussian FWHMs for ISIS kernels +#@ISIS.ORDERS S32 4 2 2 2 2 # Polynomial orders for ISIS kernels + +# Paul's values +# @ISIS.WIDTHS F32 2.9 4.8 8.2 13.8 # Gaussian FWHMs for ISIS kernels +# @ISIS.ORDERS S32 4 2 2 2 # Polynomial orders for ISIS kernels + +# Armin's values +#@ISIS.WIDTHS F32 1.5 3.0 6.0 12.0 # Gaussian FWHMs for ISIS kernels +#@ISIS.ORDERS S32 6 4 2 2 # Polynomial orders for ISIS kernels + +# test +#@ISIS.WIDTHS F32 4.0 6.0 9.0 # Gaussian FWHMs for ISIS kernels +#@ISIS.ORDERS S32 6 4 2 # Polynomial orders for ISIS kernels + +#@ISIS.WIDTHS F32 1.8 3.2 5.7 # Gaussian FWHMs for ISIS kernels +#@ISIS.ORDERS S32 2 4 2 # Polynomial orders for ISIS kernels + +# @ISIS.WIDTHS F32 2.33 5.00 9.90 # hotpants values for test 01 - 00: +# @ISIS.WIDTHS F32 2.47 5.29 10.86 # hotpants values for test 02 - 00: +# @ISIS.WIDTHS F32 2.47 5.29 11.75 # hotpants values for test 03 - 00: +# @ISIS.WIDTHS F32 2.47 5.29 13.54 # hotpants values for test 04 - 00: +# @ISIS.WIDTHS F32 2.12 4.51 9.05 # hotpants values for test 07 - 00: +# @ISIS.ORDERS S32 6 4 2 # Polynomial orders for ISIS kernels + +# @ISIS.WIDTHS F32 1.90 4.07 8.11 16.22 # hotpants values for test 05 - 00: +# @ISIS.WIDTHS F32 2.11 4.51 9.02 18.05 # hotpants values for test 06 - 00: +# @ISIS.ORDERS S32 6 4 2 2 # Polynomial orders for ISIS kernels + Index: trunk/ippconfig/recipes/psphot.config =================================================================== --- trunk/ippconfig/recipes/psphot.config (revision 29434) +++ trunk/ippconfig/recipes/psphot.config (revision 29554) @@ -12,5 +12,5 @@ # format for output CMF files -OUTPUT.FORMAT STR PS1_V2 +OUTPUT.FORMAT STR PS1_V3 # the zero point is used to set a basic scale for DVO @@ -297,4 +297,7 @@ PSPHOT.CRMASK.YTEST S32 0 PSPHOT.CRMASK.APPLY BOOL FALSE # TEST THIS before enabling. +PSPHOT.CR.MAX.SIZE F32 0.8 # guess for limit on M_minor in pix^2 +PSPHOT.CR.MAX.MAG F32 -8.0 # guess for limit on Kron Mag +PSPHOT.CR.AUTOSCALE BOOL FALSE # Detection efficiency @@ -333,5 +336,5 @@ 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 F # automatically determine target PSF size? + 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) RADIAL_APERTURES BOOL T # calculate flux in circular radial apertures? @@ -365,5 +368,5 @@ DIFF METADATA DIFF_STATS BOOL TRUE # Calculate diff-specific stats - OUTPUT.FORMAT STR PS1_DV1 # Format of output file + OUTPUT.FORMAT STR PS1_DV2 # Format of output file END Index: trunk/ippconfig/recipes/reductionClasses.mdc =================================================================== --- trunk/ippconfig/recipes/reductionClasses.mdc (revision 29434) +++ trunk/ippconfig/recipes/reductionClasses.mdc (revision 29554) @@ -151,4 +151,46 @@ 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 STR STACKPHOT + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND + +END + +# basic science analysis +PHOTFEST.SINGLE1 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.SINGLE1 + 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 STR STACKPHOT + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND + +END + +# basic science analysis +PHOTFEST.SINGLE2 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.SINGLE2 DIFF_PSPHOT STR DIFF JPEG_BIN1 STR PPIMAGE_J1 Index: trunk/ippconfig/simtest/format.config =================================================================== --- trunk/ippconfig/simtest/format.config (revision 29434) +++ trunk/ippconfig/simtest/format.config (revision 29554) @@ -44,4 +44,5 @@ FPA.EXPOSURE STR EXPTIME FPA.TEMP STR DETTEMP + FPA.ZP STR MAG_ZP CELL.EXPOSURE STR EXPTIME CELL.DARKTIME STR DARKTIME Index: trunk/ippconfig/simtest/format_relphot.config =================================================================== --- trunk/ippconfig/simtest/format_relphot.config (revision 29434) +++ trunk/ippconfig/simtest/format_relphot.config (revision 29554) @@ -51,4 +51,5 @@ FPA.TIME STR DATE-OBS UTC-OBS # Date and time FPA.EXPOSURE STR EXPTIME + FPA.ZP STR MAG_ZP CELL.EXPOSURE STR EXPTIME CELL.DARKTIME STR DARKTIME