Index: trunk/ippToPsps/jython/config.py
===================================================================
--- trunk/ippToPsps/jython/config.py	(revision 35417)
+++ trunk/ippToPsps/jython/config.py	(revision 37246)
@@ -22,17 +22,43 @@
 
         self.test = False
-        for arg in sys.argv:
-            if arg == "-test": 
-                self.test = True
-                sys.argv.remove(arg)
-            if arg == "-t": 
-                self.test = True
-                sys.argv.remove(arg)
+        self.resetDvo = False
+        self.gpc1test = True
+        self.retry = False
+        self.camera = "gpc1"
+        self.onebatch = False
 
+        if sys.argv.count("-test"):
+            self.test = True
+            sys.argv.remove("-test")
+
+        if sys.argv.count("-t"):
+            self.test = True
+            sys.argv.remove("-t")
+
+        # by default, we use gpc1test in a test, and do not if not a test
         self.gpc1test = self.test
-        for arg in sys.argv:
-            if arg == "-realgpc": 
-                self.gpc1test = False
-                sys.argv.remove(arg)
+
+        if sys.argv.count("-realgpc"):
+            if not self.test:
+                print "-realgpc requires -test"
+                sys.exit(1)
+            self.gpc1test = False
+            sys.argv.remove("-realgpc")
+
+        if sys.argv.count("-reset-dvo"):
+            self.resetDvo = True
+            sys.argv.remove("-reset-dvo")
+
+        if sys.argv.count("-retry"):
+            self.retry = True
+            sys.argv.remove("-retry")
+
+        if sys.argv.count("-simtest"):
+            self.camera = "simtest"
+            sys.argv.remove("-simtest")
+
+        if sys.argv.count("-one-batch"):
+            self.onebatch = True
+            sys.argv.remove("-one-batch")
 
         ## name of the top-level jython script