Merge branch 'feature-movesplit'

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

diff --git a/PWGHF/hfe/macros/AddTaskHFECal.C b/PWGHF/hfe/macros/AddTaskHFECal.C
index 72204122453ed7992fd5a3dda9ece4ca4801cf69..31ddac5b989fdb64957ce04b50594553861d87d2 100644 (file)
--- a/PWGHF/hfe/macros/AddTaskHFECal.C
+++ b/PWGHF/hfe/macros/AddTaskHFECal.C
@@ -1,4 +1,4 @@
-AliAnalysisTask *AddTaskHFECal(Bool_t MassConst, Bool_t MassWidthCut)
+AliAnalysisTask *AddTaskHFECal(Bool_t MassConst, Bool_t MassWidthCut, Bool_t MassNonlinear)
 {
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
   if (!mgr) {
@@ -29,14 +29,15 @@ AliAnalysisTask *AddTaskHFECal(Bool_t MassConst, Bool_t MassWidthCut)
   //analysis task 
   gROOT->LoadMacro("$ALICE_ROOT/PWGHF/hfe/macros/configs/PbPb/ConfigHFECal.C");
 
-  AliAnalysisTaskHFECal *hfetaskCent = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,0.5,0.1,masscut,-5);
-  AliAnalysisTaskHFECal *hfetaskTrig= ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,0.5,0.1,masscut,-5);
-  AliAnalysisTaskHFECal *hfetaskTrig2= ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,0.5,0.1,masscut,-5);
+  AliAnalysisTaskHFECal *hfetaskCent = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,0.5,0.1,masscut,-5,1);
+  AliAnalysisTaskHFECal *hfetaskTrig= ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,0.5,0.1,masscut,-5,1);
+  AliAnalysisTaskHFECal *hfetaskTrig2= ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,0.5,0.1,masscut,-5,1);
  
   mgr->AddTask(hfetaskCent);
   mgr->AddTask(hfetaskTrig);
   mgr->AddTask(hfetaskTrig2);
   
+  
   // central trigger
   hfetaskCent->SelectCollisionCandidates(AliVEvent::kCentral);
   
@@ -47,7 +48,7 @@ AliAnalysisTask *AddTaskHFECal(Bool_t MassConst, Bool_t MassWidthCut)
   AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("HFE_Results_EMCalCentral", TList::Class(),AliAnalysisManager::kOutputContainer, containerName.Data());
   mgr->ConnectInput(hfetaskCent, 0, cinput);
   mgr->ConnectOutput(hfetaskCent, 1, coutput1);
-  
+
   //L1 gamma trigger
   hfetaskTrig->SelectCollisionCandidates(AliVEvent::kEMCEGA);
   
@@ -59,10 +60,10 @@ AliAnalysisTask *AddTaskHFECal(Bool_t MassConst, Bool_t MassWidthCut)
   mgr->ConnectInput(hfetaskTrig, 0, cinput);
   mgr->ConnectOutput(hfetaskTrig, 1, coutput1);
   
-
-  //Jet trigger
+  
   // semi-central
-  hfetaskTrig2->SelectCollisionCandidates(AliVEvent::kSemiCentral);
+  //hfetaskTrig2->SelectCollisionCandidates(AliVEvent::kSemiCentral | AliVEvent::kCentral);
+  hfetaskTrig2->SelectCollisionCandidates(AliVEvent::kAny);
   
   TString containerName3 = mgr->GetCommonFileName();
   containerName3 += ":PWGHF_hfeCalSemiCentral";
@@ -71,12 +72,12 @@ AliAnalysisTask *AddTaskHFECal(Bool_t MassConst, Bool_t MassWidthCut)
   AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("HFE_Results_SemiCentral", TList::Class(),AliAnalysisManager::kOutputContainer, containerName3.Data());
   mgr->ConnectInput(hfetaskTrig2, 0, cinput);
   mgr->ConnectOutput(hfetaskTrig2, 1, coutput1);
-  
 
+ 
   //if(MCthere)
     //{
     //MB trigger
-    AliAnalysisTaskHFECal *hfetaskMB = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,0.5,0.1,masscut,-5);
+    AliAnalysisTaskHFECal *hfetaskMB = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,0.5,0.1,masscut,-5,1);
     mgr->AddTask(hfetaskMB);
     hfetaskMB->SelectCollisionCandidates(AliVEvent::kMB);
 
@@ -88,7 +89,6 @@ AliAnalysisTask *AddTaskHFECal(Bool_t MassConst, Bool_t MassWidthCut)
      mgr->ConnectInput(hfetaskMB, 0, cinput);
      mgr->ConnectOutput(hfetaskMB, 1, coutput1);
      //}
-  
 
   return NULL;
 }