]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskChargedJetsPA.cxx
Coverty fixes from Ruediger
[u/mrichter/AliRoot.git] / PWGJE / EMCALJetTasks / UserTasks / AliAnalysisTaskChargedJetsPA.cxx
index aea33847abe25d4eb47eb3b86ca9fb31490b536a..8f296f70a51e7d4f1012855762adef594feb61d9 100644 (file)
@@ -1,6 +1,52 @@
-#include "AliAnalysisTaskChargedJetsPA.h"
+#ifndef ALIANALYSISTASKSE_H
+#include <Riostream.h>
+#include <TROOT.h>
+#include <TFile.h>
+#include <TCint.h>
+#include <TChain.h>
+#include <TTree.h>
+#include <TKey.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <TCanvas.h>
+#include <TList.h>
+#include <TClonesArray.h>
+#include <TObject.h>
+#include <TMath.h>
+#include <TSystem.h>
+#include <TInterpreter.h>
+#include <TH1.h>
+#include "AliAnalysisTask.h"
+#include "AliCentrality.h"
+#include "AliStack.h"
+#include "AliESDEvent.h"
+#include "AliESDInputHandler.h"
+#include "AliAODEvent.h"
+#include "AliAODHandler.h"
+#include "AliAnalysisManager.h"
+#include "AliAnalysisTaskSE.h"
+#endif
+
+#include <time.h>
+#include <TRandom3.h>
+#include "AliGenPythiaEventHeader.h"
+#include "AliAODMCHeader.h"
+#include "AliMCEvent.h"
+#include "AliLog.h"
+#include <AliEmcalJet.h>
+#include <AliPicoTrack.h>
+#include "AliVEventHandler.h"
+#include "AliVParticle.h"
+#include "AliAODMCParticle.h"
+#include "AliAnalysisUtils.h"
+#include "AliRhoParameter.h"
 
+#include "AliAnalysisTaskChargedJetsPA.h"
+using std::min;
 
+//TODO: Not accessing the particles when using MC
 //TODO: FillHistogram can be done better with virtual TH1(?)
 ClassImp(AliAnalysisTaskChargedJetsPA)
 
@@ -8,144 +54,161 @@ ClassImp(AliAnalysisTaskChargedJetsPA)
 void AliAnalysisTaskChargedJetsPA::Init()
 {
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Creating Histograms." << std::endl;
+    AliInfo("Creating histograms.");
   #endif
-  // NOTE: Track & Cluster & QA histograms
-  if (fAnalyzeQA)
-  {
-  
-    AddHistogram1D<TH1D>("hNumberEvents", "Number of events (0 = before, 1 = after vertex cuts)", "", 2, 0, 2, "#Delta z(cm)","N^{Events}/cut");
-      
-    AddHistogram1D<TH1D>("hAppliedEtaCorrectionFactor", "Applied #eta correction factor for the k_{T} background", "", 500, 0.5, 1.5, "Correction factor","dN^{Jets}/df");
-    AddHistogram1D<TH1D>("hAppliedEtaCorrectionFactor2", "Applied #eta correction factor for the k_{T} background 2", "", 500, 0.5, 1.5, "Correction factor","dN^{Jets}/df");
-    AddHistogram1D<TH1D>("hVertexZ", "Z distribution of the vertex", "", 400, -40., 40., "#Delta z(cm)","dN^{Events}/dz");
 
-    AddHistogram1D<TH1D>("hVertexR", "R distribution of the vertex", "", 100, 0., 1., "#Delta r(cm)","dN^{Events}/dr");
-    AddHistogram1D<TH1D>("hCentrality", "Centrality distribution", "", 5, 0., 100., "Centrality (classes)","dN^{Events}");
+  TH1D* tmpHisto = AddHistogram1D<TH1D>("hNumberEvents", "Number of events (0 = before cuts, 1 = after cuts)", "", 2, 0, 2, "stage","N^{Events}/cut");
+  tmpHisto->GetXaxis()->SetBinLabel(1, "Before cuts");
+  tmpHisto->GetXaxis()->SetBinLabel(2, "After cuts");
 
-    AddHistogram2D<TH2D>("hTrackCountAcc", "Number of tracks in acceptance vs. centrality", "LEGO2", 750, 0., 750., 5, 0, 100, "N tracks","Centrality", "dN^{Events}/dN^{Tracks}");
-    AddHistogram2D<TH2D>("hTrackPhiEta", "Track angular distribution", "LEGO2", 100, 0., 2*TMath::Pi(),100, -2.5, 2.5, "#phi","#eta","dN^{Tracks}/(d#phi d#eta)");
-    AddHistogram1D<TH1D>("hTrackPt", "Tracks p_{T} distribution", "", 20000, 0., 200., "p_{T} (GeV/c)","dN^{Tracks}/dp_{T}");
-    AddHistogram1D<TH1D>("hTrackCharge", "Charge", "", 11, -5, 5, "Charge (e)","dN^{Tracks}/dq");
-    AddHistogram1D<TH1D>("hTrackEta", "Track #eta distribution", "", 180, -fTrackEtaWindow, +fTrackEtaWindow, "#eta","dN^{Tracks}/d#eta");
+  tmpHisto = AddHistogram1D<TH1D>("hEventAcceptance", "Accepted events (0 = before cuts, 1 = after pile up, 2 = after vertex)", "", 3, 0, 3, "stage","N^{Events}/cut");
+  tmpHisto->GetXaxis()->SetBinLabel(1, "Before cuts");
+  tmpHisto->GetXaxis()->SetBinLabel(2, "After pile up");
+  tmpHisto->GetXaxis()->SetBinLabel(3, "After vertex");
 
-    AddHistogram2D<TH2D>("hClusterCountAcc", "Number of clusters in acceptance vs. centrality", "LEGO2", 750, 0., 750., 5, 0, 100, "N clusters","Centrality", "dN^{Events}/dN^{Clusters}");
-    AddHistogram1D<TH1D>("hClusterE", "Clusters energy distribution", "", 20000, 0., 200., "p_{T} (GeV/c)","dN^{Cluster}/dp_{T}");
-  }
+  tmpHisto = AddHistogram1D<TH1D>("hTrackAcceptance", "Accepted tracks (0 = before cuts, 1 = after eta, 2 = after pT)", "", 3, 0, 3, "stage","N^{Tracks}/cut");
+  tmpHisto->GetXaxis()->SetBinLabel(1, "Before cuts");
+  tmpHisto->GetXaxis()->SetBinLabel(2, "After eta");
+  tmpHisto->GetXaxis()->SetBinLabel(3, "After pT");
 
-  // NOTE: Pythia histograms
-  if (fAnalyzePythia)
-  {
-    AddHistogram1D<TH1D>("hPythiaPtHard", "Pythia p_{T} hard distribution", "", 2000, 0, 400, "p_{T} hard","dN^{Events}/dp_{T,hard}");
-    AddHistogram1D<TProfile>("hPythiaXSection", "Pythia cross section distribution", "", fNumPtHardBins, 0, fNumPtHardBins, "p_{T} hard bin","dN^{Events}/dp_{T,hard}");
-    AddHistogram1D<TH1D>("hPythiaNTrials", "Pythia trials (no correction for manual cuts)", "", fNumPtHardBins, 0, fNumPtHardBins, "p_{T} hard bin", "Trials");
-  }
+  tmpHisto = AddHistogram1D<TH1D>("hJetAcceptance", "Accepted jets (0 = before cuts, 1 = after eta, 2 = after pT, 3 = after area)", "", 4, 0, 4, "stage","N^{Jets}/cut");
+  tmpHisto->GetXaxis()->SetBinLabel(1, "Before cuts");
+  tmpHisto->GetXaxis()->SetBinLabel(2, "After eta");
+  tmpHisto->GetXaxis()->SetBinLabel(3, "After pT");
+  tmpHisto->GetXaxis()->SetBinLabel(4, "After area");
 
   // NOTE: Jet histograms
   if (fAnalyzeJets)
   {
     // ######## Jet spectra
-    AddHistogram1D<TH1D>("hJetPt", "Jets p_{T} distribution", "", 1000, 0., 200., "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
-    AddHistogram1D<TH1D>("hJetPtBgrdSubtractedRC", "Jets p_{T} distribution, RC background subtracted", "", 500, -50., 200., "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
-    AddHistogram1D<TH1D>("hJetPtBgrdSubtractedKT", "Jets p_{T} distribution, KT background subtracted, corrected for eta dependence)", "", 500, -50., 200., "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
-    AddHistogram1D<TH1D>("hJetPtBgrdSubtractedKTNoEtaCorr", "Jets p_{T} distribution, KT background subtracted", "", 500, -50., 200., "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
-    AddHistogram1D<TH1D>("hJetPtBgrdSubtractedKT2", "Jets p_{T} distribution, KT background 2 subtracted, corrected for eta dependence)", "", 500, -50., 200., "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
-    AddHistogram1D<TH1D>("hJetPtBgrdSubtractedKT2NoEtaCorr", "Jets p_{T} distribution, KT background 2 subtracted", "", 500, -50., 200., "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
+    AddHistogram1D<TH1D>("hRawJetPt", "Raw jets p_{T} distribution (before cuts)", "", 500, 0., 250., "p_{T} (GeV/c)", "dN^{Jets}/dp_{T}");
+    AddHistogram2D<TH2D>("hJetPt", "Jets p_{T} distribution", "", 500, -50., 200., fNumberOfCentralityBins, 0, 100, "p_{T} (GeV/c)","Centrality","dN^{Jets}/dp_{T}");
+    AddHistogram2D<TH2D>("hJetPtBgrdSubtractedKTImprovedCMS", "Jets p_{T} distribution, KT background (Improved CMS) subtracted", "", 500, -50., 200., fNumberOfCentralityBins, 0, 100, "p_{T} (GeV/c)","Centrality","dN^{Jets}/dp_{T}");    
 
-    AddHistogram1D<TH1D>("hJetPtBgrdSubtractedTR", "Jets p_{T} distribution, Track background subtracted", "", 500, -50., 200., "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
+    AddHistogram2D<TProfile2D>("hJetPtSubtractedRhoKTImprovedCMS", "Mean subtracted KT (CMS w/o signal) background from jets", "COLZ", 600, 0, 150, fNumberOfCentralityBins, 0, 100, "Jet p_{T}", "Centrality", "#rho mean");
+    AddHistogram2D<TH2D>("hJetPtSubtractedRhoKTImprovedCMS020", "Mean subtracted KT (CMS w/o signal) background from jets, 0-20", "COLZ", 600, 0, 150, 400,0.,40., "Jet p_{T} (GeV/c)", "#rho (GeV/c)", "dN^{Events}/dp_{T}#rho");
 
+    if(fAnalyzeDeprecatedBackgrounds)
+    {
+      AddHistogram2D<TH2D>("hJetPtBgrdSubtractedTR", "Jets p_{T} distribution, TR background (Cone R=0.6 around jets excluded) subtracted", "", 500, -50., 200., fNumberOfCentralityBins, 0, 100, "p_{T} (GeV/c)","Centrality","dN^{Jets}/dp_{T}");
+      AddHistogram2D<TH2D>("hJetPtBgrdSubtractedKTPbPb", "Jets p_{T} distribution, KT background (PbPb w/o ghosts) subtracted", "", 500, -50., 200., fNumberOfCentralityBins, 0, 100, "p_{T} (GeV/c)","Centrality","dN^{Jets}/dp_{T}");
+      AddHistogram2D<TH2D>("hJetPtBgrdSubtractedKTPbPbWithGhosts", "Jets p_{T} distribution, KT background (PbPb w/ ghosts) subtracted", "", 500, -50., 200., fNumberOfCentralityBins, 0, 100, "p_{T} (GeV/c)","Centrality","dN^{Jets}/dp_{T}");
+      AddHistogram2D<TH2D>("hJetPtBgrdSubtractedKTCMS", "Jets p_{T} distribution, KT background (CMS) subtracted", "", 500, -50., 200., fNumberOfCentralityBins, 0, 100, "p_{T} (GeV/c)","Centrality","dN^{Jets}/dp_{T}");    
+      AddHistogram2D<TH2D>("hJetPtBgrdSubtractedKTMean", "Jets p_{T} distribution, KT background (Mean) subtracted", "", 500, -50., 200., fNumberOfCentralityBins, 0, 100, "p_{T} (GeV/c)","Centrality","dN^{Jets}/dp_{T}");    
+      AddHistogram2D<TH2D>("hJetPtBgrdSubtractedKTTrackLike", "Jets p_{T} distribution, KT background (track-like) subtracted", "", 500, -50., 200., fNumberOfCentralityBins, 0, 100, "p_{T} (GeV/c)","Centrality","dN^{Jets}/dp_{T}");
+    }
 
-    AddHistogram1D<TH1D>("hJetArea", "Jets area distribution", "", 200, 0., 2., "Area","dN^{Jets}/dA");
-    AddHistogram2D<TH2D>("hJetPtArea", "Jets p_{T} distribution", "LEGO2", 1000, 0., 200.,100, 0., 1., "p_{T} (GeV/c)","Area","dN^{Jets}/(dp_{T}dA)");
-    AddHistogram1D<TH1D>("hJetDeltaPhi", "Jets combinatorial #Delta #phi", "", 250, 0., TMath::Pi(), "#Delta #phi","dN^{Jets}/d(#Delta #phi)");
-    AddHistogram2D<TH2D>("hJetDeltaPhiPt", "Jets combinatorial #Delta #phi vs. p_{T}", "LEGO2", 250, 0., TMath::Pi(), 20, 0.,100., "#Delta #phi","max(p_{T,1},p_{T,2}) (GeV/c)","dN^{Jets}/d(#Delta #phi)dp_{T}");
-    AddHistogram1D<TH1D>("hLeadingJetDeltaPhi", "1st and 2nd leading jet #Delta #phi", "", 250, 0., TMath::Pi(), "#Delta #phi","dN^{Jets}/d(#Delta #phi)");
-    AddHistogram2D<TH2D>("hLeadingJetDeltaPhiPt", "1st and 2nd leading jet #Delta #phi vs. p_{T}", "LEGO2", 250, 0., TMath::Pi(),20, 0.,100., "#Delta #phi","1st leading p_{T} (GeV/c)","dN^{Jets}/d(#Delta #phi)dp_{T}");
-    AddHistogram2D<TH2D>("hJetPtEta", "Jets p_{T} distribution", "LEGO2", 1000, 0., 200.,100, -0.6, 0.6, "p_{T} (GeV/c)","#eta","dN^{Jets}/(dp_{T}d#eta)");
-    AddHistogram2D<TH2D>("hJetPtPhi", "Jets p_{T} #phi distribution", "LEGO2", 1000, 0., 200.,100, 0.0, TMath::TwoPi(), "p_{T} (GeV/c)","#phi","dN^{Jets}/(dp_{T}d#phi)");
-    AddHistogram2D<TH2D>("hJetPtCentrality", "Jets p_{T} distribution", "LEGO2", 1000, 0., 200.,5, 0, 100, "p_{T} (GeV/c)","Centrality","dN^{Jets}/dp_{T}");
-    AddHistogram2D<TH2D>("hJetPhiEta", "Jets angular distribution", "LEGO2", 100, 0., 2*TMath::Pi(),100, -0.6, 0.6, "#phi","#eta","dN^{Jets}/(d#phi d#eta)");
+    // ######## Jet stuff
+    AddHistogram2D<TH2D>("hJetConstituentPt", "Jet constituents p_{T} distribution", "", 500, -50., 200., fNumberOfCentralityBins, 0, 100, "p_{T} (GeV/c)","Centrality","dN^{Tracks}/dp_{T}");
     AddHistogram1D<TH1D>("hJetCountAll", "Number of Jets", "", 200, 0., 200., "N jets","dN^{Events}/dN^{Jets}");
     AddHistogram1D<TH1D>("hJetCountAccepted", "Number of accepted Jets", "", 200, 0., 200., "N jets","dN^{Events}/dN^{Jets}");
+    AddHistogram2D<TH2D>("hJetCount", "Correlation jets/accepted jets", "", 200, 0., 200., 200, 0., 200., "N jets","N jets accepted", "d^{2}N^{Events}/dN^{Jets dN^{Jets, acc}}");
+    AddHistogram1D<TH1D>("hLeadingJetPt", "Leading jet p_{T}", "", 500, -50., 200., "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
+    AddHistogram1D<TH1D>("hSecondLeadingJetPt", "Second leading jet p_{T}", "", 500, -50., 200., "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
+    AddHistogram1D<TH1D>("hCorrectedLeadingJetPt", "Corrected leading jet p_{T}", "", 500, -50., 200., "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
+    AddHistogram1D<TH1D>("hCorrectedSecondLeadingJetPt", "Corrected second leading jet p_{T}", "", 500, -50., 200., "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
+    AddHistogram1D<TH1D>("hJetDeltaPhi", "Jets combinatorial #Delta #phi", "", 250, 0., TMath::Pi(), "#Delta #phi","dN^{Jets}/d(#Delta #phi)");
+    AddHistogram1D<TH1D>("hLeadingJetDeltaPhi", "1st and 2nd leading jet #Delta #phi", "", 250, 0., TMath::Pi(), "#Delta #phi","dN^{Jets}/d(#Delta #phi)");
 
-    AddHistogram1D<TH1D>("hLeadingJetPt", "Leading jet p_{T}", "", 500,  0, 100, "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
-    AddHistogram1D<TH1D>("hSecondLeadingJetPt", "Second Leading jet p_{T}", "", 500,  0, 100, "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
-
-    AddHistogram1D<TH1D>("hDijetConstituentsPt", "Dijet constituents p_{T} distribution", "", 500, 0., 100., "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
+    // ########## Dijet stuff
     AddHistogram1D<TH1D>("hDijetLeadingJetPt", "Dijet leading jet p_{T} distribution", "", 500, 0., 100., "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
+    AddHistogram1D<TH1D>("hDijetConstituentsPt", "Dijet constituents p_{T} distribution", "", 500, 0., 100., "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
     AddHistogram2D<TH2D>("hDijetPtCorrelation", "Dijet constituents p_{T} correlation", "COLZ", 500, 5., 100., 500, 5., 100., "1st leading jet p_{T} (GeV/c)","2nd leading jet p_{T} (GeV/c)","dN^{Dijets}/d^{2}p_{T}");
-
-    AddHistogram1D<TH1D>("hDijet2ConstituentsPt", "Dijet2 constituents p_{T} distribution", "", 500, 0., 100., "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
-    AddHistogram1D<TH1D>("hDijet2LeadingJetPt", "Dijet2 leading jet p_{T} distribution", "", 500, 0., 100., "p_{T} (GeV/c)","dN^{Jets}/dp_{T}");
-    AddHistogram2D<TH2D>("hDijet2PtCorrelation", "Dijet2 constituents p_{T} correlation", "COLZ", 500, 5., 100., 500, 5., 100., "1st leading jet p_{T} (GeV/c)","2nd leading jet p_{T} (GeV/c)","dN^{Dijets}/d^{2}p_{T}");
-
   }
+
   // NOTE: Jet background histograms
   if (fAnalyzeBackground)
   {
-    // ########## Delta Pt
-    AddHistogram1D<TH1D>("hDeltaPtKT", "Background fluctuations #delta p_{T} (KT, 0 jets excluded)", "", 500, -20., 80., "#delta p_{T} (GeV/c)","dN^{Jets}/d#delta p_{T}");
-    AddHistogram1D<TH1D>("hDeltaPtKT1Excl", "Background fluctuations #delta p_{T} (KT, 1 jets excluded)", "", 500, -20., 80., "#delta p_{T} (GeV/c)","dN^{Jets}/d#delta p_{T}");
-    AddHistogram1D<TH1D>("hDeltaPtKT2Excl", "Background fluctuations #delta p_{T} (KT, 2 jets excluded)", "", 500, -20., 80., "#delta p_{T} (GeV/c)","dN^{Jets}/d#delta p_{T}");
-
-    Double_t dptEtaMin = -(fTrackEtaWindow-fRandConeRadius) + 2*(fTrackEtaWindow-fRandConeRadius)/fBackgroundEtaBins *  fKTDeltaPtEtaBin;
-    Double_t dptEtaMax = -(fTrackEtaWindow-fRandConeRadius) + 2*(fTrackEtaWindow-fRandConeRadius)/fBackgroundEtaBins * (fKTDeltaPtEtaBin+1);
-
-    AddHistogram1D<TH1D>("hDeltaPtKTEta", Form("Background fluctuations #delta p_{T} (KT, 0 jets excluded, #eta=%1.3f to %1.3f)", dptEtaMin,dptEtaMax), "", 500, -20., 80., "#delta p_{T} (GeV/c)","dN^{Jets}/d#delta p_{T}");
-    AddHistogram1D<TH1D>("hDeltaPtKTEta1Excl", Form("Background fluctuations #delta p_{T} (KT, 1 jets excluded, #eta=%1.3f to %1.3f)", dptEtaMin,dptEtaMax), "", 500, -20., 80., "#delta p_{T} (GeV/c)","dN^{Jets}/d#delta p_{T}");
-    AddHistogram1D<TH1D>("hDeltaPtKTEta2Excl", Form("Background fluctuations #delta p_{T} (KT, 2 jets excluded, #eta=%1.3f to %1.3f)", dptEtaMin,dptEtaMax), "", 500, -20., 80., "#delta p_{T} (GeV/c)","dN^{Jets}/d#delta p_{T}");
-
-    AddHistogram1D<TH1D>("hDeltaPtKT2Eta2Excl", Form("Background fluctuations #delta p_{T} (KT 2, 2 jets excluded, #eta=%1.3f to %1.3f)", dptEtaMin,dptEtaMax), "", 500, -20., 80., "#delta p_{T} (GeV/c)","dN^{Jets}/d#delta p_{T}");
-
-    AddHistogram1D<TH1D>("hDeltaPtRC", "Background fluctuations #delta p_{T} (RC, 0 jets excluded)", "", 500, -20., 80., "#delta p_{T} (GeV/c)","dN^{Jets}/d#delta p_{T}");
-    AddHistogram1D<TH1D>("hDeltaPtRC1Excl", "Background fluctuations #delta p_{T} (RC, 1 jets excluded)", "", 500, -20., 80., "#delta p_{T} (GeV/c)","dN^{Jets}/d#delta p_{T}");
-    AddHistogram1D<TH1D>("hDeltaPtRC2Excl", "Background fluctuations #delta p_{T} (RC, 2 jets excluded)", "", 500, -20., 80., "#delta p_{T} (GeV/c)","dN^{Jets}/d#delta p_{T}");
-
-    AddHistogram1D<TH1D>("hDeltaPtTR", "Background fluctuations #delta p_{T} (TR, 0 jets excluded)", "", 500, -20., 80., "#delta p_{T} (GeV/c)","dN^{Jets}/d#delta p_{T}");
-    AddHistogram1D<TH1D>("hDeltaPtTR1Excl", "Background fluctuations #delta p_{T} (TR, 1 jets excluded)", "", 500, -20., 80., "#delta p_{T} (GeV/c)","dN^{Jets}/d#delta p_{T}");
-    AddHistogram1D<TH1D>("hDeltaPtTR2Excl", "Background fluctuations #delta p_{T} (TR, 2 jets excluded)", "", 500, -20., 80., "#delta p_{T} (GeV/c)","dN^{Jets}/d#delta p_{T}");
-
-
-
-    AddHistogram2D<TH2D>("hKTJetPhiEta", "KT Jets angular distribution", "LEGO2", 100, 0., 2*TMath::Pi(),100, -0.6, 0.6, "#phi","#eta","dN^{Jets}/(d#phi d#eta)");
-    AddHistogram2D<TH2D>("hKTLeadingJetPhiEta", "KT Leading jets angular distribution", "LEGO2", 100, 0., 2*TMath::Pi(),100, -0.6, 0.6, "#phi","#eta","dN^{Jets}/(d#phi d#eta)");
-
-    AddHistogram1D<TH1D>("hDijetBackground", "Background density (dijets excluded)", "", 400, 0., 40., "#rho (GeV/c)","dN^{Events}/d#rho");
-    AddHistogram1D<TH1D>("hDijetBackgroundMostCentral", "Background density (0-20 centrality, dijets excluded)", "", 400, 0., 40., "#rho (GeV/c)","dN^{Events}/d#rho");
-    AddHistogram2D<TH2D>("hDijetBackgroundVsCentrality", "Background density vs. centrality (dijets excluded)", "", 200, 0., 20., 5, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
-
-    AddHistogram1D<TH1D>("hDijetBackgroundPerpendicular", "Background density (dijets excluded)", "", 400, 0., 40., "#rho (GeV/c)","dN^{Events}/d#rho");
-    AddHistogram1D<TH1D>("hDijetBackgroundPerpendicularMostCentral", "Background density (0-20 centrality, dijets excluded)", "", 400, 0., 40., "#rho (GeV/c)","dN^{Events}/d#rho");
-    AddHistogram2D<TH2D>("hDijetBackgroundPerpendicularVsCentrality", "Background density vs. centrality (dijets excluded)", "", 200, 0., 20., 5, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
-  
-    AddHistogram2D<TH2D>("hRCBackground", "RC background density (2 leading jets excluded, mean(8 RCs))", "LEGO2", fBackgroundEtaBins, -(fTrackEtaWindow-fRandConeRadius), +(fTrackEtaWindow-fRandConeRadius), 400, 0., 40., "#eta", "#rho (GeV/c)","dN^{Events}/d#rho");
-
-    AddHistogram1D<TH1D>("hAccConesInRCBackground", Form("Number of cones used for RC background (|#eta| < %1.1f)", fSignalJetEtaWindow), "", 8, 0, 8, "Used cones", "dN^{Events}/dN^{Cones}");
-
-    AddHistogram2D<TH2D>("hRCBackgroundMostCentral", "RC background density (0-20 centrality, 2 leading jets excluded)", "LEGO2", fBackgroundEtaBins, -(fTrackEtaWindow-fRandConeRadius), +(fTrackEtaWindow-fRandConeRadius), 400, 0., 40., "#eta",  "#rho (GeV/c)","dN^{Events}/d#rho");
-    AddHistogram2D<TH2D>("hRCBackgroundMostPeripheral", "RC background density (80-100 centrality, 2 leading jets excluded)", "LEGO2", fBackgroundEtaBins, -(fTrackEtaWindow-fRandConeRadius), +(fTrackEtaWindow-fRandConeRadius),  400, 0., 40., "#eta", "#rho (GeV/c)","dN^{Events}/d#rho");
-    AddHistogram2D<TH2D>("hRCBackgroundVsCentrality", "RC background density vs centrality (2 leading jets excluded)", "LEGO2", 200, 0., 20., 5, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
-
-    
-    AddHistogram2D<TH2D>("hKTBackground", "KT background density (2 leading jets excluded)", "LEGO2", fBackgroundEtaBins, -(fTrackEtaWindow-fRandConeRadius), +(fTrackEtaWindow-fRandConeRadius), 400, 0., 40., "#eta", "#rho (GeV/c)","dN^{Events}/d#rho");
-    AddHistogram2D<TH2D>("hKTBackgroundMostCentral", "KT background density (0-20 centrality, 2 leading jets excluded)", "LEGO2", fBackgroundEtaBins, -(fTrackEtaWindow-fRandConeRadius), +(fTrackEtaWindow-fRandConeRadius), 400, 0., 40., "#eta",  "#rho (GeV/c)","dN^{Events}/d#rho");
-    AddHistogram2D<TH2D>("hKTBackgroundMostPeripheral", "KT background density (80-100 centrality, 2 leading jets excluded)", "LEGO2", fBackgroundEtaBins, -(fTrackEtaWindow-fRandConeRadius), +(fTrackEtaWindow-fRandConeRadius),  400, 0., 40., "#eta", "#rho (GeV/c)","dN^{Events}/d#rho");
-    AddHistogram2D<TH2D>("hKTBackgroundVsCentrality", "KT background density vs centrality (2 leading jets excluded)", "LEGO2", 200, 0., 20., 5, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
-  
-    AddHistogram2D<TH2D>("hKTBackground2", "KT background 2 density (2 leading jets excluded)", "LEGO2", fBackgroundEtaBins, -(fTrackEtaWindow-fRandConeRadius), +(fTrackEtaWindow-fRandConeRadius), 400, 0., 40., "#eta", "#rho (GeV/c)","dN^{Events}/d#rho");
-    AddHistogram2D<TH2D>("hKTBackground2MostCentral", "KT background 2 density (0-20 centrality, 2 leading jets excluded)", "LEGO2", fBackgroundEtaBins, -(fTrackEtaWindow-fRandConeRadius), +(fTrackEtaWindow-fRandConeRadius), 400, 0., 40., "#eta",  "#rho (GeV/c)","dN^{Events}/d#rho");
-    AddHistogram2D<TH2D>("hKTBackground2MostPeripheral", "KT background 2 density (80-100 centrality, 2 leading jets excluded)", "LEGO2", fBackgroundEtaBins, -(fTrackEtaWindow-fRandConeRadius), +(fTrackEtaWindow-fRandConeRadius),  400, 0., 40., "#eta", "#rho (GeV/c)","dN^{Events}/d#rho");
-    AddHistogram2D<TH2D>("hKTBackground2VsCentrality", "KT background 2 density vs centrality (2 leading jets excluded)", "LEGO2", 200, 0., 20., 5, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+    // ########## Default background estimates
+    AddHistogram2D<TH2D>("hKTBackgroundImprovedCMS", "KT background density (Improved CMS approach)", "LEGO2", 400, 0., 40., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+    AddHistogram2D<TH2D>("hKTBackgroundImprovedCMSExternal", "KT background density (Improved CMS approach from external task)", "LEGO2", 400, 0., 40., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+    AddHistogram2D<TH2D>("hDeltaPtKTImprovedCMS", "Background fluctuations #delta p_{T} (KT, Improved CMS-like)", "", 1201, -40.0, 40.0, fNumberOfCentralityBins, 0, 100, "#delta p_{T} (GeV/c)","Centrality","dN^{Jets}/d#delta p_{T}");
+    AddHistogram2D<TH2D>("hDeltaPtKTImprovedCMSPartialExclusion", "Background fluctuations #delta p_{T} (KT, Improved CMS-like, partial jet exclusion)", "", 1201, -40.0, 40.0, fNumberOfCentralityBins, 0, 100, "#delta p_{T} (GeV/c)","Centrality","dN^{Jets}/d#delta p_{T}");
+    AddHistogram2D<TH2D>("hDeltaPtKTImprovedCMSPartialExclusion_Signal", "Background fluctuations #delta p_{T} (KT, Improved CMS-like, partial jet exclusion w/ 1/N_{sig} probability)", "", 1201, -40.0, 40.0, fNumberOfCentralityBins, 0, 100, "#delta p_{T} (GeV/c)","Centrality","dN^{Jets}/d#delta p_{T}");
+    AddHistogram2D<TH2D>("hDeltaPtKTImprovedCMSFullExclusion", "Background fluctuations #delta p_{T} (KT, Improved CMS-like, full leading jet exclusion)", "", 1201, -40.0, 40.0, fNumberOfCentralityBins, 0, 100, "#delta p_{T} (GeV/c)","Centrality","dN^{Jets}/d#delta p_{T}");
+    AddHistogram2D<TH2D>("hDeltaPtNoBackground", "Background fluctuations #delta p_{T} (No background)", "", 1201, -40.0, 40.0, fNumberOfCentralityBins, 0, 100, "#delta p_{T} (GeV/c)","Centrality","dN^{Jets}/d#delta p_{T}");
+    AddHistogram2D<TH2D>("hDeltaPtNoBackgroundNoEmptyCones", "Background fluctuations #delta p_{T} (No background, no empty cones)", "", 1201, -40.0, 40.0, fNumberOfCentralityBins, 0, 100, "#delta p_{T} (GeV/c)","Centrality","dN^{Jets}/d#delta p_{T}");
+
+    AddHistogram1D<TProfile>("hKTMeanBackgroundImprovedCMS", "KT background mean (Improved CMS approach)", "", 100, 0, 100, "Centrality", "#rho mean");
+
+    AddHistogram2D<TH2D>("hDijetBackground", "Background density (dijets excluded)", "", 200, 0., 20., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+    AddHistogram2D<TH2D>("hDijetBackgroundPerpendicular", "Background density (dijets excluded)", "", 200, 0., 20., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+
+    if(fAnalyzeDeprecatedBackgrounds)
+    {
+      // ########## Different background estimates
+      AddHistogram2D<TH2D>("hKTBackgroundPbPb", "KT background density (PbPb approach, no ghosts)", "LEGO2", 400, 0., 40., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+      AddHistogram2D<TH2D>("hKTBackgroundPbPbWithGhosts", "KT background density (PbPb approach w/ ghosts)", "LEGO2", 400, 0., 40., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+      AddHistogram2D<TH2D>("hKTBackgroundCMS", "KT background density (CMS approach)", "LEGO2", 400, 0., 40., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+      AddHistogram2D<TH2D>("hKTBackgroundMean", "KT background density (Mean approach)", "LEGO2", 400, 0., 40., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+      AddHistogram2D<TH2D>("hKTBackgroundTrackLike", "KT background density (Track-like approach)", "LEGO2", 400, 0., 40., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+
+      AddHistogram2D<TH2D>("hTRBackgroundNoExcl", "TR background density (No signal excluded)", "LEGO2", 400, 0., 40., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+      AddHistogram2D<TH2D>("hTRBackgroundCone02", "TR background density (Cones R=0.2 around signal jets excluded)", "LEGO2", 400, 0., 40., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+      AddHistogram2D<TH2D>("hTRBackgroundCone04", "TR background density (Cones R=0.4 around signal jets excluded)", "LEGO2", 400, 0., 40., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+      AddHistogram2D<TH2D>("hTRBackgroundCone06", "TR background density (Cones R=0.6 around signal jets excluded)", "LEGO2", 400, 0., 40., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+      AddHistogram2D<TH2D>("hTRBackgroundCone08", "TR background density (Cones R=0.8 around signal jets excluded)", "LEGO2", 400, 0., 40., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+      AddHistogram2D<TH2D>("hTRBackgroundExact",  "TR background density (signal jets exactly excluded)", "LEGO2", 400, 0., 40., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+
+      // ########## Delta Pt
+      AddHistogram2D<TH2D>("hDeltaPtKTPbPb", "Background fluctuations #delta p_{T} (KT, PbPb w/o ghosts)", "", 1201, -40.0, 40.0, fNumberOfCentralityBins, 0, 100, "#delta p_{T} (GeV/c)","Centrality","dN^{Jets}/d#delta p_{T}");
+      AddHistogram2D<TH2D>("hDeltaPtKTPbPbWithGhosts", "Background fluctuations #delta p_{T} (KT, PbPb w/ ghosts)", "", 1201, -40.0, 40.0, fNumberOfCentralityBins, 0, 100, "#delta p_{T} (GeV/c)","Centrality","dN^{Jets}/d#delta p_{T}");
+      AddHistogram2D<TH2D>("hDeltaPtKTCMS", "Background fluctuations #delta p_{T} (KT, CMS-like)", "", 1201, -40.0, 40.0, fNumberOfCentralityBins, 0, 100, "#delta p_{T} (GeV/c)","Centrality","dN^{Jets}/d#delta p_{T}");
+      AddHistogram2D<TH2D>("hDeltaPtKTMean", "Background fluctuations #delta p_{T} (KT, Mean)", "", 1201, -40.0, 40.0, fNumberOfCentralityBins, 0, 100, "#delta p_{T} (GeV/c)","Centrality","dN^{Jets}/d#delta p_{T}");
+      AddHistogram2D<TH2D>("hDeltaPtKTTrackLike", "Background fluctuations #delta p_{T} (KT, track-like)", "", 1201, -40.0, 40.0, fNumberOfCentralityBins, 0, 100, "#delta p_{T} (GeV/c)","Centrality","dN^{Jets}/d#delta p_{T}");
+      AddHistogram2D<TH2D>("hDeltaPtTR", "Background fluctuations #delta p_{T} (TR, cone R=0.6)", "", 1201, -40.0, 40.0, fNumberOfCentralityBins, 0, 100,  "#delta p_{T} (GeV/c)","Centrality","dN^{Jets}/d#delta p_{T}");
+
+      // ########## Profiles for background means vs. centrality
+      AddHistogram1D<TProfile>("hKTMeanBackgroundPbPb", "KT background mean (PbPb approach w/o ghosts)", "", fNumberOfCentralityBins, 0, 100, "Centrality", "#rho mean");
+      AddHistogram1D<TProfile>("hKTMeanBackgroundPbPbWithGhosts", "KT background mean (PbPb approach)", "", fNumberOfCentralityBins, 0, 100, "Centrality", "#rho mean");
+      AddHistogram1D<TProfile>("hKTMeanBackgroundCMS", "KT background mean (CMS approach)", "", fNumberOfCentralityBins, 0, 100, "Centrality", "#rho mean");
+      AddHistogram1D<TProfile>("hKTMeanBackgroundMean", "KT background mean (Mean approach)", "",  fNumberOfCentralityBins, 0, 100, "Centrality", "#rho mean");
+      AddHistogram1D<TProfile>("hKTMeanBackgroundTPC", "KT background mean (Track-like approach)", "", fNumberOfCentralityBins, 0, 100, "Centrality", "#rho mean");
+      AddHistogram1D<TProfile>("hTRMeanBackground", "TR background mean", "", fNumberOfCentralityBins, 0, 100, "Centrality", "#rho mean");
+    }
+  }
 
 
-    AddHistogram2D<TH2D>("hTrackBackground", "Track background density (2 leading jets excluded)", "LEGO2", fBackgroundEtaBins, -(fTrackEtaWindow-fRandConeRadius), +(fTrackEtaWindow-fRandConeRadius), 400, 0., 40., "#eta", "#rho (GeV/c)","dN^{Events}/d#rho");
-    AddHistogram2D<TH2D>("hTrackBackgroundMostCentral", "Track background density (0-20 centrality, 2 leading jets excluded)", "LEGO2", fBackgroundEtaBins,  -(fTrackEtaWindow-fRandConeRadius), +(fTrackEtaWindow-fRandConeRadius), 400, 0., 40., "#eta", "#rho (GeV/c)","dN^{Events}/d#rho");
-    AddHistogram2D<TH2D>("hTrackBackgroundMostPeripheral", "Track background density (80-100 centrality, 2 leading jets excluded)", "LEGO2", fBackgroundEtaBins, -(fTrackEtaWindow-fRandConeRadius), +(fTrackEtaWindow-fRandConeRadius), 400, 0., 40., "#eta", "#rho (GeV/c)","dN^{Events}/d#rho");
-    AddHistogram2D<TH2D>("hTrackBackgroundVsCentrality", "Track background density vs centrality (2 leading jets excluded)", "LEGO2", 200, 0., 20., 5, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+  // NOTE: Track & Cluster & QA histograms
+  if (fAnalyzeQA)
+  {
+    AddHistogram1D<TH1D>("hVertexX", "X distribution of the vertex", "", 2000, -1., 1., "#Delta x(cm)","dN^{Events}/dx");
+    AddHistogram1D<TH1D>("hVertexY", "Y distribution of the vertex", "", 2000, -1., 1., "#Delta y(cm)","dN^{Events}/dy");
+    AddHistogram2D<TH2D>("hVertexXY", "XY distribution of the vertex", "COLZ", 500, -1., 1., 500, -1., 1.,"#Delta x(cm)", "#Delta y(cm)","dN^{Events}/dxdy");
+    AddHistogram1D<TH1D>("hVertexZ", "Z distribution of the vertex", "", 200, -20., 20., "#Delta z(cm)","dN^{Events}/dz");
+    AddHistogram1D<TH1D>("hVertexR", "R distribution of the vertex", "", 100, 0., 1., "#Delta r(cm)","dN^{Events}/dr");
+    AddHistogram1D<TH1D>("hCentralityV0M", "Centrality distribution V0M", "", fNumberOfCentralityBins, 0., 100., "Centrality","dN^{Events}");
+    AddHistogram1D<TH1D>("hCentralityV0A", "Centrality distribution V0A", "", fNumberOfCentralityBins, 0., 100., "Centrality","dN^{Events}");
+    AddHistogram1D<TH1D>("hCentralityV0C", "Centrality distribution V0C", "", fNumberOfCentralityBins, 0., 100., "Centrality","dN^{Events}");
+
+    AddHistogram2D<TH2D>("hTrackCountAcc", "Number of tracks in acceptance vs. centrality", "LEGO2", 750, 0., 750., fNumberOfCentralityBins, 0, 100, "N tracks","Centrality", "dN^{Events}/dN^{Tracks}");
+    AddHistogram2D<TH2D>("hTrackPt", "Tracks p_{T} distribution", "", 1000, 0., 250., fNumberOfCentralityBins, 0, 100, "p_{T} (GeV/c)", "Centrality", "dN^{Tracks}/dp_{T}");
+    AddHistogram2D<TH2D>("hTrackPtNegEta", "Tracks p_{T} distribution (negative #eta)", "", 1000, 0., 250., fNumberOfCentralityBins, 0, 100, "p_{T} (GeV/c)","Centrality","dN^{Tracks}/dp_{T}");
+    AddHistogram2D<TH2D>("hTrackPtPosEta", "Tracks p_{T} distribution (positive #eta)", "", 1000, 0., 250., fNumberOfCentralityBins, 0, 100, "p_{T} (GeV/c)","Centrality","dN^{Tracks}/dp_{T}");
+    AddHistogram1D<TH1D>("hTrackCharge", "Charge", "", 11, -5, 5, "Charge (e)","dN^{Tracks}/dq");
+    AddHistogram1D<TH1D>("hTrackPhi", "Track #phi distribution", "", 360, 0, TMath::TwoPi(), "#phi","dN^{Tracks}/d#phi");
+    AddHistogram2D<TH2D>("hTrackPhiEta", "Track angular distribution", "LEGO2", 100, 0., 2*TMath::Pi(),100, -2.5, 2.5, "#phi","#eta","dN^{Tracks}/(d#phi d#eta)");
 
+    AddHistogram2D<TH2D>("hTrackPhiPtCut", "Track #phi distribution for different pT cuts", "LEGO2", 360, 0, TMath::TwoPi(), 20, 0, 20, "#phi", "p_{T} lower cut", "dN^{Tracks}/d#phi dp_{T}");
+    AddHistogram2D<TH2D>("hTrackPhiLabel", "Track #phi distribution for different labels", "LEGO2", 360, 0, TMath::TwoPi(), 3, 0, 3, "#phi", "Label", "dN^{Tracks}/d#phi");
+    AddHistogram2D<TH2D>("hTrackPhiTrackType", "Track #phi distribution for different track types", "LEGO2", 360, 0, TMath::TwoPi(), 3, 0, 3, "#phi", "Label", "dN^{Tracks}/d#phi");
+    AddHistogram1D<TH1D>("hTrackEta", "Track #eta distribution", "", 180, -fTrackEtaWindow, +fTrackEtaWindow, "#eta","dN^{Tracks}/d#eta");
+    if (fAnalyzeJets)
+    {
+      // ######## Jet QA
+      AddHistogram1D<TH1D>("hRawJetArea", "Jets area distribution w/o area cut", "", 200, 0., 2., "Area","dN^{Jets}/dA");
+      AddHistogram1D<TH1D>("hJetArea", "Jets area distribution", "", 200, 0., 2., "Area","dN^{Jets}/dA");
+      AddHistogram2D<TH2D>("hRawJetPhiEta", "Raw Jets angular distribution w/o #eta cut", "LEGO2", 360, 0., 2*TMath::Pi(),100, -1.0, 1.0, "#phi","#eta","dN^{Jets}/(d#phi d#eta)");
+      AddHistogram2D<TH2D>("hJetPhiEta", "Jets angular distribution", "LEGO2", 360, 0., 2*TMath::Pi(),100, -1.0, 1.0, "#phi","#eta","dN^{Jets}/(d#phi d#eta)");
+      AddHistogram2D<TH2D>("hJetPtVsConstituentCount", "Jets number of constituents vs. jet p_{T}", "COLZ", 400, 0., 200., 100, 0., 100., "p_{T}","N^{Tracks}","dN^{Jets}/(dp_{T} dN^{tracks})");
+    }
   }
 
-
+  // NOTE: Pythia histograms
+  if (fAnalyzePythia)
+  {
+    AddHistogram1D<TH1D>("hPythiaPtHard", "Pythia p_{T} hard distribution", "", 2000, 0, 400, "p_{T} hard","dN^{Events}/dp_{T,hard}");
+  }
 
   // register Histograms
   for (Int_t i = 0; i < fHistCount; i++)
@@ -158,33 +221,20 @@ void AliAnalysisTaskChargedJetsPA::Init()
 }
 
 //________________________________________________________________________
-AliAnalysisTaskChargedJetsPA::AliAnalysisTaskChargedJetsPA(const char *name, const char* trackArrayName, const char* clusterArrayName, const char* jetArrayName, const char* backgroundJetArrayName) : AliAnalysisTaskSE(name), fOutputList(0), fAnalyzeQA(1), fAnalyzeJets(1), fAnalyzeBackground(1), fAnalyzePythia(0), fHasTracks(0), fHasClusters(0), fHasJets(0), fHasBackgroundJets(0), fIsMC(0), fJetArray(0), fTrackArray(0), fClusterArray(0), fBackgroundJetArray(0), fJetArrayName(0), fTrackArrayName(0), fClusterArrayName(0), fBackgroundJetArrayName(0), fNumPtHardBins(11), fRandConeRadius(0.4), fSignalJetRadius(0.4), fBackgroundJetRadius(0.4),  fKTDeltaPtEtaBin(3), fTrackBackgroundConeRadius(0.4), fNumberRandCones(8), fNumberExcludedJets(2), fDijetMaxAngleDeviation(10.0), fBackgroundEtaBins(5), fJetBgrdCorrectionFactors(0), fSignalJetEtaWindow(0.5), fBackgroundJetEtaWindow(0.5), fTrackEtaWindow(0.9), fClusterEtaWindow(0.7), fVertexWindow(10.0), fVertexMaxR(1.0), fMinVertexContributors(1), fMinTrackPt(0.150), fMinClusterPt(0.300), fMinJetPt(1.0), fMinJetArea(0.4), fMinBackgroundJetPt(0.15), fMinDijetLeadingPt(10.0), fFirstLeadingJet(0), fSecondLeadingJet(0), fNumberSignalJets(0), fCrossSection(0.0), fTrials(0.0),  fRandom(0), fInitialized(0), fTaskInstanceCounter(0), fHistList(0), fHistCount(0)
+AliAnalysisTaskChargedJetsPA::AliAnalysisTaskChargedJetsPA(const char *name, const char* trackArrayName, const char* jetArrayName, const char* backgroundJetArrayName) : AliAnalysisTaskSE(name), fOutputList(0), fAnalyzeJets(1), fAnalyzeQA(1), fAnalyzeBackground(1), fAnalyzeDeprecatedBackgrounds(1), fAnalyzePythia(0), fHasTracks(0), fHasJets(0), fHasBackgroundJets(0), fIsKinematics(0), fUseVertexCut(1), fUsePileUpCut(1), fPartialAnalysisNParts(1), fPartialAnalysisIndex(0), fJetArray(0), fTrackArray(0), fBackgroundJetArray(0), fJetArrayName(0), fTrackArrayName(0), fBackgroundJetArrayName(0), fNumPtHardBins(11), fUsePtHardBin(-1), fRhoTaskName(), fNcoll(6.88348), fRandConeRadius(0.4), fSignalJetRadius(0.4), fBackgroundJetRadius(0.4), fTRBackgroundConeRadius(0.6), fNumberRandCones(8), fNumberExcludedJets(-1), fDijetMaxAngleDeviation(10.0), fPhysicalJetRadius(0.6), fSignalJetEtaWindow(0.5), fBackgroundJetEtaWindow(0.5), fTrackEtaWindow(0.9), fMinTrackPt(0.150), fMinJetPt(1.0), fMinJetArea(0.5), fMinBackgroundJetPt(0.0), fMinDijetLeadingPt(10.0), fNumberOfCentralityBins(100), fCentralityType("V0A"), fFirstLeadingJet(0), fSecondLeadingJet(0), fNumberSignalJets(0), fCrossSection(0.0), fTrials(0.0),  fRandom(0), fHelperClass(0), fInitialized(0), fTaskInstanceCounter(0), fHistList(0), fHistCount(0), fIsDEBUG(0), fEventCounter(0)
 {
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Calling Constructor." << std::endl;
+    AliInfo("Calling constructor.");
   #endif
 
-  // Constructor
-  // Define input and output slots here (never in the dummy constructor)
-  // Input slot #0 works with a TChain - it is connected to the default input container
-  // Output slot #1 writes into a TH1 container
-  // Constructor
-
   // Every instance of this task gets his own number
   static Int_t instance = 0;
   fTaskInstanceCounter = instance;
   instance++;
 
   fTrackArrayName = new TString(trackArrayName);
-  fClusterArrayName = new TString(clusterArrayName);
-  if (strcmp(fTrackArrayName->Data(),"") == 0)
-    fAnalyzeQA = kFALSE;
-  else
-  {
-    fAnalyzeQA = kTRUE;
-    if (fTrackArrayName->Contains("MCParticles")) //TODO: Hardcoded for now
-      fIsMC = kTRUE;
-  }
+  if (fTrackArrayName->Contains("MCParticles") || fTrackArrayName->Contains("mcparticles"))
+    fIsKinematics = kTRUE;
 
   fJetArrayName = new TString(jetArrayName);
   if (strcmp(fJetArrayName->Data(),"") == 0)
@@ -202,8 +252,12 @@ AliAnalysisTaskChargedJetsPA::AliAnalysisTaskChargedJetsPA(const char *name, con
  
   fHistList = new TList();
 
+  for(Int_t i=0;i<1024;i++)
+    fSignalJets[i] = NULL;
+
+
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Calling Constructor DONE." << std::endl;
+    AliInfo("Constructor done.");
   #endif
   
 }
@@ -223,41 +277,117 @@ inline Double_t AliAnalysisTaskChargedJetsPA::GetConePt(Double_t eta, Double_t p
   return tmpConePt;
 }
 
+
 //________________________________________________________________________
 inline Double_t AliAnalysisTaskChargedJetsPA::GetPtHard()
 {
-  Double_t tmpPtHard = -1.0;
+  #ifdef DEBUGMODE
+    AliInfo("Starting GetPtHard.");
+  #endif
+  AliGenPythiaEventHeader* pythiaHeader = dynamic_cast<AliGenPythiaEventHeader*>(MCEvent()->GenEventHeader());
+  if (MCEvent()) 
+    if (!pythiaHeader)
+    {
+      // Check if AOD
+      AliAODMCHeader* aodMCH = dynamic_cast<AliAODMCHeader*>(InputEvent()->FindListObject(AliAODMCHeader::StdBranchName()));
 
-  if (!MCEvent())
-    AliError("MCEvent not accessible although demanded!");
-  else
-  {
-    AliGenPythiaEventHeader* pythiaHeader = dynamic_cast<AliGenPythiaEventHeader*>(MCEvent()->GenEventHeader());
+      if (aodMCH)
+      {
+        for(UInt_t i = 0;i<aodMCH->GetNCocktailHeaders();i++)
+        {
+          pythiaHeader = dynamic_cast<AliGenPythiaEventHeader*>(aodMCH->GetCocktailHeader(i));
+          if (pythiaHeader) break;
+        }
+      }
+    }
+
+  #ifdef DEBUGMODE
+    AliInfo("Ending GetPtHard.");
+  #endif
+  if (pythiaHeader)
+    return pythiaHeader->GetPtHard();
+
+  AliWarning(Form("In task %s: GetPtHard() failed!", GetName()));
+  return -1.0;
+}
+
+
+//________________________________________________________________________
+inline Double_t AliAnalysisTaskChargedJetsPA::GetPythiaTrials()
+{
+  #ifdef DEBUGMODE
+    AliInfo("Starting GetPythiaTrials.");
+  #endif
+  AliGenPythiaEventHeader* pythiaHeader = dynamic_cast<AliGenPythiaEventHeader*>(MCEvent()->GenEventHeader());
+  if (MCEvent()) 
     if (!pythiaHeader)
-      AliError("Pythia Header not accessible!");
-    else
-      tmpPtHard = pythiaHeader->GetPtHard();
-  }
-  return tmpPtHard;
+    {
+      // Check if AOD
+      AliAODMCHeader* aodMCH = dynamic_cast<AliAODMCHeader*>(InputEvent()->FindListObject(AliAODMCHeader::StdBranchName()));
+
+      if (aodMCH)
+      {
+        for(UInt_t i = 0;i<aodMCH->GetNCocktailHeaders();i++)
+        {
+          pythiaHeader = dynamic_cast<AliGenPythiaEventHeader*>(aodMCH->GetCocktailHeader(i));
+          if (pythiaHeader) break;
+        }
+      }
+    }
+
+  #ifdef DEBUGMODE
+    AliInfo("Ending GetPythiaTrials.");
+  #endif
+  if (pythiaHeader)
+    return pythiaHeader->Trials();
+
+  AliWarning(Form("In task %s: GetPythiaTrials() failed!", GetName()));
+  return -1.0;
 }
 
+
+
 //________________________________________________________________________
 inline Int_t AliAnalysisTaskChargedJetsPA::GetPtHardBin()
 {
+  #ifdef DEBUGMODE
+    AliInfo("Starting GetPtHardBin.");
+  #endif
   // ########## PT HARD BIN EDGES
-  const Int_t localkPtHardLowerEdges[] = { 0, 5,11,21,36,57, 84,117,152,191,234};
-  const Int_t localkPtHardHigherEdges[] = { 5,11,21,36,57,84,117,152,191,234,1000000};
+  const Int_t kPtHardLowerEdges[] =  { 0, 5,11,21,36,57, 84,117,152,191,234};
+  const Int_t kPtHardHigherEdges[] = { 5,11,21,36,57,84,117,152,191,234,1000000};
 
   Int_t tmpPtHardBin = 0;
   Double_t tmpPtHard = GetPtHard();
  
   for (tmpPtHardBin = 0; tmpPtHardBin <= fNumPtHardBins; tmpPtHardBin++)
-    if (tmpPtHard >= localkPtHardLowerEdges[tmpPtHardBin] && tmpPtHard < localkPtHardHigherEdges[tmpPtHardBin])
+    if (tmpPtHard >= kPtHardLowerEdges[tmpPtHardBin] && tmpPtHard < kPtHardHigherEdges[tmpPtHardBin])
       break;
 
+  #ifdef DEBUGMODE
+    AliInfo("Ending GetPtHardBin.");
+  #endif
   return tmpPtHardBin;
 }
 
+//________________________________________________________________________
+Double_t AliAnalysisTaskChargedJetsPA::GetExternalRho()
+{
+  // Get rho from event.
+  AliRhoParameter *rho = 0;
+  if (!fRhoTaskName.IsNull()) {
+    rho = dynamic_cast<AliRhoParameter*>(InputEvent()->FindListObject(fRhoTaskName.Data()));
+    if (!rho) {
+      AliWarning(Form("%s: Could not retrieve rho with name %s!", GetName(), fRhoTaskName.Data())); 
+      return 0;
+    }
+  }
+  else
+    return 0;
+
+  return (rho->GetVal());
+}
+
 
 //________________________________________________________________________
 inline Bool_t AliAnalysisTaskChargedJetsPA::IsTrackInCone(AliVTrack* track, Double_t eta, Double_t phi, Double_t radius)
@@ -278,29 +408,81 @@ inline Bool_t AliAnalysisTaskChargedJetsPA::IsTrackInCone(AliVTrack* track, Doub
 }
 
 //________________________________________________________________________
-inline Bool_t AliAnalysisTaskChargedJetsPA::IsTrackInAcceptance(AliVParticle* track)
+inline Bool_t AliAnalysisTaskChargedJetsPA::IsTrackInJet(AliEmcalJet* jet, Int_t trackIndex)
 {
-  if (track != 0)
-    if (TMath::Abs(track->Eta()) <= fTrackEtaWindow)
-      if (track->Pt() >= fMinTrackPt)
-        return kTRUE;
+  for (Int_t i = 0; i < jet->GetNumberOfTracks(); ++i)
+  {
+    Int_t jetTrack = jet->TrackAt(i);
+    if (jetTrack == trackIndex)
+      return kTRUE;
+  }
+  return kFALSE;
+}
 
+//________________________________________________________________________
+inline Bool_t AliAnalysisTaskChargedJetsPA::IsJetOverlapping(AliEmcalJet* jet1, AliEmcalJet* jet2)
+{
+  for (Int_t i = 0; i < jet1->GetNumberOfTracks(); ++i)
+  {
+    Int_t jet1Track = jet1->TrackAt(i);
+    for (Int_t j = 0; j < jet2->GetNumberOfTracks(); ++j)
+    {
+      Int_t jet2Track = jet2->TrackAt(j);
+      if (jet1Track == jet2Track)
+        return kTRUE;
+    }
+  }
   return kFALSE;
 }
 
 //________________________________________________________________________
-inline Bool_t AliAnalysisTaskChargedJetsPA::IsClusterInAcceptance(AliVCluster* cluster)
+inline Bool_t AliAnalysisTaskChargedJetsPA::IsEventInAcceptance(AliVEvent* event)
 {
-  if (cluster != 0)
- //   if (TMath::Abs(cluster->Eta()) <= fClusterEtaWindow)
-//      if (cluster->Phi() <= 187.0/360.0 * TMath::TwoPi());
-//        if (cluster->Phi() >= 80.0/360.0 * TMath::TwoPi());
-          if (cluster->E() >= fMinClusterPt)
-            return kTRUE;
+  if (!event)
+    return kFALSE;
 
-  return kFALSE;
+  FillHistogram("hEventAcceptance", 0.5); // number of events before manual cuts
+  if(fUsePileUpCut)
+    if(fHelperClass->IsPileUpEvent(event))
+      return kFALSE;
+
+  FillHistogram("hEventAcceptance", 1.5); // number of events after pileup cuts
+
+  if(fAnalyzeQA)
+    FillHistogram("hVertexZ",event->GetPrimaryVertex()->GetZ());
+
+  if(fUseVertexCut)
+    if(!fHelperClass->IsVertexSelected2013pA(event))
+      return kFALSE;
+  FillHistogram("hEventAcceptance", 2.5); // number of events after vertex cut
+
+  return kTRUE;
 }
 
+//________________________________________________________________________
+inline Bool_t AliAnalysisTaskChargedJetsPA::IsTrackInAcceptance(AliVParticle* track)
+{
+  FillHistogram("hTrackAcceptance", 0.5);
+  if (track != 0)
+  {
+    if(fIsKinematics)
+    {
+      // TODO: Only working for AOD MC
+      if((!track->Charge()) || (!(static_cast<AliAODMCParticle*>(track))->IsPhysicalPrimary()) )
+        return kFALSE;
+    }
+    if (TMath::Abs(track->Eta()) <= fTrackEtaWindow)
+    {
+      FillHistogram("hTrackAcceptance", 1.5);
+      if (track->Pt() >= fMinTrackPt)
+      {
+        FillHistogram("hTrackAcceptance", 2.5);
+        return kTRUE;
+      }
+    }
+  }
+  return kFALSE;
+}
 
 //________________________________________________________________________
 inline Bool_t AliAnalysisTaskChargedJetsPA::IsBackgroundJetInAcceptance(AliEmcalJet *jet)
@@ -316,12 +498,21 @@ inline Bool_t AliAnalysisTaskChargedJetsPA::IsBackgroundJetInAcceptance(AliEmcal
 //________________________________________________________________________
 inline Bool_t AliAnalysisTaskChargedJetsPA::IsSignalJetInAcceptance(AliEmcalJet *jet)
 {   
+  FillHistogram("hJetAcceptance", 0.5);
   if (jet != 0)
     if (TMath::Abs(jet->Eta()) <= fSignalJetEtaWindow)
+    {
+      FillHistogram("hJetAcceptance", 1.5);
       if (jet->Pt() >= fMinJetPt)
+      {
+        FillHistogram("hJetAcceptance", 2.5);
         if (jet->Area() >= fMinJetArea)
+        {
+          FillHistogram("hJetAcceptance", 3.5);
           return kTRUE;
-
+        }
+      }
+    }
   return kFALSE;
 }
 
@@ -341,7 +532,7 @@ inline Bool_t AliAnalysisTaskChargedJetsPA::IsDijet(AliEmcalJet *jet1, AliEmcalJ
 void AliAnalysisTaskChargedJetsPA::ExecOnce()
 {
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Starting ExecOnce." << std::endl;
+    AliInfo("Starting ExecOnce.");
   #endif
   fInitialized = kTRUE;
 
@@ -352,7 +543,7 @@ void AliAnalysisTaskChargedJetsPA::ExecOnce()
     fHasTracks = kTRUE;
     if (!fTrackArray) 
     {
-      AliInfo(Form("%s: Could not retrieve tracks %s! This is OK, if tracks are not demanded.", GetName(), fTrackArrayName->Data())); 
+      AliWarning(Form("%s: Could not retrieve tracks %s! This is OK, if tracks are not demanded.", GetName(), fTrackArrayName->Data())); 
       fHasTracks = kFALSE;
     } 
     else
@@ -366,27 +557,6 @@ void AliAnalysisTaskChargedJetsPA::ExecOnce()
       }
     }
   }
-  // Check for cluster array
-  if (strcmp(fClusterArrayName->Data(), "") != 0)
-  {
-    fClusterArray = dynamic_cast<TClonesArray*>(InputEvent()->FindListObject(fClusterArrayName->Data()));
-    fHasClusters = kTRUE;
-    if (!fClusterArray) 
-    {
-      AliInfo(Form("%s: Could not retrieve clusters %s! This is OK, if clusters are not demanded.", GetName(), fClusterArrayName->Data())); 
-      fHasClusters = kFALSE;
-    } 
-    else
-    {
-      TClass *cl = fClusterArray->GetClass();
-      if (!cl->GetBaseClass("AliVCluster"))
-      {
-       AliError(Form("%s: Collection %s does not contain AliVCluster objects!", GetName(), fClusterArrayName->Data())); 
-       fClusterArray = 0;
-        fHasClusters = kFALSE;
-      }
-    }
-  }
 
   // Check for jet array
   if (strcmp(fJetArrayName->Data(), "") != 0)
@@ -396,7 +566,7 @@ void AliAnalysisTaskChargedJetsPA::ExecOnce()
 
     if (!fJetArray) 
     {
-      AliInfo(Form("%s: Could not retrieve jets %s! This is OK, if jets are not demanded.", GetName(), fJetArrayName->Data())); 
+      AliWarning(Form("%s: Could not retrieve jets %s! This is OK, if jets are not demanded.", GetName(), fJetArrayName->Data())); 
       fHasJets = kFALSE;
     } 
     else
@@ -423,10 +593,9 @@ void AliAnalysisTaskChargedJetsPA::ExecOnce()
   }
 
   // Look, if initialization is OK
-  if ((!fHasTracks && fAnalyzeQA) || (!fHasTracks && fAnalyzeBackground))
+  if (!fHasTracks && fAnalyzeBackground)
   {
-    AliError(Form("%s: Tracks NOT successfully casted although demanded! Deactivating QA and background analysis",GetName()));
-    fAnalyzeQA = kFALSE;
+    AliError(Form("%s: Tracks NOT successfully casted although demanded! Deactivating background analysis",GetName()));
     fAnalyzeBackground = kFALSE;
   }
   if ((!fHasJets && fAnalyzeJets) || (!fHasJets && fAnalyzeBackground))
@@ -441,11 +610,14 @@ void AliAnalysisTaskChargedJetsPA::ExecOnce()
     fAnalyzeBackground = kFALSE;
   }
 
+  // Initialize helper class (for vertex selection & pile up correction)
+  fHelperClass = new AliAnalysisUtils();
+  fHelperClass->SetCutOnZVertexSPD(kFALSE);
   // Histogram init
   Init();
 
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": ExecOnce done." << std::endl;
+    AliInfo("ExecOnce done.");
   #endif
 
 }
@@ -458,12 +630,8 @@ void AliAnalysisTaskChargedJetsPA::GetSignalJets()
   fSecondLeadingJet = NULL;
   fNumberSignalJets = 0;
 
-  Float_t maxJetPts[] = {0, 0};
-  Int_t jetIDArray[]   = {-1, -1};
-  Int_t jetCount = fJetArray->GetEntries();
-
-  // Go through all jets and save signal jets and the two leading ones
-  for (Int_t i = 0; i < jetCount; i++)
+  TList tmpJets;
+  for (Int_t i = 0; i < fJetArray->GetEntries(); i++)
   {
     AliEmcalJet* jet = static_cast<AliEmcalJet*>(fJetArray->At(i));
     if (!jet)
@@ -471,29 +639,38 @@ void AliAnalysisTaskChargedJetsPA::GetSignalJets()
       AliError(Form("%s: Could not receive jet %d", GetName(), i));
       continue;
     }
+    if (!IsSignalJetInAcceptance(jet))
+      continue;
 
-    if (!IsSignalJetInAcceptance(jet)) continue;
-    
-    if (jet->Pt() > maxJetPts[0]) 
-    {
-      maxJetPts[1] = maxJetPts[0];
-      jetIDArray[1] = jetIDArray[0];
-      maxJetPts[0] = jet->Pt();
-      jetIDArray[0] = i;
-    }
-    else if (jet->Pt() > maxJetPts[1]) 
+    for (Int_t j = 0; j <= tmpJets.GetEntries(); j++)
     {
-      maxJetPts[1] = jet->Pt();
-      jetIDArray[1] = i;
+      if (j>tmpJets.GetEntries()-1) // When passed last item add the jet at the end
+      {
+        tmpJets.Add(jet);
+        break;
+      }
+
+      AliEmcalJet* listJet = static_cast<AliEmcalJet*>(tmpJets.At(j));
+     
+      if(jet->Pt() < listJet->Pt()) // Insert jet before that one in list if pt smaller
+      {
+        tmpJets.AddAt(jet, j);
+        break;
+      }
     }
+  }
+
+  for (Int_t i = 0; i < tmpJets.GetEntries(); i++)
+  {
+    AliEmcalJet* jet = static_cast<AliEmcalJet*>(tmpJets.At(i));
     fSignalJets[fNumberSignalJets] = jet;
     fNumberSignalJets++;
   }
   
   if (fNumberSignalJets > 0)
-    fFirstLeadingJet  = static_cast<AliEmcalJet*>(fJetArray->At(jetIDArray[0]));
+    fFirstLeadingJet  = static_cast<AliEmcalJet*>(tmpJets.At(0));
   if (fNumberSignalJets > 1)
-    fSecondLeadingJet = static_cast<AliEmcalJet*>(fJetArray->At(jetIDArray[1]));
+    fSecondLeadingJet = static_cast<AliEmcalJet*>(tmpJets.At(1));
 
 }
 
@@ -549,463 +726,462 @@ Int_t AliAnalysisTaskChargedJetsPA::GetLeadingJets(TClonesArray* jetArray, Int_t
   }
   return jetCountAccepted;
 }
-//________________________________________________________________________
-Double_t AliAnalysisTaskChargedJetsPA::GetJetBackgroundCorrFactor(Double_t eta, Double_t background)
-{
-  Double_t tmpCorrFactor = 1.0;
 
-  if(fJetBgrdCorrectionFactors)
-    tmpCorrFactor = fJetBgrdCorrectionFactors->GetBinContent
-                          (
-                            fJetBgrdCorrectionFactors->GetXaxis()->FindBin(eta),
-                            fJetBgrdCorrectionFactors->GetYaxis()->FindBin(background)
-                          );
 
-  return tmpCorrFactor;
-}
 //________________________________________________________________________
-Double_t AliAnalysisTaskChargedJetsPA::GetCorrectedJetPt(AliEmcalJet* jet, Double_t background, Bool_t useEtaCorrection)
+Double_t AliAnalysisTaskChargedJetsPA::GetCorrectedJetPt(AliEmcalJet* jet, Double_t background)
 {
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Getting corrected jet spectra." << std::endl;
+    AliInfo("Getting corrected jet spectra.");
   #endif
 
   if(!jet)
   {
-    AliError("Jet pointer passed to GetCorrectedJet() not valid!");
+    AliError("Jet pointer passed to GetCorrectedJetPt() not valid!");
     return -1.0;
   }
 
   Double_t correctedPt = -1.0;
 
-  // Get correction factor from saved histo or similar in dependence of jet eta and background density
-  Double_t corrfactor = 1.0;
-  if(useEtaCorrection)
-  {
-    corrfactor = GetJetBackgroundCorrFactor(jet->Eta(), background);
-  }
-
-  // Get Eta corrected background
-  Double_t tmpCorrectedBackground = background * corrfactor;
+  // if the passed background is not valid, do not subtract it
+  if(background < 0)
+    background = 0;
 
   // Subtract background
-  correctedPt = jet->Pt() - tmpCorrectedBackground * jet->Area();
+  correctedPt = jet->Pt() - background * jet->Area();
 
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Got corrected jet spectra." << std::endl;
+    AliInfo("Got corrected jet spectra.");
   #endif 
 
   return correctedPt;
 }
 
 
+
 //________________________________________________________________________
-void AliAnalysisTaskChargedJetsPA::GetDeltaPt(Double_t& deltaPt, Double_t rho, Int_t numberExcludeLeadingJets, Int_t usedEtaBin, Bool_t useEtaCorrection)
+Double_t AliAnalysisTaskChargedJetsPA::GetDeltaPt(Double_t rho, Double_t leadingJetExclusionProbability)
 {
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Getting Delta Pt." << std::endl;
+    AliInfo("Getting Delta Pt.");
   #endif
 
-  // Define the tmp delta pt
-  deltaPt = -10000.0;
+  // Define an invalid delta pt
+  Double_t deltaPt = -10000.0;
 
-  // Exclude UP TO numberExcludeLeadingJets
-  if (fNumberSignalJets < 2)
-    numberExcludeLeadingJets = fNumberSignalJets;
-  
+  // Define eta range
   Double_t etaMin, etaMax;
-  if (usedEtaBin==-1)
-  {
-    etaMin = -(fTrackEtaWindow-fRandConeRadius);
-    etaMax = +(fTrackEtaWindow-fRandConeRadius);
-  }
-  else
-  {
-    etaMin = -(fTrackEtaWindow-fRandConeRadius) + 2*(fTrackEtaWindow-fRandConeRadius)/fBackgroundEtaBins *  usedEtaBin;
-    etaMax = -(fTrackEtaWindow-fRandConeRadius) + 2*(fTrackEtaWindow-fRandConeRadius)/fBackgroundEtaBins * (usedEtaBin+1);
-  }  
-
-
-  Double_t tmpRandConeEta = 0.0;
-  Double_t tmpRandConePhi = 0.0;
+  etaMin = -(fTrackEtaWindow-fRandConeRadius);
+  etaMax = +(fTrackEtaWindow-fRandConeRadius);
 
+  // Define random cone
   Bool_t coneValid = kTRUE;
+  Double_t tmpRandConeEta = etaMin + fRandom->Rndm()*(etaMax-etaMin);
+  Double_t tmpRandConePhi = fRandom->Rndm()*TMath::TwoPi();
 
-
-  tmpRandConeEta = etaMin + fRandom->Rndm()*(etaMax-etaMin);
-  tmpRandConePhi = fRandom->Rndm()*TMath::TwoPi();
-
-  // Apply eta correction on demand
-  if(useEtaCorrection)
-    rho = GetJetBackgroundCorrFactor(tmpRandConeEta, rho)*rho;
-
-  // Go through all excluded leading jets and check if there's an overlap
-  for(Int_t j=0;j<numberExcludeLeadingJets;j++)
+  // if there is a jet, check for overlap if demanded
+  if(leadingJetExclusionProbability)
   {
-    AliEmcalJet* tmpJet = NULL;
-
-    if (j==0)
-      tmpJet = fFirstLeadingJet;
-    else if (j==1)
-      tmpJet = fSecondLeadingJet;
-    else
-      AliFatal("Trying to exclude more than 2 jets for delta pt -- not implemented.");
+    AliEmcalJet* tmpLeading = dynamic_cast<AliEmcalJet*>(fJetArray->At(0));
+    // Get leading jet (regardless of pT)
+    for (Int_t i = 1; i<fJetArray->GetEntries(); i++)
+    {
+      AliEmcalJet* tmpJet = static_cast<AliEmcalJet*>(fJetArray->At(i));
+      // if jet is in acceptance and higher, take as new leading
+      if (tmpJet)
+        if ((TMath::Abs(tmpJet->Eta()) <= fSignalJetEtaWindow) && (tmpJet->Area() >= fMinJetArea))
+          if((!tmpLeading) || (tmpJet->Pt() > tmpLeading->Pt()))
+            tmpLeading = tmpJet;
+    }
+    if(tmpLeading)
+    {
+      Double_t excludedJetPhi = tmpLeading->Phi();
+      Double_t excludedJetEta = tmpLeading->Eta();
+      Double_t tmpDeltaPhi = GetDeltaPhi(tmpRandConePhi, excludedJetPhi);
 
-    Double_t excludedJetPhi = tmpJet->Phi();
-    Double_t excludedJetEta = tmpJet->Eta();
-    Double_t tmpDeltaPhi = GetDeltaPhi(tmpRandConePhi, excludedJetPhi);
+      // Check, if cone has overlap with jet
+      if ( tmpDeltaPhi*tmpDeltaPhi + TMath::Abs(tmpRandConeEta-excludedJetEta)*TMath::Abs(tmpRandConeEta-excludedJetEta) <= fRandConeRadius*fRandConeRadius)
+      {
+        // Define probability to exclude the RC
+        Double_t probability = leadingJetExclusionProbability;
 
-    // Check, if cone has overlap with jet
-    if ( tmpDeltaPhi*tmpDeltaPhi + TMath::Abs(tmpRandConeEta-excludedJetEta)*TMath::Abs(tmpRandConeEta-excludedJetEta) <= fRandConeRadius*fRandConeRadius)
-    {
-      coneValid = kFALSE;
-      break;
+        // Only exclude cone with a given probability
+        if (fRandom->Rndm()<=probability)
+          coneValid = kFALSE;
+      }
     }
   }
 
+
   // Get the cones' pt and calculate delta pt
   if (coneValid)
     deltaPt = GetConePt(tmpRandConeEta,tmpRandConePhi,fRandConeRadius) - (rho*fRandConeRadius*fRandConeRadius*TMath::Pi());
+
+  return deltaPt;
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Got Delta Pt." << std::endl;
+    AliInfo("Got Delta Pt.");
   #endif
 }
 
 //________________________________________________________________________
-void AliAnalysisTaskChargedJetsPA::GetKTBackgroundDensity(Int_t numberExcludeLeadingJets, Double_t& rhoMedian, Double_t& areaMean, Double_t etaMin, Double_t etaMax)
+void AliAnalysisTaskChargedJetsPA::GetKTBackgroundDensityAll(Int_t numberExcludeLeadingJets, Double_t& rhoPbPb, Double_t& rhoPbPbWithGhosts, Double_t& rhoCMS, Double_t& rhoImprovedCMS, Double_t& rhoMean, Double_t& rhoTrackLike)
 {
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Getting KT background density." << std::endl;
+    AliInfo("Getting ALL KT background density.");
   #endif
 
-  // static declaration. Advantage: more speed. Disadvantage: Problematic for events with more than 1024 jets :)
-  static Double_t tmpRhos[1024];
-  static Double_t tmpAreas[1024];
-  Int_t maxJetIds[]   = {-1, -1}; // Indices for excludes jets (up to two)
+  static Double_t tmpRhoPbPb[1024];
+  static Double_t tmpRhoPbPbWithGhosts[1024];
+  static Double_t tmpRhoMean[1024];
+  static Double_t tmpRhoCMS[1024];
+  static Double_t tmpRhoImprovedCMS[1024];
+  Double_t tmpCoveredArea = 0.0;
+  Double_t tmpSummedArea = 0.0;
+  Double_t tmpPtTrackLike = 0.0;
+  Double_t tmpAreaTrackLike = 0.0;
 
   // Setting invalid values
-  rhoMedian = -1.0;
-  areaMean= -1.0;
+  rhoPbPb = 0.0;
+  rhoPbPbWithGhosts = 0.0;
+  rhoCMS = 0.0;
+  rhoImprovedCMS = 0.0;
+  rhoMean = 0.0;
+  rhoTrackLike = 0.0;
 
-  // Exclude UP TO numberExcludeLeadingJets
-  Int_t numberBgrdJets = GetLeadingJets(fBackgroundJetArray, &maxJetIds[0], kFALSE);
-  if (numberBgrdJets < numberExcludeLeadingJets)
-    numberExcludeLeadingJets = numberBgrdJets;
-  if ((etaMin == 0) && (etaMax == 0))
-  {
-    etaMin = -fBackgroundJetEtaWindow;
-    etaMax = +fBackgroundJetEtaWindow;
-  }
+  Int_t rhoPbPbJetCount = 0;
+  Int_t rhoPbPbWithGhostsJetCount = 0;
+  Int_t rhoCMSJetCount = 0;
+  Int_t rhoImprovedCMSJetCount = 0;
+  Int_t rhoMeanJetCount = 0;
 
-  Int_t jetCountAccepted = 0;
-  Int_t jetCount = fBackgroundJetArray->GetEntries();
 
-  for (Int_t i = 0; i < jetCount; i++)
+  // Find 2 leading KT jets for the original PbPb approach
+  Int_t leadingKTJets[]   = {-1, -1};
+  GetLeadingJets(fBackgroundJetArray, &leadingKTJets[0], kFALSE);
+
+  // Exclude UP TO numberExcludeLeadingJets
+  if(numberExcludeLeadingJets==-1)
+    numberExcludeLeadingJets = fNumberSignalJets;
+  if (fNumberSignalJets < numberExcludeLeadingJets)
+    numberExcludeLeadingJets = fNumberSignalJets;
+
+  for (Int_t i = 0; i < fBackgroundJetArray->GetEntries(); i++)
   {
-    AliEmcalJet* jet = static_cast<AliEmcalJet*>(fBackgroundJetArray->At(i));
-    if (!jet)
+    AliEmcalJet* backgroundJet = static_cast<AliEmcalJet*>(fBackgroundJetArray->At(i));
+
+    if (!backgroundJet)
     {
       AliError(Form("%s: Could not receive jet %d", GetName(), i));
       continue;
     } 
 
-    // exclude leading jets
-    if (numberExcludeLeadingJets > 0)
-      if (i == maxJetIds[0])
-        continue;
-    if (numberExcludeLeadingJets > 1)
-      if (i == maxJetIds[1])
-        continue;
-      
-
-
-    if (!IsBackgroundJetInAcceptance(jet))
-      continue;
-    if (!((jet->Eta() >= etaMin) && (jet->Eta() < etaMax)))
-      continue;
-
-    
-    tmpRhos[jetCountAccepted] = jet->Pt() / jet->Area();
-    tmpAreas[jetCountAccepted] = jet->Area();
-    jetCountAccepted++;
-  }
-
-  if (jetCountAccepted > 0)
-  {
-    rhoMedian = TMath::Median(jetCountAccepted, tmpRhos);
-    areaMean   = TMath::Mean(jetCountAccepted, tmpAreas);
-  }
-  #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Got KT background density." << std::endl;
-  #endif
-}
-
-//________________________________________________________________________
-void AliAnalysisTaskChargedJetsPA::GetKTBackground2Density(Int_t numberExcludeLeadingJets, Double_t& rhoMedian, Double_t& areaMean, Double_t etaMin, Double_t etaMax)
-{
-  #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Getting KT background 2 density." << std::endl;
-  #endif
-
-  // static declaration. Advantage: more speed. Disadvantage: Problematic for events with more than 1024 jets :)
-  static Double_t tmpRhos[1024];
-  static Double_t tmpAreas[1024];
-
-  // Setting invalid values
-  rhoMedian = -1.0;
-  areaMean= -1.0;
-
-  if ((etaMin == 0) && (etaMax == 0))
-  {
-    etaMin = -fBackgroundJetEtaWindow;
-    etaMax = +fBackgroundJetEtaWindow;
-  }
+    // Search for overlap with signal jets
+    Bool_t isOverlapping = kFALSE;
+    for(Int_t j=0;j<numberExcludeLeadingJets;j++)
+    {
+      AliEmcalJet* signalJet = fSignalJets[j];
+     
+      if(IsJetOverlapping(signalJet, backgroundJet))
+      {
+        isOverlapping = kTRUE;
+        break;
+      }
+    }
 
-  Int_t jetCountAccepted = 0;
-  Int_t jetCount = fBackgroundJetArray->GetEntries();
+    tmpSummedArea += backgroundJet->Area();
+    if(backgroundJet->Pt() > 0.150)
+      tmpCoveredArea += backgroundJet->Area();
 
-  for (Int_t i = 0; i < jetCount; i++)
-  {
-    Bool_t jetValid = kTRUE;
-    AliEmcalJet* jet = static_cast<AliEmcalJet*>(fBackgroundJetArray->At(i));
-    if (!jet)
-    {
-      AliError(Form("%s: Could not receive jet %d", GetName(), i));
+    if (!IsBackgroundJetInAcceptance(backgroundJet))
       continue;
-    } 
 
-    if (!((jet->Eta() >= etaMin) && (jet->Eta() < etaMax)))
-      continue;
-    if (!IsBackgroundJetInAcceptance(jet))
-      continue;
+    Double_t tmpRho = 0.0;
+    if(backgroundJet->Area())
+      tmpRho = backgroundJet->Pt() / backgroundJet->Area();
 
-    // Look, if theres an overlap of leading jets/ kT jet. If yes, exclude this jet
-    for(Int_t j=0;j<numberExcludeLeadingJets;j++)
+    // PbPb approach (take ghosts into account)
+    if ((i != leadingKTJets[0]) && (i != leadingKTJets[1]))
     {
-      AliEmcalJet* tmpLeadingJet = NULL;
+      tmpRhoPbPbWithGhosts[rhoPbPbWithGhostsJetCount] = tmpRho;
+      rhoPbPbWithGhostsJetCount++;
+    }
 
-      if (j==0)
-        tmpLeadingJet = fFirstLeadingJet;
-      else if (j==1)
-        tmpLeadingJet = fSecondLeadingJet;
-      else
-        AliFatal("Trying to exclude more than 2 jets in KT background 2 -- not implemented.");
+    if(backgroundJet->Pt() > 0.150)
+    {
+      // CMS approach: don't take ghosts into acount
+      tmpRhoCMS[rhoCMSJetCount] = tmpRho;
+      rhoCMSJetCount++;
 
-      if (tmpLeadingJet)
+      // Improved CMS approach: like CMS but excluding signal
+      if(!isOverlapping)
       {
-        Double_t tmpDeltaPhi = GetDeltaPhi(jet->Phi(), tmpLeadingJet->Phi());
-        if ( tmpDeltaPhi*tmpDeltaPhi + TMath::Abs(jet->Eta()-tmpLeadingJet->Eta())*TMath::Abs(jet->Eta()-tmpLeadingJet->Eta()) <= fBackgroundJetRadius*fBackgroundJetRadius)
-        {
-          jetValid = kFALSE;
-          break;
-        }
+        tmpRhoImprovedCMS[rhoImprovedCMSJetCount] = tmpRho;
+        rhoImprovedCMSJetCount++;
+      }
+
+      // PbPb w/o ghosts approach (just neglect ghosts)
+      if ((i != leadingKTJets[0]) && (i != leadingKTJets[1]))
+      {  
+        tmpRhoPbPb[rhoPbPbJetCount] = tmpRho;
+        rhoPbPbJetCount++;
       }
     }
 
-    if(!jetValid)
-      continue;
-   
-    tmpRhos[jetCountAccepted] = jet->Pt() / jet->Area();
-    tmpAreas[jetCountAccepted] = jet->Area();
-    jetCountAccepted++;
+    // (no overlap with signal jets)
+    if(!isOverlapping)
+    {
+      // Mean approach
+      tmpRhoMean[rhoMeanJetCount] = tmpRho;
+      rhoMeanJetCount++;
+      
+      // Track like approach approach
+      tmpPtTrackLike += backgroundJet->Pt();
+      tmpAreaTrackLike += backgroundJet->Area();
+    }
+
   }
 
-  if (jetCountAccepted > 0)
+  if (tmpAreaTrackLike > 0)
+    rhoTrackLike = tmpPtTrackLike/tmpAreaTrackLike;
+  if (rhoPbPbJetCount > 0)
+    rhoPbPb = TMath::Median(rhoPbPbJetCount, tmpRhoPbPb);
+  if (rhoPbPbWithGhostsJetCount > 0)
+    rhoPbPbWithGhosts = TMath::Median(rhoPbPbWithGhostsJetCount, tmpRhoPbPbWithGhosts);
+  if (rhoCMSJetCount > 0)
+    rhoCMS = TMath::Median(rhoCMSJetCount, tmpRhoCMS) * tmpCoveredArea/tmpSummedArea;
+  if (rhoImprovedCMSJetCount > 0)
   {
-    rhoMedian = TMath::Median(jetCountAccepted, tmpRhos);
-    areaMean   = TMath::Mean(jetCountAccepted, tmpAreas);
+    rhoImprovedCMS = TMath::Median(rhoImprovedCMSJetCount, tmpRhoImprovedCMS) * tmpCoveredArea/tmpSummedArea;
   }
+  if (rhoMeanJetCount > 0)
+    rhoMean = TMath::Mean(rhoMeanJetCount, tmpRhoMean);
+
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Got KT background 2 density." << std::endl;
+    AliInfo("Got ALL KT background density.");
   #endif
 }
 
-
 //________________________________________________________________________
-Int_t AliAnalysisTaskChargedJetsPA::GetRCBackgroundDensity(Int_t numberExcludeLeadingJets, Double_t& rhoMean, Double_t& rhoMedian, Double_t etaMin, Double_t etaMax, Int_t numberRandCones)
+void AliAnalysisTaskChargedJetsPA::GetKTBackgroundDensity(Int_t numberExcludeLeadingJets, Double_t& rhoImprovedCMS)
 {
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Getting RC background density." << std::endl;
+    AliInfo("Getting KT background density.");
   #endif
 
-  if(numberRandCones == 0)
-    numberRandCones = fNumberRandCones;
-
-  std::vector<AliEmcalJet> tmpCones(numberRandCones);
+  static Double_t tmpRhoImprovedCMS[1024];
+  Double_t tmpCoveredArea = 0.0;
+  Double_t tmpSummedArea = 0.0;
 
   // Setting invalid values
-  rhoMean = -1.0;
-  rhoMedian = -1.0;
+  rhoImprovedCMS = 0.0;
+
+  Int_t rhoImprovedCMSJetCount = 0;
 
   // Exclude UP TO numberExcludeLeadingJets
-  if (fNumberSignalJets < 2)
+  if(numberExcludeLeadingJets==-1)
+    numberExcludeLeadingJets = fNumberSignalJets;
+  if (fNumberSignalJets < numberExcludeLeadingJets)
     numberExcludeLeadingJets = fNumberSignalJets;
 
-  // Search given amount of RCs
-  Int_t numAcceptedRCs = 0;
-  for(Int_t i=0;i<numberRandCones;i++)
+  for (Int_t i = 0; i < fBackgroundJetArray->GetEntries(); i++)
   {
-    Double_t tmpRandConeEta = 0.0;
-    Double_t tmpRandConePhi = 0.0;
-    Double_t excludedJetEta = 0.0;
-    Double_t excludedJetPhi = 0.0;
-
-    // Search random cone in acceptance with no overlap with already excluded jets (leading jets and random cones)
-    Bool_t coneValid = kTRUE;
-
-    // Set the random cone position
-    if ((etaMin == 0) && (etaMax == 0))
-      tmpRandConeEta = (fTrackEtaWindow-fRandConeRadius)*(2.0*fRandom->Rndm()-1.0); // full RC is in acceptance
-    else
-      tmpRandConeEta = etaMin + fRandom->Rndm()*(etaMax-etaMin);
+    AliEmcalJet* backgroundJet = static_cast<AliEmcalJet*>(fBackgroundJetArray->At(i));
 
-    tmpRandConePhi = fRandom->Rndm()*TMath::TwoPi();
+    if (!backgroundJet)
+    {
+      AliError(Form("%s: Could not receive jet %d", GetName(), i));
+      continue;
+    } 
 
-    // Go through all excluded leading jets and check if there's an overlap
-     
+    // Search for overlap with signal jets
+    Bool_t isOverlapping = kFALSE;
     for(Int_t j=0;j<numberExcludeLeadingJets;j++)
     {
-      AliEmcalJet* tmpJet = NULL;
-
-      if (j==0)
-        tmpJet = fFirstLeadingJet;
-      else if (j==1)
-        tmpJet = fSecondLeadingJet;
-      else
-        AliFatal("Trying to exclude more than 2 jets in RC background -- not implemented.");
-
-      excludedJetPhi = tmpJet->Phi();
-      excludedJetEta = tmpJet->Eta();
-      Double_t tmpDeltaPhi = GetDeltaPhi(tmpRandConePhi, excludedJetPhi);
-      
-      if ( tmpDeltaPhi*tmpDeltaPhi + TMath::Abs(tmpRandConeEta-excludedJetEta)*TMath::Abs(tmpRandConeEta-excludedJetEta) <= fRandConeRadius*fRandConeRadius)
+      AliEmcalJet* signalJet = fSignalJets[j];
+     
+      if(IsJetOverlapping(signalJet, backgroundJet))
       {
-        coneValid = kFALSE;
+        isOverlapping = kTRUE;
         break;
       }
     }
 
-    // RC is accepted, so save it
-    if(coneValid)
-    {
-      AliEmcalJet tmpJet(GetConePt(tmpRandConeEta, tmpRandConePhi, fRandConeRadius), tmpRandConeEta, tmpRandConePhi, 0.0);
-      tmpCones[numAcceptedRCs] = tmpJet;
-      numAcceptedRCs++;
-    }
+    tmpSummedArea += backgroundJet->Area();
+    if(backgroundJet->Pt() > 0.150)
+      tmpCoveredArea += backgroundJet->Area();
+
+    if (!IsBackgroundJetInAcceptance(backgroundJet))
+      continue;
+
+    Double_t tmpRho = backgroundJet->Pt() / backgroundJet->Area();
+
+    if(backgroundJet->Pt() > 0.150)
+      if(!isOverlapping)
+      {
+        tmpRhoImprovedCMS[rhoImprovedCMSJetCount] = tmpRho;
+        rhoImprovedCMSJetCount++;
+      }
   }
 
-  // Calculate Rho and the mean from the RCs (no excluded jets are considered!)
-  if(numAcceptedRCs > 0)
+  if (rhoImprovedCMSJetCount > 0)
   {
-    std::vector<Double_t> tmpRho(numAcceptedRCs);
-    for (Int_t i=0; i<numAcceptedRCs;i++)
-      tmpRho[i] = tmpCones[i].Pt()/(fRandConeRadius*fRandConeRadius*TMath::Pi());
-
-    rhoMean = TMath::Mean(tmpRho.begin(), tmpRho.end());
-    rhoMedian = 0.0; // NOT IMPLEMENTED because TMath::Median is not working with iterators
+    rhoImprovedCMS = TMath::Median(rhoImprovedCMSJetCount, tmpRhoImprovedCMS) * tmpCoveredArea/tmpSummedArea;
   }
-    
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Got RC background density." << std::endl;
+    AliInfo("Got KT background density.");
   #endif
-  return numAcceptedRCs;
 }
 
+
 //________________________________________________________________________
-void AliAnalysisTaskChargedJetsPA::GetTrackBackgroundDensity(Int_t numberExcludeLeadingJets, Double_t& rhoMean, Double_t& area, Double_t etaMin, Double_t etaMax)
+void AliAnalysisTaskChargedJetsPA::GetTRBackgroundDensity(Int_t numberExcludeLeadingJets, Double_t& rhoNoExclusion, Double_t& rhoConeExclusion02, Double_t& rhoConeExclusion04, Double_t& rhoConeExclusion06, Double_t& rhoConeExclusion08, Double_t& rhoExactExclusion)
 {
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Getting track background density." << std::endl;
+    AliInfo("Getting TR background density.");
   #endif
 
+  Double_t summedTracksPtCone04 = 0.0;
+  Double_t summedTracksPtCone02 = 0.0;
+  Double_t summedTracksPtCone06 = 0.0;
+  Double_t summedTracksPtCone08 = 0.0;
+  Double_t summedTracksPtWithinJets = 0.0;
   Double_t summedTracksPt = 0.0;
-
-  if ((etaMin == 0) && (etaMax == 0))
-  {
-    etaMin = -fTrackEtaWindow;
-    etaMax = +fTrackEtaWindow;
-  }
-
+  
   // Setting invalid values
-  rhoMean = -1.0;
-  area = -1.0;
+  rhoNoExclusion = 0.0;
+  rhoConeExclusion02 = 0.0;
+  rhoConeExclusion04 = 0.0;
+  rhoConeExclusion06 = 0.0;
+  rhoConeExclusion08 = 0.0; 
+  rhoExactExclusion  = 0.0;
+
   // Exclude UP TO numberExcludeLeadingJets
-  if (fNumberSignalJets < 2)
+  if(numberExcludeLeadingJets==-1)
+    numberExcludeLeadingJets = fNumberSignalJets;
+  if (fNumberSignalJets < numberExcludeLeadingJets)
     numberExcludeLeadingJets = fNumberSignalJets;
 
-
-  Int_t   trackCount = fTrackArray->GetEntries();
-  Int_t   trackCountAccepted = 0;
-  for (Int_t i = 0; i < trackCount; i++)
+  for (Int_t i = 0; i < fTrackArray->GetEntries(); i++)
   {
-    Bool_t  trackValid = kTRUE;
     AliVTrack* tmpTrack = static_cast<AliVTrack*>(fTrackArray->At(i));
+    Bool_t trackWithinJet = kFALSE; Bool_t trackWithin02Cone = kFALSE; Bool_t trackWithin04Cone = kFALSE; Bool_t trackWithin06Cone = kFALSE; Bool_t trackWithin08Cone = kFALSE;
+
     if (IsTrackInAcceptance(tmpTrack))
-      if ((tmpTrack->Eta() >= etaMin) && (tmpTrack->Eta() < etaMax))
+    {
+      // Check if tracks overlaps with jet
+      for(Int_t j=0;j<numberExcludeLeadingJets;j++)
       {
-        for (Int_t j = 0; j < numberExcludeLeadingJets; j++)
+        AliEmcalJet* signalJet = fSignalJets[j];
+
+        // Exact jet exclusion
+        if (IsTrackInJet(signalJet, i))
+          trackWithinJet = kTRUE;
+
+        // Cone exclusions
+        if (IsTrackInCone(tmpTrack, signalJet->Eta(), signalJet->Phi(), 0.2))
+        {
+          trackWithin02Cone = kTRUE;
+          trackWithin04Cone = kTRUE;
+          trackWithin06Cone = kTRUE;
+          trackWithin08Cone = kTRUE;
+          break;
+        }
+        else if (IsTrackInCone(tmpTrack, signalJet->Eta(), signalJet->Phi(), 0.4))
         {
-          AliEmcalJet* tmpJet = NULL;
-          if (j==0)
-            tmpJet = fFirstLeadingJet;
-          else if (j==1)
-            tmpJet = fSecondLeadingJet;
-          else
-            AliFatal("Trying to exclude more than 2 jets in track background -- not implemented.");
-
-          if (IsTrackInCone(tmpTrack, tmpJet->Eta(), tmpJet->Phi(), fTrackBackgroundConeRadius))
-          {
-            trackValid = kFALSE;
-            break;
-          }
+          trackWithin04Cone = kTRUE;
+          trackWithin06Cone = kTRUE;
+          trackWithin08Cone = kTRUE;
         }
-        if (trackValid)
+        else if (IsTrackInCone(tmpTrack, signalJet->Eta(), signalJet->Phi(), 0.6))
         {
-          // Add track pt to array
-          summedTracksPt = summedTracksPt + tmpTrack->Pt();
-          trackCountAccepted++;
+          trackWithin06Cone = kTRUE;
+          trackWithin08Cone = kTRUE;
         }
+        else if (IsTrackInCone(tmpTrack, signalJet->Eta(), signalJet->Phi(), 0.8))
+        {
+          trackWithin08Cone = kTRUE;
+        }
+      }
+
+      if(!trackWithin08Cone)
+      {
+        summedTracksPtCone08 += tmpTrack->Pt();
       }
+      if(!trackWithin06Cone)
+      {
+        summedTracksPtCone06 += tmpTrack->Pt();
+      }
+      if(!trackWithin04Cone)
+      {
+        summedTracksPtCone04 += tmpTrack->Pt();
+      }
+      if(!trackWithin02Cone)
+      {
+        summedTracksPtCone02 += tmpTrack->Pt();
+      }
+      if(!trackWithinJet)
+      {
+        summedTracksPtWithinJets += tmpTrack->Pt();
+      }
+      summedTracksPt += tmpTrack->Pt();
+
+    }
   }
 
-  if (trackCountAccepted > 0)
-  {
-    Double_t tmpArea = 0.0;
+  // Calculate the correct area where the tracks were taking from
 
-    tmpArea = (2.0*fTrackEtaWindow) * TMath::TwoPi() * (etaMax-etaMin)/(2.0*fTrackEtaWindow); // area of the used eta strip
-    
-    // Now: exclude the part of the leading jet that is in the strip
-    if (numberExcludeLeadingJets == 2)
-      tmpArea = tmpArea*(1.0-MCGetOverlapCircleRectancle(fFirstLeadingJet->Eta(), fFirstLeadingJet->Phi(), fTrackBackgroundConeRadius, etaMin, etaMax, 0., TMath::TwoPi()) -MCGetOverlapCircleRectancle(fSecondLeadingJet->Eta(), fSecondLeadingJet->Phi(), fTrackBackgroundConeRadius, etaMin, etaMax, 0., TMath::TwoPi()));
-    else if (numberExcludeLeadingJets == 1)
-      tmpArea = tmpArea*(1.0-MCGetOverlapCircleRectancle(fFirstLeadingJet->Eta(), fFirstLeadingJet->Phi(), fTrackBackgroundConeRadius, etaMin, etaMax, 0., TMath::TwoPi()));
-   
-    rhoMean = summedTracksPt/tmpArea;
-    area  = tmpArea;
+  Double_t tmpFullTPCArea = (2.0*fTrackEtaWindow) * TMath::TwoPi();
+  Double_t tmpAreaCone02     = tmpFullTPCArea;
+  Double_t tmpAreaCone04     = tmpFullTPCArea;
+  Double_t tmpAreaCone06     = tmpFullTPCArea;
+  Double_t tmpAreaCone08     = tmpFullTPCArea;
+  Double_t tmpAreaWithinJets = tmpFullTPCArea;
+  std::vector<Double_t> tmpEtas(numberExcludeLeadingJets);
+  std::vector<Double_t> tmpPhis(numberExcludeLeadingJets);
+
+  for(Int_t i=0;i<numberExcludeLeadingJets;i++)
+  {
+    AliEmcalJet* tmpJet = fSignalJets[i];
+    tmpEtas[i] = tmpJet->Eta();
+    tmpPhis[i] = tmpJet->Phi();
+    tmpAreaWithinJets -= tmpJet->Area();
   }
 
+  tmpAreaCone02 -= tmpFullTPCArea * MCGetOverlapMultipleCirclesRectancle(numberExcludeLeadingJets, tmpEtas, tmpPhis, 0.2, -fTrackEtaWindow, +fTrackEtaWindow, 0., TMath::TwoPi());
+  tmpAreaCone04 -= tmpFullTPCArea * MCGetOverlapMultipleCirclesRectancle(numberExcludeLeadingJets, tmpEtas, tmpPhis, 0.4, -fTrackEtaWindow, +fTrackEtaWindow, 0., TMath::TwoPi());
+  tmpAreaCone06 -= tmpFullTPCArea * MCGetOverlapMultipleCirclesRectancle(numberExcludeLeadingJets, tmpEtas, tmpPhis, 0.6, -fTrackEtaWindow, +fTrackEtaWindow, 0., TMath::TwoPi());
+  tmpAreaCone08 -= tmpFullTPCArea * MCGetOverlapMultipleCirclesRectancle(numberExcludeLeadingJets, tmpEtas, tmpPhis, 0.8, -fTrackEtaWindow, +fTrackEtaWindow, 0., TMath::TwoPi());
+  rhoConeExclusion02 = summedTracksPtCone02/tmpAreaCone02;
+  rhoConeExclusion04 = summedTracksPtCone04/tmpAreaCone04;
+  rhoConeExclusion06 = summedTracksPtCone06/tmpAreaCone06;
+  rhoConeExclusion08 = summedTracksPtCone08/tmpAreaCone08;
+  rhoExactExclusion  = summedTracksPtWithinJets/tmpAreaWithinJets;
+  rhoNoExclusion     = summedTracksPt/tmpFullTPCArea;
+
+
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Got track background density." << std::endl;
+    AliInfo("Got TR background density.");
   #endif
 }
 
 //________________________________________________________________________
-void AliAnalysisTaskChargedJetsPA::GetTrackBackgroundDensity(Int_t numberExcludeLeadingJets, Double_t& rhoMean, Double_t& area, AliEmcalJet* excludeJet1, AliEmcalJet* excludeJet2, Bool_t doSearchPerpendicular)
+void AliAnalysisTaskChargedJetsPA::GetTRBackgroundDensity(Int_t numberExcludeLeadingJets, Double_t& rhoMean, Double_t& area, AliEmcalJet* excludeJet1, AliEmcalJet* excludeJet2, Bool_t doSearchPerpendicular)
 {
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Getting track background density." << std::endl;
+    AliInfo("Getting TR background density.");
   #endif
 
   // Setting invalid values
   Double_t summedTracksPt = 0.0;
-  rhoMean = -1.0;
+  rhoMean = 0.0;
   area = -1.0;
 
   Double_t tmpRadius = 0.0;
   if (doSearchPerpendicular)
-    tmpRadius = 0.5*TMath::Pi(); // exclude 90 degrees around jets
+    tmpRadius = 0.4*TMath::Pi(); // exclude 90 degrees around jets
   else
-    tmpRadius = fSignalJetRadius;
+    tmpRadius = 0.8;
     
   numberExcludeLeadingJets = 2; // dijet is excluded here in any case
 
@@ -1045,7 +1221,7 @@ void AliAnalysisTaskChargedJetsPA::GetTrackBackgroundDensity(Int_t numberExclude
   }
 
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Got track background density." << std::endl;
+    AliInfo("Got TR background density.");
   #endif
 }
 
@@ -1053,368 +1229,380 @@ void AliAnalysisTaskChargedJetsPA::GetTrackBackgroundDensity(Int_t numberExclude
 void AliAnalysisTaskChargedJetsPA::Calculate(AliVEvent* event)
 {
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Starting Calculate." << std::endl;
+    AliInfo("Starting Calculate().");
   #endif
   ////////////////////// NOTE: initialization & casting
 
-  if (!event) {
-    AliError("??? Event pointer == 0 ???");
-    return;
-  }
-  if (!fInitialized)
-    ExecOnce(); // Get tracks, jets, background from arrays if not already given + Init Histos
-  
-  // Additional cuts
-  FillHistogram("hNumberEvents", 0.5); // number of events before manual cuts
-  
-  if ((event->GetPrimaryVertex()->GetNContributors() < fMinVertexContributors) || (TMath::Abs(event->GetPrimaryVertex()->GetZ()) > fVertexWindow))
+  fEventCounter++;
+
+  // Check, if analysis should be done in pt hard bins
+  if(fUsePtHardBin != -1)
+    if(GetPtHardBin() != fUsePtHardBin)
+      return;
+
+  // This is to take only every Nth event
+  if((fEventCounter+fPartialAnalysisIndex) % fPartialAnalysisNParts != 0)
     return;
 
-  if (TMath::Sqrt(event->GetPrimaryVertex()->GetX()*event->GetPrimaryVertex()->GetX() + event->GetPrimaryVertex()->GetY()*event->GetPrimaryVertex()->GetY())  > fVertexMaxR)
+  FillHistogram("hNumberEvents",0.5);
+
+  if(!IsEventInAcceptance(event))
     return;
 
-  FillHistogram("hNumberEvents", 1.5); // number of events after manual cuts
+  FillHistogram("hNumberEvents",1.5);
 
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Calculate:Init done" << std::endl;
+    AliInfo("Calculate()::Init done.");
   #endif
 
   ////////////////////// NOTE: Get Centrality, (Leading)Signal jets and Background
 
-  // Get centrality (V0A)
+  // Get centrality
   AliCentrality* tmpCentrality = NULL;
   tmpCentrality = event->GetCentrality();
-  Double_t centralityPercentile = 0.0;
+  Double_t centralityPercentile = -1.0;
+  Double_t centralityPercentileV0A = 0.0;
+  Double_t centralityPercentileV0C = 0.0;
+  Double_t centralityPercentileV0M = 0.0;
   if (tmpCentrality != NULL)
-    centralityPercentile = tmpCentrality->GetCentralityPercentile("V0A");
+  {
+    centralityPercentile = tmpCentrality->GetCentralityPercentile(fCentralityType.Data());
+    centralityPercentileV0A = tmpCentrality->GetCentralityPercentile("V0A");
+    centralityPercentileV0C = tmpCentrality->GetCentralityPercentile("V0C");
+    centralityPercentileV0M = tmpCentrality->GetCentralityPercentile("V0M");
+  }
 
+  if((centralityPercentile < 0.0) || (centralityPercentile > 100.0))
+  {
+    AliWarning(Form("Centrality value not valid (c=%E), setting to failsafe c=1.0.",centralityPercentile)); 
+    centralityPercentile = 1.0;
+  }
   // Get jets
   if (fAnalyzeBackground || fAnalyzeJets)
     GetSignalJets();
 
-  // Get background
-
-  // Background with N excluded leading jets
-  std::vector<Double_t>  ktBackgroundRhoMedian(fBackgroundEtaBins+1);
-  std::vector<Double_t>  ktBackgroundAreaMean(fBackgroundEtaBins+1);
-  std::vector<Double_t>  ktBackground2RhoMedian(fBackgroundEtaBins+1);
-  std::vector<Double_t>  ktBackground2AreaMean(fBackgroundEtaBins+1);
-  std::vector<Double_t>  rcBackgroundRhoMean(fBackgroundEtaBins+1);
-  std::vector<Double_t>  rcBackgroundRhoMedian(fBackgroundEtaBins+1);
-  std::vector<Double_t>  trackBackgroundRhoMean(fBackgroundEtaBins+1);
-  std::vector<Double_t>  trackBackgroundArea(fBackgroundEtaBins+1);
-  Double_t  dijetBackground = -1.0; // calculation only done in events with dijets I!
-  Double_t  dijetBackgroundPerpendicular = -1.0; // calculation only done in events with dijets I!
+  // Get background estimates
+  Double_t              backgroundKTImprovedCMS = -1.0;
+  Double_t              backgroundKTImprovedCMSExternal = -1.0;
+  Double_t              backgroundDijet = -1.0;
+  Double_t              backgroundDijetPerpendicular = -1.0;
+
+  Double_t              backgroundKTPbPb = -1.0;
+  Double_t              backgroundKTPbPbWithGhosts = -1.0;
+  Double_t              backgroundKTCMS = -1.0;
+  Double_t              backgroundKTMean = -1.0;
+  Double_t              backgroundKTTrackLike = -1.0;
+  Double_t              backgroundTRNoExcl = -1.0;
+  Double_t              backgroundTRCone02 = -1.0;
+  Double_t              backgroundTRCone04 = -1.0;
+  Double_t              backgroundTRCone06 = -1.0;
+  Double_t              backgroundTRCone08 = -1.0;
+  Double_t              backgroundTRExact  = -1.0;
+
+  // Calculate background for different jet exclusions
+
   if (fAnalyzeBackground)
   {
 
-    // Get backgrounds in bins of eta
-    for(Int_t i = 0; i<fBackgroundEtaBins; i++)
-    {
-      // scheme: etaMin = RangeMin + l*binN; etaMax = RangeMin + l*(binN+1)
-
-      Double_t etaMin = -(fTrackEtaWindow-fRandConeRadius) + 2*(fTrackEtaWindow-fRandConeRadius)/fBackgroundEtaBins *  i;
-      Double_t etaMax = -(fTrackEtaWindow-fRandConeRadius) + 2*(fTrackEtaWindow-fRandConeRadius)/fBackgroundEtaBins * (i+1);
-      GetRCBackgroundDensity (fNumberExcludedJets, rcBackgroundRhoMean[i],rcBackgroundRhoMedian[i],  etaMin, etaMax);
-      GetTrackBackgroundDensity (fNumberExcludedJets, trackBackgroundRhoMean[i], trackBackgroundArea[i], etaMin, etaMax);
-      GetKTBackgroundDensity (fNumberExcludedJets, ktBackgroundRhoMedian[i], ktBackgroundAreaMean[i], etaMin, etaMax);
-      GetKTBackground2Density (fNumberExcludedJets, ktBackground2RhoMedian[i], ktBackground2AreaMean[i], etaMin, etaMax);
-
-    }
-    Int_t tmpNRCs = 0;
+    if(fAnalyzeDeprecatedBackgrounds)
+      GetKTBackgroundDensityAll    (fNumberExcludedJets, backgroundKTPbPb, backgroundKTPbPbWithGhosts, backgroundKTCMS, backgroundKTImprovedCMS, backgroundKTMean, backgroundKTTrackLike);
+    else
+      GetKTBackgroundDensity       (fNumberExcludedJets, backgroundKTImprovedCMS);
 
-    // All eta in one bin
-    tmpNRCs = GetRCBackgroundDensity (fNumberExcludedJets, rcBackgroundRhoMean[fBackgroundEtaBins], rcBackgroundRhoMedian[fBackgroundEtaBins]);
-    FillHistogram("hAccConesInRCBackground", tmpNRCs);
-    GetTrackBackgroundDensity (fNumberExcludedJets, trackBackgroundRhoMean[fBackgroundEtaBins], trackBackgroundArea[fBackgroundEtaBins]);
-    GetKTBackgroundDensity (fNumberExcludedJets, ktBackgroundRhoMedian[fBackgroundEtaBins], ktBackgroundAreaMean[fBackgroundEtaBins]);
-    GetKTBackground2Density (fNumberExcludedJets, ktBackground2RhoMedian[fBackgroundEtaBins], ktBackground2AreaMean[fBackgroundEtaBins]);
+    if(fAnalyzeDeprecatedBackgrounds)
+      GetTRBackgroundDensity    (fNumberExcludedJets, backgroundTRNoExcl, backgroundTRCone02, backgroundTRCone04, backgroundTRCone06, backgroundTRCone08, backgroundTRExact);
 
+    backgroundKTImprovedCMSExternal = GetExternalRho();
   }
 
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Calculate:Centrality&SignalJets&Background-Calculation done" << std::endl;
+    AliInfo("Calculate()::Centrality&SignalJets&Background-Calculation done.");
   #endif
-  ////////////////////// NOTE: Pythia histograms
-  if(fAnalyzePythia)
-  {
-    FillHistogram("hPythiaPtHard", GetPtHard());
-    FillHistogram("hPythiaNTrials", GetPtHardBin()+0.1, fTrials);
-    FillHistogram("hPythiaXSection", GetPtHardBin()+0.1, fCrossSection);
-
-    #ifdef DEBUGMODE
-      std::cout << "Task " << GetName() << ": Calculate:Pythia done" << std::endl;
-    #endif
-  }
-
-  ////////////////////// NOTE: Track & QA histograms
 
   if (fAnalyzeQA)
   {
-    FillHistogram("hVertexZ",event->GetPrimaryVertex()->GetZ());
+    FillHistogram("hVertexX",event->GetPrimaryVertex()->GetX());
+    FillHistogram("hVertexY",event->GetPrimaryVertex()->GetY());
+    FillHistogram("hVertexXY",event->GetPrimaryVertex()->GetX(), event->GetPrimaryVertex()->GetY());
     FillHistogram("hVertexR",TMath::Sqrt(event->GetPrimaryVertex()->GetX()*event->GetPrimaryVertex()->GetX() + event->GetPrimaryVertex()->GetY()*event->GetPrimaryVertex()->GetY()));
-    FillHistogram("hCentrality",centralityPercentile);
+    FillHistogram("hCentralityV0M",centralityPercentileV0M);
+    FillHistogram("hCentralityV0A",centralityPercentileV0A);
+    FillHistogram("hCentralityV0C",centralityPercentileV0C);
 
     Int_t trackCountAcc = 0;
     Int_t nTracks = fTrackArray->GetEntries();
     for (Int_t i = 0; i < nTracks; i++)
     {
       AliVTrack* track = static_cast<AliVTrack*>(fTrackArray->At(i));
+
+      if (track != 0)
+        if (track->Pt() >= fMinTrackPt)
+          FillHistogram("hTrackPhiEta", track->Phi(),track->Eta(), 1);
+
       if (IsTrackInAcceptance(track))
       {
-        FillHistogram("hTrackPhiEta", track->Phi(),track->Eta(), 1);
-        FillHistogram("hTrackPt", track->Pt());
+        FillHistogram("hTrackPt", track->Pt(), centralityPercentile);
+        if(track->Eta() >= 0)
+          FillHistogram("hTrackPtPosEta", track->Pt(), centralityPercentile);
+        else
+          FillHistogram("hTrackPtNegEta", track->Pt(), centralityPercentile);
+                
         FillHistogram("hTrackEta", track->Eta());
+        FillHistogram("hTrackPhi", track->Phi());
+        
+        if(static_cast<AliPicoTrack*>(track))
+        {
+          FillHistogram("hTrackPhiTrackType", track->Phi(), (static_cast<AliPicoTrack*>(track))->GetTrackType());
+          FillHistogram("hTrackPhiLabel", track->Phi(), (static_cast<AliPicoTrack*>(track))->GetLabel());
+        }
+        for(Int_t j=0;j<20;j++)
+          if(track->Pt() > j)
+            FillHistogram("hTrackPhiPtCut", track->Phi(), track->Pt());
+
         FillHistogram("hTrackCharge", track->Charge());
         trackCountAcc++;
       }
     }
     FillHistogram("hTrackCountAcc", trackCountAcc, centralityPercentile);
 
-    if (fHasClusters)
-    {
-      Int_t clusterCountAcc = 0;
-      Int_t nClusters = fClusterArray->GetEntries();
-      for (Int_t i = 0; i < nClusters; i++)
-      {
-        AliVCluster* cluster = static_cast<AliVCluster*>(fClusterArray->At(i));
-        if (IsClusterInAcceptance(cluster))
-        {
-          FillHistogram("hClusterE", cluster->E());
-          clusterCountAcc++;
-        }
-      }
-      FillHistogram("hClusterCountAcc", clusterCountAcc, centralityPercentile);
-    }
   }
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Calculate:QA done" << std::endl;
+    AliInfo("Calculate()::QA done.");
   #endif
 
   ////////////////////// NOTE: Jet analysis and calculations
 
   if (fAnalyzeJets)
   {
-    FillHistogram("hJetCountAll", fJetArray->GetEntries());
-    FillHistogram("hJetCountAccepted", fNumberSignalJets);
-    if (fFirstLeadingJet)
-      FillHistogram("hLeadingJetPt", fFirstLeadingJet->Pt());
-    if (fSecondLeadingJet)
-      FillHistogram("hSecondLeadingJetPt", fSecondLeadingJet->Pt());
+    for (Int_t i = 0; i<fJetArray->GetEntries(); i++)
+    {
+      AliEmcalJet* tmpJet = static_cast<AliEmcalJet*>(fJetArray->At(i));
+      if (!tmpJet)
+        continue;
 
-    // ### Dijets I ###
+      FillHistogram("hRawJetPt", tmpJet->Pt());
+      if (tmpJet->Pt() >= fMinJetPt)
+      {
+      // ### RAW JET ANALYSIS
+        if (tmpJet->Area() >= fMinJetArea)
+          FillHistogram("hRawJetPhiEta", tmpJet->Phi(), tmpJet->Eta());
+        if (TMath::Abs(tmpJet->Eta()) <= fSignalJetEtaWindow)
+          FillHistogram("hRawJetArea", tmpJet->Area());
+      }
+
+      if(IsSignalJetInAcceptance(tmpJet))
+      {
+      // ### SIGNAL JET ANALYSIS
+        // Jet spectra
+        FillHistogram("hJetPt", tmpJet->Pt(), centralityPercentile);
+        FillHistogram("hJetPtBgrdSubtractedKTImprovedCMS", GetCorrectedJetPt(tmpJet, backgroundKTImprovedCMS), centralityPercentile);
+        FillHistogram("hJetPtSubtractedRhoKTImprovedCMS", tmpJet->Pt(), centralityPercentile, backgroundKTImprovedCMS);
+        if(centralityPercentile<=20.0)
+          FillHistogram("hJetPtSubtractedRhoKTImprovedCMS020", tmpJet->Pt(), backgroundKTImprovedCMS);
+        
+        if(fAnalyzeDeprecatedBackgrounds)
+        {
+          FillHistogram("hJetPtBgrdSubtractedTR", GetCorrectedJetPt(tmpJet, backgroundTRCone06), centralityPercentile);
+          FillHistogram("hJetPtBgrdSubtractedKTPbPb", GetCorrectedJetPt(tmpJet, backgroundKTPbPb), centralityPercentile);
+          FillHistogram("hJetPtBgrdSubtractedKTPbPbWithGhosts", GetCorrectedJetPt(tmpJet, backgroundKTPbPbWithGhosts), centralityPercentile);
+          FillHistogram("hJetPtBgrdSubtractedKTCMS", GetCorrectedJetPt(tmpJet, backgroundKTCMS), centralityPercentile);
+          FillHistogram("hJetPtBgrdSubtractedKTMean", GetCorrectedJetPt(tmpJet, backgroundKTMean), centralityPercentile);
+          FillHistogram("hJetPtBgrdSubtractedKTTrackLike", GetCorrectedJetPt(tmpJet, backgroundKTTrackLike), centralityPercentile);
+        }
+
+        for(Int_t j=0; j<tmpJet->GetNumberOfTracks(); j++)
+          FillHistogram("hJetConstituentPt", tmpJet->TrackAt(j, fTrackArray)->Pt(), centralityPercentile);
+
+        if(fAnalyzeQA)
+        {
+          FillHistogram("hJetArea", tmpJet->Area());
+          FillHistogram("hJetPtVsConstituentCount", tmpJet->Pt(),tmpJet->GetNumberOfTracks());
+          FillHistogram("hJetPhiEta", tmpJet->Phi(),tmpJet->Eta());
+        }
+        // Signal jet vs. signal jet - "Combinatorial"
+        for (Int_t j = i+1; j<fNumberSignalJets; j++)
+          FillHistogram("hJetDeltaPhi", GetDeltaPhi(tmpJet->Phi(), fSignalJets[j]->Phi()));
+      }
+    }
+
+    // ### DIJETS
     if(fNumberSignalJets >= 2)
     {
       FillHistogram("hLeadingJetDeltaPhi", GetDeltaPhi(fFirstLeadingJet->Phi(), fSecondLeadingJet->Phi()));
-      FillHistogram("hLeadingJetDeltaPhiPt", GetDeltaPhi(fFirstLeadingJet->Phi(), fSecondLeadingJet->Phi()), fFirstLeadingJet->Pt());
 
-      if (IsDijet(fFirstLeadingJet, fSecondLeadingJet)) // Gettin' the money
+      if (IsDijet(fFirstLeadingJet, fSecondLeadingJet))
       {
-        FillHistogram("hDijetConstituentsPt", fFirstLeadingJet->Pt()); FillHistogram("hDijetConstituentsPt", fSecondLeadingJet->Pt());
+        FillHistogram("hDijetConstituentsPt", fFirstLeadingJet->Pt());
+        FillHistogram("hDijetConstituentsPt", fSecondLeadingJet->Pt());
+
         FillHistogram("hDijetLeadingJetPt", fFirstLeadingJet->Pt());
         FillHistogram("hDijetPtCorrelation", fFirstLeadingJet->Pt(), fSecondLeadingJet->Pt());
         Double_t dummyArea = 0;
-        GetTrackBackgroundDensity (2, dijetBackground, dummyArea, fFirstLeadingJet, fSecondLeadingJet, kFALSE);
-        GetTrackBackgroundDensity (2, dijetBackgroundPerpendicular, dummyArea, fFirstLeadingJet, fSecondLeadingJet, kTRUE);
+        GetTRBackgroundDensity (2, backgroundDijet, dummyArea, fFirstLeadingJet, fSecondLeadingJet, kFALSE);
+        GetTRBackgroundDensity (2, backgroundDijetPerpendicular, dummyArea, fFirstLeadingJet, fSecondLeadingJet, kTRUE);
       }
     }
 
-    // SIGNAL JET ANALYSIS
-    for (Int_t i = 0; i<fNumberSignalJets; i++)
+    // ### SOME JET PLOTS
+    FillHistogram("hJetCountAll", fJetArray->GetEntries());
+    FillHistogram("hJetCountAccepted", fNumberSignalJets);
+    FillHistogram("hJetCount", fJetArray->GetEntries(), fNumberSignalJets);
+    if (fFirstLeadingJet)
     {
-      AliEmcalJet* tmpJet = fSignalJets[i];
-
-      FillHistogram("hJetPtArea", tmpJet->Pt(), tmpJet->Area());
-      FillHistogram("hJetPtEta", tmpJet->Pt(), tmpJet->Eta());
-      FillHistogram("hJetPtPhi", tmpJet->Pt(), tmpJet->Phi());
-      FillHistogram("hJetPtCentrality", tmpJet->Pt(), centralityPercentile);
-      FillHistogram("hJetArea", tmpJet->Area());
-      FillHistogram("hJetPt", tmpJet->Pt());
-      FillHistogram("hJetPhiEta", tmpJet->Phi(),tmpJet->Eta());
-      
-      // Background subtracted spectra
-      
-      FillHistogram("hJetPtBgrdSubtractedRC", GetCorrectedJetPt(tmpJet, rcBackgroundRhoMean[fBackgroundEtaBins]));
-      FillHistogram("hJetPtBgrdSubtractedKT", GetCorrectedJetPt(tmpJet, ktBackgroundRhoMedian[fBackgroundEtaBins], kTRUE));
-      FillHistogram("hJetPtBgrdSubtractedKT2", GetCorrectedJetPt(tmpJet, ktBackground2RhoMedian[fBackgroundEtaBins], kTRUE));
-      FillHistogram("hJetPtBgrdSubtractedKTNoEtaCorr", GetCorrectedJetPt(tmpJet, ktBackgroundRhoMedian[fBackgroundEtaBins]));
-      FillHistogram("hJetPtBgrdSubtractedKT2NoEtaCorr", GetCorrectedJetPt(tmpJet, ktBackground2RhoMedian[fBackgroundEtaBins]));
-      FillHistogram("hJetPtBgrdSubtractedTR", GetCorrectedJetPt(tmpJet, trackBackgroundRhoMean[fBackgroundEtaBins]));
-
-
-      Double_t tmpCorrFactor = GetJetBackgroundCorrFactor(tmpJet->Eta(), ktBackgroundRhoMedian[fBackgroundEtaBins]);
-      FillHistogram("hAppliedEtaCorrectionFactor", tmpCorrFactor);
-      tmpCorrFactor = GetJetBackgroundCorrFactor(tmpJet->Eta(), ktBackground2RhoMedian[fBackgroundEtaBins]);
-      FillHistogram("hAppliedEtaCorrectionFactor2", tmpCorrFactor);
-
-      // Signal jet vs. signal jet
-      for (Int_t j = i+1; j<fNumberSignalJets; j++)
-      {
-        AliEmcalJet* tmpJet2 = fSignalJets[j];
-        FillHistogram("hJetDeltaPhi", GetDeltaPhi(tmpJet->Phi(), tmpJet2->Phi()));
-        FillHistogram("hJetDeltaPhiPt", GetDeltaPhi(tmpJet->Phi(), tmpJet2->Phi()), max(tmpJet->Pt(), tmpJet2->Pt()));
-
-        // ### Dijets II ###
-        if (IsDijet(tmpJet, tmpJet2)) // Gettin' the money
-        {
-          FillHistogram("hDijet2ConstituentsPt", tmpJet->Pt()); FillHistogram("hDijet2ConstituentsPt", tmpJet2->Pt());
-          FillHistogram("hDijet2LeadingJetPt", fFirstLeadingJet->Pt());
-          FillHistogram("hDijet2PtCorrelation", tmpJet->Pt(), tmpJet2->Pt());
-        }
-      }
+      FillHistogram("hLeadingJetPt", fFirstLeadingJet->Pt());
+      FillHistogram("hCorrectedLeadingJetPt", GetCorrectedJetPt(fFirstLeadingJet,backgroundKTImprovedCMS));
     }
+    if (fSecondLeadingJet)
+    {
+      FillHistogram("hSecondLeadingJetPt", fSecondLeadingJet->Pt());
+      FillHistogram("hCorrectedSecondLeadingJetPt", GetCorrectedJetPt(fSecondLeadingJet,backgroundKTImprovedCMS));
+    }
+
   } //endif AnalyzeJets
 
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Calculate:Jets done" << std::endl;
+    AliInfo("Calculate()::Jets done.");
   #endif
   ////////////////////// NOTE: Background analysis
 
   if (fAnalyzeBackground)
   {
+    // Calculate background in centrality classes
+    FillHistogram("hKTBackgroundImprovedCMS", backgroundKTImprovedCMS, centralityPercentile);
 
-    Int_t leadingJetIds[] = {-1, -1};
-    GetLeadingJets(fBackgroundJetArray, &leadingJetIds[0], kFALSE);
+    FillHistogram("hKTBackgroundImprovedCMSExternal", backgroundKTImprovedCMSExternal, centralityPercentile);
 
-    for (Int_t i = 0; i < fBackgroundJetArray->GetEntries(); i++)
-    {
-      AliEmcalJet* jet = static_cast<AliEmcalJet*>(fBackgroundJetArray->At(i));
-      if (!jet)
-      {
-        AliError(Form("%s: Could not receive kt jet %d", GetName(), i));
-        continue;
-      }
-      if (!IsBackgroundJetInAcceptance(jet))
-        continue;
-      if (!((jet->Eta() >= -fBackgroundJetEtaWindow) && (jet->Eta() < fBackgroundJetEtaWindow)))
-        continue;
-      
-      FillHistogram("hKTJetPhiEta", jet->Phi(),jet->Eta());
-      if(i==leadingJetIds[0])
-        FillHistogram("hKTLeadingJetPhiEta", jet->Phi(),jet->Eta());
-            
-    }
+    FillHistogram("hKTMeanBackgroundImprovedCMS", centralityPercentile, backgroundKTImprovedCMS);
 
-    // ############# RC, Track, and KT background calculations
-    Double_t etaMin = 0;
-    for (Int_t i=0;i<fBackgroundEtaBins;i++)
+    // In case of dijets -> look at the background
+    if (backgroundDijet >= 0)
+      FillHistogram("hDijetBackground", backgroundDijet, centralityPercentile); 
+    if (backgroundDijetPerpendicular >= 0)
+      FillHistogram("hDijetBackgroundPerpendicular", backgroundDijetPerpendicular, centralityPercentile); 
+    
+    if(fAnalyzeDeprecatedBackgrounds)
     {
-      etaMin = -(fTrackEtaWindow-fRandConeRadius) + 2*(fTrackEtaWindow-fRandConeRadius)/fBackgroundEtaBins *  (i+0.5);
-      FillHistogram("hRCBackground", etaMin, rcBackgroundRhoMean[i]);
-      FillHistogram("hTrackBackground", etaMin, trackBackgroundRhoMean[i]);
-      FillHistogram("hKTBackground", etaMin, ktBackgroundRhoMedian[i]);
-      FillHistogram("hKTBackground2", etaMin, ktBackground2RhoMedian[i]);
-      if(centralityPercentile <= 20.)
-      {
-        FillHistogram("hRCBackgroundMostCentral", etaMin, rcBackgroundRhoMean[i]);
-        FillHistogram("hTrackBackgroundMostCentral", etaMin, trackBackgroundRhoMean[i]);
-        FillHistogram("hKTBackgroundMostCentral", etaMin, ktBackgroundRhoMedian[i]);
-        FillHistogram("hKTBackground2MostCentral", etaMin, ktBackground2RhoMedian[i]);
-      }
-      else if(centralityPercentile >= 80.)
-      {
-        FillHistogram("hRCBackgroundMostPeripheral", etaMin, rcBackgroundRhoMean[i]);
-        FillHistogram("hTrackBackgroundMostPeripheral", etaMin, trackBackgroundRhoMean[i]);
-        FillHistogram("hKTBackgroundMostPeripheral", etaMin, ktBackgroundRhoMedian[i]);
-        FillHistogram("hKTBackground2MostPeripheral", etaMin, ktBackground2RhoMedian[i]);
-      }
+      FillHistogram("hKTBackgroundPbPb", backgroundKTPbPb, centralityPercentile);
+      FillHistogram("hKTBackgroundPbPbWithGhosts", backgroundKTPbPbWithGhosts, centralityPercentile);
+      FillHistogram("hKTBackgroundCMS", backgroundKTCMS, centralityPercentile);
+      FillHistogram("hKTBackgroundMean", backgroundKTMean, centralityPercentile);
+      FillHistogram("hKTBackgroundTrackLike", backgroundKTTrackLike, centralityPercentile);
+
+      FillHistogram("hTRBackgroundNoExcl", backgroundTRNoExcl, centralityPercentile);
+      FillHistogram("hTRBackgroundCone02", backgroundTRCone02, centralityPercentile);
+      FillHistogram("hTRBackgroundCone04", backgroundTRCone04, centralityPercentile);
+      FillHistogram("hTRBackgroundCone06", backgroundTRCone06, centralityPercentile);
+      FillHistogram("hTRBackgroundCone08", backgroundTRCone08, centralityPercentile);
+      FillHistogram("hTRBackgroundExact", backgroundTRExact, centralityPercentile);
+
+      // Calculate background profiles in terms of centrality
+      FillHistogram("hKTMeanBackgroundPbPb", centralityPercentile,  backgroundKTPbPb);
+      FillHistogram("hKTMeanBackgroundPbPbWithGhosts", centralityPercentile,  backgroundKTPbPbWithGhosts);
+      FillHistogram("hKTMeanBackgroundCMS", centralityPercentile, backgroundKTCMS);
+      FillHistogram("hKTMeanBackgroundMean", centralityPercentile, backgroundKTMean);
+      FillHistogram("hKTMeanBackgroundTPC", centralityPercentile, backgroundKTTrackLike);
+      FillHistogram("hTRMeanBackground", centralityPercentile,  backgroundTRCone06);
     }
 
-    FillHistogram("hRCBackgroundVsCentrality", rcBackgroundRhoMean[fBackgroundEtaBins], centralityPercentile);
-    FillHistogram("hTrackBackgroundVsCentrality", trackBackgroundRhoMean[fBackgroundEtaBins], centralityPercentile);
-    FillHistogram("hKTBackgroundVsCentrality", ktBackgroundRhoMedian[fBackgroundEtaBins], centralityPercentile);
-    FillHistogram("hKTBackground2VsCentrality", ktBackground2RhoMedian[fBackgroundEtaBins], centralityPercentile);
 
-    if (dijetBackground >= 0)
-    {
-      // Background in Dijet events
-      FillHistogram("hDijetBackground", dijetBackground); 
-      if(centralityPercentile <= 20.)
-        FillHistogram("hDijetBackgroundMostCentral", dijetBackground); 
-      FillHistogram("hDijetBackgroundVsCentrality", dijetBackground, centralityPercentile);
-    }
-    if (dijetBackgroundPerpendicular >= 0)
+    // Calculate the delta pt
+    Double_t tmpDeltaPtNoBackground = GetDeltaPt(0.0);
+    Double_t tmpDeltaPtKTImprovedCMS = GetDeltaPt(backgroundKTImprovedCMS);
+
+    Double_t tmpDeltaPtKTImprovedCMSPartialExclusion = 0.0;
+    if(fNcoll)
+      tmpDeltaPtKTImprovedCMSPartialExclusion = GetDeltaPt(backgroundKTImprovedCMS, 1.0/fNcoll);
+    else
+      tmpDeltaPtKTImprovedCMSPartialExclusion = GetDeltaPt(backgroundKTImprovedCMS, 1.0);
+
+    Double_t tmpDeltaPtKTImprovedCMSPartialExclusion_Signal = 0.0;
+    if(fNumberSignalJets)
+      tmpDeltaPtKTImprovedCMSPartialExclusion_Signal = GetDeltaPt(backgroundKTImprovedCMS, 1.0/fNumberSignalJets);
+    else
+      tmpDeltaPtKTImprovedCMSPartialExclusion_Signal = GetDeltaPt(backgroundKTImprovedCMS, 1.0);
+    Double_t tmpDeltaPtKTImprovedCMSFullExclusion = GetDeltaPt(backgroundKTImprovedCMS, 1.0);
+
+    Double_t tmpDeltaPtKTPbPb = 0;
+    Double_t tmpDeltaPtKTPbPbWithGhosts = 0;
+    Double_t tmpDeltaPtKTCMS = 0;
+    Double_t tmpDeltaPtKTMean = 0;
+    Double_t tmpDeltaPtKTTrackLike = 0;
+    Double_t tmpDeltaPtTR = 0;
+
+    if(fAnalyzeDeprecatedBackgrounds)
     {
-      // Background in Dijet events
-      FillHistogram("hDijetBackgroundPerpendicular", dijetBackgroundPerpendicular); 
-      if(centralityPercentile <= 20.)
-        FillHistogram("hDijetBackgroundPerpendicularMostCentral", dijetBackgroundPerpendicular); 
-      FillHistogram("hDijetBackgroundPerpendicularVsCentrality", dijetBackgroundPerpendicular, centralityPercentile);
+      tmpDeltaPtKTPbPb = GetDeltaPt(backgroundKTPbPb);
+      tmpDeltaPtKTPbPbWithGhosts = GetDeltaPt(backgroundKTPbPbWithGhosts);
+      tmpDeltaPtKTCMS = GetDeltaPt(backgroundKTCMS);
+      tmpDeltaPtKTMean = GetDeltaPt(backgroundKTMean);
+      tmpDeltaPtKTTrackLike = GetDeltaPt(backgroundKTTrackLike);
+      tmpDeltaPtTR = GetDeltaPt(backgroundTRCone06);
     }
 
-    // ########## Delta pT calculations (most central, kt is eta corrected)
-    if (centralityPercentile <= 20.)
+    // If valid, fill the delta pt histograms
+
+    if(tmpDeltaPtKTImprovedCMS > -10000.0)
+      FillHistogram("hDeltaPtKTImprovedCMS", tmpDeltaPtKTImprovedCMS, centralityPercentile);
+    if(tmpDeltaPtKTImprovedCMSPartialExclusion > -10000.0)
+      FillHistogram("hDeltaPtKTImprovedCMSPartialExclusion", tmpDeltaPtKTImprovedCMSPartialExclusion, centralityPercentile);
+    if(tmpDeltaPtKTImprovedCMSPartialExclusion_Signal > -10000.0)
+      FillHistogram("hDeltaPtKTImprovedCMSPartialExclusion_Signal", tmpDeltaPtKTImprovedCMSPartialExclusion_Signal, centralityPercentile);
+    if(tmpDeltaPtKTImprovedCMSFullExclusion > -10000.0)
+      FillHistogram("hDeltaPtKTImprovedCMSFullExclusion", tmpDeltaPtKTImprovedCMSFullExclusion, centralityPercentile);
+
+    if(tmpDeltaPtNoBackground > 0.000001)
+      FillHistogram("hDeltaPtNoBackgroundNoEmptyCones", tmpDeltaPtNoBackground, centralityPercentile);
+    else if(tmpDeltaPtNoBackground > -10000.0)
+      FillHistogram("hDeltaPtNoBackground", tmpDeltaPtNoBackground, centralityPercentile);
+
+
+    if(fAnalyzeDeprecatedBackgrounds)
     {
-      Double_t tmpDeltaPtKT, tmpDeltaPtKT2Excl, tmpDeltaPtKT1Excl;
-      Double_t tmpDeltaPtKTEta, tmpDeltaPtKTEta2Excl, tmpDeltaPtKTEta1Excl, tmpDeltaPtKT2Eta2Excl;
-      Double_t tmpDeltaPtRC, tmpDeltaPtRC2Excl, tmpDeltaPtRC1Excl;
-      Double_t tmpDeltaPtTR, tmpDeltaPtTR2Excl, tmpDeltaPtTR1Excl;
-
-      GetDeltaPt(tmpDeltaPtKT, ktBackgroundRhoMedian[fBackgroundEtaBins], 0, -1, kTRUE);
-      GetDeltaPt(tmpDeltaPtKTEta, ktBackgroundRhoMedian[fKTDeltaPtEtaBin], 0, fKTDeltaPtEtaBin);
-      GetDeltaPt(tmpDeltaPtRC, rcBackgroundRhoMean[fBackgroundEtaBins], 0);
-      GetDeltaPt(tmpDeltaPtTR, trackBackgroundRhoMean[fBackgroundEtaBins], 0);
-
-      GetDeltaPt(tmpDeltaPtKT1Excl, ktBackgroundRhoMedian[fBackgroundEtaBins], 1, -1, kTRUE);
-      GetDeltaPt(tmpDeltaPtKTEta1Excl, ktBackgroundRhoMedian[fKTDeltaPtEtaBin], 1, fKTDeltaPtEtaBin);
-      GetDeltaPt(tmpDeltaPtRC1Excl, rcBackgroundRhoMean[fBackgroundEtaBins], 1);
-      GetDeltaPt(tmpDeltaPtTR1Excl, trackBackgroundRhoMean[fBackgroundEtaBins], 1);
-
-      GetDeltaPt(tmpDeltaPtKT2Excl, ktBackgroundRhoMedian[fBackgroundEtaBins], 2, -1, kTRUE);
-      GetDeltaPt(tmpDeltaPtKTEta2Excl, ktBackgroundRhoMedian[fKTDeltaPtEtaBin], 2, fKTDeltaPtEtaBin);
-      GetDeltaPt(tmpDeltaPtRC2Excl, rcBackgroundRhoMean[fBackgroundEtaBins], 2);
-      GetDeltaPt(tmpDeltaPtTR2Excl, trackBackgroundRhoMean[fBackgroundEtaBins], 2);
-
-      GetDeltaPt(tmpDeltaPtKT2Eta2Excl, ktBackground2RhoMedian[fKTDeltaPtEtaBin], 2, fKTDeltaPtEtaBin);
-
-      // kT Background
-      if(tmpDeltaPtKT > -10000.0)
-        FillHistogram("hDeltaPtKT", tmpDeltaPtKT);
-      if(tmpDeltaPtKT1Excl > -10000.0)
-        FillHistogram("hDeltaPtKT1Excl", tmpDeltaPtKT1Excl);
-      if(tmpDeltaPtKT2Excl > -10000.0)
-        FillHistogram("hDeltaPtKT2Excl", tmpDeltaPtKT2Excl);
-
-      if(tmpDeltaPtKT > -10000.0)
-        FillHistogram("hDeltaPtKTEta", tmpDeltaPtKTEta);
-      if(tmpDeltaPtKTEta1Excl > -10000.0)
-        FillHistogram("hDeltaPtKTEta1Excl", tmpDeltaPtKTEta1Excl);
-      if(tmpDeltaPtKTEta2Excl > -10000.0)
-        FillHistogram("hDeltaPtKTEta2Excl", tmpDeltaPtKTEta2Excl);
-      if(tmpDeltaPtKT2Eta2Excl > -10000.0)
-        FillHistogram("hDeltaPtKT2Eta2Excl", tmpDeltaPtKT2Eta2Excl);
-
-      // RC Background
-      if(tmpDeltaPtRC > -10000.0)
-        FillHistogram("hDeltaPtRC", tmpDeltaPtRC);
-      if(tmpDeltaPtRC1Excl > -10000.0)
-        FillHistogram("hDeltaPtRC1Excl", tmpDeltaPtRC1Excl);
-      if(tmpDeltaPtRC2Excl > -10000.0)
-        FillHistogram("hDeltaPtRC2Excl", tmpDeltaPtRC2Excl);
-      // TR Background
+      if(tmpDeltaPtKTPbPb > -10000.0)
+        FillHistogram("hDeltaPtKTPbPb", tmpDeltaPtKTPbPb, centralityPercentile);
+      if(tmpDeltaPtKTPbPbWithGhosts > -10000.0)
+        FillHistogram("hDeltaPtKTPbPbWithGhosts", tmpDeltaPtKTPbPbWithGhosts, centralityPercentile);
+      if(tmpDeltaPtKTCMS > -10000.0)
+        FillHistogram("hDeltaPtKTCMS", tmpDeltaPtKTCMS, centralityPercentile);
+      if(tmpDeltaPtKTMean > -10000.0)
+        FillHistogram("hDeltaPtKTMean", tmpDeltaPtKTMean, centralityPercentile);
+      if(tmpDeltaPtKTTrackLike > -10000.0)
+        FillHistogram("hDeltaPtKTTrackLike", tmpDeltaPtKTTrackLike, centralityPercentile);
+
       if(tmpDeltaPtTR > -10000.0)
-        FillHistogram("hDeltaPtTR", tmpDeltaPtTR);
-      if(tmpDeltaPtTR1Excl > -10000.0)
-        FillHistogram("hDeltaPtTR1Excl", tmpDeltaPtTR1Excl);
-      if(tmpDeltaPtTR2Excl > -10000.0)
-        FillHistogram("hDeltaPtTR2Excl", tmpDeltaPtTR2Excl);
+        FillHistogram("hDeltaPtTR", tmpDeltaPtTR, centralityPercentile);
     }
   }
   
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Calculate:Bckgrd done" << std::endl;
+    AliInfo("Calculate()::Background done.");
+  #endif
+  
+  ////////////////////// NOTE: Pythia histograms
+  if(fAnalyzePythia)
+  {
+    FillHistogram("hPythiaPtHard", GetPtHard());
+    FillHistogram("hPythiaNTrials", GetPtHardBin()+0.1, GetPythiaTrials());
+    FillHistogram("hPythiaXSection", GetPtHardBin()+0.1, fCrossSection);
+
+        #ifdef DEBUGMODE
+      AliInfo("Calculate()::Pythia done.");
+    #endif
+  }
+  #ifdef DEBUGMODE
+    AliInfo("Calculate() done.");
   #endif
-} 
+}
 
 //________________________________________________________________________
-Bool_t AliAnalysisTaskChargedJetsPA::Notify()
+Bool_t AliAnalysisTaskChargedJetsPA::UserNotify()
 {
   // Implemented Notify() to read the cross sections
   // and number of trials from pyxsec.root
   // 
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": Notify started." << std::endl;
+    AliInfo("UserNotify started.");
   #endif
 
   if(fAnalyzePythia)
@@ -1433,10 +1621,6 @@ Bool_t AliAnalysisTaskChargedJetsPA::Notify()
       // not an archive take the basename....
       file.ReplaceAll(gSystem->BaseName(file.Data()),"");
     }
-    #ifdef DEBUGMODE
-      std::cout << "Task " << GetName() << ": Notify::Filename=" << file.Data() << std::endl;
-    #endif
-    
    
     TFile *fxsec = TFile::Open(Form("%s%s",file.Data(),"pyxsec.root")); // problem that we cannot really test the existance of a file in a archive so we have to lvie with open error message from root
     if(!fxsec){
@@ -1478,22 +1662,94 @@ Bool_t AliAnalysisTaskChargedJetsPA::Notify()
       fCrossSection = xsection;
       fxsec->Close();
     }
-    #ifdef DEBUGMODE
-      std::cout << "Task " << GetName() << ": Notify::fCrossSection=" << fCrossSection << std::endl;
-      std::cout << "Task " << GetName() << ": Notify::fTrials=" << fTrials << std::endl;
-      std::cout << "Task " << GetName() << ": Notify ended." << std::endl;
-    #endif
   }
+  #ifdef DEBUGMODE
+    AliInfo("UserNotify ended.");
+  #endif
   return kTRUE;
 }
 
+
+//________________________________________________________________________
+inline Double_t AliAnalysisTaskChargedJetsPA::EtaToTheta(Double_t arg)
+  {return 2.*atan(exp(-arg));} 
+//________________________________________________________________________
+inline Double_t AliAnalysisTaskChargedJetsPA::ThetaToEta(Double_t arg)
+{
+  if ((arg > TMath::Pi()) || (arg < 0.0))
+  {
+    AliError(Form("ThetaToEta got wrong input! (%f)", arg));
+    return 0.0;
+  }
+  return -log(tan(arg/2.));
+}
+//________________________________________________________________________
+inline Double_t AliAnalysisTaskChargedJetsPA::GetDeltaPhi(Double_t phi1, Double_t phi2)
+  {return min(TMath::Abs(phi1-phi2),TMath::TwoPi() - TMath::Abs(phi1-phi2));}
+
+//________________________________________________________________________
+Double_t AliAnalysisTaskChargedJetsPA::MCGetOverlapCircleRectancle(Double_t cPosX, Double_t cPosY, Double_t cRadius, Double_t rPosXmin, Double_t rPosXmax, Double_t rPosYmin, Double_t rPosYmax)
+{
+  const Int_t kTests = 1000;
+  Int_t hits = 0;
+  TRandom3 randomGen(0);
+  // Loop over kTests-many tests
+  for (Int_t i=0; i<kTests; i++)
+  {
+    //Choose random position in rectangle for the tester
+    Double_t tmpTestX = randomGen.Uniform(rPosXmin, rPosXmax);
+    Double_t tmpTestY = randomGen.Uniform(rPosYmin, rPosYmax);
+
+    //Check, if tester is in circle. If yes, increment circle counter.
+    Double_t tmpDistance = TMath::Sqrt( (tmpTestX - cPosX)*(tmpTestX - cPosX) + (tmpTestY - cPosY)*(tmpTestY - cPosY) );
+    if(tmpDistance < cRadius)
+      hits++;
+  }
+
+  // return ratio
+  return (static_cast<Double_t>(hits)/static_cast<Double_t>(kTests));
+}
+
+//________________________________________________________________________
+Double_t AliAnalysisTaskChargedJetsPA::MCGetOverlapMultipleCirclesRectancle(Int_t numCircles, std::vector<Double_t> cPosX, std::vector<Double_t> cPosY, Double_t cRadius, Double_t rPosXmin, Double_t rPosXmax, Double_t rPosYmin, Double_t rPosYmax)
+{
+
+  const Int_t kTests = 1000;
+  Int_t hits = 0;
+  TRandom3 randomGen(0);
+  // Loop over kTests-many tests
+  for (Int_t i=0; i<kTests; i++)
+  {
+    //Choose random position in rectangle for the tester
+    Double_t tmpTestX = randomGen.Uniform(rPosXmin, rPosXmax);
+    Double_t tmpTestY = randomGen.Uniform(rPosYmin, rPosYmax);
+
+    //Check, if tester is in one of the circles. If yes, increment circle counter.
+    for(Int_t j=0; j<numCircles; j++)
+    {
+      Double_t tmpDistance = TMath::Sqrt( (tmpTestX - cPosX[j])*(tmpTestX - cPosX[j]) + (tmpTestY - cPosY[j])*(tmpTestY - cPosY[j]) );
+      if(tmpDistance < cRadius)
+      {
+        hits++;
+        break;
+      }
+    }
+  }
+
+  // return ratio
+  return (static_cast<Double_t>(hits)/static_cast<Double_t>(kTests));
+
+}
+
 //________________________________________________________________________
 inline void AliAnalysisTaskChargedJetsPA::FillHistogram(const char * key, Double_t x)
 {
   TH1* tmpHist = static_cast<TH1*>(fOutputList->FindObject(GetHistoName(key)));
   if(!tmpHist)
   {
-    AliInfo(Form("Cannot find histogram <%s> ",key)) ;
+    AliError(Form("Cannot find histogram <%s> ",key)) ;
     return;
   }
 
@@ -1506,7 +1762,7 @@ inline void AliAnalysisTaskChargedJetsPA::FillHistogram(const char * key, Double
   TH1* tmpHist = static_cast<TH1*>(fOutputList->FindObject(GetHistoName(key)));
   if(!tmpHist)
   {
-    AliInfo(Form("Cannot find histogram <%s> ",key));
+    AliError(Form("Cannot find histogram <%s> ",key));
     return;
   }
 
@@ -1522,7 +1778,7 @@ inline void AliAnalysisTaskChargedJetsPA::FillHistogram(const char * key, Double
   TH2* tmpHist = static_cast<TH2*>(fOutputList->FindObject(GetHistoName(key)));
   if(!tmpHist)
   {
-    AliInfo(Form("Cannot find histogram <%s> ",key));
+    AliError(Form("Cannot find histogram <%s> ",key));
     return;
   }
   
@@ -1593,10 +1849,16 @@ void AliAnalysisTaskChargedJetsPA::UserCreateOutputObjects()
   // Note: Saving to file with e.g. OpenFile(0) is must be before creating other objects.
 
   fRandom = new TRandom3(0);
-  
+
+
   fOutputList = new TList();
   fOutputList->SetOwner(); // otherwise it produces leaks in merging
 
+  // NOTE: Pythia histograms
+  AddHistogram1D<TProfile>("hPythiaXSection", "Pythia cross section distribution", "", fNumPtHardBins+1, 0, fNumPtHardBins+1, "p_{T} hard bin","dN^{Events}/dp_{T,hard}");
+  AddHistogram1D<TH1D>("hPythiaNTrials", "Pythia trials (no correction for manual cuts)", "", fNumPtHardBins+1, 0, fNumPtHardBins+1, "p_{T} hard bin", "Trials");
+
+
   PostData(1, fOutputList);
 }
 
@@ -1604,9 +1866,18 @@ void AliAnalysisTaskChargedJetsPA::UserCreateOutputObjects()
 void AliAnalysisTaskChargedJetsPA::UserExec(Option_t *) 
 {
   #ifdef DEBUGMODE
-    std::cout << "Task " << GetName() << ": UserExec started." << std::endl;
+    AliInfo("UserExec() started.");
   #endif
 
+  if (!InputEvent())
+  {
+    AliError("??? Event pointer == 0 ???");
+    return;
+  }
+
+  if (!fInitialized)
+    ExecOnce(); // Get tracks, jets, background from arrays if not already given + Init Histos
+  
   Calculate(InputEvent());
         
   PostData(1, fOutputList);