Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / PWGHF / hfe / AliAnalysisTaskFlowITSTPCTOFQCSP.cxx

diff --git a/PWGHF/hfe/AliAnalysisTaskFlowITSTPCTOFQCSP.cxx b/PWGHF/hfe/AliAnalysisTaskFlowITSTPCTOFQCSP.cxx
index 77d82069ed66209b22a85098876b073c483de8fe..2e6db7d04c1eb9e79c36d77d1312fc4a1aac2355 100755 (executable)
--- a/PWGHF/hfe/AliAnalysisTaskFlowITSTPCTOFQCSP.cxx
+++ b/PWGHF/hfe/AliAnalysisTaskFlowITSTPCTOFQCSP.cxx
@@ -207,6 +207,7 @@ AliAnalysisTaskFlowITSTPCTOFQCSP::AliAnalysisTaskFlowITSTPCTOFQCSP(const char *n
 ,fSparseMassLS(0)
 ,fAssoTPCCluster(0)
 ,fAssoITSRefit(0)
+,fPhiCut(0)
 {
     //Named constructor
     
@@ -325,6 +326,7 @@ AliAnalysisTaskFlowITSTPCTOFQCSP::AliAnalysisTaskFlowITSTPCTOFQCSP()
 ,fSparseMassLS(0)
 ,fAssoTPCCluster(0)
 ,fAssoITSRefit(0)
+,fPhiCut(0)
 {
     //Default constructor
     fPID = new AliHFEpid("hfePid");
@@ -391,7 +393,12 @@ void AliAnalysisTaskFlowITSTPCTOFQCSP::UserExec(Option_t*)
         if(!(((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected() & AliVEvent::kCentral)) return;
     }
     if(fTrigger==1){
-        if(!(((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected() & AliVEvent::kSemiCentral)) return;
+    
+        if ( !(((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected() & AliVEvent::kAny) ) return;
+        
+        TString firedTriggerClasses = static_cast<const AliAODEvent*>(InputEvent())->GetFiredTriggerClasses();
+        
+        if ( ! ( firedTriggerClasses.Contains("CVLN_B2-B-NOPF-ALLNOTRD") || firedTriggerClasses.Contains("CVLN_R1-B-NOPF-ALLNOTRD") || firedTriggerClasses.Contains("CSEMI_R1-B-NOPF-ALLNOTRD") ) ) return;
     }
     if(fTrigger==2){
         if(!(((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected() & AliVEvent::kEMCEGA)) return;
@@ -402,7 +409,11 @@ void AliAnalysisTaskFlowITSTPCTOFQCSP::UserExec(Option_t*)
     if(fTrigger==4){
         if(!(((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected() & (AliVEvent::kCentral | AliVEvent::kSemiCentral))) return;
     }
+    if(fTrigger==5){
+        if(!(((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected() & (AliVEvent::kSemiCentral))) return;
+    }
     
+ 
     
     
     //---------------CENTRALITY AND EVENT SELECTION-----------------------
@@ -579,6 +590,13 @@ void AliAnalysisTaskFlowITSTPCTOFQCSP::UserExec(Option_t*)
         //==========================================================================================================
         Double_t eta = track->Eta();
         Double_t phi = track->Phi();
+        
+        if(fPhiCut){
+            if(phi<1.4 || phi >3.14)continue; //to have same EMCal phi acceptance
+        }
+
+        
+        
         Double_t pt = track->Pt();         //pt track after cuts
         if(pt<fpTCutmin || pt>fpTCutmax) continue;
         //==========================================================================================================
@@ -1305,7 +1323,7 @@ void AliAnalysisTaskFlowITSTPCTOFQCSP::CheckCentrality(AliAODEvent* event, Bool_
     }//...after centrality selectrion
     //============================================================================================================================
     if(fMultCut){
-        if(fTrigger==1 || fTrigger==4){
+        if(fTrigger==1 || fTrigger==4 || fTrigger==5){
             if(! (multTPC > (-36.73 + 1.48*multGlob) && multTPC < (62.87 + 1.78*multGlob))){
                 //   cout <<" Trigger ==" <<fTrigger<< endl;
                 centralitypass = kFALSE;