Index: trunk/ippconfig/gpc1/camera.config =================================================================== --- trunk/ippconfig/gpc1/camera.config (revision 29902) +++ trunk/ippconfig/gpc1/camera.config (revision 29921) @@ -164,3 +164,5 @@ # This value is equal to CONV.POOR | STARCORE | SPIKE | SUSPECT = 0x5280 # unfortunately the perl parser won't accept a hex value -MASK.NO.CENSOR U32 21120 +MASK.NO.CENSOR U32 21120 + +METADATA.COMPRESSION STR 7f # compression mode (nM): n = 1-9, M = f (filtered), h (Huffman), R (run-length) Index: trunk/ippconfig/gpc1/ppImage.config =================================================================== --- trunk/ippconfig/gpc1/ppImage.config (revision 29902) +++ trunk/ippconfig/gpc1/ppImage.config (revision 29921) @@ -13,4 +13,5 @@ NORM.CLASS STR CHIP # How to find the per-class normalizations +NONLIN BOOL TRUE # apply non-linearity correction OLDDARK BOOL FALSE @@ -279,4 +280,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -308,4 +310,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -337,4 +340,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -367,4 +371,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -392,4 +397,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -415,4 +421,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -438,4 +445,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE DARK BOOL TRUE # Dark subtraction @@ -468,4 +476,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -521,4 +530,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -544,4 +554,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -574,4 +585,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -597,4 +609,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -631,4 +644,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -656,4 +670,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -680,4 +695,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -704,4 +720,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -728,4 +745,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -776,4 +794,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -820,4 +839,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -840,4 +860,5 @@ PPIMAGE_J1_RESID_B METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -877,4 +898,5 @@ PPIMAGE_J2_RESID_B METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -914,4 +936,5 @@ PPIMAGE_J1_RESID_F METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -950,4 +973,5 @@ PPIMAGE_J2_RESID_F METADATA OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -991,6 +1015,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 + OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -1028,4 +1052,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -1080,4 +1105,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -1109,4 +1135,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -1138,4 +1165,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -1167,4 +1195,5 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction Index: trunk/ippconfig/recipes/filerules-mef.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-mef.mdc (revision 29902) +++ trunk/ippconfig/recipes/filerules-mef.mdc (revision 29921) @@ -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: trunk/ippconfig/recipes/filerules-simple.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-simple.mdc (revision 29902) +++ trunk/ippconfig/recipes/filerules-simple.mdc (revision 29921) @@ -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: trunk/ippconfig/recipes/filerules-split.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-split.mdc (revision 29902) +++ trunk/ippconfig/recipes/filerules-split.mdc (revision 29921) @@ -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: trunk/ippconfig/recipes/ppImage.config =================================================================== --- trunk/ippconfig/recipes/ppImage.config (revision 29902) +++ trunk/ippconfig/recipes/ppImage.config (revision 29921) @@ -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 @@ -921,4 +952,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 @@ -950,4 +982,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 @@ -979,4 +1012,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 +1032,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 +1058,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 +1079,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 +1116,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 +1153,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 +1190,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 +1227,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 +1264,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 +1302,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 +1339,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 +1376,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 +1413,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 +1450,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 +1487,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 +1524,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 +1561,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 +1598,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 +1635,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 +1673,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 +1705,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 +1742,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 +1786,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 +1817,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 +1841,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 +1870,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 +1898,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 +1924,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: trunk/ippconfig/simtest/camera.config =================================================================== --- trunk/ippconfig/simtest/camera.config (revision 29902) +++ trunk/ippconfig/simtest/camera.config (revision 29921) @@ -80,3 +80,4 @@ # don't censor any masked pixels when making postage stamps +# MASK.NO.CENSOR U32 0xFFFFFFFF -- need to fix the MDC parser(s) to handle hex values MASK.NO.CENSOR U32 4294967295