Index: /branches/pap/ippconfig/recipes/Makefile.am =================================================================== --- /branches/pap/ippconfig/recipes/Makefile.am (revision 28466) +++ /branches/pap/ippconfig/recipes/Makefile.am (revision 28467) @@ -30,5 +30,6 @@ ppSkycell.config \ ppVizPSF.mdc \ - nightly_science.config + nightly_science.config \ + ppBackground.mdc install_DATA = $(install_files) Index: /branches/pap/ippconfig/recipes/dqStatsTool.config =================================================================== --- /branches/pap/ippconfig/recipes/dqStatsTool.config (revision 28466) +++ /branches/pap/ippconfig/recipes/dqStatsTool.config (revision 28467) @@ -7,10 +7,46 @@ COLNAME STR FWHM_MAJOR MINIMUM F32 0.0 - MAXIMUM F32 5.0 + MAXIMUM F32 9.3 # 90-percentile 2010-02-14 through 2010-06-20 = 2.4" END RULE METADATA COLNAME STR FWHM_MINOR MINIMUM F32 0.0 - MAXIMUM F32 5.0 + MAXIMUM F32 8.44 # 90-percentile 2010-02-14 through 2010-06-20 = 2.18" + END + RULE METADATA + COLNAME STR ZEROPOINT + FILTER STR g.00000 + MINIMUM F32 24.3051 # (median 2010-02-14 through 2010-06-20) - 0.25 magnitudes + MAXIMUM F32 99.9999 # We refuse to believe in negative clouds. + END + RULE METADATA + COLNAME STR ZEROPOINT + FILTER STR r.00000 + MINIMUM F32 24.5294 # (median 2010-02-14 through 2010-06-20) - 0.25 magnitudes + MAXIMUM F32 99.9999 # We refuse to believe in negative clouds. + END + RULE METADATA + COLNAME STR ZEROPOINT + FILTER STR i.00000 + MINIMUM F32 24.4641 # (median 2010-02-14 through 2010-06-20) - 0.25 magnitudes + MAXIMUM F32 99.9999 # We refuse to believe in negative clouds. + END + RULE METADATA + COLNAME STR ZEROPOINT + FILTER STR z.00000 + MINIMUM F32 24.1128 # (median 2010-02-14 through 2010-06-20) - 0.25 magnitudes + MAXIMUM F32 99.9999 # We refuse to believe in negative clouds. + END + RULE METADATA + COLNAME STR ZEROPOINT + FILTER STR y.00000 + MINIMUM F32 23.1503 # (median 2010-02-14 through 2010-06-20) - 0.25 magnitudes + MAXIMUM F32 99.9999 # We refuse to believe in negative clouds. + END + RULE METADATA + COLNAME STR ZEROPOINT + FILTER STR w.00000 + MINIMUM F32 25.8944 # (median 2010-02-14 through 2010-06-20) - 0.25 magnitudes + MAXIMUM F32 99.9999 # We refuse to believe in negative clouds. END # TYPE VAL COLNAME MINIMUM MAXIMUM Index: /branches/pap/ippconfig/recipes/filerules-mef.mdc =================================================================== --- /branches/pap/ippconfig/recipes/filerules-mef.mdc (revision 28466) +++ /branches/pap/ippconfig/recipes/filerules-mef.mdc (revision 28467) @@ -153,4 +153,9 @@ PPBGRESTORE.INPUT INPUT @FILES CHIP IMAGE PPBGRESTORE.BACKMDL INPUT @FILES CHIP IMAGE + +PPBACKGROUND.IMAGE INPUT @FILES CHIP IMAGE +PPBACKGROUND.MASK INPUT @FILES CHIP MASK +PPBACKGROUND.PATTERN INPUT @FILES CHIP PATTERN +PPBACKGROUND.BACKGROUND INPUT @FILES CHIP IMAGE ### output file definitions @@ -307,4 +312,6 @@ PPSKYCELL.JPEG1 OUTPUT {OUTPUT}.{FILE.INDEX}.b1.jpeg JPEG NONE CHIP TRUE NONE PPSKYCELL.JPEG2 OUTPUT {OUTPUT}.{FILE.INDEX}.b2.jpeg JPEG NONE CHIP TRUE NONE +PPSKYCELL.BIN1 OUTPUT {OUTPUT}.{FILE.INDEX}.b1.fits IMAGE NONE FPA TRUE NONE +PPSKYCELL.BIN2 OUTPUT {OUTPUT}.{FILE.INDEX}.b2.fits IMAGE NONE FPA TRUE NONE LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT NONE CHIP TRUE NONE @@ -328,2 +335,5 @@ PPBGRESTORE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE COMP_IMG CHIP TRUE NONE + +PPBACKGROUND.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE COMP_IMG CHIP TRUE NONE +PPBACKGROUND.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK COMP_MASK CHIP TRUE NONE Index: /branches/pap/ippconfig/recipes/filerules-simple.mdc =================================================================== --- /branches/pap/ippconfig/recipes/filerules-simple.mdc (revision 28466) +++ /branches/pap/ippconfig/recipes/filerules-simple.mdc (revision 28467) @@ -128,4 +128,9 @@ PPVIZPATTERN.INPUT INPUT @FILES CHIP PATTERN + +PPBACKGROUND.IMAGE INPUT @FILES CHIP IMAGE +PPBACKGROUND.MASK INPUT @FILES CHIP MASK +PPBACKGROUND.PATTERN INPUT @FILES CHIP PATTERN +PPBACKGROUND.BACKGROUND INPUT @FILES CHIP IMAGE ### output file definitions @@ -267,9 +272,11 @@ PPSIM.FORCE.SOURCES OUTPUT {OUTPUT}.force.cmf CMF NONE FPA TRUE NONE -PPARITH.OUTPUT.IMAGE OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE -PPARITH.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE FPA TRUE SIMPLE +PPARITH.OUTPUT.IMAGE OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE +PPARITH.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE FPA TRUE NONE PPSKYCELL.JPEG1 OUTPUT {OUTPUT}.{FILE.INDEX}.b1.jpeg JPEG NONE CHIP TRUE NONE PPSKYCELL.JPEG2 OUTPUT {OUTPUT}.{FILE.INDEX}.b2.jpeg JPEG NONE CHIP TRUE NONE +PPSKYCELL.BIN1 OUTPUT {OUTPUT}.{FILE.INDEX}.b1.fits IMAGE NONE FPA TRUE NONE +PPSKYCELL.BIN2 OUTPUT {OUTPUT}.{FILE.INDEX}.b2.fits IMAGE NONE FPA TRUE NONE LOG.IMFILE OUTPUT {OUTPUT}.imfile.log TEXT NONE FPA TRUE NONE @@ -293,2 +300,5 @@ PPBGRESTORE.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + +PPBACKGROUND.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE FPA TRUE NONE +PPBACKGROUND.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK NONE FPA TRUE NONE Index: /branches/pap/ippconfig/recipes/filerules-split.mdc =================================================================== --- /branches/pap/ippconfig/recipes/filerules-split.mdc (revision 28466) +++ /branches/pap/ippconfig/recipes/filerules-split.mdc (revision 28467) @@ -139,4 +139,9 @@ PPVIZPATTERN.INPUT INPUT @FILES CHIP PATTERN + +PPBACKGROUND.IMAGE INPUT @FILES CHIP IMAGE +PPBACKGROUND.MASK INPUT @FILES CHIP MASK +PPBACKGROUND.PATTERN INPUT @FILES CHIP PATTERN +PPBACKGROUND.BACKGROUND INPUT @FILES CHIP IMAGE ### output file definitions @@ -292,4 +297,6 @@ PPSKYCELL.JPEG1 OUTPUT {OUTPUT}.{FILE.INDEX}.b1.jpeg JPEG NONE CHIP TRUE NONE PPSKYCELL.JPEG2 OUTPUT {OUTPUT}.{FILE.INDEX}.b2.jpeg JPEG NONE CHIP TRUE NONE +PPSKYCELL.BIN1 OUTPUT {OUTPUT}.{FILE.INDEX}.b1.fits IMAGE COMP_IMG FPA TRUE NONE +PPSKYCELL.BIN2 OUTPUT {OUTPUT}.{FILE.INDEX}.b2.fits IMAGE COMP_IMG FPA TRUE NONE LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT NONE CHIP TRUE NONE @@ -319,4 +326,6 @@ PPVIZPATTERN.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE NONE CHIP TRUE NONE +PPBACKGROUND.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE COMP_IMG CHIP TRUE NONE +PPBACKGROUND.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK COMP_MASK CHIP TRUE NONE # FILERULE naming operators: Index: /branches/pap/ippconfig/recipes/nightly_science.config =================================================================== --- /branches/pap/ippconfig/recipes/nightly_science.config (revision 28466) +++ /branches/pap/ippconfig/recipes/nightly_science.config (revision 28467) @@ -6,4 +6,5 @@ COMMAND STR chiptool RETENTION_TIME U16 30 + ALTERNATE_CMD BOOL F END CLEAN_MODES METADATA @@ -11,9 +12,18 @@ COMMAND STR warptool RETENTION_TIME U16 7 + ALTERNATE_CMD BOOL F END CLEAN_MODES METADATA MODE STR DIFF COMMAND STR difftool - RETENTION_TIME U16 30 +# RETENTION_TIME U16 30 + RETENTION_TIME S16 -1 + ALTERNATE_CMD BOOL F +END +CLEAN_MODES METADATA + MODE STR DIST + COMMAND STR disttool + RETENTION_TIME S16 7 + ALTERNATE_CMD BOOL T END @@ -116,5 +126,5 @@ TARGETS METADATA NAME STR STS - TESS STR RINGS.V0 + TESS STR STS OBSMODE STR STS% OBJECT STR STS% @@ -128,5 +138,6 @@ # OBJECT STR SS STACKABLE BOOL FALSE - NOCLEAN BOOL TRUE +# NOCLEAN BOOL TRUE + WARP S16 60 END TARGETS METADATA @@ -288,2 +299,75 @@ STACKABLE BOOL TRUE END + +# Detrend verification data +DETRENDS MULTI +DETRENDS METADATA + NAME STR DARK + DETTYPE STR DARK + EXPTYPE STR dark + REF_ID S64 299 + REF_ITER S32 0 +# FILTER STR + MAX S32 10 +END + +DETRENDS METADATA + NAME STR FLAT_G + DETTYPE STR FLAT + EXPTYPE STR skyflat + REF_ID S64 300 + REF_ITER S32 0 + FILTER STR g.00000 + MAX S32 10 +END + +DETRENDS METADATA + NAME STR FLAT_R + DETTYPE STR FLAT + EXPTYPE STR skyflat + REF_ID S64 301 + REF_ITER S32 0 + FILTER STR r.00000 + MAX S32 10 +END + +DETRENDS METADATA + NAME STR FLAT_I + DETTYPE STR FLAT + EXPTYPE STR skyflat + REF_ID S64 302 + REF_ITER S32 0 + FILTER STR i.00000 + MAX S32 10 +END + +DETRENDS METADATA + NAME STR FLAT_Z + DETTYPE STR FLAT + EXPTYPE STR skyflat + REF_ID S64 303 + REF_ITER S32 0 + FILTER STR z.00000 + MAX S32 10 +END + +DETRENDS METADATA + NAME STR FLAT_Y + DETTYPE STR FLAT + EXPTYPE STR skyflat + REF_ID S64 304 + REF_ITER S32 0 + FILTER STR y.00000 + MAX S32 10 +END + +DETRENDS METADATA + NAME STR FLAT_W + DETTYPE STR FLAT + EXPTYPE STR skyflat + REF_ID S64 305 + REF_ITER S32 0 + FILTER STR w.00000 + MAX S32 10 +END + Index: /branches/pap/ippconfig/recipes/ppSkycell.config =================================================================== --- /branches/pap/ippconfig/recipes/ppSkycell.config (revision 28466) +++ /branches/pap/ippconfig/recipes/ppSkycell.config (revision 28467) @@ -2,5 +2,5 @@ MASKVAL STR MASK.VALUE # Symbolic name of values to mask -BIN1 S32 4 # Binning factor for output 1 -BIN2 S32 4 # Binning factor for output 2 - +BIN1 S32 16 # Binning factor for output 1 +BIN2 S32 10 # Binning factor for output 2 +MAKEFITS BOOL T # Make fits image as well? Index: /branches/pap/ippconfig/recipes/ppStack.config =================================================================== --- /branches/pap/ippconfig/recipes/ppStack.config (revision 28466) +++ /branches/pap/ippconfig/recipes/ppStack.config (revision 28467) @@ -29,4 +29,6 @@ PHOTOMETRY BOOL TRUE # Do basic photometry? SKIP.BG.SUB BOOL FALSE # Bypass background subtraction? +TARGET.FRAC F32 0.1 # Minimum flux fraction for target PSF +TARGET.MINMAG F32 3.0 # Minimum magnitude difference to tolerate in stamp RENORM BOOL TRUE # Renormalise weight maps? @@ -54,5 +56,5 @@ ZP.STAR.SYS.1 F32 0.10 # Estimated systematic error; pass 1 ZP.STAR.SYS.2 F32 0.05 # Estimated systematic error; pass 2 -ZP.MATCH F32 0.3 # Fraction of images to match for good star +ZP.MATCH F32 0.1 # Fraction of images to match for good star ZP.AIRMASS METADATA # Airmass terms by filter g F32 0.0 Index: /branches/pap/ippconfig/recipes/psastro.config =================================================================== --- /branches/pap/ippconfig/recipes/psastro.config (revision 28466) +++ /branches/pap/ippconfig/recipes/psastro.config (revision 28467) @@ -233,2 +233,4 @@ END +PS1_REFERENCE METADATA +END Index: /branches/pap/ippconfig/recipes/psphot.config =================================================================== --- /branches/pap/ippconfig/recipes/psphot.config (revision 28466) +++ /branches/pap/ippconfig/recipes/psphot.config (revision 28467) @@ -113,5 +113,4 @@ PSF.FAKE.ALLOW BOOL FALSE # Allow use of fake PSFs when having trouble? -PSF_FIT_RADIUS F32 15.0 # XXX this is now autoscaled PSF_REF_RADIUS F32 25.0 # aperture magnitudes are scaled via # curve-of-growth to this radius Index: /branches/pap/ippconfig/recipes/pswarp.config =================================================================== --- /branches/pap/ippconfig/recipes/pswarp.config (revision 28466) +++ /branches/pap/ippconfig/recipes/pswarp.config (revision 28467) @@ -11,4 +11,5 @@ INTERPOLATION.NUM S32 1000 # Number of interpolation kernels to pre-calculate PSF BOOL TRUE # Measure PSF for warped image? +SOURCES BOOL TRUE # Write source list for warped image? MASK.STATS BOOL TRUE # calculate mask statistics. @@ -27,2 +28,8 @@ PSF BOOL FALSE END + +# Background restoration +BACKGROUND METADATA + SOURCES BOOL FALSE # Write source list for warped image? + PSF BOOL FALSE # Measure PSF for warped image? +END Index: /branches/pap/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /branches/pap/ippconfig/recipes/reductionClasses.mdc (revision 28466) +++ /branches/pap/ippconfig/recipes/reductionClasses.mdc (revision 28467) @@ -158,4 +158,7 @@ PSASTRO STR DEFAULT_RECIPE STACKPHOT STR STACKPHOT + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND + END @@ -175,4 +178,22 @@ ADDSTAR STR ADDSTAR PSASTRO STR DEFAULT_RECIPE +END + +# basic science analysis +PS1_REFERENCE 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 PS1_REFERENCE + STACKPHOT STR STACKPHOT END Index: /branches/pap/ippconfig/system.config =================================================================== --- /branches/pap/ippconfig/system.config (revision 28466) +++ /branches/pap/ippconfig/system.config (revision 28467) @@ -59,3 +59,4 @@ PPVIZPSF STR recipes/ppVizPSF.mdc # PSF visualisation NIGHTLY_SCIENCE STR recipes/nightly_science.config # Nightly Science + PPBACKGROUND STR recipes/ppBackground.mdc # Background restoration END