Index: trunk/ippconfig/gpc1/ppImage.config =================================================================== --- trunk/ippconfig/gpc1/ppImage.config (revision 33590) +++ trunk/ippconfig/gpc1/ppImage.config (revision 33636) @@ -159,4 +159,5 @@ BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction + NOISEMAP BOOL TRUE REMNANCE BOOL FALSE # Remnance masking SHUTTER BOOL FALSE # Shutter correction @@ -312,4 +313,36 @@ END END + +CHIP_NOISEMAP METADATA + BASE.FITS BOOL FALSE # 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 TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction + NOISEMAP BOOL TRUE + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + REMNANCE BOOL FALSE # Remnance masking + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? + MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails + PATTERN.ROW BOOL TRUE # Row pattern correction + PATTERN.CELL BOOL FALSE # Cell pattern correction + PATTERN.CONTINUITY BOOL TRUE # Cell pattern correction using edge continuity + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BACKGROUND BOOL TRUE # Subtract background? + CROSSTALK.MEASURE BOOL TRUE # Subtract model background? +END + # Standard chip processing Index: trunk/ippconfig/recipes/filerules-mef.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-mef.mdc (revision 33590) +++ trunk/ippconfig/recipes/filerules-mef.mdc (revision 33636) @@ -204,4 +204,5 @@ PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.NOISEMAP 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 Index: trunk/ippconfig/recipes/filerules-simple.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-simple.mdc (revision 33590) +++ trunk/ippconfig/recipes/filerules-simple.mdc (revision 33636) @@ -180,4 +180,5 @@ PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE +PPMERGE.OUTPUT.NOISEMAP OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.fits FRINGE NONE FPA TRUE SIMPLE PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.sigma.fits IMAGE NONE FPA TRUE SIMPLE Index: trunk/ippconfig/recipes/filerules-split.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-split.mdc (revision 33590) +++ trunk/ippconfig/recipes/filerules-split.mdc (revision 33636) @@ -198,4 +198,5 @@ PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.NOISEMAP OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.{CHIP.NAME}.fits FRINGE NONE CELL TRUE NONE PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.{CHIP.NAME}.sigma.fits IMAGE NONE CELL TRUE NONE Index: trunk/ippconfig/recipes/jpeg.mdc =================================================================== --- trunk/ippconfig/recipes/jpeg.mdc (revision 33590) +++ trunk/ippconfig/recipes/jpeg.mdc (revision 33636) @@ -236,4 +236,21 @@ END END +NOISEMAP METADATA + PPIMAGE.JPEG1 METADATA + COLORMAP STR rainbow + SCALE.MODE STR VALUE + SCALE.MIN F32 0.0 + SCALE.MAX F32 10.0 + OPTIONS STR +SB,-X,+Y + END + + PPIMAGE.JPEG2 METADATA + COLORMAP STR rainbow + SCALE.MODE STR VALUE + SCALE.MIN F32 0.0 + SCALE.MAX F32 10.0 + OPTIONS STR -SB,-X,+Y + END +END Index: trunk/ippconfig/recipes/ppImage.config =================================================================== --- trunk/ippconfig/recipes/ppImage.config (revision 33590) +++ trunk/ippconfig/recipes/ppImage.config (revision 33636) @@ -248,4 +248,28 @@ END +CHIP_NOISEMAP METADATA + BASE.FITS BOOL FALSE # 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 TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented + NOISEMAP BOOL TRUE + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL TRUE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BACKGROUND BOOL TRUE # Subtract background? + MASK.STATS BOOL TRUE # Calculate Mask statistics. +END @@ -1886,5 +1910,5 @@ OVERSCAN BOOL TRUE # Overscan subtraction NONLIN BOOL FALSE # Non-linearity correction; not implemented - BIAS BOOL TRUE # Bias subtraction + BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction SHUTTER BOOL FALSE # Shutter correction @@ -1912,4 +1936,29 @@ # END END +PPIMAGE_NM 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 + NONLIN BOOL FALSE # Non-linearity correction; not implemented + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL TRUE # 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? + NOISEMAP BOOL TRUE + CHECK.NOISE BOOL TRUE + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + # For SDSS cameras Index: trunk/ippconfig/recipes/ppMerge.config =================================================================== --- trunk/ippconfig/recipes/ppMerge.config (revision 33590) +++ trunk/ippconfig/recipes/ppMerge.config (revision 33636) @@ -123,4 +123,12 @@ END + +PPMERGE_NOISEMAP METADATA + REJ F32 3.0 + ITER S32 2 + VARIANCES BOOL FALSE + COMBINE STR MEAN +END + # Shutter generation --- already included in default, above PPMERGE_SHUTTER METADATA Index: trunk/ippconfig/recipes/reductionClasses.mdc =================================================================== --- trunk/ippconfig/recipes/reductionClasses.mdc (revision 33590) +++ trunk/ippconfig/recipes/reductionClasses.mdc (revision 33636) @@ -140,4 +140,11 @@ FRINGE_JPEG_IMAGE STR FRINGE FRINGE_JPEG_RESID STR FRINGE_RESID + + NOISEMAP_PROCESS STR PPIMAGE_NOISEMAP + NOISEMAP_RESID STR PPIMAGE_NM + NOISEMAP_VERIFY STR PPIMAGE_NM + NOISEMAP_STACK STR PPMERGE_NOISEMAP + NOISEMAP_JPEG_IMAGE STR NOISEMAP + NOISEMAP_JPEG_RESID STR NOISEMAP END @@ -311,4 +318,30 @@ BACKGROUND_PSWARP STR BACKGROUND END + +DEFAULT_NMTEST METADATA + CHIP_PPIMAGE STR CHIP_NOISEMAP + 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 DEFAULT_RECIPE + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND + PSVIDEOPHOT STR PSVIDEOPHOT + STATICSKY_CALIBRATION STR STATICSKY_CAL +END + + # SSTF tests Index: trunk/ippconfig/recipes/rejections.config =================================================================== --- trunk/ippconfig/recipes/rejections.config (revision 33590) +++ trunk/ippconfig/recipes/rejections.config (revision 33636) @@ -459,4 +459,28 @@ END +NOISEMAP METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 0.0 + IMFILE.STDEV F32 0.0 + IMFILE.MEANSTDEV F32 0.0 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SNR F32 0.0 + IMFILE.BIN.STDEV F32 0.0 + IMFILE.BIN.SNR F32 0.0 + IMFILE.FLUX F32 0.0 + EXP.MEAN F32 0.0 + EXP.STDEV F32 0.0 + EXP.MEANSTDEV F32 0.0 + EXP.SNR F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SNR F32 0.0 + EXP.FLUX F32 0.0 + ENSEMBLE.MEAN F32 0.0 + ENSEMBLE.STDEV F32 0.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END + # FILTER is an additional qualifier, and may be "*" (or absent!), in which case it matches everything # EXPECTED is the expected mean value