Index: trunk/ippconfig/vysos5/Makefile.am =================================================================== --- trunk/ippconfig/vysos5/Makefile.am (revision 19656) +++ trunk/ippconfig/vysos5/Makefile.am (revision 19863) @@ -4,5 +4,7 @@ install_files = \ camera.config \ - format.config + format.config \ + psphot.config \ + ppImage.config install_DATA = $(install_files) Index: trunk/ippconfig/vysos5/camera.config =================================================================== --- trunk/ippconfig/vysos5/camera.config (revision 19656) +++ trunk/ippconfig/vysos5/camera.config (revision 19863) @@ -41,6 +41,6 @@ # Recipe options RECIPES METADATA - # PPIMAGE STR vysos5/ppImage.config # Default: all (normal) options on - # PSPHOT STR vysos5/psphot.config # psphot details + PPIMAGE STR vysos5/ppImage.config # Default: all (normal) options on + PSPHOT STR vysos5/psphot.config # psphot details # PPSIM STR vysos5/ppSim.config # ppSim details # PPSUB STR vysos5/ppSub.config # ppSub details Index: trunk/ippconfig/vysos5/format.config =================================================================== --- trunk/ippconfig/vysos5/format.config (revision 19656) +++ trunk/ippconfig/vysos5/format.config (revision 19863) @@ -56,7 +56,7 @@ FPA.DETECTOR STR VYSOS-5 FPA.POSANGLE STR 0.0 - CELL.SATURATION F32 65535 + CELL.SATURATION F32 40000 CELL.BAD F32 -100 ## XXX this value is bogus, but needs to be context based so residual images do not get half-masked - CELL.READDIR S32 1 + CELL.READDIR S32 2 CELL.TIMESYS STR UTC CELL.XPARITY S32 1 @@ -70,6 +70,6 @@ CELL.XWINDOW S32 0 CELL.YWINDOW S32 0 - CELL.GAIN F32 1.0 - CELL.READNOISE F32 10.0 + CELL.GAIN F32 0.2 + CELL.READNOISE F32 4.6 END @@ -77,5 +77,5 @@ FPA.RA STR HOURS FPA.DEC STR DEGREES - FPA.TIME STR SEPARATE,YEAR.FIRST - CELL.TIME STR SEPARATE,YEAR.FIRST + FPA.TIME STR YEAR.FIRST + CELL.TIME STR YEAR.FIRST END Index: trunk/ippconfig/vysos5/ppImage.config =================================================================== --- trunk/ippconfig/vysos5/ppImage.config (revision 19863) +++ trunk/ippconfig/vysos5/ppImage.config (revision 19863) @@ -0,0 +1,268 @@ +### ppImage recipe configuration file for simulated test camera + +# default list of output products +BASE.FITS BOOL FALSE # Save base detrended image? +BASE.MASK.FITS BOOL FALSE # Save base detrended image? +BASE.WEIGHT.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.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + +# default list of analysis steps to perform +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 +MASK BOOL FALSE # Mask bad pixels +FRINGE BOOL FALSE # Fringe subtraction +BIN1.FITS BOOL FALSE # Save 1st binned chip image? +BIN2.FITS BOOL FALSE # 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? + +# binned output image options +BIN1.XBIN S32 8 +BIN1.YBIN S32 8 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 7 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +# How to select the appropriate detrend image +DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + MASK METADATA + END + DARK METADATA + END + FLAT METADATA + FILTER STR FPA.FILTER + END + FRINGE METADATA + FILTER STR FPA.FILTER + END + SHUTTER METADATA + END +END + + +######################################################################################## +# Need the following in order to turn off overscan and shutter for the site-level recipe +######################################################################################## + +# Overscan subtraction only +PPIMAGE_O METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.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.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + 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 + MASK BOOL FALSE # Mask bad pixels + 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? +END + +# Dark subtraction only +PPIMAGE_D METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.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.WEIGHT.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 + 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? +END + +# Shutter correction only +PPIMAGE_S METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.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.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + 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? +END + +# Overscan, bias, dark +PPIMAGE_OBD METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL TRUE # Save base detrended image? + BASE.WEIGHT.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + 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 + MASK BOOL FALSE # Mask bad pixels + 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? +END + +# Overscan, bias, dark, shutter +PPIMAGE_OBDS METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL TRUE # Save base detrended image? + BASE.WEIGHT.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + 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 + MASK BOOL FALSE # Mask bad pixels + 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? +END + +# Overscan, bias, dark, shutter, flat-field +PPIMAGE_OBDSF METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL TRUE # Save base detrended image? + BASE.WEIGHT.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + 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 + MASK BOOL FALSE # Mask bad pixels + 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? +END + +# Overscan, bias, dark, shutter, flat-field, fringe +PPIMAGE_OBDSFR METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL TRUE # Save base detrended image? + BASE.WEIGHT.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + 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 + MASK BOOL FALSE # Mask bad pixels + 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? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom +PPIMAGE_OBDSFRP METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.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.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + 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 + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom, astrom +PPIMAGE_OBDSFRA METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.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.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + 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 + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + CHIP.MASK.FITS BOOL TRUE # Save mask +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom +PPIMAGE_FLATCORR METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.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.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # 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? + + DETREND.CONSTRAINTS METADATA + FLAT METADATA + DETTYPE STR FLAT_RAW + END + END +END + Index: trunk/ippconfig/vysos5/psphot.config =================================================================== --- trunk/ippconfig/vysos5/psphot.config (revision 19863) +++ trunk/ippconfig/vysos5/psphot.config (revision 19863) @@ -0,0 +1,25 @@ + +SAVE.BACKMDL BOOL TRUE +SAVE.BACKGND BOOL TRUE +SAVE.BACKSUB BOOL TRUE +SAVE.PLOTS BOOL TRUE +SAVE.RESID BOOL TRUE +SAVE.PSF BOOL TRUE +LOAD.PSF BOOL FALSE + +PEAKS_NSIGMA_LIMIT F32 25.0 # peak significance threshold +PEAKS_NSIGMA_LIMIT_2 F32 10.0 # peak significance threshold +BREAK_POINT STR ENSEMBLE +PSF_MOMENTS_RADIUS F32 7 # calculate initial source moments with this radius +PSF_CLUMP_NSIGMA F32 3.5 # region of Sx,Sy plane to use for selecting PSF stars + +USE_FOOTPRINTS BOOL TRUE # use new pmFootprint peak packaging +FOOTPRINT_NPIXMIN S32 5 # Minimum size of a pmFootprint +FOOTPRINT_NSIGMA_LIMIT F32 10 # threshold for bright pmFootprint detection +FOOTPRINT_NSIGMA_LIMIT_2 F32 10 # threshold for faint pmFootprint detection +FOOTPRINT_GROW_RADIUS S32 1 # How much to grow bright footprints +FOOTPRINT_GROW_RADIUS_2 S32 2 # How much to grow faint footprints +FOOTPRINT_CULL_NSIGMA_DELTA F32 4 # Cull peaks that aren't nsigma above coll to neighbour +FOOTPRINT_CULL_NSIGMA_MIN F32 1 # Minimum height of colls in units of skyStdev + +PSF_MODEL STR PS_MODEL_QGAUSS