cope with the new CalibObjects.root file structure (TPC calib in TDirectories)

[u/mrichter/AliRoot.git] / PWGPP / CalibMacros / CPass1 / merge.C

diff --git a/PWGPP/CalibMacros/CPass1/merge.C b/PWGPP/CalibMacros/CPass1/merge.C
index aa6f02964a46755e945bf30d8eef704d1eab9362..e31bbb74232dc41e52078ecbf4c855670ca4b1d5 100644 (file)
--- a/PWGPP/CalibMacros/CPass1/merge.C
+++ b/PWGPP/CalibMacros/CPass1/merge.C
@@ -113,9 +113,12 @@ void cpTimeOut(const char * searchdir, const char* pattern, Int_t timeOut=10, Bo
 void mergeInChunksTXT(const char* mlist, const char* dest, int maxFiles)
 {
   TH1::AddDirectory(0);
-  AliFileMerger merger;
+  AliFileMerger merger; 
+  merger.SetNoTrees(kFALSE);
   //  merger.SetMaxFilesOpen(999);
   merger.AddReject("esdFriend"); // do not merge
+  merger.AddReject("syswatchRec"); // do not merge
+  merger.AddReject("syswatchCalib"); // do not merge
   //
   if (maxFiles<2) maxFiles = 2;
   TString filesToMerge = mlist, fileDest = dest;