]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx
TriggerPID: Updates from Debojit
[u/mrichter/AliRoot.git] / PWGCF / Correlations / DPhi / AliAnalysisTaskPhiCorrelations.cxx
index 1014acbde6e74d12623c1c4875b3886166aa7831..21fc5157acf93cda085af0b0090318fca41af6e5 100644 (file)
@@ -24,6 +24,7 @@
 #include <TH2F.h>
 #include <TH3F.h>
 #include <TRandom.h>
+#include <TParameter.h>
 
 #include "AliAnalysisTaskPhiCorrelations.h"
 #include "AliAnalyseLeadingTrackUE.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,18 +93,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),
+fEfficiencyCorrectionTriggers(0),
+fEfficiencyCorrectionAssociated(0),
+fCentralityWeights(0),
 // handlers and events
 fAOD(0x0),
 fESD(0x0),
@@ -116,20 +127,40 @@ fZVertex(7.),
 fCentralityMethod("V0M"),
 // track cuts
 fTrackEtaCut(0.8),
+fTrackEtaCutMin(-1.),
 fOnlyOneEtaSide(0),
 fPtMin(0.5),
+fDCAXYCut(0),
+fSharedClusterCut(-1),
+fCrossedRowsCut(-1),
+fFoundFractionCut(-1),
 fFilterBit(0xFF),
+fTrackStatus(0),
 fSelectBit(AliVEvent::kMB|AliVEvent::kUserDefined),
 fUseChargeHadrons(kFALSE),
+fParticleSpeciesTrigger(-1),
+fParticleSpeciesAssociated(-1),
+fCheckMotherPDG(kTRUE),
 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),
+fMCUseUncheckedCentrality(kFALSE),
 fFillpT(kFALSE)
 {
   // Default constructor
@@ -201,10 +232,19 @@ 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 ((fParticleSpeciesTrigger != -1 || fParticleSpeciesAssociated != -1) && !fHelperPID)
+    AliFatal("HelperPID object should be set in the steering macro");
 
   // Initialize output list of containers
   if (fListOfHistos != NULL){
@@ -224,14 +264,17 @@ void  AliAnalysisTaskPhiCorrelations::CreateOutputObjects()
     histType = "6R";
   if (fCourseCentralityBinning)
     histType += "C";
-  fHistos = new AliUEHistograms("AliUEHistogramsSame", histType);
-  fHistosMixed = new AliUEHistograms("AliUEHistogramsMixed", histType);
+  fHistos = new AliUEHistograms("AliUEHistogramsSame", histType, fCustomBinning);
+  fHistosMixed = new AliUEHistograms("AliUEHistogramsMixed", histType, fCustomBinning);
   
   fHistos->SetSelectCharge(fSelectCharge);
   fHistosMixed->SetSelectCharge(fSelectCharge);
   
   fHistos->SetSelectTriggerCharge(fTriggerSelectCharge);
   fHistosMixed->SetSelectTriggerCharge(fTriggerSelectCharge);
+  
+  fHistos->SetSelectAssociatedCharge(fAssociatedSelectCharge);
+  fHistosMixed->SetSelectAssociatedCharge(fAssociatedSelectCharge);
 
   fHistos->SetTriggerRestrictEta(fTriggerRestrictEta);
   fHistosMixed->SetTriggerRestrictEta(fTriggerRestrictEta);
@@ -245,25 +288,53 @@ void  AliAnalysisTaskPhiCorrelations::CreateOutputObjects()
   fHistos->SetPairCuts(fCutConversions, fCutResonances);
   fHistosMixed->SetPairCuts(fCutConversions, fCutResonances);
   
+  fHistos->SetRejectResonanceDaughters(fRejectResonanceDaughters);
+  fHistosMixed->SetRejectResonanceDaughters(fRejectResonanceDaughters);
+  
   fHistos->SetTrackEtaCut(fTrackEtaCut);
   fHistosMixed->SetTrackEtaCut(fTrackEtaCut);
   
-  if (fEfficiencyCorrection)
+  fHistos->SetWeightPerEvent(fWeightPerEvent);
+  fHistosMixed->SetWeightPerEvent(fWeightPerEvent);
+  
+  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);
-    fHistosMixed->SetEfficiencyCorrection((THnF*) fEfficiencyCorrection->Clone());
+    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)
+    fListOfHistos->Add(new TH1F("V0SingleCells", "V0 single cell multiplicity;multiplicity;events", 100, -0.5, 99.5));
   
   PostData(0,fListOfHistos);
   
@@ -271,8 +342,7 @@ void  AliAnalysisTaskPhiCorrelations::CreateOutputObjects()
   AddSettingsTree();
 
   // event mixing
-  Int_t trackDepth = fMixingTracks; 
-  Int_t poolsize   = 1000;  // Maximum number of events, ignored in the present implemented of AliEventPoolManager
+  Int_t poolsize   = 1000;  // Maximum number of events, ignored in the present implemention of AliEventPoolManager
    
   Int_t nCentralityBins  = fHistos->GetUEHist(2)->GetEventHist()->GetNBins(1);
   Double_t* centralityBins = (Double_t*) fHistos->GetUEHist(2)->GetEventHist()->GetAxis(1, 0)->GetXbins()->GetArray();
@@ -294,12 +364,16 @@ void  AliAnalysisTaskPhiCorrelations::CreateOutputObjects()
     zvtxbin = (Double_t*) fHistos->GetUEHist(2)->GetEventHist()->GetAxis(2, 0)->GetXbins()->GetArray();
   }
 
-  fPoolMgr = new AliEventPoolManager(poolsize, trackDepth, nCentralityBins, centralityBins, nZvtxBins, zvtxbin);
+  fPoolMgr = new AliEventPoolManager(poolsize, fMixingTracks, nCentralityBins, centralityBins, nZvtxBins, zvtxbin);
+  fPoolMgr->SetTargetValues(fMixingTracks, 0.1, 5);
 }
 
 //____________________________________________________________________
 void  AliAnalysisTaskPhiCorrelations::Exec(Option_t */*option*/)
 {
+  // exec (per event)
+  fAnalyseUE->NextEvent();
+  
   // receive ESD pointer if we are not running AOD analysis
   if (!fAOD)
   {
@@ -339,22 +413,45 @@ void  AliAnalysisTaskPhiCorrelations::AddSettingsTree()
   settingsTree->Branch("fZVertex", &fZVertex,"ZVertex/D");
   //settingsTree->Branch("fCentralityMethod", fCentralityMethod.Data(),"CentralityMethod/C");
   settingsTree->Branch("fTrackEtaCut", &fTrackEtaCut, "TrackEtaCut/D");
+  settingsTree->Branch("fTrackEtaCutMin", &fTrackEtaCutMin, "TrackEtaCutMin/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("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("fMCUseUncheckedCentrality", &fMCUseUncheckedCentrality,"MCUseUncheckedCentrality/O");
+  settingsTree->Branch("fTwoTrackEfficiencyCut", &fTwoTrackEfficiencyCut,"TwoTrackEfficiencyCut/D");
+  settingsTree->Branch("fTwoTrackCutMinRadius", &fTwoTrackCutMinRadius,"TwoTrackCutMinRadius/D");
+  
+  //fCustomBinning
   
   settingsTree->Fill();
   fListOfHistos->Add(settingsTree);
@@ -372,22 +469,50 @@ 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")
     {
-      centrality = centralityObj->GetCentralityPercentileUnchecked(fCentralityMethod);
-      AliInfo(Form("Centrality is %f", centrality));
+      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
     {
-      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
@@ -453,6 +578,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
     {
@@ -475,45 +611,60 @@ 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
-  TObjArray* tmpList = fAnalyseUE->GetAcceptedParticles(mc, 0, kTRUE, -1, kTRUE);
-  if (fInjectedSignals)
-    fAnalyseUE->RemoveInjectedSignals(tmpList, mc, skipParticlesAbove);
+  // triggers
+  TObjArray* tmpList = fAnalyseUE->GetAcceptedParticles(mc, 0, kTRUE, fParticleSpeciesTrigger, kTRUE);
+  CleanUp(tmpList, mc, skipParticlesAbove);
   TObjArray* tracksMC = CloneAndReduceTrackList(tmpList);
   delete tmpList;
   
-  /*
-  if (fAOD)
+  // associated
+  TObjArray* tracksCorrelateMC = tracksMC;
+  if (fParticleSpeciesAssociated != fParticleSpeciesTrigger)
   {
-    for (Int_t i=0; i<fArrayMC->GetEntriesFast(); i++)
-      ((TH1F*) fListOfHistos->FindObject("pids"))->Fill(((AliAODMCParticle*) fArrayMC->At(i))->PdgCode());
+    tmpList = fAnalyseUE->GetAcceptedParticles(mc, 0, kTRUE, fParticleSpeciesAssociated, kTRUE);
+    CleanUp(tmpList, mc, skipParticlesAbove);
+    tracksCorrelateMC = CloneAndReduceTrackList(tmpList);
+    delete tmpList;
   }
-  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;
   
   // (MC-true all particles)
   // STEP 0
-  fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepAll, tracksMC, 0, weight);
+  fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepAll, tracksMC, tracksCorrelateMC, weight);
   
   // mixed event
   if (fFillMixed)
   {
     AliEventPool* pool = fPoolMgr->GetEventPool(centrality, zVtx);
-    //pool->PrintInfo();
-    if (pool->IsReady() || pool->NTracksInPool() > fMixingTracks / 10 || pool->GetCurrentNEvents() >= 5) 
+    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));
-    pool->UpdatePool(CloneAndReduceTrackList(tracksMC));
+    pool->UpdatePool(CloneAndReduceTrackList(tracksCorrelateMC));
   }
   
 //   Printf("trigger: %d", ((AliInputEventHandler*)fInputHandler)->IsEventSelected());
@@ -524,7 +675,7 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
     // (MC-true all particles)
     // STEP 1
     if (!fReduceMemoryFootprint)
-      fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepTriggered, tracksMC, 0, weight);
+      fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepTriggered, tracksMC, tracksCorrelateMC, weight);
     else
       fHistos->FillEvent(centrality, AliUEHist::kCFStepTriggered);
       
@@ -542,17 +693,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);
        
-       if (fInjectedSignals)
+       // select charges
+       if (fTriggerSelectCharge != 0)
        {
-         fAnalyseUE->RemoveInjectedSignals(primMCParticles, mc, skipParticlesAbove);
-         fAnalyseUE->RemoveInjectedSignals(primRecoTracksMatched, mc, skipParticlesAbove);
-         fAnalyseUE->RemoveInjectedSignals(allRecoTracksMatched, mc, skipParticlesAbove);
+         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());
 
@@ -560,13 +728,12 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
         delete primRecoTracksMatched;
         delete allRecoTracksMatched;
       }
+      
       TObjArray* fakeParticles = fAnalyseUE->GetFakeParticles(inputEvent, mc, kFALSE, -1, kTRUE);
-      if (fInjectedSignals)
-      {
-       fAnalyseUE->RemoveInjectedSignals((TObjArray*) fakeParticles->At(0), mc, skipParticlesAbove);
-       fAnalyseUE->RemoveInjectedSignals((TObjArray*) fakeParticles->At(1), mc, skipParticlesAbove);
-      }
-      fHistos->FillTrackingEfficiency(0, 0, 0, (TObjArray*) fakeParticles->At(2), -1, centrality, zVtx);
+      CleanUp((TObjArray*) fakeParticles->At(0), mc, skipParticlesAbove);
+      CleanUp((TObjArray*) fakeParticles->At(1), mc, skipParticlesAbove);
+
+      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;
@@ -574,79 +741,113 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
       // (MC-true all particles)
       // STEP 2
       if (!fReduceMemoryFootprint)
-       fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepVertex, tracksMC, 0, weight);
+       fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepVertex, tracksMC, tracksCorrelateMC, weight);
       else
        fHistos->FillEvent(centrality, AliUEHist::kCFStepVertex);
       
       // Get MC primaries that match reconstructed track
-      TObjArray* tracksRecoMatchedPrim = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kTRUE, -1, kTRUE);
-      if (fInjectedSignals)
-       fAnalyseUE->RemoveInjectedSignals(tracksRecoMatchedPrim, mc, skipParticlesAbove);
+      // triggers
+      tmpList = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kTRUE, fParticleSpeciesTrigger, kTRUE);
+      CleanUp(tmpList, mc, skipParticlesAbove);
+      TObjArray* tracksRecoMatchedPrim = CloneAndReduceTrackList(tmpList);
+      delete tmpList;
       
+      // associated
+      TObjArray* tracksCorrelateRecoMatchedPrim = tracksRecoMatchedPrim;
+      if (fParticleSpeciesAssociated != fParticleSpeciesTrigger)
+      {
+       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)
       // STEP 4
-      fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepTrackedOnlyPrim, tracksRecoMatchedPrim, 0, weight);
+      fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepTrackedOnlyPrim, tracksRecoMatchedPrim, tracksCorrelateRecoMatchedPrim, weight);
 
       // mixed event
       if (fFillMixed)
       {
        AliEventPool* pool = fPoolMgr->GetEventPool(centrality, zVtx + 200);
-       //pool->PrintInfo();
-       if (pool->IsReady() || pool->NTracksInPool() > fMixingTracks / 10 || pool->GetCurrentNEvents() >= 5) 
+       if (pool->IsReady())
          for (Int_t jMix=0; jMix<pool->GetCurrentNEvents(); jMix++) 
            fHistosMixed->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepTrackedOnlyPrim, tracksRecoMatchedPrim, pool->GetEvent(jMix), 1.0 / pool->GetCurrentNEvents(), (jMix == 0));
-       pool->UpdatePool(CloneAndReduceTrackList(tracksRecoMatchedPrim));
+       pool->UpdatePool(CloneAndReduceTrackList(tracksCorrelateRecoMatchedPrim));
       }
       
       // Get MC primaries + secondaries that match reconstructed track
-      TObjArray* tracksRecoMatchedAll = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kFALSE, -1, kTRUE);
-      if (fInjectedSignals)
-       fAnalyseUE->RemoveInjectedSignals(tracksRecoMatchedAll, mc, skipParticlesAbove);
+      // triggers
+      tmpList = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kFALSE, fParticleSpeciesTrigger, kTRUE);
+      CleanUp(tmpList, mc, skipParticlesAbove);
+      TObjArray* tracksRecoMatchedAll = CloneAndReduceTrackList(tmpList);
+      delete tmpList;
+      
+      // associated
+      TObjArray* tracksCorrelateRecoMatchedAll = tracksRecoMatchedAll;
+      if (fParticleSpeciesAssociated != fParticleSpeciesTrigger)
+      {
+       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)
       // STEP 5
-      fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepTracked, tracksRecoMatchedAll, 0, weight);
+      fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepTracked, tracksRecoMatchedAll, tracksCorrelateRecoMatchedAll, weight);
       
       // mixed event
       if (fFillMixed)
       {
        AliEventPool* pool = fPoolMgr->GetEventPool(centrality, zVtx + 300);
-       //pool->PrintInfo();
-       if (pool->IsReady() || pool->NTracksInPool() > fMixingTracks / 10 || pool->GetCurrentNEvents() >= 5) 
+       if (pool->IsReady())
          for (Int_t jMix=0; jMix<pool->GetCurrentNEvents(); jMix++) 
            fHistosMixed->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepTracked, tracksRecoMatchedAll, pool->GetEvent(jMix), 1.0 / pool->GetCurrentNEvents(), (jMix == 0));
-       pool->UpdatePool(CloneAndReduceTrackList(tracksRecoMatchedAll));
+       pool->UpdatePool(CloneAndReduceTrackList(tracksCorrelateRecoMatchedAll));
       }
       
       // Get RECO tracks
-      TObjArray* tracks = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, -1, kTRUE);
-      if (fInjectedSignals)
-       fAnalyseUE->RemoveInjectedSignals(tracks, mc, skipParticlesAbove);
+      // triggers
+      tmpList = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, fParticleSpeciesTrigger, kTRUE);
+      CleanUp(tmpList, mc, skipParticlesAbove);
+      TObjArray* tracks = CloneAndReduceTrackList(tmpList);
+      delete tmpList;
+      
+      // associated
+      TObjArray* tracksCorrelate = tracks;
+      if (fParticleSpeciesAssociated != fParticleSpeciesTrigger)
+      {
+       tmpList = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, fParticleSpeciesAssociated, kTRUE);
+       CleanUp(tmpList, mc, skipParticlesAbove);
+       tracksCorrelate = CloneAndReduceTrackList(tmpList);
+       delete tmpList;
+      }
      
       // (RECO all tracks)
       // STEP 6
       if (!fSkipStep6)
-       fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepReconstructed, tracks, 0, weight);
+       fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepReconstructed, tracks, tracksCorrelate, weight);
       
       // two track cut, STEP 8
       if (fTwoTrackEfficiencyCut > 0)
-       fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepBiasStudy, tracks, 0, weight, kTRUE, kTRUE, bSign, fTwoTrackEfficiencyCut);
+       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, 0, weight, kTRUE, twoTrackCut, bSign, fTwoTrackEfficiencyCut, kTRUE);
+       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);
-       //pool2->PrintInfo();
-       if (pool2->IsReady() || pool2->NTracksInPool() > fMixingTracks / 10 || pool2->GetCurrentNEvents() >= 5) 
+       ((TH2F*) fListOfHistos->FindObject("mixedDist"))->Fill(centrality, pool2->NTracksInPool());
+       if (pool2->IsReady())
        {
          for (Int_t jMix=0; jMix<pool2->GetCurrentNEvents(); jMix++)
          {
@@ -659,7 +860,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);
@@ -668,7 +869,7 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
            }
          }
        }
-       pool2->UpdatePool(CloneAndReduceTrackList(tracks));
+       pool2->UpdatePool(CloneAndReduceTrackList(tracksCorrelate));
       }
       
       if (0 && !fReduceMemoryFootprint)
@@ -721,15 +922,54 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
         delete tracksRecoMatchedSecondaries;
       }
   
+      if (tracksCorrelateRecoMatchedPrim != tracksRecoMatchedPrim)
+       delete tracksCorrelateRecoMatchedPrim;
       delete tracksRecoMatchedPrim;
+
+      if (tracksCorrelateRecoMatchedAll != tracksRecoMatchedAll)
+       delete tracksCorrelateRecoMatchedAll;
       delete tracksRecoMatchedAll;
+      
+      if (tracksCorrelate != tracks)
+       delete tracksCorrelate;
       delete tracks;
     }
   }
   
+  if (tracksMC != tracksCorrelateMC)
+    delete tracksCorrelateMC;
   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()
 {
@@ -746,7 +986,11 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
   // skip not selected events here (the AOD is not updated for those)
   if (!fSkipTrigger && !(fInputHandler->IsEventSelected() & fSelectBit))
     return;
-
+  
+  // 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)
@@ -792,6 +1036,23 @@ 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 (fAOD)
@@ -837,21 +1098,70 @@ 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;
+  }
+  
   // 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;
+  
+  if (fTriggersFromDetector == 0)
+    tracks = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, fParticleSpeciesTrigger, kTRUE);
+  else if (fTriggersFromDetector == 1 || fTriggersFromDetector == 2)
+  {
+    tracks = new TObjArray;
+    tracks->SetOwner(kTRUE);
+    
+    AliVVZERO* vZero = inputEvent->GetVZEROData();
+
+    const Int_t vZeroStart = (fTriggersFromDetector == 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(-1); // not needed here
+       
+       tracks->Add(particle);
+      }
+    }
+  }
+  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)
   Bool_t reject = kFALSE;
@@ -879,19 +1189,37 @@ 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 (fParticleSpeciesAssociated != fParticleSpeciesTrigger || fTriggersFromDetector > 0)
+    tracksCorrelate = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, fParticleSpeciesAssociated, kTRUE);
+  
   // reference multiplicity
   Int_t referenceMultiplicity = -1;
   if (fESD)
     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);
   
-  // create a list of reduced objects. This speeds up processing and reduces memory consumption for the event pool
-  TObjArray* tracksClone = CloneAndReduceTrackList(tracks);
-  delete tracks;
-  
-  //Printf("Accepted %d tracks", tracks->GetEntries());
-  
   const AliVVertex* vertex = inputEvent->GetPrimaryVertex();
   Double_t zVtx = vertex->GetZ();
   
@@ -899,30 +1227,21 @@ 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)
   {
     if (!fSkipStep6)
-      fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepReconstructed, tracksClone, 0, weight, kTRUE, kFALSE, 0, 0.02, kTRUE);
+      fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepReconstructed, tracks, tracksCorrelate, weight, kTRUE, kFALSE, 0, 0.02, kTRUE);
     
     ((TH1F*) fListOfHistos->FindObject("eventStat"))->Fill(1);
     
     if (fTwoTrackEfficiencyCut > 0)
-      fHistos->FillCorrelations(centrality, zVtx, AliUEHist::kCFStepBiasStudy, tracksClone, 0, weight, kTRUE, kTRUE, bSign, fTwoTrackEfficiencyCut, kTRUE);
+      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, tracksClone, 0, weight, kTRUE, 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;
   
   if (fFillMixed)
   {
@@ -949,9 +1268,9 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
     if (!pool)
       AliFatal(Form("No pool found for centrality = %f, zVtx = %f", centrality, zVtx));
     
-    //pool->SetDebug(1);
+//     pool->SetDebug(1);
      
-    if (pool->IsReady() || pool->NTracksInPool() > fMixingTracks / 10 || pool->GetCurrentNEvents() >= 5
+    if (pool->IsReady()) 
     {
       
       Int_t nMix = pool->GetCurrentNEvents();
@@ -976,11 +1295,21 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
     }
     
     // ownership is with the pool now
-    pool->UpdatePool(tracksClone);
+    if (tracksCorrelate)
+    {
+      pool->UpdatePool(CloneAndReduceTrackList(tracksCorrelate));
+      delete tracksClone;
+    }
+    else
+      pool->UpdatePool(tracksClone);
     //pool->PrintInfo();
   }
   else
+  {
     delete tracksClone;
+    if (tracksCorrelate)
+      delete tracksCorrelate;
+  }
 }
 
 TObjArray* AliAnalysisTaskPhiCorrelations::CloneAndReduceTrackList(TObjArray* tracks)
@@ -992,8 +1321,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;
@@ -1006,5 +1337,119 @@ void  AliAnalysisTaskPhiCorrelations::Initialize()
   fInputHandler = (AliInputEventHandler*)
          ((AliAnalysisManager::GetAnalysisManager())->GetInputEventHandler());
   // MC handler
-  fMcHandler = dynamic_cast<AliMCEventHandler*> (AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler());
+  fMcHandler = dynamic_cast<AliInputEventHandler*> (AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler());
+}
+
+//____________________________________________________________________
+void AliAnalysisTaskPhiCorrelations::RemoveDuplicates(TObjArray* tracks)
+{
+  // remove particles with the same label
+  
+  Int_t before = tracks->GetEntriesFast();
+
+  for (Int_t i=0; i<before; ++i) 
+  {
+    AliVParticle* part = (AliVParticle*) tracks->At(i);
+    
+    for (Int_t j=i+1; j<before; ++j) 
+    {
+      AliVParticle* part2 = (AliVParticle*) tracks->At(j);
+      
+      if (part->GetLabel() == part2->GetLabel())
+      {
+       Printf("Removing %d with label %d (duplicated in %d)", i, part->GetLabel(), j); part->Dump(); part2->Dump();
+       TObject* object = tracks->RemoveAt(i);
+       if (tracks->IsOwner())
+         delete object;
+       break;
+      }
+    }
+  }
+  tracks->Compress();
+  
+  if (before > tracks->GetEntriesFast())
+    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
+  
+  if (!tracks)
+    return;
+  
+  if (fInjectedSignals)
+    fAnalyseUE->RemoveInjectedSignals(tracks, mcObj, maxLabel);
+  if (fRemoveWeakDecays)
+    fAnalyseUE->RemoveWeakDecays(tracks, 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);
+  }
 }
+  
\ No newline at end of file