updated on eh config

[u/mrichter/AliRoot.git] / PWGHF / hfe / macros / AddTaskEMCalHFEpA.C

diff --git a/PWGHF/hfe/macros/AddTaskEMCalHFEpA.C b/PWGHF/hfe/macros/AddTaskEMCalHFEpA.C
index b43da7e2efc7f8c2ef931d739355c097ea63a537..1e5b00046eda900ee92cd4f65bc7bd6f9bbe9ead 100644 (file)
--- a/PWGHF/hfe/macros/AddTaskEMCalHFEpA.C
+++ b/PWGHF/hfe/macros/AddTaskEMCalHFEpA.C
@@ -1,59 +1,61 @@
-AliAnalysisTask AddTaskEMCalHFEpA(
+AliAnalysisTaskEMCalHFEpA *AddTaskEMCalHFEpA(
 
-                       Bool_t  isMC                    = kFALSE, 
-                       Int_t   triggerIndex    = 0, 
-                       Int_t   configIndex     = 0, 
-                       Int_t   centralityIndex = 0, 
-                       Bool_t  isAOD                   = kFALSE,
-                       Bool_t isEMCal                  = kFALSE,
-                       char * period                   = "b",
-                       Int_t EMCalThreshould   = 0
-               )
+                        Bool_t  isMC                    = kFALSE, 
+                        Int_t   triggerIndex    = 0, 
+                        Int_t   configIndex     = 0, 
+                        Int_t   centralityIndex = 0, 
+                        Bool_t  isAOD           = kFALSE,
+                        Bool_t isEMCal          = kFALSE,
+                                               Bool_t isTrigger                = kFALSE,
+                        char * period           = "b",
+                        Int_t EMCalThreshould   = 0
+                )
 {
-       AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
-       
-       if (!mgr) {
-       ::Error("AddTaskEMCalHFEpA", "No analysis manager to connect to.");
-       return NULL;
-       }
-       
-       if (!mgr->GetInputEventHandler()) {
-       ::Error("AddTaskEMCalHFEpA", "This task requires an input event handler");
-       return NULL;
-       }
-       
-       //_______________________
-       //Config Task
-       //gROOT->LoadMacro("ConfigEMCalHFEpA.C");
+        AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
+        
+        if (!mgr) {
+        ::Error("AddTaskEMCalHFEpA", "No analysis manager to connect to.");
+        return NULL;
+        }
+        
+        if (!mgr->GetInputEventHandler()) {
+        ::Error("AddTaskEMCalHFEpA", "This task requires an input event handler");
+        return NULL;
+        }
+        
+        //_______________________
+        //Config Task
+        //gROOT->LoadMacro("ConfigEMCalHFEpA.C");
         gROOT->LoadMacro("$ALICE_ROOT/PWGHF/hfe/macros/configs/pPb/ConfigEMCalHFEpA.C");
-       //AliAnalysisTaskEMCalHFEpA *task = ConfigEMCalHFEpA(isMC,triggerIndex,configIndex,centralityIndex,isAOD,isEMCal, EMCalThreshould, period);//test (period)
-       AliAnalysisTaskEMCalHFEpA *task = ConfigEMCalHFEpA(isMC,triggerIndex,configIndex,centralityIndex,isAOD,isEMCal, EMCalThreshould);
-       
-       //_______________________
-       //Trigger
-       if(!isMC)
-       {
-               if(triggerIndex == 0) task->SelectCollisionCandidates(AliVEvent::kINT7);
-               if(triggerIndex == 1) task->SelectCollisionCandidates(AliVEvent::kEMC7);
-               if(triggerIndex == 2) task->SelectCollisionCandidates(AliVEvent::kEMCEGA);
-               
-               //if(triggerIndex == 3) task->SelectCollisionCandidates(AliVEvent::kEMC8);
-               //if(triggerIndex == 4) task->SelectCollisionCandidates(AliVEvent::kEMCEJE); //Jet Trigger
-       }
-       
-       mgr->AddTask(task);
-       
-       //Create containers for input/output
-       
-       TString containerName = mgr->GetCommonFileName();
-       containerName += ":HFE_EMCal_pPb_cris";
-       
-       AliAnalysisDataContainer *cinput = mgr->GetCommonInputContainer();
-       AliAnalysisDataContainer *coutput = mgr->CreateContainer(Form("chist_RpPb_%d_%d_%d_%d",triggerIndex,configIndex,centralityIndex, EMCalThreshould), TList::Class(),    AliAnalysisManager::kOutputContainer, containerName.Data());
+        AliAnalysisTaskEMCalHFEpA *task = ConfigEMCalHFEpA(isMC,triggerIndex,configIndex,centralityIndex,isAOD,isEMCal,isTrigger, EMCalThreshould);
+        
+        //_______________________
+        //Trigger
+        if(!isMC)
+        {
+                if(triggerIndex == 0) task->SelectCollisionCandidates(AliVEvent::kINT7);
+                if(triggerIndex == 1) task->SelectCollisionCandidates(AliVEvent::kEMC7);
+                if(triggerIndex == 2) task->SelectCollisionCandidates(AliVEvent::kEMCEGA);
+                
+                //if(triggerIndex == 3) task->SelectCollisionCandidates(AliVEvent::kEMC8);
+                //if(triggerIndex == 4) task->SelectCollisionCandidates(AliVEvent::kEMCEJE); //Jet Trigger
+        }
+        
+        mgr->AddTask(task);
+        
+        TString containerName = mgr->GetCommonFileName();
+        containerName += ":HFE_EMCal_pPb_cris";
+        containerName += Form("_%d_%d_%d_%d",triggerIndex,configIndex,centralityIndex,EMCalThreshould);
+        
 
-       //Connect input/output
-       mgr->ConnectInput(task, 0, cinput);
-       mgr->ConnectOutput(task, 1, coutput);
-       
-       return task;
+        
+        //Create containers for input/output
+        AliAnalysisDataContainer *cinput = mgr->GetCommonInputContainer();
+        AliAnalysisDataContainer *coutput = mgr->CreateContainer(Form("chist_RpPb_%d_%d_%d_%d",triggerIndex,configIndex,centralityIndex, EMCalThreshould), TList::Class(),    AliAnalysisManager::kOutputContainer, containerName.Data());
+
+        //Connect input/output
+        mgr->ConnectInput(task, 0, cinput);
+        mgr->ConnectOutput(task, 1, coutput);
+        
+        return task;
 }