Index: trunk/ippconfig/ctio_mosaic2/camera.config =================================================================== --- trunk/ippconfig/ctio_mosaic2/camera.config (revision 13851) +++ trunk/ippconfig/ctio_mosaic2/camera.config (revision 13865) @@ -18,8 +18,11 @@ END - -# move this elsewhere? we need a lookup table to go from filter ID to abstract name +# menu of possible filter names: internal STR external name FILTER.ID METADATA - VR.Supermacho.c6027 STR VR + VR MULTI + VR STR VR.Supermacho.c6027 + VR STR VR Supermacho c6027 + R STR R Harris c6004 + I STR I c6028 END @@ -173,2 +176,8 @@ PSF.RESID STR {CHIP.NAME}.psf_resid END + +BLANK.HEADERS METADATA + FPA.TIME STR MJD-OBS + FPA.EXPOSURE STR EXPTIME + FPA.AIRMASS STR AIRMASS +END Index: trunk/ippconfig/ctio_mosaic2/format.config =================================================================== --- trunk/ippconfig/ctio_mosaic2/format.config (revision 13851) +++ trunk/ippconfig/ctio_mosaic2/format.config (revision 13865) @@ -59,7 +59,6 @@ # How to translate PS concepts into FITS headers TRANSLATION METADATA - FPA.TELESCOPE STR BLANCO - FPA.INSTRUMENT STR MOSAIC2 FPA.AIRMASS STR AIRMASS + FPA.FILTERID STR FILTER FPA.FILTER STR FILTER FPA.RA STR RA @@ -82,4 +81,7 @@ # Default PS concepts that may be specified by value DEFAULTS METADATA + FPA.TELESCOPE STR BLANCO + FPA.INSTRUMENT STR MOSAIC2 + FPA.DETECTOR STR CTIO_MOSAIC2 FPA.POSANGLE F32 0.0 FPA.TIMESYS STR UTC # Header says "UTC approximate" Index: trunk/ippconfig/ctio_mosaic2/ppImage.config =================================================================== --- trunk/ippconfig/ctio_mosaic2/ppImage.config (revision 13851) +++ trunk/ippconfig/ctio_mosaic2/ppImage.config (revision 13865) @@ -5,5 +5,6 @@ DARK BOOL FALSE # Dark correction -BASE.FITS BOOL TRUE # Save base detrended image? +BASE.FITS BOOL FALSE # Save base detrended image? +CHIP.FITS BOOL TRUE # Save base detrended image? BIN1.FITS BOOL TRUE # Save 1st binned chip image? BIN2.FITS BOOL TRUE # Save 2nd binned chip image? @@ -21,4 +22,31 @@ OVERSCAN.STAT STR MEAN # MEAN | MEDIAN +DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + DARK METADATA +# EXPTIME STR FPA.EXPOSURE + END + FLAT METADATA + FILTER STR FPA.FILTERID +# DETTYPE STR DOMEFLAT.RAW +# VERSION STR SKYFLAT.RAW +# VERSION STR DOMEFLAT.CORR.XX +# VERSION STR SKYFLAT.CORR + END + FLAT_CORRECTION METADATA + FILTER STR FPA.FILTER + END + FRINGE METADATA + FILTER STR FPA.FILTER +# AIRMASS STR FPA.AIRMASS +# TWILIGHT STR FPA.TWILIGHT + END + SHUTTER METADATA + END + MASK METADATA + END +END + #################################################################################### # Need the following in order to turn off dark and shutter for the site-level recipe @@ -29,5 +57,5 @@ OVERSCAN BOOL FALSE # Overscan subtraction BIAS BOOL FALSE # Bias subtraction - DARK BOOL FALSE # Dark subtraction + DARK BOOL FALSE # Dark subtraction SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation @@ -41,5 +69,5 @@ BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction - SHUTTER BOOL FALSE # Shutter correction + SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels @@ -51,5 +79,5 @@ OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction - DARK BOOL FALSE # Dark subtraction + DARK BOOL FALSE # Dark subtraction SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation @@ -62,6 +90,6 @@ OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction - DARK BOOL FALSE # Dark subtraction - SHUTTER BOOL FALSE # Shutter correction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels @@ -73,6 +101,6 @@ OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction - DARK BOOL FALSE # Dark subtraction - SHUTTER BOOL FALSE # Shutter correction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction FLAT BOOL TRUE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels @@ -84,9 +112,36 @@ OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction - DARK BOOL FALSE # Dark subtraction - SHUTTER BOOL FALSE # Shutter correction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction FLAT BOOL TRUE # Flat-field normalisation - MASK BOOL FALSE # Mask bad pixels + MASK BOOL FALSE # Mask bad pixels FRINGE BOOL TRUE # Fringe subtraction END +# Overscan, bias, dark, shutter, flat-field, fringe +PPIMAGE_OBDSFRP METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe +PPIMAGE_OBDSFRA METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? + ASTROM.MOSAIC BOOL TRUE # Astrometry for mosaic? +END