]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWGJE/AliAnalysisTaskJetSpectrum2.cxx
Include L0 trigger in the trigger maker and the trigger patch object Add monitoring...
[u/mrichter/AliRoot.git] / PWGJE / AliAnalysisTaskJetSpectrum2.cxx
index 6a396c49a0bc379f4645bc84e25b32cdaef4a4e4..dd811e2a67463f144a590bbe4b51cd0b0eade9af 100644 (file)
@@ -18,7 +18,6 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
-
  
 #include <TROOT.h>
 #include <TRandom.h>
@@ -93,6 +92,8 @@ AliAnalysisTaskSE(),
   fDoMatching(kFALSE),
   fNMatchJets(5),
   fNRPBins(3),
+  fTRP(0),
+  fDebug(0),
   fJetTriggerExcludeMask(AliAODJet::kHighTrackPtTriggered),
   fJetTriggerBestMask(AliAODJet::kHighTrackPtBest),
   fFilterMask(0),
@@ -137,7 +138,13 @@ AliAnalysisTaskSE(),
   fh2MultGen(0x0),
   fh2RPCentrality(0x0),
   fh2PtFGen(0x0),
+  fh2deltaPt1Pt2(0x0),
   fh2RelPtFGen(0x0),
+  fh3RelPtFGenLeadTrkPt(0x0),
+  fh1EvtSelection(0),
+  fMaxVertexZ(100.),
+  fMinNcontributors(0),
+  fRejectPileup(0),
   fHistList(0x0)  
 {
 
@@ -200,6 +207,8 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
   fDoMatching(kFALSE),
   fNMatchJets(5),
   fNRPBins(3),
+  fTRP(0),
+  fDebug(0),
   fJetTriggerExcludeMask(AliAODJet::kHighTrackPtTriggered),
   fJetTriggerBestMask(AliAODJet::kHighTrackPtBest),
   fFilterMask(0),
@@ -244,7 +253,13 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
   fh2MultGen(0x0),
   fh2RPCentrality(0x0),
   fh2PtFGen(0x0),
+  fh2deltaPt1Pt2(0x0),
   fh2RelPtFGen(0x0),
+  fh3RelPtFGenLeadTrkPt(0x0),
+  fh1EvtSelection(0),
+  fMaxVertexZ(100.),
+  fMinNcontributors(0),
+  fRejectPileup(0),
   fHistList(0x0)
 {
 
@@ -360,13 +375,13 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
 
   
   // event npsparse cent, mult
-  const Int_t nBinsSparse0 = 3;
-  const Int_t nBins0[nBinsSparse0] = {     100, 500,fNTrigger};
-  const Double_t xmin0[nBinsSparse0]  = {    0,   0, -0.5};
-  const Double_t xmax0[nBinsSparse0]  = {  100,5000,fNTrigger-0.5};
+  const Int_t nBinsSparse0 = 4;
+  const Int_t nBins0[nBinsSparse0] = {     100, 500,fNTrigger,125};
+  const Double_t xmin0[nBinsSparse0]  = {    0,   0, -0.5,-2};
+  const Double_t xmax0[nBinsSparse0]  = {  100,5000,fNTrigger-0.5,248};
       
 
-  fhnEvent = new THnSparseF("fhnEvent",";cent;mult",nBinsSparse0,
+  fhnEvent = new THnSparseF("fhnEvent",";cent;mult:trigger;#rho",nBinsSparse0,
                            nBins0,xmin0,xmax0);
   fHistList->Add(fhnEvent);
 
@@ -379,7 +394,17 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
   //  Histogram
     
 
+  fh1EvtSelection            = new TH1F("fh1EvtSelection", "Event Selection", 7, -0.5, 6.5);
+  fh1EvtSelection->GetXaxis()->SetBinLabel(1,"ACCEPTED");
+  fh1EvtSelection->GetXaxis()->SetBinLabel(2,"event selection: rejected");
+  fh1EvtSelection->GetXaxis()->SetBinLabel(3,"event class: rejected");
+  fh1EvtSelection->GetXaxis()->SetBinLabel(4,"vertex Ncontr: rejected");
+  fh1EvtSelection->GetXaxis()->SetBinLabel(5,"vertex z: rejected");
+  fh1EvtSelection->GetXaxis()->SetBinLabel(6,"vertex type: rejected");
+  fh1EvtSelection->GetXaxis()->SetBinLabel(7,"pileup: rejected");
 
+  fHistList->Add(fh1EvtSelection);
   const Int_t nBinPt = 150;
   Double_t binLimitsPt[nBinPt+1];
   for(Int_t iPt = 0;iPt <= nBinPt;iPt++){
@@ -451,9 +476,30 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
   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);
 
+  //  fh2deltaPt1Pt2(0x0),
+  fh2deltaPt1Pt2 = new TH3F("fh2deltaPt1Pt2",Form("%s vs. %s;delta;p_{T,gen};p_{T,rec}",fBranchRec.Data(),fBranchGen.Data()),nBinPt,binLimitsPt,nBinPt,binLimitsPt,nBinPt,binLimitsPt);
+  fHistList->Add(fh2deltaPt1Pt2);
+
   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);
-  
+
+  const Int_t nBinsLeadingTrackPt = 10;
+  const Double_t binArrayLeadingTrackPt[nBinsLeadingTrackPt+1] = {0.,1.,2.,3.,4.,5.,6.,8.,10.,12.,200.}; //store pT of leading track in jet
+
+  const Int_t nBinDeltaPt = 241;
+  Double_t binLimitsDeltaPt[nBinDeltaPt+1];
+  for(Int_t iDeltaPt = 0;iDeltaPt <= nBinDeltaPt;iDeltaPt++){
+    if(iDeltaPt == 0){
+      binLimitsDeltaPt[iDeltaPt] = -2.41;
+    }
+    else {
+      binLimitsDeltaPt[iDeltaPt] =  binLimitsDeltaPt[iDeltaPt-1] + 0.02;
+    }
+  }
+
+  fh3RelPtFGenLeadTrkPt = new TH3F("fh3RelPtFGenLeadTrkPt",";p_{T,gen};p_{T,rec}-p_{T,gen}/p_{T,Gen};p_{T}^{leading track}",nBinPt,binLimitsPt,nBinDeltaPt,binLimitsDeltaPt,nBinsLeadingTrackPt,binArrayLeadingTrackPt);
+  fHistList->Add(fh3RelPtFGenLeadTrkPt);  
+
   for(int ij = 0;ij <kJetTypes;++ij){    
     TString cAdd = "";
     TString cJetBranch = "";
@@ -512,18 +558,24 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
 
     // 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};
+    Int_t nbinr5=120;
+    Int_t nbinr5min=-50;
+  
+    if(cJetBranch.Contains("KT05")){
+     nbinr5=132;
+     nbinr5min=-80;}
+         
+    Int_t nBins1[nBinsSparse1] = {     kMaxJets+1,nbinr5, 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,  0.,           -0.5,};
+    const Double_t xmin1[nBinsSparse1]  = {        -0.5, static_cast<Double_t>(nbinr5min),  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};
-    
+     
     const Double_t binArrayArea[nBinsArea+1] = {xmin1[5],0.07,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);
@@ -545,22 +597,22 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
     
     // Bins:  Jet number: pTJet, cent, eta, phi, Area, trigger, acceptance, signed pT leading
     const Int_t nBinsSparse2 = 9;
-    Int_t nBins2[nBinsSparse2] = {     kMaxJets+1, 60,   8,  18, 72, 10,fNTrigger,fNAcceptance+0.5,10};
+    Int_t nBins2[nBinsSparse2] = {     kMaxJets+1, 60,   8,  6, 90, 100,fNTrigger,fNAcceptance+1,20};
     if(cJetBranch.Contains("RandomCone")){
       nBins2[5] = 1;
     }
     const Double_t xmin2[nBinsSparse2]  = {        -0.5, -50,  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);
-    fhnJetPt[ij]->SetBinEdges(5,binArrayArea);
+    //    fhnJetPt[ij]->SetBinEdges(5,binArrayArea);
     fHistList->Add(fhnJetPtQA[ij]);
     
-    // Bins:track number  pTtrack, cent, mult, RP.   total bins = 224 k
-    const Int_t nBinsSparse3 = 6;
+    // Bins:track number  pTtrack, cent, mult, RP.  charge total bins = 224 k
+    const Int_t nBinsSparse3 = 7;
     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};  
+    const Int_t nBins3[nBinsSparse3] = {       2,    100,     10,   1,    nRPBinsSparse3,fNTrigger,2};
+    const Double_t xmin3[nBinsSparse3]  = { -0.5,      0,   0,      0,        -0.5,-0.5,-1.5};
+    const Double_t xmax3[nBinsSparse3]  = { 1.5,     200, 100,   4000,nRPBinsSparse3-0.5,fNTrigger-0.5,1.5};  
     
     // change the binning of the pT axis:
     Double_t *xPt3 = new Double_t[nBins3[1]+1];
@@ -582,8 +634,8 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
 
     // Track QA bins track nr, pTrack, cent, eta, phi bins 5.4 M
     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 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:
@@ -664,6 +716,14 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
     selected = AliAnalysisHelperJetTasks::TestSelectInfo(fEventSelectionMask);
   }
 
+  if(!selected){
+    // no selection by the service task, we continue
+    if (fDebug > 1)Printf("Not selected %s:%d SelectInfo %d  Class %d",(char*)__FILE__,__LINE__, AliAnalysisHelperJetTasks::Selected(),AliAnalysisHelperJetTasks::EventClass());
+    fh1EvtSelection->Fill(1.); 
+    PostData(1, fHistList);
+    return;
+  }
+
   if(fEventClass>0){
     selected = selected&&(AliAnalysisHelperJetTasks::EventClass()==fEventClass);
   }
@@ -671,6 +731,7 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
   if(!selected){
     // no selection by the service task, we continue
     if (fDebug > 1)Printf("Not selected %s:%d SelectInfo %d  Class %d",(char*)__FILE__,__LINE__, AliAnalysisHelperJetTasks::Selected(),AliAnalysisHelperJetTasks::EventClass());
+    fh1EvtSelection->Fill(2.);
     PostData(1, fHistList);
     return;
   }
@@ -786,6 +847,44 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
     }
   }
 
+  AliAODVertex* primVtx = aod->GetPrimaryVertex();
+  Int_t nTracksPrim = primVtx->GetNContributors();
+  
+  
+  if (fDebug > 1) Printf("%s:%d primary vertex selection: %d", (char*)__FILE__,__LINE__,nTracksPrim);
+  if(nTracksPrim < fMinNcontributors){
+    if (fDebug > 1) Printf("%s:%d primary vertex selection: event REJECTED...",(char*)__FILE__,__LINE__); 
+    fh1EvtSelection->Fill(3.);
+    PostData(1, fHistList);
+    return;
+  }
+  
+  if(TMath::Abs(primVtx->GetZ())>fMaxVertexZ){
+    if (fDebug > 1) Printf("%s:%d primary vertex z = %f: event REJECTED...",(char*)__FILE__,__LINE__,primVtx->GetZ()); 
+    fh1EvtSelection->Fill(4.);
+    PostData(1, fHistList);
+    return; 
+  }
+  
+  TString primVtxName(primVtx->GetName());
+
+  if(primVtxName.CompareTo("TPCVertex",TString::kIgnoreCase) == 1){
+    if (fDebug > 1) Printf("%s:%d primary vertex selection: TPC vertex, event REJECTED...",(char*)__FILE__,__LINE__);
+    fh1EvtSelection->Fill(5.);
+    PostData(1, fHistList);
+    return;
+  }
+
+  if(fRejectPileup && AliAnalysisHelperJetTasks::IsPileUp()){
+    if (fDebug > 1) Printf("%s:%d SPD pileup: event REJECTED...",(char*)__FILE__,__LINE__);
+    fh1EvtSelection->Fill(6.);
+    PostData(1, fHistList);
+    return;
+  }
+
+  if (fDebug > 1) Printf("%s:%d event ACCEPTED ...",(char*)__FILE__,__LINE__); 
+  fh1EvtSelection->Fill(0.);
+
  
   // new Scheme
   // first fill all the pure  histograms, i.e. full jets 
@@ -857,6 +956,7 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
   TList genParticles;
 
   Int_t nT = GetListOfTracks(&recParticles,fTrackTypeRec);
+
   if(fDebug>2)Printf("%s:%d Selected Rec tracks: %d %d",(char*)__FILE__,__LINE__,nT,recParticles.GetEntries());
   nT = GetListOfTracks(&genParticles,fTrackTypeGen);
   if(fDebug>2)Printf("%s:%d Selected Gen tracks: %d %d",(char*)__FILE__,__LINE__,nT,genParticles.GetEntries());
@@ -895,12 +995,13 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
   fMultGen = genMult1;
   if(fMultGen<=0)fMultGen = genMult2;
 
-  Double_t var0[3] = {0,};
+  Double_t var0[4] = {0,};
   var0[0] = fCentrality;
   var0[1] = fMultRec;
   for(int it=0;it<fNTrigger;it++){
     if(fInputHandler->IsEventSelected()&fTriggerBit[it]){
       var0[2] = it;
+      var0[3] = GetRho(recJetsList);
       fhnEvent->Fill(var0);
     }
   }
@@ -947,8 +1048,6 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
 
   if(nJets<=0)return;
   
-  Float_t ptOld = 1.E+32;
-  Float_t pT0 = 0;
   Float_t pT1 = 0;
   Float_t phi0 = 0;
   Float_t phi1 = 0;
@@ -995,12 +1094,10 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
       continue;
     }
     fh1PtJetsIn[iType]->Fill(ptJet);
-    ptOld = ptJet;
     
     // find the dijets assume sorting and acceptance cut...
     if(ij==0){
       ij0 = ij;
-      pT0 = ptJet;
       phi0 = jet->Phi();
       if(phi0<0)phi0+=TMath::Pi()*2.;
     }
@@ -1017,7 +1114,6 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
       }
     }
     // fill jet histos for kmax jets
-
     Float_t phiJet = jet->Phi();
     Float_t etaJet = jet->Eta();
     if(phiJet<0)phiJet+=TMath::Pi()*2.;    
@@ -1027,16 +1123,33 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
     fh1PtIn[iType][kMaxJets]->Fill(ptJet);
     // fill leading jets...
     AliVParticle *leadTrack = LeadingTrackFromJetRefs(jet);
-    //      AliVParticle *leadTrack = LeadingTrackInCone(jet,&particlesList);
+    //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);
-
+    AliVParticle *tt = (AliVParticle*)particlesList.At(0);
+    Float_t ttphi=tt->Phi();
+    if(ttphi<0)ttphi+=TMath::Pi()*2.;  
+    Float_t ttpt=tt->Pt();
+    Int_t phiBintt = GetPhiBin(ttphi-fRPAngle);
+    Double_t dphitrigjet=RelativePhi(ttphi,phiJet);
+    if(fTRP==1){
+      if(TMath::Abs(dphitrigjet)<TMath::Pi()-0.6) continue; 
+      var1[1] = ptJet;
+      var1[4] = phiBintt;
+      var1[5] = jet->EffectiveAreaCharged();
+      var1[7] = ttpt;
+      var1[8] = CheckAcceptance(phiJet,etaJet);
+    }
+    
+    if(fTRP==0){
+      var1[1] = ptJet;
+      var1[4] = phiBin;
+      var1[5] = jet->EffectiveAreaCharged();
+      var1[7] = ptLead;
+      var1[8] = CheckAcceptance(phiJet,etaJet);
+    }
+    
+    //jet number;p_{T,jet};cent;#eta;#phi;area;trigger;acceptance bin;signed pt leading
     var2[1] = ptJet;
     var2[3] = etaJet;
     var2[4] = phiJet;
@@ -1062,6 +1175,7 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
     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);
       }
@@ -1149,7 +1263,7 @@ void AliAnalysisTaskJetSpectrum2::FillTrackHistos(TList &particlesList,int iType
   }
 
   // 
-  Double_t var3[6]; // track number;p_{T};cent;#tracks;RP
+  Double_t var3[7]; // track number;p_{T};cent;#tracks;RP;cahrge
   var3[2] = fCentrality;
   var3[3] = refMult;
   Double_t var4[6]; // track number;p_{T};cent;#eta;#phi;sign
@@ -1205,6 +1319,7 @@ void AliAnalysisTaskJetSpectrum2::FillTrackHistos(TList &particlesList,int iType
       var3[0] = 1;
       var3[1] = tmpPt;
       var3[4] = phiBin;
+      var3[6] = tmpTrack->Charge();
       
       var4[0] = 1;
       var4[1] = tmpPt;
@@ -1228,14 +1343,17 @@ void AliAnalysisTaskJetSpectrum2::FillTrackHistos(TList &particlesList,int iType
 
 
 
-
       fhnTrackPtQA[iType]->Fill(var4);
-
       if(tmpTrack==leading){
        var4[0] = 0;
        fhnTrackPtQA[iType]->Fill(var4);
        continue;
       }
+
+
+
+
+      
     }  
     fh1SumPtTrack[iType]->Fill(sumPt);
     delete trackIter;
@@ -1294,22 +1412,24 @@ void AliAnalysisTaskJetSpectrum2::FillMatchHistos(TList &recJetsList,TList &genJ
 
     fhnJetContainer->Fill(containerGen,kStep0); //all generated jets
 
+    if(JetSelected(genJet))
+      fhnJetContainer->Fill(containerGen,kStep1); // all generated jets in eta window
+
     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); 
 
-       AliAODJet* recJet = (AliAODJet*)recJetsList.At(ir); 
+      fhnJetContainer->Fill(containerGen,kStep2); // all generated jets with reconstructed partner
 
+      if(JetSelected(genJet)){ 
        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
+         
        }
+       containerGen[3] = recJet->GetPtLeading();
+       fhnJetContainer->Fill(containerGen,kStep5); // all generated jets in eta window with reconstructed partner with leading track on reconstructed level
       }
     }
   }// loop over generated jets used for matching...
@@ -1361,11 +1481,14 @@ void AliAnalysisTaskJetSpectrum2::FillMatchHistos(TList &recJetsList,TList &genJ
        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);
-         fh2PtFGen->Fill(ptGen,ptRec);
-       }
+       
+       Float_t delta = (ptRec-ptGen)/ptGen;
+       fh2RelPtFGen->Fill(ptGen,delta);
+       fh3RelPtFGenLeadTrkPt->Fill(ptGen,delta,recJet->GetPtLeading());
+       fh2PtFGen->Fill(ptGen,ptRec);
+
+       fh2deltaPt1Pt2->Fill(ptRec-ptGen,ptRec,ptGen);
+       
       } 
     }// loop over reconstructed jets
   }
@@ -1650,6 +1773,24 @@ AliVParticle *AliAnalysisTaskJetSpectrum2::LeadingTrackInCone(AliAODJet* jet,TLi
   return leading;
 }
 
+
+Double_t AliAnalysisTaskJetSpectrum2::RelativePhi(Double_t mphi,Double_t vphi){
+
+  if (vphi < -1*TMath::Pi()) vphi += (2*TMath::Pi());
+  else if (vphi > TMath::Pi()) vphi -= (2*TMath::Pi());
+  if (mphi < -1*TMath::Pi()) mphi += (2*TMath::Pi());
+  else if (mphi > TMath::Pi()) mphi -= (2*TMath::Pi());
+  double dphi = mphi-vphi;
+  if (dphi < -1*TMath::Pi()) dphi += (2*TMath::Pi());
+  else if (dphi > TMath::Pi()) dphi -= (2*TMath::Pi());
+  return dphi;//dphi in [-Pi, Pi]
+}
+
+
+
+
+
+
 Int_t AliAnalysisTaskJetSpectrum2::GetPhiBin(Double_t phi)
 {
   Int_t phibin=-1;
@@ -1746,7 +1887,16 @@ Int_t AliAnalysisTaskJetSpectrum2::CheckAcceptance(Float_t phi,Float_t eta){
   return fNAcceptance;
 }
 
+Float_t AliAnalysisTaskJetSpectrum2::GetRho(TList &list){
 
+  // invert the correction
+  AliAODJet *jet = (AliAODJet*)list.At(0);  // highest pt jet
+  if(!jet)return -1;
+  if(jet->EffectiveAreaCharged()<=0)return -1;
+  Float_t rho = jet->ChargedBgEnergy()/jet->EffectiveAreaCharged();
+  return rho;
+}