Index: /trunk/ippconfig/ctio_mosaic2/camera.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2/camera.config (revision 10517) +++ /trunk/ippconfig/ctio_mosaic2/camera.config (revision 10518) @@ -16,5 +16,4 @@ ccd06 STR LeftAmp RightAmp ccd07 STR LeftAmp RightAmp - ccd08 STR LeftAmp RightAmp END @@ -101,6 +100,6 @@ PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.chip.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE CTIO_MOSAIC2_CHIP:MOSAIC - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits NONE NONE NONE FPA FPA IMAGE TRUE CTIO_MOSAIC2_FPA:MOSAIC - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE FPA FPA IMAGE TRUE CTIO_MOSAIC2_FPA:MOSAIC + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.fpa1.fits NONE NONE NONE FPA FPA IMAGE TRUE CTIO_MOSAIC2_FPA:MOSAIC + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.fpa2.fits NONE NONE NONE FPA FPA IMAGE TRUE CTIO_MOSAIC2_FPA:MOSAIC PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 FPA FPA JPEG TRUE CTIO_MOSAIC2_FPA:MOSAIC Index: /trunk/ippconfig/ctio_mosaic2/format.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2/format.config (revision 10517) +++ /trunk/ippconfig/ctio_mosaic2/format.config (revision 10518) @@ -19,29 +19,39 @@ CONTENTS METADATA # Extension name, chip name:type - im1 STR ccd00:LeftAmp:amp - im2 STR ccd00:RightAmp:amp - im3 STR ccd01:LeftAmp:amp - im4 STR ccd01:RightAmp:amp - im5 STR ccd02:LeftAmp:amp - im6 STR ccd02:RightAmp:amp - im7 STR ccd03:LeftAmp:amp - im8 STR ccd03:RightAmp:amp - im9 STR ccd04:LeftAmp:amp - im10 STR ccd04:RightAmp:amp - im11 STR ccd05:LeftAmp:amp - im12 STR ccd05:RightAmp:amp - im13 STR ccd06:LeftAmp:amp - im14 STR ccd06:RightAmp:amp - im15 STR ccd07:LeftAmp:amp - im16 STR ccd07:RightAmp:amp + im1 STR ccd00:LeftAmp:left + im2 STR ccd00:RightAmp:right + im3 STR ccd01:LeftAmp:left + im4 STR ccd01:RightAmp:right + im5 STR ccd02:LeftAmp:left + im6 STR ccd02:RightAmp:right + im7 STR ccd03:LeftAmp:left + im8 STR ccd03:RightAmp:right + im9 STR ccd04:LeftAmp:left + im10 STR ccd04:RightAmp:right + im11 STR ccd05:LeftAmp:left + im12 STR ccd05:RightAmp:right + im13 STR ccd06:LeftAmp:left + im14 STR ccd06:RightAmp:right + im15 STR ccd07:LeftAmp:left + im16 STR ccd07:RightAmp:right END # Specify the cell data CELLS METADATA - amp METADATA + left METADATA CELL.BIASSEC.SOURCE STR HEADER CELL.TRIMSEC.SOURCE STR HEADER CELL.BIASSEC STR BIASSEC - CELL.TRIMSEC STR DATASEC + CELL.TRIMSEC STR TRIMSEC + CELL.XPARITY S32 1 + CELL.X0 S32 0 + END + right METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + CELL.TRIMSEC STR TRIMSEC + CELL.XPARITY S32 1 + CELL.X0 S32 1024 END END @@ -66,14 +76,4 @@ CELL.XBIN STR CCDSUM CELL.YBIN STR CCDSUM - - CHIP.XPARITY STR DTM1_1 - CHIP.YPARITY STR DTM2_2 - CHIP.X0 STR DTV1 - CHIP.Y0 STR DTV2 - - CELL.XPARITY STR ATM1_1 - CELL.YPARITY STR ATM2_2 - CELL.X0 STR ATV1 - CELL.Y0 STR ATV2 END @@ -87,4 +87,42 @@ CELL.READDIR S32 1 # Cell is read in x direction CELL.BAD S32 0 + CELL.YPARITY S32 1 + CELL.Y0 S32 0 + + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + ccd00 S32 0 + ccd01 S32 2048 + ccd02 S32 4096 + ccd03 S32 6144 + ccd04 S32 0 + ccd05 S32 2048 + ccd06 S32 4096 + ccd07 S32 6144 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + ccd00 S32 0 + ccd01 S32 0 + ccd02 S32 0 + ccd03 S32 0 + ccd04 S32 4096 + ccd05 S32 4096 + ccd06 S32 4096 + ccd07 S32 4096 + END + CHIP.XPARITY S32 1 + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + ccd00 S32 1 + ccd01 S32 1 + ccd02 S32 1 + ccd03 S32 1 + ccd04 S32 1 + ccd05 S32 1 + ccd06 S32 1 + ccd07 S32 1 + END + END @@ -114,7 +152,7 @@ FPA.TIME STR MJD CELL.TIME STR MJD - CHIP.X0 STR FORTRAN - CHIP.Y0 STR FORTRAN - CELL.X0 STR FORTRAN - CELL.Y0 STR FORTRAN +# CHIP.X0 STR FORTRAN +# CHIP.Y0 STR FORTRAN +# CELL.X0 STR FORTRAN +# CELL.Y0 STR FORTRAN END Index: /trunk/ippconfig/ctio_mosaic2_chip/camera.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2_chip/camera.config (revision 10517) +++ /trunk/ippconfig/ctio_mosaic2_chip/camera.config (revision 10518) @@ -16,5 +16,4 @@ ccd06 STR Mosaicked ccd07 STR Mosaicked - ccd08 STR Mosaicked END @@ -28,5 +27,5 @@ RECIPES METADATA # Recipes for ppImage - PPIMAGE STR ctio_mosaic2_chip/ppImage.config # Default: all (normal) options on + PPIMAGE STR ctio_mosaic2/ppImage.config # Default: all (normal) options on END @@ -94,11 +93,11 @@ ### 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}.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE NONE - PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP MASK FALSE NONE - PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP WEIGHT FALSE NONE + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP MASK FALSE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP WEIGHT FALSE NONE PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fits {CHIP.NAME} {CHIP.NAME} NONE FPA FPA IMAGE TRUE CTIO_MOSAIC2_FPA:MOSAIC PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits {CHIP.NAME} {CHIP.NAME} NONE FPA FPA IMAGE TRUE CTIO_MOSAIC2_FPA:MOSAIC - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.chip.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE CTIO_MOSAIC2_CHIP:MOSAIC + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.chip.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE CTIO_MOSAIC2_CHIP:MOSAIC PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits NONE NONE NONE FPA FPA IMAGE TRUE CTIO_MOSAIC2_FPA:MOSAIC PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE FPA FPA IMAGE TRUE CTIO_MOSAIC2_FPA:MOSAIC Index: /trunk/ippconfig/ctio_mosaic2_chip/format.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2_chip/format.config (revision 10517) +++ /trunk/ippconfig/ctio_mosaic2_chip/format.config (revision 10518) @@ -5,6 +5,4 @@ TELESCOP STR CTIO 4.0 meter telescope DETECTOR STR Mosaic2 Mosaicked:Chip - EXTEND BOOL T - NEXTEND S32 16 END @@ -12,6 +10,8 @@ FILE METADATA PHU STR FPA # The FITS file represents an entire FPA - EXTENSIONS STR CELL # The extensions represent cells + EXTENSIONS STR CHIP # The extensions represent cells FPA.NAME STR FILENAME # A PHU keyword for unique identifier within the hierarchy level +# CHIP.NAME STR EXTNAME +# CONTENT STR {CHIP.NAME} END @@ -19,4 +19,5 @@ CONTENTS METADATA # Extension name, chip name:type + ccd00 STR ccd00:Mosaicked:mosaic_amp ccd01 STR ccd01:Mosaicked:mosaic_amp ccd02 STR ccd02:Mosaicked:mosaic_amp @@ -26,5 +27,4 @@ ccd06 STR ccd06:Mosaicked:mosaic_amp ccd07 STR ccd07:Mosaicked:mosaic_amp - ccd08 STR ccd08:Mosaicked:mosaic_amp END @@ -58,9 +58,4 @@ CELL.XBIN STR CCDSUM CELL.YBIN STR CCDSUM - - CHIP.XPARITY STR DTM1_1 - CHIP.YPARITY STR DTM2_2 - CHIP.X0 STR DTV1 - CHIP.Y0 STR DTV2 END @@ -76,6 +71,42 @@ CELL.XPARITY S32 1 CELL.YPARITY S32 1 - CELL.X0 S32 1 - CELL.Y0 S32 1 + CELL.X0 S32 0 + CELL.Y0 S32 0 + + CHIP.XPARITY S32 1 + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + ccd00 S32 0 + ccd01 S32 2048 + ccd02 S32 4096 + ccd03 S32 6144 + ccd04 S32 0 + ccd05 S32 2048 + ccd06 S32 4096 + ccd07 S32 6144 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + ccd00 S32 0 + ccd01 S32 0 + ccd02 S32 0 + ccd03 S32 0 + ccd04 S32 4096 + ccd05 S32 4096 + ccd06 S32 4096 + ccd07 S32 4096 + END + CHIP.XPARITY S32 1 + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + ccd00 S32 1 + ccd01 S32 1 + ccd02 S32 1 + ccd03 S32 1 + ccd04 S32 1 + ccd05 S32 1 + ccd06 S32 1 + ccd07 S32 1 + END END @@ -105,7 +136,3 @@ FPA.TIME STR MJD CELL.TIME STR MJD - CHIP.X0 STR FORTRAN - CHIP.Y0 STR FORTRAN - CELL.X0 STR FORTRAN - CELL.Y0 STR FORTRAN END Index: /trunk/ippconfig/ctio_mosaic2_fpa/camera.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2_fpa/camera.config (revision 10517) +++ /trunk/ippconfig/ctio_mosaic2_fpa/camera.config (revision 10518) @@ -20,5 +20,5 @@ RECIPES METADATA # Recipes for ppImage - PPIMAGE STR ctio_mosaic2_fpa/ppImage.config # Default: all (normal) options on + PPIMAGE STR ctio_mosaic2/ppImage.config # Default: all (normal) options on END @@ -92,5 +92,5 @@ PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits {CHIP.NAME} {CHIP.NAME} NONE FPA FPA IMAGE TRUE NONE - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.chip.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.chip.fits {CHIP.NAME} {CHIP.NAME} NONE FPA FPA IMAGE TRUE NONE PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits NONE NONE NONE FPA FPA IMAGE TRUE NONE PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE FPA FPA IMAGE TRUE NONE Index: /trunk/ippconfig/ctio_mosaic2_fpa/format.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2_fpa/format.config (revision 10517) +++ /trunk/ippconfig/ctio_mosaic2_fpa/format.config (revision 10518) @@ -4,7 +4,5 @@ RULE METADATA TELESCOP STR CTIO 4.0 meter telescope - DETECTOR STR Mosaic2 Mosaicked:Chip - EXTEND BOOL T - NEXTEND S32 16 + DETECTOR STR Mosaic2 Mosaicked:FPA END