X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cluster_tools%2FmergeStatFile.py;h=ab5028954ce62feeab9953d0baf3af6dc0eb4f49;hb=784796d8d6a038d3afd29cea1bf4e73323852186;hp=054055e3d738ca391a1ad5f2bc53b80d5524c69a;hpb=8936b9c421ccd36097f80ccc93b151a9972cef25;p=clitk.git

diff --git a/cluster_tools/mergeStatFile.py b/cluster_tools/mergeStatFile.py
index 054055e..ab50289 100755
--- a/cluster_tools/mergeStatFile.py
+++ b/cluster_tools/mergeStatFile.py
@@ -6,7 +6,7 @@ import re
 import datetime
 
 linere = re.compile(r'''^#\s+([a-zA-Z]+)\s+=\s(.*)$''')
-mergedlines = ['NumberOfRun', 'NumberOfEvents', 'NumberOfTracks', 'NumberOfSteps', 'NumberOfGeometricalSteps', 'NumberOfPhysicalSteps', 'ElapsedTime', 'StartDate', 'EndDate']
+mergedlines = ['NumberOfRun', 'NumberOfEvents', 'NumberOfTracks', 'NumberOfSteps', 'NumberOfGeometricalSteps', 'NumberOfPhysicalSteps', 'ElapsedTimeWoInit', 'ElapsedTime', 'StartDate', 'EndDate']
 
 assert(len(sys.argv)==7)
 assert(sys.argv[1]=="-i")
@@ -27,7 +27,9 @@ def parse_stat_file(filename):
     keys = {}
     for line in open(filename,"r").readlines():
         match = linere.match(line)
-        assert(match is not None)
+        #assert(match is not None)
+        if match is None:
+            continue
         groups = match.groups()
         if groups[0] not in mergedlines:
             continue
@@ -88,4 +90,3 @@ jkeys = parse_stat_file(sys.argv[4])
 keys  = merge_keys(ikeys,jkeys)
 output = format_keys(keys)
 open(sys.argv[6],"w").write(output)
-