Index: /trunk/ippconfig/.cvsignore =================================================================== --- /trunk/ippconfig/.cvsignore (revision 11573) +++ /trunk/ippconfig/.cvsignore (revision 11573) @@ -0,0 +1,12 @@ +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure +dvo.site +install-sh +ippconfig-0.0.1.tar.bz2 +ippconfig-0.0.1.tar.gz +missing Index: /trunk/ippconfig/Makefile.am =================================================================== --- /trunk/ippconfig/Makefile.am (revision 11572) +++ /trunk/ippconfig/Makefile.am (revision 11573) @@ -116,8 +116,17 @@ ippconfig_DATA = $(config_files) +dvoconfigdir = $(datadir)/ippconfig +dvo_files = \ + dvo.photcodes \ + dvo.cameras/ISP-Apogee.config + +dvoconfig_DATA = $(dvo_files) dvo.site + install-data-hook: chmod 0755 $(ippconfigdir) -EXTRA_DIST = $(config_files) +EXTRA_DIST = $(config_files) $(dvo_files) dvo.site.in + +BUILT_SOURCES = dvo.site ACLOCAL_AMFLAGS = -I m4 Index: /trunk/ippconfig/configure.ac =================================================================== --- /trunk/ippconfig/configure.ac (revision 11572) +++ /trunk/ippconfig/configure.ac (revision 11573) @@ -9,6 +9,10 @@ AC_PROG_INSTALL +IPP_CONFIG_DIR="${datadir}/ippconfig" +AC_SUBST(IPP_CONFIG_DIR) + AC_CONFIG_FILES([ Makefile + dvo.site ]) AC_OUTPUT Index: /trunk/ippconfig/dvo.cameras/ISP-Apogee.config =================================================================== --- /trunk/ippconfig/dvo.cameras/ISP-Apogee.config (revision 11573) +++ /trunk/ippconfig/dvo.cameras/ISP-Apogee.config (revision 11573) @@ -0,0 +1,44 @@ + +# location of DVO database tables +CATDIR /data/alala/eugene/isp/catdir + +# keywords used by DVO to interpret the headers + +# used by parse_time to find time-related keywords +MJD-KEYWORD MJD-OBS +DATE-KEYWORD NONE +DATE-MODE NONE +UT-KEYWORD NONE +JD-KEYWORD NONE + +# other keyword abstractions +EXPTIME-KEYWORD EXPTIME +AIRMASS-KEYWORD AIRMASS +CCDNUM-KEYWORD EXTNAME +ST-KEYWORD NONE +OBSERVATORY-LATITUDE NONE +OBSERVATORY-LONGITUDE NONE +SUBPIX_DATAFILE NONE + +# instrumental magnitude range for calibration mode +CAL_INSTMAG_MAX 0 +CAL_INSTMAG_MIN 0 + +# exclude overscan region from the dB image boundaries +XOVERSCAN 0 +YOVERSCAN 0 + +# only upload stars within region; a value of 0 means ignore the limit +ADDSTAR_XMIN 0 +ADDSTAR_XMAX 0 +ADDSTAR_YMIN 0 +ADDSTAR_YMAX 0 + +# exclude stars with SN > SNLIMIT (ADDSTAR_SNLIMIT overrides old name MIN_SN_FSTAT) +ADDSTAR_SNLIMIT 0 + +# correlation radius (arcseconds) +ADDSTAR_RADIUS 20 + +# scaled correlation radius +ADDSTAR_NSIGMA 0 Index: /trunk/ippconfig/dvo.photcodes =================================================================== --- /trunk/ippconfig/dvo.photcodes (revision 11573) +++ /trunk/ippconfig/dvo.photcodes (revision 11573) @@ -0,0 +1,407 @@ + +# this file contains the list of valid photometry codes. there should +# be one code for each combination of CCD, filter, and telescope (and +# possibly additional ones if filter transmission reduces with time). +# The code on each line is a unique number, while the name is a +# representative name. The type defines how the photometry is +# treated. There can only be one primary photcode. There should only +# be a few secondary photcodes: these are the calibrated values for +# stars. The dependent photcodes are those which are equivalent to a +# primary or secondary photcode, and are equated after photometric +# solutions. Reference photcodes are for anything without a dynamic +# solution: the reference values are provided externally. + +# camera ranges used in this file: +# megacam: u: 100-139, g: 200-239, r: 300-339, i: 400-439, z: 500-539 +# cfh12k: B: 140-152, V: 240-252, R: 340-352, I: 440-452, Z: 540-552, + +# code name type zero airmass offset c1 c2 slope equivalence + 1 g pri 0.0 - - 1003 1004 0.016 - 1 + 2 r sec 0.0 - - 1003 1004 0.008 - 2 + 3 i sec 0.0 - - 1003 1004 0.028 - 3 + 4 z sec 0.0 - - 1003 1004 0.107 - 4 + 5 y sec 0.0 - - - - - - 5 + + 1050 u_SDSS ref - - - - - - - - + 1051 g_SDSS ref - - - - - - - - + 1052 r_SDSS ref - - - - - - - - + 1053 i_SDSS ref - - - - - - - - + 1054 z_SDSS ref - - - - - - - - + + 1002 U_L92 ref - - - - - - - - + 1003 B_L92 ref - - - - - - - - + 1004 V_L92 ref - - - - - - - - + 1005 R_L92 ref - - - - - - - - + 1007 I_L92 ref - - - - - - - - + + 1012 U_STET ref - - - - - - - - + 1013 B_STET ref - - - - - - - - + 1014 V_STET ref - - - - - - - - + 1015 R_STET ref - - - - - - - - + 1017 I_STET ref - - - - - - - - + + 1000 USNO_BLUE ref - - - - - - - - + 1001 USNO_RED ref - - - - - - - - + + 1100 GSC ref - - - - - - - - + + 1200 TYCHO_B ref - - - - - - - - + 1201 TYCHO_V ref - - - - - - - - + + 2011 2MASS_J ref - - - - - - - - + 2012 2MASS_H ref - - - - - - - - + 2013 2MASS_K ref - - - - - - - - + +### megacam photcodes: + 100 MEGACAM.u.00 dep 25.280 -0.35 - - - - - 1 + 101 MEGACAM.u.01 dep 25.280 -0.35 - - - - - 1 + 102 MEGACAM.u.02 dep 25.280 -0.35 - - - - - 1 + 103 MEGACAM.u.03 dep 25.280 -0.35 - - - - - 1 + 104 MEGACAM.u.04 dep 25.280 -0.35 - - - - - 1 + 105 MEGACAM.u.05 dep 25.280 -0.35 - - - - - 1 + 106 MEGACAM.u.06 dep 25.280 -0.35 - - - - - 1 + 107 MEGACAM.u.07 dep 25.280 -0.35 - - - - - 1 + 108 MEGACAM.u.08 dep 25.280 -0.35 - - - - - 1 + 109 MEGACAM.u.09 dep 25.280 -0.35 - - - - - 1 + 110 MEGACAM.u.10 dep 25.280 -0.35 - - - - - 1 + 111 MEGACAM.u.11 dep 25.280 -0.35 - - - - - 1 + 112 MEGACAM.u.12 dep 25.280 -0.35 - - - - - 1 + 113 MEGACAM.u.13 dep 25.280 -0.35 - - - - - 1 + 114 MEGACAM.u.14 dep 25.280 -0.35 - - - - - 1 + 115 MEGACAM.u.15 dep 25.280 -0.35 - - - - - 1 + 116 MEGACAM.u.16 dep 25.280 -0.35 - - - - - 1 + 117 MEGACAM.u.17 dep 25.280 -0.35 - - - - - 1 + 118 MEGACAM.u.18 dep 25.280 -0.35 - - - - - 1 + 119 MEGACAM.u.19 dep 25.280 -0.35 - - - - - 1 + 120 MEGACAM.u.20 dep 25.280 -0.35 - - - - - 1 + 121 MEGACAM.u.21 dep 25.280 -0.35 - - - - - 1 + 122 MEGACAM.u.22 dep 25.280 -0.35 - - - - - 1 + 123 MEGACAM.u.23 dep 25.280 -0.35 - - - - - 1 + 124 MEGACAM.u.24 dep 25.280 -0.35 - - - - - 1 + 125 MEGACAM.u.25 dep 25.280 -0.35 - - - - - 1 + 126 MEGACAM.u.26 dep 25.280 -0.35 - - - - - 1 + 127 MEGACAM.u.27 dep 25.280 -0.35 - - - - - 1 + 128 MEGACAM.u.28 dep 25.280 -0.35 - - - - - 1 + 129 MEGACAM.u.29 dep 25.280 -0.35 - - - - - 1 + 130 MEGACAM.u.30 dep 25.280 -0.35 - - - - - 1 + 131 MEGACAM.u.31 dep 25.280 -0.35 - - - - - 1 + 132 MEGACAM.u.32 dep 25.280 -0.35 - - - - - 1 + 133 MEGACAM.u.33 dep 25.280 -0.35 - - - - - 1 + 134 MEGACAM.u.34 dep 25.280 -0.35 - - - - - 1 + 135 MEGACAM.u.35 dep 25.280 -0.35 - - - - - 1 + 136 MEGACAM.u.36 dep 25.280 -0.35 - - - - - 1 + 137 MEGACAM.u.37 dep 25.280 -0.35 - - - - - 1 + 138 MEGACAM.u.38 dep 25.280 -0.35 - - - - - 1 + 139 MEGACAM.u.39 dep 25.280 -0.35 - - - - - 1 + + 200 MEGACAM.g.00 dep 26.460 -0.15 - - - - - 2 + 201 MEGACAM.g.01 dep 26.460 -0.15 - - - - - 2 + 202 MEGACAM.g.02 dep 26.460 -0.15 - - - - - 2 + 203 MEGACAM.g.03 dep 26.460 -0.15 - - - - - 2 + 204 MEGACAM.g.04 dep 26.460 -0.15 - - - - - 2 + 205 MEGACAM.g.05 dep 26.460 -0.15 - - - - - 2 + 206 MEGACAM.g.06 dep 26.460 -0.15 - - - - - 2 + 207 MEGACAM.g.07 dep 26.460 -0.15 - - - - - 2 + 208 MEGACAM.g.08 dep 26.460 -0.15 - - - - - 2 + 209 MEGACAM.g.09 dep 26.460 -0.15 - - - - - 2 + 210 MEGACAM.g.10 dep 26.460 -0.15 - - - - - 2 + 211 MEGACAM.g.11 dep 26.460 -0.15 - - - - - 2 + 212 MEGACAM.g.12 dep 26.460 -0.15 - - - - - 2 + 213 MEGACAM.g.13 dep 26.460 -0.15 - - - - - 2 + 214 MEGACAM.g.14 dep 26.460 -0.15 - - - - - 2 + 215 MEGACAM.g.15 dep 26.460 -0.15 - - - - - 2 + 216 MEGACAM.g.16 dep 26.460 -0.15 - - - - - 2 + 217 MEGACAM.g.17 dep 26.460 -0.15 - - - - - 2 + 218 MEGACAM.g.18 dep 26.460 -0.15 - - - - - 2 + 219 MEGACAM.g.19 dep 26.460 -0.15 - - - - - 2 + 220 MEGACAM.g.20 dep 26.460 -0.15 - - - - - 2 + 221 MEGACAM.g.21 dep 26.460 -0.15 - - - - - 2 + 222 MEGACAM.g.22 dep 26.460 -0.15 - - - - - 2 + 223 MEGACAM.g.23 dep 26.460 -0.15 - - - - - 2 + 224 MEGACAM.g.24 dep 26.460 -0.15 - - - - - 2 + 225 MEGACAM.g.25 dep 26.460 -0.15 - - - - - 2 + 226 MEGACAM.g.26 dep 26.460 -0.15 - - - - - 2 + 227 MEGACAM.g.27 dep 26.460 -0.15 - - - - - 2 + 228 MEGACAM.g.28 dep 26.460 -0.15 - - - - - 2 + 229 MEGACAM.g.29 dep 26.460 -0.15 - - - - - 2 + 230 MEGACAM.g.30 dep 26.460 -0.15 - - - - - 2 + 231 MEGACAM.g.31 dep 26.460 -0.15 - - - - - 2 + 232 MEGACAM.g.32 dep 26.460 -0.15 - - - - - 2 + 233 MEGACAM.g.33 dep 26.460 -0.15 - - - - - 2 + 234 MEGACAM.g.34 dep 26.460 -0.15 - - - - - 2 + 235 MEGACAM.g.35 dep 26.460 -0.15 - - - - - 2 + 236 MEGACAM.g.36 dep 26.460 -0.15 - - - - - 2 + 237 MEGACAM.g.37 dep 26.460 -0.15 - - - - - 2 + 238 MEGACAM.g.38 dep 26.460 -0.15 - - - - - 2 + 239 MEGACAM.g.39 dep 26.460 -0.15 - - - - - 2 + + 300 MEGACAM.r.00 dep 25.978 -0.10 - - - - - 3 + 301 MEGACAM.r.01 dep 25.978 -0.10 - - - - - 3 + 302 MEGACAM.r.02 dep 25.978 -0.10 - - - - - 3 + 303 MEGACAM.r.03 dep 25.978 -0.10 - - - - - 3 + 304 MEGACAM.r.04 dep 25.978 -0.10 - - - - - 3 + 305 MEGACAM.r.05 dep 25.978 -0.10 - - - - - 3 + 306 MEGACAM.r.06 dep 25.978 -0.10 - - - - - 3 + 307 MEGACAM.r.07 dep 25.978 -0.10 - - - - - 3 + 308 MEGACAM.r.08 dep 25.978 -0.10 - - - - - 3 + 309 MEGACAM.r.09 dep 25.978 -0.10 - - - - - 3 + 310 MEGACAM.r.10 dep 25.978 -0.10 - - - - - 3 + 311 MEGACAM.r.11 dep 25.978 -0.10 - - - - - 3 + 312 MEGACAM.r.12 dep 25.978 -0.10 - - - - - 3 + 313 MEGACAM.r.13 dep 25.978 -0.10 - - - - - 3 + 314 MEGACAM.r.14 dep 25.978 -0.10 - - - - - 3 + 315 MEGACAM.r.15 dep 25.978 -0.10 - - - - - 3 + 316 MEGACAM.r.16 dep 25.978 -0.10 - - - - - 3 + 317 MEGACAM.r.17 dep 25.978 -0.10 - - - - - 3 + 318 MEGACAM.r.18 dep 25.978 -0.10 - - - - - 3 + 319 MEGACAM.r.19 dep 25.978 -0.10 - - - - - 3 + 320 MEGACAM.r.20 dep 25.978 -0.10 - - - - - 3 + 321 MEGACAM.r.21 dep 25.978 -0.10 - - - - - 3 + 322 MEGACAM.r.22 dep 25.978 -0.10 - - - - - 3 + 323 MEGACAM.r.23 dep 25.978 -0.10 - - - - - 3 + 324 MEGACAM.r.24 dep 25.978 -0.10 - - - - - 3 + 325 MEGACAM.r.25 dep 25.978 -0.10 - - - - - 3 + 326 MEGACAM.r.26 dep 25.978 -0.10 - - - - - 3 + 327 MEGACAM.r.27 dep 25.978 -0.10 - - - - - 3 + 328 MEGACAM.r.28 dep 25.978 -0.10 - - - - - 3 + 329 MEGACAM.r.29 dep 25.978 -0.10 - - - - - 3 + 330 MEGACAM.r.30 dep 25.978 -0.10 - - - - - 3 + 331 MEGACAM.r.31 dep 25.978 -0.10 - - - - - 3 + 332 MEGACAM.r.32 dep 25.978 -0.10 - - - - - 3 + 333 MEGACAM.r.33 dep 25.978 -0.10 - - - - - 3 + 334 MEGACAM.r.34 dep 25.978 -0.10 - - - - - 3 + 335 MEGACAM.r.35 dep 25.978 -0.10 - - - - - 3 + 336 MEGACAM.r.36 dep 25.978 -0.10 - - - - - 3 + 337 MEGACAM.r.37 dep 25.978 -0.10 - - - - - 3 + 338 MEGACAM.r.38 dep 25.978 -0.10 - - - - - 3 + 339 MEGACAM.r.39 dep 25.978 -0.10 - - - - - 3 + + 400 MEGACAM.i.00 dep 25.744 -0.04 - - - - - 4 + 401 MEGACAM.i.01 dep 25.744 -0.04 - - - - - 4 + 402 MEGACAM.i.02 dep 25.744 -0.04 - - - - - 4 + 403 MEGACAM.i.03 dep 25.744 -0.04 - - - - - 4 + 404 MEGACAM.i.04 dep 25.744 -0.04 - - - - - 4 + 405 MEGACAM.i.05 dep 25.744 -0.04 - - - - - 4 + 406 MEGACAM.i.06 dep 25.744 -0.04 - - - - - 4 + 407 MEGACAM.i.07 dep 25.744 -0.04 - - - - - 4 + 408 MEGACAM.i.08 dep 25.744 -0.04 - - - - - 4 + 409 MEGACAM.i.09 dep 25.744 -0.04 - - - - - 4 + 410 MEGACAM.i.10 dep 25.744 -0.04 - - - - - 4 + 411 MEGACAM.i.11 dep 25.744 -0.04 - - - - - 4 + 412 MEGACAM.i.12 dep 25.744 -0.04 - - - - - 4 + 413 MEGACAM.i.13 dep 25.744 -0.04 - - - - - 4 + 414 MEGACAM.i.14 dep 25.744 -0.04 - - - - - 4 + 415 MEGACAM.i.15 dep 25.744 -0.04 - - - - - 4 + 416 MEGACAM.i.16 dep 25.744 -0.04 - - - - - 4 + 417 MEGACAM.i.17 dep 25.744 -0.04 - - - - - 4 + 418 MEGACAM.i.18 dep 25.744 -0.04 - - - - - 4 + 419 MEGACAM.i.19 dep 25.744 -0.04 - - - - - 4 + 420 MEGACAM.i.20 dep 25.744 -0.04 - - - - - 4 + 421 MEGACAM.i.21 dep 25.744 -0.04 - - - - - 4 + 422 MEGACAM.i.22 dep 25.744 -0.04 - - - - - 4 + 423 MEGACAM.i.23 dep 25.744 -0.04 - - - - - 4 + 424 MEGACAM.i.24 dep 25.744 -0.04 - - - - - 4 + 425 MEGACAM.i.25 dep 25.744 -0.04 - - - - - 4 + 426 MEGACAM.i.26 dep 25.744 -0.04 - - - - - 4 + 427 MEGACAM.i.27 dep 25.744 -0.04 - - - - - 4 + 428 MEGACAM.i.28 dep 25.744 -0.04 - - - - - 4 + 429 MEGACAM.i.29 dep 25.744 -0.04 - - - - - 4 + 430 MEGACAM.i.30 dep 25.744 -0.04 - - - - - 4 + 431 MEGACAM.i.31 dep 25.744 -0.04 - - - - - 4 + 432 MEGACAM.i.32 dep 25.744 -0.04 - - - - - 4 + 433 MEGACAM.i.33 dep 25.744 -0.04 - - - - - 4 + 434 MEGACAM.i.34 dep 25.744 -0.04 - - - - - 4 + 435 MEGACAM.i.35 dep 25.744 -0.04 - - - - - 4 + 436 MEGACAM.i.36 dep 25.744 -0.04 - - - - - 4 + 437 MEGACAM.i.37 dep 25.744 -0.04 - - - - - 4 + 438 MEGACAM.i.38 dep 25.744 -0.04 - - - - - 4 + 439 MEGACAM.i.39 dep 25.744 -0.04 - - - - - 4 + + 500 MEGACAM.z.00 dep 24.800 -0.03 - - - - - 5 + 501 MEGACAM.z.01 dep 24.800 -0.03 - - - - - 5 + 502 MEGACAM.z.02 dep 24.800 -0.03 - - - - - 5 + 503 MEGACAM.z.03 dep 24.800 -0.03 - - - - - 5 + 504 MEGACAM.z.04 dep 24.800 -0.03 - - - - - 5 + 505 MEGACAM.z.05 dep 24.800 -0.03 - - - - - 5 + 506 MEGACAM.z.06 dep 24.800 -0.03 - - - - - 5 + 507 MEGACAM.z.07 dep 24.800 -0.03 - - - - - 5 + 508 MEGACAM.z.08 dep 24.800 -0.03 - - - - - 5 + 509 MEGACAM.z.09 dep 24.800 -0.03 - - - - - 5 + 510 MEGACAM.z.10 dep 24.800 -0.03 - - - - - 5 + 511 MEGACAM.z.11 dep 24.800 -0.03 - - - - - 5 + 512 MEGACAM.z.12 dep 24.800 -0.03 - - - - - 5 + 513 MEGACAM.z.13 dep 24.800 -0.03 - - - - - 5 + 514 MEGACAM.z.14 dep 24.800 -0.03 - - - - - 5 + 515 MEGACAM.z.15 dep 24.800 -0.03 - - - - - 5 + 516 MEGACAM.z.16 dep 24.800 -0.03 - - - - - 5 + 517 MEGACAM.z.17 dep 24.800 -0.03 - - - - - 5 + 518 MEGACAM.z.18 dep 24.800 -0.03 - - - - - 5 + 519 MEGACAM.z.19 dep 24.800 -0.03 - - - - - 5 + 520 MEGACAM.z.20 dep 24.800 -0.03 - - - - - 5 + 521 MEGACAM.z.21 dep 24.800 -0.03 - - - - - 5 + 522 MEGACAM.z.22 dep 24.800 -0.03 - - - - - 5 + 523 MEGACAM.z.23 dep 24.800 -0.03 - - - - - 5 + 524 MEGACAM.z.24 dep 24.800 -0.03 - - - - - 5 + 525 MEGACAM.z.25 dep 24.800 -0.03 - - - - - 5 + 526 MEGACAM.z.26 dep 24.800 -0.03 - - - - - 5 + 527 MEGACAM.z.27 dep 24.800 -0.03 - - - - - 5 + 528 MEGACAM.z.28 dep 24.800 -0.03 - - - - - 5 + 529 MEGACAM.z.29 dep 24.800 -0.03 - - - - - 5 + 530 MEGACAM.z.30 dep 24.800 -0.03 - - - - - 5 + 531 MEGACAM.z.31 dep 24.800 -0.03 - - - - - 5 + 532 MEGACAM.z.32 dep 24.800 -0.03 - - - - - 5 + 533 MEGACAM.z.33 dep 24.800 -0.03 - - - - - 5 + 534 MEGACAM.z.34 dep 24.800 -0.03 - - - - - 5 + 535 MEGACAM.z.35 dep 24.800 -0.03 - - - - - 5 + 536 MEGACAM.z.36 dep 24.800 -0.03 - - - - - 5 + 537 MEGACAM.z.37 dep 24.800 -0.03 - - - - - 5 + 538 MEGACAM.z.38 dep 24.800 -0.03 - - - - - 5 + 539 MEGACAM.z.39 dep 24.800 -0.03 - - - - - 5 + +# cfh12k photcodes + 140 CFH12K.B.00 dep 26.000 -0.15 - - - - - 1 + 141 CFH12K.B.01 dep 26.000 -0.15 - - - - - 1 + 142 CFH12K.B.02 dep 26.000 -0.15 - - - - - 1 + 143 CFH12K.B.03 dep 26.000 -0.15 - - - - - 1 + 144 CFH12K.B.04 dep 26.000 -0.15 - - - - - 1 + 145 CFH12K.B.05 dep 26.000 -0.15 - - - - - 1 + 146 CFH12K.B.06 dep 26.000 -0.15 - - - - - 1 + 147 CFH12K.B.07 dep 26.000 -0.15 - - - - - 1 + 148 CFH12K.B.08 dep 26.000 -0.15 - - - - - 1 + 149 CFH12K.B.09 dep 26.000 -0.15 - - - - - 1 + 150 CFH12K.B.10 dep 26.000 -0.15 - - - - - 1 + 151 CFH12K.B.11 dep 26.000 -0.15 - - - - - 1 + + 240 CFH12K.V.00 dep 26.150 -0.12 - - - - - 2 + 241 CFH12K.V.01 dep 26.150 -0.12 - - - - - 2 + 242 CFH12K.V.02 dep 26.150 -0.12 - - - - - 2 + 243 CFH12K.V.03 dep 26.150 -0.12 - - - - - 2 + 244 CFH12K.V.04 dep 26.150 -0.12 - - - - - 2 + 245 CFH12K.V.05 dep 26.150 -0.12 - - - - - 2 + 246 CFH12K.V.06 dep 26.150 -0.12 - - - - - 2 + 247 CFH12K.V.07 dep 26.150 -0.12 - - - - - 2 + 248 CFH12K.V.08 dep 26.150 -0.12 - - - - - 2 + 249 CFH12K.V.09 dep 26.150 -0.12 - - - - - 2 + 250 CFH12K.V.10 dep 26.150 -0.12 - - - - - 2 + 251 CFH12K.V.11 dep 26.150 -0.12 - - - - - 2 + + 340 CFH12K.R.00 dep 26.190 -0.09 - - - - - 3 + 341 CFH12K.R.01 dep 26.190 -0.09 - - - - - 3 + 342 CFH12K.R.02 dep 26.190 -0.09 - - - - - 3 + 343 CFH12K.R.03 dep 26.190 -0.09 - - - - - 3 + 344 CFH12K.R.04 dep 26.190 -0.09 - - - - - 3 + 345 CFH12K.R.05 dep 26.190 -0.09 - - - - - 3 + 346 CFH12K.R.06 dep 26.190 -0.09 - - - - - 3 + 347 CFH12K.R.07 dep 26.190 -0.09 - - - - - 3 + 348 CFH12K.R.08 dep 26.190 -0.09 - - - - - 3 + 349 CFH12K.R.09 dep 26.190 -0.09 - - - - - 3 + 350 CFH12K.R.10 dep 26.190 -0.09 - - - - - 3 + 351 CFH12K.R.11 dep 26.190 -0.09 - - - - - 3 + + 440 CFH12K.I.00 dep 26.135 -0.04 - - - - - 4 + 441 CFH12K.I.01 dep 26.135 -0.04 - - - - - 4 + 442 CFH12K.I.02 dep 26.135 -0.04 - - - - - 4 + 443 CFH12K.I.03 dep 26.135 -0.04 - - - - - 4 + 444 CFH12K.I.04 dep 26.135 -0.04 - - - - - 4 + 445 CFH12K.I.05 dep 26.135 -0.04 - - - - - 4 + 446 CFH12K.I.06 dep 26.135 -0.04 - - - - - 4 + 447 CFH12K.I.07 dep 26.135 -0.04 - - - - - 4 + 448 CFH12K.I.08 dep 26.135 -0.04 - - - - - 4 + 449 CFH12K.I.09 dep 26.135 -0.04 - - - - - 4 + 450 CFH12K.I.10 dep 26.135 -0.04 - - - - - 4 + 451 CFH12K.I.11 dep 26.135 -0.04 - - - - - 4 + + 540 CFH12K.Z.00 dep 25.83 -0.03 - - - - - 5 + 541 CFH12K.Z.01 dep 25.83 -0.03 - - - - - 5 + 542 CFH12K.Z.02 dep 25.83 -0.03 - - - - - 5 + 543 CFH12K.Z.03 dep 25.83 -0.03 - - - - - 5 + 544 CFH12K.Z.04 dep 25.83 -0.03 - - - - - 5 + 545 CFH12K.Z.05 dep 25.83 -0.03 - - - - - 5 + 546 CFH12K.Z.06 dep 25.83 -0.03 - - - - - 5 + 547 CFH12K.Z.07 dep 25.83 -0.03 - - - - - 5 + 548 CFH12K.Z.08 dep 25.83 -0.03 - - - - - 5 + 549 CFH12K.Z.09 dep 25.83 -0.03 - - - - - 5 + 550 CFH12K.Z.10 dep 25.83 -0.03 - - - - - 5 + 551 CFH12K.Z.11 dep 25.83 -0.03 - - - - - 5 + + 600 CFH12K.Ha.00 dep 25.000 0.04 - - - - - 5 + 601 CFH12K.Ha.01 dep 25.000 0.04 - - - - - 5 + 602 CFH12K.Ha.02 dep 25.000 0.04 - - - - - 5 + 603 CFH12K.Ha.03 dep 25.000 0.04 - - - - - 5 + 604 CFH12K.Ha.04 dep 25.000 0.04 - - - - - 5 + 605 CFH12K.Ha.05 dep 25.000 0.04 - - - - - 5 + 606 CFH12K.Ha.06 dep 25.000 0.04 - - - - - 5 + 607 CFH12K.Ha.07 dep 25.000 0.04 - - - - - 5 + 608 CFH12K.Ha.08 dep 25.000 0.04 - - - - - 5 + 609 CFH12K.Ha.09 dep 25.000 0.04 - - - - - 5 + 610 CFH12K.Ha.10 dep 25.000 0.04 - - - - - 5 + 611 CFH12K.Ha.11 dep 25.000 0.04 - - - - - 5 + + 600 CFH12K.HaOff.00 dep 25.000 0.04 - - - - - 5 + 601 CFH12K.HaOff.01 dep 25.000 0.04 - - - - - 5 + 602 CFH12K.HaOff.02 dep 25.000 0.04 - - - - - 5 + 603 CFH12K.HaOff.03 dep 25.000 0.04 - - - - - 5 + 604 CFH12K.HaOff.04 dep 25.000 0.04 - - - - - 5 + 605 CFH12K.HaOff.05 dep 25.000 0.04 - - - - - 5 + 606 CFH12K.HaOff.06 dep 25.000 0.04 - - - - - 5 + 607 CFH12K.HaOff.07 dep 25.000 0.04 - - - - - 5 + 608 CFH12K.HaOff.08 dep 25.000 0.04 - - - - - 5 + 609 CFH12K.HaOff.09 dep 25.000 0.04 - - - - - 5 + 610 CFH12K.HaOff.10 dep 25.000 0.04 - - - - - 5 + 611 CFH12K.HaOff.11 dep 25.000 0.04 - - - - - 5 + 612 CFH12K.CN.00 dep 25.000 0.04 - - - - - 5 + 613 CFH12K.CN.01 dep 25.000 0.04 - - - - - 5 + 614 CFH12K.CN.02 dep 25.000 0.04 - - - - - 5 + 615 CFH12K.CN.03 dep 25.000 0.04 - - - - - 5 + 616 CFH12K.CN.04 dep 25.000 0.04 - - - - - 5 + 617 CFH12K.CN.05 dep 25.000 0.04 - - - - - 5 + 618 CFH12K.CN.06 dep 25.000 0.04 - - - - - 5 + 619 CFH12K.CN.07 dep 25.000 0.04 - - - - - 5 + 620 CFH12K.CN.08 dep 25.000 0.04 - - - - - 5 + 621 CFH12K.CN.09 dep 25.000 0.04 - - - - - 5 + 622 CFH12K.CN.10 dep 25.000 0.04 - - - - - 5 + 623 CFH12K.CN.11 dep 25.000 0.04 - - - - - 5 + 624 CFH12K.TiO.00 dep 25.000 0.04 - - - - - 5 + 625 CFH12K.TiO.01 dep 25.000 0.04 - - - - - 5 + 626 CFH12K.TiO.02 dep 25.000 0.04 - - - - - 5 + 627 CFH12K.TiO.03 dep 25.000 0.04 - - - - - 5 + 628 CFH12K.TiO.04 dep 25.000 0.04 - - - - - 5 + 629 CFH12K.TiO.05 dep 25.000 0.04 - - - - - 5 + 630 CFH12K.TiO.06 dep 25.000 0.04 - - - - - 5 + 631 CFH12K.TiO.07 dep 25.000 0.04 - - - - - 5 + 632 CFH12K.TiO.08 dep 25.000 0.04 - - - - - 5 + 633 CFH12K.TiO.09 dep 25.000 0.04 - - - - - 5 + 634 CFH12K.TiO.10 dep 25.000 0.04 - - - - - 5 + 635 CFH12K.TiO.11 dep 25.000 0.04 - - - - - 5 + 636 CFH12K.NB920.00 dep 25.000 0.04 - - - - - 5 + 637 CFH12K.NB920.01 dep 25.000 0.04 - - - - - 5 + 638 CFH12K.NB920.02 dep 25.000 0.04 - - - - - 5 + 639 CFH12K.NB920.03 dep 25.000 0.04 - - - - - 5 + 640 CFH12K.NB920.04 dep 25.000 0.04 - - - - - 5 + 641 CFH12K.NB920.05 dep 25.000 0.04 - - - - - 5 + 642 CFH12K.NB920.06 dep 25.000 0.04 - - - - - 5 + 643 CFH12K.NB920.07 dep 25.000 0.04 - - - - - 5 + 644 CFH12K.NB920.08 dep 25.000 0.04 - - - - - 5 + 645 CFH12K.NB920.09 dep 25.000 0.04 - - - - - 5 + 646 CFH12K.NB920.10 dep 25.000 0.04 - - - - - 5 + 647 CFH12K.NB920.11 dep 25.000 0.04 - - - - - 5 + 648 CFH12K.B2F.00 dep 25.000 0.04 - - - - - 5 + 649 CFH12K.B2F.01 dep 25.000 0.04 - - - - - 5 + 650 CFH12K.B2F.02 dep 25.000 0.04 - - - - - 5 + 651 CFH12K.B2F.03 dep 25.000 0.04 - - - - - 5 + 652 CFH12K.B2F.04 dep 25.000 0.04 - - - - - 5 + 653 CFH12K.B2F.05 dep 25.000 0.04 - - - - - 5 + 654 CFH12K.B2F.06 dep 25.000 0.04 - - - - - 5 + 655 CFH12K.B2F.07 dep 25.000 0.04 - - - - - 5 + 678 CFH12K.B2F.08 dep 25.000 0.04 - - - - - 5 + 679 CFH12K.B2F.09 dep 25.000 0.04 - - - - - 5 + 680 CFH12K.B2F.10 dep 25.000 0.04 - - - - - 5 + 681 CFH12K.B2F.11 dep 25.000 0.04 - - - - - 5 + + 2100 ISP-Apogee-01.i dep 15.0 0.10 - - - - - 1 + +g : 19.25 +r : 19.15 +i : 18.50 +z : 17.25 +y : 14.15 Index: /trunk/ippconfig/dvo.site.in =================================================================== --- /trunk/ippconfig/dvo.site.in (revision 11573) +++ /trunk/ippconfig/dvo.site.in (revision 11573) @@ -0,0 +1,29 @@ + +CONFDIR @IPP_CONFIG_DIR@ +CAMERA default + +# location of DVO database tables +CATDIR default + +# location of possible data sources +2MASS_DIR_AS NONE +2MASS_DIR_DR2 NONE +GSCDIR NONE +USNO_A_DIR NONE +USNO_B_DIR NONE +TYCHO_DIR NONE + +PHOTCODE_FILE $CONFDIR/dvo.photcodes +GSCFILE $CONFDIR/GSCregions.tbl +CATMODE MEF +CATFORMAT ELIXIR +SKY_DEPTH +# SKY_TABLE this may be used to override GSCFILE + +# access control for client/server addstar mode +# PASSWORD +# HOSTNAME +# VALID_IP + +# load the camera-specific configuration files +input $CONFDIR/dvo.cameras/$CAMERA.config Index: /trunk/ippconfig/isp/camera.config =================================================================== --- /trunk/ippconfig/isp/camera.config (revision 11572) +++ /trunk/ippconfig/isp/camera.config (revision 11573) @@ -66,7 +66,7 @@ FILERULES METADATA - PSASTRO.INPUT STR PSASTRO.INPUT.CMP - PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP - PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMP + PSASTRO.INPUT STR PSASTRO.INPUT.CMP + PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMP ### input file definitions @@ -120,5 +120,5 @@ SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png NONE NONE NONE KAPA FPA FPA TRUE ISP - 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 Index: /trunk/ippconfig/isp/ppImage.config =================================================================== --- /trunk/ippconfig/isp/ppImage.config (revision 11572) +++ /trunk/ippconfig/isp/ppImage.config (revision 11573) @@ -5,4 +5,5 @@ PHOTCODE.RULE STR {DETECTOR}.{FILTER.ID} +# apply the following constraints when selecting a detrend image DETREND.CONSTRAINTS METADATA BIAS METADATA @@ -14,10 +15,55 @@ FLAT METADATA FILTER STR FPA.FILTERID -# VERSION STR RAW +# VERSION STR RAW END FRINGE METADATA FILTER STR FPA.FILTERID - AIRMASS STR FPA.AIRMASS - TWILIGHT STR TWILIGHT:FPA.TIME +# AIRMASS STR FPA.AIRMASS +# TWILIGHT STR TWILIGHT:FPA.TIME END END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom +PPIMAGE_OBDSFRP METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom, astrom +PPIMAGE_OBDSFRA METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe +PPIMAGE_OBDSFR METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END Index: /trunk/ippconfig/isp/psphot.config =================================================================== --- /trunk/ippconfig/isp/psphot.config (revision 11572) +++ /trunk/ippconfig/isp/psphot.config (revision 11573) @@ -94,5 +94,5 @@ # BREAK_POINT may be one of (PEAKS, MOMENTS, PSFMODEL, ENSEMBLE) -# BREAK_POINT STR MOMENTS +BREAK_POINT STR ENSEMBLE # PEAKS_OUTPUT_FILE STR peaks.dat Index: /trunk/ippconfig/recipes/ppImage.config =================================================================== --- /trunk/ippconfig/recipes/ppImage.config (revision 11572) +++ /trunk/ippconfig/recipes/ppImage.config (revision 11573) @@ -256,4 +256,36 @@ END +# Overscan, bias, dark, shutter, flat-field, fringe, photom +PPIMAGE_OBDSFRP METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL TRUE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom, astrom +PPIMAGE_OBDSFRA METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL TRUE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + # Save JPEG from BIN1 PPIMAGE_J1 METADATA Index: /trunk/ippconfig/recipes/psastro.config =================================================================== --- /trunk/ippconfig/recipes/psastro.config (revision 11572) +++ /trunk/ippconfig/recipes/psastro.config (revision 11573) @@ -34,5 +34,6 @@ PSASTRO.MAX.ERROR F32 1.5 # max allow error for valid solution (UNITS?) -PSASTRO.MIN.NSTAR S32 3 # min fitted stars in solution +PSASTRO.MIN.NSTAR S32 3 # min fitted stars in solution +PSASTRO.MAX.NSTAR S32 300 # max stars accepted for fitting MAG_MAX F32 23.0 ## XXX change name to PSASTRO.something?