From 62028b10ee4e0b01e6d55d130c1c0a6bb3c33ca6 Mon Sep 17 00:00:00 2001
From: abercuci <abercuci@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 15 Oct 2010 08:25:55 +0000
Subject: [PATCH] fix bug in merging routine

---
 PWG1/TRD/AliTRDpwg1Helper.cxx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/PWG1/TRD/AliTRDpwg1Helper.cxx b/PWG1/TRD/AliTRDpwg1Helper.cxx
index c5c3bdc2692..aa5d3cc0ee0 100644
--- a/PWG1/TRD/AliTRDpwg1Helper.cxx
+++ b/PWG1/TRD/AliTRDpwg1Helper.cxx
@@ -172,7 +172,6 @@ const Char_t* AliTRDpwg1Helper::MergeBatch(const Char_t *mark, const Char_t *fil
 // On return the name of the merged file is return or NULL in case of failure.
 //
   TObjArray arr(nfiles); arr.SetOwner(kTRUE);
-
   TFileMerger fFM(kTRUE);
   fFM.OutputFile(Form("%s/%d_%s",  gSystem->ExpandPathName("$PWD"), first, mark));
   Int_t iline(0), nbatch(0);
@@ -180,13 +179,16 @@ const Char_t* AliTRDpwg1Helper::MergeBatch(const Char_t *mark, const Char_t *fil
   std::ifstream file(files);
   while(getline(file, filename)){
     if(Int_t(filename.find(mark)) < 0) continue;
-    iline++;
-    if(iline<first) continue;
+    if(iline<first){
+      iline++;
+      continue;
+    }
     if(kSVN){ // download SVN info for trending
       std::string base=filename.substr(0, filename.find_last_of('/'));
       if(gSystem->Exec(Form("if [ ! -f svnInfo.log ]; then cp -v %s/svnInfo.log %s; fi", base.c_str(), gSystem->ExpandPathName("$PWD"))) == 0) kSVN=kFALSE;
     }
-    Info("MergeBatch()", filename.c_str());    if(!fFM.AddFile(filename.c_str())) return NULL;
+    Info("MergeBatch()", filename.c_str());
+    if(!fFM.AddFile(filename.c_str())) return NULL;
     arr.Add(new TObjString(filename.c_str()));
     nbatch++;
     if(nbatch==nfiles) break;
-- 
2.43.0