Index: /branches/eam_branch_20080408/ippconfig/cfh12k/Makefile.am =================================================================== --- /branches/eam_branch_20080408/ippconfig/cfh12k/Makefile.am (revision 17481) +++ /branches/eam_branch_20080408/ippconfig/cfh12k/Makefile.am (revision 17482) @@ -12,5 +12,4 @@ format_split_early.config \ format_split_cmf.config \ - filerules-mef.mdc \ ppImage.config \ ppMerge.config \ Index: /branches/eam_branch_20080408/ippconfig/cfh12k/camera.config =================================================================== --- /branches/eam_branch_20080408/ippconfig/cfh12k/camera.config (revision 17481) +++ /branches/eam_branch_20080408/ippconfig/cfh12k/camera.config (revision 17482) @@ -111,92 +111,5 @@ REDUCTION STR recipes/reductionClasses.mdc -FITS METADATA -# BITPIX is the bits per pixel for writing the output data -# COMP = NONE|RICE|GZIP|HCOMPRESS|PLIO is the compression algorithm -# TILE.[XYZ] are the tile sizes. 0 means entire the dimension, so (0,1,1) forms tiles from rows -# NOISE [0..16] is the number of "noise bits" to preserve when quantising floating point data; 16 for no loss -# HSCALE is the scale factor for lossy compression with HCOMPRESS; 0 or 1 for none; 2*RMS --> 10x compression -# HSMOOTH is the smoothing to apply to HCOMPRESSed data when decompressing; 0 for none - -# BITPIX(S32) is the bits per pixel for writing the output data -# COMPRESSION(STR) = NONE|RICE|GZIP|HCOMPRESS|PLIO is the compression algorithm -# TILE.[XYZ](S32) are the tile sizes. 0 means entire the dimension, so (0,1,1) forms tiles from rows -# NOISE(S32) [0..16] is the number of "noise bits" to preserve when quantising floating point data -# HSCALE(S32) is the scale factor for lossy compression with HCOMPRESS; 0 or 1 for none; 2*RMS --> 10x compression -# HSMOOTH(S32) is the smoothing to apply to HCOMPRESSed data when decompressing; 0 for none -# SCALING(STR) = NONE|RANGE|STDEV_POSITIVE|STDEV_NEGATIVE|STDEV_BOTH|MANUAL is the scaling scheme -# BSCALE(F32) is the manual scaling to apply (when SCALING = MANUAL) -# BZERO(F32) is the manual zero-point to apply (when SCALING = MANUAL) -# STDEV.BITS(S32) is the number of bits to map to a standard deviation (when SCALING = STDEV_*) -# STDEV.NUM(F32) is the number of standard deviations to the edge (when SCALING = STDEV_NEGATIVE|STDEV_POSITIVE) -# FLOAT(STR) is the name of a custom floating-point type - - DET_IMAGE METADATA - BITPIX S32 -32 - END - DET_MASK METADATA - BITPIX S32 8 - END - DET_WEIGHT METADATA - BITPIX S32 -32 - END - - SKY_IMAGE METADATA - BITPIX S32 -32 - END - SKY_MASK METADATA - BITPIX S32 8 - END - SKY_WEIGHT METADATA - BITPIX S32 -32 - END - - # Compressed positive image - COMP_IMG METADATA - BITPIX S32 16 - SCALING STR STDEV_POSITIVE - STDEV.BITS S32 4 - STDEV.NUM F32 10 - COMPRESSION STR RICE - TILE.X S32 0 - TILE.Y S32 1 - TILE.Z S32 1 - NOISE S32 8 - END - # Compressed mask - COMP_MASK METADATA - BITPIX S32 8 - COMPRESSION STR PLIO - TILE.X S32 0 - TILE.Y S32 1 - TILE.Z S32 1 - NOISE S32 8 - END - # Compressed weight image - COMP_WT METADATA - BITPIX S32 16 - SCALING STR STDEV_POSITIVE - STDEV.BITS S32 4 - STDEV.NUM F32 10 - COMPRESSION STR RICE - TILE.X S32 0 - TILE.Y S32 1 - TILE.Z S32 1 - NOISE S32 8 - END - # Compressed subtraction image - COMP_SUB METADATA - BITPIX S32 16 - SCALING STR STDEV_BOTH - STDEV.BITS S32 4 - STDEV.NUM F32 5 - COMPRESSION STR RICE - TILE.X S32 0 - TILE.Y S32 1 - TILE.Z S32 1 - NOISE S32 8 - END - -END +FITS STR recipes/fitstypes.mdc FILERULES STR recipes/filerules-mef.mdc # File rules appropriate for MEF format Index: anches/eam_branch_20080408/ippconfig/cfh12k/filerules-mef.mdc =================================================================== --- /branches/eam_branch_20080408/ippconfig/cfh12k/filerules-mef.mdc (revision 17481) +++ (revision ) @@ -1,207 +1,0 @@ -### File rules for PHU=FPA, EXT=CHIP - -### Redirections (MEF) -PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT.MEF -PPIMAGE.OUTPUT.MASK STR PPIMAGE.OUT.MK.MEF -PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.MEF - -PPIMAGE.CHIP STR PPIMAGE.CHIP.MEF -PPIMAGE.CHIP.MASK STR PPIMAGE.CHIP.MK.MEF -PPIMAGE.CHIP.WEIGHT STR PPIMAGE.CHIP.WT.MEF - -PPIMAGE.BIN1 STR PPIMAGE.BIN1.MEF -PPIMAGE.BIN2 STR PPIMAGE.BIN2.MEF - -PSASTRO.OUTPUT STR PSASTRO.OUT.CMF.MEF -PSPHOT.OUTPUT STR PSPHOT.OUT.CMF.MEF - -### Redirections (SPL) -# PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT.SPL -# PPIMAGE.OUTPUT.MASK STR PPIMAGE.OUT.MK.SPL -# PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.SPL -# -# PPIMAGE.CHIP STR PPIMAGE.CHIP.SPL -# PPIMAGE.CHIP.MASK STR PPIMAGE.CHIP.MK.SPL -# PPIMAGE.CHIP.WEIGHT STR PPIMAGE.CHIP.WT.SPL -# -# PPIMAGE.BIN1 STR PPIMAGE.BIN1.SPL -# PPIMAGE.BIN2 STR PPIMAGE.BIN2.SPL -# -# PSASTRO.OUTPUT STR PSASTRO.OUT.CMF.SPL -# PSPHOT.OUTPUT STR PSPHOT.OUT.CMF.SPL - -### Redirections (common) - -PPIMAGE.OUTPUT.FPA1 STR PPIMAGE.OUTPUT.FPA1.MEF -PPIMAGE.OUTPUT.FPA2 STR PPIMAGE.OUTPUT.FPA2.MEF -PPSTAMP.CHIP STR PPSTAMP.CHIP.MEF -PSASTRO.INPUT STR PSASTRO.INPUT.CMF -PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF -DVOCORR.OUTPUT STR DVOCORR.MEF.OUTPUT -DVOFLAT.OUTPUT STR DVOFLAT.MEF.OUTPUT - -### input file definitions -### use @DETDB entries to get the detrend images from the database -### replace @DETDB with @FILES if you want to require it from the -### command line, or with an explicit name to require a specific file -TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE - -## files used by ppImage -PPIMAGE.INPUT INPUT @FILES CHIP IMAGE -PPIMAGE.MASK INPUT @DETDB CHIP MASK -PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE -PPIMAGE.DARK INPUT @DETDB CHIP DARK -PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE -PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE -PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE - -## Files used by ppMerge -PPMERGE.INPUT INPUT @FILES CHIP IMAGE -PPMERGE.INPUT.MASK INPUT @FILES CHIP MASK -PPMERGE.INPUT.WEIGHT INPUT @FILES CHIP WEIGHT - -## files used to build and apply the flat-field correction images -DVOCORR.INPUT INPUT @FILES CHIP IMAGE -DVOCORR.REFHEAD INPUT @FILES CHIP HEADER -DVOFLAT.INPUT INPUT @FILES CHIP IMAGE -DVOFLAT.CORR INPUT @DETDB CHIP IMAGE - -## files used by psphot -PSPHOT.LOAD INPUT @FILES CHIP IMAGE -PSPHOT.INPUT INPUT @FILES CHIP IMAGE -PSPHOT.MASK INPUT @FILES CHIP MASK -PSPHOT.WEIGHT INPUT @FILES CHIP WEIGHT -PSPHOT.PSF.LOAD INPUT @FILES CHIP PSF -PSPHOT.INPUT.CMF INPUT @FILES CHIP CMF - -## files used by psastro -PSASTRO.INPUT.CMP INPUT @FILES CHIP CMP -PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF - -## files used by pswarp -PSWARP.INPUT INPUT @FILES CHIP IMAGE -PSWARP.WEIGHT INPUT @FILES CHIP WEIGHT -PSWARP.MASK INPUT @FILES CHIP MASK -PSWARP.SKYCELL INPUT @FILES CHIP IMAGE -PSWARP.ASTROM INPUT @FILES CHIP CMF - -PPSUB.INPUT INPUT @FILES FPA IMAGE -PPSUB.INPUT.MASK INPUT @FILES FPA MASK -PPSUB.INPUT.WEIGHT INPUT @FILES FPA WEIGHT -PPSUB.REF INPUT @FILES FPA IMAGE -PPSUB.REF.MASK INPUT @FILES FPA MASK -PPSUB.REF.WEIGHT INPUT @FILES FPA WEIGHT -PPSUB.SOURCES INPUT @FILES FPA CMF - -PPSTACK.INPUT INPUT @FILES FPA IMAGE -PPSTACK.INPUT.MASK INPUT @FILES FPA MASK -PPSTACK.INPUT.WEIGHT INPUT @FILES FPA WEIGHT -PPSTACK.SOURCES INPUT @FILES FPA CMF - -PPSTAMP.INPUT INPUT @FILES CHIP IMAGE - -PPARITH.INPUT.IMAGE INPUT @FILES CHIP IMAGE -PPARITH.INPUT.MASK INPUT @FILES CHIP MASK - -### output file definitions -TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT -PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.b0.fits IMAGE COMP_IMG CHIP TRUE MEF -PPIMAGE.OUT.MK.MEF OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK CHIP TRUE MEF -PPIMAGE.OUT.WT.MEF OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT CHIP TRUE MEF -PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b0.fits IMAGE NONE CHIP TRUE SPLIT -PPIMAGE.OUT.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK NONE CHIP TRUE SPLIT -PPIMAGE.OUT.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT NONE CHIP TRUE SPLIT - -PPIMAGE.CHIP.MEF OUTPUT {OUTPUT}.ch.fits IMAGE COMP_IMG CHIP TRUE MEF -PPIMAGE.CHIP.MK.MEF OUTPUT {OUTPUT}.ch.mk.fits MASK COMP_MASK CHIP TRUE MEF -PPIMAGE.CHIP.WT.MEF OUTPUT {OUTPUT}.ch.wt.fits WEIGHT COMP_WT CHIP TRUE MEF -PPIMAGE.CHIP.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE NONE CHIP TRUE SPLIT -PPIMAGE.CHIP.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits MASK NONE CHIP TRUE SPLIT -PPIMAGE.CHIP.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT NONE CHIP TRUE SPLIT - -PPIMAGE.OUTPUT.FPA1.MEF OUTPUT {OUTPUT}.b1.fits IMAGE COMP_IMG FPA TRUE MEF -PPIMAGE.OUTPUT.FPA2.MEF OUTPUT {OUTPUT}.b2.fits IMAGE COMP_IMG FPA TRUE MEF -PPIMAGE.OUTPUT.FPA1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE NONE CHIP TRUE SPLIT -PPIMAGE.OUTPUT.FPA2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE NONE CHIP TRUE SPLIT - -PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE MEF - -PPIMAGE.BIN1.MEF OUTPUT {OUTPUT}.b1c.fits IMAGE COMP_IMG CHIP TRUE MEF -PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2c.fits IMAGE COMP_IMG CHIP TRUE MEF -PPIMAGE.BIN1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE COMP_IMG CHIP TRUE SPLIT -PPIMAGE.BIN2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE COMP_IMG CHIP TRUE SPLIT - -PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE -PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE - -PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE CHIP TRUE NONE -PPMERGE.OUTPUT.BIAS OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.DARK OUTPUT {OUTPUT}.fits DARK NONE CHIP TRUE NONE -PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.fits FRINGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.sigma.fits IMAGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.COUNT OUTPUT {OUTPUT}.count.fits IMAGE NONE CHIP TRUE NONE - -DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE CHIP TRUE MEF -DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE NONE CHIP TRUE SPLIT -DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE NONE CHIP TRUE MEF -DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE NONE CHIP TRUE SPLIT - -PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE NONE CHIP FALSE MEF -PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE NONE CHIP FALSE MEF -PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE CHIP FALSE MEF -PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE CHIP FALSE MEF - -PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW NONE CHIP TRUE NONE -PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.{CHIP.NAME}.sx SX NONE CHIP TRUE NONE -PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.{CHIP.NAME}.obj OBJ NONE CHIP TRUE NONE -PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP NONE CHIP TRUE NONE -PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF NONE CHIP TRUE SPLIT -PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE MEF - -PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF NONE CHIP TRUE MEF - -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}.{CHIP.NAME}.smp CMP NONE CHIP TRUE NONE -PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF NONE CHIP TRUE SPLIT -PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF NONE FPA TRUE MEF -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 - -PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE -PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE -PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT FPA TRUE NONE -PSWARP.OUTPUT.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE -PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE COMP_IMG FPA TRUE NONE -PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE COMP_IMG 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 COMP_IMG FPA TRUE NONE -PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE -PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT FPA TRUE NONE - -PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE -PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE -PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT FPA TRUE NONE - -PPSTAMP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE -PPSTAMP.CHIP.MEF OUTPUT {OUTPUT}.ch.fits IMAGE NONE CHIP FALSE MEF - -PPSIM.OUTPUT.MEF OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE MEF -PPSIM.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE SPLIT -PPSIM.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE MEF - -PPARITH.OUTPUT.IMAGE OUTPUT {OUTPUT}.fits IMAGE COMP_IMG CHIP TRUE NONE -PPARITH.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK COMP_MASK CHIP TRUE NONE - -LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT NONE CHIP TRUE NONE -LOG.EXP OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE - -TRACE.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.trace TEXT NONE CHIP TRUE NONE -TRACE.EXP OUTPUT {OUTPUT}.trace TEXT NONE FPA TRUE NONE Index: /branches/eam_branch_20080408/ippconfig/esowfi/Makefile.am =================================================================== --- /branches/eam_branch_20080408/ippconfig/esowfi/Makefile.am (revision 17481) +++ /branches/eam_branch_20080408/ippconfig/esowfi/Makefile.am (revision 17482) @@ -10,6 +10,5 @@ psphot.config \ psastro.config \ - rejections.config \ - filerules-mef.mdc + rejections.config install_DATA = $(install_files) Index: anches/eam_branch_20080408/ippconfig/esowfi/filerules-mef.mdc =================================================================== --- /branches/eam_branch_20080408/ippconfig/esowfi/filerules-mef.mdc (revision 17481) +++ (revision ) @@ -1,142 +1,0 @@ -### Redirections -PSASTRO.INPUT STR PSASTRO.INPUT.CMF -PSASTRO.OUTPUT STR PSASTRO.OUT.CMF.SPL -PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF -PSPHOT.OUTPUT STR PSPHOT.OUT.CMF.SPL - -### input file definitions -### use @DETDB entries to get the detrend images from the database -### replace @DETDB with @FILES if you want to require it from the -### command line, or with an explicit name to require a specific file -TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE - -## files used by ppImage -PPIMAGE.INPUT INPUT @FILES CHIP IMAGE -PPIMAGE.MASK INPUT @DETDB CHIP IMAGE -PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE -PPIMAGE.DARK INPUT @DETDB CHIP DARK -PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE -PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE -PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE - -## Files used by ppMerge -PPMERGE.INPUT INPUT @FILES CHIP IMAGE -PPMERGE.INPUT.MASK INPUT @FILES CHIP MASK -PPMERGE.INPUT.WEIGHT INPUT @FILES CHIP WEIGHT - -## files used to build and apply the flat field correction images -DVOCORR.INPUT INPUT @FILES CHIP IMAGE -DVOCORR.REFHEAD INPUT @FILES CHIP HEADER -DVOFLAT.INPUT INPUT @FILES CHIP IMAGE -DVOFLAT.CORR INPUT @DETDB CHIP IMAGE - -## files used by psphot -PSPHOT.LOAD INPUT @FILES CHIP IMAGE -PSPHOT.INPUT INPUT @FILES CHIP IMAGE -PSPHOT.MASK INPUT @FILES CHIP MASK -PSPHOT.WEIGHT INPUT @FILES CHIP WEIGHT -PSPHOT.PSF.LOAD INPUT @FILES CHIP PSF -PSPHOT.INPUT.CMF INPUT @FILES CHIP CMF - -## files used by psastro -PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF - -## files used by pswarp -PSWARP.INPUT INPUT @FILES CHIP IMAGE -PSWARP.SKYCELL INPUT @FILES CHIP IMAGE -PSWARP.WEIGHT INPUT @FILES CHIP WEIGHT -PSWARP.MASK INPUT @FILES CHIP MASK -PSWARP.ASTROM INPUT @FILES CHIP CMF - -PPSUB.INPUT INPUT none.fits CHIP IMAGE -PPSUB.INPUT.MASK INPUT none.fits CHIP MASK -PPSUB.INPUT.WEIGHT INPUT none.fits CHIP WEIGHT -PPSUB.REF INPUT none.fits CHIP IMAGE -PPSUB.REF.MASK INPUT none.fits CHIP MASK -PPSUB.REF.WEIGHT INPUT none.fits CHIP WEIGHT - -PPSTACK.INPUT INPUT none.fits CHIP IMAGE -PPSTACK.INPUT.MASK INPUT none.fits FPA MASK - -PPSTAMP.INPUT INPUT @FILES CHIP IMAGE - -PPARITH.INPUT.IMAGE INPUT @FILES CHIP IMAGE -PPARITH.INPUT.MASK INPUT @FILES CHIP MASK - -### output file definitions -TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT -PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT -PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits MASK CHIP TRUE SPLIT -PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT CHIP TRUE SPLIT -PPIMAGE.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE CHIP TRUE SPLIT -PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mask.fits MASK CHIP TRUE SPLIT -PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT CHIP TRUE SPLIT -PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.fpa1.fits IMAGE FPA TRUE TOGETHER -PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.fpa2.fits IMAGE FPA TRUE TOGETHER -PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS FPA TRUE TOGETHER - -PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE TOGETHER -PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE TOGETHER -PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE CHIP TRUE SPLIT -PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE CHIP TRUE SPLIT - -PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK CHIP TRUE NONE -PPMERGE.OUTPUT.BIAS OUTPUT {OUTPUT}.fits IMAGE CHIP TRUE NONE -PPMERGE.OUTPUT.DARK OUTPUT {OUTPUT}.fits DARK CHIP TRUE NONE -PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.fits IMAGE CHIP TRUE NONE -PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.fits IMAGE CHIP TRUE NONE -PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.fits FRINGE CHIP TRUE NONE -PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.sigma.fits IMAGE CHIP TRUE NONE -PPMERGE.OUTPUT.COUNT OUTPUT {OUTPUT}.count.fits IMAGE CHIP TRUE NONE - -DVOCORR.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE CHIP TRUE SPLIT -DVOFLAT.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE CHIP TRUE SPLIT - -PSPHOT.RESID OUTPUT {OUTPUT}.{CHIP.NAME}.res.fits IMAGE CHIP TRUE SPLIT -PSPHOT.BACKGND OUTPUT {OUTPUT}.{CHIP.NAME}.bck.fits IMAGE CHIP TRUE SPLIT -PSPHOT.BACKSUB OUTPUT {OUTPUT}.{CHIP.NAME}.sub.fits IMAGE CHIP TRUE SPLIT -PSPHOT.BACKMDL OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.fits IMAGE CHIP TRUE SPLIT -PSPHOT.BACKMDL.STDEV OUTPUT {OUTPUT}.{CHIP.NAME}.mdd.fits IMAGE CHIP TRUE SPLIT - -PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW CHIP TRUE SPLIT -PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.{CHIP.NAME}.sx SX CHIP TRUE SPLIT -PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.{CHIP.NAME}.obj OBJ CHIP TRUE SPLIT -PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF CHIP TRUE SPLIT -PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF FPA TRUE TOGETHER - -PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.{CHIP.NAME}.psf PSF CHIP TRUE SPLIT - -SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.{CHIP.NAME}.mnt.png KAPA CHIP TRUE SPLIT -SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.{CHIP.NAME}.psf.png KAPA CHIP TRUE SPLIT -SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.{CHIP.NAME}.dap.png KAPA CHIP TRUE SPLIT - -PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP CHIP TRUE SPLIT -PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF CHIP TRUE SPLIT -PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF FPA TRUE TOGETHER - -PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE TOGETHER -PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE TOGETHER -PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE TOGETHER -PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE TOGETHER -PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE TOGETHER - -SKYCELL.STATS OUTPUT {OUTPUT}.stats STATS FPA TRUE NONE -SKYCELL.TEMPLATE OUTPUT {OUTPUT}.skycell SKYCELL FPA TRUE NONE - -PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE TOGETHER -PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE TOGETHER -PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE TOGETHER - -PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE TOGETHER -PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE TOGETHER - -PPSTAMP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE -PPSTAMP.CHIP.MEF OUTPUT {OUTPUT}.ch.fits IMAGE NONE CHIP FALSE MEF - -PPSIM.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT - -PPARITH.OUTPUT.IMAGE OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPARITH.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE CHIP TRUE NONE - -LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE SPLIT -LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE TOGETHER Index: /branches/eam_branch_20080408/ippconfig/gpc1/Makefile.am =================================================================== --- /branches/eam_branch_20080408/ippconfig/gpc1/Makefile.am (revision 17481) +++ /branches/eam_branch_20080408/ippconfig/gpc1/Makefile.am (revision 17482) @@ -8,5 +8,4 @@ format_raw.config \ format_mef.config \ - filerules.mdc \ ppImage.config \ ppMerge.config \ Index: /branches/eam_branch_20080408/ippconfig/gpc1/camera.config =================================================================== --- /branches/eam_branch_20080408/ippconfig/gpc1/camera.config (revision 17481) +++ /branches/eam_branch_20080408/ippconfig/gpc1/camera.config (revision 17482) @@ -103,77 +103,5 @@ REDUCTION STR recipes/reductionClasses.mdc -FITS METADATA -# BITPIX is the bits per pixel for writing the output data -# COMP = NONE|RICE|GZIP|HCOMPRESS|PLIO is the compression algorithm -# TILE.[XYZ] are the tile sizes. 0 means entire the dimension, so (0,1,1) forms tiles from rows -# NOISE [0..16] is the number of "noise bits" to preserve when quantising floating point data; 16 for no loss -# HSCALE is the scale factor for lossy compression with HCOMPRESS; 0 or 1 for none; 2*RMS --> 10x compression -# HSMOOTH is the smoothing to apply to HCOMPRESSed data when decompressing; 0 for none - -# BITPIX(S32) is the bits per pixel for writing the output data -# COMPRESSION(STR) = NONE|RICE|GZIP|HCOMPRESS|PLIO is the compression algorithm -# TILE.[XYZ](S32) are the tile sizes. 0 means entire the dimension, so (0,1,1) forms tiles from rows -# NOISE(S32) [0..16] is the number of "noise bits" to preserve when quantising floating point data -# HSCALE(S32) is the scale factor for lossy compression with HCOMPRESS; 0 or 1 for none; 2*RMS --> 10x compression -# HSMOOTH(S32) is the smoothing to apply to HCOMPRESSed data when decompressing; 0 for none -# SCALING(STR) = NONE|RANGE|STDEV_POSITIVE|STDEV_NEGATIVE|STDEV_BOTH|MANUAL is the scaling scheme -# BSCALE(F32) is the manual scaling to apply (when SCALING = MANUAL) -# BZERO(F32) is the manual zero-point to apply (when SCALING = MANUAL) -# STDEV.BITS(S32) is the number of bits to map to a standard deviation (when SCALING = STDEV_*) -# STDEV.NUM(F32) is the number of standard deviations to the edge (when SCALING = STDEV_NEGATIVE|STDEV_POSITIVE) -# FLOAT(STR) is the name of a custom floating-point type - - DET_IMAGE METADATA - BITPIX S32 -32 - END - DET_MASK METADATA - BITPIX S32 8 - END - DET_WEIGHT METADATA - BITPIX S32 -32 - END - - SKY_IMAGE METADATA - BITPIX S32 -32 - END - SKY_MASK METADATA - BITPIX S32 8 - END - SKY_WEIGHT METADATA - BITPIX S32 -32 - END - - COMP_POS METADATA - BITPIX S32 16 - SCALING STR STDEV_POSITIVE - STDEV.BITS S32 4 - STDEV.NUM F32 10 - COMPRESSION STR RICE - TILE.X S32 0 - TILE.Y S32 1 - TILE.Z S32 1 - NOISE S32 8 - END - COMP_MASK METADATA - BITPIX S32 8 - COMPRESSION STR PLIO - TILE.X S32 0 - TILE.Y S32 1 - TILE.Z S32 1 - NOISE S32 8 - END - COMP_SUB METADATA - BITPIX S32 16 - SCALING STR STDEV_BOTH - STDEV.BITS S32 4 - STDEV.NUM F32 5 - COMPRESSION STR RICE - TILE.X S32 0 - TILE.Y S32 1 - TILE.Z S32 1 - NOISE S32 8 - END - -END +FITS STR recipes/fitstypes.mdc FILERULES STR recipes/filerules-split.mdc Index: /branches/eam_branch_20080408/ippconfig/isp/camera.config =================================================================== --- /branches/eam_branch_20080408/ippconfig/isp/camera.config (revision 17481) +++ /branches/eam_branch_20080408/ippconfig/isp/camera.config (revision 17482) @@ -53,76 +53,5 @@ REDUCTION STR recipes/reductionClasses.mdc -FITS METADATA -# BITPIX is the bits per pixel for writing the output data -# COMP = NONE|RICE|GZIP|HCOMPRESS|PLIO is the compression algorithm -# TILE.[XYZ] are the tile sizes. 0 means entire the dimension, so (0,1,1) forms tiles from rows -# NOISE [0..16] is the number of "noise bits" to preserve when quantising floating point data; 16 for no loss -# HSCALE is the scale factor for lossy compression with HCOMPRESS; 0 or 1 for none; 2*RMS --> 10x compression -# HSMOOTH is the smoothing to apply to HCOMPRESSed data when decompressing; 0 for none - -# BITPIX(S32) is the bits per pixel for writing the output data -# COMPRESSION(STR) = NONE|RICE|GZIP|HCOMPRESS|PLIO is the compression algorithm -# TILE.[XYZ](S32) are the tile sizes. 0 means entire the dimension, so (0,1,1) forms tiles from rows -# NOISE(S32) [0..16] is the number of "noise bits" to preserve when quantising floating point data -# HSCALE(S32) is the scale factor for lossy compression with HCOMPRESS; 0 or 1 for none; 2*RMS --> 10x compression -# HSMOOTH(S32) is the smoothing to apply to HCOMPRESSed data when decompressing; 0 for none -# SCALING(STR) = NONE|RANGE|STDEV_POSITIVE|STDEV_NEGATIVE|STDEV_BOTH|MANUAL is the scaling scheme -# BSCALE(F32) is the manual scaling to apply (when SCALING = MANUAL) -# BZERO(F32) is the manual zero-point to apply (when SCALING = MANUAL) -# STDEV.BITS(S32) is the number of bits to map to a standard deviation (when SCALING = STDEV_*) -# STDEV.NUM(F32) is the number of standard deviations to the edge (when SCALING = STDEV_NEGATIVE|STDEV_POSITIVE) -# FLOAT(STR) is the name of a custom floating-point type - - DET_IMAGE METADATA - BITPIX S32 -32 - END - DET_MASK METADATA - BITPIX S32 8 - END - DET_WEIGHT METADATA - BITPIX S32 -32 - END - - SKY_IMAGE METADATA - BITPIX S32 -32 - END - SKY_MASK METADATA - BITPIX S32 8 - END - SKY_WEIGHT METADATA - BITPIX S32 -32 - END - - COMPRESSED_POSITIVE METADATA - BITPIX S32 16 - SCALING STR STDEV_POSITIVE - STDEV.BITS S32 4 - STDEV.NUM F32 10 - COMPRESSION STR RICE - TILE.X S32 0 - TILE.Y S32 1 - TILE.Z S32 1 - NOISE S32 8 - END - COMPRESSED_MASK METADATA - COMPRESSION STR PLIO - TILE.X S32 0 - TILE.Y S32 1 - TILE.Z S32 1 - NOISE S32 8 - END - COMPRESSED_SUBTRACTION METADATA - BITPIX S32 16 - SCALING STR STDEV_BOTH - STDEV.BITS S32 4 - STDEV.NUM F32 5 - COMPRESSION STR RICE - TILE.X S32 0 - TILE.Y S32 1 - TILE.Z S32 1 - NOISE S32 8 - END - -END +FITS STR recipes/fitstypes.mdc FILERULES STR recipes/filerules-simple.mdc Index: /branches/eam_branch_20080408/ippconfig/lbc_red/Makefile.am =================================================================== --- /branches/eam_branch_20080408/ippconfig/lbc_red/Makefile.am (revision 17481) +++ /branches/eam_branch_20080408/ippconfig/lbc_red/Makefile.am (revision 17482) @@ -11,6 +11,5 @@ psastro.config \ psphot.config \ - rejections.config \ - filerules.mdc + rejections.config install_DATA = $(install_files) Index: /branches/eam_branch_20080408/ippconfig/megacam/Makefile.am =================================================================== --- /branches/eam_branch_20080408/ippconfig/megacam/Makefile.am (revision 17481) +++ /branches/eam_branch_20080408/ippconfig/megacam/Makefile.am (revision 17482) @@ -16,6 +16,5 @@ psphot.config \ pswarp.config \ - rejections.config \ - filerules-mef.mdc + rejections.config install_DATA = $(install_files) Index: anches/eam_branch_20080408/ippconfig/megacam/filerules-mef.mdc =================================================================== --- /branches/eam_branch_20080408/ippconfig/megacam/filerules-mef.mdc (revision 17481) +++ (revision ) @@ -1,211 +1,0 @@ -### File rules for PHU=FPA, EXT=CHIP - -### Redirections (MEF) -PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT.MEF -PPIMAGE.OUTPUT.MASK STR PPIMAGE.OUT.MK.MEF -PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.MEF - -PPIMAGE.CHIP STR PPIMAGE.CHIP.MEF -PPIMAGE.CHIP.MASK STR PPIMAGE.CHIP.MK.MEF -PPIMAGE.CHIP.WEIGHT STR PPIMAGE.CHIP.WT.MEF - -PPIMAGE.BIN1 STR PPIMAGE.BIN1.MEF -PPIMAGE.BIN2 STR PPIMAGE.BIN2.MEF - -PSASTRO.OUTPUT STR PSASTRO.OUT.CMF.MEF -PSPHOT.OUTPUT STR PSPHOT.OUT.CMF.MEF - -### Redirections (SPL) -# PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT.SPL -# PPIMAGE.OUTPUT.MASK STR PPIMAGE.OUT.MK.SPL -# PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.SPL -# -# PPIMAGE.CHIP STR PPIMAGE.CHIP.SPL -# PPIMAGE.CHIP.MASK STR PPIMAGE.CHIP.MK.SPL -# PPIMAGE.CHIP.WEIGHT STR PPIMAGE.CHIP.WT.SPL -# -# PPIMAGE.BIN1 STR PPIMAGE.BIN1.SPL -# PPIMAGE.BIN2 STR PPIMAGE.BIN2.SPL -# -# PSASTRO.OUTPUT STR PSASTRO.OUT.CMF.SPL -# PSPHOT.OUTPUT STR PSPHOT.OUT.CMF.SPL - -### Redirections (common) - -PPIMAGE.OUTPUT.FPA1 STR PPIMAGE.OUTPUT.FPA1.MEF -PPIMAGE.OUTPUT.FPA2 STR PPIMAGE.OUTPUT.FPA2.MEF -PPSTAMP.CHIP STR PPSTAMP.CHIP.MEF -PSASTRO.INPUT STR PSASTRO.INPUT.CMF -PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF -DVOCORR.OUTPUT STR DVOCORR.MEF.OUTPUT -DVOFLAT.OUTPUT STR DVOFLAT.MEF.OUTPUT - -### input file definitions -### use @DETDB entries to get the detrend images from the database -### replace @DETDB with @FILES if you want to require it from the -### command line, or with an explicit name to require a specific file -TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE - -## files used by ppImage -PPIMAGE.INPUT INPUT @FILES CHIP IMAGE -PPIMAGE.MASK INPUT @DETDB CHIP MASK -PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE -PPIMAGE.DARK INPUT @DETDB CHIP DARK -PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE -PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE -PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE - -## Files used by ppMerge -PPMERGE.INPUT INPUT @FILES CHIP IMAGE -PPMERGE.INPUT.MASK INPUT @FILES CHIP MASK -PPMERGE.INPUT.WEIGHT INPUT @FILES CHIP WEIGHT - -## files used to build and apply the flat-field correction images -DVOCORR.INPUT INPUT @FILES CHIP IMAGE -DVOCORR.REFHEAD INPUT @FILES CHIP HEADER -DVOFLAT.INPUT INPUT @FILES CHIP IMAGE -DVOFLAT.CORR INPUT @DETDB CHIP IMAGE - -## files used by psphot -PSPHOT.LOAD INPUT @FILES CHIP IMAGE -PSPHOT.INPUT INPUT @FILES CHIP IMAGE -PSPHOT.MASK INPUT @FILES CHIP MASK -PSPHOT.WEIGHT INPUT @FILES CHIP WEIGHT -PSPHOT.PSF.LOAD INPUT @FILES CHIP PSF -PSPHOT.INPUT.CMF INPUT @FILES CHIP CMF - -## files used by psastro -PSASTRO.WCS INPUT none.fits CHIP CMF -PSASTRO.MODEL INPUT @DETDB FPA ASTROM -PSASTRO.INPUT.CMP INPUT @FILES CHIP CMP -PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF - -## files used by pswarp -PSWARP.INPUT INPUT @FILES CHIP IMAGE -PSWARP.WEIGHT INPUT @FILES CHIP WEIGHT -PSWARP.MASK INPUT @FILES CHIP MASK -PSWARP.SKYCELL INPUT @FILES CHIP IMAGE -PSWARP.ASTROM INPUT @FILES CHIP CMF - -PPSUB.INPUT INPUT @FILES FPA IMAGE -PPSUB.INPUT.MASK INPUT @FILES FPA MASK -PPSUB.INPUT.WEIGHT INPUT @FILES FPA WEIGHT -PPSUB.REF INPUT @FILES FPA IMAGE -PPSUB.REF.MASK INPUT @FILES FPA MASK -PPSUB.REF.WEIGHT INPUT @FILES FPA WEIGHT -PPSUB.SOURCES INPUT @FILES FPA CMF - -PPSTACK.INPUT INPUT @FILES FPA IMAGE -PPSTACK.INPUT.MASK INPUT @FILES FPA MASK -PPSTACK.INPUT.WEIGHT INPUT @FILES FPA WEIGHT -PPSTACK.INPUT.PSF INPUT @FILES CHIP PSF -PPSTACK.SOURCES INPUT @FILES FPA CMF - -PPSTAMP.INPUT INPUT @FILES CHIP IMAGE - -PPARITH.INPUT.IMAGE INPUT @FILES CHIP IMAGE -PPARITH.INPUT.MASK INPUT @FILES CHIP MASK - -### output file definitions -TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT -PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.b0.fits IMAGE NONE CHIP TRUE MEF -PPIMAGE.OUT.MK.MEF OUTPUT {OUTPUT}.mk.fits MASK NONE CHIP TRUE MEF -PPIMAGE.OUT.WT.MEF OUTPUT {OUTPUT}.wt.fits WEIGHT NONE CHIP TRUE MEF -PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b0.fits IMAGE NONE CHIP TRUE SPLIT -PPIMAGE.OUT.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK NONE CHIP TRUE SPLIT -PPIMAGE.OUT.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT NONE CHIP TRUE SPLIT -PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.fits IMAGE MASK CHIP TRUE MEF - -PPIMAGE.CHIP.MEF OUTPUT {OUTPUT}.ch.fits IMAGE NONE CHIP TRUE MEF -PPIMAGE.CHIP.MK.MEF OUTPUT {OUTPUT}.ch.mk.fits MASK NONE CHIP TRUE MEF -PPIMAGE.CHIP.WT.MEF OUTPUT {OUTPUT}.ch.wt.fits WEIGHT NONE CHIP TRUE MEF -PPIMAGE.CHIP.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE NONE CHIP TRUE SPLIT -PPIMAGE.CHIP.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits MASK NONE CHIP TRUE SPLIT -PPIMAGE.CHIP.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT NONE CHIP TRUE SPLIT - -PPIMAGE.OUTPUT.FPA1.MEF OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE MEF -PPIMAGE.OUTPUT.FPA2.MEF OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE MEF -PPIMAGE.OUTPUT.FPA1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE NONE FPA TRUE SPLIT -PPIMAGE.OUTPUT.FPA2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE NONE FPA TRUE SPLIT - -PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE MEF - -PPIMAGE.BIN1.MEF OUTPUT {OUTPUT}.b1c.fits IMAGE NONE CHIP TRUE MEF -PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2c.fits IMAGE NONE CHIP TRUE MEF -PPIMAGE.BIN1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE NONE CHIP TRUE SPLIT -PPIMAGE.BIN2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE NONE CHIP TRUE SPLIT - -PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE -PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE - -PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE CHIP TRUE NONE -PPMERGE.OUTPUT.BIAS OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.DARK OUTPUT {OUTPUT}.fits DARK NONE CHIP TRUE NONE -PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.fits FRINGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.sigma.fits IMAGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.COUNT OUTPUT {OUTPUT}.count.fits IMAGE NONE CHIP TRUE NONE - -DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE CHIP TRUE MEF -DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE NONE CHIP TRUE SPLIT -DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE NONE CHIP TRUE MEF -DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE NONE CHIP TRUE SPLIT - -PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE NONE CHIP FALSE MEF -PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE NONE CHIP FALSE MEF -PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE CHIP FALSE MEF -PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE CHIP FALSE MEF - -PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW NONE CHIP TRUE NONE -PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.{CHIP.NAME}.sx SX NONE CHIP TRUE NONE -PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.{CHIP.NAME}.obj OBJ NONE CHIP TRUE NONE -PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP NONE CHIP TRUE NONE -PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF NONE CHIP TRUE SPLIT -PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE MEF - -PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF NONE CHIP TRUE MEF - -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}.{CHIP.NAME}.smp CMP NONE CHIP TRUE NONE -PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF NONE CHIP TRUE SPLIT -PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF NONE FPA TRUE MEF -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 - -PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE -PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.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}.mk.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}.mk.fits MASK NONE FPA TRUE NONE -PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE - -PPSTAMP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE -PPSTAMP.CHIP.MEF OUTPUT {OUTPUT}.ch.fits IMAGE NONE CHIP FALSE MEF - -PPSIM.OUTPUT.MEF OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE MEF -PPSIM.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE SPLIT -PPSIM.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE MEF - -PPARITH.OUTPUT.IMAGE OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPARITH.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK MASK CHIP TRUE NONE - -LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT NONE CHIP TRUE NONE -LOG.EXP OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE - -TRACE.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.trace TEXT NONE CHIP TRUE NONE -TRACE.EXP OUTPUT {OUTPUT}.trace TEXT NONE FPA TRUE NONE Index: /branches/eam_branch_20080408/ippconfig/mosaic2/Makefile.am =================================================================== --- /branches/eam_branch_20080408/ippconfig/mosaic2/Makefile.am (revision 17481) +++ /branches/eam_branch_20080408/ippconfig/mosaic2/Makefile.am (revision 17482) @@ -6,5 +6,4 @@ dvo.layout \ camera.config \ - filerules-mef.mdc \ format.config \ ppImage.config \ Index: anches/eam_branch_20080408/ippconfig/mosaic2/filerules-mef.mdc =================================================================== --- /branches/eam_branch_20080408/ippconfig/mosaic2/filerules-mef.mdc (revision 17481) +++ (revision ) @@ -1,211 +1,0 @@ -### File rules for PHU=FPA, EXT=CHIP - -### Redirections (MEF) -PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT.MEF -PPIMAGE.OUTPUT.MASK STR PPIMAGE.OUT.MK.MEF -PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.MEF - -PPIMAGE.CHIP STR PPIMAGE.CHIP.MEF -PPIMAGE.CHIP.MASK STR PPIMAGE.CHIP.MK.MEF -PPIMAGE.CHIP.WEIGHT STR PPIMAGE.CHIP.WT.MEF - -PPIMAGE.BIN1 STR PPIMAGE.BIN1.MEF -PPIMAGE.BIN2 STR PPIMAGE.BIN2.MEF - -PSASTRO.OUTPUT STR PSASTRO.OUT.CMF.MEF -PSPHOT.OUTPUT STR PSPHOT.OUT.CMF.MEF - -### Redirections (SPL) -# PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT.SPL -# PPIMAGE.OUTPUT.MASK STR PPIMAGE.OUT.MK.SPL -# PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.SPL -# -# PPIMAGE.CHIP STR PPIMAGE.CHIP.SPL -# PPIMAGE.CHIP.MASK STR PPIMAGE.CHIP.MK.SPL -# PPIMAGE.CHIP.WEIGHT STR PPIMAGE.CHIP.WT.SPL -# -# PPIMAGE.BIN1 STR PPIMAGE.BIN1.SPL -# PPIMAGE.BIN2 STR PPIMAGE.BIN2.SPL -# -# PSASTRO.OUTPUT STR PSASTRO.OUT.CMF.SPL -# PSPHOT.OUTPUT STR PSPHOT.OUT.CMF.SPL - -### Redirections (common) - -PPIMAGE.OUTPUT.FPA1 STR PPIMAGE.OUTPUT.FPA1.MEF -PPIMAGE.OUTPUT.FPA2 STR PPIMAGE.OUTPUT.FPA2.MEF -PPSTAMP.CHIP STR PPSTAMP.CHIP.MEF -PSASTRO.INPUT STR PSASTRO.INPUT.CMF -PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF -DVOCORR.OUTPUT STR DVOCORR.MEF.OUTPUT -DVOFLAT.OUTPUT STR DVOFLAT.MEF.OUTPUT - -### input file definitions -### use @DETDB entries to get the detrend images from the database -### replace @DETDB with @FILES if you want to require it from the -### command line, or with an explicit name to require a specific file -TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE - -## files used by ppImage -PPIMAGE.INPUT INPUT @FILES CHIP IMAGE -PPIMAGE.MASK INPUT @DETDB CHIP MASK -PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE -PPIMAGE.DARK INPUT @DETDB CHIP DARK -PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE -PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE -PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE - -## Files used by ppMerge -PPMERGE.INPUT INPUT @FILES CHIP IMAGE -PPMERGE.INPUT.MASK INPUT @FILES CHIP MASK -PPMERGE.INPUT.WEIGHT INPUT @FILES CHIP WEIGHT - -## files used to build and apply the flat-field correction images -DVOCORR.INPUT INPUT @FILES CHIP IMAGE -DVOCORR.REFHEAD INPUT @FILES CHIP HEADER -DVOFLAT.INPUT INPUT @FILES CHIP IMAGE -DVOFLAT.CORR INPUT @DETDB CHIP IMAGE - -## files used by psphot -PSPHOT.LOAD INPUT @FILES CHIP IMAGE -PSPHOT.INPUT INPUT @FILES CHIP IMAGE -PSPHOT.MASK INPUT @FILES CHIP MASK -PSPHOT.WEIGHT INPUT @FILES CHIP WEIGHT -PSPHOT.PSF.LOAD INPUT @FILES CHIP PSF -PSPHOT.INPUT.CMF INPUT @FILES CHIP CMF - -## files used by psastro -PSASTRO.WCS INPUT none.fits CHIP CMF -PSASTRO.MODEL INPUT @DETDB FPA ASTROM -PSASTRO.INPUT.CMP INPUT @FILES CHIP CMP -PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF - -## files used by pswarp -PSWARP.INPUT INPUT @FILES CHIP IMAGE -PSWARP.WEIGHT INPUT @FILES CHIP WEIGHT -PSWARP.MASK INPUT @FILES CHIP MASK -PSWARP.SKYCELL INPUT @FILES CHIP IMAGE -PSWARP.ASTROM INPUT @FILES CHIP CMF - -PPSUB.INPUT INPUT @FILES FPA IMAGE -PPSUB.INPUT.MASK INPUT @FILES FPA MASK -PPSUB.INPUT.WEIGHT INPUT @FILES FPA WEIGHT -PPSUB.REF INPUT @FILES FPA IMAGE -PPSUB.REF.MASK INPUT @FILES FPA MASK -PPSUB.REF.WEIGHT INPUT @FILES FPA WEIGHT -PPSUB.SOURCES INPUT @FILES FPA CMF - -PPSTACK.INPUT INPUT @FILES FPA IMAGE -PPSTACK.INPUT.MASK INPUT @FILES FPA MASK -PPSTACK.INPUT.WEIGHT INPUT @FILES FPA WEIGHT -PPSTACK.INPUT.PSF INPUT @FILES CHIP PSF -PPSTACK.SOURCES INPUT @FILES FPA CMF - -PPSTAMP.INPUT INPUT @FILES CHIP IMAGE - -PPARITH.INPUT.IMAGE INPUT @FILES CHIP IMAGE -PPARITH.INPUT.MASK INPUT @FILES CHIP MASK - -### output file definitions -TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT - -PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.b0.fits IMAGE COMP_IMG CHIP TRUE MEF -PPIMAGE.OUT.MK.MEF OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK CHIP TRUE MEF -PPIMAGE.OUT.WT.MEF OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT CHIP TRUE MEF -PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b0.fits IMAGE NONE CHIP TRUE SPLIT -PPIMAGE.OUT.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK NONE CHIP TRUE SPLIT -PPIMAGE.OUT.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT NONE CHIP TRUE SPLIT -PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.fits IMAGE MASK CHIP TRUE MEF - -PPIMAGE.CHIP.MEF OUTPUT {OUTPUT}.ch.fits IMAGE COMP_IMG CHIP TRUE MEF -PPIMAGE.CHIP.MK.MEF OUTPUT {OUTPUT}.ch.mk.fits MASK COMP_MASK CHIP TRUE MEF -PPIMAGE.CHIP.WT.MEF OUTPUT {OUTPUT}.ch.wt.fits WEIGHT COMP_WT CHIP TRUE MEF -PPIMAGE.CHIP.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE NONE CHIP TRUE SPLIT -PPIMAGE.CHIP.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits MASK NONE CHIP TRUE SPLIT -PPIMAGE.CHIP.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT NONE CHIP TRUE SPLIT - -PPIMAGE.OUTPUT.FPA1.MEF OUTPUT {OUTPUT}.b1.fits IMAGE COMP_IMG FPA TRUE MEF -PPIMAGE.OUTPUT.FPA2.MEF OUTPUT {OUTPUT}.b2.fits IMAGE COMP_IMG FPA TRUE MEF -PPIMAGE.OUTPUT.FPA1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE NONE CHIP TRUE SPLIT -PPIMAGE.OUTPUT.FPA2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE NONE CHIP TRUE SPLIT - -PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE MEF - -PPIMAGE.BIN1.MEF OUTPUT {OUTPUT}.b1c.fits IMAGE COMP_IMG CHIP TRUE MEF -PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2c.fits IMAGE COMP_IMG CHIP TRUE MEF -PPIMAGE.BIN1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE NONE CHIP TRUE SPLIT -PPIMAGE.BIN2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE NONE CHIP TRUE SPLIT - -PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE -PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE - -PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE CHIP TRUE NONE -PPMERGE.OUTPUT.BIAS OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.DARK OUTPUT {OUTPUT}.fits DARK NONE CHIP TRUE NONE -PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.fits FRINGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.sigma.fits IMAGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.COUNT OUTPUT {OUTPUT}.count.fits IMAGE NONE CHIP TRUE NONE - -DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE CHIP TRUE MEF -DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE NONE CHIP TRUE SPLIT -DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE NONE CHIP TRUE MEF -DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE NONE CHIP TRUE SPLIT - -PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE NONE CHIP FALSE MEF -PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE NONE CHIP FALSE MEF -PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE CHIP FALSE MEF -PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE CHIP FALSE MEF - -PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW NONE CHIP TRUE NONE -PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.{CHIP.NAME}.sx SX NONE CHIP TRUE NONE -PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.{CHIP.NAME}.obj OBJ NONE CHIP TRUE NONE -PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP NONE CHIP TRUE NONE -PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF NONE CHIP TRUE SPLIT -PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE MEF -PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF NONE CHIP TRUE MEF - -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}.{CHIP.NAME}.smp CMP NONE CHIP TRUE NONE -PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF NONE CHIP TRUE SPLIT -PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF NONE FPA TRUE MEF -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 - -PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE -PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE -PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT FPA TRUE NONE -PSWARP.OUTPUT.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE -PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE COMP_IMG FPA TRUE NONE -PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE COMP_IMG 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 COMP_IMG FPA TRUE NONE -PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE -PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT FPA TRUE NONE - -PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE -PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE -PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT FPA TRUE NONE - -PPSTAMP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE -PPSTAMP.CHIP.MEF OUTPUT {OUTPUT}.ch.fits IMAGE NONE CHIP FALSE MEF - -PPSIM.OUTPUT.MEF OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE MEF -PPSIM.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE SPLIT -PPSIM.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE MEF - -PPARITH.OUTPUT.IMAGE OUTPUT {OUTPUT}.fits IMAGE COMP_IMG CHIP TRUE NONE -PPARITH.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK COMP_MASK CHIP TRUE NONE - -LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT NONE CHIP TRUE NONE -LOG.EXP OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE - -TRACE.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.trace TEXT NONE CHIP TRUE NONE -TRACE.EXP OUTPUT {OUTPUT}.trace TEXT NONE FPA TRUE NONE Index: /branches/eam_branch_20080408/ippconfig/recipes/Makefile.am =================================================================== --- /branches/eam_branch_20080408/ippconfig/recipes/Makefile.am (revision 17481) +++ /branches/eam_branch_20080408/ippconfig/recipes/Makefile.am (revision 17482) @@ -3,5 +3,9 @@ install_files = \ + filerules-simple.mdc \ + filerules-mef.mdc \ + filerules-split.mdc \ masks.config \ + reductionClasses.mdc \ rejections.config \ ppImage.config \ Index: /branches/eam_branch_20080408/ippconfig/recipes/filerules-split.mdc =================================================================== --- /branches/eam_branch_20080408/ippconfig/recipes/filerules-split.mdc (revision 17481) +++ /branches/eam_branch_20080408/ippconfig/recipes/filerules-split.mdc (revision 17482) @@ -86,12 +86,12 @@ ### output file definitions TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT -PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE COMP_POS CHIP TRUE NONE +PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE COMP_IMG CHIP TRUE NONE PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK COMP_MASK CHIP TRUE NONE -PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT COMP_POS CHIP TRUE NONE +PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT COMP_WT CHIP TRUE NONE PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE COMP_MASK CHIP TRUE NONE -PPIMAGE.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE COMP_POS CHIP TRUE NONE +PPIMAGE.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE COMP_IMG CHIP TRUE NONE PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits MASK COMP_MASK CHIP TRUE NONE -PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT COMP_POS CHIP TRUE NONE +PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT COMP_WT CHIP TRUE NONE PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE @@ -120,7 +120,7 @@ PSPHOT.RESID OUTPUT {OUTPUT}.{CHIP.NAME}.res.fits IMAGE COMP_SUB CHIP TRUE NONE -PSPHOT.BACKGND OUTPUT {OUTPUT}.{CHIP.NAME}.bck.fits IMAGE COMP_POS CHIP TRUE NONE +PSPHOT.BACKGND OUTPUT {OUTPUT}.{CHIP.NAME}.bck.fits IMAGE COMP_IMG CHIP TRUE NONE PSPHOT.BACKSUB OUTPUT {OUTPUT}.{CHIP.NAME}.sub.fits IMAGE COMP_SUB CHIP TRUE NONE -PSPHOT.BACKMDL OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.fits IMAGE COMP_POS CHIP TRUE NONE +PSPHOT.BACKMDL OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.fits IMAGE COMP_IMG CHIP TRUE NONE PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW NONE CHIP TRUE NONE @@ -142,7 +142,7 @@ PSASTRO.OUT.REFSTARS OUTPUT {OUTPUT}.aref.fits ASTROM.REFSTARS NONE FPA TRUE NONE -PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_POS FPA TRUE NONE +PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK COMP_MASK FPA TRUE NONE -PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_POS FPA TRUE NONE +PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT 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 @@ -154,9 +154,9 @@ PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_SUB FPA TRUE NONE PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK COMP_MASK FPA TRUE NONE -PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_POS FPA TRUE NONE +PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT FPA TRUE NONE -PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_POS FPA TRUE NONE +PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK COMP_MASK FPA TRUE NONE -PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_POS FPA TRUE NONE +PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT FPA TRUE NONE PPSTAMP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE @@ -166,5 +166,5 @@ PPSIM.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE MEF -PPARITH.OUTPUT.IMAGE OUTPUT {OUTPUT}.fits IMAGE COMP_POS CHIP TRUE NONE +PPARITH.OUTPUT.IMAGE OUTPUT {OUTPUT}.fits IMAGE COMP_IMG CHIP TRUE NONE PPARITH.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK COMP_MASK CHIP TRUE NONE Index: /branches/eam_branch_20080408/ippconfig/recipes/fitstypes.mdc =================================================================== --- /branches/eam_branch_20080408/ippconfig/recipes/fitstypes.mdc (revision 17482) +++ /branches/eam_branch_20080408/ippconfig/recipes/fitstypes.mdc (revision 17482) @@ -0,0 +1,87 @@ + +# BITPIX is the bits per pixel for writing the output data +# COMP = NONE|RICE|GZIP|HCOMPRESS|PLIO is the compression algorithm +# TILE.[XYZ] are the tile sizes. 0 means entire the dimension, so (0,1,1) forms tiles from rows +# NOISE [0..16] is the number of "noise bits" to preserve when quantising floating point data; 16 for no loss +# HSCALE is the scale factor for lossy compression with HCOMPRESS; 0 or 1 for none; 2*RMS --> 10x compression +# HSMOOTH is the smoothing to apply to HCOMPRESSed data when decompressing; 0 for none + +# BITPIX(S32) is the bits per pixel for writing the output data +# COMPRESSION(STR) = NONE|RICE|GZIP|HCOMPRESS|PLIO is the compression algorithm +# TILE.[XYZ](S32) are the tile sizes. 0 means entire the dimension, so (0,1,1) forms tiles from rows +# NOISE(S32) [0..16] is the number of "noise bits" to preserve when quantising floating point data +# HSCALE(S32) is the scale factor for lossy compression with HCOMPRESS; 0 or 1 for none; 2*RMS --> 10x compression +# HSMOOTH(S32) is the smoothing to apply to HCOMPRESSed data when decompressing; 0 for none +# SCALING(STR) = NONE|RANGE|STDEV_POSITIVE|STDEV_NEGATIVE|STDEV_BOTH|MANUAL is the scaling scheme +# BSCALE(F32) is the manual scaling to apply (when SCALING = MANUAL) +# BZERO(F32) is the manual zero-point to apply (when SCALING = MANUAL) +# STDEV.BITS(S32) is the number of bits to map to a standard deviation (when SCALING = STDEV_*) +# STDEV.NUM(F32) is the number of standard deviations to the edge (when SCALING = STDEV_NEGATIVE|STDEV_POSITIVE) +# FLOAT(STR) is the name of a custom floating-point type + +DET_IMAGE METADATA + BITPIX S32 -32 +END +DET_MASK METADATA + BITPIX S32 8 +END +DET_WEIGHT METADATA + BITPIX S32 -32 +END + +SKY_IMAGE METADATA + BITPIX S32 -32 +END +SKY_MASK METADATA + BITPIX S32 8 +END +SKY_WEIGHT METADATA + BITPIX S32 -32 +END + +# Compressed positive image +COMP_IMG METADATA + BITPIX S32 16 + SCALING STR STDEV_POSITIVE + STDEV.BITS S32 4 + STDEV.NUM F32 10 + COMPRESSION STR RICE + TILE.X S32 0 + TILE.Y S32 1 + TILE.Z S32 1 + NOISE S32 8 +END +# Compressed mask +COMP_MASK METADATA + BITPIX S32 8 + COMPRESSION STR PLIO + TILE.X S32 0 + TILE.Y S32 1 + TILE.Z S32 1 + NOISE S32 8 +END +# Compressed weight image +COMP_WT METADATA + BITPIX S32 16 + SCALING STR STDEV_POSITIVE + STDEV.BITS S32 4 + STDEV.NUM F32 10 + COMPRESSION STR RICE + TILE.X S32 0 + TILE.Y S32 1 + TILE.Z S32 1 + NOISE S32 8 +END +# Compressed subtraction image +COMP_SUB METADATA + BITPIX S32 16 + SCALING STR STDEV_BOTH + STDEV.BITS S32 4 + STDEV.NUM F32 5 + COMPRESSION STR RICE + TILE.X S32 0 + TILE.Y S32 1 + TILE.Z S32 1 + NOISE S32 8 +END + Index: /branches/eam_branch_20080408/ippconfig/simple/Makefile.am =================================================================== --- /branches/eam_branch_20080408/ippconfig/simple/Makefile.am (revision 17481) +++ /branches/eam_branch_20080408/ippconfig/simple/Makefile.am (revision 17482) @@ -7,6 +7,5 @@ ppImage.config \ psastro.config \ - psphot.config \ - filerules.mdc + psphot.config install_DATA = $(install_files) Index: /branches/eam_branch_20080408/ippconfig/simple/camera.config =================================================================== --- /branches/eam_branch_20080408/ippconfig/simple/camera.config (revision 17481) +++ /branches/eam_branch_20080408/ippconfig/simple/camera.config (revision 17482) @@ -48,76 +48,5 @@ REDUCTION STR recipes/reductionClasses.mdc -FITS METADATA -# BITPIX is the bits per pixel for writing the output data -# COMP = NONE|RICE|GZIP|HCOMPRESS|PLIO is the compression algorithm -# TILE.[XYZ] are the tile sizes. 0 means entire the dimension, so (0,1,1) forms tiles from rows -# NOISE [0..16] is the number of "noise bits" to preserve when quantising floating point data; 16 for no loss -# HSCALE is the scale factor for lossy compression with HCOMPRESS; 0 or 1 for none; 2*RMS --> 10x compression -# HSMOOTH is the smoothing to apply to HCOMPRESSed data when decompressing; 0 for none - -# BITPIX(S32) is the bits per pixel for writing the output data -# COMPRESSION(STR) = NONE|RICE|GZIP|HCOMPRESS|PLIO is the compression algorithm -# TILE.[XYZ](S32) are the tile sizes. 0 means entire the dimension, so (0,1,1) forms tiles from rows -# NOISE(S32) [0..16] is the number of "noise bits" to preserve when quantising floating point data -# HSCALE(S32) is the scale factor for lossy compression with HCOMPRESS; 0 or 1 for none; 2*RMS --> 10x compression -# HSMOOTH(S32) is the smoothing to apply to HCOMPRESSed data when decompressing; 0 for none -# SCALING(STR) = NONE|RANGE|STDEV_POSITIVE|STDEV_NEGATIVE|STDEV_BOTH|MANUAL is the scaling scheme -# BSCALE(F32) is the manual scaling to apply (when SCALING = MANUAL) -# BZERO(F32) is the manual zero-point to apply (when SCALING = MANUAL) -# STDEV.BITS(S32) is the number of bits to map to a standard deviation (when SCALING = STDEV_*) -# STDEV.NUM(F32) is the number of standard deviations to the edge (when SCALING = STDEV_NEGATIVE|STDEV_POSITIVE) -# FLOAT(STR) is the name of a custom floating-point type - - DET_IMAGE METADATA - BITPIX S32 -32 - END - DET_MASK METADATA - BITPIX S32 8 - END - DET_WEIGHT METADATA - BITPIX S32 -32 - END - - SKY_IMAGE METADATA - BITPIX S32 -32 - END - SKY_MASK METADATA - BITPIX S32 8 - END - SKY_WEIGHT METADATA - BITPIX S32 -32 - END - - COMPRESSED_POSITIVE METADATA - BITPIX S32 16 - SCALING STR STDEV_POSITIVE - STDEV.BITS S32 4 - STDEV.NUM F32 10 - COMPRESSION STR RICE - TILE.X S32 0 - TILE.Y S32 1 - TILE.Z S32 1 - NOISE S32 8 - END - COMPRESSED_MASK METADATA - COMPRESSION STR PLIO - TILE.X S32 0 - TILE.Y S32 1 - TILE.Z S32 1 - NOISE S32 8 - END - COMPRESSED_SUBTRACTION METADATA - BITPIX S32 16 - SCALING STR STDEV_BOTH - STDEV.BITS S32 4 - STDEV.NUM F32 5 - COMPRESSION STR RICE - TILE.X S32 0 - TILE.Y S32 1 - TILE.Z S32 1 - NOISE S32 8 - END - -END +FITS STR recipes/fitstypes.mdc FILERULES STR recipes/filerules-simple.mdc Index: anches/eam_branch_20080408/ippconfig/simple/filerules.mdc =================================================================== --- /branches/eam_branch_20080408/ippconfig/simple/filerules.mdc (revision 17481) +++ (revision ) @@ -1,100 +1,0 @@ -PSASTRO.INPUT STR PSASTRO.INPUT.CMP -PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP -PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF - -### input file definitions -TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE -PPIMAGE.INPUT INPUT none.fits FPA IMAGE -INPUT.MASK INPUT none.fits FPA MASK -INPUT.WEIGHT INPUT none.fits FPA WEIGHT -PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE -PPIMAGE.DARK INPUT @DETDB CHIP DARK -PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE -PPIMAGE.MASK INPUT @DETDB CHIP IMAGE -PSPHOT.INPUT INPUT @FILES CHIP IMAGE -PSWARP.INPUT INPUT none.fits FPA IMAGE -PSWARP.SKYCELL INPUT none.fits FPA IMAGE -PSASTRO.INPUT.CMP INPUT none.fits CHIP CMP -PSASTRO.INPUT.CMF INPUT none.fits CHIP CMF -PSPHOT.LOAD INPUT none.fits CHIP IMAGE -PSPHOT.PSF.LOAD INPUT none.fits CHIP PSF -PSPHOT.INPUT.CMF INPUT none.fits CHIP CMF - -PPSUB.INPUT INPUT none.fits FPA IMAGE -PPSUB.INPUT.MASK INPUT none.fits FPA MASK -PPSUB.INPUT.WEIGHT INPUT none.fits FPA WEIGHT -PPSUB.REF INPUT none.fits FPA IMAGE -PPSUB.REF.MASK INPUT none.fits FPA MASK -PPSUB.REF.WEIGHT INPUT none.fits FPA WEIGHT -PPSUB.SOURCES INPUT none.fits FPA CMF - -PPSTACK.INPUT INPUT none.fits FPA IMAGE -PPSTACK.INPUT.MASK INPUT none.fits FPA MASK -PPSTACK.INPUT.WEIGHT INPUT none.fits FPA WEIGHT -PPSTACK.SOURCES INPUT none.fits FPA CMF - -PPARITH.INPUT.IMAGE INPUT none.fits CHIP IMAGE -PPARITH.INPUT.MASK INPUT none.fits CHIP MASK - -### 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 NONE -PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE -PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE -PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE 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.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE NONE FPA FALSE NONE -PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.ch.mk.fits MASK NONE FPA FALSE NONE -PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.ch.wt.fits WEIGHT NONE FPA FALSE NONE - -PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE SIMPLE -PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG 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 - -PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE -PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK NONE FPA TRUE NONE -PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT 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 - -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 FPA TRUE NONE -PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF NONE FPA TRUE NONE - -PSPHOT.MOMENT.PLT OUTPUT {OUTPUT}.mnt.png KAPA NONE FPA TRUE SIMPLE -PSPHOT.PSFMODEL.PLT OUTPUT {OUTPUT}.psf.png KAPA NONE FPA TRUE SIMPLE - -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 - -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 FALSE NONE -PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA FALSE 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 - -PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMTEST - -LOG.IMFILE OUTPUT {OUTPUT}.log TEXT NONE CHIP TRUE NONE -LOG.EXP OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE - -PPARITH.OUTPUT.IMAGE OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPARITH.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE CHIP TRUE NONE Index: /branches/eam_branch_20080408/ippconfig/simtest/Makefile.am =================================================================== --- /branches/eam_branch_20080408/ippconfig/simtest/Makefile.am (revision 17481) +++ /branches/eam_branch_20080408/ippconfig/simtest/Makefile.am (revision 17482) @@ -10,6 +10,5 @@ rejections.config \ dvo.config \ - ppSim.config \ - filerules.mdc + ppSim.config install_DATA = $(install_files) Index: /branches/eam_branch_20080408/ippconfig/simtest/camera.config =================================================================== --- /branches/eam_branch_20080408/ippconfig/simtest/camera.config (revision 17481) +++ /branches/eam_branch_20080408/ippconfig/simtest/camera.config (revision 17482) @@ -51,76 +51,5 @@ REDUCTION STR recipes/reductionClasses.mdc -FITS METADATA -# BITPIX is the bits per pixel for writing the output data -# COMP = NONE|RICE|GZIP|HCOMPRESS|PLIO is the compression algorithm -# TILE.[XYZ] are the tile sizes. 0 means entire the dimension, so (0,1,1) forms tiles from rows -# NOISE [0..16] is the number of "noise bits" to preserve when quantising floating point data; 16 for no loss -# HSCALE is the scale factor for lossy compression with HCOMPRESS; 0 or 1 for none; 2*RMS --> 10x compression -# HSMOOTH is the smoothing to apply to HCOMPRESSed data when decompressing; 0 for none - -# BITPIX(S32) is the bits per pixel for writing the output data -# COMPRESSION(STR) = NONE|RICE|GZIP|HCOMPRESS|PLIO is the compression algorithm -# TILE.[XYZ](S32) are the tile sizes. 0 means entire the dimension, so (0,1,1) forms tiles from rows -# NOISE(S32) [0..16] is the number of "noise bits" to preserve when quantising floating point data -# HSCALE(S32) is the scale factor for lossy compression with HCOMPRESS; 0 or 1 for none; 2*RMS --> 10x compression -# HSMOOTH(S32) is the smoothing to apply to HCOMPRESSed data when decompressing; 0 for none -# SCALING(STR) = NONE|RANGE|STDEV_POSITIVE|STDEV_NEGATIVE|STDEV_BOTH|MANUAL is the scaling scheme -# BSCALE(F32) is the manual scaling to apply (when SCALING = MANUAL) -# BZERO(F32) is the manual zero-point to apply (when SCALING = MANUAL) -# STDEV.BITS(S32) is the number of bits to map to a standard deviation (when SCALING = STDEV_*) -# STDEV.NUM(F32) is the number of standard deviations to the edge (when SCALING = STDEV_NEGATIVE|STDEV_POSITIVE) -# FLOAT(STR) is the name of a custom floating-point type - - DET_IMAGE METADATA - BITPIX S32 -32 - END - DET_MASK METADATA - BITPIX S32 8 - END - DET_WEIGHT METADATA - BITPIX S32 -32 - END - - SKY_IMAGE METADATA - BITPIX S32 -32 - END - SKY_MASK METADATA - BITPIX S32 8 - END - SKY_WEIGHT METADATA - BITPIX S32 -32 - END - - COMPRESSED_POSITIVE METADATA - BITPIX S32 16 - SCALING STR STDEV_POSITIVE - STDEV.BITS S32 4 - STDEV.NUM F32 10 - COMPRESSION STR RICE - TILE.X S32 0 - TILE.Y S32 1 - TILE.Z S32 1 - NOISE S32 8 - END - COMPRESSED_MASK METADATA - COMPRESSION STR PLIO - TILE.X S32 0 - TILE.Y S32 1 - TILE.Z S32 1 - NOISE S32 8 - END - COMPRESSED_SUBTRACTION METADATA - BITPIX S32 16 - SCALING STR STDEV_BOTH - STDEV.BITS S32 4 - STDEV.NUM F32 5 - COMPRESSION STR RICE - TILE.X S32 0 - TILE.Y S32 1 - TILE.Z S32 1 - NOISE S32 8 - END - -END +FITS STR recipes/fitstypes.mdc FILERULES STR recipes/filerules-simple.mdc Index: anches/eam_branch_20080408/ippconfig/simtest/filerules.mdc =================================================================== --- /branches/eam_branch_20080408/ippconfig/simtest/filerules.mdc (revision 17481) +++ (revision ) @@ -1,137 +1,0 @@ -### File rules for PHU=FPA, EXT=NONE - - -PSASTRO.INPUT STR PSASTRO.INPUT.CMF -PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMF -PSASTRO.OUTPUT.MEF STR PSASTRO.OUTPUT.CMF -PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF - -### input file definitions -TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE -PPIMAGE.INPUT INPUT none.fits FPA IMAGE -INPUT.MASK INPUT none.fits FPA MASK -INPUT.WEIGHT INPUT none.fits FPA WEIGHT -INPUT.PSF INPUT none.fits READOUT PSF -INPUT.SRC INPUT none.fits READOUT CMF -PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE -PPIMAGE.DARK INPUT @DETDB CHIP DARK -PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE -PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE -PPIMAGE.MASK INPUT @DETDB CHIP IMAGE - -## Files used by ppMerge -PPMERGE.INPUT INPUT @FILES CHIP IMAGE -PPMERGE.INPUT.MASK INPUT @FILES CHIP MASK -PPMERGE.INPUT.WEIGHT INPUT @FILES CHIP WEIGHT - -## files used by psphot -PSPHOT.LOAD INPUT @FILES CHIP IMAGE -PSPHOT.INPUT INPUT none.fits CHIP IMAGE - -PSWARP.INPUT INPUT none.fits FPA IMAGE -PSWARP.WEIGHT INPUT none.fits FPA WEIGHT -PSWARP.MASK INPUT none.fits FPA MASK -PSWARP.SKYCELL INPUT none.fits FPA IMAGE -PSWARP.ASTROM INPUT none.fits FPA CMF - -PSASTRO.INPUT.CMP INPUT none.fits CHIP CMP -PSASTRO.INPUT.CMF INPUT none.fits CHIP CMF -PSPHOT.PSF.LOAD INPUT none.psf CHIP PSF -PSPHOT.INPUT.CMF INPUT none.fits CHIP CMF - -PPSUB.INPUT INPUT none.fits FPA IMAGE -PPSUB.INPUT.MASK INPUT none.fits FPA MASK -PPSUB.INPUT.WEIGHT INPUT none.fits FPA WEIGHT -PPSUB.REF INPUT none.fits FPA IMAGE -PPSUB.REF.MASK INPUT none.fits FPA MASK -PPSUB.REF.WEIGHT INPUT none.fits FPA WEIGHT - -PPSTACK.INPUT INPUT none.fits FPA IMAGE -PPSTACK.INPUT.MASK INPUT none.fits FPA MASK -PPSTACK.INPUT.WEIGHT INPUT none.fits FPA WEIGHT - -PPSTAMP.INPUT INPUT none.fits FPA IMAGE - -PPARITH.INPUT.IMAGE INPUT @FILES CHIP IMAGE -PPARITH.INPUT.MASK INPUT @FILES CHIP MASK - -### 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 NONE -PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE -PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE -PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE -PPIMAGE.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE NONE FPA TRUE NONE -PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.ch.mask.fits MASK NONE FPA TRUE NONE -PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.ch.wt.fits WEIGHT NONE FPA TRUE NONE -PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE -PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE -PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE - -PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE -PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE -PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE -PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE - -PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE CHIP TRUE NONE -PPMERGE.OUTPUT.BIAS OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.DARK OUTPUT {OUTPUT}.fits DARK NONE CHIP TRUE NONE -PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.fits FRINGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.sigma.fits IMAGE NONE CHIP TRUE NONE -PPMERGE.OUTPUT.COUNT OUTPUT {OUTPUT}.count.fits IMAGE NONE CHIP TRUE NONE - -DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE FPA TRUE NONE -DVOFLAT.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE NONE FPA TRUE NONE - -PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE NONE FPA TRUE NONE -PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE NONE FPA TRUE NONE -PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE FPA TRUE NONE -PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE FPA TRUE NONE - -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 FPA 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 - -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.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 NONE -PPSTAMP.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE NONE CHIP FALSE MEF - -PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMTEST -PPSIM.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE - -PPARITH.OUTPUT.IMAGE OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPARITH.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE CHIP TRUE NONE - -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