Index: /branches/eam_branches/ipp-20121219/ippToPsps/Makefile.am
===================================================================
--- /branches/eam_branches/ipp-20121219/ippToPsps/Makefile.am	(revision 34999)
+++ /branches/eam_branches/ipp-20121219/ippToPsps/Makefile.am	(revision 35000)
@@ -1,3 +1,4 @@
-SUBDIRS = config jars jython src
+# SUBDIRS = config jars jython src
+SUBDIRS = config jars jython 
 
 CLEANFILES = *.pyc *~ core core.*
Index: /branches/eam_branches/ipp-20121219/ippToPsps/config/settings.xml
===================================================================
--- /branches/eam_branches/ipp-20121219/ippToPsps/config/settings.xml	(revision 34999)
+++ /branches/eam_branches/ipp-20121219/ippToPsps/config/settings.xml	(revision 35000)
@@ -5,5 +5,6 @@
 
   <!-- path for storing logs -->
-  <logPath>/home/kiawe/eugene/ipptopsps</logPath>
+  <!-- XXX Need to make this different for tests and real, also for different installations -->
+  <logPath>testdata/logs</logPath>
 
   <!-- local scratch Db section -->
Index: /branches/eam_branches/ipp-20121219/ippToPsps/test/fulltest.sh
===================================================================
--- /branches/eam_branches/ipp-20121219/ippToPsps/test/fulltest.sh	(revision 34999)
+++ /branches/eam_branches/ipp-20121219/ippToPsps/test/fulltest.sh	(revision 35000)
@@ -13,10 +13,13 @@
 # mkgpc1.sh user localhost eam eam
 
-set mkgpc1 = 0
-set initdb = 0
-set mkdummy = 0
-set initscratch = 0
+set mkgpc1 = 1
+set initdb = 1
+set mkdummy = 1
+set initscratch = 1
 set createqueue = 1
-set initbatch = 0
+set initbatch = 1
+set onebatch = 1
+
+set OUTDIR = "testdata"
 set queuename = "test"
 
@@ -89,5 +92,5 @@
 0
 catdir.cam
-catdir.cam
+$OUTDIR/catdir.cam
 9
 11
@@ -95,5 +98,5 @@
 21
 1
-test
+$OUTDIR
 0
 0
@@ -116,2 +119,6 @@
 endif
 
+if ($onebatch) then
+  ippjython loader.py $queuename once
+endif
+
Index: /branches/eam_branches/ipp-20121219/ippToPsps/test/mkgpc1data.dvo
===================================================================
--- /branches/eam_branches/ipp-20121219/ippToPsps/test/mkgpc1data.dvo	(revision 34999)
+++ /branches/eam_branches/ipp-20121219/ippToPsps/test/mkgpc1data.dvo	(revision 35000)
@@ -6,28 +6,34 @@
 
 macro test.all
-  test.relphot PS1_V2 	PS1_V2
+  test.relphot PS1_V2 PS1_V2
 end  
+
+## this script must be run in this directory, output data goes to 'testdata'
+$OUTDIR = testdata
+
+# note that ipptopsps and gpc1db need the path ex extension
+# I'm setting the base filename without the .smf and add it in mkcatdir.*
 
 # imagedata describes the full fake exposure set.  the fields are
 # exp_id stack_id raw_file exp_file offset
 list imagedata
- 1 1 test.01.txt test.01.smf  0.000 
- 2 1 test.02.txt test.02.smf -0.025
- 3 1 test.03.txt test.03.smf  0.025
- 4 1 test.04.txt test.04.smf  0.010
- 5 2 test.05.txt test.05.smf  0.000 
- 6 2 test.06.txt test.06.smf -0.025
- 7 2 test.07.txt test.07.smf  0.025
- 8 2 test.08.txt test.08.smf  0.010
- 9 3 test.09.txt test.09.smf  0.000 
-10 3 test.10.txt test.10.smf -0.025
-11 3 test.11.txt test.11.smf  0.025
-12 3 test.12.txt test.12.smf  0.010
+ 1 1 $OUTDIR/test.01  0.000 
+ 2 1 $OUTDIR/test.02 -0.025
+ 3 1 $OUTDIR/test.03  0.025
+ 4 1 $OUTDIR/test.04  0.010
+ 5 2 $OUTDIR/test.05  0.000 
+ 6 2 $OUTDIR/test.06 -0.025
+ 7 2 $OUTDIR/test.07  0.025
+ 8 2 $OUTDIR/test.08  0.010
+ 9 3 $OUTDIR/test.09  0.000 
+10 3 $OUTDIR/test.10 -0.025
+11 3 $OUTDIR/test.11  0.025
+12 3 $OUTDIR/test.12  0.010
 end
 
 list stackdata
- 1 stack.01.txt stack.01.cmf 0.010
- 2 stack.02.txt stack.02.cmf 0.020
- 3 stack.03.txt stack.03.cmf 0.030
+ 1 $OUTDIR/stack.01 0.010
+ 2 $OUTDIR/stack.02 0.020
+ 3 $OUTDIR/stack.03 0.030
 end
  
@@ -54,5 +60,5 @@
   exec mkgpc1.sh create $dbhost $dbname $dbuser $dbpass
 
-  dbconnect $dbhost $dbuser $dbname
+  dbconnect $dbhost $dbuser $dbname -p $dbpass
 
   # system-wide info
@@ -70,6 +76,8 @@
   # tapPLAN 4
 
+  mkdir $OUTDIR
+
   local i catdir RA DEC ID rawfile cmffile offset
-  $catdir = catdir.cam
+  $catdir = $OUTDIR/catdir.cam
   exec rm -rf $catdir
 
@@ -83,7 +91,7 @@
     list word -split $imagedata:$i
     $ID = $word:0
-    $rawfile = $word:2
-    $cmffile = $word:3
-    $offset = $word:4
+    $rawfile = $word:2\.txt
+    $cmffile = $word:2\.smf
+    $offset = $word:3
 
     ctimes -ref 2008/01/01,$i\:00:00 -var mjd
@@ -116,6 +124,8 @@
   # tapPLAN 4
 
+  mkdir $OUTDIR
+
   local i catdir RA DEC ID rawfile cmffile offset
-  $catdir = catdir.stk
+  $catdir = $OUTDIR/catdir.stk
   exec rm -rf $catdir
 
@@ -126,7 +136,7 @@
     list word -split $stackdata:$i
     $ID = $word:0
-    $rawfile = $word:1
-    $cmffile = $word:2
-    $offset = $word:3
+    $rawfile = $word:1\.txt
+    $cmffile = $word:1\.cmf
+    $offset = $word:2
 
     mkinput $offset $rawfile
@@ -150,8 +160,9 @@
   local myID filename
   $myID = $1
-  $filename = `basename $2 .smf`
-  pwd -var cwd
-
+  $filename = $2
+
+  # pwd -var cwd
   # NOTE: the filename is an absolute path without cmf extension
+  # XXX: no longer true
 
   # a single exposure
@@ -159,5 +170,5 @@
   dbinsert chipRun (exp_id, chip_id) values ($myID, $myID)
   dbinsert camRun (chip_id, cam_id, dist_group, software_ver) values ($myID, $myID, "testgroup", "testsoft")
-  dbinsert camProcessedExp (cam_id, path_base) values ($myID, "$cwd/$filename")
+  dbinsert camProcessedExp (cam_id, path_base) values ($myID, "$filename")
   dbinsert fakeRun (fake_id, cam_id) values ($myID, $myID)
   dbinsert warpRun (warp_id, fake_id) values ($myID, $myID)
@@ -187,5 +198,5 @@
 
     $expID = $tmp:0
-    $expfile = $tmp:3
+    $expfile = $tmp:2
     insert.exp $expID $expfile
     dbinsert stackInputSkyfile (stack_id, warp_id) values ($stkID, $expID)
@@ -206,5 +217,5 @@
     list word -split $stackdata:$i
     $ID = $word:0
-    $cmffile = $word:2
+    $cmffile = $word:1
     insert.stack $ID $cmffile
   end