Index: /trunk/ippconfig/isp/camera.config =================================================================== --- /trunk/ippconfig/isp/camera.config (revision 9628) +++ /trunk/ippconfig/isp/camera.config (revision 9629) @@ -3,5 +3,6 @@ # File formats that we know about FORMATS METADATA - ISP STR isp/format.config + ISP STR isp/format.config + ISP.CMP STR isp/cmp.config END @@ -9,12 +10,12 @@ # Description of camera --- all the chips and the cells that comprise them FPA METADATA - Chip STR Cell + Chip STR Cell END # Recipe options -RECIPES METADATA - PHASE2 STR isp/phase2.config # Phase 2 recipe details - PSPHOT STR isp/psphot.config # psphot details - PSASTRO STR isp/psastro.config # psastro details +RECIPES METADATA + PHASE2 STR isp/phase2.config # Phase 2 recipe details + PSPHOT STR isp/psphot.config # psphot details + PSASTRO STR isp/psastro.config # psastro details # Recipes for ppImage @@ -23,14 +24,15 @@ PPIMAGE_OB STR isp/ppImage_ob.config # Overscan, bias only PPIMAGE_OBD STR isp/ppImage_obd.config # Overscan, bias, dark only - PPIMAGE_OBDS STR isp/ppImage_obd.config # Overscan, bias, dark only - # PPIMAGE_OBDS STR isp/ppImage_obds.config # Overscan, bias, dark, shutter only + PPIMAGE_OBDS STR isp/ppImage_obd.config # Overscan, bias, dark only + # PPIMAGE_OBDS STR isp/ppImage_obds.config # Overscan, bias, dark, shutter only PPIMAGE_OBDSF STR isp/ppImage_obdsf.config # Overscan, bias, dark, shutter, flat only + PPIMAGE_OBDSFP STR isp/ppImage_obdsfp.config # Overscan, bias, dark, shutter, flat, psphot PPIMAGE_B STR isp/ppImage_b.config # Bias only PPIMAGE_D STR isp/ppImage_d.config # Dark only - PPIMAGE_S STR isp/ppImage_s.config # Shutter only + PPIMAGE_S STR isp/ppImage_s.config # Shutter only PPIMAGE_F STR isp/ppImage_f.config # Flat only PPIMAGE_J1 STR isp/ppImage_j1.config # JPEG only PPIMAGE_J2 STR isp/ppImage_j2.config # JPEG only - PPIMAGE_N STR isp/ppImage_n.config # Nothing except binning + PPIMAGE_N STR isp/ppImage_n.config # Nothing except binning # Recipes for ppMerge @@ -38,7 +40,7 @@ PPMERGE_DARK STR isp/ppMerge_dark.config PPMERGE_FLAT STR isp/ppMerge_flat.config - PPMERGE_SHUTTER STR isp/ppMerge_shutter.config + PPMERGE_SHUTTER STR isp/ppMerge_shutter.config - # Recipes for ppStats + # Recipes for ppStats PPSTATS STR isp/ppStats.config # ppStats recipe @@ -81,48 +83,54 @@ PSASTRO.INPUT STR PSASTRO.INPUT.CMP PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP - PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMP ### input file definitions TYPE INPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.TYPE DATA.LEVEL PPIMAGE.INPUT INPUT none.fits NONE NONE NONE IMAGE FPA - PPARITH.INPUT INPUT none.fits NONE NONE NONE IMAGE FPA - PPIMAGE.BIAS INPUT /data/alala/price/isp/bias/ISP.bias.norm.1.0.isp.fits NONE NONE NONE IMAGE CHIP - PPIMAGE.DARK INPUT /data/alala/price/isp/dark/ISP.dark.norm.2.0.isp.fits NONE NONE NONE IMAGE CHIP -# PPIMAGE.SHUTTER INPUT /data/alala/price/isp/shutter/ISP.shutter.3.0.isp.fits NONE NONE NONE IMAGE CHIP - PPIMAGE.FLAT INPUT /data/alala/price/isp/flat/ISP.flat.norm.3.0.isp.fits NONE NONE NONE IMAGE CHIP - PPIMAGE.MASK INPUT mask.fits NONE NONE NONE IMAGE CHIP + # XXX should we have a fallback option for these? + PPIMAGE.BIAS INPUT @DETDB NONE {CAMERA} NONE IMAGE CHIP + PPIMAGE.DARK INPUT @DETDB NONE {CAMERA} NONE IMAGE CHIP + PPIMAGE.FLAT INPUT @DETDB NONE {CAMERA} NONE IMAGE CHIP + + PPIMAGE.MASK INPUT mask.fits NONE NONE NONE IMAGE CHIP + # PPIMAGE.BIAS INPUT bias.fits NONE NONE NONE IMAGE CHIP + # PPIMAGE.DARK INPUT dark.fits NONE NONE NONE IMAGE CHIP + # PPIMAGE.SHUTTER INPUT shutter.fits NONE NONE NONE IMAGE CHIP + # PPIMAGE.FLAT INPUT flat.fits NONE NONE NONE IMAGE CHIP PSPHOT.INPUT INPUT none.fits NONE NONE NONE IMAGE CHIP + PSPHOT.PSF.LOAD INPUT none.psf NONE NONE NONE PSF CHIP - PSASTRO.INPUT.CMP INPUT none.fits NONE NONE PHU CMP CHIP - PSASTRO.INPUT.CMF INPUT none.fits NONE SMPDATA PHU CMF CHIP + PSASTRO.INPUT.CMP INPUT none.fits NONE NONE PHU CMP FPA + PSASTRO.INPUT.CMF INPUT none.fits NONE SMPDATA PHU CMF FPA ### output file definitions - TYPE OUTPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.TYPE FILE.LEVEL DATA.LEVEL FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT OUTPUT {OUTPUT}.isp.fits NONE NONE NONE IMAGE FPA FPA TRUE NONE - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.ch.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + TYPE OUTPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.TYPE FILE.LEVEL DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.isp.fits NONE NONE NONE IMAGE FPA FPA TRUE NONE + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.ch.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PPIMAGE.BIN1 OUTPUT {OUTPUT}.isp.b1.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PPIMAGE.BIN2 OUTPUT {OUTPUT}.isp.b2.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 JPEG FPA FPA TRUE ISP - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 JPEG FPA FPA TRUE ISP + PPIMAGE.BIN1 OUTPUT {OUTPUT}.isp.b1.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PPIMAGE.BIN2 OUTPUT {OUTPUT}.isp.b2.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 JPEG FPA FPA TRUE ISP + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 JPEG FPA FPA TRUE ISP - PPARITH.OUTPUT OUTPUT {OUTPUT} NONE NONE NONE IMAGE FPA FPA TRUE NONE + PPARITH.OUTPUT OUTPUT {OUTPUT} NONE NONE NONE IMAGE FPA FPA TRUE NONE - PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT} NONE NONE NONE RAW FPA FPA TRUE NONE - PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx NONE NONE NONE SX FPA FPA TRUE NONE - PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj NONE NONE NONE OBJ FPA FPA TRUE NONE - PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp NONE NONE NONE CMP FPA FPA TRUE NONE - PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf NONE SMPDATA PHU CMF FPA FPA TRUE NONE + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT} NONE NONE NONE RAW FPA FPA TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx NONE NONE NONE SX FPA FPA TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj NONE NONE NONE OBJ FPA FPA TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp NONE NONE NONE CMP FPA FPA TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf NONE SMPDATA PHU CMF FPA FPA TRUE NONE + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf NONE NONE NONE PSF FPA FPA TRUE NONE - PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp NONE NONE NONE CMP FPA FPA TRUE NONE + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp NONE NONE NONE CMP FPA FPA TRUE NONE END Index: /trunk/ippconfig/isp/cmp.config =================================================================== --- /trunk/ippconfig/isp/cmp.config (revision 9629) +++ /trunk/ippconfig/isp/cmp.config (revision 9629) @@ -0,0 +1,84 @@ +# Pan-STARRS Imaging Sky Probe + +# How to identify this type +RULE METADATA + SIMPLE BOOL FALSE + NAXIS S32 0 + TELESCOP STR ISP-1 + INSTRUME STR ISP-Apogee + DETECTOR STR ISP-Apogee-01 + ISPCAMER STR Apogee U42 +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR NONE # There are no extensions + FPA.NAME STR SEQID # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS STR Chip:Cell:amplifier + +# Specify the cell data +CELLS METADATA + amplifier METADATA + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC STR TRIMSEC + CELL.BIASSEC STR BIASSEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBSTYPE + FPA.FILTER STR FILTNAME + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.ALT STR ALT + FPA.AZ STR AZ + FPA.POSANGLE STR ROTANGLE + FPA.AIRMASS STR AIRMASS + FPA.TIME STR MJD-OBS + CHIP.TEMP STR CCDTEMP + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR MJD-OBS + CELL.GAIN STR GAIN + CELL.READNOISE STR RDNOISE + CELL.XBIN STR XBIN + CELL.YBIN STR YBIN +# CELL.SATURATION STR SATURATE ### Currently set to 0 ??? + CELL.BAD STR BADLEVEL +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TIMESYS STR UTC + CELL.SATURATION F32 65535 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0 S32 0 + CHIP.Y0 S32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.X0 S32 0 + CELL.Y0 S32 0 +END + +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + +# PS Concepts to get from the database +DATABASE METADATA +# None. +END Index: /trunk/ippconfig/isp/ppImage_obdsfp.config =================================================================== --- /trunk/ippconfig/isp/ppImage_obdsfp.config (revision 9629) +++ /trunk/ippconfig/isp/ppImage_obdsfp.config (revision 9629) @@ -0,0 +1,83 @@ +### Phase 2 recipe configuration file + +# 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 +SHUTTER BOOL FALSE # Shutter correction +FLAT BOOL TRUE # Flat-field normalisation +FRINGE BOOL FALSE # Fringe subtraction +PHOTOM BOOL TRUE # Source identification and photometry +ASTROM.CHIP BOOL FALSE +ASTROM.MOSAIC BOOL FALSE # Astrometry + +BASE.FITS BOOL TRUE # Save base detrended image? +CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? +FPA1.FITS BOOL FALSE # Save 1st binned fpa image? +FPA2.FITS BOOL FALSE # 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 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 +BIN1.XBIN S32 8 +BIN1.YBIN S32 8 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +PHOTCODE.RULE STR {CAMERA}.{FILTER.ID}.{CHIP.N} Index: /trunk/ippconfig/isp/psastro.config =================================================================== --- /trunk/ippconfig/isp/psastro.config (revision 9628) +++ /trunk/ippconfig/isp/psastro.config (revision 9629) @@ -27,10 +27,11 @@ # pmAstromRadiusMatch # use plate-scale to make this in pixels? -PSASTRO.MATCH.RADIUS F32 8 +PSASTRO.MATCH.RADIUS F32 32 # pmAstromMatchFit -PSASTRO.CHIP.NX S32 1 # fit order -PSASTRO.CHIP.NY S32 1 # fit order +PSASTRO.CHIP.NX S32 2 # fit order +PSASTRO.CHIP.NY S32 2 # fit order PSASTRO.CHIP.NITER S32 3 # fit clipping iterations PSASTRO.CHIP.NSIGMA F32 3 # fit clipping sigmas +MAG_MAX F32 10.0 Index: /trunk/ippconfig/isp/psphot.config =================================================================== --- /trunk/ippconfig/isp/psphot.config (revision 9628) +++ /trunk/ippconfig/isp/psphot.config (revision 9629) @@ -1,8 +1,10 @@ +#SAVE.OUTPUT BOOL TRUE #SAVE.BACKMDL BOOL TRUE -#SAVE.BACKGND BOOL TRUE -#SAVE.BACKSUB BOOL TRUE +SAVE.BACKGND BOOL TRUE +SAVE.BACKSUB BOOL TRUE SAVE.RESID BOOL TRUE -#SAVE.PSF BOOL TRUE +SAVE.PSF BOOL TRUE + #LOAD.PSF BOOL FALSE @@ -30,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 5.0 # peak significance threshold +PEAKS_NSIGMA_LIMIT F32 25.0 # peak significance threshold # basic object statistics @@ -79,5 +81,7 @@ # APTREND STR SKYSAT # APTREND STR SKYBIAS -FULL_FIT_SN_LIM F32 20.0 +APTREND.XORDER S32 2 +APTREND.YORDER S32 2 +FULL_FIT_SN_LIM F32 50.0 AP_MIN_SN F32 20.0 MAX_AP_OFFSET F32 0.5 @@ -86,6 +90,8 @@ # test options -# BREAK_POINT STR PEAKS + +# BREAK_POINT may be one of (PEAKS, MOMENTS, PSFMODEL, ENSEMBLE) # BREAK_POINT STR ENSEMBLE + PEAKS_OUTPUT_FILE STR peaks.dat MOMENTS_OUTPUT_FILE STR moments.dat @@ -93,2 +99,29 @@ # POISSON_ERRORS BOOL TRUE # SKY_BIAS F32 0.0 + +# PSFTREND must be a 2D polynomial +# the specified values are ignored but define the active components of the polynomial +PSF.TREND.MASK METADATA + NORDER_X S32 2 # number of x orders + NORDER_Y S32 2 # number of y orders + VAL_X00_Y00 F64 1 # polynomial coefficient + VAL_X01_Y00 F64 1 # polynomial coefficient + VAL_X00_Y01 F64 1 # polynomial coefficient + VAL_X02_Y00 F64 1 # polynomial coefficient + VAL_X01_Y01 F64 1 # polynomial coefficient + VAL_X00_Y02 F64 1 # polynomial coefficient + NELEMENTS S32 6 # number of unmasked components +END # folder for 4D polynomial + +# APTREND must be a 4D polynomial +# the specified values are ignored but define the active components of the polynomial +AP.TREND.MASK METADATA + NORDER_X S32 2 # number of x orders + NORDER_Y S32 2 # number of y orders + NORDER_Z S32 1 # number of z orders + NORDER_T S32 1 # number of t orders + VAL_X00_Y00_Z00_T00 F64 1 # polynomial coefficient + VAL_X00_Y00_Z01_T00 F64 0 # polynomial coefficient + NELEMENTS S32 2 # number of unmasked components +END # folder for 4D polynomial +