Index: branches/eam_branches/ipp-20120405/ippconfig/Makefile.am =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/Makefile.am (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/Makefile.am (revision 33948) @@ -3,4 +3,5 @@ isp \ gpc1 \ + gpc1-tdi \ cfh12k \ megacam \ Index: branches/eam_branches/ipp-20120405/ippconfig/cfh12k/camera.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/cfh12k/camera.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/cfh12k/camera.config (revision 33948) @@ -122,4 +122,5 @@ CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT? CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT? + CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT? CMF.DETEFF STR {CHIP.NAME}.deteff Index: branches/eam_branches/ipp-20120405/ippconfig/configure.ac =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/configure.ac (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/configure.ac (revision 33948) @@ -14,4 +14,5 @@ isp/Makefile gpc1/Makefile + gpc1-tdi/Makefile cfh12k/Makefile megacam/Makefile Index: branches/eam_branches/ipp-20120405/ippconfig/esowfi/camera.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/esowfi/camera.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/esowfi/camera.config (revision 33948) @@ -89,4 +89,5 @@ CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT? CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT? + CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT? CMF.DETEFF STR {CHIP.NAME}.deteff Index: branches/eam_branches/ipp-20120405/ippconfig/gpc1-tdi/Makefile.am =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/gpc1-tdi/Makefile.am (revision 33948) +++ branches/eam_branches/ipp-20120405/ippconfig/gpc1-tdi/Makefile.am (revision 33948) @@ -0,0 +1,15 @@ + +installdir = $(datadir)/ippconfig/gpc1-tdi + +install_files = \ + camera.config \ + format_tdi_20120416.config + +install_DATA = $(install_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) + +ACLOCAL_AMFLAGS = -I m4 Index: branches/eam_branches/ipp-20120405/ippconfig/gpc1-tdi/camera.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/gpc1-tdi/camera.config (revision 33948) +++ branches/eam_branches/ipp-20120405/ippconfig/gpc1-tdi/camera.config (revision 33948) @@ -0,0 +1,165 @@ +# Camera configuration file for GPC1: describes the camera + +# File formats that we know about +FORMATS METADATA + TDI_20120416 STR gpc1-tdi/format_tdi_20120416.config +END + + +# Description of camera --- all the chips and the cells that comprise them +FPA METADATA + XY01 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY02 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY03 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY04 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY05 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY06 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY10 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY11 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY12 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY13 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY14 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY15 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY16 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY17 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY20 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY21 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY22 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY23 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY24 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY25 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY26 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY27 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY30 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY31 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY32 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY33 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY34 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY35 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY36 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY37 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY40 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY41 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY42 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY43 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY44 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY45 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY46 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY47 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY50 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY51 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY52 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY53 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY54 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY55 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY56 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY57 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY60 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY61 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY62 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY63 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY64 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY65 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY66 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY67 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY71 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY72 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY73 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY74 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY75 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 + XY76 STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 +END + +# internal to external filter names +FILTER.ID METADATA + g STR g.00000 + r STR r.00000 + i STR i.00000 + z MULTI + z STR z.00000 + z STR ?.00000 + y STR y.00000 + w STR w.00000 + # the following were needed for detrend.correct because input and output images seem to be inconsistent sometimes: + # g STR g + # r STR r + # i STR i + # z STR z + # y STR y + # w STR w + OPEN STR OPEN +END + +# Table of strings to use for the class identifier (see ippdb) according to the file level. +CLASSID METADATA + FPA STR fpa + CHIP STR {CHIP.NAME} + CELL STR {CHIP.NAME}:{CELL.NAME} + fpa STR fpa + chip STR {CHIP.NAME} + cell STR {CHIP.NAME}:{CELL.NAME} +END + +DVO.CAMERADIR STR gpc1 # Camera directory for DVO + +# Recipe options +RECIPES METADATA + PPIMAGE STR gpc1/ppImage.config + PPMERGE STR gpc1/ppMerge.config + PSASTRO STR gpc1/psastro.config + PSPHOT STR gpc1/psphot.config + PSWARP STR gpc1/pswarp.config + PSVIDEOPHOT STR gpc1/psvideophot.config + REJECTIONS STR gpc1/rejections.config # rejection recipe + PPSTACK STR gpc1/ppStack.config +END + +# reduction classes (recipes which are grouped together) +REDUCTION STR recipes/reductionClasses.mdc + +FITSTYPES STR recipes/fitstypes.mdc + +FILERULES STR recipes/filerules-split.mdc + +EXTNAME.RULES METADATA + CMF.HEAD STR {CHIP.NAME}.hdr + CMF.DATA STR {CHIP.NAME}.psf # use .PSF and .EXT? + CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT? + CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT? + CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT? + CMF.DETEFF STR {CHIP.NAME}.deteff + + 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 + FPA.OBS STR EXPNUM +END + +PHOTCODE.RULE STR {DETECTOR}.{FILTER.ID}.{CHIP.NAME} # Rule for generating photcode + +BURNTOOL.STATE.GOOD S16 14 # Value for burntool_state with the most recent bt version. +BURNTOOL.STATE.GOOD.UPDATE S16 13 # for upddate processing accept earlier version + +FOV_REF F32 20930 # Field of view of unvignetted region in FPA pixels. +FOV_MAX F32 22720 +#NPIX_REF S32 1357799527 +#NPIX_MAX S32 1482790357 +NPIX_REF S32 1333206539 +NPIX_MAX S32 1455690816 +NPIX_INTERCHIP S32 103794483 + +# This sets the maximum size for the fwhm_major. This is roughly 3", and 98.67% of all exposures in the database are less than this. +MAX_ALLOWED_FWHM F32 12 + +# The set of maskbits that should not be set to NAN in "released" images +# This value is equal to CONV.POOR | STARCORE | SPIKE | SUSPECT = 0x5280 +# unfortunately the perl parser won't accept a hex value +MASK.NO.CENSOR U32 21120 + +METADATA.COMPRESSION STR 7f # compression mode (nM): n = 1-9, M = f (filtered), h (Huffman), R (run-length) Index: branches/eam_branches/ipp-20120405/ippconfig/gpc1-tdi/format_tdi_20120416.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/gpc1-tdi/format_tdi_20120416.config (revision 33948) +++ branches/eam_branches/ipp-20120405/ippconfig/gpc1-tdi/format_tdi_20120416.config (revision 33948) @@ -0,0 +1,615 @@ +# Refurbished GPC1 +# Change effective from 22 January 2010 (TJD=5219): new CCD temperature keywords + +# How to identify this type +RULE METADATA + ORIGIN STR PS1 + TELESCOP STR PS1 + INSTRUME STR gpc1 + CONTROLR STR STARGRASP + NAMPS S32 8 + MJD-OBS F64 55400.0 # OP: >= +END + +# How to read this data +FILE METADATA + PHU STR CHIP # The FITS file represents a single chip + EXTENSIONS STR CELL # The extensions represent cells + FPA.OBS STR FILENAME # A PHU keyword for unique identifier within the hierarchy level + CONTENT STR DETECTOR # How to determine content of FITS file + CONTENT.RULE STR {CHIP.ID} # How to derive the CONTENT when writing +END + +# What's in the FITS file? +CONTENTS METADATA + # CONTENT = chip name : type + CCID58-2-15a1 STR XY01:GPCChip # chip 00 + CCID58-2-18a1 STR XY02:GPCChip # chip 01 + CCID58-2-04a2 STR XY03:GPCChip # chip 02 + CCID58-1-01b1 STR XY04:GPCChip # chip 03 + CCID58-1-09b1 STR XY05:GPCChip # chip 04 + CCID58-2-09b1 STR XY06:GPCChip # chip 05 + CCID58-2-22a1 STR XY10:GPCChip # chip 06 + CCID58-2-01a1 STR XY11:GPCChip # chip 07 + CCID58-3-11a1 STR XY12:GPCChip # chip 08 + CCID58-3-06a1 STR XY13:GPCChip # chip 09 + CCID58-3-05b1 STR XY14:GPCChip # chip 10 + CCID58-3-08b1 STR XY15:GPCChip # chip 11 + CCID58-1-02b1 STR XY16:GPCChip # chip 12 + CCID58-2-07b2 STR XY17:GPCChip # chip 13 + CCID58-1-19a1 STR XY20:GPCChip # chip 14 + CCID58-1-04a1 STR XY21:GPCChip # chip 15 + CCID58-2-09a2 STR XY22:GPCChip # chip 16 + CCID58-1-02a1 STR XY23:GPCChip # chip 17 + CCID58-3-10b1 STR XY24:GPCChip # chip 18 + CCID58-3-05b2 STR XY25:GPCChip # chip 19 + CCID58-3-04b1 STR XY26:GPCChip # chip 20 + CCID58-1-18b1 STR XY27:GPCChip # chip 21 + CCID58-3-13a2 STR XY30:GPCChip # chip 22 + CCID58-3-05a1 STR XY31:GPCChip # chip 23 + CCID58-2-01a2 STR XY32:GPCChip # chip 24 + CCID58-1-02a2 STR XY33:GPCChip # chip 25 + CCID58-3-03b1 STR XY34:GPCChip # chip 26 + CCID58-1-01b2 STR XY35:GPCChip # chip 27 + CCID58-3-14b1 STR XY36:GPCChip # chip 28 + CCID58-2-23b2 STR XY37:GPCChip # chip 29 + CCID58-3-02b1 STR XY40:GPCChip # chip 30 + CCID58-1-03b2 STR XY41:GPCChip # chip 31 + CCID58-1-07b1 STR XY42:GPCChip # chip 32 + CCID58-2-11b2 STR XY43:GPCChip # chip 33 + CCID58-2-09a1 STR XY44:GPCChip # chip 34 + CCID58-3-04a2 STR XY45:GPCChip # chip 35 + CCID58-3-02a1 STR XY46:GPCChip # chip 36 + CCID58-3-14a1 STR XY47:GPCChip # chip 37 + CCID58-1-17b1 STR XY50:GPCChip # chip 38 + CCID58-2-09b2 STR XY51:GPCChip # chip 39 + CCID58-1-04b1 STR XY52:GPCChip # chip 40 + CCID58-1-05b2 STR XY53:GPCChip # chip 41 + CCID58-3-05a2 STR XY54:GPCChip # chip 42 + CCID58-3-03a2 STR XY55:GPCChip # chip 43 + CCID58-3-02a2 STR XY56:GPCChip # chip 44 + CCID58-3-11a2 STR XY57:GPCChip # chip 45 + CCID58-2-16b1 STR XY60:GPCChip # chip 46 + CCID58-1-03b1 STR XY61:GPCChip # chip 47 + CCID58-3-03b2 STR XY62:GPCChip # chip 48 + CCID58-1-02b2 STR XY63:GPCChip # chip 49 + CCID58-1-07a1 STR XY64:GPCChip # chip 50 + CCID58-2-04a1 STR XY65:GPCChip # chip 51 + CCID58-3-10a1 STR XY66:GPCChip # chip 52 + CCID58-1-09a1 STR XY67:GPCChip # chip 53 + CCID58-2-13b1 STR XY71:GPCChip # chip 54 + CCID58-1-14b1 STR XY72:GPCChip # chip 55 + CCID58-3-11b2 STR XY73:GPCChip # chip 56 + CCID58-1-05a2 STR XY74:GPCChip # chip 57 + CCID58-1-21a1 STR XY75:GPCChip # chip 58 + CCID58-2-05a1 STR XY76:GPCChip # chip 59 +END + +CHIPS METADATA + GPCChip METADATA + # Extension name, cellName:cellType + xy00 STR xy00:GPCCell + xy10 STR xy10:GPCCell + xy20 STR xy20:GPCCell + xy30 STR xy30:GPCCell + xy40 STR xy40:GPCCell + xy50 STR xy50:GPCCell + xy60 STR xy60:GPCCell + xy70 STR xy70:GPCCell + END +END + +# Specify the cell data +CELLS METADATA + GPCCell METADATA + CELL.TRIMSEC.SOURCE STR HEADER + CELL.TRIMSEC STR DATASEC + CELL.BIASSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + END +END + + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.FILTERID STR FILTERID + FPA.FILTER STR FILTERID + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR EQUINOX + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBJECT + FPA.OBS.MODE STR OBS_MODE + FPA.COMMENT STR CMMTOBS + FPA.AIRMASS STR AIRMASS + FPA.POSANGLE STR POSANGLE + FPA.ROTANGLE STR ROT + FPA.FOCUS STR M2Z + FPA.TIME STR SHUTOUTC + FPA.ALT STR ALT + FPA.AZ STR AZ + FPA.TEMP STR DETTEM + FPA.M1X STR M1X + FPA.M1Y STR M1Y + FPA.M1Z STR M1Z + FPA.M1TIP STR M1TIP + FPA.M1TILT STR M1TILT + FPA.M2X STR M2X + FPA.M2Y STR M2Y + FPA.M2Z STR M2Z + FPA.M2TIP STR M2TIP + FPA.M2TILT STR M2TILT + FPA.ENV.TEMP STR ENVTEM + FPA.ENV.HUMID STR ENVHUM + FPA.ENV.WIND STR ENVWIN + FPA.ENV.DIR STR ENVDIR + + FPA.TELTEMP.M1 STR TELTEMM1 # Primary mirror temps (C) + FPA.TELTEMP.M1CELL STR TELTEMMS # Primary mirror support temps (C) + FPA.TELTEMP.M2 STR TELTEMM2 # Secondary mirror temps (C + FPA.TELTEMP.SPIDER STR TELTEMSP # Spider temperatures (C) + FPA.TELTEMP.TRUSS STR TELTEMTR # Mid truss temperatures (C + FPA.TELTEMP.EXTRA STR TELTEMEX # Miscellaneous temperatures (C) + + FPA.BURNTOOL.APPLIED STR BTOOLAPP + CHIP.VIDEOCELL STR CELLMODE + + FPA.PON.TIME STR PONTIME + + CHIP.ID STR DETECTOR + CELL.XBIN STR CCDSUM + CELL.YBIN STR CCDSUM + CELL.X0 STR IMNPIX1 + CELL.Y0 STR IMNPIX2 + CELL.XPARITY STR ATM1_1 + CELL.YPARITY STR ATM2_2 + CHIP.TEMP STR CDETTEM + CHIP.TEMPERATURE STR DETTEM + FPA.EXPOSURE STR EXPREQ # Requested exposure time, presumably camera exposure time + CELL.EXPOSURE STR EXPTIME # Exposure time measured by shutter + CELL.DARKTIME STR DARKTIME # Exposure time for camera + CELL.TIME STR SHUTOUTC # Observation time + CELL.GAIN STR GAIN # Cell gain (e/ADU) + CELL.READNOISE STR RDNOISE # Cell read noise (ADU) + CELL.SATURATION STR MAXLIN # Saturation point (ADU) +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TELESCOPE STR PS1 + FPA.INSTRUMENT STR GPC1 + FPA.LONGITUDE STR 10:25:01.417 # West Longitude in Hours 10.4170608521 + FPA.LATITUDE STR 20:42:25.558 # North Latitude in Degrees 20.7070999146 + FPA.ELEVATION F32 3048.0 # altitude in meters + FPA.DETECTOR STR GPC1 + FPA.TIMESYS STR UTC + CHIP.XSIZE S32 4846 + CHIP.YSIZE S32 4868 + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + XY01 S32 4971 + XY02 S32 4971 + XY03 S32 4971 + XY04 S32 4971 + XY05 S32 4971 + XY06 S32 4971 + XY10 S32 9942 + XY11 S32 9942 + XY12 S32 9942 + XY13 S32 9942 + XY14 S32 9942 + XY15 S32 9942 + XY16 S32 9942 + XY17 S32 9942 + XY20 S32 14913 + XY21 S32 14913 + XY22 S32 14913 + XY23 S32 14913 + XY24 S32 14913 + XY25 S32 14913 + XY26 S32 14913 + XY27 S32 14913 + XY30 S32 19884 + XY31 S32 19884 + XY32 S32 19884 + XY33 S32 19884 # should be 19872 + XY34 S32 19884 + XY35 S32 19884 + XY36 S32 19884 + XY37 S32 19884 + XY40 S32 20041 + XY41 S32 20041 + XY42 S32 20041 + XY43 S32 20041 # should be 20029 + XY44 S32 20041 + XY45 S32 20041 + XY46 S32 20041 + XY47 S32 20041 + XY50 S32 25012 + XY51 S32 25012 + XY52 S32 25012 + XY53 S32 25012 + XY54 S32 25012 + XY55 S32 25012 + XY56 S32 25012 + XY57 S32 25012 + XY60 S32 29983 + XY61 S32 29983 + XY62 S32 29983 + XY63 S32 29983 + XY64 S32 29983 + XY65 S32 29983 + XY66 S32 29983 + XY67 S32 29983 + XY71 S32 34954 + XY72 S32 34954 + XY73 S32 34954 + XY74 S32 34954 + XY75 S32 34954 + XY76 S32 34954 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + XY01 S32 10286 + XY02 S32 15429 + XY03 S32 20572 + XY04 S32 25715 + XY05 S32 30858 + XY06 S32 36001 + XY10 S32 5143 + XY11 S32 10286 + XY12 S32 15429 + XY13 S32 20572 + XY14 S32 25715 + XY15 S32 30858 + XY16 S32 36001 + XY17 S32 41144 + XY20 S32 5143 + XY21 S32 10286 + XY22 S32 15429 + XY23 S32 20572 + XY24 S32 25715 + XY25 S32 30858 + XY26 S32 36001 + XY27 S32 41144 + XY30 S32 5143 + XY31 S32 10286 + XY32 S32 15429 + XY33 S32 20572 + XY34 S32 25715 # should be 25755 + XY35 S32 30858 + XY36 S32 36001 + XY37 S32 41144 + XY40 S32 306 + XY41 S32 5449 + XY42 S32 10592 + XY43 S32 15735 # should be 15707 + XY44 S32 20878 # should be 20890 + XY45 S32 26021 + XY46 S32 31164 + XY47 S32 36307 + XY50 S32 306 + XY51 S32 5449 + XY52 S32 10592 + XY53 S32 15735 + XY54 S32 20878 + XY55 S32 26021 + XY56 S32 31164 + XY57 S32 36307 + XY60 S32 306 + XY61 S32 5449 + XY62 S32 10592 + XY63 S32 15735 + XY64 S32 20878 + XY65 S32 26021 + XY66 S32 31164 + XY67 S32 36307 + XY71 S32 5449 + XY72 S32 10592 + XY73 S32 15735 + XY74 S32 20878 + XY75 S32 26021 + XY76 S32 31164 + END + CHIP.XPARITY.DEPEND STR CHIP.NAME + CHIP.XPARITY METADATA + XY01 S32 -1 + XY02 S32 -1 + XY03 S32 -1 + XY04 S32 -1 + XY05 S32 -1 + XY06 S32 -1 + XY10 S32 -1 + XY11 S32 -1 + XY12 S32 -1 + XY13 S32 -1 + XY14 S32 -1 + XY15 S32 -1 + XY16 S32 -1 + XY17 S32 -1 + XY20 S32 -1 + XY21 S32 -1 + XY22 S32 -1 + XY23 S32 -1 + XY24 S32 -1 + XY25 S32 -1 + XY26 S32 -1 + XY27 S32 -1 + XY30 S32 -1 + XY31 S32 -1 + XY32 S32 -1 + XY33 S32 -1 + XY34 S32 -1 + XY35 S32 -1 + XY36 S32 -1 + XY37 S32 -1 + XY40 S32 1 + XY41 S32 1 + XY42 S32 1 + XY43 S32 1 + XY44 S32 1 + XY45 S32 1 + XY46 S32 1 + XY47 S32 1 + XY50 S32 1 + XY51 S32 1 + XY52 S32 1 + XY53 S32 1 + XY54 S32 1 + XY55 S32 1 + XY56 S32 1 + XY57 S32 1 + XY60 S32 1 + XY61 S32 1 + XY62 S32 1 + XY63 S32 1 + XY64 S32 1 + XY65 S32 1 + XY66 S32 1 + XY67 S32 1 + XY71 S32 1 + XY72 S32 1 + XY73 S32 1 + XY74 S32 1 + XY75 S32 1 + XY76 S32 1 + END + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + XY01 S32 -1 + XY02 S32 -1 + XY03 S32 -1 + XY04 S32 -1 + XY05 S32 -1 + XY06 S32 -1 + XY10 S32 -1 + XY11 S32 -1 + XY12 S32 -1 + XY13 S32 -1 + XY14 S32 -1 + XY15 S32 -1 + XY16 S32 -1 + XY17 S32 -1 + XY20 S32 -1 + XY21 S32 -1 + XY22 S32 -1 + XY23 S32 -1 + XY24 S32 -1 + XY25 S32 -1 + XY26 S32 -1 + XY27 S32 -1 + XY30 S32 -1 + XY31 S32 -1 + XY32 S32 -1 + XY33 S32 -1 + XY34 S32 -1 + XY35 S32 -1 + XY36 S32 -1 + XY37 S32 -1 + XY40 S32 1 + XY41 S32 1 + XY42 S32 1 + XY43 S32 1 + XY44 S32 1 + XY45 S32 1 + XY46 S32 1 + XY47 S32 1 + XY50 S32 1 + XY51 S32 1 + XY52 S32 1 + XY53 S32 1 + XY54 S32 1 + XY55 S32 1 + XY56 S32 1 + XY57 S32 1 + XY60 S32 1 + XY61 S32 1 + XY62 S32 1 + XY63 S32 1 + XY64 S32 1 + XY65 S32 1 + XY66 S32 1 + XY67 S32 1 + XY71 S32 1 + XY72 S32 1 + XY73 S32 1 + XY74 S32 1 + XY75 S32 1 + XY76 S32 1 + END + CELL.READDIR S32 1 + CELL.BAD S32 0 + CELL.XSIZE S32 590 + CELL.YSIZE S32 598 + CELL.TIMESYS STR UTC +END + +# How to translation PS concepts into database lookups +DATABASE METADATA + # this rule is fragile : does not match the camera +# FPA.TEMP STR SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2 +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR DEGREES + FPA.DEC STR DEGREES + FPA.LONGITUDE STR HOURS + FPA.LATITUDE STR DEGREES + FPA.TIME STR YEAR.FIRST + CELL.TIME STR YEAR.FIRST + CELL.BINNING STR TOGETHER + # CELL.X0 STR FORTRAN + # CELL.Y0 STR FORTRAN + CELL.READNOISE STR ADU +END + +# Pattern correction information: + +# PATTERN.ROW BOOL TRUE # Do any row pattern correction at all? +PATTERN.ROW.SUBSET METADATA # List of chips and whether to do row pattern correction + XY01 BOOL FALSE +# XY02 STR 0000000000000000000000000000000000000000000000000000000000000001 # xy77 + XY02 BOOL FALSE + XY03 BOOL FALSE + XY04 BOOL FALSE + XY05 BOOL FALSE + XY06 BOOL FALSE + XY10 BOOL FALSE + XY11 STR 0011100100000000000000000000000000000000000000000000000000000000 + XY12 BOOL FALSE + XY13 BOOL FALSE + XY14 STR 0000000000000000000100000000000000000000000000000000000000000000 # xy23 + XY15 STR 1111111100000000000000000000000000000000000000000000000000000000 # cols: 0 + XY16 BOOL FALSE + XY17 BOOL FALSE + XY20 BOOL FALSE + XY21 BOOL FALSE + XY22 BOOL FALSE + XY23 BOOL FALSE + XY24 BOOL FALSE + XY25 BOOL FALSE + XY26 BOOL FALSE + XY27 STR 1111111111111111111111111111111100000000000000000000000011111111 # cols: 0,1,2,3,7 + XY30 BOOL FALSE + XY31 STR 0000000000000000000000000000000000000000000000000000000011111111 # cols: 7 + XY32 STR 0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7 + XY33 BOOL FALSE + XY34 BOOL FALSE + XY35 BOOL FALSE + XY36 BOOL FALSE + XY37 BOOL FALSE + XY40 BOOL FALSE + XY41 BOOL FALSE + XY42 BOOL FALSE + XY43 BOOL FALSE + XY44 BOOL FALSE + XY45 STR 0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7 + XY46 BOOL FALSE + XY47 STR 1111111100000000000000001111111100000000111111110000000011111111 # cols: 0,3,5,7 + XY50 BOOL FALSE + XY51 BOOL FALSE + XY52 BOOL FALSE + XY53 BOOL FALSE + XY54 BOOL FALSE + XY55 BOOL FALSE + XY56 BOOL FALSE + XY57 STR 1111111111111111111111110000000000000000000000001111111111111111 # cols: 0,1,2,6,7 + XY60 STR 0000000000000000000000000000000000000000000001000000000000000000 # cell xy55 + XY61 BOOL FALSE + XY62 BOOL FALSE + XY63 BOOL FALSE + XY64 BOOL FALSE + XY65 BOOL FALSE +# XY66 STR 0000000000000000000000000000000000000000000000000000000000000100 # cell xy75 + XY66 BOOL FALSE + XY67 BOOL FALSE + XY71 BOOL FALSE + XY72 BOOL FALSE + XY73 BOOL FALSE + XY74 STR 0000000000000000111111110000000000000000000000000000000011111111 # cols: 2,7 + XY75 BOOL FALSE + XY76 BOOL FALSE +END + +PATTERN.CONTINUITY BOOL TRUE + PATTERN.CELL BOOL FALSE # by default, do not do any cell pattern correction +# PATTERN.CELL.SUBSET METADATA # List of chips and whether to do cell pattern correction +# XY01 BOOL FALSE +# XY02 BOOL FALSE +# XY03 BOOL FALSE +# XY04 BOOL FALSE +# XY05 BOOL FALSE +# # XY06 STR 0101000000010000000110000100000000000000000000000000000000000000 +# XY06 BOOL FALSE +# XY10 BOOL FALSE +# XY11 BOOL FALSE +# XY12 BOOL FALSE +# XY13 BOOL FALSE +# XY14 STR 0000000000000000111111110000000000000000000000000000000000000000 +# XY15 STR 1111111110000000100000000000000000000000000000000000000000000000 +# # XY16 STR 0000000100000000000000000000000000000001000000000000000000000000 +# XY16 BOOL FALSE +# XY17 BOOL FALSE +# XY20 BOOL FALSE +# XY21 BOOL FALSE +# XY22 BOOL FALSE +# XY23 BOOL FALSE +# # XY24 STR 0000000000100000000000000110100000100000001000000011100000000000 +# XY24 BOOL FALSE +# # XY25 STR 0100010000001001001011000000001000000111000110000000100000000010 +# XY25 BOOL FALSE +# # XY26 STR 0000000000000100000000000000000000001000001000000000000000000000 +# XY26 BOOL FALSE +# XY27 BOOL FALSE +# XY30 BOOL FALSE +# XY31 BOOL FALSE +# XY32 BOOL FALSE +# XY33 BOOL FALSE +# # XY34 STR 0000000000000000000000000000000000000001000011000000101000111111 +# XY34 BOOL FALSE +# XY35 BOOL FALSE +# # XY36 STR 0001000000000000000000000000000000010000000000000000000000000000 +# XY36 BOOL FALSE +# # XY37 STR 0000000000000000000000000000000100010001000000001011000010110110 ? +# XY37 BOOL FALSE +# # XY40 STR 0000000000000000000000000010110000000000000001110000001000011111 +# XY40 BOOL FALSE +# XY41 BOOL FALSE +# # XY42 BOOL FALSE +# XY42 STR 0000000000000000000100000001000000000000000000000000000000000000 +# # XY43 STR 0000000000000000000000010000000100000000000010000100000100000100 +# XY43 STR 0000000000000000000000000000000000000000000010000000000000000000 +# XY44 BOOL FALSE +# XY45 BOOL FALSE +# XY46 BOOL FALSE +# XY47 BOOL FALSE +# XY50 BOOL FALSE +# XY51 BOOL FALSE +# XY52 BOOL FALSE +# XY53 BOOL FALSE +# XY54 BOOL FALSE +# XY55 BOOL FALSE +# XY56 BOOL FALSE +# XY57 BOOL FALSE +# XY60 BOOL FALSE +# XY61 BOOL FALSE +# # XY62 STR 0000000000000000000000000000000000000000000000000000000000000010 +# XY62 BOOL FALSE +# XY63 BOOL FALSE +# XY64 BOOL FALSE +# XY65 BOOL FALSE +# XY66 BOOL FALSE +# XY67 BOOL FALSE +# XY71 BOOL FALSE +# # XY72 STR 0000000000000000000000000000000000000000000000000000000000000001 +# XY72 BOOL FALSE +# # XY73 STR 0001100000000000000000000000001000000000000000000000000000000000 +# XY73 BOOL FALSE +# XY74 BOOL FALSE +# XY75 BOOL FALSE +# XY76 BOOL FALSE +# END Index: branches/eam_branches/ipp-20120405/ippconfig/gpc1/ghost.model.mdc =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/gpc1/ghost.model.mdc (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/gpc1/ghost.model.mdc (revision 33948) @@ -1,15 +1,83 @@ +# Original center models +# GHOST.CENTER.X METADATA +# NORDER_X S32 3 +# NORDER_Y S32 3 +# VAL_X00_Y00 F64 -4.421024e+01 +# VAL_X01_Y00 F64 1.216270e-02 +# VAL_X02_Y00 F64 -9.721643e-08 +# VAL_X03_Y00 F64 9.976554e-11 +# VAL_X00_Y01 F64 -1.762476e-03 +# VAL_X01_Y01 F64 1.247212e-07 +# VAL_X02_Y01 F64 3.629557e-11 +# VAL_X00_Y02 F64 -1.040174e-07 +# VAL_X01_Y02 F64 1.074674e-10 +# VAL_X00_Y03 F64 1.564112e-11 +# NELEMENTS S32 10 +# END + +# GHOST.CENTER.Y METADATA +# NORDER_X S32 3 +# NORDER_Y S32 3 +# VAL_X00_Y00 F64 -2.189470e+00 +# VAL_X01_Y00 F64 -4.186514e-03 +# VAL_X02_Y00 F64 1.131554e-07 +# VAL_X03_Y00 F64 1.415192e-11 +# VAL_X00_Y01 F64 1.569104e-02 +# VAL_X01_Y01 F64 -1.782801e-07 +# VAL_X02_Y01 F64 8.179602e-11 +# VAL_X00_Y02 F64 2.577055e-07 +# VAL_X01_Y02 F64 8.879423e-11 +# VAL_X00_Y03 F64 5.767429e-11 +# NELEMENTS S32 10 +# END + +# Updated models of 2012-05-07 +# Corrected(?) parity +# GHOST.CENTER.X METADATA +# NORDER_X S32 3 +# NORDER_Y S32 3 +# VAL_X00_Y00 F64 3.314569e+01 +# VAL_X01_Y00 F64 1.110664e-02 +# VAL_X02_Y00 F64 -1.904158e-07 +# VAL_X03_Y00 F64 8.470224e-11 +# VAL_X00_Y01 F64 -1.616877e-03 +# VAL_X01_Y01 F64 1.646508e-07 +# VAL_X02_Y01 F64 5.623381e-11 +# VAL_X00_Y02 F64 -2.342888e-07 +# VAL_X01_Y02 F64 1.023761e-10 +# VAL_X00_Y03 F64 2.836980e-11 +# NELEMENTS S32 10 +# END + +# GHOST.CENTER.Y METADATA +# NORDER_X S32 3 +# NORDER_Y S32 3 +# VAL_X00_Y00 F64 -2.860068e+01 +# VAL_X01_Y00 F64 -8.790076e-03 +# VAL_X02_Y00 F64 2.456534e-07 +# VAL_X03_Y00 F64 2.947749e-11 +# VAL_X00_Y01 F64 1.948855e-02 +# VAL_X01_Y01 F64 -2.639927e-07 +# VAL_X02_Y01 F64 4.951474e-11 +# VAL_X00_Y02 F64 4.341716e-07 +# VAL_X01_Y02 F64 1.643046e-10 +# VAL_X00_Y03 F64 -1.737983e-12 +# NELEMENTS S32 10 +# END + +# Switched order GHOST.CENTER.X METADATA NORDER_X S32 3 NORDER_Y S32 3 - VAL_X00_Y00 F64 -4.421024e+01 - VAL_X01_Y00 F64 1.216270e-02 - VAL_X02_Y00 F64 -9.721643e-08 - VAL_X03_Y00 F64 9.976554e-11 - VAL_X00_Y01 F64 -1.762476e-03 - VAL_X01_Y01 F64 1.247212e-07 - VAL_X02_Y01 F64 3.629557e-11 - VAL_X00_Y02 F64 -1.040174e-07 - VAL_X01_Y02 F64 1.074674e-10 - VAL_X00_Y03 F64 1.564112e-11 + VAL_X00_Y00 F64 -1.215661e+02 + VAL_X01_Y00 F64 1.321875e-02 + VAL_X02_Y00 F64 -4.017026e-09 + VAL_X03_Y00 F64 1.148288e-10 + VAL_X00_Y01 F64 -1.908074e-03 + VAL_X01_Y01 F64 8.479150e-08 + VAL_X02_Y01 F64 1.635732e-11 + VAL_X00_Y02 F64 2.625405e-08 + VAL_X01_Y02 F64 1.125586e-10 + VAL_X00_Y03 F64 2.912432e-12 NELEMENTS S32 10 END @@ -18,17 +86,54 @@ NORDER_X S32 3 NORDER_Y S32 3 - VAL_X00_Y00 F64 -2.189470e+00 - VAL_X01_Y00 F64 -4.186514e-03 - VAL_X02_Y00 F64 1.131554e-07 - VAL_X03_Y00 F64 1.415192e-11 - VAL_X00_Y01 F64 1.569104e-02 - VAL_X01_Y01 F64 -1.782801e-07 - VAL_X02_Y01 F64 8.179602e-11 - VAL_X00_Y02 F64 2.577055e-07 - VAL_X01_Y02 F64 8.879423e-11 - VAL_X00_Y03 F64 5.767429e-11 + VAL_X00_Y00 F64 2.422174e+01 + VAL_X01_Y00 F64 4.170486e-04 + VAL_X02_Y00 F64 -1.934260e-08 + VAL_X03_Y00 F64 -1.173657e-12 + VAL_X00_Y01 F64 1.189352e-02 + VAL_X01_Y01 F64 -9.256748e-08 + VAL_X02_Y01 F64 1.140772e-10 + VAL_X00_Y02 F64 8.123932e-08 + VAL_X01_Y02 F64 1.328378e-11 + VAL_X00_Y03 F64 1.170865e-10 NELEMENTS S32 10 END + + +# These are semi-major/minor axes +# These are my (CZW) quadratic solutions +# GHOST.INNER.MAJOR METADATA +# NORDER_X S32 2 +# VAL_X00 F64 2.2622e+01 +# VAL_X01 F64 1.3822e-02 +# VAL_X02 F64 -3.7005e-07 +# NELEMENTS S32 3 +# END + +# GHOST.INNER.MINOR METADATA +# NORDER_X S32 2 +# VAL_X00 F64 4.9626e+01 +# VAL_X01 F64 -2.4257e-04 +# VAL_X02 F64 -1.2007e-07 +# NELEMENTS S32 3 +# END + +# GHOST.OUTER.MAJOR METADATA +# NORDER_X S32 2 +# VAL_X00 F64 9.6490e+01 +# VAL_X01 F64 9.4250e-03 +# VAL_X02 F64 6.5680e-07 +# NELEMENTS S32 3 +# END + +# GHOST.OUTER.MINOR METADATA +# NORDER_X S32 2 +# VAL_X00 F64 9.5450e+01 +# VAL_X01 F64 2.8775e-03 +# VAL_X02 F64 -3.1409e-07 +# NELEMENTS S32 3 +# END + +# These are the original linear solutions GHOST.INNER.MAJOR METADATA NORDER_X S32 1 Index: branches/eam_branches/ipp-20120405/ippconfig/gpc1/ppImage.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/gpc1/ppImage.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/gpc1/ppImage.config (revision 33948) @@ -25,5 +25,8 @@ NOISEMAP BOOL FALSE # Apply read noise map - +# Final detrending options +HAS.VIDEO BOOL FALSE # Treat this OTA as if it has video data +USE.VIDEO.DARK BOOL FALSE # Use a video dark if we have video data? +USE.VIDEO.MASK BOOL TRUE # Use a video mask if we have video data? Index: branches/eam_branches/ipp-20120405/ippconfig/gpc1/psastro.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/gpc1/psastro.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/gpc1/psastro.config (revision 33948) @@ -113,5 +113,7 @@ # *** make sure the choice of CATDIR (dvo database) contains the photcodes desired below -PSASTRO.CATDIR STR SYNTH.GRIZY +# PSASTRO.CATDIR STR SYNTH.GRIZY +PSASTRO.CATDIR STR PS1.REF.20120503 + DVO.GETSTAR.PHOTCODE STR i DVO.GETSTAR.MAX.RHO F32 3000.0 @@ -130,5 +132,5 @@ ZEROPT F32 24.563 PHOTCODE STR g - GHOST_MAX_MAG F32 -20.0 + GHOST_MAX_MAG F32 -16.5 END PHOTCODE.DATA METADATA @@ -346,9 +348,10 @@ PSASTRO.MATCH.FIT.NITER S32 5 - PSASTRO.CATDIR STR STS.PP5.REFCAT + # CATDIR with PS1 astrometry from PP5 pointing. Only works for that field + # PSASTRO.CATDIR STR STS.PP5.REFCAT END DEFAULT_RECIPE METADATA - PSASTRO.CATDIR STR PS1.REF.20120325 + PSASTRO.CATDIR STR PS1.REF.20120503 ZERO.POINT.USE.MEAN BOOL TRUE END @@ -356,4 +359,14 @@ LAP_ASTRO METADATA # PSASTRO.CATDIR STR 3PI.20110505.REFCAT - PSASTRO.CATDIR STR SYNTH.GRIZY -END +# PSASTRO.CATDIR STR SYNTH.GRIZY + PSASTRO.CATDIR STR PS1.REF.20120503 + ZERO.POINT.USE.MEAN BOOL TRUE +END + +SYNTH_CAT METADATA + PSASTRO.CATDIR STR SYNTH.GRIZY +END + +TEST_REFCAT METADATA + PSASTRO.CATDIR STR /data/ipp064.0/ipp/ippRefs/catdir.refcat.20120524.v0 +END Index: branches/eam_branches/ipp-20120405/ippconfig/isp/camera.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/isp/camera.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/isp/camera.config (revision 33948) @@ -62,4 +62,5 @@ CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT? CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT? + CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT? CMF.DETEFF STR {CHIP.NAME}.deteff Index: branches/eam_branches/ipp-20120405/ippconfig/lulin/camera.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/lulin/camera.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/lulin/camera.config (revision 33948) @@ -63,4 +63,5 @@ CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT? CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT? + CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT? CMF.DETEFF STR {CHIP.NAME}.deteff Index: branches/eam_branches/ipp-20120405/ippconfig/megacam/camera.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/megacam/camera.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/megacam/camera.config (revision 33948) @@ -137,4 +137,5 @@ CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT? CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT? + CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT? CMF.DETEFF STR {CHIP.NAME}.deteff Index: branches/eam_branches/ipp-20120405/ippconfig/mosaic2/camera.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/mosaic2/camera.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/mosaic2/camera.config (revision 33948) @@ -90,4 +90,5 @@ CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT? CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT? + CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT? CMF.DETEFF STR {CHIP.NAME}.deteff Index: branches/eam_branches/ipp-20120405/ippconfig/recipes/filerules-mef.mdc =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/recipes/filerules-mef.mdc (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/recipes/filerules-mef.mdc (revision 33948) @@ -59,6 +59,8 @@ PPIMAGE.INPUT.SRC INPUT @FILES CHIP CMF PPIMAGE.MASK INPUT @DETDB CHIP MASK +PPIMAGE.VIDEOMASK INPUT @DETDB CHIP MASK PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE PPIMAGE.DARK INPUT @DETDB CHIP DARK +PPIMAGE.VIDEODARK INPUT @DETDB CHIP DARK PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE Index: branches/eam_branches/ipp-20120405/ippconfig/recipes/filerules-simple.mdc =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/recipes/filerules-simple.mdc (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/recipes/filerules-simple.mdc (revision 33948) @@ -23,6 +23,8 @@ PPIMAGE.INPUT.SRC INPUT @FILES READOUT CMF PPIMAGE.MASK INPUT @DETDB CHIP MASK +PPIMAGE.VIDEOMASK INPUT @DETDB CHIP MASK PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE PPIMAGE.DARK INPUT @DETDB CHIP DARK +PPIMAGE.VIDEODARK INPUT @DETDB CHIP DARK PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE Index: branches/eam_branches/ipp-20120405/ippconfig/recipes/filerules-split.mdc =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/recipes/filerules-split.mdc (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/recipes/filerules-split.mdc (revision 33948) @@ -36,4 +36,5 @@ PPIMAGE.INPUT INPUT @FILES CHIP IMAGE PPIMAGE.INPUT.MASK INPUT @FILES CHIP MASK +PPIMAGE.VIDEOMASK INPUT @DETDB CHIP MASK PPIMAGE.INPUT.VARIANCE INPUT @FILES CHIP VARIANCE PPIMAGE.INPUT.PSF INPUT @FILES CHIP PSF @@ -43,4 +44,5 @@ PPIMAGE.NOISEMAP INPUT @DETDB CHIP IMAGE PPIMAGE.DARK INPUT @DETDB CHIP DARK +PPIMAGE.VIDEODARK INPUT @DETDB CHIP DARK PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE Index: branches/eam_branches/ipp-20120405/ippconfig/recipes/ppImage.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/recipes/ppImage.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/recipes/ppImage.config (revision 33948) @@ -153,4 +153,9 @@ GAIN.OVERRIDE BOOL FALSE # Override a non-finite gain? + +# Final detrending options +HAS.VIDEO BOOL FALSE # Treat this OTA as if it has video data +USE.VIDEO.DARK BOOL FALSE # Use a video dark if we have video data? +USE.VIDEO.MASK BOOL FALSE # Use a video mask if we have video data? DETREND.CONSTRAINTS METADATA Index: branches/eam_branches/ipp-20120405/ippconfig/recipes/psastro.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/recipes/psastro.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/recipes/psastro.config (revision 33948) @@ -254,6 +254,11 @@ END -LAP_ASTRO METADATA - +LAP_ASTRO METADATA +END + +SYNTH_CAT METADATA +END + +TEST_REFCAT METADATA END Index: branches/eam_branches/ipp-20120405/ippconfig/recipes/psphot.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/recipes/psphot.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/recipes/psphot.config (revision 33948) @@ -38,4 +38,5 @@ SKY_CLIP_SIGMA F32 2.0 # statistic used to measure background SKY_SIG F32 1.0 # optional sky error for +SKY_SLOPE_MIN F32 3.0 # exit radial profile loop when abs(slope) is less than this # allowed values for SKY_STAT: @@ -57,4 +58,6 @@ PEAKS_POS2_NSIGMA_LIMIT F32 25.0 # peak signficance threshold for POS2 sources. (ppSub) # input pixels contribute less than this fraction of the flux +PEAKS_NMAX_TOTAL S32 0 # maximum allowed number of peaks 0 == unlimited + # parameters which adjust the footprint analysis USE_FOOTPRINTS BOOL TRUE # use new pmFootprint peak packaging @@ -65,4 +68,5 @@ FOOTPRINT_CULL_NSIGMA_MIN F32 1 # Minimum height of colls in units of skyStdev FOOTPRINT_CULL_NSIGMA_PAD F32 0.01 # Fractional Padding for stdev +FOOTPRINT_USE_UNSUBTRACTED BOOL TRUE # find footprints without sources subtracted # parameter for the simple deblending @@ -186,4 +190,9 @@ KRON_ITERATIONS S32 2 +KRON_APPLY_WEIGHT BOOL FALSE +KRON_APPLY_WINDOW BOOL FALSE +KRON_SMOOTH BOOL FALSE +KRON_SMOOTH_SIGMA F32 1.7 +KRON_SMOOTH_NSIGMA S32 2 # Extended source fit parameters @@ -368,4 +377,5 @@ PSF_MODEL STR PS_MODEL_GAUSS EXT_MODEL STR PS_MODEL_QGAUSS + PEAKS_NMAX_TOTAL S32 50000 # maximum allowed number of peaks - To avoid memory explosion END Index: branches/eam_branches/ipp-20120405/ippconfig/recipes/reductionClasses.mdc =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/recipes/reductionClasses.mdc (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/recipes/reductionClasses.mdc (revision 33948) @@ -225,4 +225,29 @@ BACKGROUND_PSWARP STR BACKGROUND END + +DEFAULT_SYNTHCAT METADATA + CHIP_PPIMAGE STR CHIP + CHIP_PSPHOT STR CHIP + WARP_PSWARP STR WARP + STACK_PPSTACK STR STACK + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK + DIFF_PPSUB STR DIFF + DIFF_PSPHOT STR DIFF + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT + ADDSTAR STR ADDSTAR + PSASTRO STR SYNTH_CAT + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND + PSVIDEOPHOT STR PSVIDEOPHOT + STATICSKY_CALIBRATION STR STATICSKY_CAL +END + # Sweetspot reduction class @@ -933,4 +958,28 @@ END +CNP_DATASET METADATA + CHIP_PPIMAGE STR CHIP + CHIP_PSPHOT STR CHIP + WARP_PSWARP STR WARP + STACK_PPSTACK STR STACK + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK + DIFF_PPSUB STR DIFF + DIFF_PSPHOT STR DIFF + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT + ADDSTAR STR ADDSTAR + PSASTRO STR CNP_DATASET + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND + PSVIDEOPHOT STR PSVIDEOPHOT + STATICSKY_CALIBRATION STR STATICSKY_CAL +END + # random user tests (may not be stable or consistent) TEST1 METADATA @@ -952,2 +1001,26 @@ END +TEST_REFCAT METADATA + CHIP_PPIMAGE STR CHIP + CHIP_PSPHOT STR CHIP + WARP_PSWARP STR WARP + STACK_PPSTACK STR STACK + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK + DIFF_PPSUB STR DIFF + DIFF_PSPHOT STR DIFF + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT + ADDSTAR STR ADDSTAR + PSASTRO STR TEST_REFCAT + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND + PSVIDEOPHOT STR PSVIDEOPHOT + STATICSKY_CALIBRATION STR STATICSKY_CAL +END + Index: branches/eam_branches/ipp-20120405/ippconfig/sdssmosaic/camera.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/sdssmosaic/camera.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/sdssmosaic/camera.config (revision 33948) @@ -93,4 +93,5 @@ CMF.XSRC STR cmf.xsrc CMF.XFIT STR cmf.xfit + CMF.XRAD STR cmf.xrad # use .PSF and .EXT? CMF.DETEFF STR cmf.deteff Index: branches/eam_branches/ipp-20120405/ippconfig/simmosaic/camera.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/simmosaic/camera.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/simmosaic/camera.config (revision 33948) @@ -72,4 +72,5 @@ CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT? CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT? + CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT? CMF.DETEFF STR {CHIP.NAME}.deteff Index: branches/eam_branches/ipp-20120405/ippconfig/simple/camera.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/simple/camera.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/simple/camera.config (revision 33948) @@ -58,4 +58,5 @@ CMF.DATA STR psf CMF.XSRC STR xsrc + CMF.XRAD STR xrad CMF.XFIT STR xfit CMF.DETEFF STR deteff Index: branches/eam_branches/ipp-20120405/ippconfig/ssp/camera.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/ssp/camera.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/ssp/camera.config (revision 33948) @@ -59,4 +59,5 @@ CMF.XSRC STR xsrc CMF.XFIT STR xfit + CMF.XRAD STR xrad CMF.DETEFF STR deteff Index: branches/eam_branches/ipp-20120405/ippconfig/ssp/format.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/ssp/format.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/ssp/format.config (revision 33948) @@ -5,4 +5,5 @@ SIMPLE BOOL TRUE ### NAXIS S32 2 + DETECTOR STR rspiusb0 END Index: branches/eam_branches/ipp-20120405/ippconfig/system.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/system.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/system.config (revision 33948) @@ -10,4 +10,5 @@ SDSS STR sdss/camera.config # Sloan Digital Sky Survey GPC1 STR gpc1/camera.config # Pan-STARRS GPC1 + GPC1-TDI STR gpc1-tdi/camera.config # Pan-STARRS GPC1 with TDI guiding ESOWFI STR esowfi/camera.config # ESO Wide-Field Imager LBCRED STR lbc_red/camera.config # Large Binocular Camera Red Index: branches/eam_branches/ipp-20120405/ippconfig/tek/camera.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/tek/camera.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/tek/camera.config (revision 33948) @@ -60,4 +60,5 @@ CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT? CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT? + CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT? CMF.DETEFF STR {CHIP.NAME}.deteff Index: branches/eam_branches/ipp-20120405/ippconfig/uh8k/camera.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/uh8k/camera.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/uh8k/camera.config (revision 33948) @@ -70,4 +70,5 @@ CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT? CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT? + CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT? CMF.DETEFF STR {CHIP.NAME}.deteff Index: branches/eam_branches/ipp-20120405/ippconfig/vysos20/camera.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/vysos20/camera.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/vysos20/camera.config (revision 33948) @@ -63,4 +63,5 @@ CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT? CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT? + CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT? CMF.DETEFF STR {CHIP.NAME}.deteff Index: branches/eam_branches/ipp-20120405/ippconfig/vysos5/camera.config =================================================================== --- branches/eam_branches/ipp-20120405/ippconfig/vysos5/camera.config (revision 33724) +++ branches/eam_branches/ipp-20120405/ippconfig/vysos5/camera.config (revision 33948) @@ -63,4 +63,5 @@ CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT? CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT? + CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT? CMF.DETEFF STR {CHIP.NAME}.deteff