Index: branches/eam_branches/ipp-20130509/ippconfig/gpc1/ppImage.config =================================================================== --- branches/eam_branches/ipp-20130509/ippconfig/gpc1/ppImage.config (revision 35594) +++ branches/eam_branches/ipp-20130509/ippconfig/gpc1/ppImage.config (revision 35752) @@ -21,14 +21,16 @@ USE.DEBURNED.IMAGE BOOL TRUE # use burntool-repaired image? USE.BEST.BURNTOOL BOOL TRUE # require the best burntooled data -MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails +MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails TILTYSTREAK.APPLY BOOL FALSE # apply the 'tiltystreak' tool NOISEMAP BOOL FALSE # Apply read noise map +APPLY.BURNTOOL BOOL TRUE # apply burntool correction in ppImage + # Final detrending options -HAS.VIDEO BOOL FALSE # Treat this OTA as if it has video data -USE.VIDEO.DARK BOOL FALSE # Use a video dark if we have video data? -USE.VIDEO.MASK BOOL TRUE # Use a video mask if we have video data? - -# aditional auxillary mask applied to corners of all chips in video cells. +HAS.VIDEO BOOL FALSE # Treat this OTA as if it has video data +USE.VIDEO.DARK BOOL TRUE # Use a video dark if we have video data? +USE.VIDEO.MASK BOOL FALSE # Use a video mask if we have video data? + +# aditional auxiliary mask applied to corners of all chips in video cells. # Is only applied if MASK.AUXMASK and USE.VIDEO.MASK are both true AUX.VIDEO.MASK STR neb://any/gpc1/auxmask/mpg.20130506/mask_video_cell_corners.fits @@ -153,5 +155,6 @@ FRINGE.FILTERS STR y.00000 -# Standard chip processing (NOTE: when changing this be sure to check whether changes should be applied toCHIP_BGPRESEVE and/or CHIP_AUXMASK +# Standard chip processing (NOTE: when changing this be sure to check whether changes should be applied to +# CHIP_PRESERVE_BG CHIP_AUXMASK or CHIP_PRESERVE_BG_AUXMASK CHIP METADATA BASE.FITS BOOL FALSE # Save base detrended image? @@ -172,5 +175,5 @@ MASK.BUILD BOOL TRUE # Build internal mask? MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails - MASK.AUXMASK BOOL FALSE # augment with more restrictive auxillary mask + MASK.AUXMASK BOOL FALSE # augment mask with more restrictive auxiliary mask PATTERN.ROW BOOL TRUE # Row pattern correction PATTERN.CELL BOOL FALSE # Cell pattern correction @@ -1224,5 +1227,5 @@ END -# Standard chip processing + auxillary mask +# Standard chip processing + auxiliary mask CHIP_AUXMASK METADATA BASE.FITS BOOL FALSE # Save base detrended image? @@ -1243,5 +1246,5 @@ MASK.BUILD BOOL TRUE # Build internal mask? MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails - MASK.AUXMASK BOOL TRUE # augment with more restrictive auxillary mask + MASK.AUXMASK BOOL TRUE # augment mask with more restrictive auxiliary mask PATTERN.ROW BOOL TRUE # Row pattern correction PATTERN.CELL BOOL FALSE # Cell pattern correction @@ -1255,7 +1258,8 @@ BACKGROUND BOOL TRUE # Subtract background? CROSSTALK.MEASURE BOOL TRUE # Subtract model background? -END - -# Standard chip processing without any background removal + NO.COMPRESS BOOL TRUE # turn off image compression +END + +# Standard chip processing without background subtraction or pattern correction CHIP_PRESERVE_BG METADATA BASE.FITS BOOL FALSE # Save base detrended image? @@ -1269,5 +1273,5 @@ BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction - NOISEMAP BOOL FALSE + NOISEMAP BOOL TRUE REMNANCE BOOL FALSE # Remnance masking SHUTTER BOOL FALSE # Shutter correction @@ -1276,7 +1280,8 @@ MASK.BUILD BOOL TRUE # Build internal mask? MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails - MASK.AUXMASK BOOL TRUE # augment with more restrictive auxillary mask + MASK.AUXMASK BOOL FALSE # augment mask with more restrictive auxiliary mask PATTERN.ROW BOOL FALSE # Row pattern correction PATTERN.CELL BOOL FALSE # Cell pattern correction + PATTERN.CONTINUITY BOOL TRUE # Cell pattern coorection using edge continuity FRINGE BOOL TRUE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -1288,4 +1293,72 @@ CROSSTALK.MEASURE BOOL TRUE # Subtract model background? END + + +# Standard chip processing with background removal, but then added back in +CHIP_RESTORE_BG METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + REMNANCE BOOL FALSE # Remnance masking + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? + MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails + PATTERN.ROW BOOL FALSE # Row pattern correction + PATTERN.CELL BOOL FALSE # Cell pattern correction + PATTERN.CONTINUITY BOOL FALSE # Cell pattern correction using edge continuity + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BACKGROUND BOOL TRUE # Subtract background? + CROSSTALK.MEASURE BOOL TRUE # Subtract model background? +END + + +# Standard chip processing without background subtraction, pattern correction, or photometry bug applying auxiliary mask +CHIP_PRESERVE_BG_AUXMASK METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + NOISEMAP BOOL TRUE + REMNANCE BOOL FALSE # Remnance masking + SHUTTER BOOL FALSE # Shutter correction + 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 + MASK.AUXMASK BOOL TRUE # augment mask with more restrictive auxiliary mask + PATTERN.ROW BOOL FALSE # Row pattern correction + PATTERN.CELL BOOL FALSE # Cell pattern correction + PATTERN.CONTINUITY BOOL FALSE # Cell pattern coorection using edge continuity + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BACKGROUND BOOL FALSE # Subtract background? + CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + NO.COMPRESS BOOL TRUE # turn off image compression +END + # Standard chip processing Index: branches/eam_branches/ipp-20130509/ippconfig/gpc1/psastro.config =================================================================== --- branches/eam_branches/ipp-20130509/ippconfig/gpc1/psastro.config (revision 35594) +++ branches/eam_branches/ipp-20130509/ippconfig/gpc1/psastro.config (revision 35752) @@ -111,4 +111,7 @@ #PSASTRO.MODEL.BORESITE.X F32 -200.0 #PSASTRO.MODEL.BORESITE.Y F32 -300.0 + +# maximum accepted fwhm_major (moved from camera.config +PSASTRO.MAX.ALLOWED.FWHM F32 12 # *** make sure the choice of CATDIR (dvo database) contains the photcodes desired below @@ -360,4 +363,9 @@ END +CNP_DATASET METADATA + ZERO.POINT.USE.MEAN BOOL TRUE + PSASTRO.MAX.ALLOWED.FWHM F32 25 +END + LAP_ASTRO METADATA # PSASTRO.CATDIR STR 3PI.20110505.REFCAT Index: branches/eam_branches/ipp-20130509/ippconfig/gpc1/psphot.config =================================================================== --- branches/eam_branches/ipp-20130509/ippconfig/gpc1/psphot.config (revision 35594) +++ branches/eam_branches/ipp-20130509/ippconfig/gpc1/psphot.config (revision 35752) @@ -5,6 +5,6 @@ BACKGROUND.YSAMPLE F32 2.0 # size of background superpixels -SOFTEN.VARIANCE BOOL TRUE # XXX drop? soften the errors for bright pixels -SOFTEN.VARIANCE.FRACTION F32 0.005 +SOFTEN.VARIANCE BOOL FALSE # XXX drop? soften the errors for bright pixels +SOFTEN.VARIANCE.FRACTION F32 0.000 # CZW 2013-06-20 I've disabled this, as I don't think it's needed. PEAKS_SMOOTH_SIGMA F32 2.5 # smoothing kernel sigma in pixels