Index: /trunk/ippconfig/dvo.photcodes =================================================================== --- /trunk/ippconfig/dvo.photcodes (revision 41272) +++ /trunk/ippconfig/dvo.photcodes (revision 41273) @@ -192,5 +192,9 @@ 2074 UKIRT.K.04 dep 22.570 0.050 0.000 - - 0.0000 0 8 0.080 0.000 5.000 0.000 0x0000 0x0000 0x0000 0x0000 - 2080 UKIRT_UHS_J ref 0.000 0.000 0.000 - - 0.0000 0 6 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 2080 UKIRT_Z ref 0.000 0.000 0.000 - - 0.0000 0 4 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 2081 UKIRT_Y ref 0.000 0.000 0.000 - - 0.0000 0 5 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 2082 UKIRT_J ref 0.000 0.000 0.000 - - 0.0000 0 6 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 2083 UKIRT_H ref 0.000 0.000 0.000 - - 0.0000 0 7 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 2084 UKIRT_K ref 0.000 0.000 0.000 - - 0.0000 0 8 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 # ICRF QSOs have astrometric error stored in dX,dY as 1/100th mas Index: /trunk/ippconfig/hsc/psphot.config =================================================================== --- /trunk/ippconfig/hsc/psphot.config (revision 41272) +++ /trunk/ippconfig/hsc/psphot.config (revision 41273) @@ -5,6 +5,4 @@ PSF_MODEL STR PS_MODEL_HSC_V1 - - STACKPHOT METADATA Index: /trunk/ippconfig/simtest/format.config =================================================================== --- /trunk/ippconfig/simtest/format.config (revision 41272) +++ /trunk/ippconfig/simtest/format.config (revision 41273) @@ -4,5 +4,5 @@ RULE METADATA INSTRUME STR SIMTEST - TELESCOP STR SimScope + TELESCOP STR SimScope1 # NAXIS S32 2 END @@ -32,5 +32,6 @@ FPA.TELESCOPE STR TELESCOP FPA.INSTRUMENT STR INSTRUME - FPA.OBSTYPE STR OBSTYPE +#FPA.OBSTYPE STR OBSTYPE + FPA.OBSTYPE STR OBS-TYPE FPA.AIRMASS STR AIRMASS FPA.FILTERID STR FILTER @@ -41,5 +42,7 @@ FPA.OBJECT STR OBJECT FPA.OBS.MODE STR OBS_MODE - FPA.TIME STR DATE-OBS UTC-OBS # Date and time +# FPA.TIME STR FOOBIRD # keyword name does not imply format +# FPA.TIME STR DATE-OBS UTC-OBS # Date and time + FPA.TIME STR MJD-OBS # Date and time FPA.EXPOSURE STR EXPTIME FPA.TEMP STR DETTEMP @@ -47,5 +50,6 @@ CELL.EXPOSURE STR EXPTIME CELL.DARKTIME STR DARKTIME - CELL.TIME STR DATE-OBS UTC-OBS # Date and time +# CELL.TIME STR DATE-OBS UTC-OBS # Date and time + CELL.TIME STR MJD-OBS # Date and time CELL.XBIN STR XBIN CELL.YBIN STR YBIN @@ -54,5 +58,6 @@ # Default PS concepts that may be specified by value DEFAULTS METADATA - FPA.TIMESYS STR UTC + FPA.TIMESYS STR TAI # valid values: TAI, UTC, UT1, TT (JD, MJD require TAI) +# FPA.TIMESYS STR UTC # valid values: TAI, UTC, UT1, TT (JD, MJD require TAI) FPA.RADECSYS STR ICRS FPA.DETECTOR STR SIMTEST @@ -63,5 +68,6 @@ CELL.BAD F32 0 CELL.READDIR S32 1 - CELL.TIMESYS STR UTC + CELL.TIMESYS STR TAI # valid values: TAI, UTC, UT1, TT (JD, MJD require TAI) +# CELL.TIMESYS STR UTC # valid values: TAI, UTC, UT1, TT (JD, MJD require TAI) CELL.XPARITY S32 1 CELL.YPARITY S32 1 @@ -83,5 +89,39 @@ FPA.RA STR HOURS FPA.DEC STR DEGREES - FPA.TIME STR SEPARATE,YEAR.FIRST - CELL.TIME STR SEPARATE,YEAR.FIRST +#FPA.TIME STR SEPARATE,YEAR.FIRST +#CELL.TIME STR SEPARATE,YEAR.FIRST +FPA.TIME STR MJD +CELL.TIME STR MJD END + +# note that the time keyword name and format must match that defined in dvo.config + +# Notes on Time formats and related: + +# TRANSLATION:FPA.TIME : this defines the keywords in the input and output headers which +# store the time of observation. Note: the name of the keywords do not imply anything about the format +# Note: if the "separate" style of format is used, two keywords must be supplied (and vice versa) + +# DEFAULTS:FPA.TIMESYS : this defines the time system (TAI, UTC, UT1, TT) that the header time represents + +# FORMATS:FPA.TIME : this specifies the format in which the time information is written to the header +# valid values are: +# YYYYMMDD, MMDDYYYY, DDMMYYYY (these define the order of year, month, day in the output) +# (note that the output formats have dashes between year, month, day; input formats may have +# dashes or slashes) +# ISO : e.g., 2010-09-01T00:00:00.000000 +# YEAR.FIRST (synonym for YYYYMMDD) +# USA (synonmy for MMDDYYYY) +# BACKWARDS (synonym for DDMMYYYY) +# MJD +# JD +# optional SEPARATE style: if the FPA.TIME value includes SEPARATE (comma-separated from the rest), then +# the date and time will be written to two keywords (date keyword first) +# WARNING: if SEPARATE is specified and only 1 keyword supplied, the output will silently ignore +# the time output +# options PRE2000 style: (comma-separated) : treats year as 2-digit year in 20th century (needed for old headers) + +# If FPA.TIME & CELL.TIME are both specified, CELL.TIME will be used +# If only FPA.TIME is specified, it will be used +# +# Simtest output headers have information defined by Index: /trunk/ippconfig/simtest/psphot.config =================================================================== --- /trunk/ippconfig/simtest/psphot.config (revision 41272) +++ /trunk/ippconfig/simtest/psphot.config (revision 41273) @@ -17,2 +17,58 @@ END END + +GALAXY_TEST METADATA + # Extended source fit parameters + # these models are used for high-quality shape analysis after all sources have been removed + SAVE.RESID BOOL T + + EXTENDED_SOURCE_FITS BOOL TRUE # perform the detailed extended sourc fits? + EXT_MODEL STR PS_MODEL_QGAUSS + PSF_MODEL STR PS_MODEL_PS1_V1 + + EXTENDED_SOURCE_SN_LIM F32 5.0 + + LMM_FIT_CHISQ_CONVERGENCE BOOL FALSE # use the (old) chisq convergence or the new parameter one + LMM_FIT_GAIN_FACTOR_MODE S32 2 # there are 3 options to determine the gain factor (0,1,2) + EXT_FIT_MIN_TOL F32 0.1 # Fit tolerance for EXT + + # XXX these are only needed if we want to get perfect fits of the synthetic data + PSF_FIT_RADIUS_SCALE F32 3.75 + EXT_FIT_NSIGMA_CONV F32 11 + PSF.RESIDUALS BOOL F + + # if this is defined, it gives a list of the model names to fit below (ALL or NONE are also valid) + EXTENDED_SOURCE_MODELS_SELECTION STR NONE + + # extended source models applied to sources + EXTENDED_SOURCE_MODELS METADATA + TYPE EXTENDED_SOURCE_MODEL MODEL SNLIM PSF_CONVOLVED + EXP_CONV EXTENDED_SOURCE_MODEL PS_MODEL_EXP 3.0 TRUE + DEV_CONV EXTENDED_SOURCE_MODEL PS_MODEL_DEV 3.0 TRUE + SER_CONV EXTENDED_SOURCE_MODEL PS_MODEL_SERSIC 3.0 TRUE + GAU_CONV EXTENDED_SOURCE_MODEL PS_MODEL_GAUSS 3.0 TRUE + PGA_CONV EXTENDED_SOURCE_MODEL PS_MODEL_PGAUSS 3.0 TRUE + QGA_CONV EXTENDED_SOURCE_MODEL PS_MODEL_QGAUSS 3.0 TRUE + PS1_CONV EXTENDED_SOURCE_MODEL PS_MODEL_PS1_V1 3.0 TRUE + + EXP_RAW EXTENDED_SOURCE_MODEL PS_MODEL_EXP 10.0 FALSE + DEV_RAW EXTENDED_SOURCE_MODEL PS_MODEL_DEV 10.0 FALSE + SER_RAW EXTENDED_SOURCE_MODEL PS_MODEL_SERSIC 10.0 FALSE + GAU_RAW EXTENDED_SOURCE_MODEL PS_MODEL_GAUSS 10.0 FALSE + PGA_RAW EXTENDED_SOURCE_MODEL PS_MODEL_PGAUSS 10.0 FALSE + QGA_RAW EXTENDED_SOURCE_MODEL PS_MODEL_QGAUSS 10.0 FALSE + PS1_RAW EXTENDED_SOURCE_MODEL PS_MODEL_PS1_V1 10.0 FALSE + END + + EXT.ANALYSIS.MAG.LIMITS METADATA + TYPE DATA FILTER.ID MAG.LIMIT.PETRO MAG.LIMIT.EXTFIT + gband DATA g 25 NAN + rband DATA r 25 NAN + iband DATA i 25 NAN + zband DATA z 25 NAN + yband DATA y 25 NAN + wband DATA w 25 NAN + other DATA any 25 NAN + END +END +