Index: trunk/ippconfig/isp/camera.config =================================================================== --- trunk/ippconfig/isp/camera.config (revision 9659) +++ trunk/ippconfig/isp/camera.config (revision 10461) @@ -84,5 +84,5 @@ PSASTRO.INPUT STR PSASTRO.INPUT.CMP PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP - PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMP + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.RAW ### input file definitions @@ -133,4 +133,7 @@ PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf NONE NONE NONE PSF FPA FPA TRUE NONE + PSPHOT.MOMENT.PLT OUTPUT {OUTPUT}.mnt.png NONE NONE NONE KAPA FPA FPA TRUE NONE + PSPHOT.PSFMODEL.PLT OUTPUT {OUTPUT}.psf.png NONE NONE NONE KAPA FPA FPA TRUE ISP + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp NONE NONE NONE CMP FPA FPA TRUE NONE END Index: trunk/ippconfig/isp/ppImage.config =================================================================== --- trunk/ippconfig/isp/ppImage.config (revision 9659) +++ trunk/ippconfig/isp/ppImage.config (revision 10461) @@ -1,17 +1,8 @@ -### Phase 2 recipe configuration file +### Phase 2 recipe configuration file - only include differences from recipes/ppImage.config # 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 TRUE # Overscan subtraction -BIAS BOOL TRUE # Bias subtraction -DARK BOOL TRUE # Dark subtraction +# turn shutter on when we have a valid shutter correction frame SHUTTER BOOL FALSE # Shutter correction -FLAT BOOL TRUE # 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 TRUE # Save base detrended image? @@ -19,59 +10,8 @@ FPA1.FITS BOOL TRUE # Save 1st binned fpa image? FPA2.FITS BOOL TRUE # Save 2nd binned fpa image? -BIN1.FITS BOOL TRUE # Save 1st binned chip image? -BIN2.FITS BOOL TRUE # Save 2nd binned chip image? -BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? +BIN1.FITS BOOL FALSE # Save 1st binned chip image? +BIN2.FITS BOOL FALSE # Save 2nd binned chip image? +BIN1.JPEG BOOL FALSE # 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 Index: trunk/ippconfig/isp/ppImage_b.config =================================================================== --- trunk/ippconfig/isp/ppImage_b.config (revision 9659) +++ trunk/ippconfig/isp/ppImage_b.config (revision 10461) @@ -2,7 +2,4 @@ # 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 TRUE # Bias subtraction @@ -11,7 +8,4 @@ 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 TRUE # Save base detrended image? @@ -24,55 +18,4 @@ 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 8 Index: trunk/ippconfig/isp/psphot.config =================================================================== --- trunk/ippconfig/isp/psphot.config (revision 9659) +++ trunk/ippconfig/isp/psphot.config (revision 10461) @@ -4,5 +4,5 @@ #SAVE.BACKGND BOOL TRUE #SAVE.BACKSUB BOOL TRUE -#SAVE.RESID BOOL TRUE +SAVE.RESID BOOL TRUE #SAVE.PSF BOOL TRUE @@ -32,5 +32,5 @@ PEAKS_SMOOTH_SIGMA F32 1.0 # smoothing kernel sigma in pixels PEAKS_SMOOTH_NSIGMA F32 3.0 # smoothing kernel width in sigmas -PEAKS_NSIGMA_LIMIT F32 25.0 # peak significance threshold +PEAKS_NSIGMA_LIMIT F32 2.0 # peak significance threshold # basic object statistics @@ -38,5 +38,6 @@ SKY_OUTER_RADIUS F32 25 # square annulus for local sky measurement PSF_MOMENTS_RADIUS F32 3 # calculate initial source moments with this radius -PSF_SN_LIM F32 50 # minimum S/N for stars used for PSF model +PSF_SN_LIM F32 25 # minimum S/N for stars used for PSF model +PSF_CLUMP_NSIGMA F32 3 # size of PSF clump in image (use a larger number for images with large PSF variations) PSF_MAX_NSTARS S32 300 # limit number of stars used for PSF model @@ -44,8 +45,8 @@ # list as many PSF_MODEL options as desired # PSF_MODEL MULTI -# PSF_MODEL STR PS_MODEL_QGAUSS +PSF_MODEL STR PS_MODEL_QGAUSS # PSF_MODEL STR PS_MODEL_GAUSS -PSF_MODEL STR PS_MODEL_PGAUSS -# PSF_MODEL STR PS_MODEL_TGAUSS ## not well tested, not very successful +# PSF_MODEL STR PS_MODEL_PGAUSS +# PSF_MODEL STR PS_MODEL_TEST1 MOMENTS_SCALE F32 0.1 @@ -92,8 +93,8 @@ # BREAK_POINT may be one of (PEAKS, MOMENTS, PSFMODEL, ENSEMBLE) -# BREAK_POINT STR ENSEMBLE +BREAK_POINT STR MOMENTS # PEAKS_OUTPUT_FILE STR peaks.dat -# MOMENTS_OUTPUT_FILE STR moments.dat +MOMENTS_OUTPUT_FILE STR moments.dat # ANALYSIS_REGION STR [1000:1600,2800:3400] # POISSON_ERRORS BOOL TRUE @@ -125,3 +126,2 @@ NELEMENTS S32 2 # number of unmasked components END # folder for 4D polynomial -