more plots

[u/mrichter/AliRoot.git] / PWG0 / CreateESDChain.C

diff --git a/PWG0/CreateESDChain.C b/PWG0/CreateESDChain.C
index f25e1531281dc31d69f5484761a6f29e7f8168f5..220abfce5b1244dd8c054618af1cec4f5a3ca07f 100644 (file)
--- a/PWG0/CreateESDChain.C
+++ b/PWG0/CreateESDChain.C
@@ -2,13 +2,11 @@
 
 // Helper macros for creating chains
 
-TChain* CreateESDChainFromDir(const char* aDataDir, Int_t aRuns = 20, Int_t offset = 0, Bool_t aAddHeader = kTRUE)
+TChain* CreateESDChainFromDir(const char* aDataDir, Int_t aRuns = 20, Int_t offset = 0)
 {
   // creates chain of files in a given directory. The structure is expected as:
   // <aDataDir>/<dir0>/AliESDs.root
-  // <aDataDir>/<dir0>/galice.root (when <aAddHeader> flag is set)
   // <aDataDir>/<dir1>/AliESDs.root
-  // <aDataDir>/<dir1>/galice.root (when <aAddHeader> flag is set)
   // ...
 
   if (!aDataDir)
@@ -17,9 +15,6 @@ TChain* CreateESDChainFromDir(const char* aDataDir, Int_t aRuns = 20, Int_t offs
   TChain* chain = new TChain("esdTree");
   TChain* chaingAlice = 0;
 
-  if (aAddHeader != kFALSE)
-    chaingAlice = new TChain("TE");
-
   TString execDir(gSystem->pwd());
   TSystemDirectory* baseDir = new TSystemDirectory(".", aDataDir);
   TList* dirList            = baseDir->GetListOfFiles();
@@ -48,22 +43,14 @@ TChain* CreateESDChainFromDir(const char* aDataDir, Int_t aRuns = 20, Int_t offs
     presentDirName += presentDir->GetName();
 
     chain->Add(presentDirName + "/AliESDs.root/esdTree");
-
-    if (aAddHeader != kFALSE)
-      chaingAlice->Add(presentDirName + "/galice.root/TE");
   }
 
-  if (aAddHeader != kFALSE)
-    chain->AddFriend(chaingAlice);
-
   return chain;
 }
 
-TChain* CreateESDChainFromList(const char* listFile, Int_t aRuns = 20, Bool_t aAddHeader = kTRUE)
+TChain* CreateESDChainFromList(const char* listFile, Int_t aRuns = 20, Int_t offset = 0)
 {
   // Creates a chain from a file which contains a list of ESD files
-  // if <aAddHeader> is set, the filename of the galice.root file is created by replacing
-  // AliESDs to galice in the esd file name
 
   if (!listFile)
     return 0;
@@ -71,9 +58,6 @@ TChain* CreateESDChainFromList(const char* listFile, Int_t aRuns = 20, Bool_t aA
   TChain* chain = new TChain("esdTree");
   TChain* chaingAlice = 0;
 
-  if (aAddHeader != kFALSE)
-    chaingAlice = new TChain("TE");
-
   // Open the input stream
   ifstream in;
   in.open(listFile);
@@ -86,29 +70,22 @@ TChain* CreateESDChainFromList(const char* listFile, Int_t aRuns = 20, Bool_t aA
     in >> esdfile;
     if (!esdfile.Contains("root")) continue; // protection
 
+    if (offset > 0)
+    {
+      --offset;
+      continue;
+    }
+
     if (count++ == aRuns)
       break;
 
       // add esd file
     chain->Add(esdfile);
-
-      // add header
-    if (aAddHeader != kFALSE)
-    {
-      esdfile.ReplaceAll("AliESDs", "galice");
-      chaingAlice->Add(esdfile + "/TE");
-    }
   }
 
   in.close();
 
   chain->Lookup();
 
-  if (aAddHeader != kFALSE)
-  {
-    chaingAlice->Lookup();
-    chain->AddFriend(chaingAlice);
-  }
-
   return chain;
 }