Modifying the GetChainFromCollection function based on the additions of the TEntryList

[u/mrichter/AliRoot.git] / ANALYSIS / AliAnalysisGoodies.cxx

diff --git a/ANALYSIS/AliAnalysisGoodies.cxx b/ANALYSIS/AliAnalysisGoodies.cxx
index 2317263496c47cccec663813f02d2774765a34c6..a3437a3fb789a184a8faa9e912194af5a1de3e55 100644 (file)
--- a/ANALYSIS/AliAnalysisGoodies.cxx
+++ b/ANALYSIS/AliAnalysisGoodies.cxx
@@ -32,6 +32,7 @@
 #include <Riostream.h>
 #ifdef WITHALIEN
 #include <TAlienCollection.h>
+#include <TGridResult.h>
 #endif
 #include <TChain.h>
 #include <TFileMerger.h>
@@ -90,7 +91,7 @@ void AliAnalysisGoodies::Help() const
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::Alien2Local(const TString collectionNameIn, const TString localDir)
+Bool_t AliAnalysisGoodies::Alien2Local(const TString collectionNameIn, const TString localDir)
 {
   // copy files ESD files listed in an xml collection from AliEn catalog to local storage and creates a local xml collection
   // usage: Alien2Local(in, out)
@@ -151,7 +152,7 @@ const Bool_t AliAnalysisGoodies::Alien2Local(const TString collectionNameIn, con
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::Make(AliRunTagCuts *runCuts, AliEventTagCuts *evtCuts, const char * in, const char * out) const  
+Bool_t AliAnalysisGoodies::Make(AliRunTagCuts *runCuts, AliEventTagCuts *evtCuts, const char * in, const char * out) const  
 {
   // makes esd collection from tags 
   // usage Make(tags, esds)
@@ -179,7 +180,7 @@ const Bool_t AliAnalysisGoodies::Make(AliRunTagCuts *runCuts, AliEventTagCuts *e
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::MakeEsdCollectionFromTagFile(AliRunTagCuts *runCuts, AliEventTagCuts *evtCuts, const char * in, const char * out) const 
+Bool_t AliAnalysisGoodies::MakeEsdCollectionFromTagFile(AliRunTagCuts *runCuts, AliEventTagCuts *evtCuts, const char * in, const char * out) const 
 {
   // Makes an esd collection from a root tag file 
   Bool_t rv = kTRUE ; 
@@ -200,7 +201,7 @@ const Bool_t AliAnalysisGoodies::MakeEsdCollectionFromTagFile(AliRunTagCuts *run
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::MakeEsdCollectionFromTagCollection(AliRunTagCuts * runCuts, AliEventTagCuts * evtCuts, const char * in, const char * out) const 
+Bool_t AliAnalysisGoodies::MakeEsdCollectionFromTagCollection(AliRunTagCuts * runCuts, AliEventTagCuts * evtCuts, const char * in, const char * out) const 
 {
   // Makes an esd collection from a xml tag collection 
   Bool_t rv = kTRUE ; 
@@ -211,7 +212,7 @@ const Bool_t AliAnalysisGoodies::MakeEsdCollectionFromTagCollection(AliRunTagCut
 
 #ifdef WITHALIEN
   
-  TAlienCollection * collection = TAlienCollection::Open(in);
+  TGridCollection * collection = TAlienCollection::Open(in);
   TGridResult* result = collection->GetGridResult("");
   AliTagAnalysis * tagAna = new AliTagAnalysis(); 
   tagAna->ChainGridTags(result);
@@ -225,7 +226,7 @@ const Bool_t AliAnalysisGoodies::MakeEsdCollectionFromTagCollection(AliRunTagCut
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::MakeEsdCollectionFromTagCollection(const char * runCuts, const char * evtCuts, const char * in, const char * out) const 
+Bool_t AliAnalysisGoodies::MakeEsdCollectionFromTagCollection(const char * runCuts, const char * evtCuts, const char * in, const char * out) const 
 {
   // Makes an esd collection from a xml tag collection 
   
@@ -238,7 +239,7 @@ const Bool_t AliAnalysisGoodies::MakeEsdCollectionFromTagCollection(const char *
   
 #ifdef WITHALIEN
 
-  TAlienCollection * collection = TAlienCollection::Open(in);
+  TGridCollection * collection = TAlienCollection::Open(in);
   TGridResult* result = collection->GetGridResult("");
   AliTagAnalysis * tagAna = new AliTagAnalysis(); 
   tagAna->ChainGridTags(result);
@@ -252,7 +253,7 @@ const Bool_t AliAnalysisGoodies::MakeEsdCollectionFromTagCollection(const char *
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::Merge(const char * collectionFile, const char * subFile, const char * outFile) 
+Bool_t AliAnalysisGoodies::Merge(const char * collectionFile, const char * subFile, const char * outFile) 
 {
   // merges files listed in a xml collection 
   // usage Merge(collection, outputFile))
@@ -274,7 +275,7 @@ const Bool_t AliAnalysisGoodies::Merge(const char * collectionFile, const char *
   
 #ifdef WITHALIEN
 
-  TAlienCollection * collection = TAlienCollection::Open(collectionFile);
+  TGridCollection * collection = TAlienCollection::Open(collectionFile);
   TGridResult* result = collection->GetGridResult("");
   
   Int_t index = 0  ;
@@ -317,11 +318,10 @@ const Bool_t AliAnalysisGoodies::Merge(const char * collectionFile, const char *
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::Process(TChain * chain) 
+Bool_t AliAnalysisGoodies::Process(TChain * chain) 
 {
   // process events starting from a chain of esd Trees
   Bool_t rv = kFALSE ; 
-
   fTimer.Start() ;
 
   rv = ProcessChain(chain) ; 
@@ -333,7 +333,7 @@ const Bool_t AliAnalysisGoodies::Process(TChain * chain)
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::Process(const char * inFile) 
+Bool_t AliAnalysisGoodies::Process(const char * inFile) 
 { 
   // process the events with an Analysis Task 
   // usage Process(esdFile)
@@ -348,7 +348,7 @@ const Bool_t AliAnalysisGoodies::Process(const char * inFile)
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::Process(const char * inFile, AliRunTagCuts *runCuts, AliEventTagCuts * evtCuts ) 
+Bool_t AliAnalysisGoodies::Process(const char * inFile, AliRunTagCuts *runCuts, AliEventTagCuts * evtCuts ) 
 {
   // process the events with an Analysis Task 
   // usage Process(esdFile, runtagCuts, evtTagCuts)
@@ -387,7 +387,7 @@ const Bool_t AliAnalysisGoodies::Process(const char * inFile, AliRunTagCuts *run
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::Process(const char * inFile, const char * runCuts, const char * evtCuts) 
+Bool_t AliAnalysisGoodies::Process(const char * inFile, const char * runCuts, const char * evtCuts) 
 {
   // process the events with an Analysis Task 
   // usage Process(esdFile, runtagCuts, evtTagCuts)
@@ -426,7 +426,7 @@ const Bool_t AliAnalysisGoodies::Process(const char * inFile, const char * runCu
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::ProcessChain(TChain * chain) const
+Bool_t AliAnalysisGoodies::ProcessChain(TChain * chain) const
 {
   // Procees a TChain. 
 
@@ -436,9 +436,9 @@ const Bool_t AliAnalysisGoodies::ProcessChain(TChain * chain) const
     AliError("No tasks defined") ; 
     return kFALSE ;
   }
-
+  
   // Make the analysis manager
-  AliAnalysisManager * mgr = new AliAnalysisManager() ;
+  AliAnalysisManager * mgr = new AliAnalysisManager("Goodies Manager", "Analysis manager created by AliAnalysisGoodies") ;
 
   // Make tasks 
   // The top input must be common to all top tasks
@@ -471,7 +471,7 @@ const Bool_t AliAnalysisGoodies::ProcessChain(TChain * chain) const
 }
  
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::ProcessEsdFile(const char * esdFile) const   
+Bool_t AliAnalysisGoodies::ProcessEsdFile(const char * esdFile) const   
 {
   // process the events in a single ESD file with an Analysis Task 
   // usage ProcessLocalEsdFile(esdFile)
@@ -495,7 +495,7 @@ const Bool_t AliAnalysisGoodies::ProcessEsdFile(const char * esdFile) const
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::ProcessTagFile(const char * tagFile, AliRunTagCuts *runCuts, AliEventTagCuts *evtCuts) const   
+Bool_t AliAnalysisGoodies::ProcessTagFile(const char * tagFile, AliRunTagCuts *runCuts, AliEventTagCuts *evtCuts) const   
 {
   // process the events in a single Tag file with an Analysis Task 
   // usage ProcessLocalEsdFile(tagFile)
@@ -528,7 +528,7 @@ const Bool_t AliAnalysisGoodies::ProcessTagFile(const char * tagFile, AliRunTagC
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::ProcessTagFile(const char * tagFile, const char * runCuts, const char * evtCuts) const   
+Bool_t AliAnalysisGoodies::ProcessTagFile(const char * tagFile, const char * runCuts, const char * evtCuts) const   
 {
   // process the events in a single Tag file with an Analysis Task 
   // usage ProcessLocalEsdFile(tagFile)
@@ -562,7 +562,7 @@ const Bool_t AliAnalysisGoodies::ProcessTagFile(const char * tagFile, const char
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::ProcessEsdXmlCollection(const char * xmlFile) const   
+Bool_t AliAnalysisGoodies::ProcessEsdXmlCollection(const char * xmlFile) const   
 {
   // process the events in a xml ESD collection  with an Analysis Task 
   // usage ProcessLocalEsdFile(xmlFile)
@@ -576,7 +576,7 @@ const Bool_t AliAnalysisGoodies::ProcessEsdXmlCollection(const char * xmlFile) c
 
 #ifdef WITHALIEN
 
-  TAlienCollection * collection = TAlienCollection::Open(xmlFile) ; 
+  TGridCollection * collection = TAlienCollection::Open(xmlFile) ; 
   if (! collection) {
     AliError(Form("%s not found", xmlFile)) ; 
     return kFALSE ; 
@@ -600,7 +600,7 @@ const Bool_t AliAnalysisGoodies::ProcessEsdXmlCollection(const char * xmlFile) c
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::ProcessTagXmlCollection(const char * xmlFile, AliRunTagCuts *runCuts, AliEventTagCuts * evtCuts) const   
+Bool_t AliAnalysisGoodies::ProcessTagXmlCollection(const char * xmlFile, AliRunTagCuts *runCuts, AliEventTagCuts * evtCuts) const   
 {
   // process the events in a xml ESD collection  with an Analysis Task 
   // usage ProcessLocalEsdFile(xmlFile)
@@ -623,7 +623,7 @@ const Bool_t AliAnalysisGoodies::ProcessTagXmlCollection(const char * xmlFile, A
 
 #ifdef WITHALIEN
 
-  TAlienCollection * collection = TAlienCollection::Open(xmlFile) ; 
+  TGridCollection * collection = TAlienCollection::Open(xmlFile) ; 
   if (! collection) {
     AliError(Form("%s not found", xmlFile)) ; 
     return kFALSE ; 
@@ -647,7 +647,7 @@ const Bool_t AliAnalysisGoodies::ProcessTagXmlCollection(const char * xmlFile, A
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::ProcessTagXmlCollection(const char * xmlFile, const char * runCuts, const char * evtCuts) const   
+Bool_t AliAnalysisGoodies::ProcessTagXmlCollection(const char * xmlFile, const char * runCuts, const char * evtCuts) const   
 {
   // process the events in a xml ESD collection  with an Analysis Task 
   // usage ProcessLocalEsdFile(xmlFile)
@@ -670,7 +670,7 @@ const Bool_t AliAnalysisGoodies::ProcessTagXmlCollection(const char * xmlFile, c
   if ( gSystem->AccessPathName(xmlFile) ) 
     TGrid::Connect("alien://"); 
 
-  TAlienCollection * collection = TAlienCollection::Open(xmlFile) ; 
+  TGridCollection * collection = TAlienCollection::Open(xmlFile) ; 
   if (! collection) {
     AliError(Form("%s not found", xmlFile)) ; 
     return kFALSE ; 
@@ -694,7 +694,7 @@ const Bool_t AliAnalysisGoodies::ProcessTagXmlCollection(const char * xmlFile, c
 }
 
 //______________________________________________________________________
-const Bool_t AliAnalysisGoodies::Register( const char * lfndir, const char * pfndir, const char * file) 
+Bool_t AliAnalysisGoodies::Register( const char * lfndir, const char * pfndir, const char * file) 
 {
   // register files already stored in a MSS into the AliEn catalog
   // usage: Register(lfndir, pfndir, pfnFileName)