Index: branches/eam_branches/20091201/ippconfig/recipes/ppImage.config =================================================================== --- branches/eam_branches/20091201/ippconfig/recipes/ppImage.config (revision 26881) +++ branches/eam_branches/20091201/ippconfig/recipes/ppImage.config (revision 26882) @@ -137,4 +137,6 @@ FRINGE.FILTERS STR UNDEF +GAIN.OVERRIDE BOOL FALSE # Override a non-finite gain? + DETREND.CONSTRAINTS METADATA END @@ -430,5 +432,5 @@ SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation - MASK BOOL FALSE # Mask bad pixels + MASK BOOL TRUE # Mask bad pixels FRINGE BOOL TRUE # Fringe subtraction PHOTOM BOOL FALSE # Source identification and photometry @@ -1715,4 +1717,29 @@ END +PR_NOPATTERN 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 + 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 + FRINGE BOOL FALSE # Fringe subtraction + PATTERN.ROW BOOL FALSE # Subtract pattern noise + PATTERN.CELL BOOL FALSE # Subtract pattern noise + 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 FALSE # Subtract background? + CROSSTALK.MEASURE BOOL TRUE # Subtract model background? +END # Standard chip processing with pattern subtraction @@ -1730,5 +1757,6 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels - PATTERN BOOL TRUE # Subtract pattern noise? + PATTERN.ROW BOOL FALSE # Subtract pattern noise + PATTERN.CELL BOOL FALSE # Subtract pattern noise FRINGE BOOL TRUE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? Index: branches/eam_branches/20091201/ippconfig/recipes/ppMerge.config =================================================================== --- branches/eam_branches/20091201/ippconfig/recipes/ppMerge.config (revision 26881) +++ branches/eam_branches/20091201/ippconfig/recipes/ppMerge.config (revision 26882) @@ -43,4 +43,6 @@ STATS.BY.CHIP BOOL TRUE # measure stats for masking by chip (or by readout) MASK.GROW.NPIX S32 3 # measure stats for masking by chip (or by readout) + +GAIN.OVERRIDE BOOL FALSE # Override non-finite gain? # Ordinates for fitting dark current Index: branches/eam_branches/20091201/ippconfig/recipes/ppStack.config =================================================================== --- branches/eam_branches/20091201/ippconfig/recipes/ppStack.config (revision 26881) +++ branches/eam_branches/20091201/ippconfig/recipes/ppStack.config (revision 26882) @@ -8,5 +8,9 @@ COMBINE.SYS F32 0.1 # Relative systematic error in combination COMBINE.DISCARD F32 0.2 # Discard fraction for Olympic weighted mean -MASK.VAL STR MASK.VALUE,CONV.BAD # Mask value of input bad pixels + +# XXX which of these is right? +MASK.VAL STR MASK.VALUE,CONV.BAD,GHOST # Mask value of input bad pixels +MASK.IN STR MASK.VALUE,CONV.BAD,GHOST # Mask value of input bad pixels + MASK.SUSPECT STR SUSPECT,CONV.POOR # Mask value of suspect pixels MASK.BAD STR BLANK # Mask value to give bad pixels Index: branches/eam_branches/20091201/ippconfig/recipes/ppStatsFromMetadata.config =================================================================== --- branches/eam_branches/20091201/ippconfig/recipes/ppStatsFromMetadata.config (revision 26881) +++ branches/eam_branches/20091201/ippconfig/recipes/ppStatsFromMetadata.config (revision 26882) @@ -400,2 +400,14 @@ END +STREAKSREMOVE METADATA + ENTRY MULTI + TYPE VAL KEYWORD TYPE STATISTIC FLAG + ENTRY VAL STREAK_FRACTION F32 CONSTANT -streak_frac # fraction of pixels masked by streaks + ENTRY VAL TOTAL_TIME F32 CONSTANT -run_time # total run time for streaksremove + + # The following timers are included in the stats not saved in the datbase +# ENTRY VAL GET_STREAK_PIXELS F32 CONSTANT -dtime_compute_masked # time to compute list of streak pixels +# ENTRY VAL REMOVE_STREAKS F32 CONSTANT -dtime_remove # time to mask the pixels +# ENTRY VAL WRITE_IMAGES F32 CONSTANT -dtime_write # time to write out the results +# ENTRY VAL REPLICATE_OUTPUTS F32 CONSTANT -dtime_replicate # time to replicate the outputs +END Index: branches/eam_branches/20091201/ippconfig/recipes/rejections.config =================================================================== --- branches/eam_branches/20091201/ippconfig/recipes/rejections.config (revision 26881) +++ branches/eam_branches/20091201/ippconfig/recipes/rejections.config (revision 26882) @@ -312,4 +312,30 @@ ENSEMBLE.MEANSTDEV F32 3.0 END + +SKYFLATTEST_RAW 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 3.0 +END + + SKYFLAT_PREMASK METADATA