Index: trunk/ippconfig/gpc1/format_20080925.config =================================================================== --- trunk/ippconfig/gpc1/format_20080925.config (revision 27230) +++ trunk/ippconfig/gpc1/format_20080925.config (revision 27231) @@ -574,5 +574,5 @@ CELL.READNOISE F32 15.0 CELL.READDIR S32 1 - CELL.BAD S32 -100 + CELL.BAD S32 0 CELL.XSIZE S32 590 CELL.YSIZE S32 598 Index: trunk/ippconfig/gpc1/format_20080929.config =================================================================== --- trunk/ippconfig/gpc1/format_20080929.config (revision 27230) +++ trunk/ippconfig/gpc1/format_20080929.config (revision 27231) @@ -569,5 +569,5 @@ CELL.READNOISE F32 15.0 CELL.READDIR S32 1 - CELL.BAD S32 -100 + CELL.BAD S32 0 CELL.XSIZE S32 590 CELL.YSIZE S32 598 Index: trunk/ippconfig/gpc1/format_20081011.config =================================================================== --- trunk/ippconfig/gpc1/format_20081011.config (revision 27230) +++ trunk/ippconfig/gpc1/format_20081011.config (revision 27231) @@ -561,5 +561,5 @@ END CELL.READDIR S32 1 - CELL.BAD S32 -100 + CELL.BAD S32 0 CELL.XSIZE S32 590 CELL.YSIZE S32 598 Index: trunk/ippconfig/gpc1/format_20090120.config =================================================================== --- trunk/ippconfig/gpc1/format_20090120.config (revision 27230) +++ trunk/ippconfig/gpc1/format_20090120.config (revision 27231) @@ -495,5 +495,5 @@ END CELL.READDIR S32 1 - CELL.BAD S32 -100 + CELL.BAD S32 0 CELL.XSIZE S32 590 CELL.YSIZE S32 598 Index: trunk/ippconfig/gpc1/format_20090220.config =================================================================== --- trunk/ippconfig/gpc1/format_20090220.config (revision 27230) +++ trunk/ippconfig/gpc1/format_20090220.config (revision 27231) @@ -495,5 +495,5 @@ END CELL.READDIR S32 1 - CELL.BAD S32 -100 + CELL.BAD S32 0 CELL.XSIZE S32 590 CELL.YSIZE S32 598 Index: trunk/ippconfig/gpc1/format_20100122.config =================================================================== --- trunk/ippconfig/gpc1/format_20100122.config (revision 27230) +++ trunk/ippconfig/gpc1/format_20100122.config (revision 27231) @@ -495,5 +495,5 @@ END CELL.READDIR S32 1 - CELL.BAD S32 -100 + CELL.BAD S32 0 CELL.XSIZE S32 590 CELL.YSIZE S32 598 Index: trunk/ippconfig/gpc1/format_orig.config =================================================================== --- trunk/ippconfig/gpc1/format_orig.config (revision 27230) +++ trunk/ippconfig/gpc1/format_orig.config (revision 27231) @@ -571,5 +571,5 @@ CELL.READNOISE F32 15.0 CELL.READDIR S32 1 - CELL.BAD S32 -100 + CELL.BAD S32 0 CELL.XSIZE S32 590 CELL.YSIZE S32 598 Index: trunk/ippconfig/gpc1/ppImage.config =================================================================== --- trunk/ippconfig/gpc1/ppImage.config (revision 27230) +++ trunk/ippconfig/gpc1/ppImage.config (revision 27231) @@ -283,4 +283,5 @@ 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 @@ -311,4 +312,5 @@ 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 FRINGE BOOL FALSE # Fringe subtraction @@ -339,4 +341,5 @@ 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 FRINGE BOOL FALSE # Fringe subtraction @@ -368,4 +371,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -391,4 +395,5 @@ 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 @@ -413,4 +418,5 @@ 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 @@ -435,4 +441,5 @@ 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 @@ -465,5 +472,6 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels - MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails + MASK.BUILD BOOL TRUE # Build internal mask? + MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails FRINGE BOOL FALSE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -516,4 +524,5 @@ 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 @@ -538,4 +547,5 @@ 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 @@ -567,4 +577,5 @@ FLAT BOOL TRUE # 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 @@ -589,4 +600,5 @@ FLAT BOOL TRUE # 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 @@ -622,4 +634,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -646,4 +659,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? BACKGROUND BOOL TRUE # Subtract background? FRINGE BOOL FALSE # Fringe subtraction @@ -669,4 +683,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? BACKGROUND BOOL TRUE # Subtract background? FRINGE BOOL FALSE # Fringe subtraction @@ -692,4 +707,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? BACKGROUND BOOL TRUE # Subtract background? FRINGE BOOL FALSE # Fringe subtraction @@ -715,4 +731,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -762,4 +779,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -805,4 +823,5 @@ FLAT BOOL FALSE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -824,4 +843,5 @@ 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 @@ -860,4 +880,5 @@ 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 @@ -896,4 +917,5 @@ 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 @@ -931,4 +953,5 @@ 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 @@ -973,4 +996,5 @@ FLAT BOOL TRUE # 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 @@ -1008,4 +1032,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -1059,4 +1084,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction PATTERN.ROW BOOL TRUE # Row pattern correction @@ -1087,4 +1113,5 @@ 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 FALSE # Row pattern correction @@ -1115,4 +1142,5 @@ 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 FALSE # Row pattern correction Index: trunk/ippconfig/recipes/filerules-split.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-split.mdc (revision 27230) +++ trunk/ippconfig/recipes/filerules-split.mdc (revision 27231) @@ -127,7 +127,7 @@ ### output file definitions TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT -PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE COMP_IMG CHIP TRUE NONE -PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK COMP_MASK CHIP TRUE NONE -PPIMAGE.OUTPUT.VARIANCE OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits VARIANCE COMP_WT CHIP TRUE NONE +PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE +PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK NONE CHIP TRUE NONE +PPIMAGE.OUTPUT.VARIANCE OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits VARIANCE NONE CHIP TRUE NONE PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE DET_MASK CHIP TRUE NONE PPIMAGE.OUTPUT.DETREND OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE @@ -135,8 +135,8 @@ PPIMAGE.CONFIG OUTPUT {OUTPUT}.{CHIP.NAME}.ppImage.mdc TEXT NONE CHIP TRUE NONE -PPIMAGE.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE COMP_IMG CHIP TRUE NONE -PPIMAGE.CHIP.DETMASK OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE NONE CHIP TRUE NONE -PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits MASK COMP_MASK CHIP TRUE NONE -PPIMAGE.CHIP.VARIANCE OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits VARIANCE COMP_WT CHIP TRUE NONE +PPIMAGE.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE NONE CHIP TRUE NONE +PPIMAGE.CHIP.DETMASK OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE NONE CHIP TRUE NONE +PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits MASK NONE CHIP TRUE NONE +PPIMAGE.CHIP.VARIANCE OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits VARIANCE NONE CHIP TRUE NONE PPIMAGE.CHIP.RESID OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE NONE CHIP TRUE NONE Index: trunk/ippconfig/recipes/ppImage.config =================================================================== --- trunk/ippconfig/recipes/ppImage.config (revision 27230) +++ trunk/ippconfig/recipes/ppImage.config (revision 27231) @@ -259,4 +259,5 @@ 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 @@ -281,4 +282,5 @@ 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 @@ -303,4 +305,5 @@ 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 @@ -325,4 +328,5 @@ 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 @@ -347,4 +351,5 @@ 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 @@ -369,4 +374,5 @@ 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 @@ -391,4 +397,5 @@ 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 @@ -413,4 +420,5 @@ FLAT BOOL TRUE # 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 @@ -435,4 +443,5 @@ FLAT BOOL FALSE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL TRUE # Fringe subtraction PHOTOM BOOL FALSE # Source identification and photometry @@ -457,4 +466,5 @@ 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 TRUE # Source identification and photometry @@ -479,4 +489,5 @@ 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 TRUE # Source identification and photometry @@ -501,4 +512,5 @@ 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 @@ -523,4 +535,5 @@ 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 @@ -545,4 +558,5 @@ 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 @@ -604,4 +618,5 @@ 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 @@ -626,4 +641,5 @@ 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 @@ -655,4 +671,5 @@ FLAT BOOL TRUE # 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 @@ -677,4 +694,5 @@ FLAT BOOL TRUE # 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 @@ -710,4 +728,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? FRINGE BOOL TRUE # Fringe subtraction PHOTOM BOOL FALSE # Source identification and photometry @@ -732,4 +751,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL TRUE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -754,4 +774,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL TRUE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -776,4 +797,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL TRUE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -804,4 +826,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL TRUE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -832,4 +855,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL TRUE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -854,4 +878,5 @@ FLAT BOOL FALSE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -870,4 +895,5 @@ 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 @@ -894,4 +920,5 @@ 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 @@ -922,4 +949,5 @@ 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 @@ -950,4 +978,5 @@ FLAT BOOL FALSE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction BIN1.FITS BOOL FALSE # Save 1st binned chip image? @@ -968,4 +997,5 @@ FLAT BOOL FALSE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction BIN1.FITS BOOL FALSE # Save 1st binned chip image? @@ -992,4 +1022,5 @@ FLAT BOOL FALSE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -1011,4 +1042,5 @@ 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 @@ -1046,4 +1078,5 @@ 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 @@ -1081,4 +1114,5 @@ 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 @@ -1116,4 +1150,5 @@ 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 @@ -1151,4 +1186,5 @@ 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 @@ -1186,4 +1222,5 @@ 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 @@ -1222,4 +1259,5 @@ 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 @@ -1257,4 +1295,5 @@ 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 @@ -1292,4 +1331,5 @@ 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 @@ -1327,4 +1367,5 @@ 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 @@ -1362,4 +1403,5 @@ 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 @@ -1397,4 +1439,5 @@ 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 @@ -1432,4 +1475,5 @@ 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 @@ -1467,4 +1511,5 @@ 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 @@ -1502,4 +1547,5 @@ 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 @@ -1537,4 +1583,5 @@ 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 @@ -1573,4 +1620,5 @@ 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 @@ -1602,4 +1650,5 @@ SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation + MASK.BUILD BOOL FALSE # Build internal mask? MASK BOOL FALSE # Mask bad pixels FRINGE BOOL FALSE # Fringe subtraction @@ -1640,4 +1689,5 @@ FLAT BOOL TRUE # 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 @@ -1681,4 +1731,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL TRUE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -1710,4 +1761,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL TRUE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -1733,4 +1785,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction PATTERN.ROW BOOL FALSE # Subtract pattern noise @@ -1759,4 +1812,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? PATTERN.ROW BOOL FALSE # Subtract pattern noise PATTERN.CELL BOOL FALSE # Subtract pattern noise @@ -1784,4 +1838,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL TRUE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? Index: trunk/ippconfig/simtest/format.config =================================================================== --- trunk/ippconfig/simtest/format.config (revision 27230) +++ trunk/ippconfig/simtest/format.config (revision 27231) @@ -60,5 +60,5 @@ FPA.ELEVATION F32 3048.0 # altitude in meters CELL.SATURATION F32 65535 - CELL.BAD F32 -100 ## XXX this value is bogus, but needs to be context based so residual images do not get half-masked + CELL.BAD F32 0 CELL.READDIR S32 1 CELL.TIMESYS STR UTC Index: trunk/ippconfig/simtest/ppImage.config =================================================================== --- trunk/ippconfig/simtest/ppImage.config (revision 27230) +++ trunk/ippconfig/simtest/ppImage.config (revision 27231) @@ -59,4 +59,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction PHOTOM BOOL TRUE # Source identification and photometry @@ -79,4 +80,5 @@ 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 @@ -99,4 +101,5 @@ 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 @@ -119,4 +122,5 @@ 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 @@ -139,4 +143,5 @@ 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 @@ -159,4 +164,5 @@ 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 @@ -179,4 +185,5 @@ FLAT BOOL TRUE # 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 @@ -199,4 +206,5 @@ FLAT BOOL TRUE # 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 @@ -219,4 +227,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction PHOTOM BOOL TRUE # Source identification and photometry @@ -239,4 +248,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction PHOTOM BOOL TRUE # Source identification and photometry @@ -260,4 +270,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -289,4 +300,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction PHOTOM BOOL TRUE # Source identification and photometry