From: Pierre Gueth <pierre.gueth@creatis.insa-lyon.fr>
Date: Thu, 24 Jan 2013 13:09:59 +0000 (+0100)
Subject: merge details
X-Git-Tag: v1.4.0~169^2~2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2deed840ca9962923a0c97f03ff8d5719c7179b3;p=clitk.git

merge details
---

diff --git a/cluster_tools/mergeStatFile.py b/cluster_tools/mergeStatFile.py
index 054055e..a1cd573 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")