From 880eb4421cfd0924a3fcd11a54f32eb7e249a157 Mon Sep 17 00:00:00 2001
From: Pierre Gueth <pierre.gueth@creatis.insa-lyon.fr>
Date: Thu, 7 Feb 2013 15:35:00 +0100
Subject: [PATCH] merger works when files are ordered

---
 tests_dav/GateMergeManager.cc | 17 +++++++++++++++++
 tests_dav/GateMergeManager.hh |  3 +++
 2 files changed, 20 insertions(+)

diff --git a/tests_dav/GateMergeManager.cc b/tests_dav/GateMergeManager.cc
index dc190fc..5c5a12c 100644
--- a/tests_dav/GateMergeManager.cc
+++ b/tests_dav/GateMergeManager.cc
@@ -29,6 +29,7 @@ See GATE/LICENSE.txt for further details
 #include <vector>
 #include <cstdlib>
 #include <cmath>
+#include <list>
 
 #include "GateMergeManager.hh"
 
@@ -50,6 +51,22 @@ void GateMergeManager::StartMerging(string splitfileName){
   //if(res) cout<<"Strange?? Can't mark "<<dir<<" as done!"<<endl;
 };
 
+void GateMergeManager::StartMergingFromFilenames(Strings filenames, string outputfile)
+{
+	for (Strings::const_iterator iter=filenames.begin(); iter!=filenames.end(); iter++)
+	{
+		m_vRootFileNames.push_back(*iter);
+		if(m_verboseLevel>2) cout<<"Root input file name: "<<m_vRootFileNames.back()<<endl;
+	}
+
+	m_Nfiles = m_vRootFileNames.size();
+	m_RootTargetName=m_outDir+outputfile;
+	if(m_verboseLevel>2) cout<<"Root output file name: "<<m_RootTargetName<<endl;
+
+	if (m_fastMerge==true) FastMergeRoot();
+	else MergeRoot();
+};
+
 // to process the splitfile
 void GateMergeManager::ReadSplitFile(string splitfileName){
 
diff --git a/tests_dav/GateMergeManager.hh b/tests_dav/GateMergeManager.hh
index 737be32..126dea3 100644
--- a/tests_dav/GateMergeManager.hh
+++ b/tests_dav/GateMergeManager.hh
@@ -17,8 +17,10 @@ See GATE/LICENSE.txt for further details
 #include <TFile.h>
 #include <TChain.h>
 #include <cstdlib>
+#include <list>
 
 using namespace std;
+typedef list<string> Strings;
 
 class GateMergeManager
 {
@@ -43,6 +45,7 @@ public:
 
 
   void StartMerging(string splitfileName);
+  void StartMergingFromFilenames(Strings filenames, string outputfile);
   void ReadSplitFile(string splitfileName);
   bool MergeTree(string name);
   bool MergeGate(TChain* chain);
-- 
2.47.1