Index: /trunk/ippconfig/esowfi/camera.config =================================================================== --- /trunk/ippconfig/esowfi/camera.config (revision 15308) +++ /trunk/ippconfig/esowfi/camera.config (revision 15309) @@ -138,40 +138,40 @@ ### input file definitions ### use @DETDB entries to get the detrend images from the database - ### replace @DETDB with @FILES if you want to require it from the + ### replace @DETDB with @FILES if you want to require it from the ### command line, or with an explicit name to require a specific file - TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE ## files used by ppImage - PPIMAGE.INPUT INPUT @FILES CHIP IMAGE - PPIMAGE.MASK INPUT @DETDB CHIP IMAGE - PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE - PPIMAGE.DARK INPUT @DETDB CHIP IMAGE - PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE - PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE - PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE - + PPIMAGE.INPUT INPUT @FILES CHIP IMAGE + PPIMAGE.MASK INPUT @DETDB CHIP IMAGE + PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE + PPIMAGE.DARK INPUT @DETDB CHIP IMAGE + PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE + PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE + PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE + ## files used to build and apply the flat field correction images - DVOCORR.INPUT INPUT @FILES CHIP IMAGE - DVOCORR.REFHEAD INPUT @FILES CHIP HEADER - DVOFLAT.INPUT INPUT @FILES CHIP IMAGE - DVOFLAT.CORR INPUT @DETDB CHIP IMAGE - - ## files used by psphot - PSPHOT.LOAD INPUT @FILES CHIP IMAGE - PSPHOT.INPUT INPUT @FILES CHIP IMAGE - PSPHOT.MASK INPUT @FILES CHIP MASK - PSPHOT.WEIGHT INPUT @FILES CHIP WEIGHT - PSPHOT.PSF.LOAD INPUT @FILES CHIP PSF - PSPHOT.INPUT.CMF INPUT @FILES CHIP CMF - - ## files used by psastro - PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF - - ## files used by pswarp - PSWARP.INPUT INPUT @FILES CHIP IMAGE - PSWARP.SKYCELL INPUT @FILES CHIP IMAGE + DVOCORR.INPUT INPUT @FILES CHIP IMAGE + DVOCORR.REFHEAD INPUT @FILES CHIP HEADER + DVOFLAT.INPUT INPUT @FILES CHIP IMAGE + DVOFLAT.CORR INPUT @DETDB CHIP IMAGE + + ## files used by psphot + PSPHOT.LOAD INPUT @FILES CHIP IMAGE + PSPHOT.INPUT INPUT @FILES CHIP IMAGE + PSPHOT.MASK INPUT @FILES CHIP MASK + PSPHOT.WEIGHT INPUT @FILES CHIP WEIGHT + PSPHOT.PSF.LOAD INPUT @FILES CHIP PSF + PSPHOT.INPUT.CMF INPUT @FILES CHIP CMF + + ## files used by psastro + PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF + + ## files used by pswarp + PSWARP.INPUT INPUT @FILES CHIP IMAGE + PSWARP.SKYCELL INPUT @FILES CHIP IMAGE PSWARP.WEIGHT INPUT @FILES CHIP WEIGHT PSWARP.MASK INPUT @FILES CHIP MASK - PSWARP.ASTROM INPUT @FILES CHIP CMF + PSWARP.ASTROM INPUT @FILES CHIP CMF PPSUB.INPUT INPUT none.fits CHIP IMAGE @@ -232,9 +232,9 @@ PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE TOGETHER PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE TOGETHER - + PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE TOGETHER PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE TOGETHER PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE TOGETHER - + PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE TOGETHER PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE TOGETHER @@ -247,5 +247,5 @@ # 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 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! Index: /trunk/ippconfig/esowfi/format_split.config =================================================================== --- /trunk/ippconfig/esowfi/format_split.config (revision 15308) +++ /trunk/ippconfig/esowfi/format_split.config (revision 15309) @@ -9,9 +9,9 @@ # How to read this data FILE METADATA - PHU STR CHIP # The FITS file represents an entire FPA + PHU STR CHIP # The FITS file represents an entire FPA EXTENSIONS STR NONE # There are no extensions - FPA.NAME STR ORIGIN # A PHU keyword for unique FPA identifier - CHIP.NAME STR EXTNAME # A PHU keyword for unique chip identifier - CONTENT STR {CHIP.NAME} # How to determine content of FITS file + FPA.NAME STR ORIGIN # A PHU keyword for unique FPA identifier + CONTENT STR EXTNAME # Key to the CONTENTS menu + CONTENT.RULE STR {CHIP.NAME} # How to derive the CONTENT when writing END Index: /trunk/ippconfig/esowfi/format_together.config =================================================================== --- /trunk/ippconfig/esowfi/format_together.config (revision 15308) +++ /trunk/ippconfig/esowfi/format_together.config (revision 15309) @@ -5,12 +5,12 @@ TELESCOP STR MPI-2.2 INSTRUME STR WFI - NAXIS S32 0 + NAXIS S32 0 END # How to read this data FILE METADATA - PHU STR FPA # The FITS file represents an entire FPA - EXTENSIONS STR CHIP # There are no extensions - FPA.NAME STR ESO OBS NAME# A PHU keyword for unique FPA identifier + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR CHIP # There are no extensions + FPA.NAME STR ESO OBS NAME # A PHU keyword for unique FPA identifier END @@ -39,7 +39,7 @@ WFICell METADATA CELL.TRIMSEC.SOURCE STR VALUE - CELL.TRIMSEC STR [49:2094,1:4098] + CELL.TRIMSEC STR [49:2094,1:4098] CELL.BIASSEC.SOURCE STR VALUE - CELL.BIASSEC STR [1:48,1:4098] + CELL.BIASSEC STR [1:48,1:4098] END END @@ -48,19 +48,17 @@ TRANSLATION METADATA FPA.TELESCOPE STR TELESCOP - FPA.INSTRUMENT STR INSTRUME - FPA.OBSTYPE STR IMAGETYP - FPA.AIRMASS STR AIRMASS - FPA.FILTER STR FILTER1 + FPA.INSTRUMENT STR INSTRUME + FPA.OBSTYPE STR IMAGETYP + FPA.AIRMASS STR AIRMASS + FPA.FILTER STR FILTER1 FPA.FILTERID STR FILTER1 - FPA.RA STR RA - FPA.DEC STR DEC - FPA.OBJECT STR OBJECT - FPA.TIME STR MJD-OBS + FPA.RA STR RA + FPA.DEC STR DEC + FPA.OBJECT STR OBJECT + FPA.TIME STR MJD-OBS FPA.EXPOSURE STR EXPTIME CELL.EXPOSURE STR EXPTIME CELL.DARKTIME STR EXPTIME - CELL.TIME STR MJD-OBS - #CELL.XBIN STR XBIN - #CELL.YBIN STR YBIN + CELL.TIME STR MJD-OBS END @@ -68,8 +66,8 @@ DEFAULTS METADATA FPA.DETECTOR STR WFI - FPA.TIMESYS STR UTC + FPA.TIMESYS STR UTC FPA.RADECSYS STR ICRS - CELL.SATURATION F32 65535 - CELL.BAD F32 0 + CELL.SATURATION F32 65535 + CELL.BAD F32 0 CELL.READDIR S32 1 CELL.TIMESYS STR UTC @@ -78,6 +76,8 @@ CHIP.XPARITY S32 1 CHIP.YPARITY S32 1 - CELL.X0 S32 0 - CELL.Y0 S32 0 + CELL.XBIN S32 1 + CELL.YBIN S32 1 + CELL.X0 S32 0 + CELL.Y0 S32 0 CHIP.X0.DEPEND STR CHIP.NAME CHIP.X0 METADATA @@ -102,10 +102,10 @@ Chip57 S32 1 END - CELL.XSIZE S32 2142 - CELL.YSIZE S32 4128 + CELL.XSIZE S32 2142 + CELL.YSIZE S32 4128 CELL.XWINDOW S32 0 CELL.YWINDOW S32 0 - CELL.GAIN F32 2.0 - CELL.READNOISE F32 3.0 + CELL.GAIN F32 2.0 + CELL.READNOISE F32 3.0 END