Index: /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/compress.dvo
===================================================================
--- /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/compress.dvo	(revision 38523)
+++ /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/compress.dvo	(revision 38524)
@@ -2,4 +2,9 @@
 
 input tap.dvo
+input ptolemy.dvo
+
+# generates ptolemy.rc, dvo.photcodes, $zpt_nominal:g,r $klam_nominal:g,r
+mkptolemy.rc
+
 $CATDIR = catdir.test.v0
 
@@ -38,5 +43,5 @@
   mkinput
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC -type $1 $NO_NOISE
-  tapEXEC addstar -D CATCOMPRESS $3 -D CATDIR $CATDIR -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
+  tapEXEC addstar -D CATCOMPRESS $3 -D CATDIR $CATDIR -D CAMERA gpc1 test.cmf -D CATFORMAT $2 -quick-airmass
 
   list testfields -copy testfields_$1
Index: /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/dvomerge.dvo
===================================================================
--- /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/dvomerge.dvo	(revision 38523)
+++ /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/dvomerge.dvo	(revision 38524)
@@ -2,4 +2,8 @@
 
 input tap.dvo
+input ptolemy.dvo
+
+# generates ptolemy.rc, dvo.photcodes, $zpt_nominal:g,r $klam_nominal:g,r
+mkptolemy.rc
 
 macro test.all
@@ -22,26 +26,26 @@
   mkinput
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec 10.0 20.0
-  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 02:00:00 -radec 10.0 20.0
-  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 03:00:00 -radec 9.9 20.0
-  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 04:00:00 -radec 9.9 20.0
-  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 05:00:00 -radec 10.0 19.9
-  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 06:00:00 -radec 10.0 19.9
-  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 07:00:00 -radec 9.9 19.9
-  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 08:00:00 -radec 9.9 19.9
-  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA gpc1 test.cmf -quick-airmass
 
   break
@@ -141,14 +145,14 @@
   mkinput
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC
-  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 02:00:00 -radec $RA $DEC
-  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 03:00:00 -radec $RA $DEC
-  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 04:00:00 -radec $RA $DEC
-  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC rsync -auc catdir.test2/ catdir.test3/
@@ -245,8 +249,8 @@
   mkinput
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC
-  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 02:00:00 -radec $RA $DEC
-  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA gpc1 test.cmf -quick-airmass
 
   date -var t1 -seconds -reftime 1276000000
@@ -322,16 +326,16 @@
   mkinput
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC
-  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 02:00:00 -radec $RA $DEC
-  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA gpc1 test.cmf -quick-airmass
 
   # generate a few extra unmatched sources 
   mkinput.extras
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 03:00:00 -radec $RA $DEC
-  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 04:00:00 -radec $RA $DEC
-  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC rsync -auc catdir.test2/ catdir.test3/
@@ -426,14 +430,14 @@
   mkinput
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC
-  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 02:00:00 -radec $RA $DEC
-  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test1 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 03:00:00 -radec $RA $DEC
-  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 04:00:00 -radec $RA $DEC
-  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA simtest test.cmf -quick-airmass
+  tapEXEC addstar -D CATDIR catdir.test2 -D CAMERA gpc1 test.cmf -quick-airmass
 
   tapEXEC dvomerge catdir.test1 and catdir.test2 to catdir.test3
Index: /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/relastro.dvo
===================================================================
--- /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/relastro.dvo	(revision 38523)
+++ /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/relastro.dvo	(revision 38524)
@@ -2,4 +2,8 @@
 
 input tap.dvo
+input ptolemy.dvo
+
+# generates ptolemy.rc, dvo.photcodes, $zpt_nominal:g,r $klam_nominal:g,r
+mkptolemy.rc
 
 macro test.all
@@ -60,5 +64,5 @@
     mkinput $offset:$i
     exec mkcmf test.in.txt test.cmf -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC -type $1
-    exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2
+    exec addstar -D CATDIR catdir.test -D CAMERA gpc1 test.cmf -D CATFORMAT $2
   end
 
Index: /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/relphot.dvo
===================================================================
--- /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/relphot.dvo	(revision 38523)
+++ /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/relphot.dvo	(revision 38524)
@@ -3,4 +3,8 @@
 
 input tap.dvo
+input ptolemy.dvo
+
+# generates ptolemy.rc, dvo.photcodes, $zpt_nominal:g,r $klam_nominal:g,r
+mkptolemy.rc
 
 macro test.all
@@ -39,5 +43,5 @@
     mkinput $offset:$i
     exec mkcmf test.in.txt test.cmf -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC -type $1
-    exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
+    exec addstar -D CATDIR catdir.test -D CAMERA gpc1 test.cmf -D CATFORMAT $2 -quick-airmass
   end
 
Index: /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/relphot.flatcorr.dvo
===================================================================
--- /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/relphot.flatcorr.dvo	(revision 38523)
+++ /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/relphot.flatcorr.dvo	(revision 38524)
@@ -17,4 +17,5 @@
 $TAP_VERBOSE = 1
 input tap.dvo
+input ptolemy.dvo
 
 # set globals
@@ -31,47 +32,7 @@
 # set various global variables
 macro init
-  # generate a fake ptolemy.rc (to make this a contained test)
-  exec rm -f ptolemy.rc
-  output ptolemy.rc
-    echo "\#"
-    echo PHOTCODE_FILE dvo.photcodes
-    echo GSCFILE GSCregions.tbl
-    echo ZERO_PT 25.0
-    echo ADDSTAR_RADIUS 1.0
-    echo CATMODE                 SPLIT
-    echo CATFORMAT               PS1_V5
-    # echo CATFORMAT               PS1_V2 -- must be at least PS1_V3 for ubercaldist to work
-    echo SKY_DEPTH               4
-    echo CAMERA                  gpc1
-    echo CAMERA_CONFIG           dvo.layout
-    echo "input dvo.config"
-  output stdout
-
-  # we need to define a photcode table consistent with the fake construction
-  $zpt_nominal:g = 24.0
-  $zpt_nominal:r = 24.5
-
-  # klam is negative, so klam*(airmass - 1) increases the zero point
-  $klam_nominal:g = -0.15
-  $klam_nominal:r = -0.10
-
-  # generate a fake dvo.photcode
-  exec rm -f dvo.photcodes
-  output dvo.photcodes
-    echo "\# code  name                type    zero  slope offset c1    c2   slope   zero  equiv  sys scale   scale  sys     poor   bad     poor   bad"
-    echo "1     g                    sec   0.000  0.000 0.000     1     3 0.0000     0  1051   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000"
-    echo "2     r                    sec   0.000  0.000 0.000     2     3 0.0000     0  1052   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000"
-    echo "10000 GPC1.g.XY00          dep  $zpt_nominal:g $klam_nominal:g 0.000     -     - 0.0000     0     1   0.015 0.000 1.000  0.000   0x0000 0x0000  0xe0440130 0x1003bc88"
-    echo "10001 GPC1.g.XY01          dep  $zpt_nominal:g $klam_nominal:g 0.000     -     - 0.0000     0     1   0.015 0.000 1.000  0.000   0x0000 0x0000  0xe0440130 0x1003bc88"
-    echo "10010 GPC1.g.XY10          dep  $zpt_nominal:g $klam_nominal:g 0.000     -     - 0.0000     0     1   0.015 0.000 1.000  0.000   0x0000 0x0000  0xe0440130 0x1003bc88"
-    echo "10011 GPC1.g.XY11          dep  $zpt_nominal:g $klam_nominal:g 0.000     -     - 0.0000     0     1   0.015 0.000 1.000  0.000   0x0000 0x0000  0xe0440130 0x1003bc88"
-    echo "10100 GPC1.r.XY00          dep  $zpt_nominal:r $klam_nominal:r 0.000     -     - 0.0000     0     1   0.015 0.000 1.000  0.000   0x0000 0x0000  0xe0440130 0x1003bc88"
-    echo "10101 GPC1.r.XY01          dep  $zpt_nominal:r $klam_nominal:r 0.000     -     - 0.0000     0     1   0.015 0.000 1.000  0.000   0x0000 0x0000  0xe0440130 0x1003bc88"
-    echo "10110 GPC1.r.XY10          dep  $zpt_nominal:r $klam_nominal:r 0.000     -     - 0.0000     0     1   0.015 0.000 1.000  0.000   0x0000 0x0000  0xe0440130 0x1003bc88"
-    echo "10111 GPC1.r.XY11          dep  $zpt_nominal:r $klam_nominal:r 0.000     -     - 0.0000     0     1   0.015 0.000 1.000  0.000   0x0000 0x0000  0xe0440130 0x1003bc88"
-    echo "2011  2MASS_J              ref   0.000  0.000 0.000     -     - 0.0000     0     6   0.080 0.000 2.000  0.000   0x0000 0x0000  0x0000 0x0000"
-    echo "3001  SYNTH.g              ref   0.000  0.000 0.000     -     - 0.0000     0     1     nan 0.000 2.000  0.600   0x0000 0x0000  0x0000 0x0000"
-    echo "2020  TYCHO_B              ref   0.000  0.000 0.000     -     - 0.0000     0     -   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000"
-  output stdout      
+
+  # generates ptolemy.rc, dvo.photcodes, $zpt_nominal:g,r $klam_nominal:g,r
+  mkptolemy.rc
 
   $RA_CENTER = 10.0
@@ -897,5 +858,5 @@
     mkinput test.in.txt $offset:$i
     exec mkcmf test.in.txt test.cmf -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC -type $1
-    exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2
+    exec addstar -D CATDIR catdir.test -D CAMERA gpc1 test.cmf -D CATFORMAT $2
   end
 
Index: /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/relphot.parallel.dvo
===================================================================
--- /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/relphot.parallel.dvo	(revision 38523)
+++ /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/relphot.parallel.dvo	(revision 38524)
@@ -5,4 +5,8 @@
 
 input tap.dvo
+input ptolemy.dvo
+
+# generates ptolemy.rc, dvo.photcodes, $zpt_nominal:g,r $klam_nominal:g,r
+mkptolemy.rc
 
 # set globals
Index: /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/relphot.reject.dvo
===================================================================
--- /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/relphot.reject.dvo	(revision 38523)
+++ /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/relphot.reject.dvo	(revision 38524)
@@ -15,4 +15,8 @@
 
 input tap.dvo
+input ptolemy.dvo
+
+# generates ptolemy.rc, dvo.photcodes, $zpt_nominal:g,r $klam_nominal:g,r
+mkptolemy.rc
 
 # set globals
Index: /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/simple.dvo
===================================================================
--- /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/simple.dvo	(revision 38523)
+++ /branches/eam_branches/ipp-20150616/Ohana/src/addstar/test/simple.dvo	(revision 38524)
@@ -2,4 +2,12 @@
 
 input tap.dvo
+input ptolemy.dvo
+
+# generates ptolemy.rc, dvo.photcodes, $zpt_nominal:g,r $klam_nominal:g,r
+mkptolemy.rc
+
+macro test.one
+  test.fields PS1_V5    PS1_V4
+end
 
 macro test.all
@@ -54,6 +62,24 @@
 
   mkinput
-  tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC -type $1 $NO_NOISE
-  tapEXEC addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
+  # tapEXEC mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC -type $1 $NO_NOISE
+
+  $options = 
+  $options = $options -type $1
+  $options = $options -radec $RA $DEC
+  $options = $options -mjd 54466.041667
+  $options = $options -date 2008/1/1 -time 01:00:00
+  $options = $options -photcode GPC1.g.XY00
+  $options = $options $NO_NOISE
+
+  # $options = $options -flags
+  # $options = $options -bad-psfqf-frac $DEFECT_FRAC
+  # $options = $options -size $CHIP_DX $CHIP_DY 
+  # $options = $options -crpix {0.5*$CHIP_DX} {0.5*$CHIP_DY} 
+  # $options = $options -airmass $AIRMASS
+  # $options = $options -exptime $EXPTIME
+  # $options = $options -coords 
+
+  tapEXEC mkcmf test.in.txt test.cmf $options
+  tapEXEC addstar -D CATDIR catdir.test -D CAMERA gpc1 test.cmf -D CATFORMAT $2 -quick-airmass
 
   list testfields -copy testfields_$1