Index: /trunk/ippconfig/megacam/camera.config =================================================================== --- /trunk/ippconfig/megacam/camera.config (revision 7583) +++ /trunk/ippconfig/megacam/camera.config (revision 7584) @@ -57,48 +57,55 @@ PPMERGE STR ppMerge_template.config # ppMerge recipe PSPHOT STR megacam/psphot.config # psphot details + PSASTRO STR megacam/psastro.config # psastro details END FILERULES METADATA + PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT.SPL PSASTRO.INPUT STR PSASTRO.INPUT.CMP PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMP - TYPE FILERULE FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.DEPTH DATA.DEPTH FILE.TYPE FILE.MODE FILE.FORMAT - PPIMAGE.INPUT FILERULE @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP CHIP IMAGE READ NONE - # PPIMAGE.INPUT FILERULE @FILES {CHIP.NAME} {CELL.NAME} NONE FPA CHIP IMAGE READ NONE + ### input file definitions + TYPE INPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA DATA.LEVEL FILE.TYPE + PPIMAGE.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE - PPIMAGE.OUTPUT FILERULE {OUTPUT}.{CHIP.NAME}.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE WRITE NONE - # PPIMAGE.OUTPUT FILERULE {OUTPUT}.{CHIP.NAME}.fit {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE WRITE NONE - PPIMAGE.BIN1 FILERULE {OUTPUT}.{CHIP.NAME}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE WRITE SPLIT - PPIMAGE.BIN2 FILERULE {OUTPUT}.{CHIP.NAME}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE WRITE SPLIT - PPIMAGE.JPEG1 FILERULE {OUTPUT}.{CHIP.NAME}.b1.jpg -greyscale RANGE -5:20 CHIP CHIP JPEG WRITE SPLIT - PPIMAGE.JPEG2 FILERULE {OUTPUT}.{CHIP.NAME}.b2.jpg -greyscale FRACTION 0.50:2.00 CHIP CHIP JPEG WRITE SPLIT - PPIMAGE.BIAS FILERULE bias.mef.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE READ NONE - PPIMAGE.DARK FILERULE dark.mef.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE READ NONE - PPIMAGE.FLAT FILERULE flat.mef.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE READ NONE - PPIMAGE.MASK FILERULE mask.mef.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE READ NONE + ### use these entries to get the detrend images from specific files + PPIMAGE.MASK INPUT mask.mef.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + #PPIMAGE.BIAS INPUT bias.mef.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + PPIMAGE.DARK INPUT dark.mef.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + #PPIMAGE.FLAT INPUT flat.mef.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE - PSPHOT.INPUT FILERULE @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP CHIP IMAGE WRITE SPLICE - PSPHOT.RESID FILERULE {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SPLICE - PSPHOT.BACKGND FILERULE {OUTPUT}.bck.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SPLICE - PSPHOT.BACKSUB FILERULE {OUTPUT}.sub.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SPLICE - PSPHOT.BACKMDL FILERULE {OUTPUT}.mdl.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SPLICE + ### use these entries to get the detrend images from the database + #PPIMAGE.MASK INPUT @DETDB {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + PPIMAGE.BIAS INPUT @DETDB fpa fpa NONE CHIP IMAGE + #PPIMAGE.DARK INPUT @DETDB {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + PPIMAGE.FLAT INPUT @DETDB {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE - PSPHOT.OUTPUT.RAW FILERULE {OUTPUT}.{CHIP.NAME} NONE NONE PHU CHIP CHIP RAW WRITE NONE - PSPHOT.OUTPUT.SX FILERULE {OUTPUT}.sx NONE NONE PHU CHIP CHIP SX WRITE NONE - PSPHOT.OUTPUT.OBJ FILERULE {OUTPUT}.obj NONE NONE PHU CHIP CHIP OBJ WRITE NONE - PSPHOT.OUTPUT.CMP FILERULE {OUTPUT}.{CHIP.NAME}.{CELL.NAME}.cmp NONE NONE PHU CELL CELL CMP WRITE NONE - PSPHOT.OUTPUT.CMF FILERULE {OUTPUT}.cmf NONE SMPDATA PHU CHIP CHIP CMF WRITE NONE + PSPHOT.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE - PSASTRO.INPUT.CMP FILERULE @FILES NONE NONE PHU CHIP CHIP CMP READ NONE - PSASTRO.INPUT.CMF FILERULE @FILES NONE SMPDATA PHU CHIP CHIP CMF READ NONE - PSASTRO.OUTPUT.CMP FILERULE {OUTPUT}.smp NONE NONE PHU CHIP CHIP CMP WRITE NONE + PSASTRO.INPUT.CMP INPUT @FILES NONE NONE PHU CHIP CMP + PSASTRO.INPUT.CMF INPUT @FILES NONE SMPDATA PHU CHIP CMF + + ### output file definitions + TYPE OUTPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.LEVEL DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.fit {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE NONE + + PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT + PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.jpg -greyscale RANGE -5:20 CHIP CHIP JPEG TRUE SPLIT + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.jpg -greyscale FRACTION 0.50:2.00 CHIP CHIP JPEG TRUE SPLIT + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} NONE NONE PHU CHIP CHIP RAW TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx NONE NONE PHU CHIP CHIP SX TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj NONE NONE PHU CHIP CHIP OBJ TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf NONE SMPDATA PHU CHIP CHIP CMF TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.{CELL.NAME}.cmp NONE NONE PHU CELL CELL CMP TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp NONE NONE PHU CHIP CHIP CMP TRUE NONE END - -# PSPHOT.PSF.SAVE FILERULE {OUTPUT}.{CHIP.NAME}.psf.txt {CHIP.NAME} {CELL.NAME} {CELL.NAME} READOUT READOUT PSF WRITE SIMPLE -# PSPHOT.PSF.LOAD FILERULE {OUTPUT}.{CHIP.NAME}.psf.txt {CHIP.NAME} {CELL.NAME} {CELL.NAME} CELL CELL PSF READ NONE -# PPIMAGE.BIAS FILERULE bias.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ SPLIT -# PPIMAGE.DARK FILERULE dark.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ SPLIT -# PPIMAGE.FLAT FILERULE flat.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ SPLIT -# PPIMAGE.MASK FILERULE mask.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ MASK - Index: /trunk/ippconfig/megacam/phase2.config =================================================================== --- /trunk/ippconfig/megacam/phase2.config (revision 7583) +++ /trunk/ippconfig/megacam/phase2.config (revision 7584) @@ -6,13 +6,13 @@ NONLIN BOOL FALSE # Non-linearity correction -OVERSCAN BOOL FALSE # Overscan subtraction -BIAS BOOL FALSE # Bias subtraction +OVERSCAN BOOL TRUE # Overscan subtraction +BIAS BOOL TRUE # Bias subtraction DARK BOOL FALSE # Dark subtraction -FLAT BOOL FALSE # Flat-field normalisation +FLAT BOOL TRUE # Flat-field normalisation FRINGE BOOL FALSE # Fringe subtraction PHOTOM BOOL FALSE # Source identification and photometry ASTROM BOOL FALSE # Astrometry BIN1.FITS BOOL TRUE -BIN2.FITS BOOL TRUE +BIN2.FITS BOOL FALSE BIN1.JPEG BOOL FALSE BIN2.JPEG BOOL FALSE Index: /trunk/ippconfig/megacam/psastro.config =================================================================== --- /trunk/ippconfig/megacam/psastro.config (revision 7584) +++ /trunk/ippconfig/megacam/psastro.config (revision 7584) @@ -0,0 +1,36 @@ + +# astrometry matching parameters + +# nominal plate scale (microns / pixel) +# PSASTRO.PLATE.SCALE F32 13.5 +PSASTRO.PLATE.SCALE F32 1.0 + +# pmAstromGridMatch: +PSASTRO.GRID.MIN.ANGLE F32 -0.0851 +PSASTRO.GRID.MAX.ANGLE F32 +0.0851 +PSASTRO.GRID.DEL.ANGLE F32 0.0170 + +# pmAstromGridAngle +# max grid offset in FP units (microns) +# use plate-scale to make this in pixels? +# PSASTRO.GRID.OFFSET F32 10000. +# PSASTRO.GRID.SCALE F32 500. +PSASTRO.GRID.OFFSET F32 1000. +PSASTRO.GRID.SCALE F32 50 + +# these tweak are in FP units (pixels, currently) +PSASTRO.TWEAK.SCALE F32 1 +PSASTRO.TWEAK.RANGE F32 75 +PSASTRO.TWEAK.SMOOTH F32 2 +PSASTRO.TWEAK.NSIGMA F32 3 + +# pmAstromRadiusMatch +# use plate-scale to make this in pixels? +PSASTRO.MATCH.RADIUS F32 8 + +# pmAstromMatchFit +PSASTRO.CHIP.NX S32 1 # fit order +PSASTRO.CHIP.NY S32 1 # fit order +PSASTRO.CHIP.NITER S32 3 # fit clipping iterations +PSASTRO.CHIP.NSIGMA F32 3 # fit clipping sigmas + Index: /trunk/ippconfig/megacam_detrended/camera.config =================================================================== --- /trunk/ippconfig/megacam_detrended/camera.config (revision 7583) +++ /trunk/ippconfig/megacam_detrended/camera.config (revision 7584) @@ -61,42 +61,31 @@ PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP - TYPE FILERULE FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.DEPTH DATA.DEPTH FILE.TYPE FILE.MODE FILE.FORMAT - PPIMAGE.INPUT FILERULE @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP CHIP IMAGE READ NONE - # PPIMAGE.INPUT FILERULE @FILES {CHIP.NAME} {CELL.NAME} NONE FPA CHIP IMAGE READ NONE + ### input file definitions + TYPE INPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA DATA.LEVEL FILE.TYPE + PPIMAGE.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE + PSPHOT.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE + PSASTRO.INPUT.CMP INPUT @FILES NONE NONE PHU CHIP CMP + PSASTRO.INPUT.CMF INPUT @FILES NONE SMPDATA PHU CHIP CMF - PPIMAGE.OUTPUT FILERULE {OUTPUT}.{CHIP.NAME}.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE WRITE SPLIT - PPIMAGE.BIN1 FILERULE {OUTPUT}.{CHIP.NAME}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE WRITE SPLIT - PPIMAGE.BIN2 FILERULE {OUTPUT}.{CHIP.NAME}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE WRITE SPLIT - PPIMAGE.JPEG1 FILERULE {OUTPUT}.{CHIP.NAME}.b1.jpg -greyscale RANGE -5:20 CHIP CHIP JPEG WRITE SPLIT - PPIMAGE.JPEG2 FILERULE {OUTPUT}.{CHIP.NAME}.b2.jpg -greyscale FRACTION 0.50:2.00 CHIP CHIP JPEG WRITE SPLIT + ### output file definitions + TYPE OUTPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.LEVEL DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT - PSPHOT.INPUT FILERULE @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP CHIP IMAGE READ NONE - PSPHOT.RESID FILERULE {OUTPUT}.res.fits {CHIP.NAME} {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SPLICED - PSPHOT.BACKGND FILERULE {OUTPUT}.bck.fits {CHIP.NAME} {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SPLICED - PSPHOT.BACKSUB FILERULE {OUTPUT}.sub.fits {CHIP.NAME} {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SPLICED - PSPHOT.BACKMDL FILERULE {OUTPUT}.mdl.fits {CHIP.NAME} {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SPLICED + PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT + PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.jpg -greyscale RANGE -5:20 CHIP CHIP JPEG TRUE SPLIT + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.jpg -greyscale FRACTION 0.50:2.00 CHIP CHIP JPEG TRUE SPLIT - PSPHOT.OUTPUT.RAW FILERULE {OUTPUT}.{CHIP.NAME} NONE NONE PHU CHIP CHIP RAW WRITE NONE - PSPHOT.OUTPUT.SX FILERULE {OUTPUT}.sx NONE NONE PHU CHIP CHIP SX WRITE NONE - PSPHOT.OUTPUT.OBJ FILERULE {OUTPUT}.obj NONE NONE PHU CHIP CHIP OBJ WRITE NONE - PSPHOT.OUTPUT.CMP FILERULE {OUTPUT}.{CHIP.NAME}.{CELL.NAME}.cmp NONE NONE PHU CELL CELL CMP WRITE NONE - PSPHOT.OUTPUT.CMF FILERULE {OUTPUT}.cmf NONE SMPDATA PHU CHIP CHIP CMF WRITE NONE + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits {CHIP.NAME} {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICED + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits {CHIP.NAME} {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICED + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits {CHIP.NAME} {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICED + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits {CHIP.NAME} {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICED - PSASTRO.INPUT.CMP FILERULE @FILES NONE NONE PHU CHIP CHIP CMP READ NONE - PSASTRO.INPUT.CMF FILERULE @FILES NONE SMPDATA PHU CHIP CHIP CMF READ NONE - PSASTRO.OUTPUT.CMP FILERULE {OUTPUT}.xmp NONE NONE PHU CHIP CHIP CMP WRITE NONE + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} NONE NONE PHU CHIP CHIP RAW TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx NONE NONE PHU CHIP CHIP SX TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj NONE NONE PHU CHIP CHIP OBJ TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf NONE SMPDATA PHU CHIP CHIP CMF TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.{CELL.NAME}.cmp NONE NONE PHU CELL CELL CMP TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.xmp NONE NONE PHU CHIP CHIP CMP TRUE NONE END - -# PSPHOT.PSF.SAVE FILERULE {OUTPUT}.{CHIP.NAME}.psf.txt {CHIP.NAME} {CELL.NAME} {CELL.NAME} READOUT READOUT PSF WRITE SIMPLE -# PSPHOT.PSF.LOAD FILERULE {OUTPUT}.{CHIP.NAME}.psf.txt {CHIP.NAME} {CELL.NAME} {CELL.NAME} CELL CELL PSF READ NONE - -# we should not need the detrend input images: these are detrended images! -# PPIMAGE.BIAS FILERULE bias.mef.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE READ NONE -# PPIMAGE.DARK FILERULE dark.mef.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE READ NONE -# PPIMAGE.FLAT FILERULE flat.mef.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE READ NONE -# PPIMAGE.MASK FILERULE mask.mef.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE READ NONE -# PPIMAGE.BIAS FILERULE bias.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ NONE -# PPIMAGE.DARK FILERULE dark.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ NONE -# PPIMAGE.FLAT FILERULE flat.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ NONE -# PPIMAGE.MASK FILERULE mask.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ NONE - Index: /trunk/ippconfig/simple/camera.config =================================================================== --- /trunk/ippconfig/simple/camera.config (revision 7583) +++ /trunk/ippconfig/simple/camera.config (revision 7584) @@ -24,34 +24,56 @@ PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMP - TYPE FILERULE FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.DEPTH DATA.DEPTH FILE.TYPE FILE.MODE FILE.FORMAT - PPIMAGE.INPUT FILERULE @FILES {CHIP.NAME} {CELL.NAME} NONE FPA CHIP IMAGE READ NONE + ### input file definitions + TYPE INPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.TYPE DATA.LEVEL + PPIMAGE.INPUT INPUT none.fits {CHIP.NAME} {CELL.NAME} NONE IMAGE FPA - PPIMAGE.OUTPUT FILERULE {OUTPUT}.{CHIP.NAME}.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE WRITE NONE - PPIMAGE.BIN1 FILERULE {OUTPUT}.{CHIP.NAME}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE WRITE SIMPLE - PPIMAGE.BIN2 FILERULE {OUTPUT}.{CHIP.NAME}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE WRITE SIMPLE - PPIMAGE.JPEG1 FILERULE {OUTPUT}.{CHIP.NAME}.b1.jpg -greyscale RANGE -5:20 CHIP CHIP JPEG WRITE SIMPLE - PPIMAGE.JPEG2 FILERULE {OUTPUT}.{CHIP.NAME}.b2.jpg -greyscale FRACTION 0.50:2.00 CHIP CHIP JPEG WRITE SIMPLE - PPIMAGE.BIAS FILERULE bias.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ NONE - PPIMAGE.DARK FILERULE dark.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ NONE - PPIMAGE.FLAT FILERULE flat.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ NONE - PPIMAGE.MASK FILERULE mask.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ NONE + PPIMAGE.BIAS INPUT bias.fits {CHIP.NAME} {CHIP.NAME} NONE IMAGE CHIP + PPIMAGE.DARK INPUT dark.fits {CHIP.NAME} {CHIP.NAME} NONE IMAGE CHIP + PPIMAGE.FLAT INPUT flat.fits {CHIP.NAME} {CHIP.NAME} NONE IMAGE CHIP + PPIMAGE.MASK INPUT mask.fits {CHIP.NAME} {CHIP.NAME} NONE IMAGE CHIP - PSPHOT.INPUT FILERULE @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP CHIP IMAGE WRITE SIMPLE - PSPHOT.RESID FILERULE {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SIMPLE - PSPHOT.BACKGND FILERULE {OUTPUT}.bck.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SIMPLE - PSPHOT.BACKSUB FILERULE {OUTPUT}.sub.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SIMPLE - PSPHOT.BACKMDL FILERULE {OUTPUT}.mdl.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SIMPLE + #PPIMAGE.BIAS INPUT none.fits {CHIP.NAME} {CHIP.NAME} NONE IMAGE CHIP + #PPIMAGE.DARK INPUT none.fits {CHIP.NAME} {CHIP.NAME} NONE IMAGE CHIP + #PPIMAGE.FLAT INPUT none.fits {CHIP.NAME} {CHIP.NAME} NONE IMAGE CHIP + #PPIMAGE.MASK INPUT none.fits {CHIP.NAME} {CHIP.NAME} NONE IMAGE CHIP - PSPHOT.OUTPUT.RAW FILERULE {OUTPUT}.{CHIP.NAME} NONE NONE PHU CHIP CHIP RAW WRITE NONE - PSPHOT.OUTPUT.SX FILERULE {OUTPUT}.sx NONE NONE PHU CHIP CHIP SX WRITE NONE - PSPHOT.OUTPUT.OBJ FILERULE {OUTPUT}.obj NONE NONE PHU CHIP CHIP OBJ WRITE NONE - PSPHOT.OUTPUT.CMP FILERULE {OUTPUT}.{CHIP.NAME}.{CELL.NAME}.cmp NONE NONE PHU CELL CELL CMP WRITE NONE - PSPHOT.OUTPUT.CMF FILERULE {OUTPUT}.cmf NONE SMPDATA PHU CHIP CHIP CMF WRITE NONE + PSPHOT.INPUT INPUT none.fits {CHIP.NAME} {CELL.NAME} NONE IMAGE CHIP - PSASTRO.INPUT.CMP FILERULE @FILES NONE NONE PHU CHIP CHIP CMP READ NONE - PSASTRO.INPUT.CMF FILERULE @FILES NONE SMPDATA PHU CHIP CHIP CMF READ NONE - PSASTRO.OUTPUT.CMP FILERULE {OUTPUT}.smp NONE NONE PHU CHIP CHIP CMP WRITE NONE + PSASTRO.INPUT.CMP INPUT none.fits NONE NONE PHU CMP CHIP + PSASTRO.INPUT.CMF INPUT none.fits NONE SMPDATA PHU CMF 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 {CHIP.NAME} {CHIP.NAME} NONE IMAGE FPA FPA TRUE - + PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE IMAGE FPA FPA FALSE SIMPLE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE IMAGE FPA FPA FALSE SIMPLE + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 JPEG CHIP CHIP TRUE SIMPLE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 JPEG CHIP CHIP TRUE SIMPLE + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} IMAGE CHIP CHIP TRUE SIMPLE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits NONE {CELL.NAME} {CELL.NAME} IMAGE CHIP CHIP TRUE SIMPLE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits NONE {CELL.NAME} {CELL.NAME} IMAGE CHIP CHIP TRUE SIMPLE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits NONE {CELL.NAME} {CELL.NAME} IMAGE CHIP CHIP TRUE SIMPLE + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} NONE NONE PHU RAW CHIP CHIP TRUE - + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx NONE NONE PHU SX CHIP CHIP TRUE - + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj NONE NONE PHU OBJ CHIP CHIP TRUE - + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp NONE NONE PHU CMP CELL CELL TRUE - + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf NONE SMPDATA PHU CMF CHIP CHIP TRUE - + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp NONE NONE PHU CMP CHIP CHIP TRUE - END -# PSPHOT.PSF.SAVE FILERULE {OUTPUT}.{CHIP.NAME}.psf.txt {CHIP.NAME} {CELL.NAME} {CELL.NAME} READOUT READOUT PSF WRITE SIMPLE -# PSPHOT.PSF.LOAD FILERULE {OUTPUT}.{CHIP.NAME}.psf.txt {CHIP.NAME} {CELL.NAME} {CELL.NAME} CELL CELL PSF READ NONE +# PSPHOT.PSF.SAVE INPUT {OUTPUT}.{CHIP.NAME}.psf.txt {CHIP.NAME} {CELL.NAME} {CELL.NAME} PSF READOUT READOUT WRITE SIMPLE +# PSPHOT.PSF.LOAD OUTPUT {OUTPUT}.{CHIP.NAME}.psf.txt {CHIP.NAME} {CELL.NAME} {CELL.NAME} PSF CELL CELL - NONE + +# FPA file defines properties of a possible input|output object +# user can set the filename (I|O), filename rules (O), or abstract source (@FILES, @DETDB) (I) +# user can set the extension name, if used +# user can set the file type (IMAGE, JPEG, RAW, SX, OBJ, CMP, CMF) : but these are not variable in most cases! +# user can set the file mode (READ, WRITE), but these must be set by the programmer +# user can set the file depth: only valid for output files +# user can set the data depth: must be >= file depth +# user can set the file format: only valid for newly created FPAs +# user can set the colormap, scaling method, scaling range (JPEG only) +# user can set the extension name for the data and header segments (CMF only) + Index: /trunk/ippconfig/simple/format.config =================================================================== --- /trunk/ippconfig/simple/format.config (revision 7583) +++ /trunk/ippconfig/simple/format.config (revision 7584) @@ -36,5 +36,5 @@ CELL.EXPOSURE STR EXPTIME CELL.DARKTIME STR DARKTIME - CELL.TIME STR DATE-OBS UTC-OBS # Date and time +# CELL.TIME STR DATE-OBS UTC-OBS # Date and time # CELL.TIME STR DATE-OBS TIME-OBS # Date and time CELL.XBIN STR CCDSUM Index: /trunk/ippconfig/simple/phase2.config =================================================================== --- /trunk/ippconfig/simple/phase2.config (revision 7583) +++ /trunk/ippconfig/simple/phase2.config (revision 7584) @@ -13,6 +13,6 @@ BIN1.FITS BOOL TRUE BIN2.FITS BOOL TRUE -BIN1.JPEG BOOL FALSE -BIN2.JPEG BOOL FALSE +BIN1.JPEG BOOL TRUE +BIN2.JPEG BOOL TRUE # Non-linearity correction