]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx
Merge branch 'TPCdev' of https://git.cern.ch/reps/AliRoot into TPCdev
[u/mrichter/AliRoot.git] / PWGCF / Correlations / DPhi / AliAnalysisTaskPhiCorrelations.cxx
index 954cba665341d15483c9805f3ecfe7f4f195e32d..c52ea2f6b22b3e76d3e742f8d7d70c798f50ade4 100644 (file)
@@ -16,6 +16,7 @@
 /* $Id:$ */
 
 #include <TROOT.h>
+#include <TInterpreter.h>
 #include <TChain.h>
 #include <TFile.h>
 #include <TList.h>
@@ -24,6 +25,7 @@
 #include <TH2F.h>
 #include <TH3F.h>
 #include <TRandom.h>
+#include <TParameter.h>
 
 #include "AliAnalysisTaskPhiCorrelations.h"
 #include "AliAnalyseLeadingTrackUE.h"
@@ -39,6 +41,7 @@
 #include "AliMCEventHandler.h"
 #include "AliVParticle.h"
 #include "AliCFContainer.h"
+#include "AliEventplane.h"
 
 #include "AliESDEvent.h"
 #include "AliESDInputHandler.h"
 #include "AliAODMCHeader.h"
 #include "AliGenCocktailEventHeader.h"
 #include "AliGenEventHeader.h"
+#include "AliCollisionGeometry.h"
 
 #include "AliEventPoolManager.h"
 
 #include "AliESDZDC.h"
 #include "AliESDtrackCuts.h"
 
+#include "AliHelperPID.h"
+#include "AliAnalysisUtils.h"
+#include "TMap.h"
 
 ////////////////////////////////////////////////////////////////////////
 //
@@ -88,19 +95,24 @@ fMode(0),
 fReduceMemoryFootprint(kFALSE),
 fFillMixed(kTRUE),
 fMixingTracks(50000),
-fCompareCentralities(kFALSE),
 fTwoTrackEfficiencyStudy(kFALSE),
 fTwoTrackEfficiencyCut(0),
+fTwoTrackCutMinRadius(0.8),
 fUseVtxAxis(kFALSE),
 fCourseCentralityBinning(kFALSE),
 fSkipTrigger(kFALSE),
 fInjectedSignals(kFALSE),
+fRandomizeReactionPlane(kFALSE),
+fHelperPID(0x0),
+fAnalysisUtils(0x0),
+fMap(0x0),
 // pointers to UE classes
 fAnalyseUE(0x0),
 fHistos(0x0),
 fHistosMixed(0),
-fEfficiencyCorrection(0),
-fCorrectTriggers(kFALSE),
+fEfficiencyCorrectionTriggers(0),
+fEfficiencyCorrectionAssociated(0),
+fCentralityWeights(0),
 // handlers and events
 fAOD(0x0),
 fESD(0x0),
@@ -114,29 +126,48 @@ fListOfHistos(0x0),
 // event QA
 fnTracksVertex(1),  // QA tracks pointing to principal vertex (= 3 default) 
 fZVertex(7.),
+fAcceptOnlyMuEvents(kFALSE),
 fCentralityMethod("V0M"),
 // track cuts
 fTrackEtaCut(0.8),
+fTrackEtaCutMin(-1.),
+fTrackPhiCutEvPlMin(0.),
+fTrackPhiCutEvPlMax(0.),
 fOnlyOneEtaSide(0),
 fPtMin(0.5),
+fDCAXYCut(0),
+fSharedClusterCut(-1),
+fCrossedRowsCut(-1),
+fFoundFractionCut(-1),
 fFilterBit(0xFF),
+fTrackStatus(0),
 fSelectBit(AliVEvent::kMB|AliVEvent::kUserDefined),
 fUseChargeHadrons(kFALSE),
-fSelectParticleSpecies(-1),
+fParticleSpeciesTrigger(-1),
+fParticleSpeciesAssociated(-1),
+fCheckMotherPDG(kTRUE),
+fTrackletDphiCut(9999999.),
 fSelectCharge(0),
 fTriggerSelectCharge(0),
+fAssociatedSelectCharge(0),
 fTriggerRestrictEta(-1),
 fEtaOrdering(kFALSE),
 fCutConversions(kFALSE),
 fCutResonances(kFALSE),
+fRejectResonanceDaughters(-1),
 fFillOnlyStep0(kFALSE),
 fSkipStep6(kFALSE),
 fRejectCentralityOutliers(kFALSE),
+fRejectZeroTrackEvents(kFALSE),
 fRemoveWeakDecays(kFALSE),
 fRemoveDuplicates(kFALSE),
 fSkipFastCluster(kFALSE),
 fWeightPerEvent(kFALSE),
 fCustomBinning(),
+fPtOrder(kTRUE),
+fTriggersFromDetector(0),
+fAssociatedFromDetector(0),
+fMCUseUncheckedCentrality(kFALSE),
 fFillpT(kFALSE)
 {
   // Default constructor
@@ -208,10 +239,21 @@ void  AliAnalysisTaskPhiCorrelations::CreateOutputObjects()
    
   // Initialize class with main algorithms, event and track selection. 
   fAnalyseUE = new AliAnalyseLeadingTrackUE();
-  fAnalyseUE->SetParticleSelectionCriteria(fFilterBit, fUseChargeHadrons, fTrackEtaCut, fPtMin);
+  fAnalyseUE->SetParticleSelectionCriteria(fFilterBit, fUseChargeHadrons, fTrackEtaCut, fTrackEtaCutMin, fPtMin);
+  fAnalyseUE->SetDCAXYCut(fDCAXYCut);
+  fAnalyseUE->SetSharedClusterCut(fSharedClusterCut);
+  fAnalyseUE->SetCrossedRowsCut(fCrossedRowsCut);
+  fAnalyseUE->SetFoundFractionCut(fFoundFractionCut);
+  fAnalyseUE->SetTrackStatus(fTrackStatus);
+  fAnalyseUE->SetCheckMotherPDG(fCheckMotherPDG);
   fAnalyseUE->SetDebug(fDebug); 
   fAnalyseUE->DefineESDCuts(fFilterBit);
   fAnalyseUE->SetEventSelection(fSelectBit);
+  fAnalyseUE->SetHelperPID(fHelperPID);
+  if(fTrackPhiCutEvPlMax > 0.0001)
+    fAnalyseUE->SetParticlePhiCutEventPlane(fTrackPhiCutEvPlMin,fTrackPhiCutEvPlMax);
+  if ((fParticleSpeciesTrigger != -1 || fParticleSpeciesAssociated != -1) && !fHelperPID)
+    AliFatal("HelperPID object should be set in the steering macro");
 
   // Initialize output list of containers
   if (fListOfHistos != NULL){
@@ -239,6 +281,9 @@ void  AliAnalysisTaskPhiCorrelations::CreateOutputObjects()
   
   fHistos->SetSelectTriggerCharge(fTriggerSelectCharge);
   fHistosMixed->SetSelectTriggerCharge(fTriggerSelectCharge);
+  
+  fHistos->SetSelectAssociatedCharge(fAssociatedSelectCharge);
+  fHistosMixed->SetSelectAssociatedCharge(fAssociatedSelectCharge);
 
   fHistos->SetTriggerRestrictEta(fTriggerRestrictEta);
   fHistosMixed->SetTriggerRestrictEta(fTriggerRestrictEta);
@@ -252,28 +297,55 @@ void  AliAnalysisTaskPhiCorrelations::CreateOutputObjects()
   fHistos->SetPairCuts(fCutConversions, fCutResonances);
   fHistosMixed->SetPairCuts(fCutConversions, fCutResonances);
   
+  fHistos->SetRejectResonanceDaughters(fRejectResonanceDaughters);
+  fHistosMixed->SetRejectResonanceDaughters(fRejectResonanceDaughters);
+  
   fHistos->SetTrackEtaCut(fTrackEtaCut);
   fHistosMixed->SetTrackEtaCut(fTrackEtaCut);
   
   fHistos->SetWeightPerEvent(fWeightPerEvent);
   fHistosMixed->SetWeightPerEvent(fWeightPerEvent);
-
-  if (fEfficiencyCorrection)
+  
+  fHistos->SetPtOrder(fPtOrder);
+  fHistosMixed->SetPtOrder(fPtOrder);
+  
+  fHistos->SetTwoTrackCutMinRadius(fTwoTrackCutMinRadius);
+  fHistosMixed->SetTwoTrackCutMinRadius(fTwoTrackCutMinRadius);
+  
+  if (fEfficiencyCorrectionTriggers)
+   {
+    fHistos->SetEfficiencyCorrectionTriggers(fEfficiencyCorrectionTriggers);
+    fHistosMixed->SetEfficiencyCorrectionTriggers((THnF*) fEfficiencyCorrectionTriggers->Clone());
+   }
+  if (fEfficiencyCorrectionAssociated)
   {
-    fHistos->SetEfficiencyCorrection(fEfficiencyCorrection, fCorrectTriggers);
-    fHistosMixed->SetEfficiencyCorrection((THnF*) fEfficiencyCorrection->Clone(), fCorrectTriggers);
+    fHistos->SetEfficiencyCorrectionAssociated(fEfficiencyCorrectionAssociated);
+    fHistosMixed->SetEfficiencyCorrectionAssociated((THnF*) fEfficiencyCorrectionAssociated->Clone());
   }
   
   // add histograms to list
   fListOfHistos->Add(fHistos);
   fListOfHistos->Add(fHistosMixed);
+  // add HelperPID to list
+  if (fHelperPID)
+    fListOfHistos->Add(fHelperPID);
+  // add TMap to list
+  if (fMap)
+    fListOfHistos->Add(fMap);
   
-  fListOfHistos->Add(new TH2F("trackletsVsV0Cent", ";L1 clusters;v0 centrality", 100, -0.5, 9999.5, 101, 0, 101));
   fListOfHistos->Add(new TH2F("processIDs", ";#Delta#phi;process id", 100, -0.5 * TMath::Pi(), 1.5 * TMath::Pi(), kPNoProcess + 1, -0.5, kPNoProcess + 0.5));
   fListOfHistos->Add(new TH1F("eventStat", ";;events", 4, -0.5, 3.5));
   fListOfHistos->Add(new TH2F("mixedDist", ";centrality;tracks;events", 101, 0, 101, 200, 0, fMixingTracks * 1.5));
-  fListOfHistos->Add(new TH1F("pids", ";pdg;tracks", 2001, -1000.5, 1000.5));
   fListOfHistos->Add(new TH2F("referenceMultiplicity", ";centrality;tracks;events", 101, 0, 101, 200, 0, 200));
+  if (fCentralityMethod == "V0A_MANUAL")
+  {
+    fListOfHistos->Add(new TH2F("V0AMult", "V0A multiplicity;V0A multiplicity;V0A multiplicity (scaled)", 1000, -.5, 999.5, 1000, -.5, 999.5));
+    fListOfHistos->Add(new TH2F("V0AMultCorrelation", "V0A multiplicity;V0A multiplicity;SPD tracklets", 1000, -.5, 999.5, 1000, -.5, 999.5));
+  }
+  if (fTriggersFromDetector == 1 || fTriggersFromDetector == 2 || fAssociatedFromDetector == 1 || fAssociatedFromDetector == 2)
+    fListOfHistos->Add(new TH1F("V0SingleCells", "V0 single cell multiplicity;multiplicity;events", 100, -0.5, 99.5));
+  if (fTriggersFromDetector == 3 || fAssociatedFromDetector == 3)
+    fListOfHistos->Add(new TH1F("DphiTrklets", "tracklets Dphi;#Delta#phi,trklets (mrad);entries", 100, -100, 100));
   
   PostData(0,fListOfHistos);
   
@@ -310,6 +382,9 @@ void  AliAnalysisTaskPhiCorrelations::CreateOutputObjects()
 //____________________________________________________________________
 void  AliAnalysisTaskPhiCorrelations::Exec(Option_t */*option*/)
 {
+  // exec (per event)
+  fAnalyseUE->NextEvent();
+  
   // receive ESD pointer if we are not running AOD analysis
   if (!fAOD)
   {
@@ -347,31 +422,51 @@ void  AliAnalysisTaskPhiCorrelations::AddSettingsTree()
   TTree *settingsTree   = new TTree("UEAnalysisSettings","Analysis Settings in UE estimation");
   settingsTree->Branch("fnTracksVertex", &fnTracksVertex,"nTracksVertex/I");
   settingsTree->Branch("fZVertex", &fZVertex,"ZVertex/D");
+  settingsTree->Branch("fAcceptOnlyMuEvents", &fAcceptOnlyMuEvents,"AcceptOnlyMuEvents/O");
   //settingsTree->Branch("fCentralityMethod", fCentralityMethod.Data(),"CentralityMethod/C");
   settingsTree->Branch("fTrackEtaCut", &fTrackEtaCut, "TrackEtaCut/D");
+  settingsTree->Branch("fTrackEtaCutMin", &fTrackEtaCutMin, "TrackEtaCutMin/D");
+  settingsTree->Branch("fTrackPhiCutEvPlMin", &fTrackPhiCutEvPlMin, "TrackPhiCutEvPlMin/D");
+  settingsTree->Branch("fTrackPhiCutEvPlMax", &fTrackPhiCutEvPlMax, "TrackPhiCutEvPlMax/D");
   settingsTree->Branch("fOnlyOneEtaSide", &fOnlyOneEtaSide,"OnlyOneEtaSide/I");
   settingsTree->Branch("fPtMin", &fPtMin, "PtMin/D");
   settingsTree->Branch("fFilterBit", &fFilterBit,"FilterBit/I");
+  settingsTree->Branch("fSharedClusterCut", &fSharedClusterCut,"SharedClusterCut/D");
+  settingsTree->Branch("fCrossedRowsCut", &fCrossedRowsCut,"CrossedRowsCut/I");
+  settingsTree->Branch("fFoundFractionCut", &fFoundFractionCut,"FoundFractionCut/D");
+  settingsTree->Branch("fTrackStatus", &fTrackStatus,"TrackStatus/I");
   settingsTree->Branch("fSelectBit", &fSelectBit,"EventSelectionBit/I");
   settingsTree->Branch("fUseChargeHadrons", &fUseChargeHadrons,"UseChHadrons/O");
-  settingsTree->Branch("fSelectParticleSpecies", &fSelectParticleSpecies,"ParticleSpecies/I");
+  settingsTree->Branch("fParticleSpeciesTrigger", &fParticleSpeciesTrigger,"ParticleSpeciesTrigger/I");
+  settingsTree->Branch("fParticleSpeciesAssociated", &fParticleSpeciesAssociated,"ParticleSpeciesAssociated/I");
+  settingsTree->Branch("fCheckMotherPDG", &fCheckMotherPDG,"CheckMotherPDG/I");
   settingsTree->Branch("fSelectCharge", &fSelectCharge,"SelectCharge/I");
   settingsTree->Branch("fTriggerSelectCharge", &fTriggerSelectCharge,"TriggerSelectCharge/I");
+  settingsTree->Branch("fAssociatedSelectCharge", &fAssociatedSelectCharge,"fAssociatedSelectCharge/I");
   settingsTree->Branch("fTriggerRestrictEta", &fTriggerRestrictEta,"TriggerRestrictEta/D");
   settingsTree->Branch("fEtaOrdering", &fEtaOrdering,"EtaOrdering/O");
   settingsTree->Branch("fCutConversions", &fCutConversions,"CutConversions/O");
   settingsTree->Branch("fCutResonances", &fCutResonances,"CutResonances/O");
+  settingsTree->Branch("fRejectResonanceDaughters", &fRejectResonanceDaughters,"RejectResonanceDaughters/I");
   settingsTree->Branch("fFillpT", &fFillpT,"FillpT/O");
   settingsTree->Branch("fMixingTracks", &fMixingTracks,"MixingTracks/I");
   settingsTree->Branch("fSkipTrigger", &fSkipTrigger,"SkipTrigger/O");
-  settingsTree->Branch("fInjectedSignals", &fInjectedSignals,"SkipTrigger/O");
+  settingsTree->Branch("fInjectedSignals", &fInjectedSignals,"InjectedSignals/O");
+  settingsTree->Branch("fRandomizeReactionPlane", &fRandomizeReactionPlane,"RandomizeReactionPlane/O");
   settingsTree->Branch("fRejectCentralityOutliers", &fRejectCentralityOutliers,"RejectCentralityOutliers/O");
+  settingsTree->Branch("fRejectZeroTrackEvents", &fRejectZeroTrackEvents,"RejectZeroTrackEvents/O");
   settingsTree->Branch("fRemoveWeakDecays", &fRemoveWeakDecays,"RemoveWeakDecays/O");
   settingsTree->Branch("fRemoveDuplicates", &fRemoveDuplicates,"RemoveDuplicates/O");
   settingsTree->Branch("fSkipFastCluster", &fSkipFastCluster,"SkipFastCluster/O");
   settingsTree->Branch("fWeightPerEvent", &fWeightPerEvent,"WeightPerEvent/O");
+  settingsTree->Branch("fPtOrder", &fPtOrder,"PtOrder/O");
+  settingsTree->Branch("fTriggersFromDetector", &fTriggersFromDetector,"TriggersFromDetector/I");
+  settingsTree->Branch("fAssociatedFromDetector", &fAssociatedFromDetector,"AssociatedFromDetector/I");
+  settingsTree->Branch("fMCUseUncheckedCentrality", &fMCUseUncheckedCentrality,"MCUseUncheckedCentrality/O");
+  settingsTree->Branch("fTwoTrackEfficiencyCut", &fTwoTrackEfficiencyCut,"TwoTrackEfficiencyCut/D");
+  settingsTree->Branch("fTwoTrackCutMinRadius", &fTwoTrackCutMinRadius,"TwoTrackCutMinRadius/D");
+  
   //fCustomBinning
-  settingsTree->Branch("fCorrectTriggers", &fCorrectTriggers,"CorrectTriggers/O");
   
   settingsTree->Fill();
   fListOfHistos->Add(settingsTree);
@@ -389,22 +484,54 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
   
   if (fCentralityMethod.Length() > 0)
   {
-    AliCentrality *centralityObj = 0;
-    if (fAOD)
-      centralityObj = fAOD->GetHeader()->GetCentralityP();
-    else if (fESD)
-      centralityObj = fESD->GetCentrality();
-    
-    if (centralityObj)
+    if (fCentralityMethod == "MC_b")
+    {
+      AliGenEventHeader* eventHeader = GetFirstHeader();
+      if (!eventHeader)
+      {
+       // We avoid AliFatal here, because the AOD productions sometimes have events where the MC header is missing 
+       // (due to unreadable Kinematics) and we don't want to loose the whole job because of a few events
+       AliError("Event header not found. Skipping this event.");
+       fHistos->FillEvent(0, AliUEHist::kCFStepAnaTopology);
+       return;
+      }
+      
+      AliCollisionGeometry* collGeometry = dynamic_cast<AliCollisionGeometry*> (eventHeader);
+      if (!collGeometry)
+      {
+       eventHeader->Dump();
+       AliFatal("Asking for MC_b centrality, but event header has no collision geometry information");
+      }
+      
+      centrality = collGeometry->ImpactParameter();
+    }
+    else if (fCentralityMethod == "nano")
     {
-      centrality = centralityObj->GetCentralityPercentileUnchecked(fCentralityMethod);
-      AliInfo(Form("Centrality is %f", centrality));
+      centrality = (Float_t) gROOT->ProcessLine(Form("100.0 + 100.0 * ((AliNanoAODHeader*) %p)->GetCentrality(\"%s\")", fAOD->GetHeader(), fCentralityMethod.Data())) / 100 - 1.0;
     }
     else
     {
-      Printf("WARNING: Centrality object is 0");
-      centrality = -1;
-     }
+      AliCentrality *centralityObj = 0;
+      if (fAOD)
+       centralityObj = fAOD->GetHeader()->GetCentralityP();
+      else if (fESD)
+       centralityObj = fESD->GetCentrality();
+      
+      if (centralityObj)
+      {
+       if (fMCUseUncheckedCentrality)
+         centrality = centralityObj->GetCentralityPercentileUnchecked(fCentralityMethod);
+       else
+         centrality = centralityObj->GetCentralityPercentile(fCentralityMethod);
+      }
+      else
+      {
+       Printf("WARNING: Centrality object is 0");
+       centrality = -1;
+      }
+    }
+
+    AliInfo(Form("Centrality is %f", centrality));
   }
   
   // Support for ESD and AOD based analysis
@@ -437,8 +564,8 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
     
   if (!fAnalyseUE->VertexSelection(vertexSupplier, 0, fZVertex)) 
     return;
-  
-  Float_t zVtx = 0;
+    
+    Float_t zVtx = 0;
   if (fAOD)
     zVtx = ((AliAODMCHeader*) vertexSupplier)->GetVtxZ();
   else
@@ -470,6 +597,17 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
 
       headers = cocktailHeader->GetHeaders()->GetEntries();
       eventHeader = dynamic_cast<AliGenEventHeader*> (cocktailHeader->GetHeaders()->First());
+      
+      if (fDebug > 4)
+      {
+       for (Int_t i=0; i<cocktailHeader->GetHeaders()->GetEntries(); i++)
+       {
+         AliGenEventHeader* headerTmp = dynamic_cast<AliGenEventHeader*> (cocktailHeader->GetHeaders()->At(i));
+         if (headerTmp)
+           Printf("%d particles in header:", headerTmp->NProduced());
+         cocktailHeader->GetHeaders()->At(i)->Dump();
+       }
+      }
     }
     else
     {
@@ -492,41 +630,57 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
     }
     
     skipParticlesAbove = eventHeader->NProduced();
-    AliInfo(Form("Injected signals in this event (%d headers). Keeping events of %s. Will skip particles/tracks above %d.", headers, eventHeader->ClassName(), skipParticlesAbove));
+    AliInfo(Form("Injected signals in this event (%d headers). Keeping particles/tracks of %s. Will skip particles/tracks above %d.", headers, eventHeader->ClassName(), skipParticlesAbove));
+  }
+  
+  if (fCentralityWeights && !AcceptEventCentralityWeight(centrality))
+  {
+    AliInfo(Form("Rejecting event because of centrality weighting: %f", centrality));
+    fHistos->FillEvent(centrality, AliUEHist::kCFStepAnaTopology);
+    return;
   }
   
   // Get MC primaries
   // triggers
-  TObjArray* tmpList = fAnalyseUE->GetAcceptedParticles(mc, 0, kTRUE, -1, kTRUE);
+  TObjArray* tmpList = fAnalyseUE->GetAcceptedParticles(mc, 0, kTRUE, fParticleSpeciesTrigger, kTRUE);
   CleanUp(tmpList, mc, skipParticlesAbove);
   TObjArray* tracksMC = CloneAndReduceTrackList(tmpList);
   delete tmpList;
   
   // associated
   TObjArray* tracksCorrelateMC = tracksMC;
-  if (fSelectParticleSpecies != -1)
+  if (fParticleSpeciesAssociated != fParticleSpeciesTrigger)
   {
-    // TODO for MC this uses to PDG of the mother of the particle
-    tracksCorrelateMC = fAnalyseUE->GetAcceptedParticles(mc, 0, kTRUE, fSelectParticleSpecies, kTRUE);
-    CleanUp(tracksCorrelateMC, mc, skipParticlesAbove);
+    tmpList = fAnalyseUE->GetAcceptedParticles(mc, 0, kTRUE, fParticleSpeciesAssociated, kTRUE);
+    CleanUp(tmpList, mc, skipParticlesAbove);
+    tracksCorrelateMC = CloneAndReduceTrackList(tmpList);
+    delete tmpList;
   }
   
-  /*
-  if (fAOD)
-  {
-    for (Int_t i=0; i<fArrayMC->GetEntriesFast(); i++)
-      ((TH1F*) fListOfHistos->FindObject("pids"))->Fill(((AliAODMCParticle*) fArrayMC->At(i))->PdgCode());
-  }
-  else
+  if (fRandomizeReactionPlane)
   {
-    for (Int_t i=0; i<fMcEvent->GetNumberOfTracks(); i++)
-      ((TH1F*) fListOfHistos->FindObject("pids"))->Fill(fMcEvent->GetTrack(i)->PdgCode());
+    Double_t centralityDigits = centrality*1000. - (Int_t)(centrality*1000.);
+    Double_t angle = TMath::TwoPi() * centralityDigits;
+    AliInfo(Form("Shifting phi of all tracks by %f (digits %f)", angle, centralityDigits));
+    ShiftTracks(tracksMC, angle);
+    if (tracksCorrelateMC != tracksMC)
+      ShiftTracks(tracksCorrelateMC, angle);
   }
-  */
   
   if (fFillOnlyStep0)
     zVtx = 0;
   
+  // Event selection based on number of number of MC particles
+  if (fRejectZeroTrackEvents && tracksMC->GetEntriesFast() == 0)
+  {
+    AliInfo(Form("Rejecting event due to kinematic selection: %f %d", centrality, tracksMC->GetEntriesFast()));
+    fHistos->FillEvent(centrality, AliUEHist::kCFStepAnaTopology);
+    if (tracksMC != tracksCorrelateMC)
+      delete tracksCorrelateMC;
+    delete tracksMC;
+    return;
+  }
+  
   // (MC-true all particles)
   // STEP 0
   fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepAll, tracksMC, tracksCorrelateMC, weight);
@@ -535,6 +689,8 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
   if (fFillMixed)
   {
     AliEventPool* pool = fPoolMgr->GetEventPool(centrality, zVtx);
+    if (fFillOnlyStep0)
+      ((TH2F*) fListOfHistos->FindObject("mixedDist"))->Fill(centrality, pool->NTracksInPool());
     if (pool->IsReady())
       for (Int_t jMix=0; jMix<pool->GetCurrentNEvents(); jMix++) 
        fHistosMixed->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepAll, tracksMC, pool->GetEvent(jMix), 1.0 / pool->GetCurrentNEvents(), (jMix == 0));
@@ -567,14 +723,34 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
       for (Int_t particleSpecies = 0; particleSpecies < 4; particleSpecies++)
       {
         TObjArray* primMCParticles = fAnalyseUE->GetAcceptedParticles(mc, 0x0, kTRUE, particleSpecies, kTRUE);
-        TObjArray* primRecoTracksMatched = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kTRUE, particleSpecies, kTRUE);
-        TObjArray* allRecoTracksMatched = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kFALSE, particleSpecies, kTRUE);
+        TObjArray* primRecoTracksMatched = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kTRUE, particleSpecies, kTRUE, kFALSE);
+        TObjArray* allRecoTracksMatched  = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kFALSE, particleSpecies, kTRUE, kFALSE);
+        TObjArray* primRecoTracksMatchedPID = 0;
+        TObjArray* allRecoTracksMatchedPID  = 0;
+       
+       if (fHelperPID)
+       {
+         primRecoTracksMatchedPID = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kTRUE, particleSpecies, kTRUE, kTRUE);
+         allRecoTracksMatchedPID  = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kFALSE, particleSpecies, kTRUE, kTRUE);
+       }
        
        CleanUp(primMCParticles, mc, skipParticlesAbove);
        CleanUp(primRecoTracksMatched, mc, skipParticlesAbove);
        CleanUp(allRecoTracksMatched, mc, skipParticlesAbove);
+       CleanUp(primRecoTracksMatchedPID, mc, skipParticlesAbove);
+       CleanUp(allRecoTracksMatchedPID, mc, skipParticlesAbove);
+       
+       // select charges
+       if (fTriggerSelectCharge != 0)
+       {
+         SelectCharge(primMCParticles);
+         SelectCharge(primRecoTracksMatched);
+         SelectCharge(allRecoTracksMatched);
+         SelectCharge(primRecoTracksMatchedPID);
+         SelectCharge(allRecoTracksMatchedPID);
+       }
       
-        fHistos->FillTrackingEfficiency(primMCParticles, primRecoTracksMatched, allRecoTracksMatched, 0, particleSpecies, centrality, zVtx);
+        fHistos->FillTrackingEfficiency(primMCParticles, primRecoTracksMatched, allRecoTracksMatched, primRecoTracksMatchedPID, allRecoTracksMatchedPID, 0, particleSpecies, centrality, zVtx);
         
 //     Printf("%d --> %d %d %d", particleSpecies, primMCParticles->GetEntries(), primRecoTracksMatched->GetEntries(), allRecoTracksMatched->GetEntries());
 
@@ -587,7 +763,7 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
       CleanUp((TObjArray*) fakeParticles->At(0), mc, skipParticlesAbove);
       CleanUp((TObjArray*) fakeParticles->At(1), mc, skipParticlesAbove);
 
-      fHistos->FillTrackingEfficiency(0, 0, 0, (TObjArray*) fakeParticles->At(2), -1, centrality, zVtx);
+      fHistos->FillTrackingEfficiency(0, 0, 0, 0, 0, (TObjArray*) fakeParticles->At(2), 0, centrality, zVtx);
       fHistos->FillFakePt(fakeParticles, centrality);
 //       Printf(">>>>> %d %d %d fakes", ((TObjArray*) fakeParticles->At(0))->GetEntriesFast(), ((TObjArray*) fakeParticles->At(1))->GetEntriesFast(), ((TObjArray*) fakeParticles->At(2))->GetEntriesFast());
       delete fakeParticles;
@@ -601,14 +777,19 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
       
       // Get MC primaries that match reconstructed track
       // triggers
-      TObjArray* tracksRecoMatchedPrim = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kTRUE, -1, kTRUE);
-      CleanUp(tracksRecoMatchedPrim, mc, skipParticlesAbove);
+      tmpList = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kTRUE, fParticleSpeciesTrigger, kTRUE);
+      CleanUp(tmpList, mc, skipParticlesAbove);
+      TObjArray* tracksRecoMatchedPrim = CloneAndReduceTrackList(tmpList);
+      delete tmpList;
+      
       // associated
       TObjArray* tracksCorrelateRecoMatchedPrim = tracksRecoMatchedPrim;
-      if (fSelectParticleSpecies != -1)
+      if (fParticleSpeciesAssociated != fParticleSpeciesTrigger)
       {
-       tracksCorrelateRecoMatchedPrim = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kTRUE, fSelectParticleSpecies, kTRUE);
-       CleanUp(tracksCorrelateRecoMatchedPrim, mc, skipParticlesAbove);
+       tmpList = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kTRUE, fParticleSpeciesAssociated, kTRUE);
+       CleanUp(tmpList, mc, skipParticlesAbove);
+       tracksCorrelateRecoMatchedPrim = CloneAndReduceTrackList(tmpList);
+       delete tmpList;
       }
 
       // (RECO-matched (quantities from MC particle) primary particles)
@@ -627,14 +808,19 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
       
       // Get MC primaries + secondaries that match reconstructed track
       // triggers
-      TObjArray* tracksRecoMatchedAll = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kFALSE, -1, kTRUE);
-      CleanUp(tracksRecoMatchedAll, mc, skipParticlesAbove);
+      tmpList = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kFALSE, fParticleSpeciesTrigger, kTRUE);
+      CleanUp(tmpList, mc, skipParticlesAbove);
+      TObjArray* tracksRecoMatchedAll = CloneAndReduceTrackList(tmpList);
+      delete tmpList;
+      
       // associated
       TObjArray* tracksCorrelateRecoMatchedAll = tracksRecoMatchedAll;
-      if (fSelectParticleSpecies != -1)
+      if (fParticleSpeciesAssociated != fParticleSpeciesTrigger)
       {
-       tracksCorrelateRecoMatchedAll = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kFALSE, fSelectParticleSpecies, kTRUE);
-       CleanUp(tracksCorrelateRecoMatchedAll, mc, skipParticlesAbove);
+       tmpList = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kFALSE, fParticleSpeciesAssociated, kTRUE);
+       CleanUp(tmpList, mc, skipParticlesAbove);
+       tracksCorrelateRecoMatchedAll = CloneAndReduceTrackList(tmpList);
+       delete tmpList;
       }
       
       // (RECO-matched (quantities from MC particle) all particles)
@@ -653,14 +839,19 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
       
       // Get RECO tracks
       // triggers
-      TObjArray* tracks = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, -1, kTRUE);
-      CleanUp(tracks, mc, skipParticlesAbove);
+      tmpList = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, fParticleSpeciesTrigger, kTRUE);
+      CleanUp(tmpList, mc, skipParticlesAbove);
+      TObjArray* tracks = CloneAndReduceTrackList(tmpList);
+      delete tmpList;
+      
       // associated
       TObjArray* tracksCorrelate = tracks;
-      if (fSelectParticleSpecies != -1)
+      if (fParticleSpeciesAssociated != fParticleSpeciesTrigger)
       {
-       tracksCorrelate = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, fSelectParticleSpecies, kTRUE);
-       CleanUp(tracksCorrelate, mc, skipParticlesAbove);
+       tmpList = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, fParticleSpeciesAssociated, kTRUE);
+       CleanUp(tmpList, mc, skipParticlesAbove);
+       tracksCorrelate = CloneAndReduceTrackList(tmpList);
+       delete tmpList;
       }
      
       // (RECO all tracks)
@@ -673,18 +864,19 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
        fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepBiasStudy, tracks, tracksCorrelate, weight, kTRUE, kTRUE, bSign, fTwoTrackEfficiencyCut);
 
       // apply correction efficiency, STEP 10
-      if (fEfficiencyCorrection)
+      if (fEfficiencyCorrectionTriggers || fEfficiencyCorrectionAssociated)
       {
-       // with or without two track efficiency depending on if fTwoTrackEfficiencyCut is set
+         // with or without two track efficiency depending on if fTwoTrackEfficiencyCut is set
        Bool_t twoTrackCut = (fTwoTrackEfficiencyCut > 0);
        
        fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepCorrected, tracks, tracksCorrelate, weight, kTRUE, twoTrackCut, bSign, fTwoTrackEfficiencyCut, kTRUE);
       }
-
+      
       // mixed event
       if (fFillMixed)
       {
        AliEventPool* pool2 = fPoolMgr->GetEventPool(centrality, zVtx + 100);
+       ((TH2F*) fListOfHistos->FindObject("mixedDist"))->Fill(centrality, pool2->NTracksInPool());
        if (pool2->IsReady())
        {
          for (Int_t jMix=0; jMix<pool2->GetCurrentNEvents(); jMix++)
@@ -698,7 +890,7 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
              fHistosMixed->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepBiasStudy, tracks, pool2->GetEvent(jMix), 1.0 / pool2->GetCurrentNEvents(), (jMix == 0), kTRUE, bSign, fTwoTrackEfficiencyCut);
            
            // apply correction efficiency, STEP 10
-           if (fEfficiencyCorrection)
+           if (fEfficiencyCorrectionTriggers || fEfficiencyCorrectionAssociated)
            {
              // with or without two track efficiency depending on if fTwoTrackEfficiencyCut is set
              Bool_t twoTrackCut = (fTwoTrackEfficiencyCut > 0);
@@ -779,6 +971,35 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
   delete tracksMC;
 }
 
+//____________________________________________________________________
+AliGenEventHeader* AliAnalysisTaskPhiCorrelations::GetFirstHeader()
+{
+  // get first MC header from either ESD/AOD (including cocktail header if available)
+  
+  if (fMcEvent)
+  {
+    // ESD
+    AliHeader* header = (AliHeader*) fMcEvent->Header();
+    if (!header)
+      return 0;
+      
+    AliGenCocktailEventHeader* cocktailHeader = dynamic_cast<AliGenCocktailEventHeader*> (header->GenEventHeader());
+    if (cocktailHeader)
+      return dynamic_cast<AliGenEventHeader*> (cocktailHeader->GetHeaders()->First());
+
+    return dynamic_cast<AliGenEventHeader*> (header->GenEventHeader());
+  }
+  else
+  {
+    // AOD
+    AliAODMCHeader* header = (AliAODMCHeader*) fAOD->GetList()->FindObject(AliAODMCHeader::StdBranchName());
+    if (!header)
+      return 0;
+    
+    return header->GetCocktailHeader(0);
+  }
+}
+
 //____________________________________________________________________
 void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
 {
@@ -799,7 +1020,7 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
   // skip fast cluster events here if requested
   if (fSkipFastCluster && (fInputHandler->IsEventSelected() & AliVEvent::kFastOnly))
     return;
-
   // Support for ESD and AOD based analysis
   AliVEvent* inputEvent = fAOD;
   if (!inputEvent)
@@ -845,6 +1066,33 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
 //       Printf("%d %f", tracks->GetEntriesFast(), centrality);
       delete tracks;
     }
+    else if (fCentralityMethod == "V0A_MANUAL")
+    {
+      // for pp
+      
+      //Total multiplicity in the VZERO A detector
+      Float_t MV0A=inputEvent->GetVZEROData()->GetMTotV0A();
+      Float_t MV0AScaled=0.;
+      if (fMap){
+       TParameter<float>* sf=(TParameter<float>*)fMap->GetValue(Form("%d",inputEvent->GetRunNumber()));
+       if(sf)MV0AScaled=MV0A*sf->GetVal();
+      }
+      
+      if (MV0AScaled > 0)
+       centrality = MV0AScaled;
+      else
+       centrality = -1;
+    }
+    else if (fCentralityMethod == "nano")
+    {
+//       fAOD->GetHeader()->Dump();
+//       Printf("%p %p %d", dynamic_cast<AliNanoAODHeader*> (fAOD->GetHeader()), dynamic_cast<AliNanoAODHeader*> ((TObject*) (fAOD->GetHeader())), fAOD->GetHeader()->InheritsFrom("AliNanoAODHeader"));
+
+      Int_t error = 0;
+      centrality = (Float_t) gROOT->ProcessLine(Form("100.0 + 100.0 * ((AliNanoAODHeader*) %p)->GetCentrality(\"%s\")", fAOD->GetHeader(), fCentralityMethod.Data()), &error) / 100 - 1.0;
+      if (error != TInterpreter::kNoError)
+       centrality = -1;
+    }
     else
     {
       if (fAOD)
@@ -857,7 +1105,7 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
        //centrality = centralityObj->GetCentralityPercentileUnchecked(fCentralityMethod);
       else
        centrality = -1;
-
+      
       if (fAOD)
       {
        // remove outliers
@@ -890,21 +1138,58 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
   
   // Trigger selection ************************************************
   if (!fSkipTrigger && !fAnalyseUE->TriggerSelection(fInputHandler)) return;
-  
+
   // Fill the "event-counting-container", it is needed to get the number of events remaining after each event-selection cut
   fHistos->FillEvent(centrality, AliUEHist::kCFStepTriggered);
   
+  // Pileup selection ************************************************
+  if (fAnalysisUtils && fAnalysisUtils->IsPileUpEvent(inputEvent)) 
+  {
+    // count the removed events
+    fHistos->FillEvent(centrality, AliUEHist::kCFStepAnaTopology);
+
+    return;
+  }
+  
+  // Reject events without a muon in the muon arm ************************************************
+  if(fAcceptOnlyMuEvents && !IsMuEvent())return;
+  
   // Vertex selection *************************************************
   if(!fAnalyseUE->VertexSelection(inputEvent, fnTracksVertex, fZVertex)) return;
   
   // Fill the "event-counting-container", it is needed to get the number of events remaining after each event-selection cut
   fHistos->FillEvent(centrality, AliUEHist::kCFStepVertex);
  
+  // fill V0 control histograms
+  if (fCentralityMethod == "V0A_MANUAL")
+  {
+    ((TH2F*) fListOfHistos->FindObject("V0AMult"))->Fill(inputEvent->GetVZEROData()->GetMTotV0A(), centrality);
+    if (fAOD)
+      ((TH2F*) fListOfHistos->FindObject("V0AMultCorrelation"))->Fill(inputEvent->GetVZEROData()->GetMTotV0A(), fAOD->GetTracklets()->GetNumberOfTracklets());
+  }
+    
   // optimization
-  if (centrality < 0 && !fCompareCentralities)
+  if (centrality < 0)
     return;
 
-  TObjArray* tracks = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, -1, kTRUE);
+  TObjArray* tracks = 0;
+  Double_t evtPlanePhi = -999.; //A value outside [-pi/2,pi/2] will be ignored
+  if(fTrackPhiCutEvPlMax > 0.0001) {
+    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);
+  else if (fTriggersFromDetector <= 4)
+    tracks=GetParticlesFromDetector(inputEvent,fTriggersFromDetector);
+  else
+    AliFatal(Form("Invalid setting for fTriggersFromDetector: %d", fTriggersFromDetector));
+  
   //Printf("Accepted %d tracks", tracks->GetEntries());
   
   // check for outlier in centrality vs number of tracks (rough constants extracted from correlation histgram)
@@ -933,10 +1218,34 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
     return;
   }
   
+  if (fRejectZeroTrackEvents && tracks->GetEntriesFast() == 0)
+  {
+    AliInfo(Form("Rejecting event because it has no tracks: %f %d", centrality, tracks->GetEntriesFast()));
+    fHistos->FillEvent(centrality, AliUEHist::kCFStepAnaTopology);
+    delete tracks;
+    return;
+  }
+  
+  if (fCentralityWeights && !AcceptEventCentralityWeight(centrality))
+  {
+    AliInfo(Form("Rejecting event because of centrality weighting: %f", centrality));
+    fHistos->FillEvent(centrality, AliUEHist::kCFStepAnaTopology);
+    delete tracks;
+    return;
+  }
+  
   // correlate particles with...
   TObjArray* tracksCorrelate = 0;
-  if (fSelectParticleSpecies != -1)
-    tracksCorrelate = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, fSelectParticleSpecies, kTRUE);
+  if(fAssociatedFromDetector==0){
+    if (fParticleSpeciesAssociated != fParticleSpeciesTrigger || fTriggersFromDetector > 0 || fTrackPhiCutEvPlMax > 0.0001)
+      tracksCorrelate = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, fParticleSpeciesAssociated, kTRUE);
+  }
+  else if (fAssociatedFromDetector <= 4){
+    if(fAssociatedFromDetector != fTriggersFromDetector)
+      tracksCorrelate = GetParticlesFromDetector(inputEvent,fAssociatedFromDetector);
+  }
+  else
+    AliFatal(Form("Invalid setting for fAssociatedFromDetector: %d", fAssociatedFromDetector));
   
   // reference multiplicity
   Int_t referenceMultiplicity = -1;
@@ -944,6 +1253,7 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
     referenceMultiplicity = AliESDtrackCuts::GetReferenceMultiplicity(fESD);
   else if (fAOD)
     referenceMultiplicity = tracks->GetEntriesFast(); // TODO to be replaced by the estimator once available in the AOD
+//    referenceMultiplicity = fAOD->GetHeader()->GetRefMultiplicityComb05();
 
   ((TH2F*) fListOfHistos->FindObject("referenceMultiplicity"))->Fill(centrality, referenceMultiplicity);
   
@@ -954,11 +1264,6 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
   if (fFillpT)
     weight = -1;
 
-  // fill two different centralities (syst study)
-  // the zvtx axis is used to distinguish the results of both centralities: configured centrality in zvtx = 0, SPD in zvtx = 2
-  if (fCompareCentralities)
-    zVtx = 0;
-  
   // Fill containers at STEP 6 (reconstructed)
   if (centrality >= 0)
   {
@@ -971,14 +1276,6 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
       fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepBiasStudy, tracks, tracksCorrelate, weight, kTRUE, kTRUE, bSign, fTwoTrackEfficiencyCut, kTRUE);
   }
 
-  // fill second time with SPD centrality
-  if (fCompareCentralities && centralityObj)
-  {
-    centrality = centralityObj->GetCentralityPercentile("CL1");
-    if (centrality >= 0 && !fSkipStep6)
-      fHistos->FillCorrelations(centrality, 2, AliUEHist::kCFStepReconstructed, tracks, tracksCorrelate, weight, kFALSE, kFALSE, 0, 0.02, kTRUE);
-  }
-  
   // create a list of reduced objects. This speeds up processing and reduces memory consumption for the event pool
   TObjArray* tracksClone = CloneAndReduceTrackList(tracks);
   delete tracks;
@@ -1061,8 +1358,10 @@ TObjArray* AliAnalysisTaskPhiCorrelations::CloneAndReduceTrackList(TObjArray* tr
   
   for (Int_t i=0; i<tracks->GetEntriesFast(); i++)
   {
-    AliVParticle* particle = (AliVParticle*) tracks->At(i);
-    tracksClone->Add(new AliDPhiBasicParticle(particle->Eta(), particle->Phi(), particle->Pt(), particle->Charge()));
+    AliVParticle* particle = (AliVParticle*) tracks->UncheckedAt(i);
+    AliDPhiBasicParticle* copy = new AliDPhiBasicParticle(particle->Eta(), particle->Phi(), particle->Pt(), particle->Charge());
+    copy->SetUniqueID(particle->GetUniqueID());
+    tracksClone->Add(copy);
   }
   
   return tracksClone;
@@ -1075,7 +1374,7 @@ void  AliAnalysisTaskPhiCorrelations::Initialize()
   fInputHandler = (AliInputEventHandler*)
          ((AliAnalysisManager::GetAnalysisManager())->GetInputEventHandler());
   // MC handler
-  fMcHandler = dynamic_cast<AliMCEventHandler*> (AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler());
+  fMcHandler = dynamic_cast<AliInputEventHandler*> (AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler());
 }
 
 //____________________________________________________________________
@@ -1114,6 +1413,9 @@ void AliAnalysisTaskPhiCorrelations::CleanUp(TObjArray* tracks, TObject* mcObj,
 {
   // calls RemoveInjectedSignals, RemoveWeakDecays and RemoveDuplicates
   
+  if (!tracks)
+    return;
+  
   if (fInjectedSignals)
     fAnalyseUE->RemoveInjectedSignals(tracks, mcObj, maxLabel);
   if (fRemoveWeakDecays)
@@ -1121,3 +1423,174 @@ void AliAnalysisTaskPhiCorrelations::CleanUp(TObjArray* tracks, TObject* mcObj,
   if (fRemoveDuplicates)
     RemoveDuplicates(tracks);
 }
+
+//____________________________________________________________________
+void AliAnalysisTaskPhiCorrelations::SelectCharge(TObjArray* tracks)
+{
+  // remove particles with charge not selected (depending on fTriggerSelectCharge)
+  
+  if (!tracks)
+    return;
+  
+  Int_t before = tracks->GetEntriesFast();
+
+  for (Int_t i=0; i<before; ++i) 
+  {
+    AliVParticle* part = (AliVParticle*) tracks->At(i);
+    
+    if (part->Charge() * fTriggerSelectCharge < -1)
+    {
+//       Printf("Removing %d with charge %d", i, part->Charge());
+      TObject* object = tracks->RemoveAt(i);
+      if (tracks->IsOwner())
+       delete object;
+    }
+  }
+  tracks->Compress();
+  
+  if (before > tracks->GetEntriesFast())
+    AliInfo(Form("Reduced from %d to %d", before, tracks->GetEntriesFast())); 
+}
+
+//____________________________________________________________________
+Bool_t AliAnalysisTaskPhiCorrelations::AcceptEventCentralityWeight(Double_t centrality)
+{
+  // rejects "randomly" events such that the centrality gets flat
+  // uses fCentralityWeights histogram
+
+  // TODO code taken and adapted from AliRDHFCuts; waiting for general class AliCentralityFlattening
+  
+  Double_t weight = fCentralityWeights->GetBinContent(fCentralityWeights->FindBin(centrality));
+  Double_t centralityDigits = centrality*100. - (Int_t)(centrality*100.);
+  
+  Bool_t result = kFALSE;
+  if (centralityDigits < weight) 
+    result = kTRUE;
+  
+  AliInfo(Form("Centrality: %f; Digits: %f; Weight: %f; Result: %d", centrality, centralityDigits, weight, result));
+  
+  return result;
+}
+
+//____________________________________________________________________
+void AliAnalysisTaskPhiCorrelations::ShiftTracks(TObjArray* tracks, Double_t angle)
+{
+  // shifts the phi angle of all tracks by angle
+  // 0 <= angle <= 2pi
+  
+  for (Int_t i=0; i<tracks->GetEntriesFast(); ++i) 
+  {
+    AliDPhiBasicParticle* part = (AliDPhiBasicParticle*) tracks->At(i);
+    Double_t newAngle = part->Phi() + angle; 
+    if (newAngle >= TMath::TwoPi())
+      newAngle -= TMath::TwoPi();
+    
+    part->SetPhi(newAngle);
+  }
+}
+
+//____________________________________________________________________
+TObjArray* AliAnalysisTaskPhiCorrelations::GetParticlesFromDetector(AliVEvent* inputEvent, Int_t idet)
+{
+  //1 = VZERO_A; 2 = VZERO_C; 3 = SPD tracklets
+  TObjArray* obj = new TObjArray;
+  obj->SetOwner(kTRUE);
+  
+  if (idet == 1 || idet == 2)
+  {
+    AliVVZERO* vZero = inputEvent->GetVZEROData();
+    
+    const Int_t vZeroStart = (idet == 1) ? 32 : 0;
+    
+    TH1F* singleCells = (TH1F*) fListOfHistos->FindObject("V0SingleCells");
+    for (Int_t i=vZeroStart; i<vZeroStart+32; i++)
+      {
+       Float_t weight = vZero->GetMultiplicity(i);
+       singleCells->Fill(weight);
+       
+       // rough estimate of multiplicity
+       for (Int_t j=0; j<TMath::Nint(weight); j++)
+         {
+           AliDPhiBasicParticle* particle = new AliDPhiBasicParticle((AliVVZERO::GetVZEROEtaMax(i) + AliVVZERO::GetVZEROEtaMin(i)) / 2, AliVVZERO::GetVZEROAvgPhi(i), 1.1, 0); // fit pT = 1.1 and charge = 0
+           particle->SetUniqueID(fAnalyseUE->GetEventCounter()* 100000 + j + i * 1000);
+           
+           obj->Add(particle);
+         }
+      }    
+  }
+  else if (idet == 3)
+    {
+      if(!fAOD)
+       AliFatal("Tracklets only available on AOD");
+      AliAODTracklets* trklets=(AliAODTracklets*)fAOD->GetTracklets();
+      if(!trklets)
+       AliFatal("AliAODTracklets not found");
+      for(Int_t itrklets=0;itrklets<trklets->GetNumberOfTracklets();itrklets++)
+       {
+         Float_t eta=-TMath::Log(TMath::Tan(trklets->GetTheta(itrklets)/2));
+         if(TMath::Abs(eta)>fTrackEtaCut)continue;
+         Float_t pT=1000*TMath::Abs(trklets->GetDeltaPhi(itrklets));//in mrad
+         if(pT>fTrackletDphiCut)continue;
+         TH1F* DphiTrklets = (TH1F*)fListOfHistos->FindObject("DphiTrklets");
+         DphiTrklets->Fill(1000*trklets->GetDeltaPhi(itrklets)); //in mrad
+         Float_t phi=trklets->GetPhi(itrklets);
+         phi+=trklets->GetDeltaPhi(itrklets)*39./34.; //correction dphi*39./34. (Dphi in rad)
+         if (phi<0) phi+=TMath::TwoPi();
+         if (phi>TMath::TwoPi()) phi-=TMath::TwoPi();
+         
+         AliDPhiBasicParticle* particle = new AliDPhiBasicParticle(eta,phi, pT, 0); // pT = TMath::Abs(trklets->GetDeltaPhi(itrklets)) in mrad and charge = 0
+         particle->SetUniqueID(fAnalyseUE->GetEventCounter()* 100000 + itrklets);
+         
+         obj->Add(particle);
+               }      
+    }
+  else if (idet == 4)
+    {
+      if(!fAOD)
+       AliFatal("Muon selection only implemented on AOD");//FIXME to be implemented also for ESDs as in AliAnalyseLeadingTrackUE::GetAcceptedPArticles
+      for (Int_t iTrack = 0; iTrack < fAOD->GetNTracks(); iTrack++) {
+       AliAODTrack* track = fAOD->GetTrack(iTrack);
+       if (!track->IsMuonTrack()) continue;
+       //Float_t dca    = track->DCA();
+       //Float_t chi2   = track->Chi2perNDF();
+       Float_t rabs   = track->GetRAtAbsorberEnd();
+       Float_t eta    = track->Eta();
+       Int_t   matching   = track->GetMatchTrigger();
+       if (rabs < 17.6 || rabs > 89.5) continue;
+       if (eta < -4 || eta > -2.5) continue;
+       if (matching < 2) continue;
+       
+       AliDPhiBasicParticle* particle = new AliDPhiBasicParticle(eta,track->Phi(), track->Pt(), track->Charge()); 
+       particle->SetUniqueID(fAnalyseUE->GetEventCounter() * 100000 + iTrack);
+       
+       obj->Add(particle);
+      }
+    }      
+  else
+    AliFatal(Form("GetParticlesFromDetector: Invalid idet value: %d", idet));
+  
+  return obj;  
+}
+
+//____________________________________________________________________
+Bool_t AliAnalysisTaskPhiCorrelations::IsMuEvent(){
+  
+  if(!fAOD)
+    AliFatal("Muon selection only implemented on AOD");//FIXME to be implemented also for ESDs as in AliAnalyseLeadingTrackUE::GetAcceptedPArticles
+  for (Int_t iTrack = 0; iTrack < fAOD->GetNTracks(); iTrack++) {
+    AliAODTrack* track = fAOD->GetTrack(iTrack);
+    if (!track->IsMuonTrack()) continue;
+    //Float_t dca    = track->DCA();
+    //Float_t chi2   = track->Chi2perNDF();
+    Float_t rabs   = track->GetRAtAbsorberEnd();
+    Float_t eta    = track->Eta();
+    Int_t   matching   = track->GetMatchTrigger();
+    if (rabs < 17.6 || rabs > 89.5) continue;
+    if (eta < -4 || eta > -2.5) continue;
+    if (matching < 2) continue;
+    return kTRUE;
+  }
+  return kFALSE;
+  
+}