Index: trunk/ippconfig/isp/camera.config =================================================================== --- trunk/ippconfig/isp/camera.config (revision 9503) +++ trunk/ippconfig/isp/camera.config (revision 9629) @@ -3,5 +3,6 @@ # File formats that we know about FORMATS METADATA - ISP STR isp/format.config + ISP STR isp/format.config + ISP.CMP STR isp/cmp.config END @@ -9,12 +10,12 @@ # Description of camera --- all the chips and the cells that comprise them FPA METADATA - Chip STR Cell + Chip STR Cell END # Recipe options -RECIPES METADATA - PHASE2 STR isp/phase2.config # Phase 2 recipe details - PSPHOT STR isp/psphot.config # psphot details - PSASTRO STR isp/psastro.config # psastro details +RECIPES METADATA + PHASE2 STR isp/phase2.config # Phase 2 recipe details + PSPHOT STR isp/psphot.config # psphot details + PSASTRO STR isp/psastro.config # psastro details # Recipes for ppImage @@ -23,14 +24,15 @@ PPIMAGE_OB STR isp/ppImage_ob.config # Overscan, bias only PPIMAGE_OBD STR isp/ppImage_obd.config # Overscan, bias, dark only - PPIMAGE_OBDS STR isp/ppImage_obd.config # Overscan, bias, dark only - # PPIMAGE_OBDS STR isp/ppImage_obds.config # Overscan, bias, dark, shutter only + PPIMAGE_OBDS STR isp/ppImage_obd.config # Overscan, bias, dark only + # PPIMAGE_OBDS STR isp/ppImage_obds.config # Overscan, bias, dark, shutter only PPIMAGE_OBDSF STR isp/ppImage_obdsf.config # Overscan, bias, dark, shutter, flat only + PPIMAGE_OBDSFP STR isp/ppImage_obdsfp.config # Overscan, bias, dark, shutter, flat, psphot PPIMAGE_B STR isp/ppImage_b.config # Bias only PPIMAGE_D STR isp/ppImage_d.config # Dark only - PPIMAGE_S STR isp/ppImage_s.config # Shutter only + PPIMAGE_S STR isp/ppImage_s.config # Shutter only PPIMAGE_F STR isp/ppImage_f.config # Flat only PPIMAGE_J1 STR isp/ppImage_j1.config # JPEG only PPIMAGE_J2 STR isp/ppImage_j2.config # JPEG only - PPIMAGE_N STR isp/ppImage_n.config # Nothing except binning + PPIMAGE_N STR isp/ppImage_n.config # Nothing except binning # Recipes for ppMerge @@ -38,7 +40,7 @@ PPMERGE_DARK STR isp/ppMerge_dark.config PPMERGE_FLAT STR isp/ppMerge_flat.config - PPMERGE_SHUTTER STR isp/ppMerge_shutter.config + PPMERGE_SHUTTER STR isp/ppMerge_shutter.config - # Recipes for ppStats + # Recipes for ppStats PPSTATS STR isp/ppStats.config # ppStats recipe @@ -81,48 +83,54 @@ PSASTRO.INPUT STR PSASTRO.INPUT.CMP PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP - PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMP ### input file definitions TYPE INPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.TYPE DATA.LEVEL PPIMAGE.INPUT INPUT none.fits NONE NONE NONE IMAGE FPA - PPARITH.INPUT INPUT none.fits NONE NONE NONE IMAGE FPA - PPIMAGE.BIAS INPUT /data/alala/price/isp/bias/ISP.bias.norm.1.0.isp.fits NONE NONE NONE IMAGE CHIP - PPIMAGE.DARK INPUT /data/alala/price/isp/dark/ISP.dark.norm.2.0.isp.fits NONE NONE NONE IMAGE CHIP -# PPIMAGE.SHUTTER INPUT /data/alala/price/isp/shutter/ISP.shutter.3.0.isp.fits NONE NONE NONE IMAGE CHIP - PPIMAGE.FLAT INPUT /data/alala/price/isp/flat/ISP.flat.norm.3.0.isp.fits NONE NONE NONE IMAGE CHIP - PPIMAGE.MASK INPUT mask.fits NONE NONE NONE IMAGE CHIP + # XXX should we have a fallback option for these? + PPIMAGE.BIAS INPUT @DETDB NONE {CAMERA} NONE IMAGE CHIP + PPIMAGE.DARK INPUT @DETDB NONE {CAMERA} NONE IMAGE CHIP + PPIMAGE.FLAT INPUT @DETDB NONE {CAMERA} NONE IMAGE CHIP + + PPIMAGE.MASK INPUT mask.fits NONE NONE NONE IMAGE CHIP + # PPIMAGE.BIAS INPUT bias.fits NONE NONE NONE IMAGE CHIP + # PPIMAGE.DARK INPUT dark.fits NONE NONE NONE IMAGE CHIP + # PPIMAGE.SHUTTER INPUT shutter.fits NONE NONE NONE IMAGE CHIP + # PPIMAGE.FLAT INPUT flat.fits NONE NONE NONE IMAGE CHIP PSPHOT.INPUT INPUT none.fits NONE NONE NONE IMAGE CHIP + PSPHOT.PSF.LOAD INPUT none.psf NONE NONE NONE PSF CHIP - PSASTRO.INPUT.CMP INPUT none.fits NONE NONE PHU CMP CHIP - PSASTRO.INPUT.CMF INPUT none.fits NONE SMPDATA PHU CMF CHIP + PSASTRO.INPUT.CMP INPUT none.fits NONE NONE PHU CMP FPA + PSASTRO.INPUT.CMF INPUT none.fits NONE SMPDATA PHU CMF FPA ### output file definitions - TYPE OUTPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.TYPE FILE.LEVEL DATA.LEVEL FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT OUTPUT {OUTPUT}.isp.fits NONE NONE NONE IMAGE FPA FPA TRUE NONE - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.ch.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + TYPE OUTPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.TYPE FILE.LEVEL DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.isp.fits NONE NONE NONE IMAGE FPA FPA TRUE NONE + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.ch.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PPIMAGE.BIN1 OUTPUT {OUTPUT}.isp.b1.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PPIMAGE.BIN2 OUTPUT {OUTPUT}.isp.b2.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 JPEG FPA FPA TRUE ISP - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 JPEG FPA FPA TRUE ISP + PPIMAGE.BIN1 OUTPUT {OUTPUT}.isp.b1.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PPIMAGE.BIN2 OUTPUT {OUTPUT}.isp.b2.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 JPEG FPA FPA TRUE ISP + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 JPEG FPA FPA TRUE ISP - PPARITH.OUTPUT OUTPUT {OUTPUT} NONE NONE NONE IMAGE FPA FPA TRUE NONE + PPARITH.OUTPUT OUTPUT {OUTPUT} NONE NONE NONE IMAGE FPA FPA TRUE NONE - PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT} NONE NONE NONE RAW FPA FPA TRUE NONE - PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx NONE NONE NONE SX FPA FPA TRUE NONE - PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj NONE NONE NONE OBJ FPA FPA TRUE NONE - PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp NONE NONE NONE CMP FPA FPA TRUE NONE - PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf NONE SMPDATA PHU CMF FPA FPA TRUE NONE + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT} NONE NONE NONE RAW FPA FPA TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx NONE NONE NONE SX FPA FPA TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj NONE NONE NONE OBJ FPA FPA TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp NONE NONE NONE CMP FPA FPA TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf NONE SMPDATA PHU CMF FPA FPA TRUE NONE + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf NONE NONE NONE PSF FPA FPA TRUE NONE - PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp NONE NONE NONE CMP FPA FPA TRUE NONE + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp NONE NONE NONE CMP FPA FPA TRUE NONE END