Index: trunk/ippconfig/tc3/.cvsignore =================================================================== --- trunk/ippconfig/tc3/.cvsignore (revision 12565) +++ trunk/ippconfig/tc3/.cvsignore (revision 12565) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: trunk/ippconfig/tc3/Makefile.am =================================================================== --- trunk/ippconfig/tc3/Makefile.am (revision 12525) +++ trunk/ippconfig/tc3/Makefile.am (revision 12565) @@ -1,14 +1,15 @@ -installdir = $(datadir)/ippconfig/megacam +installdir = $(datadir)/ippconfig/tc3 install_files = \ camera.config \ - format_mef.config \ - format_split.config \ - ppImage.config \ - ppMerge.config \ - ppStats.config \ - psastro.config \ - psphot.config + format.config \ + dvo.config + +# ppImage.config \ +# ppMerge.config \ +# ppStats.config \ +# psastro.config \ +# psphot.config install_DATA = $(install_files) Index: trunk/ippconfig/tc3/camera.config =================================================================== --- trunk/ippconfig/tc3/camera.config (revision 12525) +++ trunk/ippconfig/tc3/camera.config (revision 12565) @@ -29,6 +29,7 @@ # move this elsewhere? we need a lookup table to go from filter ID to abstract name FILTER.ID METADATA - B STR B - V STR V + NONE STR NONE + B STR B + V STR V END @@ -55,8 +56,8 @@ RECIPES METADATA # Other recipes - PSPHOT STR tc3/psphot.config # psphot details - PSASTRO STR tc3/psastro.config # psastro details - PPSTATS STR tc3/ppStats.config # ppStats recipe - PPIMAGE STR tc3/ppImage.config # ppImage recipe +# PSPHOT STR tc3/psphot.config # psphot details +# PSASTRO STR tc3/psastro.config # psastro details +# PPSTATS STR tc3/ppStats.config # ppStats recipe +# PPIMAGE STR tc3/ppImage.config # ppImage recipe END @@ -95,7 +96,4 @@ PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF - PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT.MEF - PPIMAGE.BIN1 STR PPIMAGE.BIN1.MEF - PPIMAGE.BIN2 STR PPIMAGE.BIN2.MEF DVOCORR.OUTPUT STR DVOCORR.MEF.OUTPUT DVOFLAT.OUTPUT STR DVOFLAT.MEF.OUTPUT @@ -126,28 +124,25 @@ ### output file definitions TYPE OUTPUT FILENAME.RULE DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.fits CHIP IMAGE TRUE SPLIT - PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.fits CHIP IMAGE TRUE MEF + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits CHIP IMAGE TRUE NONE PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits CHIP MASK FALSE NONE PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits CHIP WEIGHT FALSE NONE - PPIMAGE.BIN1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits CHIP IMAGE TRUE SPLIT - PPIMAGE.BIN2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits CHIP IMAGE TRUE SPLIT - PPIMAGE.BIN1.MEF OUTPUT {OUTPUT}.b1.fits CHIP IMAGE TRUE MEF - PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2.fits CHIP IMAGE TRUE MEF - DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits CHIP IMAGE TRUE MEF - DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits CHIP IMAGE TRUE SPLIT - DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits CHIP IMAGE TRUE MEF - DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits CHIP IMAGE TRUE SPLIT + PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits CHIP IMAGE TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits CHIP IMAGE TRUE NONE + DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits CHIP IMAGE TRUE NONE + DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits CHIP IMAGE TRUE NONE + DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits CHIP IMAGE TRUE NONE + DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits CHIP IMAGE TRUE NONE - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits CHIP IMAGE TRUE SPLIT - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits FPA IMAGE TRUE MEF - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits FPA IMAGE TRUE MEF + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits FPA IMAGE TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits FPA IMAGE TRUE NONE PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg FPA JPEG TRUE NONE PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg FPA JPEG TRUE NONE - PSPHOT.RESID OUTPUT {OUTPUT}.res.fits CHIP IMAGE TRUE MEF - PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits CHIP IMAGE TRUE MEF - PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits CHIP IMAGE TRUE MEF - PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits CHIP IMAGE TRUE MEF + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits CHIP IMAGE TRUE NONE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits CHIP IMAGE TRUE NONE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits CHIP IMAGE TRUE NONE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits CHIP IMAGE TRUE NONE PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} CHIP RAW TRUE NONE Index: trunk/ippconfig/tc3/format.config =================================================================== --- trunk/ippconfig/tc3/format.config (revision 12525) +++ trunk/ippconfig/tc3/format.config (revision 12565) @@ -9,92 +9,161 @@ FILE METADATA # How to read this data - PHU STR FPA # The FITS file represents an entire FPA - EXTENSIONS STR CHIP # The extensions represent chips - CONTENT STR {EXTNAME} + PHU STR CHIP # The FITS file represents a chip + EXTENSIONS STR CELL # The extensions represent cells FPA.NAME STR OBSTYPE # A PHU keyword for unique identifier CHIP.NAME STR DETECTOR # An extension keyword for unique identifie + CONTENT STR {CHIP.NAME} # How to determine content of FITS file END # What's in the FITS file? CONTENTS METADATA - # Extension name, chip name:component cell - STR ccd00:Amp:cell - STR ccd01:Amp:cell - STR ccd02:Amp:cell - STR ccd03:Amp:cell - STR ccd04:Amp:cell - STR ccd05:Amp:cell - STR ccd06:Amp:cell - STR ccd07:Amp:cell -END - -# What's in the FITS file? -CONTENTS METADATA - # Extension name, type - xy00 STR xy00:pitch10u - xy01 STR xy01:pitch10u - xy02 STR xy02:pitch10u - xy03 STR xy03:pitch10u - xy04 STR xy04:pitch10u - xy05 STR xy05:pitch10u - xy06 STR xy06:pitch10u - xy07 STR xy07:pitch10u - xy10 STR xy10:pitch10u - xy11 STR xy11:pitch10u - xy12 STR xy12:pitch10u - xy13 STR xy13:pitch10u - xy14 STR xy14:pitch10u - xy15 STR xy15:pitch10u - xy16 STR xy16:pitch10u - xy17 STR xy17:pitch10u - xy20 STR xy20:pitch10u - xy21 STR xy21:pitch10u - xy22 STR xy22:pitch10u - xy23 STR xy23:pitch10u - xy24 STR xy24:pitch10u - xy25 STR xy25:pitch10u - xy26 STR xy26:pitch10u - xy27 STR xy27:pitch10u - xy30 STR xy30:pitch10u - xy31 STR xy31:pitch10u - xy32 STR xy32:pitch10u - xy33 STR xy33:pitch10u - xy34 STR xy34:pitch10u - xy35 STR xy35:pitch10u - xy36 STR xy36:pitch10u - xy37 STR xy37:pitch10u - xy40 STR xy40:pitch10u - xy41 STR xy41:pitch10u - xy42 STR xy42:pitch10u - xy43 STR xy43:pitch10u - xy44 STR xy44:pitch10u - xy45 STR xy45:pitch10u - xy46 STR xy46:pitch10u - xy47 STR xy47:pitch10u - xy50 STR xy50:pitch10u - xy51 STR xy51:pitch10u - xy52 STR xy52:pitch10u - xy53 STR xy53:pitch10u - xy54 STR xy54:pitch10u - xy55 STR xy55:pitch10u - xy56 STR xy56:pitch10u - xy57 STR xy57:pitch10u - xy60 STR xy60:pitch10u - xy61 STR xy61:pitch10u - xy62 STR xy62:pitch10u - xy63 STR xy63:pitch10u - xy64 STR xy64:pitch10u - xy65 STR xy65:pitch10u - xy66 STR xy66:pitch10u - xy67 STR xy67:pitch10u - xy70 STR xy70:pitch10u - xy71 STR xy71:pitch10u - xy72 STR xy72:pitch10u - xy73 STR xy73:pitch10u - xy74 STR xy74:pitch10u - xy75 STR xy75:pitch10u - xy76 STR xy76:pitch10u - xy77 STR xy77:pitch10u -END + # File identifier with corresponding file layout name + CCID58-1-06b STR CCID58 + CCID45-1-14A STR CCID45 + CCID45-1-11A STR CCID45 + CCID45-1-22A STR CCID45 + CCID45-1-04C STR CCID45 + CCID45-1-13A STR CCID45 + CCID45-1-05A STR CCID45 + CCID45-1-19A STR CCID45 +END + +# Specify the layout +CHIPS METADATA + CCID58 METADATA + # Extension name, cellName:cellType + xy00 STR xy00:pitch10u + xy01 STR xy01:pitch10u + xy02 STR xy02:pitch10u + xy03 STR xy03:pitch10u + xy04 STR xy04:pitch10u + xy05 STR xy05:pitch10u + xy06 STR xy06:pitch10u + xy07 STR xy07:pitch10u + xy10 STR xy10:pitch10u + xy11 STR xy11:pitch10u + xy12 STR xy12:pitch10u + xy13 STR xy13:pitch10u + xy14 STR xy14:pitch10u + xy15 STR xy15:pitch10u + xy16 STR xy16:pitch10u + xy17 STR xy17:pitch10u + xy20 STR xy20:pitch10u + xy21 STR xy21:pitch10u + xy22 STR xy22:pitch10u + xy23 STR xy23:pitch10u + xy24 STR xy24:pitch10u + xy25 STR xy25:pitch10u + xy26 STR xy26:pitch10u + xy27 STR xy27:pitch10u + xy30 STR xy30:pitch10u + xy31 STR xy31:pitch10u + xy32 STR xy32:pitch10u + xy33 STR xy33:pitch10u + xy34 STR xy34:pitch10u + xy35 STR xy35:pitch10u + xy36 STR xy36:pitch10u + xy37 STR xy37:pitch10u + xy40 STR xy40:pitch10u + xy41 STR xy41:pitch10u + xy42 STR xy42:pitch10u + xy43 STR xy43:pitch10u + xy44 STR xy44:pitch10u + xy45 STR xy45:pitch10u + xy46 STR xy46:pitch10u + xy47 STR xy47:pitch10u + xy50 STR xy50:pitch10u + xy51 STR xy51:pitch10u + xy52 STR xy52:pitch10u + xy53 STR xy53:pitch10u + xy54 STR xy54:pitch10u + xy55 STR xy55:pitch10u + xy56 STR xy56:pitch10u + xy57 STR xy57:pitch10u + xy60 STR xy60:pitch10u + xy61 STR xy61:pitch10u + xy62 STR xy62:pitch10u + xy63 STR xy63:pitch10u + xy64 STR xy64:pitch10u + xy65 STR xy65:pitch10u + xy66 STR xy66:pitch10u + xy67 STR xy67:pitch10u + xy70 STR xy70:pitch10u + xy71 STR xy71:pitch10u + xy72 STR xy72:pitch10u + xy73 STR xy73:pitch10u + xy74 STR xy74:pitch10u + xy75 STR xy75:pitch10u + xy76 STR xy76:pitch10u + xy77 STR xy77:pitch10u + END + CCID45 METADATA + # Extension name, cellName:cellType + xy00 STR xy00:pitch10u + xy01 STR xy01:pitch10u + xy02 STR xy02:pitch10u + xy03 STR xy03:pitch10u + xy04 STR xy04:pitch10u + xy05 STR xy05:pitch10u + xy06 STR xy06:pitch10u + xy07 STR xy07:pitch10u + xy10 STR xy10:pitch10u + xy11 STR xy11:pitch10u + xy12 STR xy12:pitch10u + xy13 STR xy13:pitch10u + xy14 STR xy14:pitch10u + xy15 STR xy15:pitch10u + xy16 STR xy16:pitch10u + xy17 STR xy17:pitch10u + xy20 STR xy20:pitch10u + xy21 STR xy21:pitch10u + xy22 STR xy22:pitch10u + xy23 STR xy23:pitch10u + xy24 STR xy24:pitch10u + xy25 STR xy25:pitch10u + xy26 STR xy26:pitch10u + xy27 STR xy27:pitch10u + xy30 STR xy30:pitch10u + xy31 STR xy31:pitch10u + xy32 STR xy32:pitch10u + xy33 STR xy33:pitch10u + xy34 STR xy34:pitch10u + xy35 STR xy35:pitch10u + xy36 STR xy36:pitch10u + xy37 STR xy37:pitch10u + xy40 STR xy40:pitch10u + xy41 STR xy41:pitch10u + xy42 STR xy42:pitch10u + xy43 STR xy43:pitch10u + xy44 STR xy44:pitch10u + xy45 STR xy45:pitch10u + xy46 STR xy46:pitch10u + xy47 STR xy47:pitch10u + xy50 STR xy50:pitch10u + xy51 STR xy51:pitch10u + xy52 STR xy52:pitch10u + xy53 STR xy53:pitch10u + xy54 STR xy54:pitch10u + xy55 STR xy55:pitch10u + xy56 STR xy56:pitch10u + xy57 STR xy57:pitch10u + xy60 STR xy60:pitch10u + xy61 STR xy61:pitch10u + xy62 STR xy62:pitch10u + xy63 STR xy63:pitch10u + xy64 STR xy64:pitch10u + xy65 STR xy65:pitch10u + xy66 STR xy66:pitch10u + xy67 STR xy67:pitch10u + xy70 STR xy70:pitch10u + xy71 STR xy71:pitch10u + xy72 STR xy72:pitch10u + xy73 STR xy73:pitch10u + xy74 STR xy74:pitch10u + xy75 STR xy75:pitch10u + xy76 STR xy76:pitch10u + xy77 STR xy77:pitch10u + END +END # Specify the cell data @@ -128,6 +197,6 @@ FPA.OBSTYPE STR OBSTYPE FPA.OBJECT STR OBJECT - FPA.FILTERID STR FILTER - FPA.FILTER STR FILTER +# FPA.FILTERID STR FILTER # Not available from OTIS +# FPA.FILTER STR FILTER # Not available from OTIS FPA.POSANGLE STR ROTANGLE FPA.RA STR RA @@ -136,5 +205,4 @@ FPA.FOCUS STR TELFOCUS FPA.TIME STR MJD-OBS - FPA.TIMESYS STR TIMESYS FPA.ALT STR TELALT FPA.AZ STR TELAZ @@ -148,5 +216,4 @@ # CELL.READNOISE STR RDNOISE CELL.SATURATION STR SATURATE - CELL.TIMESYS STR TIMESYS CELL.XBIN STR CCDBIN1 CELL.YBIN STR CCDBIN2 @@ -156,4 +223,8 @@ # Default PS concepts that may be specified by value DEFAULTS METADATA + FPA.TIMESYS STR UTC + CELL.TIMESYS STR UTC + FPA.FILTERID STR NONE + FPA.FILTER STR NONE CHIP.XSIZE S32 2048 CHIP.YSIZE S32 4612 @@ -166,50 +237,55 @@ CELL.YPARITY S32 1 CELL.Y0 S32 0 - CHIP.X0.DEPEND STR CHIP.NAME - CHIP.X0 METADATA - chip00 S32 0 - chip01 S32 2048 - chip02 S32 4096 - chip03 S32 6144 - chip04 S32 8192 - chip05 S32 10240 - chip06 S32 0 - chip07 S32 2048 - chip08 S32 4096 - chip09 S32 6144 - chip10 S32 8192 - chip11 S32 10240 - END - CHIP.Y0.DEPEND STR CHIP.NAME - CHIP.Y0 METADATA - chip00 S32 0 - chip01 S32 0 - chip02 S32 0 - chip03 S32 0 - chip04 S32 0 - chip05 S32 0 - chip06 S32 4128 - chip07 S32 4128 - chip08 S32 4128 - chip09 S32 4128 - chip10 S32 4128 - chip11 S32 4128 - END + +# CHIP.X0.DEPEND STR CHIP.NAME +# CHIP.X0 METADATA +# chip00 S32 0 +# chip01 S32 2048 +# chip02 S32 4096 +# chip03 S32 6144 +# chip04 S32 8192 +# chip05 S32 10240 +# chip06 S32 0 +# chip07 S32 2048 +# chip08 S32 4096 +# chip09 S32 6144 +# chip10 S32 8192 +# chip11 S32 10240 +# END +# CHIP.Y0.DEPEND STR CHIP.NAME +# CHIP.Y0 METADATA +# chip00 S32 0 +# chip01 S32 0 +# chip02 S32 0 +# chip03 S32 0 +# chip04 S32 0 +# chip05 S32 0 +# chip06 S32 4128 +# chip07 S32 4128 +# chip08 S32 4128 +# chip09 S32 4128 +# chip10 S32 4128 +# chip11 S32 4128 +# END +# CHIP.XPARITY S32 1 +# CHIP.YPARITY.DEPEND STR CHIP.NAME +# CHIP.YPARITY METADATA +# chip00 S32 +1 +# chip01 S32 +1 +# chip02 S32 +1 +# chip03 S32 +1 +# chip04 S32 +1 +# chip05 S32 +1 +# chip06 S32 -1 +# chip07 S32 -1 +# chip08 S32 -1 +# chip09 S32 -1 +# chip10 S32 -1 +# chip11 S32 -1 +# END CHIP.XPARITY S32 1 - CHIP.YPARITY.DEPEND STR CHIP.NAME - CHIP.YPARITY METADATA - chip00 S32 +1 - chip01 S32 +1 - chip02 S32 +1 - chip03 S32 +1 - chip04 S32 +1 - chip05 S32 +1 - chip06 S32 -1 - chip07 S32 -1 - chip08 S32 -1 - chip09 S32 -1 - chip10 S32 -1 - chip11 S32 -1 - END + CHIP.YPARITY S32 1 + CHIP.X0 S32 0 + CHIP.Y0 S32 0 END