Index: /tags/base-1-5-0/Ohana/.cvsignore =================================================================== --- /tags/base-1-5-0/Ohana/.cvsignore (revision 11429) +++ /tags/base-1-5-0/Ohana/.cvsignore (revision 11429) @@ -0,0 +1,9 @@ +help +bin +lib +include +man +CVS +Configure +ohana-config +Makefile Index: /tags/base-1-5-0/Ohana/Configure.in =================================================================== --- /tags/base-1-5-0/Ohana/Configure.in (revision 11429) +++ /tags/base-1-5-0/Ohana/Configure.in (revision 11429) @@ -0,0 +1,33 @@ +# Configure file for Ohana Package +# +# this is the location of the package +# change this to match your location of the source +ROOT = @ROOTDIR@ +ARCH = @ARCHVAL@ + +# destination directories: +# these are the installation directories. +# if you use a different toplevel directory than $(ROOT), you might +# need to copy the include files in $(ROOT)/include by hand to the destination +# LBIN = PREFIX/bin/$(ARCH) + +DESTBIN = @BINDIR@ +DESTINC = @INCDIR@ +DESTLIB = @LIBDIR@ +DESTMAN = @MANDIR@ +DESTDATA = @DATADIR@ + +# prefered C compiler +# CC = gcc -g -DOHANA_MEMORY -Wall -Werror +CC = gcc @OPTFLAGS@ +INCDIRS = @INCDIRS@ +LIBDIRS = @LIBDIRS@ +LIBFLAGS = @LIBFLAGS@ + +# select the appropriate version of ranlib +RANLIB-sid = ranlib +RANLIB-sol = touch +RANLIB-linux = ranlib +RANLIB-lin64 = ranlib +RANLIB-linrh = ranlib +RANLIB = $(RANLIB-$(ARCH)) Index: /tags/base-1-5-0/Ohana/Makefile.Common =================================================================== --- /tags/base-1-5-0/Ohana/Makefile.Common (revision 11429) +++ /tags/base-1-5-0/Ohana/Makefile.Common (revision 11429) @@ -0,0 +1,79 @@ +# this file must be added to the makefile *after* LIB,BIN, etc are defined + +# XXX replace BINDIR, etc with DESTBIN in Configure.in + +CFLAGS = -I$(INC) -I$(DESTINC) $(INCDIRS) -D$(ARCH) +LDFLAGS = -L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBFLAGS) + +.PRECIOUS: %.$(ARCH).o +.PRECIOUS: $(BIN)/%.$(ARCH) + +# is this line needed? +.SUFFIXES: .$(ARCH).o + +$(DESTINC)/%: $(INC)/% + @if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi + rm -f $@ + cp $< $@ + +%.$(ARCH).o : %.c + $(CC) $(CFLAGS) -c $< -o $@ + +$(BIN)/%.$(ARCH): + @echo "trying $*" + @if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi + $(CC) -o $@ $^ $(LDFLAGS) + @echo "compiled $*" + @echo "" + +$(DESTBIN)/%: $(BIN)/%.$(ARCH) + @if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi + rm -f $(DESTBIN)/$* + cp $(BIN)/$*.$(ARCH) $(DESTBIN)/$* + @echo "installed $*" + @echo "" + +$(LIB): + @if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi + +$(LIB)/%.$(ARCH).a: + @if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi + rm -f $@ + ar rcv $@ $^ + $(RANLIB) $@ + +$(DESTLIB)/%.a: $(LIB)/%.$(ARCH).a + @if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi + rm -f $@ + cp $< $@ + +$(LIB)/%.$(ARCH).so: + @if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi + rm -f $@ + gcc -shared -Wl,-soname,$*.so -o $@ $^ -lc + +$(DESTLIB)/%.so: $(LIB)/%.$(ARCH).so + @if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi + rm -f $@ + cp $< $@ + +$(DESTMAN)/%: $(MAN)/% + @if [ ! -d $(DESTMAN) ]; then mkdir -p $(DESTMAN); fi + rm -f $@ + cp $< $@ + +clean: + rm -f `find . -name "*.o"` + rm -f `find . -name "*.o"` + rm -f `find . -name "*~"` + rm -f `find . -name "#*"` + +dist: clean + rm -rf $(BIN) + rm -rf $(LIB) + +# $@ : target filename +# $* : matched word (%) +# $< : first prereq +# $^ : all prereqs + Index: /tags/base-1-5-0/Ohana/Makefile.in =================================================================== --- /tags/base-1-5-0/Ohana/Makefile.in (revision 11429) +++ /tags/base-1-5-0/Ohana/Makefile.in (revision 11429) @@ -0,0 +1,149 @@ +# --------------------------------------------------------------------------- # +# --------------------------------------------------------------------------- # +# # +# OOO HH HH AAA NN NN AAA # +# OO OO HH HH AA AA NNN NN AA AA # +# OO OO HHHHHHH AAAAAAA NN N NN AAAAAAA # +# OO OO HH HH AA AA NN NNN AA AA # +# OOO HH HH AA AA NN NN AA AA # +# # +# --------------------------------------------------------------------------- # +# --------------------------------------------------------------------------- # + +# This makefile compiles all Ohana package programs in the Elixir +# system, and their libraries. Most of the components in this +# directory were created for Ohana, but there are a few libraries +# which are from external sources: libjpeg, libpng, zlib, and +# readline. Extra care should be taken in compiling those libraries. + +# Edit Configure to reflect the location of your installation +# or use the script 'configure' + +include Configure + +# .SILENT: +default: all + +# The collection of Ohana programs. Other components in the src +# directory may be compiled by going to those directories. +PROGRAM = \ +addstar \ +delstar \ +elixir \ +gastro \ +gastro2 \ +getstar \ +gcompare \ +imclean \ +imregister \ +kapa \ +kii \ +misc \ +mosastro \ +nightd \ +opihi \ +perl \ +relphot \ +shell \ +tcl \ +uniphot + +# any of these programs can be built with 'make (name)' +EXTRAS = \ +opihi.v1 \ +fixcat \ +gophot \ +getusno \ +lightcurve \ +markrock \ +photdbc \ +markstar \ +mosastro.v1 \ +mosastro.v2 \ +skycalc + +OLD = mana status addusno addrefs addspphot + +# Required libraries depends on the architecture +LIBS-linux = libtap libohana libfits libdvo libkapa +LIBS-lin64 = libtap libohana libfits libdvo libkapa +LIBS-linrh = libtap libohana libfits libdvo libkapa +LIBS-sid = libtap libohana libfits libdvo libkapa +LIBS-sol = libtap libohana libfits libdvo libkapa + +# general build targets: +libs: + @if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi + @if [ "$(LIBS-$(ARCH))" = "" ]; then echo; echo " *** LIBS-$(ARCH) is missing"; echo; exit 1; fi + mkdir -p $(DESTINC) + mkdir -p $(DESTLIB) + mkdir -p $(DESTBIN) + for i in $(LIBS-$(ARCH)); do make $$i.install || exit; done + chmod +x ohana-config + cp -f ohana-config $(DESTBIN)/ + +bins: + for i in $(PROGRAM); do make $$i; done + +all: + make libs || exit + for i in $(PROGRAM); do make $$i || exit; done + +extras: + for i in $(EXTRAS); do make $$i || exit; done + +pantasks: + make libs || exit + cd src/opihi; make pclient.install && exit + cd src/opihi; make pcontrol.install && exit + cd src/opihi; make pantasks.install && exit + +mana: + make libs + make kii.install + make kapa.install + cd src/opihi; make mana.install && exit + +dvoshell: + make libs + make kii.install + make kapa.install + cd src/opihi; make dvo.install && exit + +clean: + @if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi + @if [ "$(LIBS-$(ARCH))" = "" ]; then echo; echo " *** LIBS-$(ARCH) is missing"; echo; exit 1; fi + for i in $(LIBS-$(ARCH)); do make $$i.clean || exit; done + for i in $(PROGRAM); do make $$i.clean || exit; done + for i in $(EXTRAS); do make $$i.clean || exit; done + @rm -f `find . -name .mana` + @rm -f `find . -name .dvo` + +dist: + @if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi + @if [ "$(LIBS-$(ARCH))" = "" ]; then echo; echo " *** LIBS-$(ARCH) is missing"; echo; exit 1; fi + for i in $(LIBS-$(ARCH)); do make $$i.dist || exit; done + for i in $(PROGRAM); do make $$i.dist || exit; done + +install: + @if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi + @if [ "$(LIBS-$(ARCH))" = "" ]; then echo; echo " *** LIBS-$(ARCH) is missing"; echo; exit 1; fi + for i in $(LIBS-$(ARCH)); do make $$i.install || exit; done + for i in $(PROGRAM); do make $$i.install || exit; done + +install.extras: + for i in $(EXTRAS); do make $$i.install || exit; done + +# standard rules: targets are foo, foo.clean, foo.install, foo.dist +$(PROGRAM) $(LIBS-$(ARCH)) $(EXTRAS): + if [ -d "src/$@" ]; then (cd src/$@ && make); fi + +%.install: + mkdir -p bin/$(ARCH) + if [ -d "src/$*" ]; then (cd src/$* && make install); fi + +%.clean: + if [ -d "src/$*" ]; then (cd src/$* && make clean); fi + +%.dist: + (cd src/$* && make dist) Index: /tags/base-1-5-0/Ohana/autogen.sh =================================================================== --- /tags/base-1-5-0/Ohana/autogen.sh (revision 11429) +++ /tags/base-1-5-0/Ohana/autogen.sh (revision 11429) @@ -0,0 +1,3 @@ +#!/bin/sh + +./configure.tcsh $* Index: /tags/base-1-5-0/Ohana/configure =================================================================== --- /tags/base-1-5-0/Ohana/configure (revision 11429) +++ /tags/base-1-5-0/Ohana/configure (revision 11429) @@ -0,0 +1,3 @@ +#!/bin/sh + +./configure.tcsh $* Index: /tags/base-1-5-0/Ohana/configure.tcsh =================================================================== --- /tags/base-1-5-0/Ohana/configure.tcsh (revision 11429) +++ /tags/base-1-5-0/Ohana/configure.tcsh (revision 11429) @@ -0,0 +1,386 @@ +#!/bin/csh -f + +# this is a very low-tech version of configure, not built by autoconf. +# we check for the following libraries: + +# we need to be able to list the required libraries for a given distribution + +# libX11.a +# libsocket.a +# libnsl.a +# libpng.a +# libjpeg.a +# libz.a +# libreadline.a +# libtermcap.a + +# evaluate command-line options +set vararch = 0 +set prefix = "" + +set bindir = "" +set libdir = "" +set incdir = "" +set mandir = "" +set datadir = "" +set sysconfdir = "" +set optflags = "-g -O0" +set pedantic = "" + +set root = "" +set args = "" +while ("$1" != "") + switch ($1) + case --vararch + set vararch = 1 + breaksw; + # options passed by jhbuild which we ignore + case --enable-maintainer-mode + case --no-create + case --no-recursion + breaksw; + case --enable-optimize + set optflags = "-O2" + breaksw; + case --pedantic + set pedantic = "-Wall -Werror" + breaksw; + case --prefix* + if ("$1" == "--prefix") then + shift + set prefix = $1 + else + set prefix = `echo $1 | tr = ' ' | awk '{print $2}'` + endif + set exec_prefix = $prefix + breaksw; + case --bindir* + if ("$1" == "--bindir") then + shift + set bindir = $1 + else + set bindir = `echo $1 | tr = ' ' | awk '{print $2}'` + endif + breaksw; + case --libdir* + if ("$1" == "--libdir") then + shift + set libdir = $1 + else + set libdir = `echo $1 | tr = ' ' | awk '{print $2}'` + endif + breaksw; + case --includedir* + if ("$1" == "--includedir") then + shift + set includedir = $1 + else + set includedir = `echo $1 | tr = ' ' | awk '{print $2}'` + endif + breaksw; + case --sysconfdir* + if ("$1" == "--sysconfdir") then + shift + set sysconfdir = $1 + else + set sysconfdir = `echo $1 | tr = ' ' | awk '{print $2}'` + endif + breaksw; + case --datadir* + if ("$1" == "--datadir") then + shift + set datadir = $1 + else + set datadir = `echo $1 | tr = ' ' | awk '{print $2}'` + endif + breaksw; + case --mandir* + if ("$1" == "--mandir") then + shift + set mandir = $1 + else + set mandir = `echo $1 | tr = ' ' | awk '{print $2}'` + endif + breaksw; + case --help: + goto usage + case -*: + echo "" + echo "Unknown option: $1" + goto usage + default: + set args=($args $1); + breaksw; + endsw + shift +end +if ($#args != 1) goto usage + +set needlibs = "png z jpeg readline X11 pthread m" +set syslibpath = "/usr/lib /usr/X11R6/lib /usr/openwin/lib" + +set needincs = "math.h fcntl.h malloc.h errno.h time.h memory.h stdlib.h string.h X11/X.h" +set sysincpath = "/usr/include /usr/X11R6/include /usr/openwin/include" + +# check the hardware architecture: +set sys=`uname -s` +switch ($sys) + case IRIX64: + set arch="irix"; + breaksw; + case SunOS: + set ver=`uname -r | awk '{print substr($1,1,1)}'`; + if ($ver == 5) then + set arch="sol"; + else + set arch="sun4"; + endif + # sun (at least) seems to need the socket library (linux does not) + set needlibs = "$needlibs libsocket libnsl" + breaksw; + case Linux: + set arch="linux"; + if (-e /etc/sidious.config) set arch="sid"; + set mach=`uname -m` + if ("$mach" == "x86_64") then + set arch="lin64"; + endif + breaksw; + case HP-UX: + set arch="hpux"; + breaksw; + default: + echo "unknown architecture"; + exit 1; + breaksw; +endsw +echo "setting architecture to: $arch" + +# set up the basic directory names: +# XXX : this should be set based on the rules for libdir below +set root = `pwd` +if ($prefix == "") set prefix = $root +if ($vararch) then + set inc = $prefix/include/$arch + set lib = $prefix/lib/$arch +else + set inc = $prefix/include + set lib = $prefix/lib +endif +if ($?LD_LIBRARY_PATH) then + set libpath = `echo $LD_LIBRARY_PATH | tr ':' ' '` +else + set libpath = "" +endif + +# check for basic libraries +set faillibs = "" +set libflags = "" +set libdirs = "" +foreach f ( $needlibs ) + foreach g ( $syslibpath $lib $libpath ) + set name = "$g/lib$f.a" + if (-e $name) goto got_lib; + set name = "$g/lib$f.so" + if (-e $name) goto got_lib; + end + echo "missing lib$f" + set faillibs = "$faillibs lib$f" + continue +got_lib: + echo "found lib$f ($name)" + echo "$libdirs" | grep -- "-L$g " > /dev/null + if ($status) then + set libdirs = "$libdirs -L$g " + endif + echo "$libflags" | grep -- "-l$f " > /dev/null + if ($status) then + set libflags = "$libflags -l$f " + endif +end + +# we need a curses library; can choose one of the following: +# check for termcap, curses, etc +foreach f ( ncurses curses termcap ) + foreach g ( $syslibpath $lib $libpath ) + set name = "$g/lib$f.a" + if (-e $name) goto got_curses; + set name = "$g/lib$f.so" + if (-e $name) goto got_curses; + end +end +set faillibs = "$faillibs (ncurses | curses | termcap)" +echo "missing a valid curses library" +echo "missing: $faillibs" +echo "please find them and install them in $lib" +exit 1 + +got_curses: + echo "found $f ($name)" + echo "$libdirs" | grep -- "-L$g " > /dev/null + if ($status) then + set libdirs = "$libdirs -L$g " + endif + echo "$libflags" | grep -- "-l$f " > /dev/null + if ($status) then + set libflags = "$libflags -l$f " + endif + +if ("$faillibs" != "") then + echo "your installation is missing some important libraries" + echo "missing: $faillibs" + echo "please find them and install them in $lib" + exit 1 +endif + +# check for headers +set failincs = "" +set incdirs = "" +foreach f ( $needincs ) + foreach g ( $sysincpath $inc ) + set name = "$g/$f" + if (-e $name) goto got_inc; + end + echo "missing $f" + set failincs = "$failincs $f" + continue +got_inc: + echo "found $f ($name)" + echo "$incdirs" | grep -- "-I$g " > /dev/null + if ($status) then + set incdirs = "$incdirs -I$g " + endif +end + +if ("$failincs" != "") then + echo "your installation is missing some important library headers" + echo "please find them and install them in $inc" + exit 1 +endif + +echo INCDIRS: $incdirs +echo LIBDIRS: $libdirs +echo LIBFLAGS: $libflags + +echo ARCH: $arch +echo ROOT: $root +echo PREFIX: $prefix +echo + +#echo BINDIR $bindir +#echo LIBDIR $libdir +#echo INCDIR $incdir +#echo DATADIR $datadir +#echo MANDIR $mandir + +if (-e Configure) mv Configure Configure.bak + +rm -f Configure.in.tmp Configure.tmp +cp Configure.in Configure.in.tmp + +# we don't currently need to modify the Makefile but since configure +# should create a new Makefile, we need to do this: +cp -f Makefile.in Makefile + +# modify the BINDIR +if ("$bindir" == "") then + set subdir = bin + set subpath = bin + if ($vararch) then + set subdir = 'bin/$(ARCH)' + set subpath = "bin/$arch" + endif + set bindir = $prefix/$subdir + set binpath = $prefix/$subpath +endif +cat Configure.in.tmp | sed "s|@BINDIR@| $bindir|" > Configure.tmp +rm -f Configure.in.tmp +mv Configure.tmp Configure.in.tmp +echo BINDIR $bindir + +# modify the INCDIR +if ("$incdir" == "") then + set subdir = include + if ($vararch) set subdir = 'include/$(ARCH)' + set incdir = $prefix/$subdir +endif +cat Configure.in.tmp | sed "s|@INCDIR@|$incdir|" > Configure.tmp +rm -f Configure.in.tmp +mv Configure.tmp Configure.in.tmp +echo INCDIR $incdir + +# modify the LIBDIR +if ("$libdir" == "") then + set subdir = lib + if ($vararch) set subdir = 'lib/$(ARCH)' + set libdir = $prefix/$subdir +endif +cat Configure.in.tmp | sed "s|@LIBDIR@|$libdir|" > Configure.tmp +rm -f Configure.in.tmp +mv Configure.tmp Configure.in.tmp +echo LIBDIR $libdir + +# modify the MANDIR +if ("$mandir" == "") then + set mandir = $prefix/man +endif +cat Configure.in.tmp | sed "s|@MANDIR@|$mandir|" > Configure.tmp +rm -f Configure.in.tmp +mv Configure.tmp Configure.in.tmp +echo MANDIR $mandir + +# modify the DATADIR +if ("$datadir" == "") then + set datadir = $prefix/share +endif +cat Configure.in.tmp | sed "s|@DATADIR@|$datadir|" > Configure.tmp +rm -f Configure.in.tmp +mv Configure.tmp Configure.in.tmp +echo DATADIR $datadir + +if ($vararch) then + cat Configure.in.tmp | sed "s|^\s*ARCH|# ARCH|" > Configure.tmp +else + cat Configure.in.tmp | sed "s|@ARCHVAL@|$arch|" > Configure.tmp +endif +rm -f Configure.in.tmp +mv Configure.tmp Configure.in.tmp + +cat Configure.in.tmp | sed "s|@ROOTDIR@|$root|" | sed "s|@INCDIRS@|$incdirs|" | sed "s|@LIBDIRS@|$libdirs|" | sed "s|@LIBFLAGS@|$libflags|" | sed "s|@OPTFLAGS@|$optflags $pedantic|" > Configure +rm -f Configure.in.tmp Configure.tmp + +cat ohana-config.in | sed "s|@INCDIR@|$incdir|" | sed "s|@LIBDIR@|$libdir|" | sed "s|(ARCH)|ARCH|" > ohana-config + +echo "" +echo "include $bindir in your path" + +exit 0 + +usage: +cat < equivalence +# 1 B pri 26.017 -0.15 - 1023 1024 0.016 - 1 +# 2 V sec 26.220 -0.12 - 1023 1024 0.008 - 2 +# 3 R sec 26.190 -0.09 - 1024 1025 0.028 - 3 +# 4 I sec 26.185 -0.04 - 1025 1027 0.107 - 4 + +# 1 B pri 26.017 -0.15 - 1003 1004 0.016 - 1 +# 2 V sec 26.220 -0.12 - 1003 1004 0.008 - 2 +# 3 R sec 26.190 -0.09 - 1004 1005 0.028 - 3 +# 4 I sec 26.185 -0.04 - 1005 1007 0.107 - 4 + + 1 B pri 26.000 -0.15 - 1003 1004 0.016 - 1 + 2 V sec 26.150 -0.12 - 1003 1004 0.008 - 2 + 3 R sec 26.190 -0.09 - 1003 1004 0.028 - 3 + 4 I sec 26.135 -0.04 - 1003 1004 0.107 - 4 + 5 Z sec 25.830 -0.03 - - - - - 5 + + 1000 USNO_BLUE ref - - - - - - - - + 1001 USNO_RED ref - - - - - - - - + + 50 ASCA_RED dep 10.000 0.0 - - - - - 3 + 51 ASCA_BLUE dep 10.000 0.0 - - - - - 3 + + 1002 U_L92 ref - - - - - - - - + 1003 B_L92 ref - - - - - - - - + 1004 V_L92 ref - - - - - - - - + 1005 R_L92 ref - - - - - - - - + 1007 I_L92 ref - - - - - - - - + + 1022 U_L92_HQ ref - - - - - - - - + 1023 B_L92_HQ ref - - - - - - - - + 1024 V_L92_HQ ref - - - - - - - - + 1025 R_L92_HQ ref - - - - - - - - + 1027 I_L92_HQ ref - - - - - - - - + + 1012 U_STET ref - - - - - - - - + 1013 B_STET ref - - - - - - - - + 1014 V_STET ref - - - - - - - - + 1015 R_STET ref - - - - - - - - + 1017 I_STET ref - - - - - - - - + + 1100 GSC_M ref - - - - - - - - + 1101 SAO ref - - - - - - - - + + 1200 TYCHO_B ref - - - - - - - - + 1201 TYCHO_V ref - - - - - - - - + + 2011 2MASS_J ref - - - - - - - - + 2012 2MASS_H ref - - - - - - - - + 2013 2MASS_K ref - - - - - - - - + + 100 CFH12K.B.00 dep 26.000 -0.15 - - - - - 1 + 101 MEGACAM.r.13 dep 26.000 -0.15 - - - - - 1 Index: /tags/base-1-5-0/Ohana/test/addstar/image.sa/ptolemy.rc =================================================================== --- /tags/base-1-5-0/Ohana/test/addstar/image.sa/ptolemy.rc (revision 11429) +++ /tags/base-1-5-0/Ohana/test/addstar/image.sa/ptolemy.rc (revision 11429) @@ -0,0 +1,23 @@ +# .ptolemyrc + +REFSDIR ../../refs + +# asca camera settings +UT-KEYWORD UTSHUT +DATE-KEYWORD DATE +DATE-MODE yyyy-mm-dd + +# matching radius (arcseconds) +# RADIUS 1.0 (old name, deprecated) +ADDSTAR_RADIUS 1.0 + +GSCFILE $REFSDIR/GSCregions.tbl +CATDIR catdir +PHOTCODE_FILE photcode.txt + +USNO_A_DIR /data/elixir/srcdir/refs/usno +USNO_B_DIR /data/elixir/srcdir/refs/usnob + +ZERO_PT 25.0 + +GSCDIR /data/elixir/srcdir/refs/gsc Index: /tags/base-1-5-0/Ohana/test/addstar/refcat.sa/.cvsignore =================================================================== --- /tags/base-1-5-0/Ohana/test/addstar/refcat.sa/.cvsignore (revision 11429) +++ /tags/base-1-5-0/Ohana/test/addstar/refcat.sa/.cvsignore (revision 11429) @@ -0,0 +1,1 @@ +catdir.* Index: /tags/base-1-5-0/Ohana/test/addstar/refcat.sa/Makefile =================================================================== --- /tags/base-1-5-0/Ohana/test/addstar/refcat.sa/Makefile (revision 11429) +++ /tags/base-1-5-0/Ohana/test/addstar/refcat.sa/Makefile (revision 11429) @@ -0,0 +1,91 @@ + +REG = -region 0 1 0 1 + +usno: usno.photcodes usno.formats usno.depths +usno.depths: usno.depths.raw usno.depths.mef usno.depths.split +usno.formats: usno.formats.raw usno.formats.mef usno.formats.split + +gsc: + addstar -v -cat GSC $(REG) -D CATDIR catdir.gsc + dvocheck catdir.gsc gsc + +2mass: + addstar -cat 2MASS $(REG) -D CATDIR catdir.2mass -photcode 2MASS_J + addstar -cat 2MASS $(REG) -D CATDIR catdir.2mass -photcode 2MASS_H + addstar -cat 2MASS $(REG) -D CATDIR catdir.2mass -photcode 2MASS_K + dvocheck catdir.2mass 2mass + +tycho: + addstar -cat TYCHO $(REG) -D CATDIR catdir.tycho -photcode TYCHO_B + addstar -cat TYCHO $(REG) -D CATDIR catdir.tycho -photcode TYCHO_V + dvocheck catdir.tycho tycho + +usnob: + addstar -cat USNOB $(REG) -D CATDIR catdir.usnob -photcode USNO_RED + addstar -cat USNOB $(REG) -D CATDIR catdir.usnob -photcode USNO_BLUE + dvocheck catdir.usnob usnob + +usno.photcodes: + addstar -cat USNO $(REG) -D CATDIR catdir.usno -photcode USNO_RED + addstar -cat USNO $(REG) -D CATDIR catdir.usno -photcode USNO_BLUE + dvocheck catdir.usno usno + +usno.formats.raw: + addstar -cat USNO $(REG) -D CATDIR catdir.usno.raw.loneos -photcode USNO_BLUE -D CATFORMAT LONEOS + dvocheck catdir.usno.raw.loneos usno + addstar -cat USNO $(REG) -D CATDIR catdir.usno.raw.elixir -photcode USNO_BLUE -D CATFORMAT ELIXIR + dvocheck catdir.usno.raw.elixir usno + addstar -cat USNO $(REG) -D CATDIR catdir.usno.raw.pmtest -photcode USNO_BLUE -D CATFORMAT PMTEST + dvocheck catdir.usno.raw.pmtest usno + addstar -cat USNO $(REG) -D CATDIR catdir.usno.raw.panstarrs -photcode USNO_BLUE -D CATFORMAT PANSTARRS + dvocheck catdir.usno.raw.panstarrs usno + +usno.formats.mef: + addstar -cat USNO $(REG) -D CATDIR catdir.usno.mef.loneos -photcode USNO_BLUE -D CATMODE MEF -D CATFORMAT LONEOS + dvocheck catdir.usno.mef.loneos usno + addstar -cat USNO $(REG) -D CATDIR catdir.usno.mef.elixir -photcode USNO_BLUE -D CATMODE MEF -D CATFORMAT ELIXIR + dvocheck catdir.usno.mef.elixir usno + addstar -cat USNO $(REG) -D CATDIR catdir.usno.mef.pmtest -photcode USNO_BLUE -D CATMODE MEF -D CATFORMAT PMTEST + dvocheck catdir.usno.mef.pmtest usno + addstar -cat USNO $(REG) -D CATDIR catdir.usno.mef.panstarrs -photcode USNO_BLUE -D CATMODE MEF -D CATFORMAT PANSTARRS + dvocheck catdir.usno.mef.panstarrs usno + +usno.formats.split: + addstar -cat USNO $(REG) -D CATDIR catdir.usno.split.loneos -photcode USNO_BLUE -D CATMODE SPLIT -D CATFORMAT LONEOS + dvocheck catdir.usno.split.loneos usno + addstar -cat USNO $(REG) -D CATDIR catdir.usno.split.elixir -photcode USNO_BLUE -D CATMODE SPLIT -D CATFORMAT ELIXIR + dvocheck catdir.usno.split.elixir usno + addstar -cat USNO $(REG) -D CATDIR catdir.usno.split.pmtest -photcode USNO_BLUE -D CATMODE SPLIT -D CATFORMAT PMTEST + dvocheck catdir.usno.split.pmtest usno + addstar -cat USNO $(REG) -D CATDIR catdir.usno.split.panstarrs -photcode USNO_BLUE -D CATMODE SPLIT -D CATFORMAT PANSTARRS + dvocheck catdir.usno.split.panstarrs usno + +usno.depths.raw: + addstar -cat USNO $(REG) -D CATDIR catdir.usno.raw.L2 -photcode USNO_BLUE -D SKY_DEPTH 2 -D CATMODE RAW + dvocheck catdir.usno.raw.L2 usno + addstar -cat USNO $(REG) -D CATDIR catdir.usno.raw.L3 -photcode USNO_BLUE -D SKY_DEPTH 3 -D CATMODE RAW + dvocheck catdir.usno.raw.L3 usno + addstar -cat USNO $(REG) -D CATDIR catdir.usno.raw.L4 -photcode USNO_BLUE -D SKY_DEPTH 4 -D CATMODE RAW + dvocheck catdir.usno.raw.L4 usno + +usno.depths.mef: + addstar -cat USNO $(REG) -D CATDIR catdir.usno.mef.L2 -photcode USNO_BLUE -D SKY_DEPTH 2 -D CATMODE MEF + dvocheck catdir.usno.mef.L2 usno + addstar -cat USNO $(REG) -D CATDIR catdir.usno.mef.L3 -photcode USNO_BLUE -D SKY_DEPTH 3 -D CATMODE MEF + dvocheck catdir.usno.mef.L3 usno + addstar -cat USNO $(REG) -D CATDIR catdir.usno.mef.L4 -photcode USNO_BLUE -D SKY_DEPTH 4 -D CATMODE MEF + dvocheck catdir.usno.mef.L4 usno + +usno.depths.split: + addstar -cat USNO $(REG) -D CATDIR catdir.usno.split.L2 -photcode USNO_BLUE -D SKY_DEPTH 2 -D CATMODE SPLIT + dvocheck catdir.usno.split.L2 usno + addstar -cat USNO $(REG) -D CATDIR catdir.usno.split.L3 -photcode USNO_BLUE -D SKY_DEPTH 3 -D CATMODE SPLIT + dvocheck catdir.usno.split.L3 usno + addstar -cat USNO $(REG) -D CATDIR catdir.usno.split.L4 -photcode USNO_BLUE -D SKY_DEPTH 4 -D CATMODE SPLIT + dvocheck catdir.usno.split.L4 usno + + +##### + +clean: + rm -rf catdir.* Index: /tags/base-1-5-0/Ohana/test/addstar/refcat.sa/dvocheck =================================================================== --- /tags/base-1-5-0/Ohana/test/addstar/refcat.sa/dvocheck (revision 11429) +++ /tags/base-1-5-0/Ohana/test/addstar/refcat.sa/dvocheck (revision 11429) @@ -0,0 +1,29 @@ +#!/usr/bin/env dvo + +if ($argv:n != 2) + echo "USAGE: validate (catdir) (mode)" + echo $argv:n + exit 2 +end + +catdir $argv:0 +$KAPA = kapa -nomap + +if ("$argv:1" == "gsc") + region 0.5 0.5 0.5 +end + +if ("$argv:1" == "asca") + resize -g 800 420 + usleep 200000 + region 60 0 90 ait +end + +mextract ra +if (ra[] == 0) + echo "no stars found for $1" + exit 1 +end + +echo "found ra[] stars" +exit 0 Index: /tags/base-1-5-0/Ohana/test/addstar/refcat.sa/photcode.txt =================================================================== --- /tags/base-1-5-0/Ohana/test/addstar/refcat.sa/photcode.txt (revision 11429) +++ /tags/base-1-5-0/Ohana/test/addstar/refcat.sa/photcode.txt (revision 11429) @@ -0,0 +1,225 @@ +# 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. + +# a bogosity in scatfit: it assumes primary photcodes are those which +# N % 50 == 0 + +# I discovered that the standards star analysis and the photreg +# process are inconsistent. the standard star analysis was using the +# per-chip zero-points while photreg was using the per-filter +# zero-points. these should have been the same, but were not. See +# cfh12.photcode.original for the version with this error. This file +# now contains consistent entries + +# code name type zero airmass offset c1 c2 slope equivalence +# 1 B pri 26.017 -0.15 - 1023 1024 0.016 - 1 +# 2 V sec 26.220 -0.12 - 1023 1024 0.008 - 2 +# 3 R sec 26.190 -0.09 - 1024 1025 0.028 - 3 +# 4 I sec 26.185 -0.04 - 1025 1027 0.107 - 4 + +# 1 B pri 26.017 -0.15 - 1003 1004 0.016 - 1 +# 2 V sec 26.220 -0.12 - 1003 1004 0.008 - 2 +# 3 R sec 26.190 -0.09 - 1004 1005 0.028 - 3 +# 4 I sec 26.185 -0.04 - 1005 1007 0.107 - 4 + + 1 B pri 26.000 -0.15 - 1003 1004 0.016 - 1 + 2 V sec 26.150 -0.12 - 1003 1004 0.008 - 2 + 3 R sec 26.190 -0.09 - 1003 1004 0.028 - 3 + 4 I sec 26.135 -0.04 - 1003 1004 0.107 - 4 + 5 Z sec 25.830 -0.03 - - - - - 5 + + 1000 USNO_BLUE ref - - - - - - - - + 1001 USNO_RED ref - - - - - - - - + + 50 ASCA_RED dep 10.000 0.0 - - - - - 3 + + 1002 U_L92 ref - - - - - - - - + 1003 B_L92 ref - - - - - - - - + 1004 V_L92 ref - - - - - - - - + 1005 R_L92 ref - - - - - - - - + 1007 I_L92 ref - - - - - - - - + + 1022 U_L92_HQ ref - - - - - - - - + 1023 B_L92_HQ ref - - - - - - - - + 1024 V_L92_HQ ref - - - - - - - - + 1025 R_L92_HQ ref - - - - - - - - + 1027 I_L92_HQ ref - - - - - - - - + + 1012 U_STET ref - - - - - - - - + 1013 B_STET ref - - - - - - - - + 1014 V_STET ref - - - - - - - - + 1015 R_STET ref - - - - - - - - + 1017 I_STET ref - - - - - - - - + + 1100 GSC_M ref - - - - - - - - + 1101 SAO ref - - - - - - - - + + 1200 TYCHO_B ref - - - - - - - - + 1201 TYCHO_V ref - - - - - - - - + + 2011 2MASS_J ref - - - - - - - - + 2012 2MASS_H ref - - - - - - - - + 2013 2MASS_K ref - - - - - - - - + + 100 CFH12K.B.00 dep 26.000 -0.15 - - - - - 1 + 101 CFH12K.B.01 dep 26.000 -0.15 - - - - - 1 + 102 CFH12K.B.02 dep 26.000 -0.15 - - - - - 1 + 103 CFH12K.B.03 dep 26.000 -0.15 - - - - - 1 + 104 CFH12K.B.04 dep 26.000 -0.15 - - - - - 1 + 105 CFH12K.B.05 dep 26.000 -0.15 - - - - - 1 + 106 CFH12K.B.06 dep 26.000 -0.15 - - - - - 1 + 107 CFH12K.B.07 dep 26.000 -0.15 - - - - - 1 + 108 CFH12K.B.08 dep 26.000 -0.15 - - - - - 1 + 109 CFH12K.B.09 dep 26.000 -0.15 - - - - - 1 + 110 CFH12K.B.10 dep 26.000 -0.15 - - - - - 1 + 111 CFH12K.B.11 dep 26.000 -0.15 - - - - - 1 + + 200 CFH12K.V.00 dep 26.150 -0.12 - - - - - 2 + 201 CFH12K.V.01 dep 26.150 -0.12 - - - - - 2 + 202 CFH12K.V.02 dep 26.150 -0.12 - - - - - 2 + 203 CFH12K.V.03 dep 26.150 -0.12 - - - - - 2 + 204 CFH12K.V.04 dep 26.150 -0.12 - - - - - 2 + 205 CFH12K.V.05 dep 26.150 -0.12 - - - - - 2 + 206 CFH12K.V.06 dep 26.150 -0.12 - - - - - 2 + 207 CFH12K.V.07 dep 26.150 -0.12 - - - - - 2 + 208 CFH12K.V.08 dep 26.150 -0.12 - - - - - 2 + 209 CFH12K.V.09 dep 26.150 -0.12 - - - - - 2 + 210 CFH12K.V.10 dep 26.150 -0.12 - - - - - 2 + 211 CFH12K.V.11 dep 26.150 -0.12 - - - - - 2 + +# was 26.190 + 300 CFH12K.R.00 dep 26.190 -0.09 - - - - - 3 + 301 CFH12K.R.01 dep 26.190 -0.09 - - - - - 3 + 302 CFH12K.R.02 dep 26.190 -0.09 - - - - - 3 + 303 CFH12K.R.03 dep 26.190 -0.09 - - - - - 3 + 304 CFH12K.R.04 dep 26.190 -0.09 - - - - - 3 + 305 CFH12K.R.05 dep 26.190 -0.09 - - - - - 3 + 306 CFH12K.R.06 dep 26.190 -0.09 - - - - - 3 + 307 CFH12K.R.07 dep 26.190 -0.09 - - - - - 3 + 308 CFH12K.R.08 dep 26.190 -0.09 - - - - - 3 + 309 CFH12K.R.09 dep 26.190 -0.09 - - - - - 3 + 310 CFH12K.R.10 dep 26.190 -0.09 - - - - - 3 + 311 CFH12K.R.11 dep 26.190 -0.09 - - - - - 3 + + 400 CFH12K.I.00 dep 26.135 -0.04 - - - - - 4 + 401 CFH12K.I.01 dep 26.135 -0.04 - - - - - 4 + 402 CFH12K.I.02 dep 26.135 -0.04 - - - - - 4 + 403 CFH12K.I.03 dep 26.135 -0.04 - - - - - 4 + 404 CFH12K.I.04 dep 26.135 -0.04 - - - - - 4 + 405 CFH12K.I.05 dep 26.135 -0.04 - - - - - 4 + 406 CFH12K.I.06 dep 26.135 -0.04 - - - - - 4 + 407 CFH12K.I.07 dep 26.135 -0.04 - - - - - 4 + 408 CFH12K.I.08 dep 26.135 -0.04 - - - - - 4 + 409 CFH12K.I.09 dep 26.135 -0.04 - - - - - 4 + 410 CFH12K.I.10 dep 26.135 -0.04 - - - - - 4 + 411 CFH12K.I.11 dep 26.135 -0.04 - - - - - 4 + +### This needs to be fixed: I am setting all filters which are not +### BVRI to point at photcode 5 (= Z) as a reference. This is +### needed because the + + 500 CFH12K.Z.00 dep 25.83 -0.03 - - - - - 5 + 501 CFH12K.Z.01 dep 25.83 -0.03 - - - - - 5 + 502 CFH12K.Z.02 dep 25.83 -0.03 - - - - - 5 + 503 CFH12K.Z.03 dep 25.83 -0.03 - - - - - 5 + 504 CFH12K.Z.04 dep 25.83 -0.03 - - - - - 5 + 505 CFH12K.Z.05 dep 25.83 -0.03 - - - - - 5 + 506 CFH12K.Z.06 dep 25.83 -0.03 - - - - - 5 + 507 CFH12K.Z.07 dep 25.83 -0.03 - - - - - 5 + 508 CFH12K.Z.08 dep 25.83 -0.03 - - - - - 5 + 509 CFH12K.Z.09 dep 25.83 -0.03 - - - - - 5 + 510 CFH12K.Z.10 dep 25.83 -0.03 - - - - - 5 + 511 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 + + 700 CFH12K.HaOff.00 dep 25.000 0.04 - - - - - 5 + 701 CFH12K.HaOff.01 dep 25.000 0.04 - - - - - 5 + 702 CFH12K.HaOff.02 dep 25.000 0.04 - - - - - 5 + 703 CFH12K.HaOff.03 dep 25.000 0.04 - - - - - 5 + 704 CFH12K.HaOff.04 dep 25.000 0.04 - - - - - 5 + 705 CFH12K.HaOff.05 dep 25.000 0.04 - - - - - 5 + 706 CFH12K.HaOff.06 dep 25.000 0.04 - - - - - 5 + 707 CFH12K.HaOff.07 dep 25.000 0.04 - - - - - 5 + 708 CFH12K.HaOff.08 dep 25.000 0.04 - - - - - 5 + 709 CFH12K.HaOff.09 dep 25.000 0.04 - - - - - 5 + 710 CFH12K.HaOff.10 dep 25.000 0.04 - - - - - 5 + 711 CFH12K.HaOff.11 dep 25.000 0.04 - - - - - 5 + + 800 CFH12K.CN.00 dep 25.000 0.04 - - - - - 5 + 801 CFH12K.CN.01 dep 25.000 0.04 - - - - - 5 + 802 CFH12K.CN.02 dep 25.000 0.04 - - - - - 5 + 803 CFH12K.CN.03 dep 25.000 0.04 - - - - - 5 + 804 CFH12K.CN.04 dep 25.000 0.04 - - - - - 5 + 805 CFH12K.CN.05 dep 25.000 0.04 - - - - - 5 + 806 CFH12K.CN.06 dep 25.000 0.04 - - - - - 5 + 807 CFH12K.CN.07 dep 25.000 0.04 - - - - - 5 + 808 CFH12K.CN.08 dep 25.000 0.04 - - - - - 5 + 809 CFH12K.CN.09 dep 25.000 0.04 - - - - - 5 + 810 CFH12K.CN.10 dep 25.000 0.04 - - - - - 5 + 811 CFH12K.CN.11 dep 25.000 0.04 - - - - - 5 + + 900 CFH12K.TiO.00 dep 25.000 0.04 - - - - - 5 + 901 CFH12K.TiO.01 dep 25.000 0.04 - - - - - 5 + 902 CFH12K.TiO.02 dep 25.000 0.04 - - - - - 5 + 903 CFH12K.TiO.03 dep 25.000 0.04 - - - - - 5 + 904 CFH12K.TiO.04 dep 25.000 0.04 - - - - - 5 + 905 CFH12K.TiO.05 dep 25.000 0.04 - - - - - 5 + 906 CFH12K.TiO.06 dep 25.000 0.04 - - - - - 5 + 907 CFH12K.TiO.07 dep 25.000 0.04 - - - - - 5 + 908 CFH12K.TiO.08 dep 25.000 0.04 - - - - - 5 + 909 CFH12K.TiO.09 dep 25.000 0.04 - - - - - 5 + 910 CFH12K.TiO.10 dep 25.000 0.04 - - - - - 5 + 911 CFH12K.TiO.11 dep 25.000 0.04 - - - - - 5 + + 950 CFH12K.NB920.00 dep 25.000 0.04 - - - - - 5 + 951 CFH12K.NB920.01 dep 25.000 0.04 - - - - - 5 + 952 CFH12K.NB920.02 dep 25.000 0.04 - - - - - 5 + 953 CFH12K.NB920.03 dep 25.000 0.04 - - - - - 5 + 954 CFH12K.NB920.04 dep 25.000 0.04 - - - - - 5 + 955 CFH12K.NB920.05 dep 25.000 0.04 - - - - - 5 + 956 CFH12K.NB920.06 dep 25.000 0.04 - - - - - 5 + 957 CFH12K.NB920.07 dep 25.000 0.04 - - - - - 5 + 958 CFH12K.NB920.08 dep 25.000 0.04 - - - - - 5 + 959 CFH12K.NB920.09 dep 25.000 0.04 - - - - - 5 + 960 CFH12K.NB920.10 dep 25.000 0.04 - - - - - 5 + 961 CFH12K.NB920.11 dep 25.000 0.04 - - - - - 5 + + 970 CFH12K.B2F.00 dep 25.000 0.04 - - - - - 5 + 971 CFH12K.B2F.01 dep 25.000 0.04 - - - - - 5 + 972 CFH12K.B2F.02 dep 25.000 0.04 - - - - - 5 + 973 CFH12K.B2F.03 dep 25.000 0.04 - - - - - 5 + 974 CFH12K.B2F.04 dep 25.000 0.04 - - - - - 5 + 975 CFH12K.B2F.05 dep 25.000 0.04 - - - - - 5 + 976 CFH12K.B2F.06 dep 25.000 0.04 - - - - - 5 + 977 CFH12K.B2F.07 dep 25.000 0.04 - - - - - 5 + 978 CFH12K.B2F.08 dep 25.000 0.04 - - - - - 5 + 979 CFH12K.B2F.09 dep 25.000 0.04 - - - - - 5 + 980 CFH12K.B2F.10 dep 25.000 0.04 - - - - - 5 + 981 CFH12K.B2F.11 dep 25.000 0.04 - - - - - 5 + + 2000 U_BESS dep 25.0 0.10 - - - - - 5 + 2001 B_BESS dep 25.0 0.10 - - - - - 1 + 2002 V_BESS dep 25.0 0.10 - - - - - 2 + 2003 R_BESS dep 25.0 0.10 - - - - - 3 + 2004 I_BESS dep 25.0 0.10 - - - - - 4 Index: /tags/base-1-5-0/Ohana/test/addstar/refcat.sa/ptolemy.rc =================================================================== --- /tags/base-1-5-0/Ohana/test/addstar/refcat.sa/ptolemy.rc (revision 11429) +++ /tags/base-1-5-0/Ohana/test/addstar/refcat.sa/ptolemy.rc (revision 11429) @@ -0,0 +1,25 @@ +# .ptolemyrc + +REFDIR ../../refs + +# asca camera settings +UT-KEYWORD UTSHUT +DATE-KEYWORD DATE +DATE-MODE yyyy-mm-dd + +# matching radius (arcseconds) +# RADIUS 1.0 (old name, deprecated) +ADDSTAR_RADIUS 1.0 + +GSCFILE $REFDIR/GSCregions.tbl +CATDIR catdir +PHOTCODE_FILE photcode.txt + +USNO_A_DIR /data/elixir/srcdir/refs/usno +USNO_B_DIR /data/elixir/srcdir/refs/usnob + +ZERO_PT 25.0 + +GSCDIR /data/elixir/srcdir/refs/gsc +2MASS_DIR_AS /data/elixir/srcdir/refs/2mass.allsky +2MASS_DIR_DR2 /data/elixir/srcdir/refs/2mass.dr2 Index: /tags/base-1-5-0/Ohana/test/photdbc/Makefile =================================================================== --- /tags/base-1-5-0/Ohana/test/photdbc/Makefile (revision 11429) +++ /tags/base-1-5-0/Ohana/test/photdbc/Makefile (revision 11429) @@ -0,0 +1,24 @@ + +clean: + rm -rf catdir.output.copy + rm -rf catdir.output.clip + rm -rf catdir.output.clip2 + +empty: clean + rm -rf catdir.input + rm -rf catdir.in2 + +init: + rm -rf catdir.input + addstar -D CATDIR catdir.input -cat usno -p USNO_RED -region 0 1 0 1 + addstar -D CATDIR catdir.in2 -cat usno -p USNO_RED -region 0 1 0 1 + addstar -D CATDIR catdir.in2 -cat usno -p USNO_BLUE -region 0 1 0 1 + +copy: + photdbc -D CATDIR catdir.input catdir.output.copy -region 0 1 0 1 + +clip: + photdbc -D CATDIR catdir.input catdir.output.clip -region 0 1 0 1 -maxminmag 14.0 + +clip2: + photdbc -D CATDIR catdir.in2 catdir.output.clip2 -region 0 1 0 1 -maxminmag 14.0 Index: /tags/base-1-5-0/Ohana/test/photdbc/photcode.txt =================================================================== --- /tags/base-1-5-0/Ohana/test/photdbc/photcode.txt (revision 11429) +++ /tags/base-1-5-0/Ohana/test/photdbc/photcode.txt (revision 11429) @@ -0,0 +1,75 @@ +# 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. + +# a bogosity in scatfit: it assumes primary photcodes are those which +# N % 50 == 0 + +# I discovered that the standards star analysis and the photreg +# process are inconsistent. the standard star analysis was using the +# per-chip zero-points while photreg was using the per-filter +# zero-points. these should have been the same, but were not. See +# cfh12.photcode.original for the version with this error. This file +# now contains consistent entries + +# code name type zero airmass offset c1 c2 slope equivalence +# 1 B pri 26.017 -0.15 - 1023 1024 0.016 - 1 +# 2 V sec 26.220 -0.12 - 1023 1024 0.008 - 2 +# 3 R sec 26.190 -0.09 - 1024 1025 0.028 - 3 +# 4 I sec 26.185 -0.04 - 1025 1027 0.107 - 4 + +# 1 B pri 26.017 -0.15 - 1003 1004 0.016 - 1 +# 2 V sec 26.220 -0.12 - 1003 1004 0.008 - 2 +# 3 R sec 26.190 -0.09 - 1004 1005 0.028 - 3 +# 4 I sec 26.185 -0.04 - 1005 1007 0.107 - 4 + + 1 B pri 26.000 -0.15 - 1003 1004 0.016 - 1 + 2 V sec 26.150 -0.12 - 1003 1004 0.008 - 2 + 3 R sec 26.190 -0.09 - 1003 1004 0.028 - 3 + 4 I sec 26.135 -0.04 - 1003 1004 0.107 - 4 + 5 Z sec 25.830 -0.03 - - - - - 5 + + 1000 USNO_BLUE ref - - - - - - - - + 1001 USNO_RED ref - - - - - - - - + + 50 ASCA_RED dep 10.000 0.0 - - - - - 3 + 51 ASCA_BLUE dep 10.000 0.0 - - - - - 3 + + 1002 U_L92 ref - - - - - - - - + 1003 B_L92 ref - - - - - - - - + 1004 V_L92 ref - - - - - - - - + 1005 R_L92 ref - - - - - - - - + 1007 I_L92 ref - - - - - - - - + + 1022 U_L92_HQ ref - - - - - - - - + 1023 B_L92_HQ ref - - - - - - - - + 1024 V_L92_HQ ref - - - - - - - - + 1025 R_L92_HQ ref - - - - - - - - + 1027 I_L92_HQ ref - - - - - - - - + + 1012 U_STET ref - - - - - - - - + 1013 B_STET ref - - - - - - - - + 1014 V_STET ref - - - - - - - - + 1015 R_STET ref - - - - - - - - + 1017 I_STET ref - - - - - - - - + + 1100 GSC_M ref - - - - - - - - + 1101 SAO ref - - - - - - - - + + 1200 TYCHO_B ref - - - - - - - - + 1201 TYCHO_V ref - - - - - - - - + + 2011 2MASS_J ref - - - - - - - - + 2012 2MASS_H ref - - - - - - - - + 2013 2MASS_K ref - - - - - - - - + + 100 CFH12K.B.00 dep 26.000 -0.15 - - - - - 1 + 101 MEGACAM.r.13 dep 26.000 -0.15 - - - - - 1 Index: /tags/base-1-5-0/Ohana/test/photdbc/ptolemy.rc =================================================================== --- /tags/base-1-5-0/Ohana/test/photdbc/ptolemy.rc (revision 11429) +++ /tags/base-1-5-0/Ohana/test/photdbc/ptolemy.rc (revision 11429) @@ -0,0 +1,23 @@ +# .ptolemyrc + +REFSDIR ../../refs + +# asca camera settings +UT-KEYWORD UTSHUT +DATE-KEYWORD DATE +DATE-MODE yyyy-mm-dd + +# matching radius (arcseconds) +# RADIUS 1.0 (old name, deprecated) +ADDSTAR_RADIUS 1.0 + +GSCFILE ../refs/GSCregions.tbl +CATDIR catdir +PHOTCODE_FILE photcode.txt + +USNO_A_DIR /data/elixir/srcdir/refs/usno +USNO_B_DIR /data/elixir/srcdir/refs/usnob + +ZERO_PT 25.0 + +GSCDIR /data/elixir/srcdir/refs/gsc