]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx
cuts for TOF requirements for MC corrections (Leonardo)
[u/mrichter/AliRoot.git] / PWGCF / Correlations / DPhi / AliAnalysisTaskPhiCorrelations.cxx
index 6a6ecf9755d8d86f8dec4cee2b753b100b91bbd5..92fe4281b3faf3cd2f3498ab14406c5d3cb88e88 100644 (file)
@@ -54,6 +54,7 @@
 #include "AliESDZDC.h"
 #include "AliESDtrackCuts.h"
 
+#include "AliHelperPID.h"
 
 ////////////////////////////////////////////////////////////////////////
 //
@@ -96,11 +97,12 @@ fCourseCentralityBinning(kFALSE),
 fSkipTrigger(kFALSE),
 fInjectedSignals(kFALSE),
 // pointers to UE classes
+fHelperPID(0x0),
 fAnalyseUE(0x0),
 fHistos(0x0),
 fHistosMixed(0),
-fEfficiencyCorrection(0),
-fCorrectTriggers(kFALSE),
+fEfficiencyCorrectionTriggers(0),
+fEfficiencyCorrectionAssociated(0),
 // handlers and events
 fAOD(0x0),
 fESD(0x0),
@@ -120,10 +122,14 @@ fTrackEtaCut(0.8),
 fOnlyOneEtaSide(0),
 fPtMin(0.5),
 fFilterBit(0xFF),
+fTrackStatus(0),
 fSelectBit(AliVEvent::kMB|AliVEvent::kUserDefined),
 fUseChargeHadrons(kFALSE),
+fParticleSpeciesTrigger(-1),
+fParticleSpeciesAssociated(-1),
 fSelectCharge(0),
 fTriggerSelectCharge(0),
+fAssociatedSelectCharge(0),
 fTriggerRestrictEta(-1),
 fEtaOrdering(kFALSE),
 fCutConversions(kFALSE),
@@ -135,6 +141,7 @@ fRemoveWeakDecays(kFALSE),
 fRemoveDuplicates(kFALSE),
 fSkipFastCluster(kFALSE),
 fWeightPerEvent(kFALSE),
+fCustomBinning(),
 fFillpT(kFALSE)
 {
   // Default constructor
@@ -207,9 +214,13 @@ void  AliAnalysisTaskPhiCorrelations::CreateOutputObjects()
   // Initialize class with main algorithms, event and track selection. 
   fAnalyseUE = new AliAnalyseLeadingTrackUE();
   fAnalyseUE->SetParticleSelectionCriteria(fFilterBit, fUseChargeHadrons, fTrackEtaCut, fPtMin);
+  fAnalyseUE->SetTrackStatus(fTrackStatus);
   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){
@@ -229,14 +240,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);
@@ -255,16 +269,24 @@ void  AliAnalysisTaskPhiCorrelations::CreateOutputObjects()
   
   fHistos->SetWeightPerEvent(fWeightPerEvent);
   fHistosMixed->SetWeightPerEvent(fWeightPerEvent);
-
-  if (fEfficiencyCorrection)
+  
+  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);
   
   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));
@@ -279,8 +301,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();
@@ -302,7 +323,8 @@ 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);
 }
 
 //____________________________________________________________________
@@ -350,10 +372,14 @@ void  AliAnalysisTaskPhiCorrelations::AddSettingsTree()
   settingsTree->Branch("fOnlyOneEtaSide", &fOnlyOneEtaSide,"OnlyOneEtaSide/I");
   settingsTree->Branch("fPtMin", &fPtMin, "PtMin/D");
   settingsTree->Branch("fFilterBit", &fFilterBit,"FilterBit/I");
+  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("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");
@@ -367,7 +393,7 @@ void  AliAnalysisTaskPhiCorrelations::AddSettingsTree()
   settingsTree->Branch("fRemoveDuplicates", &fRemoveDuplicates,"RemoveDuplicates/O");
   settingsTree->Branch("fSkipFastCluster", &fSkipFastCluster,"SkipFastCluster/O");
   settingsTree->Branch("fWeightPerEvent", &fWeightPerEvent,"WeightPerEvent/O");
-  settingsTree->Branch("fCorrectTriggers", &fCorrectTriggers,"CorrectTriggers/O");
+  //fCustomBinning
   
   settingsTree->Fill();
   fListOfHistos->Add(settingsTree);
@@ -492,14 +518,21 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
   }
   
   // Get MC primaries
-  TObjArray* tmpList = fAnalyseUE->GetAcceptedParticles(mc, 0, kTRUE, -1, kTRUE);
-  if (fInjectedSignals)
-    fAnalyseUE->RemoveInjectedSignals(tmpList, mc, skipParticlesAbove);
-  if (fRemoveWeakDecays)
-    fAnalyseUE->RemoveWeakDecays(tmpList, mc);
+  // triggers
+  TObjArray* tmpList = fAnalyseUE->GetAcceptedParticles(mc, 0, kTRUE, fParticleSpeciesTrigger, kTRUE);
+  CleanUp(tmpList, mc, skipParticlesAbove);
   TObjArray* tracksMC = CloneAndReduceTrackList(tmpList);
   delete tmpList;
   
+  // associated
+  TObjArray* tracksCorrelateMC = tracksMC;
+  if (fParticleSpeciesAssociated != fParticleSpeciesTrigger)
+  {
+    // TODO for MC this uses to PDG of the mother of the particle
+    tracksCorrelateMC = fAnalyseUE->GetAcceptedParticles(mc, 0, kTRUE, fParticleSpeciesAssociated, kTRUE);
+    CleanUp(tracksCorrelateMC, mc, skipParticlesAbove);
+  }
+  
   /*
   if (fAOD)
   {
@@ -518,17 +551,16 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
   
   // (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 (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());
@@ -539,7 +571,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);
       
@@ -560,19 +592,9 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
         TObjArray* primRecoTracksMatched = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kTRUE, particleSpecies, kTRUE);
         TObjArray* allRecoTracksMatched = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kFALSE, particleSpecies, kTRUE);
        
-       if (fInjectedSignals)
-       {
-         fAnalyseUE->RemoveInjectedSignals(primMCParticles, mc, skipParticlesAbove);
-         fAnalyseUE->RemoveInjectedSignals(primRecoTracksMatched, mc, skipParticlesAbove);
-         fAnalyseUE->RemoveInjectedSignals(allRecoTracksMatched, mc, skipParticlesAbove);
-       }
-       
-       if (fRemoveWeakDecays)
-       {
-         fAnalyseUE->RemoveWeakDecays(primMCParticles, mc);
-         fAnalyseUE->RemoveWeakDecays(primRecoTracksMatched, mc);
-         fAnalyseUE->RemoveWeakDecays(allRecoTracksMatched, mc);
-       }
+       CleanUp(primMCParticles, mc, skipParticlesAbove);
+       CleanUp(primRecoTracksMatched, mc, skipParticlesAbove);
+       CleanUp(allRecoTracksMatched, mc, skipParticlesAbove);
       
         fHistos->FillTrackingEfficiency(primMCParticles, primRecoTracksMatched, allRecoTracksMatched, 0, particleSpecies, centrality, zVtx);
         
@@ -582,17 +604,11 @@ 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);
-      }
-      if (fRemoveWeakDecays)
-      {
-       fAnalyseUE->RemoveWeakDecays((TObjArray*) fakeParticles->At(0), mc);
-       fAnalyseUE->RemoveWeakDecays((TObjArray*) fakeParticles->At(1), mc);
-      }
+      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->FillFakePt(fakeParticles, centrality);
 //       Printf(">>>>> %d %d %d fakes", ((TObjArray*) fakeParticles->At(0))->GetEntriesFast(), ((TObjArray*) fakeParticles->At(1))->GetEntriesFast(), ((TObjArray*) fakeParticles->At(2))->GetEntriesFast());
@@ -601,89 +617,97 @@ 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);
-      if (fRemoveWeakDecays)
-       fAnalyseUE->RemoveWeakDecays(tracksRecoMatchedPrim, mc);
-      if (fRemoveDuplicates)
-       RemoveDuplicates(tracksRecoMatchedPrim);
-      
+      // triggers
+      TObjArray* tracksRecoMatchedPrim = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kTRUE, fParticleSpeciesTrigger, kTRUE);
+      CleanUp(tracksRecoMatchedPrim, mc, skipParticlesAbove);
+      // associated
+      TObjArray* tracksCorrelateRecoMatchedPrim = tracksRecoMatchedPrim;
+      if (fParticleSpeciesAssociated != fParticleSpeciesTrigger)
+      {
+       tracksCorrelateRecoMatchedPrim = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kTRUE, fParticleSpeciesAssociated, kTRUE);
+       CleanUp(tracksCorrelateRecoMatchedPrim, mc, skipParticlesAbove);
+      }
+
       // (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);
-      if (fRemoveWeakDecays)
-       fAnalyseUE->RemoveWeakDecays(tracksRecoMatchedAll, mc);
-      if (fRemoveDuplicates)
-       RemoveDuplicates(tracksRecoMatchedAll);
-     
+      // triggers
+      TObjArray* tracksRecoMatchedAll = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kFALSE, fParticleSpeciesTrigger, kTRUE);
+      CleanUp(tracksRecoMatchedAll, mc, skipParticlesAbove);
+      // associated
+      TObjArray* tracksCorrelateRecoMatchedAll = tracksRecoMatchedAll;
+      if (fParticleSpeciesAssociated != fParticleSpeciesTrigger)
+      {
+       tracksCorrelateRecoMatchedAll = fAnalyseUE->GetAcceptedParticles(inputEvent, mc, kFALSE, fParticleSpeciesAssociated, kTRUE);
+       CleanUp(tracksCorrelateRecoMatchedAll, mc, skipParticlesAbove);
+      }
+      
       // (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);
-      if (fRemoveWeakDecays)
-       fAnalyseUE->RemoveWeakDecays(tracks, mc);
+      // triggers
+      TObjArray* tracks = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, fParticleSpeciesTrigger, kTRUE);
+      CleanUp(tracks, mc, skipParticlesAbove);
+      // associated
+      TObjArray* tracksCorrelate = tracks;
+      if (fParticleSpeciesAssociated != fParticleSpeciesTrigger)
+      {
+       tracksCorrelate = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, fParticleSpeciesAssociated, kTRUE);
+       CleanUp(tracksCorrelate, mc, skipParticlesAbove);
+      }
      
       // (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) 
+       if (pool2->IsReady())
        {
          for (Int_t jMix=0; jMix<pool2->GetCurrentNEvents(); jMix++)
          {
@@ -696,7 +720,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);
@@ -705,7 +729,7 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseCorrectionMode()
            }
          }
        }
-       pool2->UpdatePool(CloneAndReduceTrackList(tracks));
+       pool2->UpdatePool(CloneAndReduceTrackList(tracksCorrelate));
       }
       
       if (0 && !fReduceMemoryFootprint)
@@ -758,12 +782,22 @@ 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;
 }
 
@@ -892,7 +926,8 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
   if (centrality < 0 && !fCompareCentralities)
     return;
 
-  TObjArray* tracks = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, -1, kTRUE);
+  TObjArray* tracks = fAnalyseUE->GetAcceptedParticles(inputEvent, 0, kTRUE, fParticleSpeciesTrigger, kTRUE);
+  //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;
@@ -920,19 +955,21 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
     return;
   }
   
+  // correlate particles with...
+  TObjArray* tracksCorrelate = 0;
+  if (fParticleSpeciesAssociated != fParticleSpeciesTrigger)
+    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();
   
@@ -949,12 +986,12 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
   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
@@ -962,9 +999,13 @@ void  AliAnalysisTaskPhiCorrelations::AnalyseDataMode()
   {
     centrality = centralityObj->GetCentralityPercentile("CL1");
     if (centrality >= 0 && !fSkipStep6)
-      fHistos->FillCorrelations(centrality, 2, AliUEHist::kCFStepReconstructed, tracksClone, 0, weight, kTRUE, kFALSE, 0, 0.02, kTRUE);
+      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;
+  
   if (fFillMixed)
   {
     // event mixing
@@ -990,9 +1031,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();
@@ -1017,11 +1058,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)
@@ -1081,3 +1132,15 @@ void AliAnalysisTaskPhiCorrelations::RemoveDuplicates(TObjArray* tracks)
   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 (fInjectedSignals)
+    fAnalyseUE->RemoveInjectedSignals(tracks, mcObj, maxLabel);
+  if (fRemoveWeakDecays)
+    fAnalyseUE->RemoveWeakDecays(tracks, mcObj);
+  if (fRemoveDuplicates)
+    RemoveDuplicates(tracks);
+}