Index: trunk/ippconfig/simple/camera.config =================================================================== --- trunk/ippconfig/simple/camera.config (revision 10461) +++ trunk/ippconfig/simple/camera.config (revision 10723) @@ -6,5 +6,4 @@ END - # Description of camera --- all the chips and the cells that comprise them FPA METADATA @@ -12,12 +11,47 @@ END +# move this elsewhere? we need a lookup table to go from filter ID to abstract name +FILTER.ID METADATA + Test.V STR V + Test.B STR B +END + # Recipe options RECIPES METADATA -# PHASE2 STR simple/phase2.config # Phase 2 recipe details - PSPHOT STR simple/psphot.config # psphot details - PSPHOT_ALT STR simple/psphot_alt.config # psphot details -# PSASTRO STR simple/psastro.config # psastro details + PPIMAGE STR simple/ppImage.config # Default: all (normal) options on + PSPHOT STR simple/psphot.config # psphot details END +# Rejection levels for detrend creation +REJECTION METADATA + TYPE LIMITS FILTER EXPECTED IMFILE.MEAN IMFILE.STDEV EXP.MEAN EXP.STDEV EXP.MEANSTDEV ENSEMBLE.MEAN ENSEMBLE.STDEV ENSEMBLE.MEANSTDEV IMFILE.SN EXP.SN IMFILE.MEANSTDEV + FLAT MULTI + + BIAS LIMITS * 0 1 4 0.5 4 0 3 4 0 0 0 0.5 + DARK LIMITS * 0 1 4 0.5 4 0 3 4 0 0 0 0.5 + FLAT LIMITS * 0 0 0 0 0 0 0 0 3 0 0 0 +# FLAT LIMITS u 0 0 0 0 0 0 0 0 3 0 0 0 +# FLAT LIMITS g 0 0 0 0 0 0 0 0 3 0 0 0 +# FLAT LIMITS r 0 0 0 0 0 0 0 0 3 0 0 0 +# FLAT LIMITS i 0 0 0 0 0 0 0 0 3 0 0 0 +# FLAT LIMITS z 0 0 0 0 0 0 0 0 3 0 0 0 + FRINGE LIMITS * 0 0 0 0 0 0 0 0 0 0 0 0 + +# FILTER is an additional qualifier, and may be "*" (or absent!), in which case it matches everything +# EXPECTED is the expected mean value +# IMFILE.MEAN is the maximum permitted mean value for an imfile, relative to the standard deviation +# IMFILE.STDEV is the maximum permitted standard deviation for an imfile +# EXP.MEAN is the maximum permitted mean value for an exposure, relative to the standard deviation +# EXP.STDEV is the maximum permitted standard deviation for an exposure +# EXP.MEANSTDEV is the maximum permitted mean standard deviation for an exposure relative to the mean +# ENSEMBLE.MEAN is the maximum permitted mean for an ensemble of exposures +# ENSEMBLE.STDEV is the maximum permitted standard deviation for an ensemble of exposures +# ENSEMBLE.MEANSTDEV is the maximum permitted mean standard deviation for an ensemble of exposures +# IMFILE.SN is the minimum permitted signal-to-noise for an imfile +# EXP.SN is the minimum permitted signal-to-noise for an exposure +# These values (all except FILTER) may be zero, in which case no clipping is applied. + +END + FILERULES METADATA PSASTRO.INPUT STR PSASTRO.INPUT.CMP @@ -29,8 +63,8 @@ PPIMAGE.INPUT INPUT none.fits NONE NONE NONE IMAGE FPA - PPIMAGE.BIAS INPUT bias.fits NONE NONE NONE IMAGE CHIP - PPIMAGE.DARK INPUT dark.fits NONE NONE NONE IMAGE CHIP - PPIMAGE.FLAT INPUT flat.fits NONE NONE NONE IMAGE CHIP - PPIMAGE.MASK INPUT mask.fits NONE NONE NONE IMAGE CHIP + PPIMAGE.BIAS INPUT @DETDB NONE fpa NONE IMAGE CHIP + PPIMAGE.DARK INPUT @DETDB NONE fpa NONE IMAGE CHIP + PPIMAGE.FLAT INPUT @DETDB NONE fpa NONE IMAGE CHIP + PPIMAGE.MASK INPUT @DETDB NONE fpa NONE IMAGE CHIP PSPHOT.INPUT INPUT none.fits NONE NONE NONE IMAGE CHIP @@ -38,17 +72,19 @@ PSASTRO.INPUT.CMP INPUT none.fits NONE NONE PHU CMP CHIP PSASTRO.INPUT.CMF INPUT none.fits NONE SMPDATA PHU CMF CHIP - PSPHOT.PSF.LOAD INPUT {OUTPUT}.psf NONE NONE NONE PSF FPA FPA TRUE NONE + PSPHOT.PSF.LOAD INPUT {OUTPUT}.psf NONE NONE NONE PSF CHIP ### 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}.fit NONE NONE NONE IMAGE FPA FPA TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits NONE NONE NONE MASK FPA FPA FALSE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits NONE NONE NONE WEIGHT FPA FPA FALSE NONE PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.ch.fit NONE NONE NONE IMAGE FPA FPA TRUE SIMPLE PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fit NONE NONE NONE IMAGE FPA FPA TRUE SIMPLE PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit NONE NONE NONE IMAGE FPA FPA TRUE SIMPLE - PPIMAGE.BIN1 OUTPUT {OUTPUT}.B1.fit NONE NONE NONE IMAGE FPA FPA TRUE SIMPLE - PPIMAGE.BIN2 OUTPUT {OUTPUT}.B2.fit NONE NONE NONE IMAGE FPA FPA TRUE SIMPLE PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 JPEG FPA FPA TRUE SIMPLE PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 JPEG FPA FPA TRUE SIMPLE + PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fit NONE NONE NONE IMAGE FPA FPA TRUE SIMPLE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fit NONE NONE NONE IMAGE FPA FPA TRUE SIMPLE PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE NONE NONE IMAGE FPA FPA TRUE SIMPLE Index: trunk/ippconfig/simple/format.config =================================================================== --- trunk/ippconfig/simple/format.config (revision 10461) +++ trunk/ippconfig/simple/format.config (revision 10723) @@ -20,8 +20,9 @@ CELLS METADATA amplifier METADATA + CELL.TRIMSEC.SOURCE STR VALUE + CELL.TRIMSEC STR [0:0,0:0] + # alternatives for getting these from the headers # CELL.TRIMSEC.SOURCE STR HEADER - CELL.TRIMSEC.SOURCE STR VALUE # CELL.BIASSEC.SOURCE STR VALUE - CELL.TRIMSEC STR [0:0,0:0] # CELL.TRIMSEC STR DATASEC # CELL.BIASSEC STR BIASSEC @@ -31,9 +32,15 @@ # How to translate PS concepts into FITS headers TRANSLATION METADATA + FPA.TELESCOPE STR TELESCOP + FPA.INSTRUMENT STR INSTRUME + FPA.OBSTYPE STR OBSTYPE FPA.AIRMASS STR AIRMASS FPA.FILTER STR FILTER - FPA.POSANGLE STR POSANG - FPA.RA STR OBJ-RA - FPA.DEC STR OBJ-DEC + FPA.POSANGLE STR POSANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.OBJECT STR OBJECT + FPA.TIMESYS STR UTC + FPA.TIME STR DATE-OBS UTC-OBS # Date and time CELL.EXPOSURE STR EXPTIME CELL.DARKTIME STR DARKTIME @@ -46,4 +53,5 @@ # Default PS concepts that may be specified by value DEFAULTS METADATA + FPA.TIMESYS STR UTC FPA.RADECSYS STR ICRS CELL.GAIN F32 1.0 @@ -62,3 +70,4 @@ FPA.RA STR HOURS FPA.DEC STR DEGREES + FPA.TIME STR YEAR.FIRST END Index: trunk/ippconfig/simple/psphot.config =================================================================== --- trunk/ippconfig/simple/psphot.config (revision 10461) +++ trunk/ippconfig/simple/psphot.config (revision 10723) @@ -3,5 +3,6 @@ SAVE.BACKGND BOOL TRUE SAVE.BACKSUB BOOL TRUE -SAVE.RESID BOOL FALSE +SAVE.PLOTS BOOL TRUE +SAVE.RESID BOOL TRUE SAVE.PSF BOOL FALSE LOAD.PSF BOOL FALSE