Index: trunk/ippconfig/recipes/reductionClasses.mdc =================================================================== --- trunk/ippconfig/recipes/reductionClasses.mdc (revision 19615) +++ trunk/ippconfig/recipes/reductionClasses.mdc (revision 19650) @@ -1,205 +1,169 @@ # These reduction classes define recipes that go together as a group -# XXX rename the jpeg recipes to the form BIAS_JPEG_BIN1_IMAGE -# need to also modify detrend_norm_exp.pl, detrend_process_exp.pl, detrend_reject_imfile.pl DETREND METADATA + BIAS_PROCESS STR PPIMAGE_O + BIAS_RESID STR PPIMAGE_B + BIAS_VERIFY STR PPIMAGE_B + BIAS_STACK STR PPMERGE_BIAS + BIAS_JPEG_IMAGE STR BIAS + BIAS_JPEG_RESID STR BIAS_RESID - BIAS_PROCESS STR PPIMAGE_O - BIAS_RESID STR PPIMAGE_B - BIAS_VERIFY STR PPIMAGE_B - BIAS_STACK STR PPMERGE_BIAS - JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B - JPEG_BIN2_IMAGE_BIAS STR PPIMAGE_J2_IMAGE_B - JPEG_BIN1_RESID_BIAS STR PPIMAGE_J1_RESID_B - JPEG_BIN2_RESID_BIAS STR PPIMAGE_J2_RESID_B + DARK_PREMASK_PROCESS STR PPIMAGE_OB + DARK_PREMASK_RESID STR PPIMAGE_D + DARK_PREMASK_VERIFY STR PPIMAGE_D + DARK_PREMASK_STACK STR PPMERGE_DARK + DARK_PREMASK_JPEG_IMAGE STR DARK + DARK_PREMASK_JPEG_RESID STR DARK_RESID - DARK_PREMASK_PROCESS STR PPIMAGE_OB - DARK_PREMASK_RESID STR PPIMAGE_D - DARK_PREMASK_VERIFY STR PPIMAGE_D - DARK_PREMASK_STACK STR PPMERGE_DARK - JPEG_BIN1_IMAGE_DARK_PREMASK STR PPIMAGE_J1_IMAGE_B - JPEG_BIN2_IMAGE_DARK_PREMASK STR PPIMAGE_J2_IMAGE_B - JPEG_BIN1_RESID_DARK_PREMASK STR PPIMAGE_J1_RESID_B - JPEG_BIN2_RESID_DARK_PREMASK STR PPIMAGE_J2_RESID_B + DARK_PROCESS STR PPIMAGE_OB + DARK_RESID STR PPIMAGE_D + DARK_VERIFY STR PPIMAGE_D + DARK_STACK STR PPMERGE_DARK + DARK_JPEG_IMAGE STR DARK + DARK_JPEG_RESID STR DARK_RESID - DARK_PROCESS STR PPIMAGE_OB - DARK_RESID STR PPIMAGE_D - DARK_VERIFY STR PPIMAGE_D - DARK_STACK STR PPMERGE_DARK - JPEG_BIN1_IMAGE_DARK STR PPIMAGE_J1_IMAGE_B - JPEG_BIN2_IMAGE_DARK STR PPIMAGE_J2_IMAGE_B - JPEG_BIN1_RESID_DARK STR PPIMAGE_J1_RESID_B - JPEG_BIN2_RESID_DARK STR PPIMAGE_J2_RESID_B - - SHUTTER_PROCESS STR PPIMAGE_OBD - SHUTTER_RESID STR PPIMAGE_S - SHUTTER_VERIFY STR PPIMAGE_S - SHUTTER_STACK STR PPMERGE_SHUTTER - JPEG_BIN1_IMAGE_SHUTTER STR PPIMAGE_J1_IMAGE_F - JPEG_BIN2_IMAGE_SHUTTER STR PPIMAGE_J2_IMAGE_F - JPEG_BIN1_RESID_SHUTTER STR PPIMAGE_J1_RESID_F - JPEG_BIN2_RESID_SHUTTER STR PPIMAGE_J2_RESID_F + SHUTTER_PROCESS STR PPIMAGE_OBD + SHUTTER_RESID STR PPIMAGE_S + SHUTTER_VERIFY STR PPIMAGE_S + SHUTTER_STACK STR PPMERGE_SHUTTER + SHUTTER_JPEG_IMAGE STR FLAT + SHUTTER_JPEG_RESID STR FLAT_RESID # *** premask (unmasked) flat-field types - FLAT_PREMASK_PROCESS STR PPIMAGE_OBDS - FLAT_PREMASK_RESID STR PPIMAGE_F - FLAT_PREMASK_VERIFY STR PPIMAGE_F - FLAT_PREMASK_STACK STR PPMERGE_FLAT - JPEG_BIN1_IMAGE_FLAT_PREMASK STR PPIMAGE_J1_IMAGE_B - JPEG_BIN2_IMAGE_FLAT_PREMASK STR PPIMAGE_J2_IMAGE_B - JPEG_BIN1_RESID_FLAT_PREMASK STR PPIMAGE_J1_RESID_B - JPEG_BIN2_RESID_FLAT_PREMASK STR PPIMAGE_J2_RESID_B + FLAT_PREMASK_PROCESS STR PPIMAGE_OBDS + FLAT_PREMASK_RESID STR PPIMAGE_F + FLAT_PREMASK_VERIFY STR PPIMAGE_F + FLAT_PREMASK_STACK STR PPMERGE_FLAT + FLAT_PREMASK_JPEG_IMAGE STR FLAT + FLAT_PREMASK_JPEG_RESID STRE FLAT_RESID - DOMEFLAT_PREMASK_PROCESS STR PPIMAGE_OBDS - DOMEFLAT_PREMASK_RESID STR PPIMAGE_F - DOMEFLAT_PREMASK_VERIFY STR PPIMAGE_F - DOMEFLAT_PREMASK_STACK STR PPMERGE_FLAT - JPEG_BIN1_IMAGE_DOMEFLAT_PREMASK STR PPIMAGE_J1_IMAGE_B - JPEG_BIN2_IMAGE_DOMEFLAT_PREMASK STR PPIMAGE_J2_IMAGE_B - JPEG_BIN1_RESID_DOMEFLAT_PREMASK STR PPIMAGE_J1_RESID_B - JPEG_BIN2_RESID_DOMEFLAT_PREMASK STR PPIMAGE_J2_RESID_B + DOMEFLAT_PREMASK_PROCESS STR PPIMAGE_OBDS + DOMEFLAT_PREMASK_RESID STR PPIMAGE_F + DOMEFLAT_PREMASK_VERIFY STR PPIMAGE_F + DOMEFLAT_PREMASK_STACK STR PPMERGE_FLAT + DOMEFLAT_PREMASK_JPEG_IMAGE STR FLAT + DOMEFLAT_PREMASK_JPEG_RESID STR FLAT_RESID - SKYFLAT_PREMASK_PROCESS STR PPIMAGE_OBDS - SKYFLAT_PREMASK_RESID STR PPIMAGE_F - SKYFLAT_PREMASK_VERIFY STR PPIMAGE_F - SKYFLAT_PREMASK_STACK STR PPMERGE_FLAT - JPEG_BIN1_IMAGE_SKYFLAT_PREMASK STR PPIMAGE_J1_IMAGE_B - JPEG_BIN2_IMAGE_SKYFLAT_PREMASK STR PPIMAGE_J2_IMAGE_B - JPEG_BIN1_RESID_SKYFLAT_PREMASK STR PPIMAGE_J1_RESID_B - JPEG_BIN2_RESID_SKYFLAT_PREMASK STR PPIMAGE_J2_RESID_B + SKYFLAT_PREMASK_PROCESS STR PPIMAGE_OBDS + SKYFLAT_PREMASK_RESID STR PPIMAGE_F + SKYFLAT_PREMASK_VERIFY STR PPIMAGE_F + SKYFLAT_PREMASK_STACK STR PPMERGE_FLAT + SKYFLAT_PREMASK_JPEG_IMAGE STR FLAT + SKYFLAT_PREMASK_JPEG_RESID STR FLAT_RESID # *** raw (uncorrected) flat-field types - FLAT_RAW_PROCESS STR PPIMAGE_OBDS - FLAT_RAW_RESID STR PPIMAGE_F - FLAT_RAW_VERIFY STR PPIMAGE_F - FLAT_RAW_STACK STR PPMERGE_FLAT - JPEG_BIN1_IMAGE_FLAT_RAW STR PPIMAGE_J1_IMAGE_F - JPEG_BIN2_IMAGE_FLAT_RAW STR PPIMAGE_J2_IMAGE_F - JPEG_BIN1_RESID_FLAT_RAW STR PPIMAGE_J1_RESID_F - JPEG_BIN2_RESID_FLAT_RAW STR PPIMAGE_J2_RESID_F + FLAT_RAW_PROCESS STR PPIMAGE_OBDS + FLAT_RAW_RESID STR PPIMAGE_F + FLAT_RAW_VERIFY STR PPIMAGE_F + FLAT_RAW_STACK STR PPMERGE_FLAT + FLAT_RAW_JPEG_IMAGE STR FLAT + FLAT_RAW_JPEG_RESID STR FLAT_RESID - DOMEFLAT_RAW_PROCESS STR PPIMAGE_OBDS - DOMEFLAT_RAW_RESID STR PPIMAGE_F - DOMEFLAT_RAW_VERIFY STR PPIMAGE_F - DOMEFLAT_RAW_STACK STR PPMERGE_FLAT - JPEG_BIN1_IMAGE_DOMEFLAT_RAW STR PPIMAGE_J1_IMAGE_F - JPEG_BIN2_IMAGE_DOMEFLAT_RAW STR PPIMAGE_J2_IMAGE_F - JPEG_BIN1_RESID_DOMEFLAT_RAW STR PPIMAGE_J1_RESID_F - JPEG_BIN2_RESID_DOMEFLAT_RAW STR PPIMAGE_J2_RESID_F + DOMEFLAT_RAW_PROCESS STR PPIMAGE_OBDS + DOMEFLAT_RAW_RESID STR PPIMAGE_F + DOMEFLAT_RAW_VERIFY STR PPIMAGE_F + DOMEFLAT_RAW_STACK STR PPMERGE_FLAT + DOMEFLAT_RAW_JPEG_IMAGE STR FLAT + DOMEFLAT_RAW_JPEG_RESID STR FLAT_RESID - SKYFLAT_RAW_PROCESS STR PPIMAGE_OBDS - SKYFLAT_RAW_RESID STR PPIMAGE_F - SKYFLAT_RAW_VERIFY STR PPIMAGE_F - SKYFLAT_RAW_STACK STR PPMERGE_FLAT - JPEG_BIN1_IMAGE_SKYFLAT_RAW STR PPIMAGE_J1_IMAGE_F - JPEG_BIN2_IMAGE_SKYFLAT_RAW STR PPIMAGE_J2_IMAGE_F - JPEG_BIN1_RESID_SKYFLAT_RAW STR PPIMAGE_J1_RESID_F - JPEG_BIN2_RESID_SKYFLAT_RAW STR PPIMAGE_J2_RESID_F + SKYFLAT_RAW_PROCESS STR PPIMAGE_OBDS + SKYFLAT_RAW_RESID STR PPIMAGE_F + SKYFLAT_RAW_VERIFY STR PPIMAGE_F + SKYFLAT_RAW_STACK STR PPMERGE_FLAT + SKYFLAT_RAW_JPEG_IMAGE STR FLAT + SKYFLAT_RAW_JPEG_RESID STR FLAT_RESID - # *** standard flat-field types - FLAT_PROCESS STR PPIMAGE_OBDS - FLAT_RESID STR PPIMAGE_F - FLAT_VERIFY STR PPIMAGE_F - FLAT_STACK STR PPMERGE_FLAT - JPEG_BIN1_IMAGE_FLAT STR PPIMAGE_J1_IMAGE_F - JPEG_BIN2_IMAGE_FLAT STR PPIMAGE_J2_IMAGE_F - JPEG_BIN1_RESID_FLAT STR PPIMAGE_J1_RESID_F - JPEG_BIN2_RESID_FLAT STR PPIMAGE_J2_RESID_F + # *** Standard flat-field types + FLAT_PROCESS STR PPIMAGE_OBDS + FLAT_RESID STR PPIMAGE_F + FLAT_VERIFY STR PPIMAGE_F + FLAT_STACK STR PPMERGE_FLAT + FLAT_JPEG_IMAGE STR FLAT + FLAT_JPEG_RESID STR FLAT_RESID - DOMEFLAT_PROCESS STR PPIMAGE_OBDS - DOMEFLAT_RESID STR PPIMAGE_F - DOMEFLAT_VERIFY STR PPIMAGE_F - DOMEFLAT_STACK STR PPMERGE_FLAT - JPEG_BIN1_IMAGE_DOMEFLAT STR PPIMAGE_J1_IMAGE_F - JPEG_BIN2_IMAGE_DOMEFLAT STR PPIMAGE_J2_IMAGE_F - JPEG_BIN1_RESID_DOMEFLAT STR PPIMAGE_J1_RESID_F - JPEG_BIN2_RESID_DOMEFLAT STR PPIMAGE_J2_RESID_F + DOMEFLAT_PROCESS STR PPIMAGE_OBDS + DOMEFLAT_RESID STR PPIMAGE_F + DOMEFLAT_VERIFY STR PPIMAGE_F + DOMEFLAT_STACK STR PPMERGE_FLAT + DOMEFLAT_JPEG_IMAGE STR FLAT + DOMEFLAT_JPEG_RESID STR FLAT_RESID - SKYFLAT_PROCESS STR PPIMAGE_OBDS - SKYFLAT_RESID STR PPIMAGE_F - SKYFLAT_VERIFY STR PPIMAGE_F - SKYFLAT_STACK STR PPMERGE_FLAT - JPEG_BIN1_IMAGE_SKYFLAT STR PPIMAGE_J1_IMAGE_F - JPEG_BIN2_IMAGE_SKYFLAT STR PPIMAGE_J2_IMAGE_F - JPEG_BIN1_RESID_SKYFLAT STR PPIMAGE_J1_RESID_F - JPEG_BIN2_RESID_SKYFLAT STR PPIMAGE_J2_RESID_F + SKYFLAT_PROCESS STR PPIMAGE_OBDS + SKYFLAT_RESID STR PPIMAGE_F + SKYFLAT_VERIFY STR PPIMAGE_F + SKYFLAT_STACK STR PPMERGE_FLAT + SKYFLAT_JPEG_IMAGE STR FLAT + SKYFLAT_JPEG_RESID STR FLAT_RESID - # Generation of pixel masks from darks and flats - DARKMASK_PROCESS STR PPIMAGE_OBD - DARKMASK_RESID STR PPIMAGE_M - DARKMASK_VERIFY STR PPIMAGE_M - DARKMASK_STACK STR PPMERGE_DARKMASK - JPEG_BIN1_IMAGE_DARKMASK STR PPIMAGE_J1_RESID_B - JPEG_BIN2_IMAGE_DARKMASK STR PPIMAGE_J2_RESID_B - JPEG_BIN1_RESID_DARKMASK STR PPIMAGE_J1_RESID_B - JPEG_BIN2_RESID_DARKMASK STR PPIMAGE_J2_RESID_B + # Generation of pixel masks from darks and flats + DARKMASK_PROCESS STR PPIMAGE_OBD + DARKMASK_RESID STR PPIMAGE_M + DARKMASK_VERIFY STR PPIMAGE_M + DARKMASK_STACK STR PPMERGE_DARKMASK + DARKMASK_JPEG_IMAGE STR BIAS_RESID + DARKMASK_JPEG_RESID STR BIAS_RESID - FLATMASK_PROCESS STR PPIMAGE_OBDSF - FLATMASK_RESID STR PPIMAGE_M - FLATMASK_VERIFY STR PPIMAGE_M - FLATMASK_STACK STR PPMERGE_FLATMASK - JPEG_BIN1_IMAGE_FLATMASK STR PPIMAGE_J1_RESID_F - JPEG_BIN2_IMAGE_FLATMASK STR PPIMAGE_J2_RESID_F - JPEG_BIN1_RESID_FLATMASK STR PPIMAGE_J1_RESID_F - JPEG_BIN2_RESID_FLATMASK STR PPIMAGE_J2_RESID_F + FLATMASK_PROCESS STR PPIMAGE_OBDSF + FLATMASK_RESID STR PPIMAGE_M + FLATMASK_VERIFY STR PPIMAGE_M + FLATMASK_STACK STR PPMERGE_FLATMASK + FLATMASK_JPEG_IMAGE STR FLAT_RESID + FLATMASK_JPEG_RESID STR FLAT_RESID - FRINGE_PROCESS STR PPIMAGE_OBDSF - FRINGE_RESID STR PPIMAGE_R - FRINGE_VERIFY STR PPIMAGE_R - FRINGE_STACK STR PPMERGE_FRINGE - JPEG_BIN1_IMAGE_FRINGE STR PPIMAGE_J1_IMAGE_R - JPEG_BIN2_IMAGE_FRINGE STR PPIMAGE_J2_IMAGE_R - JPEG_BIN1_RESID_FRINGE STR PPIMAGE_J1_RESID_R - JPEG_BIN2_RESID_FRINGE STR PPIMAGE_J2_RESID_R - + FRINGE_PROCESS STR PPIMAGE_OBDSF + FRINGE_RESID STR PPIMAGE_R + FRINGE_VERIFY STR PPIMAGE_R + FRINGE_STACK STR PPMERGE_FRINGE + FRINGE_JPEG_IMAGE STR FRINGE + FRINGE_JPEG_RESID STR FRINGE_RESID END # basic science analysis -DEFAULT METADATA - CHIP STR PPIMAGE_OBDSFRP - JPEG_BIN1 STR PPIMAGE_J1 - JPEG_BIN2 STR PPIMAGE_J2 - FAKEPHOT STR FAKEPHOT - ADDSTAR STR ADDSTAR +DEFAULT METADATA + CHIP STR PPIMAGE_OBDSFRP + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT + ADDSTAR STR ADDSTAR END # photometry for pre-detrended images -PROCESSED METADATA - CHIP STR PPIMAGE_P - JPEG_BIN1 STR PPIMAGE_J1 - JPEG_BIN2 STR PPIMAGE_J2 - FAKEPHOT STR FAKEPHOT - ADDSTAR STR ADDSTAR +PROCESSED METADATA + CHIP STR PPIMAGE_P + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT + ADDSTAR STR ADDSTAR END # photometry to make flat-field correction (apply flat_raw) -FLATCORR METADATA - CHIP STR PPIMAGE_FLATCORR - JPEG_BIN1 STR PPIMAGE_J1 - JPEG_BIN2 STR PPIMAGE_J2 - FAKEPHOT STR FAKEPHOT - ADDSTAR STR FLATCORR +FLATCORR METADATA + CHIP STR PPIMAGE_FLATCORR + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT + ADDSTAR STR FLATCORR END # Detrend Processing only for raw data -DETREND_ONLY METADATA - CHIP STR PPIMAGE_DET_ONLY - JPEG_BIN1 STR PPIMAGE_J1 - JPEG_BIN2 STR PPIMAGE_J2 - FAKEPHOT STR FAKEPHOT +DETREND_ONLY METADATA + CHIP STR PPIMAGE_DET_ONLY + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT END -NO_PHOTOM METADATA - CHIP STR PPIMAGE_OBDSF - JPEG_BIN1 STR PPIMAGE_J1 - JPEG_BIN2 STR PPIMAGE_J2 - FAKEPHOT STR FAKEPHOT +NO_PHOTOM METADATA + CHIP STR PPIMAGE_OBDSF + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT END # Detrend Processing only for raw data -MASKPHOT METADATA - CHIP STR PPIMAGE_MASKPHOT - JPEG_BIN1 STR PPIMAGE_J1 - JPEG_BIN2 STR PPIMAGE_J2 - FAKEPHOT STR FAKEPHOT +MASKPHOT METADATA + CHIP STR PPIMAGE_MASKPHOT + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT END