From 52bf1f162ee702dcd5a87cb9eb9a86080d519455 Mon Sep 17 00:00:00 2001
From: Matthieu Cattin <matthieu.cattin@cern.ch>
Date: Thu, 29 Aug 2013 10:10:10 +0200
Subject: [PATCH] test31: Move program argument read out of main function.

Was causing trouble when called from pts.
---
 test/fmcadc100m14b4cha/python/test31.py | 27 ++++++++++++++-----------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/test/fmcadc100m14b4cha/python/test31.py b/test/fmcadc100m14b4cha/python/test31.py
index 6920530..55e7039 100755
--- a/test/fmcadc100m14b4cha/python/test31.py
+++ b/test/fmcadc100m14b4cha/python/test31.py
@@ -42,7 +42,7 @@ test31: Fix EEPROM content:
 Note: Requires test00.py to run first to load the firmware!
 """
 
-def main (default_directory='.'):
+def main (default_directory='.', offset="0x1000", filename="calibration.sdb"):
 
     # Constants declaration
     TEST_NB = 31
@@ -62,16 +62,8 @@ def main (default_directory='.'):
     NEW_EEPROM_BIN_FILENAME = os.path.join(default_directory, NEW_EEPROM_BIN_FILENAME)
     EEPROM_SIZE = 8192 # in Bytes
 
-    arg_nb = len(sys.argv[1:])
-    if arg_nb == 2:
-        BAD_SDB_DIR_OFFSET = sys.argv[1]
-        BAD_CALIBR_BIN_FILENAME = sys.argv[2]
-    elif arg_nb > 2:
-        print("Too many arguments.")
-        sys.exit()
-    else:
-        BAD_SDB_DIR_OFFSET = "0x1000"
-        BAD_CALIBR_BIN_FILENAME = "calibration.sdb"
+    BAD_SDB_DIR_OFFSET = offset
+    BAD_CALIBR_BIN_FILENAME = filename
 
 
     start_test_time = time.time()
@@ -350,4 +342,15 @@ P1 Bank A nb signal=%d, P1 Bank B nb signal=%d, P2 Bank A nb signal=%d, P2 Bank
 
 
 if __name__ == '__main__' :
-    main()
+    arg_nb = len(sys.argv[1:])
+    if arg_nb == 2:
+        offset = sys.argv[1]
+        filename = sys.argv[2]
+    elif arg_nb > 2:
+        print("Too many arguments.")
+        sys.exit()
+    else:
+        offset = "0x1000"
+        filename = "calibration.sdb"
+
+    main('.', offset, filename)
-- 
2.18.1