Index: trunk/ippToPsps/jython/batch.py
===================================================================
--- trunk/ippToPsps/jython/batch.py	(revision 38989)
+++ trunk/ippToPsps/jython/batch.py	(revision 38990)
@@ -452,4 +452,21 @@
     Accepts a regular expression filter so not all tables need to be imported
     '''
+    def importIppTables(self, columns="*", filter=""):
+        if self.useOhanaMYSQLtoFITS:
+            if not self.importIppTablesOhana():
+                self.logger.errorPair("problem running", "importIppTablesOhana")
+                return False
+        else:
+            if not self.importIppTablesStilts(columns, filter):
+                self.logger.errorPair("problem running", "importIppTablesStilts")
+                return False
+
+        return True
+
+    '''
+    Imports IPP tables from FITS file
+
+    Accepts a regular expression filter so not all tables need to be imported
+    '''
     def importIppTablesOhana(self):
         
@@ -463,5 +480,5 @@
             return False
 
-        loadFITStoMYSQL(self.fits.getPath(), "none")
+        self.scratchDb.loadFITStoMYSQL(self.fits.getPath(), "none")
 
         ## may need to do this with direct sql:
@@ -496,5 +513,5 @@
     Accepts a regular expression filter so not all tables need to be imported
     '''
-    def importIppTables(self, columns="*", filter=""):
+    def importIppTablesStilts(self, columns="*", filter=""):
         
         self.logger.infoPair("Importing tables with filter", filter)
Index: trunk/ippToPsps/jython/config.py
===================================================================
--- trunk/ippToPsps/jython/config.py	(revision 38989)
+++ trunk/ippToPsps/jython/config.py	(revision 38990)
@@ -21,4 +21,5 @@
     def __init__(self):
 
+        self.useOhanaMYSQLtoFITS = False
         self.test = False
         self.resetDvo = False
Index: trunk/ippToPsps/jython/dvo.py
===================================================================
--- trunk/ippToPsps/jython/dvo.py	(revision 38989)
+++ trunk/ippToPsps/jython/dvo.py	(revision 38990)
@@ -589,7 +589,16 @@
     Imports the Photcode file
     '''
+    def importPhotcodes(self, path, tableName):
+        if True:
+            self.importPhotcodesOhana(path,tableName)
+        else:
+            self.importPhotcodesStilts(path,tableName)
+
+    '''
+    Imports the Photcode file
+    '''
     def importPhotcodesOhana(self, path, tableName):
 
-      self.logger.infoPair("Importing file", "%s (%s)" % (path, self.getFileSizeStr(self.getDiskSize(path))))
+      self.logger.infoPair("Importing file with ohana", "%s (%s)" % (path, self.getFileSizeStr(self.getDiskSize(path))))
       self.logger.debugPair("Writing to database table", tableName)
 
@@ -598,5 +607,5 @@
       # table = stilts.tpipe(table, cmd='addcol -after TYPE TYPE_AS_INT "TYPE + 0"')
 
-      loadFITStoMYSQL (path, tableName)
+      self.scratchDb.loadFITStoMYSQL (path, tableName)
 
       self.logger.debugPair("Finished importing", tableName)
@@ -607,5 +616,5 @@
     Imports the Photcode file
     '''
-    def importPhotcodes(self, path, tableName):
+    def importPhotcodesStilts(self, path, tableName):
 
       self.logger.infoPair("Importing file", "%s (%s)" % (path, self.getFileSizeStr(self.getDiskSize(path))))
Index: trunk/ippToPsps/jython/forcedwarpbatch.py
===================================================================
--- trunk/ippToPsps/jython/forcedwarpbatch.py	(revision 38989)
+++ trunk/ippToPsps/jython/forcedwarpbatch.py	(revision 38990)
@@ -459,9 +459,9 @@
         results= self.scratchDb.reportAndDeleteRowsWithNULLS("ForcedWarpMeasurement_"+forcedWarpID, "objID")
         rowCountAfter =  self.scratchDb.getRowCount("ForcedWarpMeasurement_"+forcedWarpID)
-        self.logger.infoPair("row count of ForcedWarpMeasurement",rowCountBefore)
+        self.logger.infoPair("row count of ForcedWarpMeasurement", rowCountBefore)
         self.logger.infoPair("row count of ForcedWarpMeasurement after cull of null objID ", rowCountAfter)
         if rowCountAfter == 0:
             self.skipBatch = True
-            self.logger.infoPair ("skip this batch, it is bad")
+            self.logger.infoPair ("skip this batch", "it is bad")
             return False
 #        self.generateRandomIDs()
Index: trunk/ippToPsps/jython/scratchdb.py
===================================================================
--- trunk/ippToPsps/jython/scratchdb.py	(revision 38989)
+++ trunk/ippToPsps/jython/scratchdb.py	(revision 38990)
@@ -5,4 +5,6 @@
 import os
 import logging
+import tempfile
+from subprocess import call, PIPE, Popen
 
 from java.lang import *
@@ -809,11 +811,14 @@
     def loadFITStoMYSQL(self, filename, tablename):
 
+        self.logger.infoPair("starting loadFITStoMYSQL: ", filename)
+
         # TODO path to DVO prog hardcoded temporarily
-        cmd = "fits_to_mysql"
-        cmd += " -dbhost " + self.scratchDb.dbHost
-        cmd += " -dbname " + self.scratchDb.dbName
-        cmd += " -dbuser " + self.scratchDb.dbUser
-        cmd += " -dbpass " + self.scratchDb.dbPass
-        cmd += filename
+        cmd = "fits_to_mysql " + filename
+        cmd += " -dbhost " + self.dbHost
+        cmd += " -dbname " + self.dbName
+        cmd += " -dbuser " + self.dbUser
+        cmd += " -dbpass " + self.dbPass
+
+        self.logger.debugPair("preparing command: ", cmd)
 
         if tablename != "none":
@@ -822,4 +827,6 @@
         (stdoutFile, stdoutName) = tempfile.mkstemp(prefix="fits_to_mysql.stdout.", dir="/tmp")
         (stderrFile, stderrName) = tempfile.mkstemp(prefix="fits_to_mysql.stderr.", dir="/tmp")
+
+        self.logger.debugPair("generated tmpfiles: ", cmd)
 
         self.logger.infoPair("Running fits_to_mysql", cmd)
@@ -838,4 +845,4 @@
             os._exit(1)
 
-        os.close(loadFITStoMYSQL)
-        os.close(loadFITStoMYSQL)
+        os.close(stdoutFile)
+        os.close(stderrFile)
Index: trunk/ippToPsps/test/fulltest.sh
===================================================================
--- trunk/ippToPsps/test/fulltest.sh	(revision 38989)
+++ trunk/ippToPsps/test/fulltest.sh	(revision 38990)
@@ -29,4 +29,6 @@
 set forcedobjqueue = 1
 set forcedobjbatch = 1
+
+set debug = ""
 
 set targ = ($argv)
@@ -89,4 +91,7 @@
     set forcedobjqueue = 0
     set forcedobjbatch = 0
+    breaksw;
+  case -debug
+    set debug = "-debug"
     breaksw;
   default:
@@ -246,5 +251,5 @@
   echo "2000-01-01 00:00:00.0  " >> initbatch.dat # trange_start
   echo "2020-01-01 00:00:00.0  " >> initbatch.dat # trange_end
-  ippjython queue.py -test edit < initbatch.dat
+  ippjython queue.py $debug -test edit < initbatch.dat
   if ($status) exit 1
 
@@ -253,5 +258,5 @@
 
   rm -rf $OUTDIR/IN
-  ippjython loader.py -test initbatch init -simtest < /dev/null
+  ippjython loader.py $debug -test initbatch init -simtest < /dev/null
   if ($status) exit 1
 endif
@@ -296,5 +301,5 @@
   echo "2000-01-01 00:00:00.0 " >> cambatch.dat # trange_start
   echo "2020-01-01 00:00:00.0 " >> cambatch.dat # trange_end
-  ippjython queue.py -test edit -simtest < cambatch.dat
+  ippjython queue.py $debug -test edit -simtest < cambatch.dat
   if ($status) exit 1
 endif
@@ -305,5 +310,5 @@
 
   rm -rf $OUTDIR/P2
-  ippjython loader.py -test $queuename once -simtest < /dev/null
+  ippjython loader.py $debug -test $queuename once -simtest < /dev/null
   if ($status) exit
 endif
@@ -348,5 +353,5 @@
   echo "2000-01-01 00:00:00.0 " >> objectbatch.dat # trange_start
   echo "2020-01-01 00:00:00.0 " >> objectbatch.dat # trange_end
-  ippjython queue.py -test edit once -simtest < objectbatch.dat
+  ippjython queue.py $debug -test edit once -simtest < objectbatch.dat
   if ($status) exit
 endif
@@ -358,5 +363,5 @@
   rm -rf $OUTDIR/OB
 
-  ippjython loader.py -test $objectqueuename once -simtest < /dev/null
+  ippjython loader.py $debug -test $objectqueuename once -simtest < /dev/null
   if ($status) exit
 endif
@@ -401,5 +406,5 @@
   echo "2000-01-01 00:00:00.0 " >> stackbatch.dat # trange_start
   echo "2020-01-01 00:00:00.0 " >> stackbatch.dat # trange_end
-  ippjython queue.py -test edit -simtest < stackbatch.dat
+  ippjython queue.py $debug -test edit -simtest < stackbatch.dat
   if ($status) exit
 endif
@@ -410,5 +415,5 @@
 
   rm -rf $OUTDIR/ST
-  ippjython loader.py -test $stackqueuename once -simtest < /dev/null
+  ippjython loader.py $debug -test $stackqueuename once -simtest < /dev/null
   if ($status) exit
 endif
@@ -453,5 +458,5 @@
   echo "2000-01-01 00:00:00.0 " >> forcebatch.dat # trange_start
   echo "2020-01-01 00:00:00.0 " >> forcebatch.dat # trange_end
-  ippjython queue.py -test edit -simtest < forcebatch.dat
+  ippjython queue.py $debug -test edit -simtest < forcebatch.dat
   if ($status) exit 1
 endif
@@ -462,5 +467,5 @@
 
   rm -rf $OUTDIR/FW
-  ippjython loader.py -test $forcedwarpqueuename once -simtest < /dev/null
+  ippjython loader.py $debug -test $forcedwarpqueuename once -simtest < /dev/null
   if ($status) exit
 endif
@@ -505,5 +510,5 @@
   echo "2000-01-01 00:00:00.0 " >> forcedobjectbatch.dat # trange_start
   echo "2020-01-01 00:00:00.0 " >> forcedobjectbatch.dat # trange_end
-  ippjython queue.py -test edit once -simtest < forcedobjectbatch.dat
+  ippjython queue.py $debug -test edit once -simtest < forcedobjectbatch.dat
   if ($status) exit
 endif
@@ -515,6 +520,6 @@
   rm -rf $OUTDIR/LO
 
-  ippjython loader.py -test $forcedobjqueuename once -simtest < /dev/null
-  if ($status) exit
-endif
-
+  ippjython loader.py $debug -test $forcedobjqueuename once -simtest < /dev/null
+  if ($status) exit
+endif
+
Index: trunk/ippToPsps/test/mkgpc1data.dvo
===================================================================
--- trunk/ippToPsps/test/mkgpc1data.dvo	(revision 38989)
+++ trunk/ippToPsps/test/mkgpc1data.dvo	(revision 38990)
@@ -194,6 +194,11 @@
   end
 
-  echo relphot -D CATDIR $catdir -region 8 12 18 22 -images g,r,i,z,y -update
-  exec relphot -D CATDIR $catdir -region 8 12 18 22 -images g,r,i,z,y -update
+  if ($SMALLTEST)
+    echo relphot -D CATDIR $catdir -region 8 12 18 22 -averages -update
+    exec relphot -D CATDIR $catdir -region 8 12 18 22 -averages -update
+  else
+    echo relphot -D CATDIR $catdir -region 8 12 18 22 -images g,r,i,z,y -update
+    exec relphot -D CATDIR $catdir -region 8 12 18 22 -images g,r,i,z,y -update
+  end
 
   if ($PARALLEL)
@@ -254,9 +259,11 @@
   end
 
-# echo relphot -D CATDIR $catdir -region 8 12 18 22 -images g,r,i,z,y -update
-# exec relphot -D CATDIR $catdir -region 8 12 18 22 -images g,r,i,z,y -update
-
-  echo relphot -D CATDIR $catdir -region 8 12 18 22 -averages -update
-  exec relphot -D CATDIR $catdir -region 8 12 18 22 -averages -update
+  if ($SMALLTEST)
+    echo relphot -D CATDIR $catdir -region 8 12 18 22 -averages -update
+    exec relphot -D CATDIR $catdir -region 8 12 18 22 -averages -update
+  else
+    echo relphot -D CATDIR $catdir -region 8 12 18 22 -images g,r,i,z,y -update
+    exec relphot -D CATDIR $catdir -region 8 12 18 22 -images g,r,i,z,y -update
+  end
 
   if ($PARALLEL)
@@ -323,6 +330,11 @@
   end
 
-  echo relphot -D CATDIR $catdir -region 8 12 18 22 -images g,r,i,z,y -update
-  exec relphot -D CATDIR $catdir -region 8 12 18 22 -images g,r,i,z,y -update
+  if ($SMALLTEST)
+    echo relphot -D CATDIR $catdir -region 8 12 18 22 -averages -update
+    exec relphot -D CATDIR $catdir -region 8 12 18 22 -averages -update
+  else
+    echo relphot -D CATDIR $catdir -region 8 12 18 22 -images g,r,i,z,y -update
+    exec relphot -D CATDIR $catdir -region 8 12 18 22 -images g,r,i,z,y -update
+  end
 
   echo dvolens -D CATDIR $catdir -region 8 12 18 22 -update-objects -update