Update train macros

[u/mrichter/AliRoot.git] / PWG2 / FEMTOSCOPY / macros / AddTaskFemto.C

diff --git a/PWG2/FEMTOSCOPY/macros/AddTaskFemto.C b/PWG2/FEMTOSCOPY/macros/AddTaskFemto.C
index 45ea23f6d7b8c8704be004bec231aa35307a0dff..0611f5cf8910c9730d01aecea4c16b2b9e95b786 100644 (file)
--- a/PWG2/FEMTOSCOPY/macros/AddTaskFemto.C
+++ b/PWG2/FEMTOSCOPY/macros/AddTaskFemto.C
@@ -6,7 +6,7 @@
 //
 //=============================================================================
 
-AliAnalysisTaskFemto *AddTaskFemto()
+AliAnalysisTaskFemto *AddTaskFemto(const char *configMacroName="ConfigFemtoAnalysis.C", const char *configMacroParameters="" )
 {
 // Creates a proton analysis task and adds it to the analysis manager.
   
@@ -26,19 +26,24 @@ AliAnalysisTaskFemto *AddTaskFemto()
     return NULL;
   }  
   TString type = mgr->GetInputEventHandler()->GetDataType(); // can be "ESD" or "AOD"
+  cout << "Found " <<type << " event handler" << endl;
 
   // C. Create the task, add it to manager.
   //===========================================================================
 //  gSystem->SetIncludePath("-I$ROOTSYS/include  -I./PWG2AOD/AOD -I./PWG2femtoscopy/FEMTOSCOPY/AliFemto -I./PWG2femtoscopyUser/FEMTOSCOPY/AliFemtoUser -I$ALICE_ROOT/include");
+
   if (TProofMgr::GetListOfManagers()->GetEntries()) {
-    if (dynamic_cast<TProofLite *> gProof)
-      gProof->Exec(".L ConfigFemtoAnalysis.C");
-    else
-      gProof->Load("ConfigFemtoAnalysis.C");
+//     if (dynamic_cast<TProofLite *> gProof) {
+//       char *macrocommand[10000];
+//       sprintf(macrocommand, ".L %s", configMacroName);
+//       gProof->Exec(macrocommand);
+//     }
+//     else
+    gProof->Load(configMacroName);
   }  
   //  gROOT->LoadMacro("ConfigFemtoAnalysis.C++");
 
-  AliAnalysisTaskFemto *taskfemto = new AliAnalysisTaskFemto("TaskFemto");
+  AliAnalysisTaskFemto *taskfemto = new AliAnalysisTaskFemto("TaskFemto",configMacroName,configMacroParameters);
   mgr->AddTask(taskfemto);
 
   // D. Configure the analysis task. Extra parameters can be used via optional
@@ -48,8 +53,11 @@ AliAnalysisTaskFemto *AddTaskFemto()
   // E. Create ONLY the output containers for the data produced by the task.
   // Get and connect other common input/output containers via the manager as below
   //==============================================================================
+  TString outputfile = AliAnalysisManager::GetCommonFileName();  
+  outputfile += ":PWG2FEMTO";
   AliAnalysisDataContainer *cout_femto  = mgr->CreateContainer("femtolist",  TList::Class(),
-                                                              AliAnalysisManager::kOutputContainer,"Femto.ESD.root");
+                                                              AliAnalysisManager::kOutputContainer,outputfile);
+
 
    mgr->ConnectInput(taskfemto, 0, mgr->GetCommonInputContainer());
    mgr->ConnectOutput(taskfemto, 0, cout_femto);