CPass0/merge.C CPass1/merge.C - enable merging of trees

CPass0/makeSyswatchCPass0.C CPass1/makeSyswatchCPass1.C - enable merging of trees
CPass0/makeSyswatchCPass0.C       - Set the name of trees othewise not merged

diff --git a/PWGPP/CalibMacros/CPass0/makeSyswatchCPass0.C b/PWGPP/CalibMacros/CPass0/makeSyswatchCPass0.C
index ad8dc2003be4ab4b76d9b30ce11436ba5cd6d72b..a83776b9e829b6488f9ef9818de96d1a32add3d4 100644 (file)
--- a/PWGPP/CalibMacros/CPass0/makeSyswatchCPass0.C
+++ b/PWGPP/CalibMacros/CPass0/makeSyswatchCPass0.C
@@ -8,7 +8,13 @@ void makeSyswatchCPass0(const char * fname){
   TFile * fout= new TFile(fname,"update");
   TTree * treeRec = AliSysInfo::MakeTree("syswatch_rec.log");
   TTree * treeCalib = AliSysInfo::MakeTree("syswatch_calib.log");
-  if (treeRec) treeRec->Write("syswatchRec");
-  if (treeCalib) treeCalib->Write("syswatchCalib");
+  if (treeRec) {
+    treeRec->SetName("syswatchRec");
+    treeRec->Write("syswatchRec");
+  }
+  if (treeCalib){
+    treeCalib->SetName("syswatchCalib");
+    treeCalib->Write("syswatchCalib");
+  }
   fout->Close();
 }

diff --git a/PWGPP/CalibMacros/CPass0/merge.C b/PWGPP/CalibMacros/CPass0/merge.C
index 8b255b430d93e04e4ad8f6fbeed996a1ea237837..eba0cd4c0ebd703408675ee16eae9a39d44935e9 100644 (file)
--- a/PWGPP/CalibMacros/CPass0/merge.C
+++ b/PWGPP/CalibMacros/CPass0/merge.C
@@ -114,6 +114,7 @@ void mergeInChunksTXT(const char* mlist, const char* dest, int maxFiles)
 {
   TH1::AddDirectory(0);
   AliFileMerger merger;
+  merger.SetNoTrees(kFALSE);
   //  merger.SetMaxFilesOpen(999);
   merger.AddReject("esdFriend"); // do not merge
   //

diff --git a/PWGPP/CalibMacros/CPass0/mergeByComponent.C b/PWGPP/CalibMacros/CPass0/mergeByComponent.C
index 1e1569f6b765eaa341bc9a3fdcf090ac75b624a8..3c032ed888b0e0d41c86d8139d2f02cb07a6a5ee 100644 (file)
--- a/PWGPP/CalibMacros/CPass0/mergeByComponent.C
+++ b/PWGPP/CalibMacros/CPass0/mergeByComponent.C
@@ -53,6 +53,7 @@ void MergeCPass(const Char_t *list, TString component, TString outputFileName="C
 {
   AliFileMerger merger;
   /* select what to merge */
+  merger.SetNoTrees(kFALSE);
   if (component == "ALL")
     merger.AddReject("esdFriend");
   else

diff --git a/PWGPP/CalibMacros/CPass1/merge.C b/PWGPP/CalibMacros/CPass1/merge.C
index aa6f02964a46755e945bf30d8eef704d1eab9362..eb8b266429917e8edeeefffe1079d7a8c0042959 100644 (file)
--- a/PWGPP/CalibMacros/CPass1/merge.C
+++ b/PWGPP/CalibMacros/CPass1/merge.C
@@ -113,7 +113,8 @@ 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
   //

diff --git a/PWGPP/CalibMacros/CPass1/mergeByComponent.C b/PWGPP/CalibMacros/CPass1/mergeByComponent.C
index 8a5510feb1d35490864e4fe46290dec875cbf78c..40a463db4c33188edabf3d66606b2e7775d8c1fd 100644 (file)
--- a/PWGPP/CalibMacros/CPass1/mergeByComponent.C
+++ b/PWGPP/CalibMacros/CPass1/mergeByComponent.C
@@ -52,6 +52,7 @@ void mergeByComponent(TString       component,
 void MergeCPass(const Char_t *list, TString component, TString outputFileName="CalibObjects.root")
 {
   AliFileMerger merger;
+  merger.SetNoTrees(kFALSE);
   /* select what to merge */
   if (component == "ALL")
     merger.AddReject("esdFriend");