]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
Adding TPRofiles for mean and sigma(pT), clean up of EP from tracks, added EP from...
[u/mrichter/AliRoot.git] / PWG4 / JetTasks / AliAnalysisTaskJetSpectrum2.cxx
index 0b58276d35ca84442fe5fc4d2cd2f0958ea5568b..49fcf9007a4ff851891b6aa1f2583ae0a5fb845b 100644 (file)
@@ -1,6 +1,5 @@
-
 // **************************************
-// Task used for the correction of determiantion of reconstructed jet spectra
+// used for the correction of determiantion of reconstructed jet spectra
 // Compares input (gen) and output (rec) jets   
 // *******************************************
 
@@ -23,6 +22,7 @@
  
 #include <TROOT.h>
 #include <TRandom.h>
+#include <TRandom3.h>
 #include <TSystem.h>
 #include <TInterpreter.h>
 #include <TChain.h>
 #include <TH2F.h>
 #include <TH3F.h>
 #include <TProfile.h>
+#include <TProfile2D.h>
 #include <TList.h>
 #include <TLorentzVector.h>
 #include <TClonesArray.h>
+#include <TRefArray.h>
 #include  "TDatabasePDG.h"
 
 #include "AliAnalysisTaskJetSpectrum2.h"
 #include "AliAnalysisManager.h"
 #include "AliJetFinder.h"
+#include "AliTHn.h"
 #include "AliJetHeader.h"
 #include "AliJetReader.h"
 #include "AliJetReaderHeader.h"
 
 ClassImp(AliAnalysisTaskJetSpectrum2)
 
-AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(): AliAnalysisTaskSE(),
+AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(): 
+  AliAnalysisTaskSE(),
   fJetHeaderRec(0x0),
   fJetHeaderGen(0x0),
   fAODIn(0x0),
   fAODOut(0x0),
   fAODExtension(0x0),
+  fhnJetContainer(0x0),
   fhnCorrelation(0x0),
-  fhnCorrelationPhiZRec(0x0),
+  fhnEvent(0x0),
   f1PtScale(0x0),
   fBranchRec("jets"),
   fBranchGen(""),
-  fBranchBkg(""), 
+  fBranchBkgRec(""), 
+  fBranchBkgGen(""), 
   fNonStdFile(""),
+  fRandomizer(0x0),
   fUseAODJetInput(kFALSE),
   fUseAODTrackInput(kFALSE),
   fUseAODMCInput(kFALSE),
   fUseGlobalSelection(kFALSE),
   fUseExternalWeightOnly(kFALSE),
   fLimitGenJetEta(kFALSE),
-  fBkgSubtraction(kFALSE),
+  fDoMatching(kFALSE),
   fNMatchJets(5),
-  fFillCorrBkg(0),
+  fNRPBins(3),
   fFilterMask(0),
   fEventSelectionMask(0),
   fAnalysisType(0),
   fTrackTypeRec(kTrackUndef),
   fTrackTypeGen(kTrackUndef),
   fEventClass(0),
+  fRPMethod(0),
   fAvgTrials(1),
   fExternalWeight(1),    
   fJetRecEtaWindow(0.5),
@@ -99,90 +107,45 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(): AliAnalysisTaskSE(),
   fMinJetPt(0),
   fMinTrackPt(0.15),
   fDeltaPhiWindow(90./180.*TMath::Pi()),
+  fCentrality(100),
+  fRPAngle(0),
+  fMultRec(0),
+  fMultGen(0),
   fh1Xsec(0x0),
   fh1Trials(0x0),
   fh1PtHard(0x0),
   fh1PtHardNoW(0x0),  
   fh1PtHardTrials(0x0),
   fh1ZVtx(0x0),
-  fh1NGenJets(0x0),
-  fh1NRecJets(0x0),
-  fh1PtTrackRec(0x0),   
-  fh1SumPtTrackRec(0x0),  
-  fh1SumPtTrackAreaRec(0x0),  
+  fh1RP(0x0),
+  fh1Centrality(0x0),
   fh1TmpRho(0x0),
-  fh1PtJetsRecIn(0x0),
-  fh1PtJetsGenIn(0x0),
-  fh1PtJetsLeadingRecIn(0x0),
-  fh1PtTracksRecIn(0x0),
-  fh1PtTracksLeadingRecIn(0x0),
-  fh1PtTracksGenIn(0x0),
-  fh2NRecJetsPt(0x0),
-  fh2NRecTracksPt(0x0),
-  fh2NGenJetsPt(0x0),
-  fh2NGenTracksPt(0x0),
+  fh2MultRec(0x0),
+  fh2MultGen(0x0),
+  fh2RPCentrality(0x0),
   fh2PtFGen(0x0),
   fh2RelPtFGen(0x0),
-  fh1Bkg1(0x0),
-  fh1Bkg2(0x0),
-  fh1Bkg3(0x0),
-  fh1Sigma1(0x0),
-  fh1Sigma2(0x0),
-  fh1Sigma3(0x0),
-  fh1Area1(0x0),
-  fh1Area2(0x0),
-  fh1Area3(0x0),
-  fh1Ptjet(0x0),
-  fh1Ptjetsub1(0x0),
-  fh1Ptjetsub2(0x0),
-  fh1Ptjetsub3(0x0), 
-  fh1Ptjethardest(0x0),
-  fh1Ptjetsubhardest1(0x0),
-  fh1Ptjetsubhardest2(0x0),
-  fh1Ptjetsubhardest3(0x0),
-  fh2Rhovspthardest1(0x0), 
-  fh2Rhovspthardest2(0x0),
-  fh2Rhovspthardest3(0x0),
-  fh2Errorvspthardest1(0x0), 
-  fh2Errorvspthardest2(0x0),
-  fh2Errorvspthardest3(0x0),
   fHistList(0x0)  
 {
-  for(int i = 0;i < kMaxStep*2;++i){
-    fhnJetContainer[i] = 0;
-  }
-  for(int i = 0;i < kMaxJets;++i){
-    fh1PtRecIn[i] = fh1PtGenIn[i] = 0;
-    
-    fh2RhoPtRec[i] = 0; 
-    fh2RhoPtGen[i] = 0; 
-    fh2PsiPtGen[i] = 0; 
-    fh2PsiPtRec[i] = 0;
-    fh2FragRec[i] = 0;
-    fh2FragLnRec[i] = 0;
-    fh2FragGen[i] = 0;
-    fh2FragLnGen[i] = 0;
-  }  
 
   for(int ij = 0;ij <kJetTypes;++ij){    
+    fFlagJetType[ij] = 1; // default = on
     fh1NJets[ij] = 0;
     fh1SumPtTrack[ij] = 0;
     fh1PtJetsIn[ij] = 0;
     fh1PtTracksIn[ij] = 0;
-    fh1PtTracksLeadingIn[ij] = 0;
+    fh1PtTracksInLow[ij] = 0;
     fh2NJetsPt[ij]  = 0;
     fh2NTracksPt[ij]  = 0;
-    fh2LeadingJetPtJetPhi[ij] = 0;
-    fh2LeadingTrackPtTrackPhi[ij] = 0;
-    for(int i = 0;i < kMaxJets;++i){
-      fh2PhiPt[ij][i] = 0;
-      fh2EtaPt[ij][i] = 0;
-      fh2PhiEta[ij][i] = 0; 
-      
+    fp2MultRPPhiTrackPt[ij] = 0;
+    fp2CentRPPhiTrackPt[ij] = 0;
+    fhnJetPt[ij] = 0;
+    fhnJetPtQA[ij] = 0;
+    fhnTrackPt[ij] = 0;
+    fhnTrackPtQA[ij] = 0;
+    for(int i = 0;i <= kMaxJets;++i){
+      fh2LTrackPtJetPt[ij][i] = 0;
       fh1PtIn[ij][i] = 0;
-      fh2RhoPt[ij][i] = 0;
-      fh2PsiPt[ij][i] = 0;
     }
 
     fh1DijetMinv[ij] = 0;      
@@ -201,28 +164,32 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
   fAODIn(0x0),
   fAODOut(0x0),
   fAODExtension(0x0),
+  fhnJetContainer(0x0),
   fhnCorrelation(0x0),
-  fhnCorrelationPhiZRec(0x0),
+  fhnEvent(0x0),
   f1PtScale(0x0),
   fBranchRec("jets"),
   fBranchGen(""),
-  fBranchBkg(""),
+  fBranchBkgRec(""),
+  fBranchBkgGen(""),
   fNonStdFile(""),
+  fRandomizer(0x0),
   fUseAODJetInput(kFALSE),
   fUseAODTrackInput(kFALSE),
   fUseAODMCInput(kFALSE),
   fUseGlobalSelection(kFALSE),
   fUseExternalWeightOnly(kFALSE),
   fLimitGenJetEta(kFALSE),
-  fBkgSubtraction(kFALSE),
+  fDoMatching(kFALSE),
   fNMatchJets(5),
-  fFillCorrBkg(0),
+  fNRPBins(3),
   fFilterMask(0),
   fEventSelectionMask(0),
   fAnalysisType(0),
   fTrackTypeRec(kTrackUndef),
   fTrackTypeGen(kTrackUndef),
   fEventClass(0),
+  fRPMethod(0),
   fAvgTrials(1),
   fExternalWeight(1),    
   fJetRecEtaWindow(0.5),
@@ -230,90 +197,45 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
   fMinJetPt(0),
   fMinTrackPt(0.15),
   fDeltaPhiWindow(90./180.*TMath::Pi()),
+  fCentrality(100),
+  fRPAngle(0),
+  fMultRec(0),
+  fMultGen(0),
   fh1Xsec(0x0),
   fh1Trials(0x0),
   fh1PtHard(0x0),
   fh1PtHardNoW(0x0),  
   fh1PtHardTrials(0x0),
   fh1ZVtx(0x0),
-  fh1NGenJets(0x0),
-  fh1NRecJets(0x0),
-  fh1PtTrackRec(0x0),   
-  fh1SumPtTrackRec(0x0),  
-  fh1SumPtTrackAreaRec(0x0),  
+  fh1RP(0x0),
+  fh1Centrality(0x0),
   fh1TmpRho(0x0),
-  fh1PtJetsRecIn(0x0),
-  fh1PtJetsGenIn(0x0),
-  fh1PtJetsLeadingRecIn(0x0),
-  fh1PtTracksRecIn(0x0),
-  fh1PtTracksLeadingRecIn(0x0),
-  fh1PtTracksGenIn(0x0),
-  fh2NRecJetsPt(0x0),
-  fh2NRecTracksPt(0x0),
-  fh2NGenJetsPt(0x0),
-  fh2NGenTracksPt(0x0),
+  fh2MultRec(0x0),
+  fh2MultGen(0x0),
+  fh2RPCentrality(0x0),
   fh2PtFGen(0x0),
   fh2RelPtFGen(0x0),
-  fh1Bkg1(0x0), 
-  fh1Bkg2(0x0),
-  fh1Bkg3(0x0),
-  fh1Sigma1(0x0),
-  fh1Sigma2(0x0),
-  fh1Sigma3(0x0),
-  fh1Area1(0x0),
-  fh1Area2(0x0),
-  fh1Area3(0x0),
-  fh1Ptjet(0x0),
-  fh1Ptjetsub1(0x0),      
-  fh1Ptjetsub2(0x0),   
-  fh1Ptjetsub3(0x0),     
-  fh1Ptjethardest(0x0),
-  fh1Ptjetsubhardest1(0x0),
-  fh1Ptjetsubhardest2(0x0),
-  fh1Ptjetsubhardest3(0x0),
-  fh2Rhovspthardest1(0x0),
-  fh2Rhovspthardest2(0x0),
-  fh2Rhovspthardest3(0x0),
-  fh2Errorvspthardest1(0x0),
-  fh2Errorvspthardest2(0x0),
-  fh2Errorvspthardest3(0x0),
   fHistList(0x0)
 {
 
-  for(int i = 0;i < kMaxStep*2;++i){
-    fhnJetContainer[i] = 0;
-  }  
-  for(int i = 0;i < kMaxJets;++i){
-    fh1PtRecIn[i] = fh1PtGenIn[i] = 0;
-    
-    fh2RhoPtRec[i] = 0; 
-    fh2RhoPtGen[i] = 0; 
-    fh2PsiPtGen[i] = 0; 
-    fh2PsiPtRec[i] = 0;
-    fh2FragRec[i] = 0;
-    fh2FragLnRec[i] = 0;
-    fh2FragGen[i] = 0;
-    fh2FragLnGen[i] = 0;
-  }
-
   for(int ij = 0;ij <kJetTypes;++ij){    
+    fFlagJetType[ij] = 1; // default = on
     fh1NJets[ij] = 0;
     fh1SumPtTrack[ij] = 0;
     fh1PtJetsIn[ij] = 0;
     fh1PtTracksIn[ij] = 0;
-    fh1PtTracksLeadingIn[ij] = 0;
+    fh1PtTracksInLow[ij] = 0;
     fh2NJetsPt[ij]  = 0;
     fh2NTracksPt[ij]  = 0;
-    fh2LeadingJetPtJetPhi[ij] = 0;
-    fh2LeadingTrackPtTrackPhi[ij] = 0;
-    for(int i = 0;i < kMaxJets;++i){
-      fh2PhiPt[ij][i] = 0;
-      fh2EtaPt[ij][i] = 0;
-      fh2PhiEta[ij][i] = 0; 
-
+    fp2MultRPPhiTrackPt[ij] = 0;
+    fp2CentRPPhiTrackPt[ij] = 0;
+    fhnJetPt[ij] = 0;
+    fhnJetPtQA[ij] = 0;
+    fhnTrackPt[ij] = 0;
+    fhnTrackPtQA[ij] = 0;
+    for(int i = 0;i <= kMaxJets;++i){
+      fh2LTrackPtJetPt[ij][i] = 0;
       fh1PtIn[ij][i] = 0;
-      fh2RhoPt[ij][i] = 0;
-      fh2PsiPt[ij][i] = 0;
     }
 
     fh1DijetMinv[ij] = 0;      
@@ -323,7 +245,7 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
     fh2DijetDifvsSum[ij] = 0;
   } 
 
- DefineOutput(1, TList::Class());  
 DefineOutput(1, TList::Class());  
 }
 
 
@@ -378,6 +300,7 @@ Bool_t AliAnalysisTaskJetSpectrum2::Notify()
     if(ftrials>=nEntries && nEntries>0.)fAvgTrials = ftrials/nEntries;
   }  
 
+  if(fDebug)Printf("Reading File %s",fInputHandler->GetTree()->GetCurrentFile()->GetName());
 
   return kTRUE;
 }
@@ -385,64 +308,64 @@ Bool_t AliAnalysisTaskJetSpectrum2::Notify()
 void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
 {
 
-
+  
   // Connect the AOD
 
-
-
-
   if (fDebug > 1) printf("AnalysisTaskJetSpectrum2::UserCreateOutputObjects() \n");
-
   OpenFile(1);
-  if(!fHistList)fHistList = new TList();
+  if(!fHistList)fHistList = new TList(); 
+  PostData(1, fHistList); // post data in any case once
+
+  if(!fRandomizer)fRandomizer = new TRandom3(0);
+
   fHistList->SetOwner(kTRUE);
-  Bool_t oldStatus = TH1::AddDirectoryStatus();
+  Bool_t oldStatus = TH1::AddDirectoryStatus(); 
   TH1::AddDirectory(kFALSE);
 
 
-  MakeJetContainer();
-  fHistList->Add(fhnCorrelation);
-  fHistList->Add(fhnCorrelationPhiZRec);
-  for(int i = 0;i<kMaxStep*2;++i)fHistList->Add(fhnJetContainer[i]);
+  
+  // event npsparse cent, mult
+  const Int_t nBinsSparse0 = 2;
+  const Int_t nBins0[nBinsSparse0] = {     100, 500};
+  const Double_t xmin0[nBinsSparse0]  = {    0,   0};
+  const Double_t xmax0[nBinsSparse0]  = {  100,5000};
+      
+
+  fhnEvent = new THnSparseF("fhnEvent",";cent;mult",nBinsSparse0,
+                           nBins0,xmin0,xmax0);
+  fHistList->Add(fhnEvent);
 
+  if(fDoMatching){
+    MakeJetContainer();
+    fHistList->Add(fhnCorrelation);
+    fHistList->Add(fhnJetContainer);
+  }
   //
   //  Histogram
     
-  const Int_t nBinPt = 320;
+
+
+  const Int_t nBinPt = 100;
   Double_t binLimitsPt[nBinPt+1];
   for(Int_t iPt = 0;iPt <= nBinPt;iPt++){
     if(iPt == 0){
       binLimitsPt[iPt] = 0.0;
     }
     else {// 1.0
-      binLimitsPt[iPt] =  binLimitsPt[iPt-1] + 1.0;
+      binLimitsPt[iPt] =  binLimitsPt[iPt-1] + 2.5;
     }
   }
-  
   const Int_t nBinPhi = 90;
   Double_t binLimitsPhi[nBinPhi+1];
   for(Int_t iPhi = 0;iPhi<=nBinPhi;iPhi++){
     if(iPhi==0){
-      binLimitsPhi[iPhi] = -1.*TMath::Pi();
+      binLimitsPhi[iPhi] = 0;
     }
     else{
       binLimitsPhi[iPhi] = binLimitsPhi[iPhi-1] + 1/(Float_t)nBinPhi * TMath::Pi()*2;
     }
   }
 
-
-  const Int_t nBinPhi2 = 360;
-  Double_t binLimitsPhi2[nBinPhi2+1];
-  for(Int_t iPhi2 = 0;iPhi2<=nBinPhi2;iPhi2++){
-    if(iPhi2==0){
-      binLimitsPhi2[iPhi2] = 0.;
-    }
-    else{
-      binLimitsPhi2[iPhi2] = binLimitsPhi2[iPhi2-1] + 1/(Float_t)nBinPhi2 * TMath::Pi()*2;
-    }
-  }
-
   const Int_t nBinEta = 40;
   Double_t binLimitsEta[nBinEta+1];
   for(Int_t iEta = 0;iEta<=nBinEta;iEta++){
@@ -457,98 +380,164 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
 
   fh1Xsec = new TProfile("fh1Xsec","xsec from pyxsec.root",1,0,1);
   fh1Xsec->GetXaxis()->SetBinLabel(1,"<#sigma>");
-   fHistList->Add(fh1Xsec);
-
+  fHistList->Add(fh1Xsec);
   fh1Trials = new TH1F("fh1Trials","trials root file",1,0,1);
   fh1Trials->GetXaxis()->SetBinLabel(1,"#sum{ntrials}");
   fHistList->Add(fh1Trials);
-
   fh1PtHard = new TH1F("fh1PtHard","PYTHIA Pt hard;p_{T,hard}",nBinPt,binLimitsPt);
   fHistList->Add(fh1PtHard);
-
   fh1PtHardNoW = new TH1F("fh1PtHardNoW","PYTHIA Pt hard no weight;p_{T,hard}",nBinPt,binLimitsPt);
   fHistList->Add(fh1PtHardNoW);
-  
   fh1PtHardTrials = new TH1F("fh1PtHardTrials","PYTHIA Pt hard weight with trials;p_{T,hard}",nBinPt,binLimitsPt);
   fHistList->Add(fh1PtHardTrials);
-
   
   fh1ZVtx = new TH1F("fh1ZVtx","z vtx;z_{vtx} (cm)",400,-20,20);
   fHistList->Add(fh1ZVtx);
 
-  fh2PtFGen = new TH2F("fh2PtFGen",Form("%s vs. %s;p_{T,gen};p_{T,rec}",fBranchRec.Data(),fBranchGen.Data()),nBinPt,binLimitsPt,nBinPt,binLimitsPt);
-  fHistList->Add(fh2PtFGen);
 
-  fh2RelPtFGen = new TH2F("fh2RelPtFGen",";p_{T,gen};p_{T,rec}-p_{T,gen}/p_{T,Gen}",nBinPt,binLimitsPt,241,-2.41,2.41);
-  fHistList->Add(fh2RelPtFGen);
+  fh1RP = new TH1F("fh1RP","RP;#Psi",440, -1.*TMath::Pi(), 2.*TMath::Pi());
+  fHistList->Add(fh1RP);
 
+  fh1Centrality = new TH1F("fh1Centrality","cent;cent (%)",103,-1,102);
+  fHistList->Add(fh1Centrality);
 
-    for(int ij = 0;ij <kJetTypes;++ij){    
-      TString cAdd = "";
-      TString cJetBranch = "";
-      if(ij==kJetRec){
-       cAdd = "Rec";
-       cJetBranch = fBranchRec.Data();
-      }
-      else if (ij==kJetGen){
-       cAdd = "Gen";
-       cJetBranch = fBranchGen.Data();
-      }
-
-      fh1NJets[ij] =new TH1F(Form("fh1N%sJets",cAdd.Data()),Form("N %s jets",cAdd.Data()),50,-0.5,49.5);
-      fHistList->Add(fh1NJets[ij]);
+  fh2MultRec = new TH2F("fh2MultRec","multiplicity rec;# tracks;# jetrefs",500,0,5000,500,0.,5000);
+  fHistList->Add(fh2MultRec);
+  fh2MultGen = new TH2F("fh2MultGen","multiplicity gen;# tracks;# jetrefs",400,0,5000,500,0.,5000);
+  fHistList->Add(fh2MultGen);
 
-      fh1PtJetsIn[ij]  = new TH1F(Form("fh1PtJets%sIn",cAdd.Data()),Form("%s jets p_T;p_{T} (GeV/c)",cAdd.Data()),nBinPt,binLimitsPt);
-      fHistList->Add(fh1PtJetsIn[ij]);
 
-      fh1PtTracksIn[ij] = new TH1F(Form("fh1PtTracks%sIn",cAdd.Data()),Form("%s track p_T;p_{T} (GeV/c)",cAdd.Data()),nBinPt,binLimitsPt);
-      fHistList->Add(fh1PtTracksIn[ij]);
+  fh2RPCentrality = new TH2F("fh2RPCentrality" ,"Reaction Plane Angle" , 20, 0.,100., 180, 0, TMath::Pi());
+  fHistList->Add(fh2RPCentrality);
 
-      fh1PtTracksLeadingIn[ij] = new TH1F(Form("fh1PtTracksLeading%sIn",cAdd.Data()),Form("%s track p_T;p_{T} (GeV/c)",cAdd.Data()),nBinPt,binLimitsPt);
-      fHistList->Add(fh1PtTracksLeadingIn[ij]);
+  fh2PtFGen = new TH2F("fh2PtFGen",Form("%s vs. %s;p_{T,gen};p_{T,rec}",fBranchRec.Data(),fBranchGen.Data()),nBinPt,binLimitsPt,nBinPt,binLimitsPt);
+  fHistList->Add(fh2PtFGen);
 
-      fh1SumPtTrack[ij] = new TH1F(Form("fh1SumPtTrack%s",cAdd.Data()),Form("Sum %s track p_T;p_{T} (GeV/c)",cAdd.Data()),nBinPt,binLimitsPt);
-      fHistList->Add(fh1SumPtTrack[ij]);
+  fh2RelPtFGen = new TH2F("fh2RelPtFGen",";p_{T,gen};p_{T,rec}-p_{T,gen}/p_{T,Gen}",nBinPt,binLimitsPt,241,-2.41,2.41);
+  fHistList->Add(fh2RelPtFGen);
+  
+  for(int ij = 0;ij <kJetTypes;++ij){    
+    TString cAdd = "";
+    TString cJetBranch = "";
+    if(ij==kJetRec){
+      cAdd = "Rec";
+      cJetBranch = fBranchRec.Data();
+    }
+    else if (ij==kJetGen){
+      cAdd = "Gen";
+      cJetBranch = fBranchGen.Data();
+    }
+    else if (ij==kJetRecFull){
+      cAdd = "RecFull";
+      cJetBranch = fBranchRec.Data();
+    }
+    else if (ij==kJetGenFull){
+      cAdd = "GenFull";
+      cJetBranch = fBranchGen.Data();
+    }
 
-      fh2NJetsPt[ij]  = new TH2F(Form("fh2N%sJetsPt",cAdd.Data()),Form("Number of %s jets above threshhold;p_{T,cut} (GeV/c);N_{jets}",cAdd.Data()),nBinPt,binLimitsPt,50,-0.5,49.5);
-      fHistList->Add(fh2NJetsPt[ij]);
+    if(cJetBranch.Length()==0)fFlagJetType[ij] = 0;
+    if(!fFlagJetType[ij])continue;
 
-      fh2NTracksPt[ij]  = new TH2F(Form("fh2N%sTracksPt",cAdd.Data()),Form("Number of %s tracks above threshhold;p_{T,cut} (GeV/c);N_{tracks}",cAdd.Data()),nBinPt,binLimitsPt,50,-0.5,49.5);
-      fHistList->Add(fh2NTracksPt[ij]);
+    fh1NJets[ij] =new TH1F(Form("fh1N%sJets",cAdd.Data()),Form("N %s jets",cAdd.Data()),50,-0.5,49.5);
+    fHistList->Add(fh1NJets[ij]);
+    
+    fh1PtJetsIn[ij]  = new TH1F(Form("fh1PtJets%sIn",cAdd.Data()),Form("%s jets p_T;p_{T} (GeV/c)",cAdd.Data()),nBinPt,binLimitsPt);
+    fHistList->Add(fh1PtJetsIn[ij]);
+    
+    fh1PtTracksIn[ij] = new TH1F(Form("fh1PtTracks%sIn",cAdd.Data()),Form("%s track p_T;p_{T} (GeV/c)",cAdd.Data()),nBinPt,binLimitsPt);
+    fHistList->Add(fh1PtTracksIn[ij]);
+    
+    fh1PtTracksInLow[ij] = new TH1F(Form("fh1PtTracks%sInLow",cAdd.Data()),Form("%s track p_T;p_{T} (GeV/c)",cAdd.Data()),100,0.,5.);
+    fHistList->Add(fh1PtTracksInLow[ij]);
+    
+    fh1SumPtTrack[ij] = new TH1F(Form("fh1SumPtTrack%s",cAdd.Data()),Form("Sum %s track p_T;p_{T} (GeV/c)",cAdd.Data()),1000,0.,3000.);
+    fHistList->Add(fh1SumPtTrack[ij]);
+    
+    fh2NJetsPt[ij]  = new TH2F(Form("fh2N%sJetsPt",cAdd.Data()),Form("Number of %s jets above threshhold;p_{T,cut} (GeV/c);N_{jets}",cAdd.Data()),nBinPt,binLimitsPt,50,-0.5,49.5);
+    fHistList->Add(fh2NJetsPt[ij]);
+    
+    fh2NTracksPt[ij]  = new TH2F(Form("fh2N%sTracksPt",cAdd.Data()),Form("Number of %s tracks above threshhold;p_{T,cut} (GeV/c);N_{tracks}",cAdd.Data()),nBinPt,binLimitsPt,1000,0.,5000);
+    fHistList->Add(fh2NTracksPt[ij]);
 
-      fh2LeadingJetPtJetPhi[ij] = new TH2F(Form("fh2Leading%sJetPtJetPhi",cAdd.Data()),Form("phi of leading %s jet;p_{T};#phi;",cAdd.Data()),
-                                          nBinPt,binLimitsPt,nBinPhi,binLimitsPhi);
-      fHistList->Add(fh2LeadingJetPtJetPhi[ij]);
     
-      fh2LeadingTrackPtTrackPhi[ij] = new TH2F(Form("fh2Leading%sTrackPtTrackPhi",cAdd.Data()),Form("phi of leading %s track;p_{T};#phi;",cAdd.Data()),
-                                              nBinPt,binLimitsPt,nBinPhi,binLimitsPhi);
-      fHistList->Add(fh2LeadingTrackPtTrackPhi[ij]);
+    fp2MultRPPhiTrackPt[ij] = new TProfile2D(Form("fp2MultRPPhiTrackPt%s",cAdd.Data()),"RP phi vs Number of tracks;# tracks;#Delta#phi_{RP}; <p_{T}>",20,0,4000,181,-1./180.*TMath::Pi(),TMath::Pi(),"S");
+    fHistList->Add(fp2MultRPPhiTrackPt[ij]);
+    fp2CentRPPhiTrackPt[ij] = new TProfile2D(Form("fp2CentRPPhiTrackPt%s",cAdd.Data()),"RP phi vs cent;# cent;#Delta#phi_{RP}; <p_{T}>",10,0,100,181,-1./180.*TMath::Pi(),TMath::Pi(),"S");
+    fHistList->Add(fp2CentRPPhiTrackPt[ij]);    
+
+    // Bins:  Jet number: pTJet, cent, mult, RP, Area.   total bins = 4.5M
+    const Int_t nBinsSparse1 = 6;
+    const Int_t nBins1[nBinsSparse1] = {     kMaxJets+1,100, 10,  25,    fNRPBins, 10};
+    const Double_t xmin1[nBinsSparse1]  = {        -0.5,  0,  0,   0,        -0.5, 0.};
+    const Double_t xmax1[nBinsSparse1]  = {kMaxJets+0.5,250,100,5000,fNRPBins-0.5,1.0};
+    
+    fhnJetPt[ij] = new THnSparseF(Form("fhnJetPt%s",cAdd.Data()),";jet number;p_{T,jet};cent;# tracks;RP;area",nBinsSparse1,nBins1,xmin1,xmax1);
+    fHistList->Add(fhnJetPt[ij]);
+    
+    // Bins:  Jet number: pTJet, cent, eta, phi, Area.   total bins = 9.72 M
+    const Int_t nBinsSparse2 = 6;
+      const Int_t nBins2[nBinsSparse2] = {     kMaxJets+1, 25,   5,  18,             360, 10};
+      const Double_t xmin2[nBinsSparse2]  = {        -0.5,  0,   0,-0.9,              0,  0.};
+      const Double_t xmax2[nBinsSparse2]  = {kMaxJets+0.5,250, 100, 0.9, 2.*TMath::Pi(),1.0};
+      fhnJetPtQA[ij] = new THnSparseF(Form("fhnJetPtQA%s",cAdd.Data()),";jet number;p_{T,jet};cent;#eta;#phi;area",nBinsSparse2,nBins2,xmin2,xmax2);
+      fHistList->Add(fhnJetPtQA[ij]);
+
+      // Bins:track number  pTtrack, cent, mult, RP.   total bins = 224 k
+      const Int_t nBinsSparse3 = 5;
+      const Int_t nBins3[nBinsSparse3] = {       2,    100,     10,  20,    fNRPBins};
+      const Double_t xmin3[nBinsSparse3]  = { -0.5,     0,   0,      0,        -0.5};
+      const Double_t xmax3[nBinsSparse3]  = { 1.5,    200, 100,   4000,fNRPBins-0.5};  
+
+      // change the binning ot the pT axis:
+      Double_t *xPt3 = new Double_t[nBins3[1]+1];
+      xPt3[0] = 0.;
+      for(int i = 1; i<=nBins3[1];i++){
+       if(xPt3[i-1]<2)xPt3[i] = xPt3[i-1] + 0.05; // 1 - 40
+       else if(xPt3[i-1]<4)xPt3[i] = xPt3[i-1] + 0.2; // 41 - 50
+       else if(xPt3[i-1]<10)xPt3[i] = xPt3[i-1] + 0.5; // 50 - 62
+       else if(xPt3[i-1]<20)xPt3[i] = xPt3[i-1] +  1.; // 62 - 72
+       else if(xPt3[i-1]<30)xPt3[i] = xPt3[i-1] + 2.5; // 74 - 78
+       else xPt3[i] = xPt3[i-1] + 5.; // 78 - 100 = 140 
+      }
       
-      for(int i = 0;i < kMaxJets;++i){
+      fhnTrackPt[ij] = new THnSparseF(Form("fhnTrackPt%s",cAdd.Data()),";track number;p_{T};cent;#tracks;RP",nBinsSparse3,nBins3,xmin3,xmax3);
+      fhnTrackPt[ij]->SetBinEdges(1,xPt3);
+      fHistList->Add(fhnTrackPt[ij]);
+      delete [] xPt3;
+
+      // Track QA bins track nr, pTrack, cent, eta, phi bins 5.4 M
+      const Int_t nBinsSparse4 = 5;
+      const Int_t nBins4[nBinsSparse4] =    {    2, 50,  10,  20, 360};
+      const Double_t xmin4[nBinsSparse4]  = { -0.5,  0,   0, -1.0,   0.};
+      const Double_t xmax4[nBinsSparse4]  = {  1.5,150, 100,  1.0,2.*TMath::Pi()};  
+
+      // change the binning ot the pT axis:
+      Double_t *xPt4 = new Double_t[nBins4[1]+1];
+      xPt4[0] = 0.;
+      for(int i = 1; i<=nBins4[1];i++){
+       if(xPt4[i-1]<2)xPt4[i] = xPt4[i-1] + 0.1;
+       else if(xPt4[i-1]<10)xPt4[i] = xPt4[i-1] + 0.5;
+       else if(xPt4[i-1]<20)xPt4[i] = xPt4[i-1] +  1.;
+       else if(xPt4[i-1]<30)xPt4[i] = xPt4[i-1] +  2.5;
+       else xPt4[i] = xPt4[i-1] + 5.;
+      }
+      fhnTrackPtQA[ij] = new THnSparseF(Form("fhnTrackPtQA%s",cAdd.Data()),";track number;p_{T};cent;#eta;#phi",nBinsSparse4,nBins4,xmin4,xmax4);
+      fhnTrackPtQA[ij]->SetBinEdges(1,xPt4);
+      fHistList->Add(fhnTrackPtQA[ij]);
+      delete [] xPt4;
 
+      for(int i = 0;i <= kMaxJets;++i){
        fh1PtIn[ij][i] = new TH1F(Form("fh1Pt%sIn_j%d",cAdd.Data(),i),Form("%s p_T input ;p_{T}",cAdd.Data()),nBinPt,binLimitsPt);
        fHistList->Add(fh1PtIn[ij][i]);
 
-       fh2RhoPt[ij][i] = new TH2F(Form("fh2RhoPt%s_j%d",cAdd.Data(),i),Form("jet shape rho for %s jets;r;p_{T};",cAdd.Data()),
-                                  40,0.,2.,nBinPt,binLimitsPt);
-       fHistList->Add(fh2RhoPt[ij][i]);
-       if(!fh1TmpRho)fh1TmpRho = new TH1F("fh1TmpRho","tmp histo for jet shape",40,0.,2);
-
-
-       fh2PsiPt[ij][i] = new TH2F(Form("fh2PsiPt%s_j%d",cAdd.Data(),i),Form("jet shape #psi for %s jets;r;p_{T};",cAdd.Data()),
-                                    40,0.,2.,nBinPt,binLimitsPt);
-       fHistList->Add(fh2PsiPt[ij][i]);
-
-       fh2PhiPt[ij][i] = new TH2F(Form("fh2PhiPt%s_j%d",cAdd.Data(),i),Form("pt vs phi %s;phi;p_{T};",cAdd.Data()),
-                                  nBinPhi,binLimitsPhi,nBinPt,binLimitsPt);
-       fHistList->Add(fh2PhiPt[ij][i]);
-       fh2EtaPt[ij][i] = new TH2F(Form("fh2EtaPt%s_j%d",cAdd.Data(),i),Form("pt vs phi %s;phi;p_{T};",cAdd.Data()),
-                                  20,-1.,1.,nBinPt,binLimitsPt);
-       fHistList->Add(fh2EtaPt[ij][i]);
-       fh2PhiEta[ij][i] =  new TH2F(Form("fh2PhiEta%s_j%d",cAdd.Data(),i),Form("phi vs eta %s ;phi;p_{T};",cAdd.Data()),
-                                    nBinPhi,binLimitsPhi,20,-1.,1.);
-       fHistList->Add(fh2PhiEta[ij][i]);
 
+       if(!fh1TmpRho)fh1TmpRho = new TH1F("fh1TmpRho","tmp histo for jet shape",40,0.,2);
+       fh2LTrackPtJetPt[ij][i] = new TH2F(Form("fh2LTrackPtJetPt%s_j%d",cAdd.Data(),i),
+                                          Form("pt of leadin track within a jet vs jet %s;p_{T,lead in jet};p_{T.jet};",
+                                               cAdd.Data()),
+                                          200,0.,200.,nBinPt,binLimitsPt);
+       fHistList->Add(fh2LTrackPtJetPt[ij][i]);
       }
 
 
@@ -563,11 +552,9 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
 
       fh2DijetPt2vsPt1[ij]          = new TH2F(Form("fh2Dijet%sPt2vsPt1",cAdd.Data()),"Pt2 versus Pt1;p_{T,1} (GeV/c);p_{T,2} (GeV/c)",250,0.,250.,250,0.,250.);
       fHistList->Add(fh2DijetPt2vsPt1[ij]);
-
       fh2DijetDifvsSum[ij]         = new TH2F(Form("fh2Dijet%sDifvsSum",cAdd.Data()),"Pt difference vs Pt sum;p_{T,1}+p_{T,2} (GeV/c);#Deltap_{T} (GeV/c)",400,0.,400.,150,0.,150.);
       fHistList->Add( fh2DijetDifvsSum[ij]);
     }   
-
   // =========== Switch on Sumw2 for all histos ===========
   for (Int_t i=0; i<fHistList->GetEntries(); ++i) {
     TH1 *h1 = dynamic_cast<TH1*>(fHistList->At(i));
@@ -650,8 +637,23 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
 
 
   if(!aodRecJets){
-    Printf("%s:%d no reconstructed Jet array with name %s in AOD",(char*)__FILE__,__LINE__,fBranchRec.Data());
-    return;
+    if(fDebug){
+
+       Printf("%s:%d no reconstructed Jet array with name %s in AOD",(char*)__FILE__,__LINE__,fBranchRec.Data());
+       if(fAODIn){
+         Printf("Input AOD >>>>");
+         fAODIn->Print();    
+       }
+       if(fAODExtension){
+         Printf("AOD Extension >>>>");
+         fAODExtension->Print();
+       }
+       if(fAODOut){
+         Printf("Output AOD >>>>");
+         fAODOut->Print();    
+       }
+    }
+       return;
   }
 
   TClonesArray *aodGenJets = 0;
@@ -672,6 +674,44 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
     }
   }
 
+  TClonesArray *aodBackRecJets = 0;
+  if(fBranchBkgRec.Length()>0){
+    if(fAODOut&&!aodBackRecJets){
+      aodBackRecJets = dynamic_cast<TClonesArray*>(fAODOut->FindListObject(fBranchBkgRec.Data()));
+    }
+    if(fAODExtension&&!aodBackRecJets){
+      aodBackRecJets = dynamic_cast<TClonesArray*>(fAODExtension->GetAOD()->FindListObject(fBranchBkgRec.Data()));
+    }
+    if(fAODIn&&!aodBackRecJets){
+      aodBackRecJets = dynamic_cast<TClonesArray*>(fAODIn->FindListObject(fBranchBkgRec.Data()));
+    }
+
+    if(!aodBackRecJets){
+      Printf("%s:%d no background rec Jet array with name %s in AOD",(char*)__FILE__,__LINE__,fBranchBkgRec.Data());
+      return;
+    }
+  }
+
+
+  TClonesArray *aodBackGenJets = 0;
+
+  if(fBranchBkgGen.Length()>0){
+    if(fAODOut&&!aodBackGenJets){
+      aodBackGenJets = dynamic_cast<TClonesArray*>(fAODOut->FindListObject(fBranchBkgGen.Data()));
+    }
+    if(fAODExtension&&!aodBackGenJets){
+      aodBackGenJets = dynamic_cast<TClonesArray*>(fAODExtension->GetAOD()->FindListObject(fBranchBkgGen.Data()));
+    }
+    if(fAODIn&&!aodBackGenJets){
+      aodBackGenJets = dynamic_cast<TClonesArray*>(fAODIn->FindListObject(fBranchBkgGen.Data()));
+    }
+
+    if(!aodBackGenJets){
+      Printf("%s:%d no background rec Jet array with name %s in AOD",(char*)__FILE__,__LINE__,fBranchBkgGen.Data());
+      return;
+    }
+  }
+
  
   // new Scheme
   // first fill all the pure  histograms, i.e. full jets 
@@ -686,6 +726,7 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
   // second fill the correlation histograms, here we limit to the n-th leading jet in case of the reconstructed
 
 
+
   TList genJetsList;         // full acceptance
   TList genJetsListCut;      // acceptance cut
   TList recJetsList;         // full acceptance
@@ -705,6 +746,12 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
   Double_t nTrials = 1; // Trials for MC trigger 
   fh1Trials->Fill("#sum{ntrials}",fAvgTrials); 
 
+  // Getting some global properties
+  fCentrality = GetCentrality();
+  if(fCentrality<=0)fCentrality = 0;
+  fh1Centrality->Fill(fCentrality);
+
+
   if((fAnalysisType&kAnaMCESD)==kAnaMCESD){
     // this is the part we only use when we have MC information
     AliMCEvent* mcEvent = MCEvent();
@@ -740,6 +787,15 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
   nT = GetListOfTracks(&genParticles,fTrackTypeGen);
   if(fDebug>2)Printf("%s:%d Selected Gen tracks: %d %d",(char*)__FILE__,__LINE__,nT,genParticles.GetEntries());
 
+  //  CalculateReactionPlaneAngle(&recParticles);
+  fRPAngle = 0;
+  
+  if(fRPMethod==0)fRPAngle = aod->GetHeader()->GetEventplane();
+  else if(fRPMethod==1||fRPMethod==2){
+    fRPAngle = aod->GetHeader()->GetQTheta(fRPMethod);
+  }
+  fh1RP->Fill(fRPAngle);
+  fh2RPCentrality->Fill(fCentrality,fRPAngle);
   // Event control and counting ...  
   // MC
   fh1PtHard->Fill(ptHard,eventW);
@@ -751,6 +807,25 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
     fh1ZVtx->Fill(aod->GetPrimaryVertex()->GetZ());
   }
 
+
+  Int_t recMult1 = recParticles.GetEntries();
+  Int_t genMult1 = genParticles.GetEntries();
+
+  Int_t recMult2 = MultFromJetRefs(aodBackRecJets);
+  Int_t genMult2 = MultFromJetRefs(aodBackGenJets);
+
+  fh2MultRec->Fill(recMult1,recMult2);
+  fh2MultGen->Fill(genMult1,genMult2);
+  fMultRec = recMult1;
+  if(fMultRec<=0)fMultRec = recMult2;
+  fMultGen = genMult1;
+  if(fMultGen<=0)fMultGen = genMult2;
+
+  Double_t var0[2] = {0,};
+  var0[0] = fCentrality;
+  var0[1] = fMultRec;
+  fhnEvent->Fill(var0);
+
   // the loops for rec and gen should be indentical... pass it to a separate
   // function ...
   // Jet Loop
@@ -759,15 +834,19 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
   // Jet Track loop
 
   FillJetHistos(recJetsListCut,recParticles,kJetRec);
+  FillJetHistos(recJetsList,recParticles,kJetRecFull);
   FillTrackHistos(recParticles,kJetRec);
 
   FillJetHistos(genJetsListCut,genParticles,kJetGen);
+  FillJetHistos(genJetsList,genParticles,kJetGenFull);
   FillTrackHistos(genParticles,kJetGen);
 
   // Here follows the jet matching part
   // delegate to a separated method?
 
-  FillMatchHistos(recJetsList,genJetsList);
+  if(fDoMatching){
+    FillMatchHistos(recJetsList,genJetsList);
+  }
 
   if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
   PostData(1, fHistList);
@@ -778,6 +857,12 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
   if(iType>=kJetTypes){
     return;
   }
+  if(!fFlagJetType[iType])return;
+
+  Int_t refMult = fMultRec;
+  if(iType==kJetGen||iType==kJetGenFull){
+    refMult = fMultGen;
+  }
 
   Int_t nJets = jetsList.GetEntries(); 
   fh1NJets[iType]->Fill(nJets);
@@ -792,6 +877,12 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
   Int_t ij0 = -1;
   Int_t ij1 = -1;
 
+  Double_t var1[6] = {0,}; // jet number;p_{T,jet};cent;# tracks;RP;area
+  var1[2] = fCentrality; 
+  var1[3] = refMult;
+
+  Double_t var2[6] = {0,}; // jet number;p_{T,jet};cent;#eta;#phi;area
+  var2[2] = fCentrality;
 
   for(int ij = 0;ij < nJets;ij++){
     AliAODJet *jet = (AliAODJet*)jetsList.At(ij);
@@ -822,24 +913,41 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
       }
     }
     // fill jet histos for kmax jets
-    if(ij<kMaxJets){      
+
       Float_t phiJet = jet->Phi();
       Float_t etaJet = jet->Eta();
       if(phiJet<0)phiJet+=TMath::Pi()*2.;    
       fh1TmpRho->Reset();
-      fh1PtIn[iType][ij]->Fill(ptJet);
+      if(ij<kMaxJets)fh1PtIn[iType][ij]->Fill(ptJet);
+
+      fh1PtIn[iType][kMaxJets]->Fill(ptJet);
       // fill leading jets...
-      fh2PhiEta[iType][ij]->Fill(phiJet,etaJet);
-      fh2PhiPt[iType][ij]->Fill(phiJet,ptJet);
-      if(ptJet>10)fh2EtaPt[iType][ij]->Fill(etaJet,ptJet);
-      if(ij==0){
-       fh2LeadingJetPtJetPhi[iType]->Fill(ptJet,phiJet);
-       if(ij==0&&iType==0&&fDebug>1){
-         Printf("%d %3.3f %p %s",iType,ptJet,jet,fBranchRec.Data());
-       }
+      AliVParticle *leadTrack = LeadingTrackFromJetRefs(jet);
+      //      AliVParticle *leadTrack = LeadingTrackInCone(jet,&particlesList);
+      Int_t phiBin = GetPhiBin(phiJet-fRPAngle);
+
+      var1[1] = ptJet;
+      var1[4] = phiBin;
+      var1[5] = jet->EffectiveAreaCharged();
+
+      var2[1] = ptJet;
+      var2[3] = etaJet;
+      var2[4] = phiJet;
+      var2[5] = jet->EffectiveAreaCharged();
+      if(ij<kMaxJets){
+       if(leadTrack)fh2LTrackPtJetPt[iType][ij]->Fill(leadTrack->Pt(),ptJet);
+       var1[0] = ij;
+       var2[0] = ij;
+       fhnJetPt[iType]->Fill(var1);
+       fhnJetPtQA[iType]->Fill(var2);
       }
-      if(particlesList.GetSize()){
+      var1[0] = kMaxJets;// fill for all jets
+      var2[0] = kMaxJets;// fill for all jets
+      fhnJetPt[iType]->Fill(var1);
+      fhnJetPtQA[iType]->Fill(var2);
+      if(leadTrack)fh2LTrackPtJetPt[iType][kMaxJets]->Fill(leadTrack->Pt(),ptJet);
 
+      if(particlesList.GetSize()&&ij<kMaxJets){
        // Particles... correlated with jets...
        for(int it = 0;it<particlesList.GetEntries();++it){
          AliVParticle *part = (AliVParticle*)particlesList.At(it);
@@ -847,16 +955,7 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
          if(ptJet>0)fh1TmpRho->Fill(deltaR,part->Pt()/ptJet);
        }
        // fill the jet shapes
-       Float_t rhoSum = 0;
-       for(int ibx = 1;ibx<=fh2RhoPt[iType][ij]->GetNbinsX();ibx++){
-         Float_t r = fh2RhoPt[iType][ij]->GetXaxis()->GetBinCenter(ibx);
-         Float_t rho = fh1TmpRho->GetBinContent(ibx);
-         rhoSum += rho;
-         fh2RhoPt[iType][ij]->Fill(r,ptJet,rho);
-         fh2PsiPt[iType][ij]->Fill(r,ptJet,rhoSum);
-       }
       }// if we have particles
-    }// ij < kMaxJets
   }// Jet Loop
 
 
@@ -920,6 +1019,19 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
 
 void AliAnalysisTaskJetSpectrum2::FillTrackHistos(TList &particlesList,int iType){
 
+  if(fFlagJetType[iType]<=0)return;
+  Int_t refMult = fMultRec;
+  if(iType==kJetGen||iType==kJetGenFull){
+    refMult = fMultGen;
+
+  }
+
+  // 
+  Double_t var3[5]; // track number;p_{T};cent;#tracks;RP
+  var3[2] = fCentrality;
+  var3[3] = refMult;
+  Double_t var4[5]; // track number;p_{T};cent;#eta;#phi
+  var4[2] = fCentrality;
   Int_t nTrackOver = particlesList.GetSize();
   // do the same for tracks and jets
   if(nTrackOver>0){
@@ -947,12 +1059,44 @@ void AliAnalysisTaskJetSpectrum2::FillTrackHistos(TList &particlesList,int iType
     while((tmpTrack = (AliVParticle*)(trackIter->Next()))){
       Float_t tmpPt = tmpTrack->Pt();
       fh1PtTracksIn[iType]->Fill(tmpPt);
+      fh1PtTracksInLow[iType]->Fill(tmpPt);
+
       sumPt += tmpPt;
       Float_t tmpPhi = tmpTrack->Phi();
       if(tmpPhi<0)tmpPhi+=TMath::Pi()*2.;    
+
+      
+      Float_t phiRP = tmpPhi-fRPAngle;
+      if(phiRP>TMath::Pi())phiRP -= TMath::Pi();
+      if(phiRP<0)phiRP += TMath::Pi();
+      if(phiRP<0)phiRP += TMath::Pi();
+      const float allPhi = -1./180.*TMath::Pi();
+
+      fp2MultRPPhiTrackPt[iType]->Fill(refMult,phiRP,tmpPt);
+      fp2MultRPPhiTrackPt[iType]->Fill(refMult,allPhi,tmpPt);
+
+      fp2CentRPPhiTrackPt[iType]->Fill(fCentrality,phiRP,tmpPt);
+      fp2CentRPPhiTrackPt[iType]->Fill(fCentrality,allPhi,tmpPt);
+
+      Int_t phiBin = GetPhiBin(tmpPhi-fRPAngle);
+      var3[0] = 1;
+      var3[1] = tmpPt;
+      var3[4] = phiBin;
+      
+      var4[0] = 1;
+      var4[1] = tmpPt;
+      var4[3] = tmpTrack->Eta();
+      var4[4] = tmpPhi;
+
+
+      fhnTrackPt[iType]->Fill(var3);
+      fhnTrackPtQA[iType]->Fill(var4);
+
       if(tmpTrack==leading){
-       fh1PtTracksLeadingIn[iType]->Fill(tmpPt);
-       fh2LeadingTrackPtTrackPhi[iType]->Fill(tmpPt,tmpPhi);
+       var3[0] = 0;
+       var4[0] = 0;
+       fhnTrackPt[iType]->Fill(var3);
+       fhnTrackPtQA[iType]->Fill(var4);
        continue;
       }
     }  
@@ -995,7 +1139,6 @@ void AliAnalysisTaskJetSpectrum2::FillMatchHistos(TList &recJetsList,TList &genJ
   }
 
   Double_t container[6];
-  Double_t containerPhiZ[6];
 
   // loop over generated jets
   // consider the 
@@ -1008,15 +1151,15 @@ void AliAnalysisTaskJetSpectrum2::FillMatchHistos(TList &recJetsList,TList &genJ
     container[3] = ptGen;
     container[4] = etaGen;
     container[5] = phiGen;
-    fhnJetContainer[kStep0]->Fill(&container[3]);
+    fhnJetContainer->Fill(&container[3],kStep0);
     if(JetSelected(genJet)){
-      fhnJetContainer[kStep1]->Fill(&container[3]);
+      fhnJetContainer->Fill(&container[3],kStep1);
       Int_t ir = aRecIndex[ig];
       if(ir>=0&&ir<recJetsList.GetEntries()){   
-       fhnJetContainer[kStep2]->Fill(&container[3]);
+       fhnJetContainer->Fill(&container[3],kStep2);
        AliAODJet* recJet = (AliAODJet*)recJetsList.At(ir); 
-       if(JetSelected(recJet))fhnJetContainer[kStep4]->Fill(&container[3]);
-       if(JetSelected(recJet))fhnJetContainer[kStep3]->Fill(&container[3]);
+       if(JetSelected(recJet))fhnJetContainer->Fill(&container[3],kStep4);
+       if(JetSelected(recJet))fhnJetContainer->Fill(&container[3],kStep3);
       }
     }
   }// loop over generated jets used for matching...
@@ -1035,18 +1178,16 @@ void AliAnalysisTaskJetSpectrum2::FillMatchHistos(TList &recJetsList,TList &genJ
     container[0] = ptRec;
     container[1] = etaRec;
     container[2] = phiRec;
-    containerPhiZ[0] = ptRec;
-    containerPhiZ[1] = phiRec;
 
-    fhnJetContainer[kStep0+kMaxStep]->Fill(container);
+    fhnJetContainer->Fill(container,kStep0+kMaxStep);
     if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
   
     if(JetSelected(recJet)){
-      fhnJetContainer[kStep1+kMaxStep]->Fill(container);
+      fhnJetContainer->Fill(container,kStep1+kMaxStep);
       // Fill Correlation
       Int_t ig = aGenIndex[ir];
       if(ig>=0 && ig<genJetsList.GetEntries()){
-       fhnJetContainer[kStep2+kMaxStep]->Fill(container);
+       fhnJetContainer->Fill(container,kStep2+kMaxStep);
        if (fDebug > 10)Printf("%s:%d ig = %d ir = %d",(char*)__FILE__,__LINE__,ig,ir);
        AliAODJet *genJet = (AliAODJet*)genJetsList.At(ig);
        Double_t ptGen  = genJet->Pt();
@@ -1057,24 +1198,18 @@ void AliAnalysisTaskJetSpectrum2::FillMatchHistos(TList &recJetsList,TList &genJ
        container[3] = ptGen;
        container[4] = etaGen;
        container[5] = phiGen;
-       containerPhiZ[3] = ptGen;
        // 
        // we accept only jets which are detected within a smaller window, to avoid ambigious pair association at the edges of the acceptance
        // 
-       if(JetSelected(genJet))fhnJetContainer[kStep4+kMaxStep]->Fill(container);
-       fhnJetContainer[kStep3+kMaxStep]->Fill(container);
-       fhnCorrelation->Fill(container);
+       if(JetSelected(genJet))fhnJetContainer->Fill(container,kStep4+kMaxStep);
+       fhnJetContainer->Fill(container,kStep3+kMaxStep);
+       fhnCorrelation->Fill(container,0);
        if(ptGen>0){
          Float_t delta = (ptRec-ptGen)/ptGen;
          fh2RelPtFGen->Fill(ptGen,delta);
          fh2PtFGen->Fill(ptGen,ptRec);
        }
-       if(fhnCorrelationPhiZRec)fhnCorrelationPhiZRec->Fill(containerPhiZ);
       } 
-      else{
-       containerPhiZ[3] = 0;
-       if(fhnCorrelationPhiZRec)fhnCorrelationPhiZRec->Fill(containerPhiZ);
-      }
     }// loop over reconstructed jets
   }
   if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
@@ -1087,10 +1222,9 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
   // link it
   //
   const Int_t kNvar   = 3 ; //number of variables on the grid:pt,eta, phi
-  const Double_t kPtmin = 0.0, kPtmax = 320.; // we do not want to have empty bins at the beginning...
+  const Double_t kPtmin = 0.0, kPtmax = 250.; // we do not want to have empty bins at the beginning...
   const Double_t kEtamin = -3.0, kEtamax = 3.0;
   const Double_t kPhimin = 0., kPhimax = 2. * TMath::Pi();
-  const Double_t kZmin = 0., kZmax = 1;
 
   // can we neglect migration in eta and phi?
   // phi should be no problem since we cover full phi and are phi symmetric
@@ -1099,7 +1233,7 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
 
   //arrays for the number of bins in each dimension
   Int_t iBin[kNvar];
-  iBin[0] = 320; //bins in pt
+  iBin[0] = 125; //bins in pt
   iBin[1] =  1; //bins in eta 
   iBin[2] = 1; // bins in phi
 
@@ -1115,12 +1249,11 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
   for(Int_t i=0; i<=iBin[2]; i++) binEdges[2][i]=(Double_t)kPhimin  + (kPhimax-kPhimin)/iBin[2]*(Double_t)i;
 
 
-  for(int i = 0;i < kMaxStep*2;++i){
-    fhnJetContainer[i] = new THnSparseF(Form("fhnJetContainer%d",i),Form("THnSparse jet info %d",i),kNvar,iBin);
-    for (int k=0; k<kNvar; k++) {
-      fhnJetContainer[i]->SetBinEdges(k,binEdges[k]);
-    }
+  fhnJetContainer = new AliTHn(Form("fahnJetContainer"),Form("AliTHn jet info"),kMaxStep*2,kNvar,iBin);
+  for (int k=0; k<kNvar; k++) {
+    fhnJetContainer->SetBinLimits(k,binEdges[k]);
   }
+
   //create correlation matrix for unfolding
   Int_t thnDim[2*kNvar];
   for (int k=0; k<kNvar; k++) {
@@ -1130,48 +1263,15 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
     thnDim[k+kNvar] = iBin[k];
   }
 
-  fhnCorrelation = new THnSparseF("fhnCorrelation","THnSparse with correlations",2*kNvar,thnDim);
+  fhnCorrelation = new AliTHn("fahnCorrelation","AliTHn with correlations",1,2*kNvar,thnDim);
   for (int k=0; k<kNvar; k++) {
-    fhnCorrelation->SetBinEdges(k,binEdges[k]);
-    fhnCorrelation->SetBinEdges(k+kNvar,binEdges[k]);
+    fhnCorrelation->SetBinLimits(k,binEdges[k]);
+    fhnCorrelation->SetBinLimits(k+kNvar,binEdges[k]);
   }
-  fhnCorrelation->Sumw2();
-
-  // for second correlation histogram
-
-
-  const Int_t kNvarPhiZ   = 4; 
-  //arrays for the number of bins in each dimension
-  Int_t iBinPhiZ[kNvarPhiZ];
-  iBinPhiZ[0] = 80; //bins in pt
-  iBinPhiZ[1] = 72; //bins in phi 
-  iBinPhiZ[2] = 20; // bins in Z
-  iBinPhiZ[3] = 80; //bins in ptgen
-
-  //arrays for lower bounds :
-  Double_t* binEdgesPhiZ[kNvarPhiZ];
-  for(Int_t ivar = 0; ivar < kNvarPhiZ; ivar++)
-    binEdgesPhiZ[ivar] = new Double_t[iBinPhiZ[ivar] + 1];
-
-  for(Int_t i=0; i<=iBinPhiZ[0]; i++) binEdgesPhiZ[0][i]=(Double_t)kPtmin  + (kPtmax-kPtmin)/(Double_t)iBinPhiZ[0]*(Double_t)i;
-  for(Int_t i=0; i<=iBinPhiZ[1]; i++) binEdgesPhiZ[1][i]=(Double_t)kPhimin  + (kPhimax-kPhimin)/iBinPhiZ[1]*(Double_t)i;
-  for(Int_t i=0; i<=iBinPhiZ[2]; i++) binEdgesPhiZ[2][i]=(Double_t)kZmin  + (kZmax-kZmin)/iBinPhiZ[2]*(Double_t)i;
-  for(Int_t i=0; i<=iBinPhiZ[3]; i++) binEdgesPhiZ[3][i]=(Double_t)kPtmin  + (kPtmax-kPtmin)/(Double_t)iBinPhiZ[3]*(Double_t)i;
-
-  fhnCorrelationPhiZRec = new THnSparseF("fhnCorrelationPhiZRec","THnSparse with correlations",kNvarPhiZ,iBinPhiZ);
-  for (int k=0; k<kNvarPhiZ; k++) {
-    fhnCorrelationPhiZRec->SetBinEdges(k,binEdgesPhiZ[k]);
-  }
-  fhnCorrelationPhiZRec->Sumw2();
-
-
-  // Add a histogram for Fake jets
 
   for(Int_t ivar = 0; ivar < kNvar; ivar++)
     delete [] binEdges[ivar];
 
-  for(Int_t ivar = 0; ivar < kNvarPhiZ; ivar++)
-    delete [] binEdgesPhiZ[ivar];
 
 }
 
@@ -1208,7 +1308,7 @@ Int_t  AliAnalysisTaskJetSpectrum2::GetListOfTracks(TList *list,Int_t type){
          //    tr->Dump();
          AliESDEvent *fESD = dynamic_cast<AliESDEvent*> (InputEvent());
          if(fESD){
-           AliESDtrack *esdTr = (AliESDtrack*)fESD->GetTrack(tr->GetID());
+           AliESDtrack *esdTr = (AliESDtrack*)fESD->GetTrack(TMath::Abs(tr->GetID()+1));
            esdTr->Print("");
            // esdTr->Dump();
          }
@@ -1272,6 +1372,17 @@ Int_t  AliAnalysisTaskJetSpectrum2::GetListOfTracks(TList *list,Int_t type){
 }
 
 
+Float_t AliAnalysisTaskJetSpectrum2::GetCentrality(){
+    AliAODEvent *aod = 0;
+    if(fUseAODTrackInput)aod = dynamic_cast<AliAODEvent*>(InputEvent());
+    else aod = AODEvent();
+    if(!aod){
+      return 101;
+    }
+    return aod->GetHeader()->GetCentrality();
+}
+
+
 
 Bool_t  AliAnalysisTaskJetSpectrum2::JetSelected(AliAODJet *jet){
   Bool_t selected = false;
@@ -1319,3 +1430,64 @@ Int_t  AliAnalysisTaskJetSpectrum2::GetListOfJets(TList *list,TClonesArray* jarr
 }
 
 
+Int_t AliAnalysisTaskJetSpectrum2::MultFromJetRefs(TClonesArray* jets){
+  if(!jets)return 0;
+
+  Int_t refMult = 0;
+  for(int ij = 0;ij < jets->GetEntries();++ij){
+    AliAODJet* jet = (AliAODJet*)jets->At(ij);
+    if(!jet)continue;
+    TRefArray *refs = jet->GetRefTracks();
+    if(!refs)continue;
+    refMult += refs->GetEntries();
+  }
+  return refMult;
+
+}
+
+
+AliVParticle *AliAnalysisTaskJetSpectrum2::LeadingTrackFromJetRefs(AliAODJet* jet){
+  if(!jet)return 0;
+  TRefArray *refs = jet->GetRefTracks();
+  if(!refs) return 0;
+  AliVParticle *leading = 0;
+  Float_t fMaxPt = 0;
+  for(int i = 0;i<refs->GetEntries();i++){
+    AliVParticle *tmp = dynamic_cast<AliVParticle*>(refs->At(i));
+    if(!tmp)continue;
+    if(tmp->Pt()>fMaxPt){
+      leading = tmp;
+      fMaxPt = tmp->Pt();
+    }
+  }
+  return leading;
+}
+
+
+AliVParticle *AliAnalysisTaskJetSpectrum2::LeadingTrackInCone(AliAODJet* jet,TList *list,Float_t r){
+  if(!jet)return 0;
+  if(!list) return 0;
+  AliVParticle *leading = 0;
+  Float_t fMaxPt = 0;
+  for(int i = 0;i<list->GetEntries();i++){
+    AliVParticle *tmp = (AliVParticle*)(list->At(i));
+    if(!tmp)continue;
+    if(jet->DeltaR(tmp)>r)continue;
+    if(tmp->Pt()>fMaxPt){
+      leading = tmp;
+      fMaxPt = tmp->Pt();
+    }
+  }
+  return leading;
+}
+
+Int_t AliAnalysisTaskJetSpectrum2::GetPhiBin(Double_t phi)
+{
+    Int_t phibin=-1;
+    if(!(TMath::Abs(phi)<=2*TMath::Pi())){AliError("phi w.r.t. RP out of defined range");return -1;}
+    Double_t phiwrtrp=TMath::ACos(TMath::Abs(TMath::Cos(phi)));
+    phibin=Int_t(fNRPBins*phiwrtrp/(0.5*TMath::Pi()));
+    if(phibin<0||phibin>=fNRPBins){AliError("Phi Bin not defined");}
+    return phibin;
+}
+