Index: /trunk/ippconfig/cfh12k/camera.config =================================================================== --- /trunk/ippconfig/cfh12k/camera.config (revision 15611) +++ /trunk/ippconfig/cfh12k/camera.config (revision 15612) @@ -127,21 +127,13 @@ FRINGE_STACK STR PPMERGE_FRINGE - # Generation of pixel masks from darks and flats - DARKMASK_PROCESS STR PPIMAGE_OBD - DARKMASK_RESID STR PPIMAGE_N - DARKMASK_VERIFY STR PPIMAGE_OBD - DARKMASK_STACK STR PPMERGE_MASK - FLATMASK_PROCESS STR PPIMAGE_OBDSF - FLATMASK_RESID STR PPIMAGE_N - FLATMASK_VERIFY STR PPIMAGE_OBDSF - FLATMASK_STACK STR PPMERGE_MASK - JPEG_BIN1_IMAGE_DARKMASK STR PPIMAGE_J1_IMAGE_M - JPEG_BIN2_IMAGE_DARKMASK STR PPIMAGE_J2_IMAGE_M - JPEG_BIN1_IMAGE_FLATMASK STR PPIMAGE_J1_IMAGE_M - JPEG_BIN2_IMAGE_FLATMASK STR PPIMAGE_J2_IMAGE_M - JPEG_BIN1_RESID_DARKMASK STR PPIMAGE_J1_RESID_M - JPEG_BIN2_RESID_DARKMASK STR PPIMAGE_J2_RESID_M - JPEG_BIN1_RESID_FLATMASK STR PPIMAGE_J1_RESID_M - JPEG_BIN2_RESID_FLATMASK STR PPIMAGE_J2_RESID_M + # Make masks from flats + MASK_PROCESS STR PPIMAGE_OBDSF + MASK_RESID STR PPIMAGE_N + MASK_VERIFY STR PPIMAGE_OBDSF + MASK_STACK STR PPMERGE_MASK + JPEG_BIN1_IMAGE_MASK STR PPIMAGE_J1_IMAGE_M + JPEG_BIN2_IMAGE_MASK STR PPIMAGE_J2_IMAGE_M + JPEG_BIN1_RESID_MASK STR PPIMAGE_J1_RESID_M + JPEG_BIN2_RESID_MASK STR PPIMAGE_J2_RESID_M JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B @@ -175,4 +167,17 @@ JPEG_BIN2_RESID_FRINGE STR PPIMAGE_J2_RESID_R END + + # Additional reduction prescription for generating masks from darks + DARKMASK METADATA + MASK_PROCESS STR PPIMAGE_OBD + MASK_RESID STR PPIMAGE_N + MASK_VERIFY STR PPIMAGE_OBD + MASK_STACK STR PPMERGE_MASK + JPEG_BIN1_IMAGE_MASK STR PPIMAGE_J1_IMAGE_M + JPEG_BIN2_IMAGE_MASK STR PPIMAGE_J2_IMAGE_M + JPEG_BIN1_RESID_MASK STR PPIMAGE_J1_RESID_M + JPEG_BIN2_RESID_MASK STR PPIMAGE_J2_RESID_M + END + # Processing raw data DEFAULT METADATA Index: /trunk/ippconfig/ctio_mosaic2/camera.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2/camera.config (revision 15611) +++ /trunk/ippconfig/ctio_mosaic2/camera.config (revision 15612) @@ -78,21 +78,13 @@ FRINGE_STACK STR PPMERGE_FRINGE - # Generation of pixel masks from darks and flats - DARKMASK_PROCESS STR PPIMAGE_OBD - DARKMASK_RESID STR PPIMAGE_N - DARKMASK_VERIFY STR PPIMAGE_OBD - DARKMASK_STACK STR PPMERGE_MASK - FLATMASK_PROCESS STR PPIMAGE_OBDSF - FLATMASK_RESID STR PPIMAGE_N - FLATMASK_VERIFY STR PPIMAGE_OBDSF - FLATMASK_STACK STR PPMERGE_MASK - JPEG_BIN1_IMAGE_DARKMASK STR PPIMAGE_J1_IMAGE_M - JPEG_BIN2_IMAGE_DARKMASK STR PPIMAGE_J2_IMAGE_M - JPEG_BIN1_IMAGE_FLATMASK STR PPIMAGE_J1_IMAGE_M - JPEG_BIN2_IMAGE_FLATMASK STR PPIMAGE_J2_IMAGE_M - JPEG_BIN1_RESID_DARKMASK STR PPIMAGE_J1_RESID_M - JPEG_BIN2_RESID_DARKMASK STR PPIMAGE_J2_RESID_M - JPEG_BIN1_RESID_FLATMASK STR PPIMAGE_J1_RESID_M - JPEG_BIN2_RESID_FLATMASK STR PPIMAGE_J2_RESID_M + # Make masks from flats + MASK_PROCESS STR PPIMAGE_OBDSF + MASK_RESID STR PPIMAGE_N + MASK_VERIFY STR PPIMAGE_OBDSF + MASK_STACK STR PPMERGE_MASK + JPEG_BIN1_IMAGE_MASK STR PPIMAGE_J1_IMAGE_M + JPEG_BIN2_IMAGE_MASK STR PPIMAGE_J2_IMAGE_M + JPEG_BIN1_RESID_MASK STR PPIMAGE_J1_RESID_M + JPEG_BIN2_RESID_MASK STR PPIMAGE_J2_RESID_M JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B @@ -126,4 +118,17 @@ JPEG_BIN2_RESID_FRINGE STR PPIMAGE_J2_RESID_R END + + # Additional reduction prescription for generating masks from darks + DARKMASK METADATA + MASK_PROCESS STR PPIMAGE_OBD + MASK_RESID STR PPIMAGE_N + MASK_VERIFY STR PPIMAGE_OBD + MASK_STACK STR PPMERGE_MASK + JPEG_BIN1_IMAGE_MASK STR PPIMAGE_J1_IMAGE_M + JPEG_BIN2_IMAGE_MASK STR PPIMAGE_J2_IMAGE_M + JPEG_BIN1_RESID_MASK STR PPIMAGE_J1_RESID_M + JPEG_BIN2_RESID_MASK STR PPIMAGE_J2_RESID_M + END + # Processing raw data DEFAULT METADATA Index: /trunk/ippconfig/esowfi/camera.config =================================================================== --- /trunk/ippconfig/esowfi/camera.config (revision 15611) +++ /trunk/ippconfig/esowfi/camera.config (revision 15612) @@ -91,21 +91,13 @@ FRINGE_STACK STR PPMERGE_FRINGE - # Generation of pixel masks from darks and flats - DARKMASK_PROCESS STR PPIMAGE_OBD - DARKMASK_RESID STR PPIMAGE_N - DARKMASK_VERIFY STR PPIMAGE_OBD - DARKMASK_STACK STR PPMERGE_MASK - FLATMASK_PROCESS STR PPIMAGE_OBDSF - FLATMASK_RESID STR PPIMAGE_N - FLATMASK_VERIFY STR PPIMAGE_OBDSF - FLATMASK_STACK STR PPMERGE_MASK - JPEG_BIN1_IMAGE_DARKMASK STR PPIMAGE_J1_IMAGE_M - JPEG_BIN2_IMAGE_DARKMASK STR PPIMAGE_J2_IMAGE_M - JPEG_BIN1_IMAGE_FLATMASK STR PPIMAGE_J1_IMAGE_M - JPEG_BIN2_IMAGE_FLATMASK STR PPIMAGE_J2_IMAGE_M - JPEG_BIN1_RESID_DARKMASK STR PPIMAGE_J1_RESID_M - JPEG_BIN2_RESID_DARKMASK STR PPIMAGE_J2_RESID_M - JPEG_BIN1_RESID_FLATMASK STR PPIMAGE_J1_RESID_M - JPEG_BIN2_RESID_FLATMASK STR PPIMAGE_J2_RESID_M + # Make masks from flats + MASK_PROCESS STR PPIMAGE_OBDSF + MASK_RESID STR PPIMAGE_N + MASK_VERIFY STR PPIMAGE_OBDSF + MASK_STACK STR PPMERGE_MASK + JPEG_BIN1_IMAGE_MASK STR PPIMAGE_J1_IMAGE_M + JPEG_BIN2_IMAGE_MASK STR PPIMAGE_J2_IMAGE_M + JPEG_BIN1_RESID_MASK STR PPIMAGE_J1_RESID_M + JPEG_BIN2_RESID_MASK STR PPIMAGE_J2_RESID_M JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B @@ -139,4 +131,17 @@ JPEG_BIN2_RESID_FRINGE STR PPIMAGE_J2_RESID_R END + + # Additional reduction prescription for generating masks from darks + DARKMASK METADATA + MASK_PROCESS STR PPIMAGE_OBD + MASK_RESID STR PPIMAGE_N + MASK_VERIFY STR PPIMAGE_OBD + MASK_STACK STR PPMERGE_MASK + JPEG_BIN1_IMAGE_MASK STR PPIMAGE_J1_IMAGE_M + JPEG_BIN2_IMAGE_MASK STR PPIMAGE_J2_IMAGE_M + JPEG_BIN1_RESID_MASK STR PPIMAGE_J1_RESID_M + JPEG_BIN2_RESID_MASK STR PPIMAGE_J2_RESID_M + END + # Processing raw data DEFAULT METADATA Index: /trunk/ippconfig/gpc1/camera.config =================================================================== --- /trunk/ippconfig/gpc1/camera.config (revision 15611) +++ /trunk/ippconfig/gpc1/camera.config (revision 15612) @@ -113,21 +113,13 @@ FRINGE_STACK STR PPMERGE_FRINGE - # Generation of pixel masks from darks and flats - DARKMASK_PROCESS STR PPIMAGE_OBD - DARKMASK_RESID STR PPIMAGE_N - DARKMASK_VERIFY STR PPIMAGE_OBD - DARKMASK_STACK STR PPMERGE_MASK - FLATMASK_PROCESS STR PPIMAGE_OBDSF - FLATMASK_RESID STR PPIMAGE_N - FLATMASK_VERIFY STR PPIMAGE_OBDSF - FLATMASK_STACK STR PPMERGE_MASK - JPEG_BIN1_IMAGE_DARKMASK STR PPIMAGE_J1_IMAGE_M - JPEG_BIN2_IMAGE_DARKMASK STR PPIMAGE_J2_IMAGE_M - JPEG_BIN1_IMAGE_FLATMASK STR PPIMAGE_J1_IMAGE_M - JPEG_BIN2_IMAGE_FLATMASK STR PPIMAGE_J2_IMAGE_M - JPEG_BIN1_RESID_DARKMASK STR PPIMAGE_J1_RESID_M - JPEG_BIN2_RESID_DARKMASK STR PPIMAGE_J2_RESID_M - JPEG_BIN1_RESID_FLATMASK STR PPIMAGE_J1_RESID_M - JPEG_BIN2_RESID_FLATMASK STR PPIMAGE_J2_RESID_M + # Make masks from flats + MASK_PROCESS STR PPIMAGE_OBDSF + MASK_RESID STR PPIMAGE_N + MASK_VERIFY STR PPIMAGE_OBDSF + MASK_STACK STR PPMERGE_MASK + JPEG_BIN1_IMAGE_MASK STR PPIMAGE_J1_IMAGE_M + JPEG_BIN2_IMAGE_MASK STR PPIMAGE_J2_IMAGE_M + JPEG_BIN1_RESID_MASK STR PPIMAGE_J1_RESID_M + JPEG_BIN2_RESID_MASK STR PPIMAGE_J2_RESID_M JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B @@ -161,4 +153,17 @@ JPEG_BIN2_RESID_FRINGE STR PPIMAGE_J2_RESID_R END + + # Additional reduction prescription for generating masks from darks + DARKMASK METADATA + MASK_PROCESS STR PPIMAGE_OBD + MASK_RESID STR PPIMAGE_N + MASK_VERIFY STR PPIMAGE_OBD + MASK_STACK STR PPMERGE_MASK + JPEG_BIN1_IMAGE_MASK STR PPIMAGE_J1_IMAGE_M + JPEG_BIN2_IMAGE_MASK STR PPIMAGE_J2_IMAGE_M + JPEG_BIN1_RESID_MASK STR PPIMAGE_J1_RESID_M + JPEG_BIN2_RESID_MASK STR PPIMAGE_J2_RESID_M + END + # Processing raw data DEFAULT METADATA Index: /trunk/ippconfig/megacam/camera.config =================================================================== --- /trunk/ippconfig/megacam/camera.config (revision 15611) +++ /trunk/ippconfig/megacam/camera.config (revision 15612) @@ -138,21 +138,13 @@ FRINGE_STACK STR PPMERGE_FRINGE - # Generation of pixel masks from darks and flats - DARKMASK_PROCESS STR PPIMAGE_OBD - DARKMASK_RESID STR PPIMAGE_N - DARKMASK_VERIFY STR PPIMAGE_OBD - DARKMASK_STACK STR PPMERGE_MASK - FLATMASK_PROCESS STR PPIMAGE_OBDSF - FLATMASK_RESID STR PPIMAGE_N - FLATMASK_VERIFY STR PPIMAGE_OBDSF - FLATMASK_STACK STR PPMERGE_MASK - JPEG_BIN1_IMAGE_DARKMASK STR PPIMAGE_J1_IMAGE_M - JPEG_BIN2_IMAGE_DARKMASK STR PPIMAGE_J2_IMAGE_M - JPEG_BIN1_IMAGE_FLATMASK STR PPIMAGE_J1_IMAGE_M - JPEG_BIN2_IMAGE_FLATMASK STR PPIMAGE_J2_IMAGE_M - JPEG_BIN1_RESID_DARKMASK STR PPIMAGE_J1_RESID_M - JPEG_BIN2_RESID_DARKMASK STR PPIMAGE_J2_RESID_M - JPEG_BIN1_RESID_FLATMASK STR PPIMAGE_J1_RESID_M - JPEG_BIN2_RESID_FLATMASK STR PPIMAGE_J2_RESID_M + # Make masks from flats + MASK_PROCESS STR PPIMAGE_OBDSF + MASK_RESID STR PPIMAGE_N + MASK_VERIFY STR PPIMAGE_OBDSF + MASK_STACK STR PPMERGE_MASK + JPEG_BIN1_IMAGE_MASK STR PPIMAGE_J1_IMAGE_M + JPEG_BIN2_IMAGE_MASK STR PPIMAGE_J2_IMAGE_M + JPEG_BIN1_RESID_MASK STR PPIMAGE_J1_RESID_M + JPEG_BIN2_RESID_MASK STR PPIMAGE_J2_RESID_M JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B @@ -187,4 +179,16 @@ END + # Additional reduction prescription for generating masks from darks + DARKMASK METADATA + MASK_PROCESS STR PPIMAGE_OBD + MASK_RESID STR PPIMAGE_N + MASK_VERIFY STR PPIMAGE_OBD + MASK_STACK STR PPMERGE_MASK + JPEG_BIN1_IMAGE_MASK STR PPIMAGE_J1_IMAGE_M + JPEG_BIN2_IMAGE_MASK STR PPIMAGE_J2_IMAGE_M + JPEG_BIN1_RESID_MASK STR PPIMAGE_J1_RESID_M + JPEG_BIN2_RESID_MASK STR PPIMAGE_J2_RESID_M + END + # basic science analysis DEFAULT METADATA Index: /trunk/ippconfig/recipes/rejections.config =================================================================== --- /trunk/ippconfig/recipes/rejections.config (revision 15611) +++ /trunk/ippconfig/recipes/rejections.config (revision 15612) @@ -120,29 +120,5 @@ END -DARKMASK METADATA - FILTER STR * - EXPECTED F32 0.0 - IMFILE.MEAN F32 0.0 - IMFILE.STDEV F32 0.0 - IMFILE.MEANSTDEV F32 0.0 - IMFILE.SKEWNESS F32 0.0 - IMFILE.KURTOSIS F32 0.0 - IMFILE.SNR F32 0.0 - IMFILE.BIN.STDEV F32 0.0 - IMFILE.BIN.SNR F32 0.0 - IMFILE.FLUX F32 0.0 - EXP.MEAN F32 0.0 - EXP.STDEV F32 0.0 - EXP.MEANSTDEV F32 0.0 - EXP.SNR F32 0.0 - EXP.BIN.STDEV F32 0.0 - EXP.BIN.SNR F32 0.0 - EXP.FLUX F32 0.0 - ENSEMBLE.MEAN F32 0.0 - ENSEMBLE.STDEV F32 0.0 - ENSEMBLE.MEANSTDEV F32 0.0 -END - -FLATMASK METADATA +MASK METADATA FILTER STR * EXPECTED F32 0.0 Index: /trunk/ippconfig/simmosaic/camera.config =================================================================== --- /trunk/ippconfig/simmosaic/camera.config (revision 15611) +++ /trunk/ippconfig/simmosaic/camera.config (revision 15612) @@ -85,21 +85,13 @@ FRINGE_STACK STR PPMERGE_FRINGE - # Generation of pixel masks from darks and flats - DARKMASK_PROCESS STR PPIMAGE_OBD - DARKMASK_RESID STR PPIMAGE_N - DARKMASK_VERIFY STR PPIMAGE_OBD - DARKMASK_STACK STR PPMERGE_MASK - FLATMASK_PROCESS STR PPIMAGE_OBDSF - FLATMASK_RESID STR PPIMAGE_N - FLATMASK_VERIFY STR PPIMAGE_OBDSF - FLATMASK_STACK STR PPMERGE_MASK - JPEG_BIN1_IMAGE_DARKMASK STR PPIMAGE_J1_IMAGE_M - JPEG_BIN2_IMAGE_DARKMASK STR PPIMAGE_J2_IMAGE_M - JPEG_BIN1_IMAGE_FLATMASK STR PPIMAGE_J1_IMAGE_M - JPEG_BIN2_IMAGE_FLATMASK STR PPIMAGE_J2_IMAGE_M - JPEG_BIN1_RESID_DARKMASK STR PPIMAGE_J1_RESID_M - JPEG_BIN2_RESID_DARKMASK STR PPIMAGE_J2_RESID_M - JPEG_BIN1_RESID_FLATMASK STR PPIMAGE_J1_RESID_M - JPEG_BIN2_RESID_FLATMASK STR PPIMAGE_J2_RESID_M + # Make masks from flats + MASK_PROCESS STR PPIMAGE_OBDSF + MASK_RESID STR PPIMAGE_N + MASK_VERIFY STR PPIMAGE_OBDSF + MASK_STACK STR PPMERGE_MASK + JPEG_BIN1_IMAGE_MASK STR PPIMAGE_J1_IMAGE_M + JPEG_BIN2_IMAGE_MASK STR PPIMAGE_J2_IMAGE_M + JPEG_BIN1_RESID_MASK STR PPIMAGE_J1_RESID_M + JPEG_BIN2_RESID_MASK STR PPIMAGE_J2_RESID_M JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B @@ -133,4 +125,17 @@ JPEG_BIN2_RESID_FRINGE STR PPIMAGE_J2_RESID_R END + + # Additional reduction prescription for generating masks from darks + DARKMASK METADATA + MASK_PROCESS STR PPIMAGE_OBD + MASK_RESID STR PPIMAGE_N + MASK_VERIFY STR PPIMAGE_OBD + MASK_STACK STR PPMERGE_MASK + JPEG_BIN1_IMAGE_MASK STR PPIMAGE_J1_IMAGE_M + JPEG_BIN2_IMAGE_MASK STR PPIMAGE_J2_IMAGE_M + JPEG_BIN1_RESID_MASK STR PPIMAGE_J1_RESID_M + JPEG_BIN2_RESID_MASK STR PPIMAGE_J2_RESID_M + END + # Processing raw data DEFAULT METADATA Index: /trunk/ippconfig/simtest/camera.config =================================================================== --- /trunk/ippconfig/simtest/camera.config (revision 15611) +++ /trunk/ippconfig/simtest/camera.config (revision 15612) @@ -71,21 +71,13 @@ FRINGE_STACK STR PPMERGE_FRINGE - # Generation of pixel masks from darks and flats - DARKMASK_PROCESS STR PPIMAGE_OBD - DARKMASK_RESID STR PPIMAGE_N - DARKMASK_VERIFY STR PPIMAGE_OBD - DARKMASK_STACK STR PPMERGE_MASK - FLATMASK_PROCESS STR PPIMAGE_OBDSF - FLATMASK_RESID STR PPIMAGE_N - FLATMASK_VERIFY STR PPIMAGE_OBDSF - FLATMASK_STACK STR PPMERGE_MASK - JPEG_BIN1_IMAGE_DARKMASK STR PPIMAGE_J1_IMAGE_M - JPEG_BIN2_IMAGE_DARKMASK STR PPIMAGE_J2_IMAGE_M - JPEG_BIN1_IMAGE_FLATMASK STR PPIMAGE_J1_IMAGE_M - JPEG_BIN2_IMAGE_FLATMASK STR PPIMAGE_J2_IMAGE_M - JPEG_BIN1_RESID_DARKMASK STR PPIMAGE_J1_RESID_M - JPEG_BIN2_RESID_DARKMASK STR PPIMAGE_J2_RESID_M - JPEG_BIN1_RESID_FLATMASK STR PPIMAGE_J1_RESID_M - JPEG_BIN2_RESID_FLATMASK STR PPIMAGE_J2_RESID_M + # Make masks from flats + MASK_PROCESS STR PPIMAGE_OBDSF + MASK_RESID STR PPIMAGE_N + MASK_VERIFY STR PPIMAGE_OBDSF + MASK_STACK STR PPMERGE_MASK + JPEG_BIN1_IMAGE_MASK STR PPIMAGE_J1_IMAGE_M + JPEG_BIN2_IMAGE_MASK STR PPIMAGE_J2_IMAGE_M + JPEG_BIN1_RESID_MASK STR PPIMAGE_J1_RESID_M + JPEG_BIN2_RESID_MASK STR PPIMAGE_J2_RESID_M JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B @@ -119,4 +111,17 @@ JPEG_BIN2_RESID_FRINGE STR PPIMAGE_J2_RESID_R END + + # Additional reduction prescription for generating masks from darks + DARKMASK METADATA + MASK_PROCESS STR PPIMAGE_OBD + MASK_RESID STR PPIMAGE_N + MASK_VERIFY STR PPIMAGE_OBD + MASK_STACK STR PPMERGE_MASK + JPEG_BIN1_IMAGE_MASK STR PPIMAGE_J1_IMAGE_M + JPEG_BIN2_IMAGE_MASK STR PPIMAGE_J2_IMAGE_M + JPEG_BIN1_RESID_MASK STR PPIMAGE_J1_RESID_M + JPEG_BIN2_RESID_MASK STR PPIMAGE_J2_RESID_M + END + # Processing raw data DEFAULT METADATA