Fixes for cmake

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

diff --git a/ANALYSIS/AliAnalysisGoodies.cxx b/ANALYSIS/AliAnalysisGoodies.cxx
index 7a24780895b9251f2720b5d4639570ed1edfeba7..f2ce7d0b75d849b051584f6ebaae9ad66baab83d 100644 (file)
--- a/ANALYSIS/AliAnalysisGoodies.cxx
+++ b/ANALYSIS/AliAnalysisGoodies.cxx
@@ -25,14 +25,15 @@
 #include "AliXMLCollection.h" 
 #include "AliAnalysisGoodies.h" 
 #include "AliAnalysisManager.h" 
 #include "AliXMLCollection.h" 
 #include "AliAnalysisGoodies.h" 
 #include "AliAnalysisManager.h" 

+#include "AliAODHandler.h"

 #include "AliAnalysisTask.h" 
 #include "AliLog.h" 
 
 #include <Riostream.h>
 #ifdef WITHALIEN
 #include "AliAnalysisTask.h" 
 #include "AliLog.h" 
 
 #include <Riostream.h>
 #ifdef WITHALIEN

-#include <TAlienCollection.h>

 #include <TGridResult.h>
 #include <TFileMerger.h>
 #include <TGridResult.h>
 #include <TFileMerger.h>

+#include <TFile.h> 

 #endif
 #include <TChain.h>
 #include <TGrid.h>
 #endif
 #include <TChain.h>
 #include <TGrid.h>


@@ -45,10 +46,7 @@ AliAnalysisGoodies::AliAnalysisGoodies() :
   TObject(),
   fTimer(), 
   fESDTreeName("esdTree"), 
   TObject(),
   fTimer(), 
   fESDTreeName("esdTree"), 

-  fnumberOfTasks(0),
-  fTaskList(0),
-  fTaskInType(0), 
-  fTaskOuType(0)
+  fAmgr(0)

 {
   fTimer.Reset() ; 
    
 {
   fTimer.Reset() ; 
    


@@ -58,6 +56,8 @@ AliAnalysisGoodies::AliAnalysisGoodies() :
     TGrid::Connect("alien://");
   else 
     AliInfo("You are not connected to the GRID") ; 
     TGrid::Connect("alien://");
   else 
     AliInfo("You are not connected to the GRID") ; 

+ // Make the analysis manager
+  fAmgr = new AliAnalysisManager("Goodies Manager", "Analysis manager created by AliAnalysisGoodies") ;

 }
 
 //______________________________________________________________________________
 }
 
 //______________________________________________________________________________


@@ -65,10 +65,7 @@ AliAnalysisGoodies::AliAnalysisGoodies(const AliAnalysisGoodies& ag) :
   TObject(),
   fTimer(), 
   fESDTreeName(""), 
   TObject(),
   fTimer(), 
   fESDTreeName(""), 

-  fnumberOfTasks(0),
-  fTaskList(0),
-  fTaskInType(0), 
-  fTaskOuType(0)
+  fAmgr(0x0)  

 {
   
   fESDTreeName = ag.fESDTreeName ;  
 {
   
   fESDTreeName = ag.fESDTreeName ;  


@@ -78,6 +75,19 @@ AliAnalysisGoodies::AliAnalysisGoodies(const AliAnalysisGoodies& ag) :
     TGrid::Connect("alien://");
   else 
     AliInfo("You are not connected to the GRID") ; 
     TGrid::Connect("alien://");
   else 
     AliInfo("You are not connected to the GRID") ; 

+   
+  // Make the analysis manager
+  fAmgr = new AliAnalysisManager("Goodies Manager", "Analysis manager created by AliAnalysisGoodies") ;
+}
+
+//______________________________________________________________________________
+AliAnalysisGoodies& AliAnalysisGoodies::operator=(const AliAnalysisGoodies& ag)
+{
+  // Assignment operator
+  if(this!=&ag) {
+  }
+
+  return *this;

 }
 
 //______________________________________________________________________________
 }
 
 //______________________________________________________________________________


@@ -133,8 +143,6 @@ Bool_t AliAnalysisGoodies::Alien2Local(const TString collectionNameIn, const TSt
   collectionOu->SetCollectionName(collectionNameOu) ; 
   collectionOu->WriteHeader() ; 
 
   collectionOu->SetCollectionName(collectionNameOu) ; 
   collectionOu->WriteHeader() ; 
 

-  TFileMerger merger ; 
-  

   const char* ocwd = gSystem->WorkingDirectory();
 
   Int_t counter = 1 ;  
   const char* ocwd = gSystem->WorkingDirectory();
 
   Int_t counter = 1 ;  


@@ -162,7 +170,7 @@ Bool_t AliAnalysisGoodies::Alien2Local(const TString collectionNameIn, const TSt
     AliInfo(Form("Copying %s to %s\n", fileTURL.Data(), dir.Data())) ;  
     collectionOu->WriteBody(counter, collectionIn->GetGUID(""), collectionIn->GetLFN(""), dir, list) ;
     counter++ ;
     AliInfo(Form("Copying %s to %s\n", fileTURL.Data(), dir.Data())) ;  
     collectionOu->WriteBody(counter, collectionIn->GetGUID(""), collectionIn->GetLFN(""), dir, list) ;
     counter++ ;

-    merger.Cp(fileTURL, dir) ;
+    TFile::Cp(fileTURL, dir) ;

   }
   collectionOu->Export() ;
   gSystem->ChangeDirectory(ocwd) ; 
   }
   collectionOu->Export() ;
   gSystem->ChangeDirectory(ocwd) ; 


@@ -176,6 +184,78 @@ Bool_t AliAnalysisGoodies::Alien2Local(const TString collectionNameIn, const TSt
 #endif
 }
 
 #endif
 }
 

+//______________________________________________________________________
+AliAnalysisDataContainer * AliAnalysisGoodies::ConnectInput(AliAnalysisTask * task, TClass * classin, UShort_t index) 
+{
+  // connect a task to the input
+
+  if ( ! fAmgr->GetTask(task->GetName()) ) 
+    fAmgr->AddTask(task) ;
+  else 
+    AliFatal(Form("Task %s already exists", task->GetName())) ; 
+
+  AliAnalysisDataContainer * taskInput = 0x0 ; 
+  if ( fAmgr->GetInputs() ) 
+    taskInput = dynamic_cast<AliAnalysisDataContainer *>(fAmgr->GetInputs()->FindObject(Form("InputContainer_%s_%d", task->GetName(), index))) ; 
+  if ( ! taskInput ) {
+    taskInput  = fAmgr->CreateContainer(Form("InputContainer_%s_%d", task->GetName(), index), classin, AliAnalysisManager::kInputContainer) ;
+    fAmgr->ConnectInput (task, index, taskInput);
+  }
+  else 
+    AliFatal(Form("Input %s already exists", taskInput->GetName())) ; 
+
+  return taskInput ; 
+} 
+
+//______________________________________________________________________
+void AliAnalysisGoodies::ConnectInput(AliAnalysisTask * task, AliAnalysisDataContainer * taskInput, UShort_t index) 
+{
+  // connect a task to the input
+
+  if ( ! fAmgr->GetTask(task->GetName()) ) 
+    fAmgr->AddTask(task) ;
+  else 
+    AliFatal(Form("Task %s already exists", task->GetName())) ; 
+
+  fAmgr->ConnectInput (task, index, taskInput);
+} 
+
+//______________________________________________________________________
+AliAnalysisDataContainer *  AliAnalysisGoodies::ConnectOuput(AliAnalysisTask * task, TClass * classou, UShort_t index, TString opt ) 
+{
+  // connect a task to the output
+
+  char filename[20] ; 
+
+    if (opt == "AOD" ) {    
+      if ( fAmgr->GetOutputEventHandler() == 0x0) {
+       AliAODHandler * aodHandler = new AliAODHandler() ; 
+       aodHandler->SetOutputFileName(Form("%s_0.root",task->GetName())) ; 
+       fAmgr->SetOutputEventHandler(aodHandler) ;
+      } 
+      sprintf(filename, "default") ; 
+    } 
+    else 
+      sprintf(filename, "%s_%d.root",task->GetName(), index) ; 
+    
+    AliAnalysisDataContainer * taskOuput = 0x0 ;
+    if ( fAmgr->GetOutputs() ) 
+      taskOuput = dynamic_cast<AliAnalysisDataContainer *>(fAmgr->GetOutputs()->FindObject(Form("OutputContainer_%s_%d", task->GetName(), index))) ; 
+    if ( ! taskOuput )
+      taskOuput = fAmgr->CreateContainer(Form("OutputContainer_%s_%d", task->GetName(), index), classou, AliAnalysisManager::kOutputContainer, filename) ;
+    fAmgr->ConnectOutput(task, index, taskOuput);
+    
+    return taskOuput ; 
+} 
+
+//______________________________________________________________________
+void AliAnalysisGoodies::ConnectOuput(AliAnalysisTask * task, AliAnalysisDataContainer * taskOuput, UShort_t index) 
+{
+  // connect a task to the output
+
+  fAmgr->ConnectInput (task, index, taskOuput);
+} 
+

 //______________________________________________________________________
 Bool_t AliAnalysisGoodies::Make(AliRunTagCuts *runCuts, AliLHCTagCuts *lhcCuts, AliDetectorTagCuts *detCuts, AliEventTagCuts *evtCuts, const char * in, const char * out) const  
 {
 //______________________________________________________________________
 Bool_t AliAnalysisGoodies::Make(AliRunTagCuts *runCuts, AliLHCTagCuts *lhcCuts, AliDetectorTagCuts *detCuts, AliEventTagCuts *evtCuts, const char * in, const char * out) const  
 {


@@ -237,8 +317,8 @@ Bool_t AliAnalysisGoodies::MakeEsdCollectionFromTagCollection(AliRunTagCuts *run
 
 #ifdef WITHALIEN
   
 
 #ifdef WITHALIEN
   

-  TGridCollection * collection = TAlienCollection::Open(in);
-  TGridResult* result = collection->GetGridResult("");
+  TGridCollection * collection = (TGridCollection*)gROOT->ProcessLine(Form("TAlienCollection::Open(\"%s\", 0)",in));
+  TGridResult* result = collection->GetGridResult("", 0, 0);

   AliTagAnalysis * tagAna = new AliTagAnalysis(); 
   tagAna->ChainGridTags(result);
 
   AliTagAnalysis * tagAna = new AliTagAnalysis(); 
   tagAna->ChainGridTags(result);
 


@@ -264,17 +344,17 @@ Bool_t AliAnalysisGoodies::MakeEsdCollectionFromTagCollection(const char * runCu
   
 #ifdef WITHALIEN
 
   
 #ifdef WITHALIEN
 

-  TGridCollection * collection = TAlienCollection::Open(in);
-  TGridResult* result = collection->GetGridResult("");
+  TGridCollection * collection = (TGridCollection*)gROOT->ProcessLine(Form("TAlienCollection::Open(\"%s\", 0)",in));
+  TGridResult* result = collection->GetGridResult("", 0, 0);

   AliTagAnalysis * tagAna = new AliTagAnalysis(); 
   tagAna->ChainGridTags(result);
   
   tagAna->CreateXMLCollection(out, runCuts, lhcCuts, detCuts, evtCuts) ;
 
   AliTagAnalysis * tagAna = new AliTagAnalysis(); 
   tagAna->ChainGridTags(result);
   
   tagAna->CreateXMLCollection(out, runCuts, lhcCuts, detCuts, evtCuts) ;
 

-  return rv ;

 #else
 #else

-  return kFALSE;
+  rv = kFALSE;

 #endif
 #endif

+  return rv ;

 }
 
 //______________________________________________________________________
 }
 
 //______________________________________________________________________


@@ -300,8 +380,8 @@ Bool_t AliAnalysisGoodies::Merge(const char * collectionFile, const char * subFi
   
 #ifdef WITHALIEN
 
   
 #ifdef WITHALIEN
 

-  TGridCollection * collection = TAlienCollection::Open(collectionFile);
-  TGridResult* result = collection->GetGridResult("");
+  TGridCollection * collection = (TGridCollection*)gROOT->ProcessLine(Form("TAlienCollection::Open(\"%s\", 0)",collectionFile));
+  TGridResult* result = collection->GetGridResult("", 0, 0);

   
   Int_t index = 0  ;
   const char * turl ;
   
   Int_t index = 0  ;
   const char * turl ;


@@ -336,10 +416,10 @@ Bool_t AliAnalysisGoodies::Merge(const char * collectionFile, const char * subFi
   fTimer.Stop();
   fTimer.Print();
   
   fTimer.Stop();
   fTimer.Print();
   

-  return rv ;

 #else
 #else

-  return kFALSE;
+  rv = kFALSE;

 #endif
 #endif

+  return rv ;

 }
 
 //______________________________________________________________________
 }
 
 //______________________________________________________________________


@@ -459,36 +539,10 @@ Bool_t AliAnalysisGoodies::ProcessChain(TChain * chain) const
 
   Bool_t rv = kTRUE ;
 
 
   Bool_t rv = kTRUE ;
 

-  if (! fTaskList ) {
-    AliError("No tasks defined") ; 
-    return kFALSE ;
-  }
-  
-  // Make the analysis manager
-  AliAnalysisManager * mgr = new AliAnalysisManager("Goodies Manager", "Analysis manager created by AliAnalysisGoodies") ;
-
-  // Make tasks 
-  // The top input must be common to all top tasks
-  TClass * classIn = fTaskInType[0] ; 
-  AliAnalysisDataContainer * taskInput  = mgr->CreateContainer("InputContainer", classIn, AliAnalysisManager::kInputContainer) ;
-  Int_t index ; 
-  for (index = 0; index < fnumberOfTasks; index++) {
-    AliAnalysisTask * task = fTaskList[index] ;
-    mgr->AddTask(task) ;
-  
-    // Create containers for input/output
-    TClass * classOu = fTaskOuType[index] ; 
-    AliAnalysisDataContainer * taskOutput = mgr->CreateContainer(Form("OutputContainer%d",index), classOu, AliAnalysisManager::kOutputContainer,
-                                            Form("%s.root",task->GetName())) ;
-    mgr->ConnectInput (task, 0, taskInput);
-    mgr->ConnectOutput(task, 0, taskOutput);
-  }
-  

   // start processing 
   // start processing 

-
-  if (mgr->InitAnalysis()) {
-    mgr->PrintStatus();
-    mgr->StartAnalysis("local",chain);
+  if (fAmgr->InitAnalysis()) {
+    fAmgr->PrintStatus();
+    fAmgr->StartAnalysis("local",chain);

   } else 
     rv = kFALSE ; 
   
   } else 
     rv = kFALSE ; 
   


@@ -600,28 +654,30 @@ Bool_t AliAnalysisGoodies::ProcessEsdXmlCollection(const char * xmlFile) const
   printf("***  Coll   = |%s|             \n",xmlFile);                 
 
 #ifdef WITHALIEN
   printf("***  Coll   = |%s|             \n",xmlFile);                 
 
 #ifdef WITHALIEN

-
-  TGridCollection * collection = TAlienCollection::Open(xmlFile) ; 
+  //AliXMLCollection * collection = AliXMLCollection::Open(xmlFile,0) ;
+  TGridCollection * collection =  (TGridCollection*)gROOT->ProcessLine(Form("TAlienCollection::Open(\"%s\", 0)", xmlFile));

   if (! collection) {
     AliError(Form("%s not found", xmlFile)) ; 
     return kFALSE ; 
   }
 
   if (! collection) {
     AliError(Form("%s not found", xmlFile)) ; 
     return kFALSE ; 
   }
 

-  TGridResult* result = collection->GetGridResult("");
+  TGridResult* result = collection->GetGridResult("",0 ,0);

   TList* analysisfilelist = result->GetFileInfoList();
   
   // Makes the ESD chain 
   printf("*** Getting the Chain       ***\n");
   TChain* analysisChain = new TChain(fESDTreeName);
   analysisChain->AddFileInfoList(analysisfilelist);
   TList* analysisfilelist = result->GetFileInfoList();
   
   // Makes the ESD chain 
   printf("*** Getting the Chain       ***\n");
   TChain* analysisChain = new TChain(fESDTreeName);
   analysisChain->AddFileInfoList(analysisfilelist);

- 
+

   // Process the events
   rv = ProcessChain(analysisChain) ; 
 
   // Process the events
   rv = ProcessChain(analysisChain) ; 
 

-  return rv ; 

 #else
 #else

-  return kFALSE;
+  rv = kFALSE;
+

 #endif
 #endif

+
+  return rv ; 

 }
 
 //______________________________________________________________________
 }
 
 //______________________________________________________________________


@@ -640,7 +696,7 @@ Bool_t AliAnalysisGoodies::ProcessTagXmlCollection(const char * xmlFile, AliRunT
 
   printf("*** Process       ***\n");
   printf("***  Wk-Dir = |%s|             \n",gSystem->WorkingDirectory());
 
   printf("*** Process       ***\n");
   printf("***  Wk-Dir = |%s|             \n",gSystem->WorkingDirectory());

-  printf("***  Coll   = |%s|             \n",xmlFile);                 
+  printf("***  Coll   = |%s|            \n",xmlFile);                  

  
   // check if file is local or alien
   if ( gSystem->AccessPathName(xmlFile) ) 
  
   // check if file is local or alien
   if ( gSystem->AccessPathName(xmlFile) ) 


@@ -648,13 +704,13 @@ Bool_t AliAnalysisGoodies::ProcessTagXmlCollection(const char * xmlFile, AliRunT
 
 #ifdef WITHALIEN
 
 
 #ifdef WITHALIEN
 

-  TGridCollection * collection = TAlienCollection::Open(xmlFile) ; 
+  TGridCollection * collection = (TGridCollection*)gROOT->ProcessLine(Form("TAlienCollection::Open(\"%s\", 0)",xmlFile));

   if (! collection) {
     AliError(Form("%s not found", xmlFile)) ; 
     return kFALSE ; 
   }
 
   if (! collection) {
     AliError(Form("%s not found", xmlFile)) ; 
     return kFALSE ; 
   }
 

-  TGridResult* result = collection->GetGridResult("");
+  TGridResult* result = collection->GetGridResult("", 0, 0);

   AliTagAnalysis * tagAna = new AliTagAnalysis(); 
   tagAna->ChainGridTags(result);
   
   AliTagAnalysis * tagAna = new AliTagAnalysis(); 
   tagAna->ChainGridTags(result);
   


@@ -665,10 +721,10 @@ Bool_t AliAnalysisGoodies::ProcessTagXmlCollection(const char * xmlFile, AliRunT
   // Process the events
   rv = ProcessChain(analysisChain) ; 
 
   // Process the events
   rv = ProcessChain(analysisChain) ; 
 

-  return rv ; 

 #else
 #else

-  return kFALSE;
+  rv = kFALSE;

 #endif
 #endif

+  return rv ; 

 }
 
 //______________________________________________________________________
 }
 
 //______________________________________________________________________


@@ -695,13 +751,13 @@ Bool_t AliAnalysisGoodies::ProcessTagXmlCollection(const char * xmlFile, const c
   if ( gSystem->AccessPathName(xmlFile) ) 
     TGrid::Connect("alien://"); 
 
   if ( gSystem->AccessPathName(xmlFile) ) 
     TGrid::Connect("alien://"); 
 

-  TGridCollection * collection = TAlienCollection::Open(xmlFile) ; 
+  TGridCollection * collection = (TGridCollection*)gROOT->ProcessLine(Form("TAlienCollection::Open(\"%s\", 0)",xmlFile));

   if (! collection) {
     AliError(Form("%s not found", xmlFile)) ; 
     return kFALSE ; 
   }
 
   if (! collection) {
     AliError(Form("%s not found", xmlFile)) ; 
     return kFALSE ; 
   }
 

-  TGridResult* result = collection->GetGridResult("");
+  TGridResult* result = collection->GetGridResult("", 0, 0);

   AliTagAnalysis * tagAna = new AliTagAnalysis(); 
   tagAna->ChainGridTags(result);
   
   AliTagAnalysis * tagAna = new AliTagAnalysis(); 
   tagAna->ChainGridTags(result);
   


@@ -712,10 +768,10 @@ Bool_t AliAnalysisGoodies::ProcessTagXmlCollection(const char * xmlFile, const c
   // Process the events
   rv = ProcessChain(analysisChain) ; 
 
   // Process the events
   rv = ProcessChain(analysisChain) ; 
 

-  return rv ; 

 #else
 #else

-  return kFALSE;
+  rv = kFALSE;

 #endif
 #endif

+  return rv ; 

 }
 
 //______________________________________________________________________
 }
 
 //______________________________________________________________________


@@ -764,14 +820,3 @@ Bool_t AliAnalysisGoodies::Register( const char * lfndir, const char * pfndir, c
   return rv;
 }
  
   return rv;
 }
  

-//______________________________________________________________________
-void AliAnalysisGoodies::SetTasks(Int_t nb, AliAnalysisTask ** taskList, TClass ** inputType, TClass ** outputType)
-{
-  // define a task with its output and input type
-
-  
-  fnumberOfTasks= nb; 
-  fTaskList   = taskList ;
-  fTaskInType = inputType ; 
-  fTaskOuType = outputType ; 
-}