updated

diff --git a/PWGHF/hfe/macros/AddTaskHFECal.C b/PWGHF/hfe/macros/AddTaskHFECal.C
index 7850189a4a2a03f318c825accfc6fd6436b13eec..ee05360add9c261240d4227c318f5ff354d976c0 100644 (file)
--- a/PWGHF/hfe/macros/AddTaskHFECal.C
+++ b/PWGHF/hfe/macros/AddTaskHFECal.C
@@ -24,12 +24,14 @@ AliAnalysisTask *AddTaskHFECal(Bool_t MassConst, Bool_t MassWidthCut)
   }
   
   Bool_t MassCal = kTRUE;
+  Double_t masscut = 0.05;
+  if(!MassConst)masscut = 0.1;
   //analysis task 
   gROOT->LoadMacro("$ALICE_ROOT/PWGHF/hfe/macros/configs/PbPb/ConfigHFECal.C");
 
-  AliAnalysisTaskHFECal *hfetaskCent = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,0.5,0.1);
-  AliAnalysisTaskHFECal *hfetaskTrig= ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,0.5,0.1);
-  AliAnalysisTaskHFECal *hfetaskTrig2= ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,0.5,0.1);
+  AliAnalysisTaskHFECal *hfetaskCent = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,0.5,0.1,masscut);
+  AliAnalysisTaskHFECal *hfetaskTrig= ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,0.5,0.1,masscut);
+  AliAnalysisTaskHFECal *hfetaskTrig2= ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,0.5,0.1,masscut);
  
   mgr->AddTask(hfetaskCent);
   mgr->AddTask(hfetaskTrig);
@@ -74,7 +76,7 @@ AliAnalysisTask *AddTaskHFECal(Bool_t MassConst, Bool_t MassWidthCut)
   //if(MCthere)
     //{
     //MB trigger
-    AliAnalysisTaskHFECal *hfetaskMB = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,0.5,0.1);
+    AliAnalysisTaskHFECal *hfetaskMB = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,0.5,0.1,masscut);
     mgr->AddTask(hfetaskMB);
     hfetaskMB->SelectCollisionCandidates(AliVEvent::kMB);
 

diff --git a/PWGHF/hfe/macros/AddTaskHFECalPbPbSys.C b/PWGHF/hfe/macros/AddTaskHFECalPbPbSys.C
index 3c22e65058d9d8eeae4036be5b3f4c03ea3dfb77..39260ac80e6c0a545c834ff093e26912ebac470b 100644 (file)
--- a/PWGHF/hfe/macros/AddTaskHFECalPbPbSys.C
+++ b/PWGHF/hfe/macros/AddTaskHFECalPbPbSys.C
@@ -1,4 +1,4 @@
-AliAnalysisTask *AddTaskHFECalPbPbSys(Bool_t MassConst, Bool_t MassWidthCut, Bool_t MassCal, Double_t asspTCut, Double_t angleCut, TString ID="phoSys0")
+AliAnalysisTask *AddTaskHFECalPbPbSys(Bool_t MassConst, Bool_t MassWidthCut, Bool_t MassCal, Double_t asspTCut, Double_t angleCut, Double_t MassCut, TString ID="phoSys0")
 {
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
   if (!mgr) {
@@ -25,7 +25,7 @@ AliAnalysisTask *AddTaskHFECalPbPbSys(Bool_t MassConst, Bool_t MassWidthCut, Boo
   
   //analysis task 
   gROOT->LoadMacro("$ALICE_ROOT/PWGHF/hfe/macros/configs/PbPb/ConfigHFECal.C");
-  AliAnalysisTaskHFECal *hfetask = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,asspTCut,angleCut);
+  AliAnalysisTaskHFECal *hfetask = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,asspTCut,angleCut,MassCut);
   mgr->AddTask(hfetask);
   // semi-central
   hfetask->SelectCollisionCandidates(AliVEvent::kSemiCentral);
@@ -36,10 +36,22 @@ AliAnalysisTask *AddTaskHFECalPbPbSys(Bool_t MassConst, Bool_t MassWidthCut, Boo
   AliAnalysisDataContainer *coutput1 = mgr->CreateContainer(Form("HFE_Results_SemiCentral_%s",ID.Data()), TList::Class(),AliAnalysisManager::kOutputContainer, containerName3.Data());
   mgr->ConnectInput(hfetask, 0, cinput);
   mgr->ConnectOutput(hfetask, 1, coutput1);
-  
+ 
+  //trigger
+  AliAnalysisTaskHFECal *hfetaskTrig = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,asspTCut,angleCut,MassCut);
+  mgr->AddTask(hfetaskTrig);
+  hfetaskTrig->SelectCollisionCandidates(AliVEvent::kEMCEGA);
+  TString containerName2 = mgr->GetCommonFileName();
+  containerName2 += ":PWGHF_hfeCalkTrig";
+  containerName2 += ID;
+  AliAnalysisDataContainer *cinput = mgr->GetCommonInputContainer();
+  AliAnalysisDataContainer *coutput1 = mgr->CreateContainer(Form("HFE_Results_EMCalTrig_%s",ID.Data()), TList::Class(),AliAnalysisManager::kOutputContainer, containerName2.Data());
+  mgr->ConnectInput(hfetaskTrig, 0, cinput);
+  mgr->ConnectOutput(hfetaskTrig, 1, coutput1);
+ 
 
   //MB trigger
-  AliAnalysisTaskHFECal *hfetaskMB = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,asspTCut,angleCut);
+  AliAnalysisTaskHFECal *hfetaskMB = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,asspTCut,angleCut,MassCut);
   mgr->AddTask(hfetaskMB);
   hfetaskMB->SelectCollisionCandidates(AliVEvent::kMB);
   TString containerName4 = mgr->GetCommonFileName();

diff --git a/PWGHF/hfe/macros/configs/PbPb/ConfigHFECal.C b/PWGHF/hfe/macros/configs/PbPb/ConfigHFECal.C
index 4772dd1172f7dfefe6aeb29e6155fca7208f7b3c..38b4aecca966acbcca1c19f7eb6809d2b0ee08aa 100644 (file)
--- a/PWGHF/hfe/macros/configs/PbPb/ConfigHFECal.C
+++ b/PWGHF/hfe/macros/configs/PbPb/ConfigHFECal.C
@@ -1,4 +1,4 @@
-AliAnalysisTaskHFECal* ConfigHFECal(Bool_t useMC,Bool_t MassConst,Bool_t MassWidthCut,Bool_t MassCal,Double_t asspTCut,Double_t angleCut){\r
+AliAnalysisTaskHFECal* ConfigHFECal(Bool_t useMC,Bool_t MassConst,Bool_t MassWidthCut,Bool_t MassCal,Double_t asspTCut,Double_t angleCut,Double_t MassCut){\r
   //\r
   // HFE standard task configuration\r
   //\r
@@ -23,8 +23,9 @@ AliAnalysisTaskHFECal* ConfigHFECal(Bool_t useMC,Bool_t MassConst,Bool_t MassWid
   task->SetHFECuts(hfecuts);\r
   task->SetMassConstraint(MassConst);\r
   task->SetMassWidthCut(MassWidthCut);\r
-  Double_t masscut = 0.05;\r
-  if(!MassConst)masscut = 0.1;\r
+  //Double_t masscut = 0.05;\r
+  //if(!MassConst)masscut = 0.1;\r
+  Double_t masscut = MassCut;\r
   task->SetInvariantMassCut(masscut);\r
   task->SetOpeningAngleCut(angleCut);\r
   task->SetMimpTassCut(asspTCut);\r