Index: /trunk/ippToPsps/jython/dvo.py
===================================================================
--- /trunk/ippToPsps/jython/dvo.py	(revision 38888)
+++ /trunk/ippToPsps/jython/dvo.py	(revision 38889)
@@ -170,9 +170,16 @@
         p = Popen(cmd, shell=True, stdout=dvoStdoutFile, stderr=dvoStderrFile)
 
+        # If I set waitTime to the full value at the beginning, we will always wait a long time for short jobs.
+
+        totalWait = 0
         dvopspsRunning = True
         while dvopspsRunning:
             p.poll()
             if p.returncode == None:
-                time.sleep(waittime)
+                time.sleep(2.0)
+
+                totalWait += 2.0
+                if (totalWait < waittime): continue
+                totalWait = 0.0
 
                 sql = "show table status where name = '" + myTable + "'"
@@ -743,12 +750,14 @@
         if (useFW == 1):
             if (self.config.camera == "simtest"):
-                print "need photcodes for non gpc1 camera"
+                # SIMTEST.x.ForcedWarp
+                cmd += " -photcode-start 15100 -photcode-end 15500"
+                # print "need photcodes for non gpc1 camera"
             else:
                 cmd += " -photcode-start 12000 -photcode-end 12500"
-        if (useFW == 1):
-            if (self.config.camera == "simtest"):
-                print "need photcodes for non gpc1 camera"
-            else:
-                print "need photcode for warp for gpc1 camera, default is no selection, should work, could be slow"
+        ## if (useFW == 1):
+        ##     if (self.config.camera == "simtest"):
+        ##         print "need photcodes for non gpc1 camera"
+        ##     else:
+        ##         print "need photcode for warp for gpc1 camera, default is no selection, should work, could be slow"
                 
         ## dvopsps can take a very long time. try 2 or 3 times to re-establish communication with the db before proceeding?