Index: /trunk/ippconfig/ipprc.config =================================================================== --- /trunk/ippconfig/ipprc.config (revision 8614) +++ /trunk/ippconfig/ipprc.config (revision 8615) @@ -30,21 +30,5 @@ LOGDEST STR STDERR # Log destination TRACE METADATA # Trace levels - pmFPAPrint S32 10 - pmHDUPrint S32 10 -# ppMergeCheckInputs S32 7 -# ppMergeScaleZero S32 10 -# pmFlatNormalize S32 10 -# pmHDUWrite S32 10 -# ppImageLoadPixels S32 10 -# pmFPAWrite S32 10 -# pmFPARead S32 10 -# pmSubtractBias S32 10 -# ppDetrendBias S32 10 -# psModule.concepts S32 10 -# pmConfigRead S32 10 -# pmFPAWriteMask S32 10 -# pmFPAWriteWeight S32 10 -# pmChipMosaic S32 10 - + #err S32 10 END Index: /trunk/ippconfig/megacam/camera.config =================================================================== --- /trunk/ippconfig/megacam/camera.config (revision 8614) +++ /trunk/ippconfig/megacam/camera.config (revision 8615) @@ -94,5 +94,8 @@ PPIMAGE_D STR megacam/ppImage_d.config # Dark only PPIMAGE_F STR megacam/ppImage_f.config # Flat only + PPIMAGE_J STR megacam/ppImage_j.config # JPEG only + # Recipes for ppMerge + PPMERGE_BIAS STR megacam/ppMerge_bias.config # Other recipes PPMERGE STR ppMerge_template.config # ppMerge recipe @@ -104,5 +107,7 @@ FILERULES METADATA - PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT.SPL + PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT.MEF + PPIMAGE.BIN1 STR PPIMAGE.BIN1.MEF + PPIMAGE.BIN2 STR PPIMAGE.BIN2.MEF PSASTRO.INPUT STR PSASTRO.INPUT.CMP PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP @@ -134,5 +139,5 @@ TYPE OUTPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.LEVEL DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE - PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.fit {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.mc.fit {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE NONE PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.mos.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE MEGACAM_CHIP:MOSAIC @@ -140,6 +145,9 @@ PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit NONE NONE NONE FPA FPA IMAGE TRUE MEGACAM_FPA:MOSAIC - PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit NONE NONE NONE CHIP CHIP IMAGE TRUE MEGACAM_CHIP:MOSAIC - PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit NONE NONE NONE CHIP CHIP IMAGE TRUE MEGACAM_CHIP:MOSAIC + PPIMAGE.BIN1.SPL OUTPUT {OUTPUT}.mc.b1.fit NONE NONE NONE CHIP CHIP IMAGE TRUE MEGACAM_CHIP:MOSAIC + PPIMAGE.BIN2.SPL OUTPUT {OUTPUT}.mc.b2.fit NONE NONE NONE CHIP CHIP IMAGE TRUE MEGACAM_CHIP:MOSAIC + PPIMAGE.BIN1.MEF OUTPUT {OUTPUT}.mc.b1.fit NONE NONE NONE CHIP CHIP IMAGE TRUE MEGACAM_CHIP:MOSAIC + PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.mc.b2.fit NONE NONE NONE CHIP CHIP IMAGE TRUE MEGACAM_CHIP:MOSAIC + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 FPA FPA JPEG TRUE MEGACAM_FPA:MOSAIC PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 FPA FPA JPEG TRUE MEGACAM_FPA:MOSAIC Index: /trunk/ippconfig/megacam/ppImage_b.config =================================================================== --- /trunk/ippconfig/megacam/ppImage_b.config (revision 8614) +++ /trunk/ippconfig/megacam/ppImage_b.config (revision 8615) @@ -18,8 +18,8 @@ FPA1.FITS BOOL FALSE # Save 1st binned fpa image? FPA2.FITS BOOL FALSE # Save 2nd binned fpa image? -BIN1.FITS BOOL FALSE # Save 1st binned chip image? -BIN2.FITS BOOL FALSE # Save 2nd binned chip image? -BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? -BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? +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 Index: /trunk/ippconfig/megacam/ppImage_d.config =================================================================== --- /trunk/ippconfig/megacam/ppImage_d.config (revision 8614) +++ /trunk/ippconfig/megacam/ppImage_d.config (revision 8615) @@ -18,8 +18,8 @@ FPA1.FITS BOOL FALSE # Save 1st binned fpa image? FPA2.FITS BOOL FALSE # Save 2nd binned fpa image? -BIN1.FITS BOOL FALSE # Save 1st binned chip image? -BIN2.FITS BOOL FALSE # Save 2nd binned chip image? -BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? -BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? +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 Index: /trunk/ippconfig/megacam/ppImage_f.config =================================================================== --- /trunk/ippconfig/megacam/ppImage_f.config (revision 8614) +++ /trunk/ippconfig/megacam/ppImage_f.config (revision 8615) @@ -18,8 +18,8 @@ FPA1.FITS BOOL FALSE # Save 1st binned fpa image? FPA2.FITS BOOL FALSE # Save 2nd binned fpa image? -BIN1.FITS BOOL FALSE # Save 1st binned chip image? -BIN2.FITS BOOL FALSE # Save 2nd binned chip image? -BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? -BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? +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 Index: /trunk/ippconfig/megacam/ppImage_j.config =================================================================== --- /trunk/ippconfig/megacam/ppImage_j.config (revision 8615) +++ /trunk/ippconfig/megacam/ppImage_j.config (revision 8615) @@ -0,0 +1,85 @@ +### Phase 2 recipe configuration file + +### A little bit of a cheat to make a mosaicked binned JPEG from the binned FITS file. +### Set binning to 1, since the input will already be binned. + +# 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 FALSE # Overscan subtraction +BIAS BOOL FALSE # Bias subtraction +DARK BOOL FALSE # Dark subtraction +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 FALSE # 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 FALSE # Save 1st binned chip image? +BIN2.FITS BOOL FALSE # Save 2nd binned chip image? +BIN1.JPEG BOOL TRUE # 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 1 +BIN1.YBIN S32 1 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +PHOTCODE.RULE STR {CAMERA}.{FILTER.ID}.{CHIP.N} Index: /trunk/ippconfig/megacam/ppImage_o.config =================================================================== --- /trunk/ippconfig/megacam/ppImage_o.config (revision 8614) +++ /trunk/ippconfig/megacam/ppImage_o.config (revision 8615) @@ -20,6 +20,6 @@ BIN1.FITS BOOL FALSE # Save 1st binned chip image? BIN2.FITS BOOL FALSE # Save 2nd binned chip image? -BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? -BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? +BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? +BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? # Non-linearity correction Index: /trunk/ippconfig/megacam/ppImage_ob.config =================================================================== --- /trunk/ippconfig/megacam/ppImage_ob.config (revision 8614) +++ /trunk/ippconfig/megacam/ppImage_ob.config (revision 8615) @@ -20,6 +20,6 @@ BIN1.FITS BOOL FALSE # Save 1st binned chip image? BIN2.FITS BOOL FALSE # Save 2nd binned chip image? -BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? -BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? +BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? +BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? # Non-linearity correction Index: /trunk/ippconfig/megacam/ppImage_obd.config =================================================================== --- /trunk/ippconfig/megacam/ppImage_obd.config (revision 8614) +++ /trunk/ippconfig/megacam/ppImage_obd.config (revision 8615) @@ -20,6 +20,6 @@ BIN1.FITS BOOL FALSE # Save 1st binned chip image? BIN2.FITS BOOL FALSE # Save 2nd binned chip image? -BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? -BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? +BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? +BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? # Non-linearity correction Index: /trunk/ippconfig/megacam/ppMerge_bias.config =================================================================== --- /trunk/ippconfig/megacam/ppMerge_bias.config (revision 8615) +++ /trunk/ippconfig/megacam/ppMerge_bias.config (revision 8615) @@ -0,0 +1,14 @@ +# 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 +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 Index: /trunk/ippconfig/megacam/ppMerge_dark.config =================================================================== --- /trunk/ippconfig/megacam/ppMerge_dark.config (revision 8615) +++ /trunk/ippconfig/megacam/ppMerge_dark.config (revision 8615) @@ -0,0 +1,14 @@ +# 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 +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 Index: /trunk/ippconfig/megacam/ppMerge_flat.config =================================================================== --- /trunk/ippconfig/megacam/ppMerge_flat.config (revision 8615) +++ /trunk/ippconfig/megacam/ppMerge_flat.config (revision 8615) @@ -0,0 +1,14 @@ +# 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 +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 Index: /trunk/ippconfig/ppMerge_template.config =================================================================== --- /trunk/ippconfig/ppMerge_template.config (revision 8614) +++ /trunk/ippconfig/ppMerge_template.config (revision 8615) @@ -1,5 +1,5 @@ # Recipe configuration for ppMerge -ROWS S32 256 # Number of rows to read at once +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