Index: /trunk/ippconfig/system.config =================================================================== --- /trunk/ippconfig/system.config (revision 19627) +++ /trunk/ippconfig/system.config (revision 19628) @@ -4,18 +4,18 @@ CAMERAS METADATA MEGACAM STR megacam/camera.config # CFHT MegaCam - CFH12K STR cfh12k/camera.config # CFHT 12K - ISP-Apogee STR isp/camera.config # Pan-STARRS Imaging sky probe - MOSAIC2 STR mosaic2/camera.config # CTIO MOSAIC2 camera, for ESSENCE - SDSSmosaic STR sdssmosaic/camera.config # SDSS, mosaic version - SDSS STR sdss/camera.config # Sloan Digital Sky Survey - GPC1 STR gpc1/camera.config # Pan-STARRS GPC1 - ESOWFI STR esowfi/camera.config # ESO Wide-Field Imager - LBCRED STR lbc_red/camera.config # Large Binocular Camera Red - LULIN STR lulin/camera.config # Lulin Optical Telescope 1m - UH8K STR uh8k/camera.config # WFI/8k on UH88 - # VYSOS-5 STR vysos5/camera.config # VYSOS 5in - SIMMOSAIC STR simmosaic/camera.config # Simulated mosaic, for testing - SIMTEST STR simtest/camera.config # Simulation test camera - SIMPLE STR simple/camera.config # If all else fails.... + CFH12K STR cfh12k/camera.config # CFHT 12K + ISP-Apogee STR isp/camera.config # Pan-STARRS Imaging sky probe + MOSAIC2 STR mosaic2/camera.config # CTIO MOSAIC2 camera, for ESSENCE + SDSSmosaic STR sdssmosaic/camera.config # SDSS, mosaic version + SDSS STR sdss/camera.config # Sloan Digital Sky Survey + GPC1 STR gpc1/camera.config # Pan-STARRS GPC1 + ESOWFI STR esowfi/camera.config # ESO Wide-Field Imager + LBCRED STR lbc_red/camera.config # Large Binocular Camera Red + LULIN STR lulin/camera.config # Lulin Optical Telescope 1m + UH8K STR uh8k/camera.config # WFI/8k on UH88 + VYSOS-5 STR vysos5/camera.config # VYSOS 5in + SIMMOSAIC STR simmosaic/camera.config # Simulated mosaic, for testing + SIMTEST STR simtest/camera.config # Simulation test camera + SIMPLE STR simple/camera.config # If all else fails.... END @@ -25,21 +25,4 @@ # TC3 STR tc3/camera.config # Pan-STARRS Test Camera III # LRIS_RED STR lris_red/camera.config - -### camera names as expected by DVO -DVO.CAMERAS METADATA - MEGACAM STR megacam - CFH12K STR cfh12k - ISP-Apogee STR isp - MOSAIC2 STR mosaic2 - SDSSmosaic STR sdssmosaic - SDSS STR sdss - GPC1 STR gpc1 - ESOWFI STR esowfi - LULIN STR lulin - UH8K STR uh8k - SIMMOSAIC STR simmosaic - SIMTEST STR simtest - SIMPLE STR simple -END # Header keywords for skycell concepts; required because DVO doesn't read HIERARCH @@ -53,15 +36,16 @@ RECIPES METADATA # Site-level recipes - MASKS STR recipes/masks.config # Mask values - REJECTIONS STR recipes/rejections.config # Rejection for detrend creation - PPIMAGE STR recipes/ppImage.config # Image reduction - PPMERGE STR recipes/ppMerge.config # Image combination - PPSTATS STR recipes/ppStats.config # Image statistics - PSPHOT STR recipes/psphot.config # Photometry - PSASTRO STR recipes/psastro.config # Astrometry - PPSTACK STR recipes/ppStack.config # Combination - PSWARP STR recipes/pswarp.config # Warping - PPSIM STR recipes/ppSim.config # Simulations - PPSUB STR recipes/ppSub.config # Subtraction - ADDSTAR STR recipes/addstar.config # addstar to dvodb + MASKS STR recipes/masks.config # Mask values + REJECTIONS STR recipes/rejections.config # Rejection for detrend creation + PPIMAGE STR recipes/ppImage.config # Image reduction + PPMERGE STR recipes/ppMerge.config # Image combination + PPSTATS STR recipes/ppStats.config # Image statistics + PSPHOT STR recipes/psphot.config # Photometry + PSASTRO STR recipes/psastro.config # Astrometry + PPSTACK STR recipes/ppStack.config # Combination + PSWARP STR recipes/pswarp.config # Warping + PPSIM STR recipes/ppSim.config # Simulations + PPSUB STR recipes/ppSub.config # Subtraction + ADDSTAR STR recipes/addstar.config # addstar to dvodb + PPSTATS_METADATA STR recipes/ppStatsFromMetadata.config # Image statistics END Index: /trunk/ippconfig/vysos5/camera.config =================================================================== --- /trunk/ippconfig/vysos5/camera.config (revision 19627) +++ /trunk/ippconfig/vysos5/camera.config (revision 19628) @@ -3,34 +3,34 @@ # File formats that we know about FORMATS METADATA - SIMPLE STR vysos-5/format.config + SIMPLE STR vysos5/format.config END # Description of camera --- all the chips and the cells that comprise them FPA METADATA - Chip STR Cell + Chip STR Cell END # valid filter names and corresponding IDs FILTER.ID METADATA - NONE STR NONE - g STR g - r STR r - i STR i - z STR z + NONE STR NONE + g STR PSg + r STR PSr + i STR PSi + z STR PSz END # Table of strings to use for the class identifier (see ippdb) according to the file level. -CLASSID METADATA - FPA STR fpa +CLASSID METADATA + FPA STR fpa END -DVO.CAMERADIR STR simtest # Camera directory for DVO +DVO.CAMERADIR STR vysos5 # Camera directory for DVO # convert supplied FPA.OBSTYPE values to abstract exptype names OBSTYPE.TABLE METADATA - bias STR BIAS - zero STR BIAS - dark STR DARK - flat STR SKYFLAT + bias STR BIAS + zero STR BIAS + dark STR DARK + flat STR SKYFLAT skyflat STR SKYFLAT domeflat STR DOMEFLAT @@ -40,19 +40,19 @@ # Recipe options -RECIPES METADATA - PPIMAGE STR simtest/ppImage.config # Default: all (normal) options on - PSPHOT STR simtest/psphot.config # psphot details - PPSIM STR simtest/ppSim.config # ppSim details - PPSUB STR simtest/ppSub.config # ppSub details - PSASTRO STR simtest/psastro.config # psastro details - REJECTIONS STR simtest/rejections.config # Rejection for detrend creation +RECIPES METADATA + # PPIMAGE STR vysos5/ppImage.config # Default: all (normal) options on + # PSPHOT STR vysos5/psphot.config # psphot details + # PPSIM STR vysos5/ppSim.config # ppSim details + # PPSUB STR vysos5/ppSub.config # ppSub details + # PSASTRO STR vysos5/psastro.config # psastro details + # REJECTIONS STR vysos5/rejections.config # Rejection for detrend creation END # reduction classes (recipes which are grouped together) -REDUCTION STR recipes/reductionClasses.mdc +REDUCTION STR recipes/reductionClasses.mdc FITSTYPES STR recipes/fitstypes.mdc -FILERULES STR recipes/filerules-simple.mdc +FILERULES STR recipes/filerules-simple.mdc EXTNAME.RULES METADATA @@ -62,14 +62,14 @@ CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT? - PSF.HEAD STR {CHIP.NAME}.hdr + PSF.HEAD STR {CHIP.NAME}.hdr PSF.TABLE STR {CHIP.NAME}.psf_model PSF.RESID STR {CHIP.NAME}.psf_resid END -BLANK.HEADERS METADATA - FPA.TIME STR MJD-OBS - FPA.EXPOSURE STR EXPTIME - FPA.AIRMASS STR AIRMASS +BLANK.HEADERS METADATA + FPA.TIME STR MJD-OBS + FPA.EXPOSURE STR EXPTIME + FPA.AIRMASS STR AIRMASS END -PHOTCODE.RULE STR {DETECTOR}.{FILTER.ID} # Rule for generating photcode +PHOTCODE.RULE STR {DETECTOR}.{FILTER.ID} # Rule for generating photcode Index: /trunk/ippconfig/vysos5/format.config =================================================================== --- /trunk/ippconfig/vysos5/format.config (revision 19627) +++ /trunk/ippconfig/vysos5/format.config (revision 19628) @@ -20,8 +20,8 @@ CELLS METADATA amplifier METADATA - CELL.TRIMSEC.SOURCE STR HEADER - CELL.TRIMSEC STR TRIMSEC - CELL.BIASSEC.SOURCE STR HEADER - CELL.BIASSEC STR BIASSEC + CELL.TRIMSEC.SOURCE STR VALUE + CELL.TRIMSEC STR [1:4098,10:4098] + CELL.BIASSEC.SOURCE STR VALUE + CELL.BIASSEC STR [1:4098,1:9] END END @@ -34,19 +34,20 @@ FPA.FILTERID STR FILTER FPA.FILTER STR FILTER - FPA.POSANGLE STR POSANGLE FPA.RA STR OBJCTRA FPA.DEC STR OBJCTDEC FPA.OBJECT STR OBJECT FPA.COMMENT STR NOTES - FPA.TIME STR DATE TIME-OBS # Date and time + FPA.TIME STR DATE-OBS # Date and time FPA.EXPOSURE STR EXPTIME FPA.TEMP STR CCD-TEMP + CHIP.TEMP STR CCD-TEMP CELL.EXPOSURE STR EXPTIME CELL.DARKTIME STR DARKTIME -. CELL.TIME STR DATE-OBS UTC-OBS # Date and time + CELL.TIME STR DATE-OBS # Date and time CELL.XBIN STR XBINNING CELL.YBIN STR YBINNING FPA.TIMESYS STR TIMESYS FPA.RADECSYS STR RADECSYS + FPA.AIRMASS STR AIRMASS ## XXX need to fix this! (ALT, AZ, LAT, LONG are provided) END @@ -54,5 +55,5 @@ DEFAULTS METADATA FPA.DETECTOR STR VYSOS-5 - FPA.AIRMASS STR AIRMASS ## XXX need to fix this! (ALT, AZ, LAT, LONG are provided) + FPA.POSANGLE STR 0.0 CELL.SATURATION F32 65535 CELL.BAD F32 -100 ## XXX this value is bogus, but needs to be context based so residual images do not get half-masked