]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWGJE/AliAnalysisTaskJetSpectrum2.cxx
fixing a very nasty bug, and cleaning up
[u/mrichter/AliRoot.git] / PWGJE / AliAnalysisTaskJetSpectrum2.cxx
index c99f2a69bd535ae88a60866eb9f8f707650d9556..d5c624df7fbc3e444d6700606d8e8c225c1b6280 100644 (file)
@@ -61,7 +61,7 @@
 #include "AliJetKineReaderHeader.h"
 #include "AliGenCocktailEventHeader.h"
 #include "AliInputEventHandler.h"
-
+#include "AliCFContainer.h"
 
 #include "AliAnalysisHelperJetTasks.h"
 
@@ -94,10 +94,14 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2():
   fNMatchJets(5),
   fNRPBins(3),
   fJetTriggerExcludeMask(AliAODJet::kHighTrackPtTriggered),
+  fJetTriggerBestMask(AliAODJet::kHighTrackPtBest),
   fFilterMask(0),
   fEventSelectionMask(0),
   fNTrigger(0),
   fTriggerBit(0x0),
+  fNAcceptance(0),
+  fNBinsLeadingTrackPt(10),
+  fNBinsMult(20),
   fAnalysisType(0),
   fTrackTypeRec(kTrackUndef),
   fTrackTypeGen(kTrackUndef),
@@ -110,6 +114,10 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2():
   fMinJetPt(0),
   fMinTrackPt(0.15),
   fDeltaPhiWindow(90./180.*TMath::Pi()),
+  fAcceptancePhiMin(0x0),
+  fAcceptancePhiMax(0x0),
+  fAcceptanceEtaMin(0x0),
+  fAcceptanceEtaMax(0x0),
   fCentrality(100),
   fRPAngle(0),
   fMultRec(0),
@@ -117,6 +125,7 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2():
   fTriggerName(0x0),
   fh1Xsec(0x0),
   fh1Trials(0x0),
+  fh1AvgTrials(0x0),
   fh1PtHard(0x0),
   fh1PtHardNoW(0x0),  
   fh1PtHardTrials(0x0),
@@ -138,6 +147,7 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2():
     fh1SumPtTrack[ij] = 0;
     fh1PtJetsIn[ij] = 0;
     fh1PtJetsInRej[ij] = 0;
+    fh1PtJetsInBest[ij] = 0;
     fh1PtTracksIn[ij] = 0;
     fh1PtTracksInLow[ij] = 0;
     fh2NJetsPt[ij]  = 0;
@@ -145,6 +155,8 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2():
     fp2MultRPPhiTrackPt[ij] = 0;
     fp2CentRPPhiTrackPt[ij] = 0;
     fhnJetPt[ij] = 0;
+    fhnJetPtBest[ij] = 0;
+    fhnJetPtRej[ij] = 0;
     fhnJetPtQA[ij] = 0;
     fhnTrackPt[ij] = 0;
     fhnTrackPtQA[ij] = 0;
@@ -189,10 +201,14 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
   fNMatchJets(5),
   fNRPBins(3),
   fJetTriggerExcludeMask(AliAODJet::kHighTrackPtTriggered),
+  fJetTriggerBestMask(AliAODJet::kHighTrackPtBest),
   fFilterMask(0),
   fEventSelectionMask(0),
   fNTrigger(0),
   fTriggerBit(0x0),
+  fNAcceptance(0),
+  fNBinsLeadingTrackPt(10),
+  fNBinsMult(20),
   fAnalysisType(0),
   fTrackTypeRec(kTrackUndef),
   fTrackTypeGen(kTrackUndef),
@@ -205,6 +221,10 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
   fMinJetPt(0),
   fMinTrackPt(0.15),
   fDeltaPhiWindow(90./180.*TMath::Pi()),
+  fAcceptancePhiMin(0x0),
+  fAcceptancePhiMax(0x0),
+  fAcceptanceEtaMin(0x0),
+  fAcceptanceEtaMax(0x0),
   fCentrality(100),
   fRPAngle(0),
   fMultRec(0),
@@ -212,6 +232,7 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
   fTriggerName(0x0),
   fh1Xsec(0x0),
   fh1Trials(0x0),
+  fh1AvgTrials(0x0),
   fh1PtHard(0x0),
   fh1PtHardNoW(0x0),  
   fh1PtHardTrials(0x0),
@@ -233,6 +254,7 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
     fh1SumPtTrack[ij] = 0;
     fh1PtJetsIn[ij] = 0;
     fh1PtJetsInRej[ij] = 0;
+    fh1PtJetsInBest[ij] = 0;
     fh1PtTracksIn[ij] = 0;
     fh1PtTracksInLow[ij] = 0;
     fh2NJetsPt[ij]  = 0;
@@ -240,6 +262,8 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
     fp2MultRPPhiTrackPt[ij] = 0;
     fp2CentRPPhiTrackPt[ij] = 0;
     fhnJetPt[ij] = 0;
+    fhnJetPtBest[ij] = 0;
+    fhnJetPtRej[ij] = 0;
     fhnJetPtQA[ij] = 0;
     fhnTrackPt[ij] = 0;
     fhnTrackPtQA[ij] = 0;
@@ -308,6 +332,7 @@ Bool_t AliAnalysisTaskJetSpectrum2::Notify()
     // construct a poor man average trials 
     Float_t nEntries = (Float_t)tree->GetTree()->GetEntries();
     if(ftrials>=nEntries && nEntries>0.)fAvgTrials = ftrials/nEntries;
+    fh1Trials->Fill("#sum{ntrials}",ftrials); 
   }  
 
   if(fDebug)Printf("Reading File %s",fInputHandler->GetTree()->GetCurrentFile()->GetName());
@@ -355,14 +380,14 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
     
 
 
-  const Int_t nBinPt = 120;
+  const Int_t nBinPt = 150;
   Double_t binLimitsPt[nBinPt+1];
   for(Int_t iPt = 0;iPt <= nBinPt;iPt++){
     if(iPt == 0){
       binLimitsPt[iPt] = -50.0;
     }
     else {// 1.0
-      binLimitsPt[iPt] =  binLimitsPt[iPt-1] + 2.5;
+      binLimitsPt[iPt] =  binLimitsPt[iPt-1] + 2.;
     }
   }
   const Int_t nBinPhi = 90;
@@ -394,6 +419,9 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
   fh1Trials = new TH1F("fh1Trials","trials root file",1,0,1);
   fh1Trials->GetXaxis()->SetBinLabel(1,"#sum{ntrials}");
   fHistList->Add(fh1Trials);
+  fh1AvgTrials = new TH1F("fh1AvgTrials","trials root file",1,0,1);
+  fh1AvgTrials->GetXaxis()->SetBinLabel(1,"#sum{avg ntrials}");
+  fHistList->Add(fh1AvgTrials);
   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);
@@ -457,6 +485,9 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
 
     fh1PtJetsInRej[ij]  = new TH1F(Form("fh1PtJets%sInRej",cAdd.Data()),Form("%s jets p_T;p_{T} (GeV/c)",cAdd.Data()),nBinPt,binLimitsPt);
     fHistList->Add(fh1PtJetsInRej[ij]);
+
+    fh1PtJetsInBest[ij]  = new TH1F(Form("fh1PtJets%sInBest",cAdd.Data()),Form("%s jets p_T;p_{T} (GeV/c)",cAdd.Data()),nBinPt,binLimitsPt);
+    fHistList->Add(fh1PtJetsInBest[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]);
@@ -479,35 +510,56 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
     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, trigger total bins = 4.5M
-    const Int_t nBinsSparse1 = 7;
-    Int_t nBins1[nBinsSparse1] = {     kMaxJets+1,120, 10,  25,    fNRPBins, 10,fNTrigger};
+    // Bins:  Jet number: pTJet, cent, mult, RP, Area, trigger, leading track pT total bins = 4.5M
+    const Int_t nBinsSparse1 = 9;
+    const Int_t nBinsLeadingTrackPt = 10;
+    const Int_t nBinsArea = 10;
+    Int_t nBins1[nBinsSparse1] = {     kMaxJets+1,120, 10,  fNBinsMult,    fNRPBins, nBinsArea,fNTrigger,fNBinsLeadingTrackPt,fNAcceptance+1};
     if(cJetBranch.Contains("RandomCone")){
       nBins1[1] = 600;
       nBins1[5] = 1;
     }
-    const Double_t xmin1[nBinsSparse1]  = {        -0.5,-50,  0,   0,        -0.5, 0.,-0.5};
-    const Double_t xmax1[nBinsSparse1]  = {kMaxJets+0.5,250,100,5000,fNRPBins-0.5,1.0,fNTrigger-0.5};
+    const Double_t xmin1[nBinsSparse1]  = {        -0.5,-50,  0,   0,        -0.5, 0.,         -0.5,  0.,           -0.5,};
+    const Double_t xmax1[nBinsSparse1]  = {kMaxJets+0.5,250,100,4000,fNRPBins-0.5,1.0,fNTrigger-0.5,200.,fNAcceptance+0.5};
     
-    fhnJetPt[ij] = new THnSparseF(Form("fhnJetPt%s",cAdd.Data()),";jet number;p_{T,jet};cent;# tracks;RP;area;trigger",nBinsSparse1,nBins1,xmin1,xmax1);
+    const Double_t binArrayArea[nBinsArea+1] = {xmin1[5],0.05,0.1,0.15,0.2,0.25,0.3,0.4,0.5,0.6,xmax1[5]};
+    const Double_t binArrayLeadingTrackPt[nBinsLeadingTrackPt+1] = {xmin1[7],1.,2.,3.,4.,5.,6.,8.,10.,12.,xmax1[7]}; //store pT of leading track in jet
+
+    fhnJetPt[ij] = new THnSparseF(Form("fhnJetPt%s",cAdd.Data()),";jet number;p_{T,jet};cent;# tracks;RP;area;trigger;leading track p_{T};acceptance bin",nBinsSparse1,nBins1,xmin1,xmax1);
+    fhnJetPt[ij]->SetBinEdges(5,binArrayArea);
+    if(fNBinsLeadingTrackPt>1) fhnJetPt[ij]->SetBinEdges(7,binArrayLeadingTrackPt);
     fHistList->Add(fhnJetPt[ij]);
+
+
+    // Bins:  pTJet, cent, trigger, 
+    const Int_t nBinsSparse1b = 3;
+    Int_t nBins1b[nBinsSparse1b] = {120, 10,fNTrigger};
+    const Double_t xmin1b[nBinsSparse1b]  = {-50,  0,-0.5};
+    const Double_t xmax1b[nBinsSparse1b]  = {250,100,fNTrigger-0.5};
+
+    fhnJetPtBest[ij] = new THnSparseF(Form("fhnJetPtBest%s",cAdd.Data()),";p_{T,jet};cent;trigger",nBinsSparse1b,nBins1b,xmin1b,xmax1b);
+    fHistList->Add(fhnJetPtBest[ij]);
+
+    fhnJetPtRej[ij] = new THnSparseF(Form("fhnJetPtRej%s",cAdd.Data()),";p_{T,jet};cent;trigger",nBinsSparse1b,nBins1b,xmin1b,xmax1b);
+    fHistList->Add(fhnJetPtRej[ij]);
     
     // Bins:  Jet number: pTJet, cent, eta, phi, Area.   total bins = 9.72 M
-    const Int_t nBinsSparse2 = 6;
-    Int_t nBins2[nBinsSparse2] = {     kMaxJets+1, 25,   5,  18,             360, 10};
+    const Int_t nBinsSparse2 = 9;
+    Int_t nBins2[nBinsSparse2] = {     kMaxJets+1, 25,   8,  18,             180, 10,fNTrigger,fNAcceptance+0.5,10};
     if(cJetBranch.Contains("RandomCone")){
       nBins2[5] = 1;
     }
-    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);
+    const Double_t xmin2[nBinsSparse2]  = {        -0.5,  0,   0,-0.9,              0,  0.,-0.5,-0.5,-100};
+    const Double_t xmax2[nBinsSparse2]  = {kMaxJets+0.5,250, 80, 0.9, 2.*TMath::Pi(),1.0,fNTrigger-0.5,fNAcceptance+0.5,100};
+    fhnJetPtQA[ij] = new THnSparseF(Form("fhnJetPtQA%s",cAdd.Data()),";jet number;p_{T,jet};cent;#eta;#phi;area;trigger;acceptance bin;signed pt leading",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};  
+    const Int_t nBinsSparse3 = 6;
+    const Int_t nRPBinsSparse3 = 3;
+    const Int_t nBins3[nBinsSparse3] = {       2,    100,     10,   1,    nRPBinsSparse3,fNTrigger};
+    const Double_t xmin3[nBinsSparse3]  = { -0.5,      0,   0,      0,        -0.5,-0.5};
+    const Double_t xmax3[nBinsSparse3]  = { 1.5,     200, 100,   4000,nRPBinsSparse3-0.5,fNTrigger-0.5};  
     
       // change the binning ot the pT axis:
     Double_t *xPt3 = new Double_t[nBins3[1]+1];
@@ -516,21 +568,22 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
       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 
+      else if(xPt3[i-1]<15)xPt3[i] = xPt3[i-1] +  1.; // 62 - 67
+      else if(xPt3[i-1]<20)xPt3[i] = xPt3[i-1] + 2.; // 67 - 72
+      else if(xPt3[i-1]<60)xPt3[i] = xPt3[i-1] + 5; // 72 - 76
+      else xPt3[i] = xPt3[i-1] + 10; // 76 - 100 = 140 
     }
     
-      fhnTrackPt[ij] = new THnSparseF(Form("fhnTrackPt%s",cAdd.Data()),";track number;p_{T};cent;#tracks;RP",nBinsSparse3,nBins3,xmin3,xmax3);
+      fhnTrackPt[ij] = new THnSparseF(Form("fhnTrackPt%s",cAdd.Data()),";track number;p_{T};cent;#tracks;RP;trigger",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()};  
+      const Int_t nBinsSparse4 = 6;
+      const Int_t nBins4[nBinsSparse4] =    {    2, 50,  10,  20, 180,2};
+      const Double_t xmin4[nBinsSparse4]  = { -0.5,  0,   0, -1.0,   0.,-1.5};
+      const Double_t xmax4[nBinsSparse4]  = {  1.5,150, 100,  1.0,2.*TMath::Pi(),1.5};  
 
       // change the binning ot the pT axis:
       Double_t *xPt4 = new Double_t[nBins4[1]+1];
@@ -542,7 +595,7 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
        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] = new THnSparseF(Form("fhnTrackPtQA%s",cAdd.Data()),";track number;p_{T};cent;#eta;#phi;sign",nBinsSparse4,nBins4,xmin4,xmax4);
       fhnTrackPtQA[ij]->SetBinEdges(1,xPt4);
       fHistList->Add(fhnTrackPtQA[ij]);
       delete [] xPt4;
@@ -764,7 +817,7 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
   Double_t eventW = 1;
   Double_t ptHard = 0; 
   Double_t nTrials = 1; // Trials for MC trigger 
-  fh1Trials->Fill("#sum{ntrials}",fAvgTrials); 
+  fh1AvgTrials->Fill("#sum{avg ntrials}",fAvgTrials); 
 
   // Getting some global properties
   fCentrality = GetCentrality();
@@ -901,25 +954,46 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
   Int_t ij0 = -1;
   Int_t ij1 = -1;
 
-  Double_t var1[7] = {0,}; // jet number;p_{T,jet};cent;# tracks;RP;area
+  Double_t var1[9] = {0,}; // jet number;p_{T,jet};cent;# tracks;RP;area;trigger;leadingTrackPt
+  Double_t var1b[3] = {0,}; // p_{T,jet};cent;trigger;
+
   var1[2] = fCentrality; 
+  var1b[1] = fCentrality; 
   var1[3] = refMult;
 
-  Double_t var2[6] = {0,}; // jet number;p_{T,jet};cent;#eta;#phi;area
+  
+
+  Double_t var2[9] = {0,}; // jet number;p_{T,jet};cent;#eta;#phi;area;trigger
   var2[2] = fCentrality;
 
   for(int ij = 0;ij < nJets;ij++){
     AliAODJet *jet = (AliAODJet*)jetsList.At(ij);
     Float_t ptJet = jet->Pt();
+    
+    
     if(ptJet<0.150)ptJet = jet->GetPtSubtracted(0);
+
+    var1b[0] = ptJet;
+    if(jet->Trigger()&fJetTriggerBestMask){
+      fh1PtJetsInBest[iType]->Fill(ptJet);
+      for(int it = 0;it <fNTrigger;it++){
+       if(fInputHandler->IsEventSelected()&fTriggerBit[it]){
+         var1b[2] = it;
+         fhnJetPtBest[iType]->Fill(var1b);
+       }
+      }
+    }
     if(jet->Trigger()&fJetTriggerExcludeMask){
       fh1PtJetsInRej[iType]->Fill(ptJet);
+      for(int it = 0;it <fNTrigger;it++){
+       if(fInputHandler->IsEventSelected()&fTriggerBit[it]){
+         var1b[2] = it;
+         fhnJetPtRej[iType]->Fill(var1b);
+       }
+      }
       continue;
     }
     fh1PtJetsIn[iType]->Fill(ptJet);
-    if(ptJet>ptOld){
-      Printf("%s:%d Jets Type %d Not Sorted !! %d:%.3E %d:%.3E",(char*)__FILE__,__LINE__,iType,ij,ptJet,ij-1,ptOld);
-    }
     ptOld = ptJet;
     
     // find the dijets assume sorting and acceptance cut...
@@ -954,26 +1028,33 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
       AliVParticle *leadTrack = LeadingTrackFromJetRefs(jet);
       //      AliVParticle *leadTrack = LeadingTrackInCone(jet,&particlesList);
       Int_t phiBin = GetPhiBin(phiJet-fRPAngle);
+      Double_t ptLead = jet->GetPtLeading(); //pT of leading jet
 
       var1[1] = ptJet;
       var1[4] = phiBin;
       var1[5] = jet->EffectiveAreaCharged();
+      var1[7] = ptLead;
+      var1[8] = CheckAcceptance(phiJet,etaJet);
 
       var2[1] = ptJet;
       var2[3] = etaJet;
       var2[4] = phiJet;
       var2[5] = jet->EffectiveAreaCharged();
+      var2[7] = var1[8];
+      var2[8] = (leadTrack?leadTrack->Charge()*leadTrack->Pt():0);//pT of leading jet x charge
+
       if(ij<kMaxJets){
-       if(leadTrack)fh2LTrackPtJetPt[iType][ij]->Fill(leadTrack->Pt(),ptJet);
+       fh2LTrackPtJetPt[iType][ij]->Fill(jet->GetPtLeading(),ptJet);
        var1[0] = ij;
        var2[0] = ij;
        for(int it = 0;it <fNTrigger;it++){
          if(fInputHandler->IsEventSelected()&fTriggerBit[it]){
            var1[6] = it;
+           var2[6] = it;
            fhnJetPt[iType]->Fill(var1);
+           fhnJetPtQA[iType]->Fill(var2);
          }
        }
-       fhnJetPtQA[iType]->Fill(var2);
       }
       var1[0] = kMaxJets;// fill for all jets
       var2[0] = kMaxJets;// fill for all jets
@@ -981,11 +1062,11 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
        if(fInputHandler->IsEventSelected()&fTriggerBit[it]){
          var1[6] = it;
          fhnJetPt[iType]->Fill(var1);
+         fhnJetPtQA[iType]->Fill(var2);
        }
       }
 
-      fhnJetPtQA[iType]->Fill(var2);
-      if(leadTrack)fh2LTrackPtJetPt[iType][kMaxJets]->Fill(leadTrack->Pt(),ptJet);
+      fh2LTrackPtJetPt[iType][kMaxJets]->Fill(jet->GetPtLeading(),ptJet);
 
       if(particlesList.GetSize()&&ij<kMaxJets){
        // Particles... correlated with jets...
@@ -1067,10 +1148,10 @@ void AliAnalysisTaskJetSpectrum2::FillTrackHistos(TList &particlesList,int iType
   }
 
   // 
-  Double_t var3[5]; // track number;p_{T};cent;#tracks;RP
+  Double_t var3[6]; // track number;p_{T};cent;#tracks;RP
   var3[2] = fCentrality;
   var3[3] = refMult;
-  Double_t var4[5]; // track number;p_{T};cent;#eta;#phi
+  Double_t var4[6]; // track number;p_{T};cent;#eta;#phi;sign
   var4[2] = fCentrality;
   Int_t nTrackOver = particlesList.GetSize();
   // do the same for tracks and jets
@@ -1128,15 +1209,29 @@ void AliAnalysisTaskJetSpectrum2::FillTrackHistos(TList &particlesList,int iType
       var4[1] = tmpPt;
       var4[3] = tmpTrack->Eta();
       var4[4] = tmpPhi;
+      var4[5] = tmpTrack->Charge();
+
+      
+      for(int it = 0;it <fNTrigger;it++){
+       if(fInputHandler->IsEventSelected()&fTriggerBit[it]){
+         var3[0] = 1;
+         var3[5] = it;
+         fhnTrackPt[iType]->Fill(var3);
+         if(tmpTrack==leading){
+           var3[0] = 0;         
+           fhnTrackPt[iType]->Fill(var3);   
+         }
+       }
+      }
+
+
+
 
 
-      fhnTrackPt[iType]->Fill(var3);
       fhnTrackPtQA[iType]->Fill(var4);
 
       if(tmpTrack==leading){
-       var3[0] = 0;
        var4[0] = 0;
-       fhnTrackPt[iType]->Fill(var3);
        fhnTrackPtQA[iType]->Fill(var4);
        continue;
       }
@@ -1179,7 +1274,9 @@ void AliAnalysisTaskJetSpectrum2::FillMatchHistos(TList &recJetsList,TList &genJ
     }
   }
 
-  Double_t container[6];
+  Double_t container[8];
+  Double_t containerRec[4];
+  Double_t containerGen[4];
 
   // loop over generated jets
   // consider the 
@@ -1189,18 +1286,29 @@ void AliAnalysisTaskJetSpectrum2::FillMatchHistos(TList &recJetsList,TList &genJ
     Double_t phiGen = genJet->Phi();
     if(phiGen<0)phiGen+=TMath::Pi()*2.;    
     Double_t etaGen = genJet->Eta();
-    container[3] = ptGen;
-    container[4] = etaGen;
-    container[5] = phiGen;
-    fhnJetContainer->Fill(&container[3],kStep0);
-    if(JetSelected(genJet)){
-      fhnJetContainer->Fill(&container[3],kStep1);
-      Int_t ir = aRecIndex[ig];
-      if(ir>=0&&ir<recJetsList.GetEntries()){   
-       fhnJetContainer->Fill(&container[3],kStep2);
+    containerGen[0] = ptGen;
+    containerGen[1] = etaGen;
+    containerGen[2] = phiGen;
+    containerGen[3] = genJet->GetPtLeading();
+
+    fhnJetContainer->Fill(containerGen,kStep0); //all generated jets
+
+    Int_t ir = aRecIndex[ig];
+    if(ir>=0&&ir<recJetsList.GetEntries()){   
+      fhnJetContainer->Fill(containerGen,kStep2); // all generated jets with reconstructed partner
+      
+      if(JetSelected(genJet)){
+       fhnJetContainer->Fill(containerGen,kStep1); // all generated jets in eta window
+
        AliAODJet* recJet = (AliAODJet*)recJetsList.At(ir); 
-       if(JetSelected(recJet))fhnJetContainer->Fill(&container[3],kStep4);
-       if(JetSelected(recJet))fhnJetContainer->Fill(&container[3],kStep3);
+
+       fhnJetContainer->Fill(containerGen,kStep3); // all generated jets in eta window with reconstructed partner
+       if(JetSelected(recJet)) {
+         fhnJetContainer->Fill(containerGen,kStep4); // all generated jets in eta window with reconstructed partner in eta window
+
+         containerGen[3] = recJet->GetPtLeading();
+         fhnJetContainer->Fill(containerGen,kStep5); // all generated jets in eta window with reconstructed partner in eta window with leading track on reconstructed level
+       }
       }
     }
   }// loop over generated jets used for matching...
@@ -1214,37 +1322,44 @@ void AliAnalysisTaskJetSpectrum2::FillMatchHistos(TList &recJetsList,TList &genJ
     Double_t ptRec = recJet->Pt();
     Double_t phiRec = recJet->Phi();
     if(phiRec<0)phiRec+=TMath::Pi()*2.;    
-    // do something with dijets...
     
+    containerRec[0] = ptRec;
+    containerRec[1] = etaRec;
+    containerRec[2] = phiRec;
+    containerRec[3] = recJet->GetPtLeading();
+
     container[0] = ptRec;
     container[1] = etaRec;
     container[2] = phiRec;
+    container[3] = recJet->GetPtLeading();
 
-    fhnJetContainer->Fill(container,kStep0+kMaxStep);
     if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
   
     if(JetSelected(recJet)){
-      fhnJetContainer->Fill(container,kStep1+kMaxStep);
+      fhnJetContainer->Fill(containerRec,kStep7); //all rec jets in eta window
       // Fill Correlation
       Int_t ig = aGenIndex[ir];
       if(ig>=0 && ig<genJetsList.GetEntries()){
-       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();
        Double_t phiGen = genJet->Phi();
        if(phiGen<0)phiGen+=TMath::Pi()*2.; 
        Double_t etaGen = genJet->Eta();
-      
-       container[3] = ptGen;
-       container[4] = etaGen;
-       container[5] = phiGen;
-       // 
-       // 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->Fill(container,kStep4+kMaxStep);
-       fhnJetContainer->Fill(container,kStep3+kMaxStep);
-       fhnCorrelation->Fill(container,0);
+
+       containerGen[0] = ptGen;
+       containerGen[1] = etaGen;
+       containerGen[2] = phiGen;
+       containerGen[3] = genJet->GetPtLeading();
+
+       container[4] = ptGen;
+       container[5] = etaGen;
+       container[6] = phiGen;
+       container[7] = genJet->GetPtLeading();
+
+       fhnJetContainer->Fill(containerGen,kStep6); // all rec jets in eta window with generated partner
+
+       fhnCorrelation->Fill(container);
        if(ptGen>0){
          Float_t delta = (ptRec-ptGen)/ptGen;
          fh2RelPtFGen->Fill(ptGen,delta);
@@ -1262,10 +1377,11 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
   // Create the particle container for the correction framework manager and 
   // link it
   //
-  const Int_t kNvar   = 3 ; //number of variables on the grid:pt,eta, phi
+  const Int_t kNvar   = 4 ; //number of variables on the grid:pt,eta, phi
   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 kEtamin = -1.0, kEtamax = 1.0;
   const Double_t kPhimin = 0., kPhimax = 2. * TMath::Pi();
+  const Double_t kPtLeadingTrackPtMin = 0., kPtLeadingTrackPtMax = 200.;
 
   // can we neglect migration in eta and phi?
   // phi should be no problem since we cover full phi and are phi symmetric
@@ -1275,8 +1391,9 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
   //arrays for the number of bins in each dimension
   Int_t iBin[kNvar];
   iBin[0] = 125; //bins in pt
-  iBin[1] =  1; //bins in eta 
-  iBin[2] = 1; // bins in phi
+  iBin[1] =  4; //bins in eta 
+  iBin[2] =  1; // bins in phi
+  iBin[3] =  10; // bins in leading track Pt
 
   //arrays for lower bounds :
   Double_t* binEdges[kNvar];
@@ -1288,9 +1405,19 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
   for(Int_t i=0; i<=iBin[0]; i++) binEdges[0][i]=(Double_t)kPtmin  + (kPtmax-kPtmin)/(Double_t)iBin[0]*(Double_t)i;
   for(Int_t i=0; i<=iBin[1]; i++) binEdges[1][i]=(Double_t)kEtamin  + (kEtamax-kEtamin)/iBin[1]*(Double_t)i;
   for(Int_t i=0; i<=iBin[2]; i++) binEdges[2][i]=(Double_t)kPhimin  + (kPhimax-kPhimin)/iBin[2]*(Double_t)i;
-
-
-  fhnJetContainer = new AliTHn(Form("fahnJetContainer"),Form("AliTHn jet info"),kMaxStep*2,kNvar,iBin);
+  binEdges[3][0]= kPtLeadingTrackPtMin;
+  binEdges[3][1]= 1.;
+  binEdges[3][2]= 2.;
+  binEdges[3][3]= 3.;
+  binEdges[3][4]= 4.;
+  binEdges[3][5]= 5.;
+  binEdges[3][6]= 6.;
+  binEdges[3][7]= 8.;
+  binEdges[3][8]= 10.;
+  binEdges[3][9]= 12.;
+  binEdges[3][10]= kPtLeadingTrackPtMax;
+
+  fhnJetContainer = new AliCFContainer(Form("fhnJetContainer"),Form("AliCFContainer jet info"),kMaxStep,kNvar,iBin);
   for (int k=0; k<kNvar; k++) {
     fhnJetContainer->SetBinLimits(k,binEdges[k]);
   }
@@ -1304,10 +1431,10 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
     thnDim[k+kNvar] = iBin[k];
   }
 
-  fhnCorrelation = new AliTHn("fahnCorrelation","AliTHn with correlations",1,2*kNvar,thnDim);
+  fhnCorrelation = new THnSparseF("fhnCorrelation","THnSparseF with correlations",2*kNvar,thnDim);
   for (int k=0; k<kNvar; k++) {
-    fhnCorrelation->SetBinLimits(k,binEdges[k]);
-    fhnCorrelation->SetBinLimits(k+kNvar,binEdges[k]);
+    fhnCorrelation->SetBinEdges(k,binEdges[k]);
+    fhnCorrelation->SetBinEdges(k+kNvar,binEdges[k]);
   }
 
   for(Int_t ivar = 0; ivar < kNvar; ivar++)
@@ -1533,6 +1660,9 @@ Int_t AliAnalysisTaskJetSpectrum2::GetPhiBin(Double_t phi)
 }
 
 void AliAnalysisTaskJetSpectrum2::SetNTrigger(Int_t n){
+  //
+  // set number of trigger bins
+  //
   if(n>0){
       fNTrigger = n;
       delete [] fTriggerName;
@@ -1545,15 +1675,90 @@ void AliAnalysisTaskJetSpectrum2::SetNTrigger(Int_t n){
   }
 }
 
+
 void AliAnalysisTaskJetSpectrum2::SetTrigger(Int_t i,UInt_t it,const char* c){
+  //
+  // set trigger bin
+  //
   if(i<fNTrigger){
     fTriggerBit[i] = it;
     fTriggerName[i] =  c;     
   } 
 }
 
+
+void AliAnalysisTaskJetSpectrum2::SetNAcceptance(Int_t n){
+  //
+  // Set number of acceptance bins
+  //
+
+  if(n>0){
+      fNAcceptance = n;
+      delete [] fAcceptancePhiMin; 
+      delete [] fAcceptancePhiMax;
+      delete [] fAcceptanceEtaMin;
+      delete [] fAcceptanceEtaMax;
+
+      fAcceptancePhiMin = new Float_t[fNAcceptance];
+      fAcceptancePhiMax = new Float_t[fNAcceptance];
+      fAcceptanceEtaMin = new Float_t[fNAcceptance];
+      fAcceptanceEtaMax = new Float_t[fNAcceptance];
+  }
+  else{
+    fNTrigger = 0;
+  }
+}
+
+void AliAnalysisTaskJetSpectrum2::SetAcceptance(Int_t i,Float_t phiMin,Float_t phiMax,Float_t etaMin,Float_t etaMax){
+  //
+  // Set acceptance bins
+  //
+
+  if(i<fNAcceptance){
+    Printf("%s:%d Setting acceptance %d phi %3.3f-%3.3f eta %3.3f-%3.3f",(char*)__FILE__,__LINE__,i,phiMin,phiMax,etaMin,etaMax); 
+
+    fAcceptancePhiMin[i] = phiMin; 
+    fAcceptancePhiMax[i] = phiMax;
+    fAcceptanceEtaMin[i] = etaMin;
+    fAcceptanceEtaMax[i] = etaMax;
+  }
+  else{
+    fNTrigger = 0;
+  }
+}
+
+
+Int_t AliAnalysisTaskJetSpectrum2::CheckAcceptance(Float_t phi,Float_t eta){
+
+  //
+  // return aceptnace bin do no use ovelapping bins
+  //
+
+  for(int i = 0;i<fNAcceptance;i++){    
+    if(phi<fAcceptancePhiMin[i])continue;
+    if(phi>fAcceptancePhiMax[i])continue;
+    if(eta<fAcceptanceEtaMin[i])continue;
+    if(eta>fAcceptanceEtaMax[i])continue;
+    return i;
+  }
+  // catch the rest
+  return fNAcceptance;
+}
+
+
+
+
+
 AliAnalysisTaskJetSpectrum2::~AliAnalysisTaskJetSpectrum2(){
   // 
   delete [] fTriggerBit;
   delete [] fTriggerName;
+
+  delete [] fAcceptancePhiMin; 
+  delete [] fAcceptancePhiMax;
+  delete [] fAcceptanceEtaMin;
+  delete [] fAcceptanceEtaMax;
+
+
+
 }