Index: /trunk/ippconfig/simmosaic/Makefile.am =================================================================== --- /trunk/ippconfig/simmosaic/Makefile.am (revision 13020) +++ /trunk/ippconfig/simmosaic/Makefile.am (revision 13021) @@ -4,5 +4,6 @@ install_files = \ camera.config \ - format_split.config \ + format_chip_cell.config \ + format_chip_none.config \ ppImage.config \ psastro.config \ Index: /trunk/ippconfig/simmosaic/camera.config =================================================================== --- /trunk/ippconfig/simmosaic/camera.config (revision 13020) +++ /trunk/ippconfig/simmosaic/camera.config (revision 13021) @@ -21,4 +21,7 @@ R STR R I STR I + g STR g + r STR r + i STR i z STR z END @@ -27,4 +30,9 @@ CLASSID METADATA FPA STR fpa + CHIP STR {CHIP.NAME} + CELL STR {CHIP.NAME}.{CELL.NAME} + fpa STR fpa + chip STR {CHIP.NAME} + cell STR {CHIP.NAME}.{CELL.NAME} END @@ -55,7 +63,7 @@ FLAT MULTI - BIAS LIMITS * 0 1 20 0.5 20 0 3 20 0 0 0 0.5 - DARK LIMITS * 0 1 0 0.5 0 0 3 20 0 0 0 0.5 - SHUTTER LIMITS * 0 0 0 0 0 0 0 0 0 0 0 20.0 + BIAS LIMITS * 0 1 20 0.5 20 0 3 20 0 0 0 0.75 + DARK LIMITS * 0 1 0 0.5 0 0 3 20 0 0 0 0.75 + SHUTTER LIMITS * 0 0 0 0 0 0 0 0 0 0 0 0 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 @@ -89,14 +97,14 @@ ### input file definitions TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE - PPIMAGE.INPUT INPUT none.fits FPA IMAGE - INPUT.MASK INPUT none.fits FPA MASK - INPUT.WEIGHT INPUT none.fits FPA WEIGHT + PPIMAGE.INPUT INPUT none.fits CHIP IMAGE + INPUT.MASK INPUT none.fits CHIP MASK + INPUT.WEIGHT INPUT none.fits CHIP WEIGHT INPUT.PSF INPUT none.fits READOUT PSF INPUT.SRC INPUT none.fits READOUT CMF - PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE - PPIMAGE.DARK INPUT @DETDB CHIP IMAGE - PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE - PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE - PPIMAGE.MASK INPUT @DETDB CHIP IMAGE + PPIMAGE.BIAS INPUT @DETDB CELL IMAGE + PPIMAGE.DARK INPUT @DETDB CELL IMAGE + PPIMAGE.SHUTTER INPUT @DETDB CELL IMAGE + PPIMAGE.FLAT INPUT @DETDB CELL IMAGE + PPIMAGE.MASK INPUT @DETDB CELL IMAGE PSPHOT.INPUT INPUT none.fits CHIP IMAGE PSWARP.INPUT INPUT none.fits FPA IMAGE @@ -108,8 +116,8 @@ ### output file definitions TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT - PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits MASK CHIP TRUE SPLIT - PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT CHIP TRUE SPLIT - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits MASK CHIP TRUE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT CHIP TRUE NONE + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE CHIP TRUE NONE PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.fpa1.fits IMAGE FPA TRUE NONE PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.fpa2.fits IMAGE FPA TRUE NONE @@ -117,6 +125,6 @@ PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE - PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE - PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE CHIP TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE CHIP TRUE NONE DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE FPA TRUE NONE Index: /trunk/ippconfig/simmosaic/format_split.config =================================================================== --- /trunk/ippconfig/simmosaic/format_split.config (revision 13020) +++ /trunk/ippconfig/simmosaic/format_split.config (revision 13021) @@ -54,4 +54,5 @@ FPA.AIRMASS STR AIRMASS FPA.FILTER STR FILTER + FPA.FILTERID STR FILTER FPA.POSANGLE STR POSANGLE FPA.RA STR RA @@ -63,4 +64,6 @@ CELL.DARKTIME STR DARKTIME CELL.TIME STR DATE-OBS UTC-OBS # Date and time + CELL.XBIN STR XBIN + CELL.YBIN STR YBIN END @@ -107,6 +110,4 @@ CELL.XSIZE S32 500 CELL.YSIZE S32 500 - CELL.XBIN S32 1 - CELL.YBIN S32 1 CELL.GAIN F32 1.0 CELL.READNOISE F32 10.0 Index: /trunk/ippconfig/simmosaic/ppImage.config =================================================================== --- /trunk/ippconfig/simmosaic/ppImage.config (revision 13020) +++ /trunk/ippconfig/simmosaic/ppImage.config (revision 13021) @@ -16,5 +16,5 @@ OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE -OVERSCAN.ORDER S32 3 # Order of polynomial fit +OVERSCAN.ORDER S32 7 # Order of polynomial fit OVERSCAN.STAT STR MEAN # MEAN | MEDIAN @@ -43,5 +43,5 @@ # Overscan subtraction only PPIMAGE_O METADATA - OVERSCAN BOOL FALSE # Overscan subtraction + OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -85,5 +85,5 @@ # Overscan, bias, dark PPIMAGE_OBD METADATA - OVERSCAN BOOL FALSE # Overscan subtraction + OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -99,5 +99,5 @@ # Overscan, bias, dark, shutter PPIMAGE_OBDS METADATA - OVERSCAN BOOL FALSE # Overscan subtraction + OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -113,5 +113,5 @@ # Overscan, bias, dark, shutter, flat-field PPIMAGE_OBDSF METADATA - OVERSCAN BOOL FALSE # Overscan subtraction + OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -127,5 +127,5 @@ # Overscan, bias, dark, shutter, flat-field, fringe PPIMAGE_OBDSFR METADATA - OVERSCAN BOOL FALSE # Overscan subtraction + OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -141,5 +141,5 @@ # Overscan, bias, dark, shutter, flat-field, fringe, photom PPIMAGE_OBDSFRP METADATA - OVERSCAN BOOL FALSE # Overscan subtraction + OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -148,5 +148,5 @@ MASK BOOL FALSE # Mask bad pixels FRINGE BOOL FALSE # Fringe subtraction - PHOTOM BOOL FALSE # Source identification and photometry + PHOTOM BOOL TRUE # Source identification and photometry ASTROM.CHIP BOOL FALSE # Astrometry per chip? ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? @@ -155,5 +155,5 @@ # Overscan, bias, dark, shutter, flat-field, fringe, photom, astrom PPIMAGE_OBDSFRA METADATA - OVERSCAN BOOL FALSE # Overscan subtraction + OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -162,6 +162,6 @@ MASK BOOL FALSE # Mask bad pixels FRINGE BOOL FALSE # Fringe subtraction - PHOTOM BOOL FALSE # Source identification and photometry - ASTROM.CHIP BOOL FALSE # Astrometry per chip? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? END