Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/test/addstar.tests.txt
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/test/addstar.tests.txt	(revision 27351)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/test/addstar.tests.txt	(revision 27352)
@@ -6,2 +6,5 @@
    * check all fields in the input file against the dvo database
 
+2) addstar matches:
+  * ingest fake cmf 2x
+  * check for 
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/test/relastro.dvo
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/test/relastro.dvo	(revision 27352)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/test/relastro.dvo	(revision 27352)
@@ -0,0 +1,106 @@
+
+input tap.dvo
+
+# offset values are in pixels
+list offset
+  0.5
+ -0.5
+  0.5
+  0.5
+end
+
+# create a populated catdir with a couple of cmf files
+macro test.relastro
+
+  tapPLAN 28
+
+  exec rm -rf catdir.test
+
+  $RA = 10.0
+  $DEC = 20.0
+
+  for i 0 $offset:n
+    mkinput $offset:$i
+    exec mkcmf test.in.txt test.cmf -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC
+    exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf
+  end
+
+  rd im test.cmf -head
+  keyword im CDELT1 cdelt
+
+  catdir catdir.test
+  skyregion {$RA-1.0} {$RA+1.0} {$DEC-1.0} {$DEC+1.0} 
+
+  mextract RA DEC RA:AVE DEC:AVE dR dD
+  create n 0 RA[]
+
+  for i 0 $offset:n
+    subset dr = dR if (n % 4 == $i)
+    vstat -q dr
+    tapOK {abs($offset:0 - $MEAN / (3600*$cdelt) - $offset:$i) < 0.1} "raw dX $i = {$MEAN / (3600*$cdelt)}"
+  end
+
+  for N 0 3
+    exec relastro -D CATDIR catdir.test -region {$RA-1.0} {$RA+1.0} {$DEC-1.0} {$DEC+1.0} -update-objects -update
+    mextract RA DEC RA:AVE DEC:AVE dR dD mag
+    create n 0 RA[]
+  
+    $dXmean = 0
+    for i 0 $offset:n
+      $dXmean = $dXmean + $offset:$i
+    end
+    $dXmean = $dXmean / $offset:n
+  
+    for i 0 $offset:n
+      subset dr = dR if (n % 4 == $i)
+      vstat -q dr
+  
+      $dXexpect = $MEAN / (3600*$cdelt)
+      if ($N == 0)
+        $dXexpect = $dXmean - $MEAN / (3600*$cdelt) - $offset:$i 
+      end
+      tapOK {abs($dXexpect) < 0.1} "update objects dX $i = {$MEAN / (3600*$cdelt)}"
+  
+      # subset ms = mag if (n % 4 == $i)
+      # lim ms dr; clear; box; plot ms dr
+      # cursor
+    end
+  
+    exec relastro -D CATDIR catdir.test -region {$RA-1.0} {$RA+1.0} {$DEC-1.0} {$DEC+1.0} -update-simple -update
+    mextract RA DEC RA:AVE DEC:AVE dR dD
+    create n 0 RA[]
+  
+    for i 0 $offset:n
+      subset dr = dR if (n % 4 == $i)
+      vstat -q dr
+  
+      $dXexpect = $MEAN / (3600*$cdelt)
+      tapOK {abs($dXexpect) < 0.1} "update simple dX $i = {$MEAN / (3600*$cdelt)}"
+  
+      # subset ms = mag if (n % 4 == $i)
+      # lim ms dr; clear; box; plot ms dr
+      # cursor
+    end
+  end
+
+  tapDONE
+end
+
+# make a simple input file for mkcmf
+macro mkinput
+  if ($0 != 2)
+    echo "mkinput (offset)"
+    break
+  end
+
+  local i j
+  exec rm -f test.in.txt
+
+  output test.in.txt
+  for i 10 1024 100
+    for j 10 1024 100
+      fprintf " %6.1f %6.1f  %7.3f" {$i + $1} $j {-15.0 + 2.5*($i + $j)/1000.0}
+    end
+  end
+  output stdout
+end
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/test/relphot.dvo
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/test/relphot.dvo	(revision 27352)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/test/relphot.dvo	(revision 27352)
@@ -0,0 +1,58 @@
+
+input tap.dvo
+
+list offset
+  0.000
+ -0.025
+  0.025
+  0.010
+end
+
+# create a populated catdir with a couple of cmf files
+macro test.relphot
+
+  tapPLAN 4
+
+  exec rm -rf catdir.test
+
+  $RA = 10.0
+  $DEC = 20.0
+
+  for i 0 $offset:n
+    mkinput $offset:$i
+    exec mkcmf test.in.txt test.cmf -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC
+    exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf 
+  end
+
+  exec relphot -D CATDIR catdir.test r -region {$RA-1.0} {$RA+1.0} {$DEC-1.0} {$DEC+1.0} -update -nloop 10.0 >& /dev/null
+
+  catdir catdir.test
+  skyregion {$RA-1.0} {$RA+1.0} {$DEC-1.0} {$DEC+1.0} 
+
+  imextract time Mcal
+
+  for i 0 $offset:n
+    tapOK {abs(Mcal[$i] - Mcal[0] - $offset:$i) < 0.001} "Mcal $i"
+  end
+
+  tapDONE
+end
+
+# make a simple input file for mkcmf
+macro mkinput
+  if ($0 != 2)
+    echo "mkinput (offset)"
+    break
+  end
+
+  exec rm -f test.in.txt
+
+  local i j
+  output test.in.txt
+  for i 10 1024 100
+    for j 10 1024 100
+      fprintf " %6.1f %6.1f  %7.3f" $i $j {-15.0 + $1 + 2.5*($i + $j)/1000.0}
+    end
+  end
+  output stdout
+end
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/test/simple.dvo
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/test/simple.dvo	(revision 27351)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/test/simple.dvo	(revision 27352)
@@ -1,2 +1,4 @@
+
+input tap.dvo
 
 # create a populated catdir with a couple of cmf files
@@ -104,49 +106,2 @@
 end
 
-macro tapOK
-  if ($0 != 3) 
-    echo "USAGE: tapOK (condition) (message)"
-    break
-  end
-
-  if ($1)
-    echo "ok : $2"
-    $TAP_LAST = 1
-  else
-    echo "not ok : $2"
-    $TAP_NFAIL ++
-    $TAP_LAST = 0
-  end
-  $TAP_NDONE ++
-end
-
-macro tapPLAN
-  if ($0 != 2) 
-    echo "USAGE: tapPLAN (Ntests)"
-    break
-  end
-
-  $TAP_NTEST = $1
-  $TAP_NFAIL = 0
-  $TAP_NDONE = 0
-end
-
-macro tapDONE
-  if ($0 != 1) 
-    echo "USAGE: tapDONE"
-    break
-  end
-
-  if ($TAP_NDONE != $TAP_NTEST) 
-    echo "planned tests ($TAP_NTEST) not equal to done tests ($TAP_NDONE)"
-  end
-
-  if ($TAP_NFAIL) 
-    echo "failed $TAP_NFAIL of $TAP_NDONE"
-  end
-
-  if ($TAP_NFAIL == 0) 
-    echo "passed $TAP_NDONE tests"
-  end
-end
-
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/test/tap.dvo
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/test/tap.dvo	(revision 27352)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/test/tap.dvo	(revision 27352)
@@ -0,0 +1,51 @@
+
+macro tapOK
+  if ($0 != 3) 
+    echo "USAGE: tapOK (condition) (message)"
+    break
+  end
+
+  if ($1)
+    echo "ok : $2"
+    $TAP_LAST = 1
+  else
+    echo "not ok : $2"
+    $TAP_NFAIL ++
+    $TAP_LAST = 0
+    if ($TAP_BREAK)
+     break
+    end
+  end
+  $TAP_NDONE ++
+end
+
+macro tapPLAN
+  if ($0 != 2) 
+    echo "USAGE: tapPLAN (Ntests)"
+    break
+  end
+
+  $TAP_NTEST = $1
+  $TAP_NFAIL = 0
+  $TAP_NDONE = 0
+  if (not($?TAP_BREAK)) set TAP_BREAK = 0
+end
+
+macro tapDONE
+  if ($0 != 1) 
+    echo "USAGE: tapDONE"
+    break
+  end
+
+  if ($TAP_NDONE != $TAP_NTEST) 
+    echo "planned tests ($TAP_NTEST) not equal to done tests ($TAP_NDONE)"
+  end
+
+  if ($TAP_NFAIL) 
+    echo "failed $TAP_NFAIL of $TAP_NDONE"
+  end
+
+  if ($TAP_NFAIL == 0) 
+    echo "passed $TAP_NDONE tests"
+  end
+end