Index: /branches/eam_branch_20080706/ippconfig/recipes/filerules-simple.mdc =================================================================== --- /branches/eam_branch_20080706/ippconfig/recipes/filerules-simple.mdc (revision 18528) +++ /branches/eam_branch_20080706/ippconfig/recipes/filerules-simple.mdc (revision 18529) @@ -84,95 +84,95 @@ ### output file definitions -TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT -PPIMAGE.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE -PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK NONE FPA TRUE SIMPLE -PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE SIMPLE -PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE -PPIMAGE.OUTPUT.RESID OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE - -PPIMAGE.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE NONE FPA TRUE SIMPLE -PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.ch.mk.fits MASK NONE FPA TRUE SIMPLE -PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.ch.wt.fits WEIGHT NONE FPA TRUE SIMPLE - -PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE SIMPLE -PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE SIMPLE - -PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE SIMPLE -PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE SIMPLE - -PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE -PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE - -PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE +TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT +PPIMAGE.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE +PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK NONE FPA TRUE SIMPLE +PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE SIMPLE +PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE +PPIMAGE.OUTPUT.RESID OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE + +PPIMAGE.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE NONE FPA TRUE SIMPLE +PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.ch.mk.fits MASK NONE FPA TRUE SIMPLE +PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.ch.wt.fits WEIGHT NONE FPA TRUE SIMPLE + +PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE SIMPLE +PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE SIMPLE + +PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE SIMPLE +PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE SIMPLE + +PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE +PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE + +PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE ## note: these use the same output naming convention since they are used for different ppMerge runs -PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE FPA TRUE SIMPLE -PPMERGE.OUTPUT.BIAS OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE -PPMERGE.OUTPUT.DARK OUTPUT {OUTPUT}.fits DARK NONE FPA TRUE SIMPLE -PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE -PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE -PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.fits FRINGE NONE FPA TRUE SIMPLE -PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.sigma.fits IMAGE NONE FPA TRUE SIMPLE -PPMERGE.OUTPUT.COUNT OUTPUT {OUTPUT}.count.fits IMAGE NONE FPA TRUE SIMPLE +PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE FPA TRUE SIMPLE +PPMERGE.OUTPUT.BIAS OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE +PPMERGE.OUTPUT.DARK OUTPUT {OUTPUT}.fits DARK NONE FPA TRUE SIMPLE +PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE +PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE +PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.fits FRINGE NONE FPA TRUE SIMPLE +PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.sigma.fits IMAGE NONE FPA TRUE SIMPLE +PPMERGE.OUTPUT.COUNT OUTPUT {OUTPUT}.count.fits IMAGE NONE FPA TRUE SIMPLE + +DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE FPA TRUE SIMPLE +DVOFLAT.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE NONE FPA TRUE SIMPLE + +PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE NONE FPA TRUE SIMPLE +PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE NONE FPA TRUE SIMPLE +PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE FPA TRUE SIMPLE +PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE FPA TRUE SIMPLE + +PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT} RAW NONE FPA TRUE NONE +PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX NONE FPA TRUE NONE +PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ NONE FPA TRUE NONE +PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp CMP NONE FPA TRUE NONE +PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE NONE +PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF NONE FPA TRUE NONE + +SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA NONE FPA TRUE NONE +SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA NONE FPA TRUE NONE +SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA NONE FPA TRUE NONE + +PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP NONE FPA TRUE NONE +PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.smf CMF NONE FPA TRUE NONE +PSASTRO.OUT.MODEL OUTPUT {OUTPUT}.asm ASTROM.MODEL NONE FPA TRUE NONE +PSASTRO.OUT.REFSTARS OUTPUT {OUTPUT}.aref.fits ASTROM.REFSTARS NONE FPA TRUE NONE +PSASTRO.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE + +PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE +PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE +PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE +PSWARP.OUTPUT.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE +PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE +PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE + +SKYCELL.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE +SKYCELL.TEMPLATE OUTPUT {OUTPUT}.skycell SKYCELL NONE FPA TRUE NONE + +PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE +PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE +PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE + +PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE +PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE +PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.weight.fits WEIGHT NONE FPA TRUE NONE + +PPSTAMP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE +PPSTAMP.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE NONE CHIP FALSE SIMPLE + +PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE +PPSIM.FAKE.CHIP OUTPUT {OUTPUT}.fake.fits IMAGE NONE FPA TRUE SIMPLE +PPSIM.FORCE.CHIP OUTPUT {OUTPUT}.force.fits IMAGE NONE FPA TRUE SIMPLE +PPSIM.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE +PPSIM.FAKE.SOURCES OUTPUT {OUTPUT}.fake.cmf CMF NONE FPA TRUE NONE +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 -DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE FPA TRUE SIMPLE -DVOFLAT.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE NONE FPA TRUE SIMPLE +LOG.IMFILE OUTPUT {OUTPUT}.imfile.log TEXT NONE FPA TRUE NONE +LOG.EXP OUTPUT {OUTPUT}.exp.log TEXT NONE FPA TRUE NONE -PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE NONE FPA TRUE SIMPLE -PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE NONE FPA TRUE SIMPLE -PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE FPA TRUE SIMPLE -PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE FPA TRUE SIMPLE - -PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT} RAW NONE FPA TRUE NONE -PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX NONE FPA TRUE NONE -PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ NONE FPA TRUE NONE -PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp CMP NONE FPA TRUE NONE -PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE NONE -PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF NONE FPA TRUE NONE - -SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA NONE FPA TRUE NONE -SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA NONE FPA TRUE NONE -SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA NONE FPA TRUE NONE - -PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP NONE FPA TRUE NONE -PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.smf CMF NONE FPA TRUE NONE -PSASTRO.OUT.MODEL OUTPUT {OUTPUT}.asm ASTROM.MODEL NONE FPA TRUE NONE -PSASTRO.OUT.REFSTARS OUTPUT {OUTPUT}.aref.fits ASTROM.REFSTARS NONE FPA TRUE NONE -PSASTRO.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE - -PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE -PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE SIMPLE -PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE SIMPLE -PSWARP.OUTPUT.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE -PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE SIMPLE -PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE SIMPLE - -SKYCELL.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE -SKYCELL.TEMPLATE OUTPUT {OUTPUT}.skycell SKYCELL NONE FPA TRUE NONE - -PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE -PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE SIMPLE -PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE SIMPLE - -PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE -PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE SIMPLE -PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.weight.fits WEIGHT NONE FPA TRUE SIMPLE - -PPSTAMP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE -PPSTAMP.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE NONE CHIP FALSE SIMPLE - -PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE -PPSIM.FAKE.CHIP OUTPUT {OUTPUT}.fake.fits IMAGE NONE FPA TRUE SIMPLE -PPSIM.FORCE.CHIP OUTPUT {OUTPUT}.force.fits IMAGE NONE FPA TRUE SIMPLE -PPSIM.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE -PPSIM.FAKE.SOURCES OUTPUT {OUTPUT}.fake.cmf CMF NONE FPA TRUE NONE -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 - -LOG.IMFILE OUTPUT {OUTPUT}.imfile.log TEXT NONE FPA TRUE NONE -LOG.EXP OUTPUT {OUTPUT}.exp.log TEXT NONE FPA TRUE NONE - -TRACE.IMFILE OUTPUT {OUTPUT}.imfile.trace TEXT NONE FPA TRUE NONE -TRACE.EXP OUTPUT {OUTPUT}.exp.trace TEXT NONE FPA TRUE NONE +TRACE.IMFILE OUTPUT {OUTPUT}.imfile.trace TEXT NONE FPA TRUE NONE +TRACE.EXP OUTPUT {OUTPUT}.exp.trace TEXT NONE FPA TRUE NONE Index: /branches/eam_branch_20080706/ippconfig/simtest/Makefile.am =================================================================== --- /branches/eam_branch_20080706/ippconfig/simtest/Makefile.am (revision 18528) +++ /branches/eam_branch_20080706/ippconfig/simtest/Makefile.am (revision 18529) @@ -10,5 +10,6 @@ rejections.config \ dvo.config \ - ppSim.config + ppSim.config \ + ppSub.config install_DATA = $(install_files) Index: /branches/eam_branch_20080706/ippconfig/simtest/camera.config =================================================================== --- /branches/eam_branch_20080706/ippconfig/simtest/camera.config (revision 18528) +++ /branches/eam_branch_20080706/ippconfig/simtest/camera.config (revision 18529) @@ -44,4 +44,5 @@ PSPHOT STR simtest/psphot.config # psphot details PPSIM STR simtest/ppSim.config # ppSim details + PPSUB STR simtest/ppSub.config # ppSub details PSASTRO STR simtest/psastro.config # psastro details REJECTIONS STR simtest/rejections.config # Rejection for detrend creation Index: /branches/eam_branch_20080706/ippconfig/simtest/ppSub.config =================================================================== --- /branches/eam_branch_20080706/ippconfig/simtest/ppSub.config (revision 18529) +++ /branches/eam_branch_20080706/ippconfig/simtest/ppSub.config (revision 18529) @@ -0,0 +1,25 @@ +### Recipe file for ppSub + +KERNEL.TYPE STR RINGS # Kernel type to use (POIS|ISIS|SPAM|FRIES|GUNK|RINGS) +KERNEL.SIZE S32 15 # Kernel half-size (pixels) +SPATIAL.ORDER S32 1 # Spatial polynomial order +REGION.SIZE F32 0 # Iso-kernel region size (pixels) +STAMP.SPACING F32 200 # Typical spacing between stamps (pixels) +STAMP.FOOTPRINT S32 35 # Size of stamps (pixels) +STAMP.THRESHOLD F32 0 # Flux threshold for stamps (ADU) +ITER S32 10 # Number of rejection iterations +REJ F32 2.5 # Rejection level (std dev) +MASK.BAD STR BLANK,BAD,SAT # Mask value for bad pixels +MASK.BLANK STR BLANK # Mask value to give blank pixels +BADFRAC F32 0.8 # Maximum fraction of bad pixels +@ISIS.WIDTHS F32 1 3 5 # Gaussian FWHMs for ISIS kernels +@ISIS.ORDERS S32 2 2 2 # Polynomial orders for ISIS kernels +INNER S32 5 # Inner half-size for SPAM and FRIES kernels +RINGS.ORDER S32 2 # Polynomial order for RINGS kernels +PENALTY F32 1.0 # Penalty for wideness + +### Modifications to use when stacking data +STACK METADATA + KERNEL.TYPE STR RINGS # Kernel type to use (POIS|ISIS|SPAM|FRIES|GUNK|RINGS) + KERNEL.SIZE S32 15 # Kernel half-size (pixels) +END