Index: /branches/eam_branches/ipp-20101103/ippconfig/recipes/filerules-mef.mdc =================================================================== --- /branches/eam_branches/ipp-20101103/ippconfig/recipes/filerules-mef.mdc (revision 29848) +++ /branches/eam_branches/ipp-20101103/ippconfig/recipes/filerules-mef.mdc (revision 29849) @@ -63,4 +63,5 @@ PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE +PPIMAGE.LINEARITY INPUT @DETDB CHIP LINEARITY ## Files used by ppMerge Index: /branches/eam_branches/ipp-20101103/ippconfig/recipes/filerules-simple.mdc =================================================================== --- /branches/eam_branches/ipp-20101103/ippconfig/recipes/filerules-simple.mdc (revision 29848) +++ /branches/eam_branches/ipp-20101103/ippconfig/recipes/filerules-simple.mdc (revision 29849) @@ -28,4 +28,5 @@ PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE +PPIMAGE.LINEARITY INPUT @DETDB CHIP LINEARITY ## Files used by ppMerge Index: /branches/eam_branches/ipp-20101103/ippconfig/recipes/filerules-split.mdc =================================================================== --- /branches/eam_branches/ipp-20101103/ippconfig/recipes/filerules-split.mdc (revision 29848) +++ /branches/eam_branches/ipp-20101103/ippconfig/recipes/filerules-split.mdc (revision 29849) @@ -16,4 +16,14 @@ # PSASTRO.OUTPUT.SPL STR PSASTRO.OUT.CMF.SPL # PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF + +# ppStack outputs default to compressed images +PPSTACK.OUTPUT STR PPSTACK.OUTPUT.COMP +PPSTACK.OUTPUT.MASK STR PPSTACK.OUTPUT.MASK.COMP +PPSTACK.OUTPUT.VARIANCE STR PPSTACK.OUTPUT.VARIANCE.COMP +PPSTACK.OUTPUT.EXPWT STR PPSTACK.OUTPUT.EXPWT.COMP +PPSTACK.UNCONV STR PPSTACK.UNCONV.COMP +PPSTACK.UNCONV.MASK STR PPSTACK.UNCONV.MASK.COMP +PPSTACK.UNCONV.VARIANCE STR PPSTACK.UNCONV.VARIANCE.COMP +PPSTACK.UNCONV.EXPWT STR PPSTACK.UNCONV.EXPWT.COMP ### input file definitions @@ -36,4 +46,5 @@ PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE +PPIMAGE.LINEARITY INPUT @DETDB CHIP LINEARITY ## Files used by ppMerge @@ -261,16 +272,24 @@ PPSUB.REF.CONV.VARIANCE OUTPUT {OUTPUT}.refConv.wt.fits VARIANCE COMP_WT 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.VARIANCE OUTPUT {OUTPUT}.wt.fits VARIANCE COMP_WT FPA TRUE NONE +PPSTACK.OUTPUT.COMP OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE +PPSTACK.OUTPUT.NOCOMP OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE +PPSTACK.OUTPUT.MASK.COMP OUTPUT {OUTPUT}.mask.fits MASK COMP_MASK FPA TRUE NONE +PPSTACK.OUTPUT.MASK.NOCCOMP OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE +PPSTACK.OUTPUT.VARIANCE.COMP OUTPUT {OUTPUT}.wt.fits VARIANCE COMP_WT FPA TRUE NONE +PPSTACK.OUTPUT.VARIANCE.NOCOMP OUTPUT {OUTPUT}.wt.fits VARIANCE NONE FPA TRUE NONE PPSTACK.OUTPUT.EXP OUTPUT {OUTPUT}.exp.fits IMAGE EXP FPA TRUE NONE PPSTACK.OUTPUT.EXPNUM OUTPUT {OUTPUT}.num.fits MASK EXPNUM FPA TRUE NONE -PPSTACK.OUTPUT.EXPWT OUTPUT {OUTPUT}.expwt.fits VARIANCE EXP FPA TRUE NONE -PPSTACK.UNCONV OUTPUT {OUTPUT}.unconv.fits IMAGE COMP_IMG FPA TRUE NONE -PPSTACK.UNCONV.MASK OUTPUT {OUTPUT}.unconv.mask.fits MASK COMP_MASK FPA TRUE NONE -PPSTACK.UNCONV.VARIANCE OUTPUT {OUTPUT}.unconv.wt.fits VARIANCE COMP_WT FPA TRUE NONE +PPSTACK.OUTPUT.EXPWT.COMP OUTPUT {OUTPUT}.expwt.fits VARIANCE EXP FPA TRUE NONE +PPSTACK.OUTPUT.EXPWT.NOCOMP OUTPUT {OUTPUT}.expwt.fits VARIANCE NONE FPA TRUE NONE +PPSTACK.UNCONV.COMP OUTPUT {OUTPUT}.unconv.fits IMAGE COMP_IMG FPA TRUE NONE +PPSTACK.UNCONV.NOCOMP OUTPUT {OUTPUT}.unconv.fits IMAGE NONE FPA TRUE NONE +PPSTACK.UNCONV.MASK.COMP OUTPUT {OUTPUT}.unconv.mask.fits MASK COMP_MASK FPA TRUE NONE +PPSTACK.UNCONV.MASK.NOCOMP OUTPUT {OUTPUT}.unconv.mask.fits MASK NONE FPA TRUE NONE +PPSTACK.UNCONV.VARIANCE.COMP OUTPUT {OUTPUT}.unconv.wt.fits VARIANCE COMP_WT FPA TRUE NONE +PPSTACK.UNCONV.VARIANCE.NOCOMP OUTPUT {OUTPUT}.unconv.wt.fits VARIANCE NONE FPA TRUE NONE PPSTACK.UNCONV.EXP OUTPUT {OUTPUT}.unconv.exp.fits IMAGE EXP FPA TRUE NONE PPSTACK.UNCONV.EXPNUM OUTPUT {OUTPUT}.unconv.num.fits MASK EXPNUM FPA TRUE NONE -PPSTACK.UNCONV.EXPWT OUTPUT {OUTPUT}.unconv.expwt.fits VARIANCE EXP FPA TRUE NONE +PPSTACK.UNCONV.EXPWT.COMP OUTPUT {OUTPUT}.unconv.expwt.fits VARIANCE EXP FPA TRUE NONE +PPSTACK.UNCONV.EXPWT.NOCOMP OUTPUT {OUTPUT}.unconv.expwt.fits VARIANCE NONE FPA TRUE NONE PPSTACK.TARGET.PSF OUTPUT {OUTPUT}.target.psf PSF NONE CHIP TRUE NONE PPSTACK.CONV.KERNEL OUTPUT {OUTPUT}.{FILE.INDEX}.kernel SUBKERNEL NONE FPA TRUE NONE Index: /branches/eam_branches/ipp-20101103/ippconfig/recipes/ppStack.config =================================================================== --- /branches/eam_branches/ipp-20101103/ippconfig/recipes/ppStack.config (revision 29848) +++ /branches/eam_branches/ipp-20101103/ippconfig/recipes/ppStack.config (revision 29849) @@ -88,6 +88,11 @@ TEMP.DELETE BOOL TRUE # Delete temporary files on completion? +OUTPUT.NOCOMP BOOL FALSE # use filerules that make conconpressed outputs + # Recipe overrides for STACK STACK METADATA +END +# +PS1_REFERENCE METADATA END Index: /branches/eam_branches/ipp-20101103/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /branches/eam_branches/ipp-20101103/ippconfig/recipes/reductionClasses.mdc (revision 29848) +++ /branches/eam_branches/ipp-20101103/ippconfig/recipes/reductionClasses.mdc (revision 29849) @@ -250,5 +250,5 @@ CHIP_PSPHOT STR CHIP WARP_PSWARP STR WARP - STACK_PPSTACK STR STACK + STACK_PPSTACK STR PS1_REFERENCE STACK_PPSUB STR STACK STACK_PSPHOT STR STACK @@ -444,8 +444,4 @@ ADDSTAR STR ADDSTAR PSASTRO STR DEFAULT_RECIPE -END - -WARPWARP METADATA - DIFF_PPSUB STR WARPWARP END