Index: /trunk/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /trunk/ippconfig/recipes/reductionClasses.mdc (revision 18223) +++ /trunk/ippconfig/recipes/reductionClasses.mdc (revision 18224) @@ -1,9 +1,16 @@ # 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_OB 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 @@ -20,4 +27,8 @@ DARK_VERIFY STR PPIMAGE_OBD 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 @@ -25,4 +36,8 @@ SHUTTER_VERIFY STR PPIMAGE_OBDS 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 FLAT_PROCESS STR PPIMAGE_OBDS @@ -30,4 +45,20 @@ FLAT_VERIFY STR PPIMAGE_OBDSF 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 + + # DOMEFLAT does not have specific processing recipes? + 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 + + # SKYFLAT does not have specific processing recipes? + 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 FLAT_PREMASK_PROCESS STR PPIMAGE_OBDS @@ -40,58 +71,32 @@ JPEG_BIN2_RESID_FLAT_PREMASK 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_OBD + 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 + + FLATMASK_PROCESS STR PPIMAGE_OBDSF + FLATMASK_RESID STR PPIMAGE_M + FLATMASK_VERIFY STR PPIMAGE_OBDSF + 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 + FRINGE_PROCESS STR PPIMAGE_OBDSF FRINGE_RESID STR PPIMAGE_R FRINGE_VERIFY STR PPIMAGE_OBDSFR 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 - # 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_DARKMASK - - FLATMASK_PROCESS STR PPIMAGE_OBDSF - FLATMASK_RESID STR PPIMAGE_N - FLATMASK_VERIFY STR PPIMAGE_OBDSF - FLATMASK_STACK STR PPMERGE_FLATMASK - - 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 - JPEG_BIN1_IMAGE_DARK STR PPIMAGE_J1_IMAGE_B - JPEG_BIN1_IMAGE_SHUTTER STR PPIMAGE_J1_IMAGE_F - JPEG_BIN1_IMAGE_FLAT STR PPIMAGE_J1_IMAGE_F - JPEG_BIN1_IMAGE_DOMEFLAT STR PPIMAGE_J1_IMAGE_F - JPEG_BIN1_IMAGE_SKYFLAT STR PPIMAGE_J1_IMAGE_F - JPEG_BIN1_IMAGE_FRINGE STR PPIMAGE_J1_IMAGE_R - JPEG_BIN2_IMAGE_BIAS STR PPIMAGE_J2_IMAGE_B - JPEG_BIN2_IMAGE_DARK STR PPIMAGE_J2_IMAGE_B - JPEG_BIN2_IMAGE_SHUTTER STR PPIMAGE_J2_IMAGE_F - JPEG_BIN2_IMAGE_FLAT STR PPIMAGE_J2_IMAGE_F - JPEG_BIN2_IMAGE_DOMEFLAT STR PPIMAGE_J2_IMAGE_F - JPEG_BIN2_IMAGE_SKYFLAT STR PPIMAGE_J2_IMAGE_F - JPEG_BIN2_IMAGE_FRINGE STR PPIMAGE_J2_IMAGE_R - - JPEG_BIN1_RESID_BIAS STR PPIMAGE_J1_RESID_B - JPEG_BIN1_RESID_DARK STR PPIMAGE_J1_RESID_B - JPEG_BIN1_RESID_SHUTTER STR PPIMAGE_J1_RESID_F - JPEG_BIN1_RESID_FLAT STR PPIMAGE_J1_RESID_F - JPEG_BIN1_RESID_DOMEFLAT STR PPIMAGE_J1_RESID_F - JPEG_BIN1_RESID_SKYFLAT STR PPIMAGE_J1_RESID_F - JPEG_BIN1_RESID_FRINGE STR PPIMAGE_J1_RESID_R - JPEG_BIN2_RESID_BIAS STR PPIMAGE_J2_RESID_B - JPEG_BIN2_RESID_DARK STR PPIMAGE_J2_RESID_B - JPEG_BIN2_RESID_SHUTTER STR PPIMAGE_J2_RESID_F - JPEG_BIN2_RESID_FLAT STR PPIMAGE_J2_RESID_F - JPEG_BIN2_RESID_DOMEFLAT STR PPIMAGE_J2_RESID_F - JPEG_BIN2_RESID_SKYFLAT STR PPIMAGE_J2_RESID_F - JPEG_BIN2_RESID_FRINGE STR PPIMAGE_J2_RESID_R END