Index: /trunk/ippconfig/isp/camera.config =================================================================== --- /trunk/ippconfig/isp/camera.config (revision 9330) +++ /trunk/ippconfig/isp/camera.config (revision 9331) @@ -23,7 +23,9 @@ PPIMAGE_OB STR isp/ppImage_ob.config # Overscan, bias only PPIMAGE_OBD STR isp/ppImage_obd.config # Overscan, bias, dark only - PPIMAGE_OBDF STR isp/ppImage_obdf.config # Overscan, bias, dark, flat only + PPIMAGE_OBDS STR isp/ppImage_obds.config # Overscan, bias, dark, shutter only + PPIMAGE_OBDSF STR isp/ppImage_obdsf.config # Overscan, bias, dark, shutter, flat only PPIMAGE_B STR isp/ppImage_b.config # Bias only PPIMAGE_D STR isp/ppImage_d.config # Dark only + PPIMAGE_S STR isp/ppImage_s.config # Shutter only PPIMAGE_F STR isp/ppImage_f.config # Flat only PPIMAGE_J1 STR isp/ppImage_j1.config # JPEG only @@ -32,8 +34,8 @@ # Recipes for ppMerge - PPMERGE STR ppMerge_template.config # ppMerge recipe PPMERGE_BIAS STR isp/ppMerge_bias.config PPMERGE_DARK STR isp/ppMerge_dark.config PPMERGE_FLAT STR isp/ppMerge_flat.config + PPMERGE_SHUTTER STR isp/ppMerge_shutter.config # Recipes for ppStats @@ -58,5 +60,6 @@ PPIMAGE.BIAS INPUT /data/alala/price/isp/bias/ISP.bias.1.0.isp.fits NONE NONE NONE IMAGE CHIP PPIMAGE.DARK INPUT /data/alala/price/isp/dark/ISP.dark.2.0.isp.fits NONE NONE NONE IMAGE CHIP - PPIMAGE.FLAT INPUT /data/alala/price/isp/flat/ISP.flat.3.0.isp.fits NONE NONE NONE IMAGE CHIP + PPIMAGE.SHUTTER INPUT /data/alala/price/isp/shutter/ISP.shutter.3.0.isp.fits NONE NONE NONE IMAGE CHIP + PPIMAGE.FLAT INPUT /data/alala/price/isp/flat/ISP.flat.4.0.isp.fits NONE NONE NONE IMAGE CHIP PPIMAGE.MASK INPUT mask.fits NONE NONE NONE IMAGE CHIP Index: /trunk/ippconfig/isp/ppImage.config =================================================================== --- /trunk/ippconfig/isp/ppImage.config (revision 9330) +++ /trunk/ippconfig/isp/ppImage.config (revision 9331) @@ -3,9 +3,10 @@ # List of tasks to perform MASK BOOL FALSE # Mask bad pixels -MASK.VALUE U8 0x10 # only mask pixels matching this bitmask +MASK.VALUE U8 0xff # only mask pixels matching this bitmask NONLIN BOOL FALSE # Non-linearity correction OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction +SHUTTER BOOL TRUE # Shutter correction FLAT BOOL TRUE # Flat-field normalisation FRINGE BOOL FALSE # Fringe subtraction Index: /trunk/ippconfig/isp/ppImage_b.config =================================================================== --- /trunk/ippconfig/isp/ppImage_b.config (revision 9330) +++ /trunk/ippconfig/isp/ppImage_b.config (revision 9331) @@ -3,9 +3,10 @@ # List of tasks to perform MASK BOOL FALSE # Mask bad pixels -MASK.VALUE U8 0x10 # only mask pixels matching this bitmask +MASK.VALUE U8 0xff # only mask pixels matching this bitmask NONLIN BOOL FALSE # Non-linearity correction OVERSCAN BOOL FALSE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL FALSE # Dark subtraction +SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation FRINGE BOOL FALSE # Fringe subtraction Index: /trunk/ippconfig/isp/ppImage_d.config =================================================================== --- /trunk/ippconfig/isp/ppImage_d.config (revision 9330) +++ /trunk/ippconfig/isp/ppImage_d.config (revision 9331) @@ -3,9 +3,10 @@ # List of tasks to perform MASK BOOL FALSE # Mask bad pixels -MASK.VALUE U8 0x10 # only mask pixels matching this bitmask +MASK.VALUE U8 0xff # only mask pixels matching this bitmask NONLIN BOOL FALSE # Non-linearity correction 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 FRINGE BOOL FALSE # Fringe subtraction Index: /trunk/ippconfig/isp/ppImage_f.config =================================================================== --- /trunk/ippconfig/isp/ppImage_f.config (revision 9330) +++ /trunk/ippconfig/isp/ppImage_f.config (revision 9331) @@ -3,9 +3,10 @@ # List of tasks to perform MASK BOOL FALSE # Mask bad pixels -MASK.VALUE U8 0x10 # only mask pixels matching this bitmask +MASK.VALUE U8 0xff # only mask pixels matching this bitmask NONLIN BOOL FALSE # Non-linearity correction OVERSCAN BOOL FALSE # Overscan subtraction BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction +SHUTTER BOOL FALSE # Shutter correction FLAT BOOL TRUE # Flat-field normalisation FRINGE BOOL FALSE # Fringe subtraction Index: /trunk/ippconfig/isp/ppImage_j1.config =================================================================== --- /trunk/ippconfig/isp/ppImage_j1.config (revision 9330) +++ /trunk/ippconfig/isp/ppImage_j1.config (revision 9331) @@ -11,4 +11,5 @@ BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction +SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation FRINGE BOOL FALSE # Fringe subtraction Index: /trunk/ippconfig/isp/ppImage_j2.config =================================================================== --- /trunk/ippconfig/isp/ppImage_j2.config (revision 9330) +++ /trunk/ippconfig/isp/ppImage_j2.config (revision 9331) @@ -11,4 +11,5 @@ BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction +SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation FRINGE BOOL FALSE # Fringe subtraction Index: /trunk/ippconfig/isp/ppImage_n.config =================================================================== --- /trunk/ippconfig/isp/ppImage_n.config (revision 9330) +++ /trunk/ippconfig/isp/ppImage_n.config (revision 9331) @@ -8,4 +8,5 @@ BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction +SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation FRINGE BOOL FALSE # Fringe subtraction @@ -14,5 +15,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry -BASE.FITS BOOL TRUE # Save base detrended image? +BASE.FITS BOOL FALSE # Save base detrended image? CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? FPA1.FITS BOOL FALSE # Save 1st binned fpa image? Index: /trunk/ippconfig/isp/ppImage_o.config =================================================================== --- /trunk/ippconfig/isp/ppImage_o.config (revision 9330) +++ /trunk/ippconfig/isp/ppImage_o.config (revision 9331) @@ -3,9 +3,10 @@ # List of tasks to perform MASK BOOL FALSE # Mask bad pixels -MASK.VALUE U8 0x10 # only mask pixels matching this bitmask +MASK.VALUE U8 0xff # only mask pixels matching this bitmask NONLIN BOOL FALSE # Non-linearity correction OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction +SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation FRINGE BOOL FALSE # Fringe subtraction Index: /trunk/ippconfig/isp/ppImage_ob.config =================================================================== --- /trunk/ippconfig/isp/ppImage_ob.config (revision 9330) +++ /trunk/ippconfig/isp/ppImage_ob.config (revision 9331) @@ -3,9 +3,10 @@ # List of tasks to perform MASK BOOL FALSE # Mask bad pixels -MASK.VALUE U8 0x10 # only mask pixels matching this bitmask +MASK.VALUE U8 0xff # only mask pixels matching this bitmask NONLIN BOOL FALSE # Non-linearity correction OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL FALSE # Dark subtraction +SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation FRINGE BOOL FALSE # Fringe subtraction Index: /trunk/ippconfig/isp/ppImage_obd.config =================================================================== --- /trunk/ippconfig/isp/ppImage_obd.config (revision 9330) +++ /trunk/ippconfig/isp/ppImage_obd.config (revision 9331) @@ -3,9 +3,10 @@ # List of tasks to perform MASK BOOL FALSE # Mask bad pixels -MASK.VALUE U8 0x10 # only mask pixels matching this bitmask +MASK.VALUE U8 0xff # only mask pixels matching this bitmask NONLIN BOOL FALSE # Non-linearity correction OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction +SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation FRINGE BOOL FALSE # Fringe subtraction Index: unk/ippconfig/isp/ppImage_obdf.config =================================================================== --- /trunk/ippconfig/isp/ppImage_obdf.config (revision 9330) +++ (revision ) @@ -1,82 +1,0 @@ -### Phase 2 recipe configuration file - -# List of tasks to perform -MASK BOOL FALSE # Mask bad pixels -MASK.VALUE U8 0x10 # only mask pixels matching this bitmask -NONLIN BOOL FALSE # Non-linearity correction -OVERSCAN BOOL TRUE # Overscan subtraction -BIAS BOOL TRUE # Bias subtraction -DARK BOOL TRUE # Dark subtraction -FLAT BOOL TRUE # Flat-field normalisation -FRINGE BOOL FALSE # Fringe subtraction -PHOTOM BOOL FALSE # Source identification and photometry -ASTROM.CHIP BOOL FALSE -ASTROM.MOSAIC BOOL FALSE # Astrometry - -BASE.FITS BOOL TRUE # Save base detrended image? -CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? -FPA1.FITS BOOL FALSE # Save 1st binned fpa image? -FPA2.FITS BOOL FALSE # Save 2nd binned fpa image? -BIN1.FITS BOOL TRUE # Save 1st binned chip image? -BIN2.FITS BOOL TRUE # Save 2nd binned chip image? -BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? -BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? - -# Non-linearity correction -NONLIN.SOURCE STR CHIP.NAME # How to determine the source -#@NONLIN.DATA F32 0.0 1.001 0.001 # A polynomial -NONLIN.DATA STR nonlin.dat # Filename for lookup table -#NONLIN.DATA METADATA # Source of non-linearity data -# ccd00 STR nonlin00.dat # A lookup table -# @ccd01 F32 0.0 1.001 0.001 # A polynomial -# @ccd02 F32 0.0 1.001 0.001 # A polynomial -# @ccd03 F32 1.2345 # A polynomial -# @ccd04 F32 0.0 1.001 0.001 # A polynomial -# @ccd05 F32 0.0 1.001 0.001 # A polynomial -# @ccd06 F32 0.0 1.001 0.001 # A polynomial -# @ccd07 F32 0.0 1.001 0.001 # A polynomial -# @ccd08 F32 0.0 1.001 0.001 # A polynomial -# @ccd09 F32 0.0 1.001 0.001 # A polynomial -# @ccd10 F32 0.0 1.001 0.001 # A polynomial -# @ccd11 F32 0.0 1.001 0.001 # A polynomial -# @ccd12 F32 0.0 1.001 0.001 # A polynomial -# @ccd13 F32 0.0 1.001 0.001 # A polynomial -# @ccd14 F32 0.0 1.001 0.001 # A polynomial -# @ccd15 F32 0.0 1.001 0.001 # A polynomial -# @ccd16 F32 0.0 1.001 0.001 # A polynomial -# @ccd17 F32 0.0 1.001 0.001 # A polynomial -# @ccd18 F32 0.0 1.001 0.001 # A polynomial -# @ccd19 F32 0.0 1.001 0.001 # A polynomial -# @ccd10 F32 0.0 1.001 0.001 # A polynomial -# @ccd21 F32 0.0 1.001 0.001 # A polynomial -# @ccd22 F32 0.0 1.001 0.001 # A polynomial -# @ccd23 F32 0.0 1.001 0.001 # A polynomial -# @ccd24 F32 0.0 1.001 0.001 # A polynomial -# @ccd25 F32 0.0 1.001 0.001 # A polynomial -# @ccd26 F32 0.0 1.001 0.001 # A polynomial -# @ccd27 F32 0.0 1.001 0.001 # A polynomial -# @ccd28 F32 0.0 1.001 0.001 # A polynomial -# @ccd29 F32 0.0 1.001 0.001 # A polynomial -# @ccd30 F32 0.0 1.001 0.001 # A polynomial -# @ccd31 F32 0.0 1.001 0.001 # A polynomial -# @ccd32 F32 0.0 1.001 0.001 # A polynomial -# @ccd33 F32 0.0 1.001 0.001 # A polynomial -# @ccd34 F32 0.0 1.001 0.001 # A polynomial -# @ccd35 F32 0.0 1.001 0.001 # A polynomial -# @ccd36 F32 0.0 1.001 0.001 # A polynomial -#END - -# Overscan subtraction -OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? -#OVERSCAN.FIT STR SPLINE # NONE | POLYNOMIAL | SPLINE -OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE -OVERSCAN.ORDER S32 5 # Order of polynomial fit -OVERSCAN.STAT STR MEAN # MEAN | MEDIAN - -# binned output image options -BIN1.XBIN S32 8 -BIN1.YBIN S32 8 -BIN2.XBIN S32 64 -BIN2.YBIN S32 64 - -PHOTCODE.RULE STR {CAMERA}.{FILTER.ID}.{CHIP.N} Index: /trunk/ippconfig/isp/ppImage_obds.config =================================================================== --- /trunk/ippconfig/isp/ppImage_obds.config (revision 9331) +++ /trunk/ippconfig/isp/ppImage_obds.config (revision 9331) @@ -0,0 +1,83 @@ +### Phase 2 recipe configuration file + +# List of tasks to perform +MASK BOOL FALSE # Mask bad pixels +MASK.VALUE U8 0xff # only mask pixels matching this bitmask +NONLIN BOOL FALSE # Non-linearity correction +OVERSCAN BOOL TRUE # Overscan subtraction +BIAS BOOL TRUE # Bias subtraction +DARK BOOL TRUE # Dark subtraction +SHUTTER BOOL TRUE # Shutter correction +FLAT BOOL FALSE # Flat-field normalisation +FRINGE BOOL FALSE # Fringe subtraction +PHOTOM BOOL FALSE # Source identification and photometry +ASTROM.CHIP BOOL FALSE +ASTROM.MOSAIC BOOL FALSE # Astrometry + +BASE.FITS BOOL TRUE # Save base detrended image? +CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? +FPA1.FITS BOOL FALSE # Save 1st binned fpa image? +FPA2.FITS BOOL FALSE # Save 2nd binned fpa image? +BIN1.FITS BOOL TRUE # Save 1st binned chip image? +BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? +BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + +# Non-linearity correction +NONLIN.SOURCE STR CHIP.NAME # How to determine the source +#@NONLIN.DATA F32 0.0 1.001 0.001 # A polynomial +NONLIN.DATA STR nonlin.dat # Filename for lookup table +#NONLIN.DATA METADATA # Source of non-linearity data +# ccd00 STR nonlin00.dat # A lookup table +# @ccd01 F32 0.0 1.001 0.001 # A polynomial +# @ccd02 F32 0.0 1.001 0.001 # A polynomial +# @ccd03 F32 1.2345 # A polynomial +# @ccd04 F32 0.0 1.001 0.001 # A polynomial +# @ccd05 F32 0.0 1.001 0.001 # A polynomial +# @ccd06 F32 0.0 1.001 0.001 # A polynomial +# @ccd07 F32 0.0 1.001 0.001 # A polynomial +# @ccd08 F32 0.0 1.001 0.001 # A polynomial +# @ccd09 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd11 F32 0.0 1.001 0.001 # A polynomial +# @ccd12 F32 0.0 1.001 0.001 # A polynomial +# @ccd13 F32 0.0 1.001 0.001 # A polynomial +# @ccd14 F32 0.0 1.001 0.001 # A polynomial +# @ccd15 F32 0.0 1.001 0.001 # A polynomial +# @ccd16 F32 0.0 1.001 0.001 # A polynomial +# @ccd17 F32 0.0 1.001 0.001 # A polynomial +# @ccd18 F32 0.0 1.001 0.001 # A polynomial +# @ccd19 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd21 F32 0.0 1.001 0.001 # A polynomial +# @ccd22 F32 0.0 1.001 0.001 # A polynomial +# @ccd23 F32 0.0 1.001 0.001 # A polynomial +# @ccd24 F32 0.0 1.001 0.001 # A polynomial +# @ccd25 F32 0.0 1.001 0.001 # A polynomial +# @ccd26 F32 0.0 1.001 0.001 # A polynomial +# @ccd27 F32 0.0 1.001 0.001 # A polynomial +# @ccd28 F32 0.0 1.001 0.001 # A polynomial +# @ccd29 F32 0.0 1.001 0.001 # A polynomial +# @ccd30 F32 0.0 1.001 0.001 # A polynomial +# @ccd31 F32 0.0 1.001 0.001 # A polynomial +# @ccd32 F32 0.0 1.001 0.001 # A polynomial +# @ccd33 F32 0.0 1.001 0.001 # A polynomial +# @ccd34 F32 0.0 1.001 0.001 # A polynomial +# @ccd35 F32 0.0 1.001 0.001 # A polynomial +# @ccd36 F32 0.0 1.001 0.001 # A polynomial +#END + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +#OVERSCAN.FIT STR SPLINE # NONE | POLYNOMIAL | SPLINE +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 5 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +# binned output image options +BIN1.XBIN S32 8 +BIN1.YBIN S32 8 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +PHOTCODE.RULE STR {CAMERA}.{FILTER.ID}.{CHIP.N} Index: /trunk/ippconfig/isp/ppImage_obdsf.config =================================================================== --- /trunk/ippconfig/isp/ppImage_obdsf.config (revision 9331) +++ /trunk/ippconfig/isp/ppImage_obdsf.config (revision 9331) @@ -0,0 +1,83 @@ +### Phase 2 recipe configuration file + +# List of tasks to perform +MASK BOOL FALSE # Mask bad pixels +MASK.VALUE U8 0xff # only mask pixels matching this bitmask +NONLIN BOOL FALSE # Non-linearity correction +OVERSCAN BOOL TRUE # Overscan subtraction +BIAS BOOL TRUE # Bias subtraction +DARK BOOL TRUE # Dark subtraction +SHUTTER BOOL TRUE # Shutter correction +FLAT BOOL TRUE # Flat-field normalisation +FRINGE BOOL FALSE # Fringe subtraction +PHOTOM BOOL FALSE # Source identification and photometry +ASTROM.CHIP BOOL FALSE +ASTROM.MOSAIC BOOL FALSE # Astrometry + +BASE.FITS BOOL TRUE # Save base detrended image? +CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? +FPA1.FITS BOOL FALSE # Save 1st binned fpa image? +FPA2.FITS BOOL FALSE # Save 2nd binned fpa image? +BIN1.FITS BOOL TRUE # Save 1st binned chip image? +BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? +BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + +# Non-linearity correction +NONLIN.SOURCE STR CHIP.NAME # How to determine the source +#@NONLIN.DATA F32 0.0 1.001 0.001 # A polynomial +NONLIN.DATA STR nonlin.dat # Filename for lookup table +#NONLIN.DATA METADATA # Source of non-linearity data +# ccd00 STR nonlin00.dat # A lookup table +# @ccd01 F32 0.0 1.001 0.001 # A polynomial +# @ccd02 F32 0.0 1.001 0.001 # A polynomial +# @ccd03 F32 1.2345 # A polynomial +# @ccd04 F32 0.0 1.001 0.001 # A polynomial +# @ccd05 F32 0.0 1.001 0.001 # A polynomial +# @ccd06 F32 0.0 1.001 0.001 # A polynomial +# @ccd07 F32 0.0 1.001 0.001 # A polynomial +# @ccd08 F32 0.0 1.001 0.001 # A polynomial +# @ccd09 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd11 F32 0.0 1.001 0.001 # A polynomial +# @ccd12 F32 0.0 1.001 0.001 # A polynomial +# @ccd13 F32 0.0 1.001 0.001 # A polynomial +# @ccd14 F32 0.0 1.001 0.001 # A polynomial +# @ccd15 F32 0.0 1.001 0.001 # A polynomial +# @ccd16 F32 0.0 1.001 0.001 # A polynomial +# @ccd17 F32 0.0 1.001 0.001 # A polynomial +# @ccd18 F32 0.0 1.001 0.001 # A polynomial +# @ccd19 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd21 F32 0.0 1.001 0.001 # A polynomial +# @ccd22 F32 0.0 1.001 0.001 # A polynomial +# @ccd23 F32 0.0 1.001 0.001 # A polynomial +# @ccd24 F32 0.0 1.001 0.001 # A polynomial +# @ccd25 F32 0.0 1.001 0.001 # A polynomial +# @ccd26 F32 0.0 1.001 0.001 # A polynomial +# @ccd27 F32 0.0 1.001 0.001 # A polynomial +# @ccd28 F32 0.0 1.001 0.001 # A polynomial +# @ccd29 F32 0.0 1.001 0.001 # A polynomial +# @ccd30 F32 0.0 1.001 0.001 # A polynomial +# @ccd31 F32 0.0 1.001 0.001 # A polynomial +# @ccd32 F32 0.0 1.001 0.001 # A polynomial +# @ccd33 F32 0.0 1.001 0.001 # A polynomial +# @ccd34 F32 0.0 1.001 0.001 # A polynomial +# @ccd35 F32 0.0 1.001 0.001 # A polynomial +# @ccd36 F32 0.0 1.001 0.001 # A polynomial +#END + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +#OVERSCAN.FIT STR SPLINE # NONE | POLYNOMIAL | SPLINE +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 5 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +# binned output image options +BIN1.XBIN S32 8 +BIN1.YBIN S32 8 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +PHOTCODE.RULE STR {CAMERA}.{FILTER.ID}.{CHIP.N} Index: /trunk/ippconfig/isp/ppMerge_bias.config =================================================================== --- /trunk/ippconfig/isp/ppMerge_bias.config (revision 9330) +++ /trunk/ippconfig/isp/ppMerge_bias.config (revision 9331) @@ -9,6 +9,7 @@ FRACLOW F32 0.1 # Fraction of low pixels to reject immediately NKEEP S32 5 # Minimum number of pixels in stack to keep +SHUTTERSIZE S32 128 # Size of shutter regions for statistics MASKVAL S32 0xff # Mask value for input data -### Statistics options: MEAN | MEDIAN | ROBUST | FITTED | CLIPPED COMBINE STR MEAN # Statistic to use for combination: -BACKGROUND STR MEDIAN # Statistic to use to measure the background +MEAN STR ROBUST_MEDIAN # Statistic to use to measure the mean +STDEV STR ROBUST_STDEV # Statistic to use to measure the stdev Index: /trunk/ippconfig/isp/ppMerge_dark.config =================================================================== --- /trunk/ippconfig/isp/ppMerge_dark.config (revision 9330) +++ /trunk/ippconfig/isp/ppMerge_dark.config (revision 9331) @@ -9,6 +9,7 @@ FRACLOW F32 0.1 # Fraction of low pixels to reject immediately NKEEP S32 5 # Minimum number of pixels in stack to keep +SHUTTERSIZE S32 128 # Size of shutter regions for statistics MASKVAL S32 0xff # Mask value for input data -### Statistics options: MEAN | MEDIAN | ROBUST | FITTED | CLIPPED COMBINE STR MEAN # Statistic to use for combination: -BACKGROUND STR MEDIAN # Statistic to use to measure the background +MEAN STR ROBUST_MEDIAN # Statistic to use to measure the mean +STDEV STR ROBUST_STDEV # Statistic to use to measure the stdev Index: /trunk/ippconfig/isp/ppMerge_flat.config =================================================================== --- /trunk/ippconfig/isp/ppMerge_flat.config (revision 9330) +++ /trunk/ippconfig/isp/ppMerge_flat.config (revision 9331) @@ -9,6 +9,7 @@ FRACLOW F32 0.1 # Fraction of low pixels to reject immediately NKEEP S32 5 # Minimum number of pixels in stack to keep +SHUTTERSIZE S32 128 # Size of shutter regions for statistics MASKVAL S32 0xff # Mask value for input data -### Statistics options: MEAN | MEDIAN | ROBUST | FITTED | CLIPPED COMBINE STR MEAN # Statistic to use for combination: -BACKGROUND STR MEDIAN # Statistic to use to measure the background +MEAN STR ROBUST_MEDIAN # Statistic to use to measure the mean +STDEV STR ROBUST_STDEV # Statistic to use to measure the stdev Index: /trunk/ippconfig/isp/ppMerge_shutter.config =================================================================== --- /trunk/ippconfig/isp/ppMerge_shutter.config (revision 9331) +++ /trunk/ippconfig/isp/ppMerge_shutter.config (revision 9331) @@ -0,0 +1,15 @@ +# Recipe configuration for ppMerge + +ROWS S32 128 # Number of rows to read at once +ELECTRONS F32 100.0 # Minimum number of electrons for useful signal +SAMPLE S32 100 # Sampling factor for measuring the background +REJ F32 3.0 # Rejection threshold (sigma) +ITER S32 1 # Number of rejection iterations +FRACHIGH F32 0.3 # Fraction of high pixels to reject immediately +FRACLOW F32 0.1 # Fraction of low pixels to reject immediately +NKEEP S32 5 # Minimum number of pixels in stack to keep +SHUTTERSIZE S32 128 # Size of shutter regions for statistics +MASKVAL S32 0xff # Mask value for input data +COMBINE STR MEAN # Statistic to use for combination: +MEAN STR ROBUST_MEDIAN # Statistic to use to measure the mean +STDEV STR ROBUST_STDEV # Statistic to use to measure the stdev