Index: /trunk/ippconfig/ctio_mosaic2/camera.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2/camera.config (revision 16408) +++ /trunk/ippconfig/ctio_mosaic2/camera.config (revision 16409) @@ -1,3 +1,3 @@ -# Camera configuration file for MegaCam: describes the camera +# Camera configuration file for the CTIO MOSAIC2 : describes the camera # File formats that we know about @@ -23,6 +23,28 @@ VR STR VR.Supermacho.c6027 VR STR VR Supermacho c6027 + VR STR VR SuperMacho c6027 R STR R Harris c6004 I STR I c6028 + U STR U c6001 + B STR B Harris c6002 + V STR V Harris c6026 + # Minor filters + g MULTI + g STR g SDSS c6017 + g STR SDSS g c6017 + r MULTI + r STR SDSS r c6018 + r STR r SDSS c6018 + i MULTI + i STR i SDSS c6019 + i STR SDSS i c6019 + # Unused filters (only used in zeros, and therefore irrelevent) + NULL MULTI + NULL STR z SDSS c6020 + NULL STR SDSS z c6020 + NULL STR ha8 H-alpha+8nm c6011 + NULL STR M Washington c6007 + NULL STR u SDSS c6021 + NULL STR VRr Supermacho c6027 END @@ -49,5 +71,6 @@ RECIPES METADATA # Recipes for ppImage - PPIMAGE STR ctio_mosaic2/ppImage.config # Default: all (normal) options on +# PPIMAGE STR /netdisks/panstarrs/rodney/ctio_mosaic2/ppImage.config # Default: all (normal) options on + PPIMAGE STR /netdisks/panstarrs/rodney/ctio_mosaic2/ppImage.config # SR's local copy PSPHOT STR ctio_mosaic2/psphot.config # Default: all (normal) options on END @@ -82,9 +105,9 @@ DARKMASK_RESID STR PPIMAGE_N DARKMASK_VERIFY STR PPIMAGE_OBD - DARKMASK_STACK STR PPMERGE_MASK + DARKMASK_STACK STR PPMERGE_DARKMASK FLATMASK_PROCESS STR PPIMAGE_OBDSF FLATMASK_RESID STR PPIMAGE_N FLATMASK_VERIFY STR PPIMAGE_OBDSF - FLATMASK_STACK STR PPMERGE_MASK + FLATMASK_STACK STR PPMERGE_FLATMASK JPEG_BIN1_IMAGE_DARKMASK STR PPIMAGE_J1_IMAGE_M JPEG_BIN2_IMAGE_DARKMASK STR PPIMAGE_J2_IMAGE_M @@ -279,6 +302,10 @@ ### output file definitions TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b0.fits IMAGE NONE CHIP TRUE SPLIT PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.b0.fits IMAGE NONE CHIP TRUE MEF + #PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE DET_MASK CHIP TRUE NONE + PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.detmask.fits IMAGE DET_MASK CHIP TRUE MEF + PPIMAGE.OUT.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK NONE CHIP TRUE SPLIT PPIMAGE.OUT.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT NONE CHIP TRUE SPLIT @@ -352,4 +379,5 @@ LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT NONE CHIP TRUE NONE LOG.EXP OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE + TRACE.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.trace TEXT NONE CHIP TRUE NONE END Index: /trunk/ippconfig/ctio_mosaic2/ppImage.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2/ppImage.config (revision 16408) +++ /trunk/ippconfig/ctio_mosaic2/ppImage.config (revision 16409) @@ -3,7 +3,7 @@ # List of tasks to perform SHUTTER BOOL FALSE # Shutter correction -DARK BOOL FALSE # Dark correction +DARK BOOL TRUE # Dark correction -BASE.FITS BOOL FALSE # Save base detrended image? +BASE.FITS BOOL TRUE # Save base detrended image? CHIP.FITS BOOL TRUE # Save base detrended image? BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -50,5 +50,5 @@ #################################################################################### -# Need the following in order to turn off dark and shutter for the site-level recipe +# Need the following in order to turn off shutter for the site-level recipe #################################################################################### @@ -57,5 +57,5 @@ OVERSCAN BOOL FALSE # Overscan subtraction BIAS BOOL FALSE # Bias subtraction - DARK BOOL FALSE # Dark subtraction + DARK BOOL TRUE # Dark subtraction SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation @@ -79,5 +79,5 @@ OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction - DARK BOOL FALSE # Dark subtraction + DARK BOOL TRUE # Dark subtraction SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation @@ -90,5 +90,5 @@ OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction - DARK BOOL FALSE # Dark subtraction + DARK BOOL TRUE # Dark subtraction SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation @@ -101,5 +101,5 @@ OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction - DARK BOOL FALSE # Dark subtraction + DARK BOOL TRUE # Dark subtraction SHUTTER BOOL FALSE # Shutter correction FLAT BOOL TRUE # Flat-field normalisation @@ -112,5 +112,5 @@ OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction - DARK BOOL FALSE # Dark subtraction + DARK BOOL TRUE # Dark subtraction SHUTTER BOOL FALSE # Shutter correction FLAT BOOL TRUE # Flat-field normalisation @@ -123,5 +123,5 @@ OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction - DARK BOOL FALSE # Dark subtraction + DARK BOOL TRUE # Dark subtraction SHUTTER BOOL FALSE # Shutter correction FLAT BOOL TRUE # Flat-field normalisation @@ -133,9 +133,9 @@ END -# Overscan, bias, dark, shutter, flat-field, fringe +# Overscan, bias, dark, shutter, flat-field, fringe, photometry & astrometry PPIMAGE_OBDSFRA METADATA OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction - DARK BOOL FALSE # Dark subtraction + DARK BOOL TRUE # Dark subtraction SHUTTER BOOL FALSE # Shutter correction FLAT BOOL TRUE # Flat-field normalisation