Index: /trunk/ippScripts/scripts/detrend_norm_calc.pl =================================================================== --- /trunk/ippScripts/scripts/detrend_norm_calc.pl (revision 15615) +++ /trunk/ippScripts/scripts/detrend_norm_calc.pl (revision 15616) @@ -63,4 +63,6 @@ 'fringe' => 0, 'mask' => 0, + 'darkmask' => 0, + 'flatmask' => 0, }; Index: /trunk/ippScripts/scripts/detrend_resid.pl =================================================================== --- /trunk/ippScripts/scripts/detrend_resid.pl (revision 15615) +++ /trunk/ippScripts/scripts/detrend_resid.pl (revision 15616) @@ -113,4 +113,6 @@ 'fringe' => '-fringe', # Specify the fringe frame 'mask' => '-mask', # Specify the mask frame + 'darkmask' => '-mask', # Specify the mask frame + 'flatmask' => '-mask', # Specify the mask frame }; Index: /trunk/ippconfig/cfh12k/camera.config =================================================================== --- /trunk/ippconfig/cfh12k/camera.config (revision 15615) +++ /trunk/ippconfig/cfh12k/camera.config (revision 15616) @@ -127,13 +127,21 @@ FRINGE_STACK STR PPMERGE_FRINGE - # 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 + # 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 JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B @@ -167,17 +175,4 @@ 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 15615) +++ /trunk/ippconfig/ctio_mosaic2/camera.config (revision 15616) @@ -78,13 +78,21 @@ FRINGE_STACK STR PPMERGE_FRINGE - # 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 + # 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 JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B @@ -118,17 +126,4 @@ 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 15615) +++ /trunk/ippconfig/esowfi/camera.config (revision 15616) @@ -91,13 +91,21 @@ FRINGE_STACK STR PPMERGE_FRINGE - # 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 + # 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 JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B @@ -131,17 +139,4 @@ 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 15615) +++ /trunk/ippconfig/gpc1/camera.config (revision 15616) @@ -113,13 +113,21 @@ FRINGE_STACK STR PPMERGE_FRINGE - # 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 + # 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 JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B @@ -153,17 +161,4 @@ 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 15615) +++ /trunk/ippconfig/megacam/camera.config (revision 15616) @@ -138,13 +138,21 @@ FRINGE_STACK STR PPMERGE_FRINGE - # 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 + # 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 JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B @@ -179,16 +187,4 @@ 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 15615) +++ /trunk/ippconfig/recipes/rejections.config (revision 15616) @@ -120,5 +120,29 @@ END -MASK METADATA +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 FILTER STR * EXPECTED F32 0.0 Index: /trunk/ippconfig/simmosaic/camera.config =================================================================== --- /trunk/ippconfig/simmosaic/camera.config (revision 15615) +++ /trunk/ippconfig/simmosaic/camera.config (revision 15616) @@ -85,13 +85,21 @@ FRINGE_STACK STR PPMERGE_FRINGE - # 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 + # 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 JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B @@ -125,17 +133,4 @@ 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 15615) +++ /trunk/ippconfig/simtest/camera.config (revision 15616) @@ -71,13 +71,21 @@ FRINGE_STACK STR PPMERGE_FRINGE - # 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 + # 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 JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B @@ -111,17 +119,4 @@ 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