erange version 4.0a dev release

[erange.git] / peakstoregion.py

diff --git a/peakstoregion.py b/peakstoregion.py
index 78000f5a2253d6a711cdafaaeac2adff26e5ddee..b7a9ec571c886fe5140b5a8e43a13dfa598d91c0 100755 (executable)
--- a/peakstoregion.py
+++ b/peakstoregion.py
@@ -11,7 +11,7 @@ except:
 
 import sys
 
-print "%s: version 1.0" % sys.argv[0]
+print "peakstoregion: version 1.1"
 
 def main(argv=None):
     if not argv:
@@ -24,26 +24,30 @@ def main(argv=None):
     peakfile = argv[1]
     outfile = argv[2]
 
-    radius = 500
-    chromField = 2
-    posField = 3
-    labelField = 1
-    dataField = -1
-
-    if len(argv) > 3:
+    try:
         radius = int(argv[3])
+    except (IndexError, ValueError):
+        radius = 500
 
-    if len(argv) > 4:
+    try:
         chromField = int(argv[4])
+    except (IndexError, ValueError):
+        chromField = 2
 
-    if len(argv) > 5:
+    try:
         posField = int(argv[5])
+    except (IndexError, ValueError):
+        posField = 3
 
-    if len(argv) > 6:
+    try:
         labelField = int(argv[6])
+    except (IndexError, ValueError):
+        labelField = 1
 
-    if len(argv) > 7:
+    try:
         dataField = int(argv[7])
+    except (IndexError, ValueError):
+        dataField = -1
 
     peakstoregion(peakfile, outfile, radius, chromField, posField, labelField, dataField)