]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
fix to avoid crash when runnign with option 1
[u/mrichter/AliRoot.git] / PWG4 / JetTasks / AliAnalysisTaskJetSpectrum2.cxx
index 96c35c33cd4780904b199b7c954d39adb58b5c8f..77e0753dce63ba2c45587bff1730eed10ee0c89a 100644 (file)
@@ -1,4 +1,3 @@
-
 // **************************************
 // Task used for the correction of determiantion of reconstructed jet spectra
 // Compares input (gen) and output (rec) jets   
@@ -35,6 +34,7 @@
 #include <TList.h>
 #include <TLorentzVector.h>
 #include <TClonesArray.h>
+#include <TRefArray.h>
 #include  "TDatabasePDG.h"
 
 #include "AliAnalysisTaskJetSpectrum2.h"
@@ -64,7 +64,8 @@
 
 ClassImp(AliAnalysisTaskJetSpectrum2)
 
-AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(): AliAnalysisTaskSE(),
+AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(): 
+  AliAnalysisTaskSE(),
   fJetHeaderRec(0x0),
   fJetHeaderGen(0x0),
   fAODIn(0x0),
@@ -75,7 +76,8 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(): AliAnalysisTaskSE(),
   f1PtScale(0x0),
   fBranchRec("jets"),
   fBranchGen(""),
-  fBranchBkg(""), 
+  fBranchBkgRec(""), 
+  fBranchBkgGen(""), 
   fNonStdFile(""),
   fUseAODJetInput(kFALSE),
   fUseAODTrackInput(kFALSE),
@@ -83,10 +85,7 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(): AliAnalysisTaskSE(),
   fUseGlobalSelection(kFALSE),
   fUseExternalWeightOnly(kFALSE),
   fLimitGenJetEta(kFALSE),
-  fBkgSubtraction(kFALSE),
-  fUseOldFill(kFALSE),
   fNMatchJets(5),
-  fFillCorrBkg(0),
   fFilterMask(0),
   fEventSelectionMask(0),
   fAnalysisType(0),
@@ -100,73 +99,24 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(): AliAnalysisTaskSE(),
   fMinJetPt(0),
   fMinTrackPt(0.15),
   fDeltaPhiWindow(90./180.*TMath::Pi()),
+  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),  
   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),
   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;
-    
-    fh2PhiPt[i] = 0;
-    fh2PhiEta[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){    
     fh1NJets[ij] = 0;
@@ -174,11 +124,17 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(): AliAnalysisTaskSE(),
     fh1PtJetsIn[ij] = 0;
     fh1PtTracksIn[ij] = 0;
     fh1PtTracksLeadingIn[ij] = 0;
+    fh2MultJetPt[ij] = 0;
     fh2NJetsPt[ij]  = 0;
     fh2NTracksPt[ij]  = 0;
-    fh2LeadingJetPtJetPhi[ij] = 0;
     fh2LeadingTrackPtTrackPhi[ij] = 0;
-    for(int i = 0;i < kMaxJets;++i){
+    for(int i = 0;i <= kMaxJets;++i){
+      fh2PhiPt[ij][i] = 0;
+      fh2EtaPt[ij][i] = 0;
+      fh2AreaPt[ij][i] = 0;
+      fh2EtaArea[ij][i] = 0;
+      fh2PhiEta[ij][i] = 0; 
+      fh2LTrackPtJetPt[ij][i] = 0;
       fh1PtIn[ij][i] = 0;
       fh2RhoPt[ij][i] = 0;
       fh2PsiPt[ij][i] = 0;
@@ -205,7 +161,8 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
   f1PtScale(0x0),
   fBranchRec("jets"),
   fBranchGen(""),
-  fBranchBkg(""),
+  fBranchBkgRec(""),
+  fBranchBkgGen(""),
   fNonStdFile(""),
   fUseAODJetInput(kFALSE),
   fUseAODTrackInput(kFALSE),
@@ -213,10 +170,7 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
   fUseGlobalSelection(kFALSE),
   fUseExternalWeightOnly(kFALSE),
   fLimitGenJetEta(kFALSE),
-  fBkgSubtraction(kFALSE),
-  fUseOldFill(kFALSE),
   fNMatchJets(5),
-  fFillCorrBkg(0),
   fFilterMask(0),
   fEventSelectionMask(0),
   fAnalysisType(0),
@@ -230,73 +184,25 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
   fMinJetPt(0),
   fMinTrackPt(0.15),
   fDeltaPhiWindow(90./180.*TMath::Pi()),
+  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),  
   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),
   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;
-    
-    fh2PhiPt[i] = 0;
-    fh2PhiEta[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){    
     fh1NJets[ij] = 0;
@@ -304,11 +210,17 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
     fh1PtJetsIn[ij] = 0;
     fh1PtTracksIn[ij] = 0;
     fh1PtTracksLeadingIn[ij] = 0;
+    fh2MultJetPt[ij] = 0;
     fh2NJetsPt[ij]  = 0;
     fh2NTracksPt[ij]  = 0;
-    fh2LeadingJetPtJetPhi[ij] = 0;
     fh2LeadingTrackPtTrackPhi[ij] = 0;
-    for(int i = 0;i < kMaxJets;++i){
+    for(int i = 0;i <= kMaxJets;++i){
+      fh2PhiPt[ij][i] = 0;
+      fh2EtaPt[ij][i] = 0;
+      fh2AreaPt[ij][i] = 0;
+      fh2EtaArea[ij][i] = 0;
+      fh2PhiEta[ij][i] = 0; 
+      fh2LTrackPtJetPt[ij][i] = 0;
       fh1PtIn[ij][i] = 0;
       fh2RhoPt[ij][i] = 0;
       fh2PsiPt[ij][i] = 0;
@@ -321,7 +233,7 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
     fh2DijetDifvsSum[ij] = 0;
   } 
 
- DefineOutput(1, TList::Class());  
 DefineOutput(1, TList::Class());  
 }
 
 
@@ -376,6 +288,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;
 }
@@ -386,19 +299,13 @@ 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(); 
   fHistList->SetOwner(kTRUE);
-  Bool_t oldStatus = TH1::AddDirectoryStatus();
+  Bool_t oldStatus = TH1::AddDirectoryStatus(); 
   TH1::AddDirectory(kFALSE);
 
-
   MakeJetContainer();
   fHistList->Add(fhnCorrelation);
   fHistList->Add(fhnCorrelationPhiZRec);
@@ -417,30 +324,17 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
       binLimitsPt[iPt] =  binLimitsPt[iPt-1] + 1.0;
     }
   }
-  
   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++){
@@ -452,191 +346,33 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
     }
   }
 
-  const Int_t nBinFrag = 25;
-
-
-
 
   fh1Xsec = new TProfile("fh1Xsec","xsec from pyxsec.root",1,0,1);
   fh1Xsec->GetXaxis()->SetBinLabel(1,"<#sigma>");
    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);
+  fh2MultRec = new TH2F("fh2MultRec","multiplicity rec;# tracks;# jetrefs",400,-0.5,4000,400,0.,4000);
+  fHistList->Add(fh2MultRec);
+  fh2MultGen = new TH2F("fh2MultGen","multiplicity gen;# tracks;# jetrefs",400,-0.5,4000,400,0.,4000);
+  fHistList->Add(fh2MultGen);
 
   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};#Delta p_{T}/p_{T,Gen}",nBinPt,binLimitsPt,120,-2.4,2.4);
+  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);
 
-
-  if(fUseOldFill){
-
-    fh1NGenJets  = new TH1F("fh1NGenJets","N generated jets",20,-0.5,19.5);
-    fh1NRecJets = new TH1F("fh1NRecJets","N reconstructed jets",20,-0.5,19.5);
-    
-  fh1PtTrackRec = new TH1F("fh1PtTrackRec","Rec track P_T #eta < 0.9;p_{T} (GeV/c)",nBinPt,binLimitsPt);
-  fh1SumPtTrackRec = new TH1F("fh1SumPtTrackRec","Sum Rec track P_T #eta <0.9;p_{T,sum} (GeV/c)",nBinPt,binLimitsPt);
-  fh1SumPtTrackAreaRec = new TH1F("fh1SumPtTrackAreaRec","Sum Rec track P_T #eta <0.9 / 1.8 * 2 * 0.4*0.4;p_{T,sum} (GeV/c)",nBinPt,binLimitsPt);
-  
-  fh1PtJetsRecIn  = new TH1F("fh1PtJetsRecIn","Rec jets P_T;p_{T} (GeV/c)",nBinPt,binLimitsPt);
-  fh1PtJetsGenIn  = new TH1F("fh1PtJetsGenIn","Gen jets P_T;p_{T} (GeV/c)",nBinPt,binLimitsPt);
-  fh1PtJetsLeadingRecIn = new TH1F("fh1PtJetsLeadingRecIn","Rec jets P_T;p_{T} (GeV/c)",nBinPt,binLimitsPt);
-  fh1PtTracksRecIn  = new TH1F("fh1PtTracksRecIn","Rec tracks P_T #eta < 0.9;p_{T} (GeV/c)",nBinPt,binLimitsPt);
-  fh1PtTracksLeadingRecIn  = new TH1F("fh1PtTracksLeadingRecIn","Rec tracks P_T #eta < 0.9;p_{T} (GeV/c)",nBinPt,binLimitsPt);
-  fh1PtTracksGenIn  = new TH1F("fh1PtTracksGenIn","gen tracks P_T #eta < 0.9;p_{T} (GeV/c)",nBinPt,binLimitsPt);
-
-  fh2NRecJetsPt = new TH2F("fh2NRecJetsPt","Number of jets above threshhold;p_{T,cut} (GeV/c);N_{jets}",nBinPt,binLimitsPt,50,-0.5,49.5);
-  fh2NRecTracksPt = new TH2F("fh2NRecTracksPt","Number of tracks above threshhold;p_{T,cut} (GeV/c);N_{tracks}",nBinPt,binLimitsPt,50,-0.5,49.5);
-
-  fh2NGenJetsPt = new TH2F("fh2NGenJetsPt","Number of jets above threshhold;p_{T,cut} (GeV/c);N_{jets}",nBinPt,binLimitsPt,50,-0.5,49.5);
-  fh2NGenTracksPt = new TH2F("fh2NGenTracksPt","Number of tracks above threshhold;p_{T,cut} (GeV/c);N_{tracks}",nBinPt,binLimitsPt,50,-0.5,49.5);
-  // 
-
-  for(int ij = 0;ij < kMaxJets;++ij){
-    fh1PtRecIn[ij] = new TH1F(Form("fh1PtRecIn_j%d",ij),"rec p_T input ;p_{T,rec}",nBinPt,binLimitsPt);
-    fh1PtGenIn[ij] = new TH1F(Form("fh1PtGenIn_j%d",ij),"found p_T input ;p_{T,gen}",nBinPt,binLimitsPt);
-
-    fh2PhiPt[ij] =  new TH2F(Form("fh2PhiPtRec_j%d",ij),"Jet pt vs delta phi;#Delta#phi;p_{T,jet}",
-                            nBinPhi,binLimitsPhi,nBinPt,binLimitsPt);
-
-    fh2PhiEta[ij] =  new TH2F(Form("fh2PhiEtaRec_j%d",ij),"delta eta vs delta phi for jets;#Delta#phi;#Delta#eta",
-                             nBinPhi,binLimitsPhi,nBinEta,binLimitsEta);
-
-    fh2RhoPtRec[ij] =  new TH2F(Form("fh2RhoPtRec_j%d",ij),"jet shape rho for jets;r;p_{T,rec};",
-                               40,0.,1.,nBinPt,binLimitsPt);
-    fh2PsiPtRec[ij] =  new TH2F(Form("fh2PsiPtRec_j%d",ij),"jet shape psi for jets;r;p_{T,rec};",
-                               40,0.,2.,nBinPt,binLimitsPt);
-
-    fh2RhoPtGen[ij] =  new TH2F(Form("fh2RhoPtGen_j%d",ij),"jet shape rho for jets;r;p_{T,gen};",
-                              40,0.,2.,nBinPt,binLimitsPt);
-    fh2PsiPtGen[ij] =  new TH2F(Form("fh2PsiPtGen_j%d",ij),"jet shape psi for jets;r;p_{T,gen};",
-                               40,0.,2.,nBinPt,binLimitsPt);
-    if(!fh1TmpRho)fh1TmpRho = new TH1F("fh1TmpRho","tmp histo for jet shape",40,0.,2);
-
-    fh2FragRec[ij] = new TH2F(Form("fh2FragRec_j%d",ij),"Jet Fragmentation;x=p_{T,i}/p_{T,jet};p_{T,jet};1/N_{jet}dN_{ch}/dx",
-                          nBinFrag,0.,1.,nBinPt,binLimitsPt);
-    fh2FragLnRec[ij] = new TH2F(Form("fh2FragLnRec_j%d",ij),"Jet Fragmentation Ln;#xi=ln(p_{T,jet}/p_{T,i});p_{T,jet}(GeV);1/N_{jet}dN_{ch}/d#xi",
-                            nBinFrag,0.,10.,nBinPt,binLimitsPt);
-
-    fh2FragGen[ij] = new TH2F(Form("fh2FragGen_j%d",ij),"Jet Fragmentation;x=p_{T,i}/p_{T,jet};p_{T,jet};1/N_{jet}dN_{ch}/dx",
-                             nBinFrag,0.,1.,nBinPt,binLimitsPt);
-    fh2FragLnGen[ij] = new TH2F(Form("fh2FragLnGen_j%d",ij),"Jet Fragmentation Ln;#xi=ln(p_{T,jet}/p_{T,i});p_{T,jet}(GeV);1/N_{jet}dN_{ch}/d#xi",
-                               nBinFrag,0.,10.,nBinPt,binLimitsPt);
-  }
-
-  // Dijet histograms
-  //background histograms
-  if(fBkgSubtraction){
-    fh1Bkg1 = new TH1F("fh1Bkg1","Background estimate 1",100,0.,10.);
-    fh1Bkg2 = new TH1F("fh1Bkg2","Background estimate 2",100,0.,10.);
-    fh1Bkg3 = new TH1F("fh1Bkg3","Background estimate 3",100,0.,10.);
-    fh1Sigma1 = new TH1F("fh1Sigma1","Background fluctuations 1",100,0.,10.);
-    fh1Sigma2 = new TH1F("fh1Sigma2","Background fluctuations 2",100,0.,10.);
-    fh1Sigma3 = new TH1F("fh1Sigma3","Background fluctuations 3",100,0.,10.);
-    fh1Area1 = new TH1F("fh1Area1","Background mean area 1",50,0.,5.);
-    fh1Area2 = new TH1F("fh1Area2","Background mean area 2",50,0.,5.);
-    fh1Area3 = new TH1F("fh1Area3","Background mean area 3",50,0.,5.);
-    fh1Ptjet = new TH1F("fh1Ptjet","Jet spectrum",100,0.,200.);
-    fh1Ptjetsub1 = new TH1F("fh1Ptjetsub1","Subtracted spectrum 1",50,0.,200.);
-    fh1Ptjetsub2 = new TH1F("fh1Ptjetsub2","Subtracted spectrum 2",50,0.,200.);
-    fh1Ptjetsub3 = new TH1F("fh1Ptjetsub3","Subtracted spectrum 3",50,0.,200.);
-    fh1Ptjethardest = new TH1F("fh1Ptjethardest","Hardest jet spectrum",50,0.,200.);
-    fh1Ptjetsubhardest1 = new TH1F("fh1Pthardestsub1","Subtracted hardest jet spectrum 1",100,0.,200.);
-    fh1Ptjetsubhardest2 = new TH1F("fh1Pthardestsub2","Subtracted hardest jet spectrum 2",100,0.,200.);
-    fh1Ptjetsubhardest3 = new TH1F("fh1Pthardestsub3","Subtracted hardest jet spectrum 3",100,0.,200.);
-    fh2Rhovspthardest1 = new TH2F("fh2Rhovspthardest1","Background vs pTjet 1",100,0.,200.,50,0.,5.);
-    fh2Rhovspthardest2 = new TH2F("fh2Rhovspthardest2","Background vs pTjet 2",100,0.,200.,50,0.,5.);
-    fh2Rhovspthardest3 = new TH2F("fh2Rhovspthardest3","Background vs pTjet 3",100,0.,200.,50,0.,5.);
-    fh2Errorvspthardest1 = new TH2F("fh2Errorvspthardest1","Relative error 1",100,0.,200.,50,0.,5.);
-    fh2Errorvspthardest2 = new TH2F("fh2Errorvspthardest2","Relative error 2",100,0.,200.,50,0.,5.);
-    fh2Errorvspthardest3 = new TH2F("fh2Errorvspthardest3","Relative error 3",100,0.,200.,50,0.,5.);
-  }
-  
-
-  const Int_t saveLevel = 3; // large save level more histos
-  if(saveLevel>0){
-     if(fBranchGen.Length()>0||fBkgSubtraction){
-       fHistList->Add(fh1NGenJets);
-       fHistList->Add(fh1PtTracksGenIn);
-    }
-    fHistList->Add(fh1PtJetsRecIn);
-    fHistList->Add(fh1PtJetsGenIn);
-    fHistList->Add(fh1PtJetsLeadingRecIn);
-    fHistList->Add(fh1PtTracksRecIn);
-    fHistList->Add(fh1PtTracksLeadingRecIn);
-    fHistList->Add(fh1NRecJets);
-    fHistList->Add(fh1PtTrackRec);
-    fHistList->Add(fh1SumPtTrackRec);
-    fHistList->Add(fh1SumPtTrackAreaRec);
-    fHistList->Add(fh2NRecJetsPt);
-    fHistList->Add(fh2NRecTracksPt);
-    fHistList->Add(fh2NGenJetsPt);
-    fHistList->Add(fh2NGenTracksPt);
-    for(int ij = 0;ij<kMaxJets;++ij){
-      fHistList->Add( fh1PtRecIn[ij]);
-
-      if(fBranchGen.Length()>0||fBkgSubtraction){      
-       fHistList->Add(fh1PtGenIn[ij]);
-       fHistList->Add(fh2FragGen[ij]);
-       fHistList->Add(fh2FragLnGen[ij]);
-       fHistList->Add(fh2RhoPtGen[ij]);
-       fHistList->Add(fh2PsiPtGen[ij]);
-      }
-      fHistList->Add( fh2PhiPt[ij]);
-      fHistList->Add( fh2PhiEta[ij]);
-      fHistList->Add( fh2RhoPtRec[ij]);
-      fHistList->Add( fh2PsiPtRec[ij]);
-      fHistList->Add( fh2FragRec[ij]);
-      fHistList->Add( fh2FragLnRec[ij]);
-    }
-    //    fHistList->Add(fh2TrackPtTrackPhi);
-    if(fBkgSubtraction){
-      fHistList->Add(fh1Bkg1);
-      fHistList->Add(fh1Bkg2);
-      fHistList->Add(fh1Bkg3);
-      fHistList->Add(fh1Sigma1);
-      fHistList->Add(fh1Sigma2);
-      fHistList->Add(fh1Sigma3);
-      fHistList->Add(fh1Area1);
-      fHistList->Add(fh1Area2);
-      fHistList->Add(fh1Area3);
-      fHistList->Add(fh1Ptjet);
-      fHistList->Add(fh1Ptjethardest);
-      fHistList->Add(fh1Ptjetsub1);
-      fHistList->Add(fh1Ptjetsub2);
-      fHistList->Add(fh1Ptjetsub3);      
-      fHistList->Add(fh1Ptjetsubhardest1);
-      fHistList->Add(fh1Ptjetsubhardest2);
-      fHistList->Add(fh1Ptjetsubhardest3);
-      fHistList->Add(fh2Rhovspthardest1);
-      fHistList->Add(fh2Rhovspthardest2);
-      fHistList->Add(fh2Rhovspthardest3);
-      fHistList->Add(fh2Errorvspthardest1);
-      fHistList->Add(fh2Errorvspthardest2);
-     fHistList->Add(fh2Errorvspthardest3);
-    }
-  }
-
-
-  }// ue old fill
-  else{
     for(int ij = 0;ij <kJetTypes;++ij){    
       TString cAdd = "";
       TString cJetBranch = "";
@@ -648,6 +384,14 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
        cAdd = "Gen";
        cJetBranch = fBranchGen.Data();
       }
+      else if (ij==kJetRecFull){
+       cAdd = "RecFull";
+       cJetBranch = fBranchRec.Data();
+      }
+      else if (ij==kJetGenFull){
+       cAdd = "GenFull";
+       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]);
@@ -664,22 +408,20 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
       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]);
 
+      fh2MultJetPt[ij]  = new TH2F(Form("fh2MultJetPt%s",cAdd.Data()),Form("%s jets p_T;# tracks;;p_{T} (GeV/c)",cAdd.Data()),400,0,4000,nBinPt,binLimitsPt);
+      fHistList->Add(fh2MultJetPt[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,50,-0.5,49.5);
+      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.,4000);
       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]);
-      
-      for(int i = 0;i < kMaxJets;++i){
 
+      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]);
 
@@ -687,11 +429,35 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
                                   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 eta %s;#eta;p_{T};",cAdd.Data()),
+                                  50,-1.,1.,nBinPt,binLimitsPt);
+       fHistList->Add(fh2EtaPt[ij][i]);
+       fh2AreaPt[ij][i] = new TH2F(Form("fh2AreaPt%s_j%d",cAdd.Data(),i),
+                                   Form("pt vs area %s;area;p_{T};",
+                                        cAdd.Data()),
+                                   50,0.,1.,nBinPt,binLimitsPt);
+       fHistList->Add(fh2AreaPt[ij][i]);
+       fh2EtaArea[ij][i] = new TH2F(Form("fh2EtaArea%s_j%d",cAdd.Data(),i),
+                                    Form("area vs eta %s;#eta;area;",
+                                         cAdd.Data()),
+                                    50,-1.,1.,50,0,1.);
+       fHistList->Add(fh2EtaArea[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]);
+
+       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]);
       }
 
 
@@ -706,12 +472,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]);
     }   
-  }// new filling
-
   // =========== Switch on Sumw2 for all histos ===========
   for (Int_t i=0; i<fHistList->GetEntries(); ++i) {
     TH1 *h1 = dynamic_cast<TH1*>(fHistList->At(i));
@@ -816,10 +579,42 @@ 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(false){
-    UserExecOld();
-    return;
+    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;
+    }
   }
 
  
@@ -901,6 +696,20 @@ 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;
+
   // the loops for rec and gen should be indentical... pass it to a separate
   // function ...
   // Jet Loop
@@ -909,9 +718,11 @@ 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
@@ -929,6 +740,11 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
     return;
   }
 
+  Int_t refMult = fMultRec;
+  if(iType==kJetGen||iType==kJetGenFull){
+    refMult = fMultGen;
+  }
+
   Int_t nJets = jetsList.GetEntries(); 
   fh1NJets[iType]->Fill(nJets);
 
@@ -947,6 +763,7 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
     AliAODJet *jet = (AliAODJet*)jetsList.At(ij);
     Float_t ptJet = jet->Pt();
     fh1PtJetsIn[iType]->Fill(ptJet);
+    fh2MultJetPt[iType]->Fill(refMult,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);
     }
@@ -972,20 +789,36 @@ 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...
-      if(ij==0){
-       fh2LeadingJetPtJetPhi[iType]->Fill(ptJet,ptJet);
-       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);
+      if(ptJet>10){
+       if(ij<kMaxJets){
+         fh2PhiEta[iType][ij]->Fill(phiJet,etaJet);
+         fh2AreaPt[iType][ij]->Fill(jet->EffectiveAreaCharged(),ptJet);
+         fh2EtaArea[iType][ij]->Fill(etaJet,jet->EffectiveAreaCharged());
        }
+       fh2PhiEta[iType][kMaxJets]->Fill(phiJet,etaJet);
+       fh2AreaPt[iType][kMaxJets]->Fill(jet->EffectiveAreaCharged(),ptJet);
+       fh2EtaArea[iType][kMaxJets]->Fill(etaJet,jet->EffectiveAreaCharged());
       }
-      if(particlesList.GetSize()){
+      if(ij<kMaxJets){
+       fh2PhiPt[iType][ij]->Fill(phiJet,ptJet);
+       fh2EtaPt[iType][ij]->Fill(etaJet,ptJet);
+       if(leadTrack)fh2LTrackPtJetPt[iType][ij]->Fill(leadTrack->Pt(),ptJet);
+      }
+      fh2PhiPt[iType][kMaxJets]->Fill(phiJet,ptJet);
+      fh2EtaPt[iType][kMaxJets]->Fill(etaJet,ptJet);
+      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);
@@ -1002,7 +835,6 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
          fh2PsiPt[iType][ij]->Fill(r,ptJet,rhoSum);
        }
       }// if we have particles
-    }// ij < kMaxJets
   }// Jet Loop
 
 
@@ -1227,707 +1059,6 @@ void AliAnalysisTaskJetSpectrum2::FillMatchHistos(TList &recJetsList,TList &genJ
 }
 
 
-void AliAnalysisTaskJetSpectrum2::UserExecOld(Option_t */*option*/)
-{
-
-
-  Bool_t selected = kTRUE;
-
-
-
-
-  if(fUseGlobalSelection&&fEventSelectionMask==0){
-    selected = AliAnalysisHelperJetTasks::Selected();
-  }
-  else if(fUseGlobalSelection&&fEventSelectionMask>0){
-    selected = AliAnalysisHelperJetTasks::TestSelectInfo(fEventSelectionMask);
-  }
-
-  if(fEventClass>0){
-    selected = selected&&(AliAnalysisHelperJetTasks::EventClass()==fEventClass);
-  }
-
-  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());
-    PostData(1, fHistList);
-    return;
-  }
-
-
-  //
-  // Execute analysis for current event
-  //
-  static AliESDEvent *fESD = dynamic_cast<AliESDEvent*> (InputEvent());
-
-
-  // take all other information from the aod we take the tracks from
-  static AliAODEvent *aod = 0;
-  if(!aod){
-    if(fUseAODTrackInput)aod = fAODIn;
-    aod = fAODOut;
-  }
-  static AliAODEvent *fAOD = 0;
-  if(!fAOD){
-    if(fUseAODJetInput)fAOD = fAODIn;
-    fAOD = fAODOut;
-  }
-
-  if (fDebug > 1)printf("Analysing event # %5d\n", (Int_t) fEntry);
-
-  
-  AliAODHandler *aodH = dynamic_cast<AliAODHandler*>(AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler());
-
-  if(!aodH){
-    Printf("%s:%d no output aodHandler found Jet",(char*)__FILE__,__LINE__);
-    return;
-  }
-
-  if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
-  TClonesArray *aodRecJets = 0;
-
-
-
-  if(fAOD&&!aodRecJets){
-    aodRecJets = dynamic_cast<TClonesArray*>(fAOD->FindListObject(fBranchRec.Data()));
-  }
-  if(fAODExtension&&!aodRecJets){
-    aodRecJets = dynamic_cast<TClonesArray*>(fAODExtension->GetAOD()->FindListObject(fBranchRec.Data()));
-  }
-
-  if(!aodRecJets){
-    Printf("%s:%d no reconstructed Jet array with name %s in AOD",(char*)__FILE__,__LINE__,fBranchRec.Data());
-    return;
-  }
-
-  Int_t nJets = aodRecJets->GetEntriesFast();
-
-  TClonesArray *aodGenJets = 0;
-  if(fBranchGen.Length()>0){
-    if(fAOD&&!aodGenJets){
-      aodGenJets = dynamic_cast<TClonesArray*>(fAOD->FindListObject(fBranchGen.Data()));
-    }
-    if(fAODExtension&&!aodGenJets){
-      aodGenJets = dynamic_cast<TClonesArray*>(fAODExtension->GetAOD()->FindListObject(fBranchGen.Data()));
-    }
-
-    if(!aodGenJets){
-      Printf("%s:%d no generated Jet array with name %s in AOD",(char*)__FILE__,__LINE__,fBranchGen.Data());
-      return;
-    }
-  }
-
-
-  // ==== General variables needed
-  // We use statice array, not to fragment the memory
-  AliAODJet genJets[kMaxJets];
-  Int_t nGenJets = 0;
-  AliAODJet recJets[kMaxJets];
-  Int_t nRecJets = 0;
-  // These will replace the arrays...
-  TList genJetsList;         // full acceptance
-  TList genJetsListCut;   // acceptance cut
-  TList recJetsList;         // full acceptance
-  TList recJetsListCut;   // acceptance cut
-
-
-  GetListOfJets(&genJetsList,aodGenJets,0);
-  GetListOfJets(&genJetsListCut,aodGenJets,1);
-
-  if(fBranchGen.Length()>0){
-    GetListOfJets(&recJetsList,aodRecJets,0);
-    GetListOfJets(&recJetsListCut,aodRecJets,1);
-  }
-  ///////////////////////////
-
-  
-
-
-  if(fBkgSubtraction){
-     AliAODJetEventBackground* evBkg=(AliAODJetEventBackground*)fAOD->FindListObject(fBranchBkg.Data()); 
-     if(!evBkg){
-       Printf("%s:%d no reconstructed background array with name %s in AOD",(char*)__FILE__,__LINE__,fBranchBkg.Data());
-       return; 
-     }
-
-
-     ///just to start: some very simple plots containing rho, sigma and area of the background. 
-     
-     
-     Float_t pthardest=0.;
-     
-     if(nJets!=0){
-  
-       Float_t bkg1=evBkg->GetBackground(0);
-       Float_t bkg2=evBkg->GetBackground(1);
-       Float_t bkg3=evBkg->GetBackground(2);
-       Float_t sigma1=evBkg->GetSigma(0);
-       Float_t sigma2=evBkg->GetSigma(1);
-       Float_t sigma3=evBkg->GetSigma(2); 
-       Float_t area1=evBkg->GetMeanarea(0);
-       Float_t area2=evBkg->GetMeanarea(1);  
-       Float_t area3=evBkg->GetMeanarea(2);
-       fh1Bkg1->Fill(bkg1); //rho computed with all background jets.
-       fh1Bkg2->Fill(bkg2); //rho computed with all background jets but the 2 hardest. 
-       fh1Bkg3->Fill(bkg3); //rho computed with randomized jets
-       fh1Sigma1->Fill(sigma1); 
-       fh1Sigma2->Fill(sigma2);
-       fh1Sigma3->Fill(sigma3);
-       fh1Area1->Fill(area1);
-       fh1Area2->Fill(area2);
-       fh1Area3->Fill(area3);
-       
-       Int_t iSubJetCounter = 0;
-       for(Int_t k=0;k<nJets;k++){
-        AliAODJet *jet = dynamic_cast<AliAODJet*>(aodRecJets->At(k));
-        if(!jet)continue;
-        fh1Ptjet->Fill(jet->Pt());
-        Float_t ptsub1=jet->Pt()-bkg1*jet->EffectiveAreaCharged();
-        Float_t ptsub2=jet->Pt()-bkg2*jet->EffectiveAreaCharged();
-         Float_t ptsub3=jet->Pt()-bkg3*jet->EffectiveAreaCharged();
-         if(ptsub2<0.) ptsub2=0.;
-         if(ptsub1<0.) ptsub1=0.;
-         if(ptsub3<0.) ptsub3=0.;
-        Float_t err1=sigma1*sqrt(area1);
-        Float_t err2=sigma2*sqrt(area2);
-         Float_t err3=sigma3*sqrt(area3);       
-        fh1Ptjetsub1->Fill(ptsub1);
-        fh1Ptjetsub2->Fill(ptsub2);
-        fh1Ptjetsub3->Fill(ptsub3);
-        if(k==0) {
-          pthardest=jet->Pt();
-          fh1Ptjethardest->Fill(pthardest);
-          fh1Ptjetsubhardest1->Fill(ptsub1);
-          fh1Ptjetsubhardest2->Fill(ptsub2);
-           fh1Ptjetsubhardest3->Fill(ptsub3);
-          if (ptsub1 > 0)
-            fh2Errorvspthardest1->Fill(ptsub1,err1/ptsub1);
-          if (ptsub2 > 0)
-            fh2Errorvspthardest2->Fill(ptsub2,err2/ptsub2);
-          if (ptsub3 > 0)
-            fh2Errorvspthardest3->Fill(ptsub3,err3/ptsub3);
-        }
-
-        Float_t ptsub=0.;
-        if(fFillCorrBkg==1) ptsub=ptsub1;
-        if(fFillCorrBkg==2) ptsub=ptsub2;
-        if(fFillCorrBkg==3) ptsub=ptsub3;
-        if(ptsub>0){// avoid unphysical jets pT
-          Float_t subphi=jet->Phi();
-          Float_t subtheta=jet->Theta();
-          Float_t subpz = ptsub/TMath::Tan(subtheta);
-          Float_t subpx=ptsub*TMath::Cos(subphi);
-          Float_t subpy=ptsub * TMath::Sin(subphi);
-          Float_t subp  = TMath::Sqrt(ptsub*ptsub+subpz*subpz);
-          if(k<kMaxJets){// only store the jets which are assoicated to anohter one
-            genJets[iSubJetCounter].SetPxPyPzE(subpx,subpy,subpz,subp);
-            iSubJetCounter++;
-          }
-        }
-       }
-       nGenJets = iSubJetCounter;
-       fh2Rhovspthardest1->Fill(pthardest,bkg1);
-       fh2Rhovspthardest2->Fill(pthardest,bkg2);
-       fh2Rhovspthardest3->Fill(pthardest,bkg3); 
-     }
-  }// background subtraction
-  
-
-  Double_t eventW = 1;
-  Double_t ptHard = 0; 
-  Double_t nTrials = 1; // Trials for MC trigger 
-
-  if(fUseExternalWeightOnly){
-    eventW = fExternalWeight;
-  }
-
-  fh1Trials->Fill("#sum{ntrials}",fAvgTrials); 
-  //  if(fDebug>0)aodH->SetFillAOD(kFALSE);
-  if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
-  if((fAnalysisType&kAnaMCESD)==kAnaMCESD){
-    // this is the part we only use when we have MC information
-    AliMCEvent* mcEvent = MCEvent();
-    //    AliStack *pStack = 0; 
-    if(!mcEvent){
-      Printf("%s:%d no mcEvent",(char*)__FILE__,__LINE__);
-      return;
-    }
-    AliGenPythiaEventHeader*  pythiaGenHeader = AliAnalysisHelperJetTasks::GetPythiaEventHeader(mcEvent);
-    Int_t iCount = 0;  
-    if(pythiaGenHeader){
-      nTrials = pythiaGenHeader->Trials();
-      ptHard  = pythiaGenHeader->GetPtHard();
-      int iProcessType = pythiaGenHeader->ProcessType();
-      // 11 f+f -> f+f
-      // 12 f+barf -> f+barf
-      // 13 f+barf -> g+g
-      // 28 f+g -> f+g
-      // 53 g+g -> f+barf
-      // 68 g+g -> g+g
-      if (fDebug > 10)Printf("%d iProcessType %d",__LINE__, iProcessType);
-      if(fDebug>20)AliAnalysisHelperJetTasks::PrintStack(mcEvent);
-      
-      // fetch the pythia generated jets only to be used here
-      Int_t nPythiaGenJets = pythiaGenHeader->NTriggerJets();
-      AliAODJet pythiaGenJets[kMaxJets];
-      for(int ip = 0;ip < nPythiaGenJets;++ip){
-       if(iCount>=kMaxJets)continue;
-       Float_t p[4];
-       pythiaGenHeader->TriggerJet(ip,p);
-       pythiaGenJets[iCount].SetPxPyPzE(p[0],p[1],p[2],p[3]);
-       
-       if(fBranchGen.Length()==0){
-         /*    
-         if(fLimitGenJetEta){
-           if(pythiaGenJets[iCount].Eta()>fJetHeaderRec->GetJetEtaMax()||
-              pythiaGenJets[iCount].Eta()<fJetHeaderRec->GetJetEtaMin())continue;
-         }
-         */   
-         if(fMinJetPt>0&&pythiaGenJets[iCount].Pt()<fMinJetPt)continue;
-         // if we have MC particles and we do not read from the aod branch
-         // use the pythia jets
-         if(!fBkgSubtraction){
-           genJets[iCount].SetPxPyPzE(p[0],p[1],p[2],p[3]);
-           iCount++;
-         }
-       }
-      }
-    }
-    if(fBranchGen.Length()==0&&!fBkgSubtraction)nGenJets = iCount;    
-  }// (fAnalysisType&kMCESD)==kMCESD)
-
-
-  // we simply fetch the tracks/mc particles as a list of AliVParticles
-
-  TList recParticles;
-  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());
-
-
-  if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
-  fh1PtHard->Fill(ptHard,eventW);
-  fh1PtHardNoW->Fill(ptHard,1);
-  fh1PtHardTrials->Fill(ptHard,nTrials);
-  fh1ZVtx->Fill(fAOD->GetPrimaryVertex()->GetZ());
-
-
-  // If we set a second branch for the input jets fetch this 
-  if(fBranchGen.Length()>0&&!fBkgSubtraction){
-    if(aodGenJets){
-      Int_t iCount = 0;
-      for(int ig = 0;ig < aodGenJets->GetEntries();++ig){
-       if(iCount>=kMaxJets)continue;
-       AliAODJet *tmp = dynamic_cast<AliAODJet*>(aodGenJets->At(ig));
-       if(!tmp)continue;
-       /*
-       if(fLimitGenJetEta){
-         if(tmp->Eta()>fJetHeaderRec->GetJetEtaMax()||
-            tmp->Eta()<fJetHeaderRec->GetJetEtaMin())continue;
-       }
-       */
-       if(fMinJetPt>0&&tmp->Pt()<fMinJetPt)continue;
-       genJets[iCount] = *tmp;
-       iCount++;
-      }
-      nGenJets = iCount;
-    }
-    else{
-      if(fDebug>1)Printf("%s:%d Generated jet branch %s not found",(char*)__FILE__,__LINE__,fBranchGen.Data());
-      if(fDebug>2)fAOD->Print();
-    }
-  }
-
-  fh1NGenJets->Fill(nGenJets);
-  // We do not want to exceed the maximum jet number
-  nGenJets = TMath::Min(nGenJets,kMaxJets);
-
-  // Fetch the reconstructed jets...
-
-  nRecJets = aodRecJets->GetEntries();
-
-  nRecJets = aodRecJets->GetEntries();
-  fh1NRecJets->Fill(nRecJets);
-
-  // Do something with the all rec jets
-  Int_t nRecOver = nRecJets;
-
-  // check that the jets are sorted
-  Float_t ptOld = 999999;
-  for(int ir = 0;ir < nRecJets;ir++){
-    AliAODJet *tmp = (AliAODJet*)(aodRecJets->At(ir));
-    Float_t tmpPt = tmp->Pt();
-    if(tmpPt>ptOld){
-      Printf("%s:%d Jets Not Sorted %s !! %d:%.3E %d:%.3E",(char*)__FILE__,__LINE__,fBranchRec.Data(),ir,tmpPt,ir-1,ptOld);
-    }
-    ptOld = tmpPt;
-  }
-
-
-  if(nRecOver>0){
-    TIterator *recIter = aodRecJets->MakeIterator();
-    AliAODJet *tmpRec = (AliAODJet*)(recIter->Next());  
-    Float_t pt = 0;
-    if(tmpRec){
-      pt = tmpRec->Pt();
-      for(int i = 1;i <= fh2NRecJetsPt->GetNbinsX();i++){
-       Float_t ptCut = fh2NRecJetsPt->GetXaxis()->GetBinCenter(i);
-       while(pt<ptCut&&tmpRec){
-         nRecOver--;
-         tmpRec = (AliAODJet*)(recIter->Next()); 
-         if(tmpRec){
-           pt = tmpRec->Pt();
-         }
-       }
-       if(nRecOver<=0)break;
-       fh2NRecJetsPt->Fill(ptCut,nRecOver);
-      }
-    }
-    recIter->Reset();
-    AliAODJet *leading = (AliAODJet*)aodRecJets->At(0);
-    Float_t phi = leading->Phi();
-    if(phi<0)phi+=TMath::Pi()*2.;    
-    pt = leading->Pt();
-    while((tmpRec = (AliAODJet*)(recIter->Next()))){
-      Float_t tmpPt = tmpRec->Pt();
-      fh1PtJetsRecIn->Fill(tmpPt);
-      if(tmpRec==leading){
-       fh1PtJetsLeadingRecIn->Fill(tmpPt);
-       continue;
-      }
-      // correlation
-      Float_t tmpPhi =  tmpRec->Phi();
-
-      if(tmpPhi<0)tmpPhi+=TMath::Pi()*2.;    
-      Float_t dPhi = phi - tmpRec->Phi();
-      if(dPhi>TMath::Pi())dPhi = dPhi - 2.*TMath::Pi();
-      if(dPhi<(-1.*TMath::Pi()))dPhi = dPhi + 2.*TMath::Pi();      
-      //  Float_t dEta = eta - tmpRec->Eta();
-      //      fh2JetsLeadingPhiEta->Fill(dPhi,dEta);
-      //      fh2JetsLeadingPhiPt->Fill(dPhi,pt);
-    }  
-    delete recIter;
-  }
-
-  Int_t nTrackOver = recParticles.GetSize();
-  // do the same for tracks and jets
-  if(nTrackOver>0){
-    TIterator *recIter = recParticles.MakeIterator();
-    AliVParticle *tmpRec = (AliVParticle*)(recIter->Next());  
-    Float_t pt = tmpRec->Pt();
-    //    Printf("Leading track p_t %3.3E",pt);
-    for(int i = 1;i <= fh2NRecTracksPt->GetNbinsX();i++){
-      Float_t ptCut = fh2NRecTracksPt->GetXaxis()->GetBinCenter(i);
-      while(pt<ptCut&&tmpRec){
-       nTrackOver--;
-       tmpRec = (AliVParticle*)(recIter->Next()); 
-       if(tmpRec){
-         pt = tmpRec->Pt();
-       }
-      }
-      if(nTrackOver<=0)break;
-      fh2NRecTracksPt->Fill(ptCut,nTrackOver);
-    }
-    
-    recIter->Reset();
-    AliVParticle *leading = (AliVParticle*)recParticles.At(0);
-    Float_t phi = leading->Phi();
-    if(phi<0)phi+=TMath::Pi()*2.;    
-    pt  = leading->Pt();
-    while((tmpRec = (AliVParticle*)(recIter->Next()))){
-      Float_t tmpPt = tmpRec->Pt();
-      fh1PtTracksRecIn->Fill(tmpPt);
-      if(tmpRec==leading){
-       fh1PtTracksLeadingRecIn->Fill(tmpPt);
-       continue;
-      }
-      // correlation
-      Float_t tmpPhi =  tmpRec->Phi();
-
-      if(tmpPhi<0)tmpPhi+=TMath::Pi()*2.;    
-      Float_t dPhi = phi - tmpRec->Phi();
-      if(dPhi>TMath::Pi())dPhi = dPhi - 2.*TMath::Pi();
-      if(dPhi<(-1.*TMath::Pi()))dPhi = dPhi + 2.*TMath::Pi();      
-      //      Float_t dEta = eta - tmpRec->Eta();
-      //      fh2TracksLeadingPhiEta->Fill(dPhi,dEta);
-      //      fh2TracksLeadingPhiPt->Fill(dPhi,pt);
-    }  
-    delete recIter;
-  }
-  
-  if(genParticles.GetSize()){
-    TIterator *genIter = genParticles.MakeIterator();
-    AliVParticle *tmpGen = 0;
-    while((tmpGen = (AliVParticle*)(genIter->Next()))){
-      if(TMath::Abs(tmpGen->Eta())<0.9){
-       Float_t tmpPt = tmpGen->Pt();
-       fh1PtTracksGenIn->Fill(tmpPt);
-      }  
-    }
-    delete genIter;
-  }
-  
-  nRecJets = TMath::Min(nRecJets,kMaxJets);
-  nJets = TMath::Min(nJets,kMaxJets);
-  Int_t iCountRec = 0;
-  for(int ir = 0;ir < nRecJets;++ir){
-    AliAODJet *tmp = dynamic_cast<AliAODJet*>(aodRecJets->At(ir));
-    if(!tmp)continue;
-    if(tmp->Pt()<fMinJetPt)continue;
-    recJets[iCountRec] = *tmp;
-    iCountRec++;
-  }
-  nRecJets = iCountRec;
-
-
-  if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
-  // Relate the jets
-  Int_t iGenIndex[kMaxJets];    // Index of the generated jet for i-th rec -1 if none
-  Int_t iRecIndex[kMaxJets];    // Index of the rec jet for i-th gen -1 if none
-  
-
-  for(int i = 0;i<kMaxJets;++i){    
-    iGenIndex[i] = iRecIndex[i] = -1;
-  }
-
-
-  AliAnalysisHelperJetTasks::GetClosestJets(genJets,nGenJets,recJets,nRecJets,
-                                           iGenIndex,iRecIndex,fDebug);
-
-  static TArrayI aGenIndex(recJetsListCut.GetEntries());
-  if(aGenIndex.GetSize()<recJetsListCut.GetEntries())aGenIndex.Set(recJetsListCut.GetEntries());
-
-  static TArrayI aRecIndex(genJetsList.GetEntries());
-  if(aRecIndex.GetSize()<genJetsList.GetEntries())aRecIndex.Set(genJetsList.GetEntries());
-
-  if(fDebug){
-    Printf("New Gens List %d rec index Array %d count %d",genJetsList.GetEntries(),aRecIndex.GetSize(),nGenJets);
-    Printf("New Rec List %d gen indey Array %d count %d",recJetsListCut.GetEntries(),aGenIndex.GetSize(),nRecJets);
-  }
-  AliAnalysisHelperJetTasks::GetClosestJets(&genJetsList,nGenJets,&recJetsListCut,nRecJets,
-                                           aGenIndex,aRecIndex,fDebug);
-
-
-  if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
-
-  if(fDebug){
-    for(int i = 0;i<kMaxJets;++i){ 
-      if(iGenIndex[i]>=0)Printf("iGenFound: %d -> %d",i,iGenIndex[i]); 
-      if(iRecIndex[i]>=0)Printf("iRecFound: %d -> %d",i,iRecIndex[i]); 
-    }
-  }
-
-
-
-
-  Double_t container[6];
-  Double_t containerPhiZ[6];
-
-  // loop over generated jets
-
-  // radius; tmp, get from the jet header itself
-  // at some point, how todeal woht FastJet on MC?
-  Float_t radiusGen =0.4;
-  Float_t radiusRec =0.4;
-
-  for(int ig = 0;ig < nGenJets;++ig){
-    Double_t ptGen = genJets[ig].Pt();
-    Double_t phiGen = genJets[ig].Phi();
-    if(phiGen<0)phiGen+=TMath::Pi()*2.;    
-    Double_t etaGen = genJets[ig].Eta();
-    fh1PtJetsGenIn->Fill(ptGen);
-
-    container[3] = ptGen;
-    container[4] = etaGen;
-    container[5] = phiGen;
-    fhnJetContainer[kStep0]->Fill(&container[3],eventW);
-    Int_t ir = iRecIndex[ig];
-
-    if(TMath::Abs(etaGen)<fJetRecEtaWindow){
-      fh1TmpRho->Reset();
-
-      fhnJetContainer[kStep1]->Fill(&container[3],eventW);
-      fh1PtGenIn[ig]->Fill(ptGen,eventW);
-      // fill the fragmentation function
-      for(int it = 0;it<genParticles.GetEntries();++it){
-       AliVParticle *part = (AliVParticle*)genParticles.At(it);
-       Float_t deltaR = genJets[ig].DeltaR(part);
-       if(ptGen>0)fh1TmpRho->Fill(deltaR,part->Pt()/ptGen);
-       if(deltaR<radiusGen&&ptGen>0){
-         Float_t z = part->Pt()/ptGen;
-         Float_t lnz =  -1.*TMath::Log(z);
-         fh2FragGen[ig]->Fill(z,ptGen,eventW);
-         fh2FragLnGen[ig]->Fill(lnz,ptGen,eventW);
-       }
-
-      }
-      Float_t rhoSum = 0;
-      for(int ibx = 1;ibx<=fh2RhoPtGen[ir]->GetNbinsX();ibx++){
-       Float_t r = fh2RhoPtGen[ir]->GetXaxis()->GetBinCenter(ibx);
-       Float_t rho = fh1TmpRho->GetBinContent(ibx);
-       rhoSum += rho;
-       fh2RhoPtGen[ig]->Fill(r,ptGen,rho);
-       fh2PsiPtGen[ig]->Fill(r,ptGen,rhoSum);
-      }
-    }
-    if(ir>=0&&ir<nRecJets){   
-      fhnJetContainer[kStep2]->Fill(&container[3],eventW);
-      Double_t etaRec = recJets[ir].Eta();
-      if(TMath::Abs(etaRec)<fJetRecEtaWindow)fhnJetContainer[kStep4]->Fill(&container[3],eventW);
-      if(TMath::Abs(etaRec)<fJetRecEtaWindow&&TMath::Abs(etaGen)<fJetRecEtaWindow)fhnJetContainer[kStep3]->Fill(&container[3],eventW);
-    }
-  }// loop over generated jets
-  
-  Float_t sumPt = 0;
-  for(int it = 0;it<recParticles.GetEntries();++it){
-    AliVParticle *part = (AliVParticle*)recParticles.At(it);
-    // fill sum pt and P_t of all paritles
-    if(TMath::Abs(part->Eta())<0.9){
-      Float_t pt = part->Pt();
-      fh1PtTrackRec->Fill(pt,eventW);
-      //      fh2TrackPtTrackPhi->Fill(pt,part->Phi());
-      sumPt += pt;
-    }
-  }
-  fh1SumPtTrackAreaRec->Fill(sumPt*0.4*0.4/(2.*1.8),eventW);
-  fh1SumPtTrackRec->Fill(sumPt,eventW);
-
-  
-  // loop over reconstructed jets
-  for(int ir = 0;ir < nRecJets;++ir){
-    Double_t etaRec = recJets[ir].Eta();
-    Double_t ptRec = recJets[ir].Pt();
-    Double_t phiRec = recJets[ir].Phi();
-    if(phiRec<0)phiRec+=TMath::Pi()*2.;    
-
-
-  // do something with dijets...
-
-    container[0] = ptRec;
-    container[1] = etaRec;
-    container[2] = phiRec;
-    containerPhiZ[0] = ptRec;
-    containerPhiZ[1] = phiRec;
-    if(ptRec>30.&&fDebug>2){
-      // need to cast to int, otherwise the printf overwrites
-      Printf("Jet found in Event %d with p_T, %E",(int)Entry(),ptRec);
-      Printf("%s read event, %d",fInputHandler->GetTree()->GetCurrentFile()->GetName(),(int)fInputHandler->GetTree()->GetTree()->GetReadEntry());
-      if(fESD)Printf("ESDEvent  GetEventNumberInFile(): %d",fESD->GetEventNumberInFile());
-      //  aodH->SetFillAOD(kTRUE);
-      fAOD->GetHeader()->Print();
-      Printf("TriggerClasses: %s",fAOD->GetFiredTriggerClasses().Data());
-      for(int it = 0;it < fAOD->GetNumberOfTracks();++it){
-       AliAODTrack *tr = fAOD->GetTrack(it);
-       if((fFilterMask>0)&&!(tr->TestFilterBit(fFilterMask)))continue;
-       tr->Print();
-       //      tr->Dump();
-       if(fESD){
-         AliESDtrack *esdTr = (AliESDtrack*)fESD->GetTrack(tr->GetID());
-         esdTr->Print("");
-         // esdTr->Dump();
-       }
-      }
-    }
-  
-
-    fhnJetContainer[kStep0+kMaxStep]->Fill(container,eventW);
-    if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
-  
-    Float_t zLeading = -1;
-    if(TMath::Abs(etaRec)<fJetRecEtaWindow){
-      //      fh2JetPtJetPhi->Fill(ptRec,phiRec);
-      fhnJetContainer[kStep1+kMaxStep]->Fill(container,eventW);
-      fh1PtRecIn[ir]->Fill(ptRec,eventW);
-      // fill the fragmentation function
-      
-      fh1TmpRho->Reset();
-
-      for(int it = 0;it<recParticles.GetEntries();++it){
-       AliVParticle *part = (AliVParticle*)recParticles.At(it);
-       Float_t eta = part->Eta();
-       if(TMath::Abs(eta)<0.9){
-         Float_t phi = part->Phi();
-         if(phi<0)phi+=TMath::Pi()*2.;    
-         Float_t dPhi = phi - phiRec;
-         Float_t dEta = eta - etaRec;
-         if(dPhi>TMath::Pi())dPhi = dPhi - 2.*TMath::Pi();
-         if(dPhi<(-1.*TMath::Pi()))dPhi = dPhi + 2.*TMath::Pi();      
-         fh2PhiPt[ir]->Fill(dPhi,ptRec,eventW);
-         fh2PhiEta[ir]->Fill(dPhi,dEta,eventW);
-       }
-
-       Float_t deltaR = recJets[ir].DeltaR(part);
-       if(ptRec>0)fh1TmpRho->Fill(deltaR,part->Pt()/ptRec);
-
-
-       if(deltaR<radiusRec&&ptRec>0){
-         Float_t z = part->Pt()/ptRec;
-         if(z>zLeading)zLeading=z;
-         Float_t lnz =  -1.*TMath::Log(z);
-         fh2FragRec[ir]->Fill(z,ptRec,eventW);
-         fh2FragLnRec[ir]->Fill(lnz,ptRec,eventW);
-       }
-      }
-      // fill the jet shapes
-      Float_t rhoSum = 0;
-      for(int ibx = 1;ibx<=fh2RhoPtRec[ir]->GetNbinsX();ibx++){
-       Float_t r = fh2RhoPtRec[ir]->GetXaxis()->GetBinCenter(ibx);
-       Float_t rho = fh1TmpRho->GetBinContent(ibx);
-       rhoSum += rho;
-       fh2RhoPtRec[ir]->Fill(r,ptRec,rho);
-       fh2PsiPtRec[ir]->Fill(r,ptRec,rhoSum);
-      }
-    }
-    
-    // Fill Correlation
-    Int_t ig = iGenIndex[ir];
-    if(ig>=0 && ig<nGenJets){
-      fhnJetContainer[kStep2+kMaxStep]->Fill(container,eventW);
-      if (fDebug > 10)Printf("%s:%d ig = %d ir = %d",(char*)__FILE__,__LINE__,ig,ir);
-      Double_t ptGen  = genJets[ig].Pt();
-      Double_t phiGen = genJets[ig].Phi();
-      if(phiGen<0)phiGen+=TMath::Pi()*2.; 
-      Double_t etaGen = genJets[ig].Eta();
-      
-      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(TMath::Abs(etaGen)<fJetRecEtaWindow)fhnJetContainer[kStep4+kMaxStep]->Fill(container,eventW);
-      if(TMath::Abs(etaRec)<fJetRecEtaWindow){
-       fhnJetContainer[kStep3+kMaxStep]->Fill(container,eventW);
-       fhnCorrelation->Fill(container);
-       if(ptGen>0){
-         Float_t delta = (ptRec-ptGen)/ptGen;
-         fh2RelPtFGen->Fill(ptGen,delta,eventW);
-       }
-       if(fhnCorrelationPhiZRec)fhnCorrelationPhiZRec->Fill(containerPhiZ);
-      }// if etarec in window      
-    } 
-    else{
-      containerPhiZ[3] = 0;
-      if(fhnCorrelationPhiZRec)fhnCorrelationPhiZRec->Fill(containerPhiZ);
-    }
-  }// loop over reconstructed jets
-
-
-  if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
-  if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
-  PostData(1, fHistList);
-}
-
-
 void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
   //
   // Create the particle container for the correction framework manager and 
@@ -2055,7 +1186,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();
          }
@@ -2166,3 +1297,53 @@ 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;
+}