Index: branches/czw_branch/20101203/ippconfig/recipes/filerules-mef.mdc =================================================================== --- branches/czw_branch/20101203/ippconfig/recipes/filerules-mef.mdc (revision 30048) +++ branches/czw_branch/20101203/ippconfig/recipes/filerules-mef.mdc (revision 30118) @@ -276,4 +276,8 @@ PPSUB.REF.CONV.VARIANCE OUTPUT {OUTPUT}.refConv.wt.fits VARIANCE COMP_WT FPA TRUE NONE +PPSUB.FORCED1.SOURCES OUTPUT {OUTPUT}.frc1.cmf CMF NONE FPA TRUE NONE +PPSUB.FORCED2.SOURCES OUTPUT {OUTPUT}.frc2.cmf CMF NONE FPA TRUE NONE +PPSUB.POS1.SOURCES OUTPUT {OUTPUT}.pos1.cmf CMF NONE FPA TRUE NONE +PPSUB.POS2.SOURCES OUTPUT {OUTPUT}.pos2.cmf CMF NONE FPA TRUE NONE PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE Index: branches/czw_branch/20101203/ippconfig/recipes/filerules-simple.mdc =================================================================== --- branches/czw_branch/20101203/ippconfig/recipes/filerules-simple.mdc (revision 30048) +++ branches/czw_branch/20101203/ippconfig/recipes/filerules-simple.mdc (revision 30118) @@ -246,4 +246,9 @@ PPSUB.REF.CONV.VARIANCE OUTPUT {OUTPUT}.refConv.wt.fits VARIANCE NONE FPA TRUE NONE +PPSUB.FORCED1.SOURCES OUTPUT {OUTPUT}.frc1.cmf CMF NONE FPA TRUE NONE +PPSUB.FORCED2.SOURCES OUTPUT {OUTPUT}.frc2.cmf CMF NONE FPA TRUE NONE +PPSUB.POS1.SOURCES OUTPUT {OUTPUT}.pos1.cmf CMF NONE FPA TRUE NONE +PPSUB.POS2.SOURCES OUTPUT {OUTPUT}.pos2.cmf CMF NONE FPA TRUE NONE + PPSTACK.OUTPUT.COMP OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE PPSTACK.OUTPUT.RAW OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE Index: branches/czw_branch/20101203/ippconfig/recipes/filerules-split.mdc =================================================================== --- branches/czw_branch/20101203/ippconfig/recipes/filerules-split.mdc (revision 30048) +++ branches/czw_branch/20101203/ippconfig/recipes/filerules-split.mdc (revision 30118) @@ -272,4 +272,9 @@ PPSUB.REF.CONV.VARIANCE OUTPUT {OUTPUT}.refConv.wt.fits VARIANCE COMP_WT FPA TRUE NONE +PPSUB.FORCED1.SOURCES OUTPUT {OUTPUT}.frc1.cmf CMF NONE FPA TRUE NONE +PPSUB.FORCED2.SOURCES OUTPUT {OUTPUT}.frc2.cmf CMF NONE FPA TRUE NONE +PPSUB.POS1.SOURCES OUTPUT {OUTPUT}.pos1.cmf CMF NONE FPA TRUE NONE +PPSUB.POS2.SOURCES OUTPUT {OUTPUT}.pos2.cmf CMF NONE 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 @@ -278,4 +283,5 @@ 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 Index: branches/czw_branch/20101203/ippconfig/recipes/nightly_science.config =================================================================== --- branches/czw_branch/20101203/ippconfig/recipes/nightly_science.config (revision 30048) +++ branches/czw_branch/20101203/ippconfig/recipes/nightly_science.config (revision 30118) @@ -82,5 +82,5 @@ NAME STR MD02 DISTRIBUTION STR MD02 - TESS STR MD02 + TESS STR MD02.V2 OBSMODE STR MD OBJECT STR MD02% @@ -104,5 +104,5 @@ NAME STR MD04 DISTRIBUTION STR MD04 - TESS STR MD04 + TESS STR MD04.V2 OBSMODE STR MD OBJECT STR MD04% Index: branches/czw_branch/20101203/ippconfig/recipes/ppImage.config =================================================================== --- branches/czw_branch/20101203/ippconfig/recipes/ppImage.config (revision 30048) +++ branches/czw_branch/20101203/ippconfig/recipes/ppImage.config (revision 30118) @@ -4,6 +4,6 @@ # List of tasks to perform +OVERSCAN BOOL TRUE # Overscan subtraction NONLIN BOOL FALSE # Non-linearity correction; not implemented -OVERSCAN BOOL TRUE # Overscan subtraction NOISEMAP BOOL FALSE # Apply read noise map BIAS BOOL TRUE # Bias subtraction @@ -162,4 +162,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -186,4 +187,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -209,4 +211,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -236,4 +239,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -260,4 +264,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -283,4 +288,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -306,4 +312,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -329,4 +336,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -345,23 +353,24 @@ # Dark subtraction only PPIMAGE_D METADATA - BASE.FITS BOOL TRUE # Save base detrended image? - BASE.MASK.FITS BOOL FALSE # Save base detrended image? - BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? - CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? - CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? - CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? - OVERSCAN BOOL FALSE # Overscan subtraction - BIAS BOOL FALSE # Bias subtraction - DARK BOOL TRUE # Dark subtraction - SHUTTER BOOL FALSE # Shutter correction - FLAT BOOL FALSE # Flat-field normalisation - MASK BOOL FALSE # Mask bad pixels - MASK.BUILD BOOL FALSE # Build internal mask? - FRINGE BOOL FALSE # Fringe subtraction - PHOTOM BOOL FALSE # Source identification and photometry - ASTROM.CHIP BOOL FALSE # Astrometry per chip? - ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? - BIN1.FITS BOOL TRUE # Save 1st binned chip image? - BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? END @@ -375,4 +384,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -398,4 +408,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -421,4 +432,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -444,4 +456,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -467,4 +480,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -490,4 +504,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -513,4 +528,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -536,4 +552,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -559,4 +576,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -589,4 +607,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -619,4 +638,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -642,4 +662,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -672,4 +693,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -695,4 +717,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -729,4 +752,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -752,4 +776,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -775,4 +800,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -798,4 +824,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -827,4 +854,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -856,4 +884,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -879,4 +908,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -896,4 +926,5 @@ PPIMAGE_JPEG METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -916,4 +947,6 @@ BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + MASK.SATURATED BOOL FALSE # DO NOT Mask the saturated pixels + MASK.LOW BOOL FALSE # DO NOT Mask the saturated pixels END @@ -921,4 +954,5 @@ PPIMAGE_J1 METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -945,4 +979,6 @@ BIN2.XBIN S32 1 # Image is already binned BIN2.YBIN S32 1 # Image is already binned + MASK.SATURATED BOOL FALSE # DO NOT Mask the saturated pixels + MASK.LOW BOOL FALSE # DO NOT Mask the saturated pixels END @@ -950,4 +986,5 @@ PPIMAGE_J2 METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -974,4 +1011,6 @@ BIN2.XBIN S32 1 # Image is already binned BIN2.YBIN S32 1 # Image is already binned + MASK.SATURATED BOOL FALSE # DO NOT Mask the saturated pixels + MASK.LOW BOOL FALSE # DO NOT Mask the saturated pixels END @@ -979,4 +1018,5 @@ PPIMAGE_OA METADATA OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -998,4 +1038,5 @@ PPIMAGE_OP METADATA OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1023,4 +1064,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1043,4 +1085,5 @@ PPIMAGE_J1_RESID_B METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1079,4 +1122,5 @@ PPIMAGE_J2_RESID_B METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1115,4 +1159,5 @@ PPIMAGE_J1_RESID_F METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1151,4 +1196,5 @@ PPIMAGE_J2_RESID_F METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1187,4 +1233,5 @@ PPIMAGE_J1_RESID_R METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1223,4 +1270,5 @@ PPIMAGE_J2_RESID_R METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1260,4 +1308,5 @@ PPIMAGE_J1_IMAGE_B METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1296,4 +1345,5 @@ PPIMAGE_J2_IMAGE_B METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1332,4 +1382,5 @@ PPIMAGE_J1_IMAGE_F METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1368,4 +1419,5 @@ PPIMAGE_J2_IMAGE_F METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1404,4 +1456,5 @@ PPIMAGE_J1_IMAGE_R METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1440,4 +1493,5 @@ PPIMAGE_J2_IMAGE_R METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1476,4 +1530,5 @@ PPIMAGE_J1_IMAGE_M METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1512,4 +1567,5 @@ PPIMAGE_J2_IMAGE_M METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1548,4 +1604,5 @@ PPIMAGE_J1_RESID_M METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1584,4 +1641,5 @@ PPIMAGE_J2_RESID_M METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1621,4 +1679,5 @@ PPIMAGE_MOSAIC METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1652,4 +1711,5 @@ PPIMAGE_CHIPMOSAIC METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -1688,6 +1748,6 @@ CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? - OVERSCAN BOOL FALSE # Overscan subtraction OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -1732,4 +1792,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -1762,4 +1823,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -1785,4 +1847,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Overscan subtraction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -1813,4 +1876,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -1840,4 +1904,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -1865,4 +1930,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction Index: branches/czw_branch/20101203/ippconfig/recipes/ppSub.config =================================================================== --- branches/czw_branch/20101203/ippconfig/recipes/ppSub.config (revision 30048) +++ branches/czw_branch/20101203/ippconfig/recipes/ppSub.config (revision 30118) @@ -72,4 +72,7 @@ PHOTOMETRY BOOL FALSE # Perform photometry? +FORCED.PHOTOMETRY.BOTH BOOL FALSE # forced photometry on input sources? +FORCED.PHOTOMETRY.INPUT1 BOOL FALSE # forced photometry on input sources? +FORCED.PHOTOMETRY.INPUT2 BOOL FALSE # forced photometry on input sources? # Recipe overrides for STACK @@ -112,4 +115,13 @@ PHOTOMETRY BOOL TRUE # Perform photometry? CONVOLVE.TARGET STR SINGLE2 # convolution direction +END + +# Difference of warp - stack +WARPSTACK_FORCED METADATA + DUAL BOOL FALSE # Dual convolution? + INVERSE BOOL FALSE # Generate inverse subtraction? + PHOTOMETRY BOOL TRUE # Perform photometry? + CONVOLVE.TARGET STR SINGLE2 # convolution direction + FORCED.PHOTOMETRY.BOTH BOOL TRUE # forced photometry on input sources END Index: branches/czw_branch/20101203/ippconfig/recipes/psastro.config =================================================================== --- branches/czw_branch/20101203/ippconfig/recipes/psastro.config (revision 30048) +++ branches/czw_branch/20101203/ippconfig/recipes/psastro.config (revision 30118) @@ -238,2 +238,6 @@ MOPS.TEST METADATA END + +SAS_REFERENCE METADATA +END + Index: branches/czw_branch/20101203/ippconfig/recipes/psphot.config =================================================================== --- branches/czw_branch/20101203/ippconfig/recipes/psphot.config (revision 30048) +++ branches/czw_branch/20101203/ippconfig/recipes/psphot.config (revision 30118) @@ -49,4 +49,5 @@ PEAKS_NMAX S32 5000 # on first pass, only keep NMAX peaks (0 == all) PEAKS_MIN_GAUSS F32 0.5 # On quick convolution, mask pixels for which the +PEAKS_POS2_NSIGMA_LIMIT F32 25.0 # peak signficance threshold for POS2 sources. (ppSub) # input pixels contribute less than this fraction of the flux # parameters which adjust the footprint analysis Index: branches/czw_branch/20101203/ippconfig/recipes/reductionClasses.mdc =================================================================== --- branches/czw_branch/20101203/ippconfig/recipes/reductionClasses.mdc (revision 30048) +++ branches/czw_branch/20101203/ippconfig/recipes/reductionClasses.mdc (revision 30118) @@ -173,4 +173,12 @@ WARPSTACK METADATA DIFF_PPSUB STR WARPSTACK + DIFF_PSPHOT STR DIFF + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 +END + +# reduction class specifically for warpstack diffs: +WARPSTACK_FORCED METADATA + DIFF_PPSUB STR WARPSTACK_FORCED DIFF_PSPHOT STR DIFF JPEG_BIN1 STR PPIMAGE_J1 @@ -535,2 +543,19 @@ END +SAS_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 SAS_REFERENCE + STACKPHOT STR STACKPHOT +END +