reverted commit 092db0d78a7a4058bb5893bf8110127f6fa3bfe1

[u/mrichter/AliRoot.git] / PWGCF / Correlations / DPhi / AliAnalysisTaskPhiCorrelations.cxx

diff --git a/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx b/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx
index 8d60182506112ce6bb098de60f44daadf335a65c..8caa6fd2b13aa0bdba188e5d2fc34520cb24139a 100644 (file)
--- a/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx
+++ b/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx
@@ -130,8 +130,6 @@ fCentralityMethod("V0M"),
 // track cuts
 fTrackEtaCut(0.8),
 fTrackEtaCutMin(-1.),
-fTrackPhiCutEvPlMin(0),
-fTrackPhiCutEvPlMax(0),
 fOnlyOneEtaSide(0),
 fPtMin(0.5),
 fDCAXYCut(0),
@@ -249,8 +247,6 @@ void  AliAnalysisTaskPhiCorrelations::CreateOutputObjects()
   fAnalyseUE->DefineESDCuts(fFilterBit);
   fAnalyseUE->SetEventSelection(fSelectBit);
   fAnalyseUE->SetHelperPID(fHelperPID);
-  if(fTrackPhiCutEvPlMax!=0)
-    fAnalyseUE->SetParticlePhiCutEventPlane(fTrackPhiCutEvPlMin,fTrackPhiCutEvPlMax);
   if ((fParticleSpeciesTrigger != -1 || fParticleSpeciesAssociated != -1) && !fHelperPID)
     AliFatal("HelperPID object should be set in the steering macro");
 
@@ -1170,18 +1166,9 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
     return;
 
   TObjArray* tracks = 0;
- 
-  Double_t evtPlanePhi = 10e10; //A value outside [-pi/2,pi/2] will be ignored
-  if(fTrackPhiCutEvPlMax!=0) {
-    AliEventplane* evtPlane = inputEvent->GetEventplane();
-    Double_t qx = 0; Double_t qy = 0;
-    if(evtPlane) evtPlanePhi = evtPlane->CalculateVZEROEventPlane(inputEvent, 10, 2, qx, qy);
-    //Reject event if the plane is not available
-    else return; 
-  }
- 
+  
   if (fTriggersFromDetector == 0)
-    tracks = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, fParticleSpeciesTrigger, kTRUE, kTRUE, evtPlanePhi);
+    tracks = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, fParticleSpeciesTrigger, kTRUE);
   else if (fTriggersFromDetector <= 4)
     tracks=GetParticlesFromDetector(inputEvent,fTriggersFromDetector);
   else
@@ -1234,7 +1221,7 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
   // correlate particles with...
   TObjArray* tracksCorrelate = 0;
   if(fAssociatedFromDetector==0){
-    if (fParticleSpeciesAssociated != fParticleSpeciesTrigger || fTriggersFromDetector > 0 || fTrackPhiCutEvPlMax != 0)
+    if (fParticleSpeciesAssociated != fParticleSpeciesTrigger || fTriggersFromDetector > 0 )
       tracksCorrelate = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, fParticleSpeciesAssociated, kTRUE);
   }
   else if (fAssociatedFromDetector <= 4){
@@ -1346,7 +1333,6 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
   }
 }
 
-//____________________________________________________________________
 TObjArray* AliAnalysisTaskPhiCorrelations::CloneAndReduceTrackList(TObjArray* tracks)
 {
   // clones a track list by using AliDPhiBasicParticle which uses much less memory (used for event mixing)
@@ -1407,7 +1393,6 @@ void AliAnalysisTaskPhiCorrelations::RemoveDuplicates(TObjArray* tracks)
     AliInfo(Form("Reduced from %d to %d", before, tracks->GetEntriesFast())); 
 }
 
-//____________________________________________________________________
 void AliAnalysisTaskPhiCorrelations::CleanUp(TObjArray* tracks, TObject* mcObj, Int_t maxLabel)
 {
   // calls RemoveInjectedSignals, RemoveWeakDecays and RemoveDuplicates
@@ -1573,8 +1558,7 @@ TObjArray* AliAnalysisTaskPhiCorrelations::GetParticlesFromDetector(AliVEvent* i
 }
 
 //____________________________________________________________________
-Bool_t AliAnalysisTaskPhiCorrelations::IsMuEvent()
-{
+Bool_t AliAnalysisTaskPhiCorrelations::IsMuEvent(){
   
   if(!fAOD)
     AliFatal("Muon selection only implemented on AOD");//FIXME to be implemented also for ESDs as in AliAnalyseLeadingTrackUE::GetAcceptedPArticles