]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
Rewritten spectrum2 task, old running is optional, various minor updates to AddTask...
[u/mrichter/AliRoot.git] / PWG4 / JetTasks / AliAnalysisTaskJetSpectrum2.cxx
index a7aaca82049ec7a0204c502de7da5d7014f2b363..bf9f64adc70128504aa71230f3efe9b36dcf72f0 100644 (file)
@@ -1,3 +1,4 @@
+
 // **************************************
 // Task used for the correction of determiantion of reconstructed jet spectra
 // Compares input (gen) and output (rec) jets   
@@ -48,6 +49,7 @@
 #include "AliAODHandler.h"
 #include "AliAODTrack.h"
 #include "AliAODJet.h"
+#include "AliAODJetEventBackground.h"
 #include "AliAODMCParticle.h"
 #include "AliMCEventHandler.h"
 #include "AliMCEvent.h"
@@ -65,100 +67,216 @@ ClassImp(AliAnalysisTaskJetSpectrum2)
 AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(): AliAnalysisTaskSE(),
   fJetHeaderRec(0x0),
   fJetHeaderGen(0x0),
-  fAOD(0x0),
+  fAODIn(0x0),
+  fAODOut(0x0),
+  fAODExtension(0x0),
   fhnCorrelation(0x0),
+  fhnCorrelationPhiZRec(0x0),
+  f1PtScale(0x0),
   fBranchRec("jets"),
   fBranchGen(""),
+  fBranchBkg(""), 
+  fNonStdFile(""),
   fUseAODJetInput(kFALSE),
   fUseAODTrackInput(kFALSE),
   fUseAODMCInput(kFALSE),
   fUseGlobalSelection(kFALSE),
   fUseExternalWeightOnly(kFALSE),
   fLimitGenJetEta(kFALSE),
+  fBkgSubtraction(kFALSE),
+  fUseOldFill(kFALSE),
+  fNMatchJets(5),
+  fFillCorrBkg(0),
   fFilterMask(0),
+  fEventSelectionMask(0),
   fAnalysisType(0),
   fTrackTypeRec(kTrackUndef),
   fTrackTypeGen(kTrackUndef),
+  fEventClass(0),
   fAvgTrials(1),
   fExternalWeight(1),    
-  fRecEtaWindow(0.5),
+  fJetRecEtaWindow(0.5),
+  fTrackRecEtaWindow(0.5),
+  fMinJetPt(0),
+  fMinTrackPt(0.15),
+  fDeltaPhiWindow(90./180.*TMath::Pi()),
   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),
-  fh2JetsLeadingPhiEta(0x0),
-  fh2JetsLeadingPhiPt(0x0),
-  fh2TracksLeadingPhiEta(0x0),
-  fh2TracksLeadingPhiPt(0x0),
-  fh2TracksLeadingJetPhiPt(0x0),
+  fh2NGenJetsPt(0x0),
+  fh2NGenTracksPt(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){
-    fh2PhiPt[i] = fh2PhiEta[i] = fh2FragRec[i] = fh2FragLnRec[i] = fh2FragGen[i] = fh2FragLnGen[i] = 0;
     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;
+    fh1SumPtTrack[ij] = 0;
+    fh1PtJetsIn[ij] = 0;
+    fh1PtTracksIn[ij] = 0;
+    fh1PtTracksLeadingIn[ij] = 0;
+    fh2NJetsPt[ij]  = 0;
+    fh2NTracksPt[ij]  = 0;
+    fh2LeadingJetPtJetPhi[ij] = 0;
+    fh2LeadingTrackPtTrackPhi[ij] = 0;
+    for(int i = 0;i < kMaxJets;++i){
+      fh1PtIn[ij][i] = 0;
+      fh2RhoPt[ij][i] = 0;
+      fh2PsiPt[ij][i] = 0;
+    }
+
+    fh1DijetMinv[ij] = 0;      
+    fh2DijetDeltaPhiPt[ij] = 0;  
+    fh2DijetAsymPt[ij] = 0; 
+    fh2DijetPt2vsPt1[ij] = 0;
+    fh2DijetDifvsSum[ij] = 0;
+
+  }
 }
 
 AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
   AliAnalysisTaskSE(name),
   fJetHeaderRec(0x0),
   fJetHeaderGen(0x0),
-  fAOD(0x0),
+  fAODIn(0x0),
+  fAODOut(0x0),
+  fAODExtension(0x0),
   fhnCorrelation(0x0),
+  fhnCorrelationPhiZRec(0x0),
+  f1PtScale(0x0),
   fBranchRec("jets"),
   fBranchGen(""),
+  fBranchBkg(""),
+  fNonStdFile(""),
   fUseAODJetInput(kFALSE),
   fUseAODTrackInput(kFALSE),
   fUseAODMCInput(kFALSE),
   fUseGlobalSelection(kFALSE),
   fUseExternalWeightOnly(kFALSE),
   fLimitGenJetEta(kFALSE),
+  fBkgSubtraction(kFALSE),
+  fUseOldFill(kFALSE),
+  fNMatchJets(5),
+  fFillCorrBkg(0),
   fFilterMask(0),
+  fEventSelectionMask(0),
   fAnalysisType(0),
   fTrackTypeRec(kTrackUndef),
   fTrackTypeGen(kTrackUndef),
+  fEventClass(0),
   fAvgTrials(1),
   fExternalWeight(1),    
-  fRecEtaWindow(0.5),
+  fJetRecEtaWindow(0.5),
+  fTrackRecEtaWindow(0.5),
+  fMinJetPt(0),
+  fMinTrackPt(0.15),
+  fDeltaPhiWindow(90./180.*TMath::Pi()),
   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),
-  fh2JetsLeadingPhiEta(0x0),
-  fh2JetsLeadingPhiPt(0x0),
-  fh2TracksLeadingPhiEta(0x0),
-  fh2TracksLeadingPhiPt(0x0),
-  fh2TracksLeadingJetPhiPt(0x0),
+  fh2NGenJetsPt(0x0),
+  fh2NGenTracksPt(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)
 {
 
@@ -166,20 +284,75 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
     fhnJetContainer[i] = 0;
   }  
   for(int i = 0;i < kMaxJets;++i){
-    fh2PhiPt[i] = fh2PhiEta[i] = fh2FragRec[i] = fh2FragLnRec[i] = fh2FragGen[i] = fh2FragLnGen[i] = 0;
     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;
   }
-  DefineOutput(1, TList::Class());  
+
+  for(int ij = 0;ij <kJetTypes;++ij){    
+    fh1NJets[ij] = 0;
+    fh1SumPtTrack[ij] = 0;
+    fh1PtJetsIn[ij] = 0;
+    fh1PtTracksIn[ij] = 0;
+    fh1PtTracksLeadingIn[ij] = 0;
+    fh2NJetsPt[ij]  = 0;
+    fh2NTracksPt[ij]  = 0;
+    fh2LeadingJetPtJetPhi[ij] = 0;
+    fh2LeadingTrackPtTrackPhi[ij] = 0;
+    for(int i = 0;i < kMaxJets;++i){
+      fh1PtIn[ij][i] = 0;
+      fh2RhoPt[ij][i] = 0;
+      fh2PsiPt[ij][i] = 0;
+    }
+
+    fh1DijetMinv[ij] = 0;      
+    fh2DijetDeltaPhiPt[ij] = 0;  
+    fh2DijetAsymPt[ij] = 0; 
+    fh2DijetPt2vsPt1[ij] = 0;
+    fh2DijetDifvsSum[ij] = 0;
+  } 
+
+ DefineOutput(1, TList::Class());  
 }
 
 
 
 Bool_t AliAnalysisTaskJetSpectrum2::Notify()
 {
+
+
+
   //
   // Implemented Notify() to read the cross sections
   // and number of trials from pyxsec.root
   // 
+  
+  // Fetch the aod also from the input in,
+  // have todo it in notify
+  
+  
+  fAODIn = dynamic_cast<AliAODEvent*>(InputEvent());
+  //  assume that the AOD is in the general output...
+  fAODOut  = AODEvent();
+  
+  if(fNonStdFile.Length()!=0){
+    // case that we have an AOD extension we need can fetch the jets from the extended output
+    AliAODHandler *aodH = dynamic_cast<AliAODHandler*>(AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler());
+    fAODExtension = aodH->GetExtension(fNonStdFile.Data());    
+    if(!fAODExtension){
+      if(fDebug>1)Printf("AODExtension found for %s",fNonStdFile.Data());
+    }
+  }
+
 
   TTree *tree = AliAnalysisManager::GetAnalysisManager()->GetTree();
   Float_t xsection = 0;
@@ -202,21 +375,19 @@ Bool_t AliAnalysisTaskJetSpectrum2::Notify()
     Float_t nEntries = (Float_t)tree->GetTree()->GetEntries();
     if(ftrials>=nEntries && nEntries>0.)fAvgTrials = ftrials/nEntries;
   }  
+
+
   return kTRUE;
 }
 
 void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
 {
 
-  //
-  // Create the output container
-  //
-
 
   // Connect the AOD
 
 
-  MakeJetContainer();
 
 
   if (fDebug > 1) printf("AnalysisTaskJetSpectrum2::UserCreateOutputObjects() \n");
@@ -227,10 +398,15 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
   Bool_t oldStatus = TH1::AddDirectoryStatus();
   TH1::AddDirectory(kFALSE);
 
+
+  MakeJetContainer();
+  fHistList->Add(fhnCorrelation);
+  fHistList->Add(fhnCorrelationPhiZRec);
+
   //
   //  Histogram
     
-  const Int_t nBinPt = 100;
+  const Int_t nBinPt = 320;
   Double_t binLimitsPt[nBinPt+1];
   for(Int_t iPt = 0;iPt <= nBinPt;iPt++){
     if(iPt == 0){
@@ -253,6 +429,16 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
   }
 
 
+  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];
@@ -268,24 +454,47 @@ 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);
+
+  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);
+  fHistList->Add(fh2RelPtFGen);
 
-  fh1NGenJets  = new TH1F("fh1NGenJets","N generated jets",20,-0.5,19.5);
-  fh1NRecJets = new TH1F("fh1NRecJets","N reconstructed jets",20,-0.5,19.5);
 
+  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);
@@ -293,16 +502,10 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
 
   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);
-  // 
 
-  fh2JetsLeadingPhiEta = new TH2F("fh2JetsLeadingPhiEta","delta eta vs delta phi to leading jet;#Delta#phi;#Delta#eta",
-                               nBinPhi,binLimitsPhi,nBinEta,binLimitsEta);
-  fh2JetsLeadingPhiPt = new TH2F("fh2JetsLeadingPhiPt","leading p_T vs delta phi to leading jet;#Delta#phi;p_{T} (GeV/c)",
-                               nBinPhi,binLimitsPhi,nBinPt,binLimitsPt);
-  fh2TracksLeadingPhiEta = new TH2F("fh2TracksLeadingPhiEta","delta eta vs delta phi to leading track;#Delta#phi;#Delta#eta",
-                                   nBinPhi,binLimitsPhi,nBinEta,binLimitsEta);
-  fh2TracksLeadingPhiPt = new TH2F("fh2TracksLeadingPhiPt","leading p_T vs delta phi to leading jet;#Delta#phi;p_{T} (GeV/c)",
-                                nBinPhi,binLimitsPhi,nBinPt,binLimitsPt);
+  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);
@@ -314,6 +517,16 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
     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);
@@ -321,24 +534,48 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
                             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);
+                             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);
+                               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){
-    fHistList->Add(fh1Xsec);
-    fHistList->Add(fh1Trials);
-    fHistList->Add(fh1PtHard);
-    fHistList->Add(fh1PtHardNoW);
-    fHistList->Add(fh1PtHardTrials);
-    if(fBranchGen.Length()>0){
-      fHistList->Add(fh1NGenJets);
-      fHistList->Add(fh1PtTracksGenIn);
+     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);
@@ -348,26 +585,133 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
     fHistList->Add(fh1SumPtTrackAreaRec);
     fHistList->Add(fh2NRecJetsPt);
     fHistList->Add(fh2NRecTracksPt);
-    fHistList->Add(fh2JetsLeadingPhiEta );
-    fHistList->Add(fh2JetsLeadingPhiPt );
-    fHistList->Add(fh2TracksLeadingPhiEta);
-    fHistList->Add(fh2TracksLeadingPhiPt);
+    fHistList->Add(fh2NGenJetsPt);
+    fHistList->Add(fh2NGenTracksPt);
     for(int i = 0;i<kMaxStep*2;++i)fHistList->Add(fhnJetContainer[i]);
     for(int ij = 0;ij<kMaxJets;++ij){
       fHistList->Add( fh1PtRecIn[ij]);
-      if(fBranchGen.Length()>0){
-       fHistList->Add( fh1PtGenIn[ij]);
-       fHistList->Add( fh2FragGen[ij]);
-       fHistList->Add( fh2FragLnGen[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(fhnCorrelation);
+    //    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 = "";
+      if(ij==kJetRec){
+       cAdd = "Rec";
+       cJetBranch = fBranchRec.Data();
+      }
+      else if (ij==kJetGen){
+       cAdd = "Gen";
+       cJetBranch = fBranchGen.Data();
+      }
+
+      fh1NJets[ij] =new TH1F(Form("fh1N%sJets",cAdd.Data()),Form("N %s jets",cAdd.Data()),50,-0.5,49.5);
+      fHistList->Add(fh1NJets[ij]);
+
+      fh1PtJetsIn[ij]  = new TH1F(Form("fh1PtJets%sIn",cAdd.Data()),Form("%s jets p_T;p_{T} (GeV/c)",cAdd.Data()),nBinPt,binLimitsPt);
+      fHistList->Add(fh1PtJetsIn[ij]);
+
+      fh1PtTracksIn[ij] = new TH1F(Form("fh1PtTracks%sIn",cAdd.Data()),Form("%s track p_T;p_{T} (GeV/c)",cAdd.Data()),nBinPt,binLimitsPt);
+      fHistList->Add(fh1PtTracksIn[ij]);
+
+      fh1PtTracksLeadingIn[ij] = new TH1F(Form("fh1PtTracksLeading%sIn",cAdd.Data()),Form("%s track p_T;p_{T} (GeV/c)",cAdd.Data()),nBinPt,binLimitsPt);
+      fHistList->Add(fh1PtTracksLeadingIn[ij]);
+
+      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]);
+
+      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);
+      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){
+
+       fh1PtIn[ij][i] = new TH1F(Form("fh1Pt%sIn_j%d",cAdd.Data(),i),Form("%s p_T input ;p_{T}",cAdd.Data()),nBinPt,binLimitsPt);
+       fHistList->Add(fh1PtIn[ij][i]);
+
+       fh2RhoPt[ij][i] = new TH2F(Form("fh2RhoPt%s_j%d",cAdd.Data(),i),Form("jet shape rho for %s jets;r;p_{T};",cAdd.Data()),
+                                  40,0.,2.,nBinPt,binLimitsPt);
+       fHistList->Add(fh2RhoPt[ij][i]);
+       if(!fh1TmpRho)fh1TmpRho = new TH1F("fh1TmpRho","tmp histo for jet shape",40,0.,2);
+
+
+       fh2PsiPt[ij][i] = new TH2F(Form("fh2PsiPt%s_j%d",cAdd.Data(),i),Form("jet shape #psi for %s jets;r;p_{T};",cAdd.Data()),
+                                    40,0.,2.,nBinPt,binLimitsPt);
+       fHistList->Add(fh2PsiPt[ij][i]);
+      }
+
+
+      fh1DijetMinv[ij]                = new TH1F(Form("fh1Dijet%sMinv",cAdd.Data()),"Dijet invariant mass;m_{JJ}",nBinPt,binLimitsPt);
+      fHistList->Add(fh1DijetMinv[ij]);
+
+      fh2DijetDeltaPhiPt[ij]       = new TH2F(Form("fh2Dijet%sDeltaPhiPt",cAdd.Data()),"Difference in the azimuthal angle;#Delta#phi;p_{T,1};Entries",180,0.,TMath::Pi(),nBinPt,binLimitsPt);
+      fHistList->Add(fh2DijetDeltaPhiPt[ij]);
+
+      fh2DijetAsymPt[ij]            = new TH2F(Form("fh2Dijet%sAsym",cAdd.Data()),"Pt asymmetry;#Deltap_{T}/(p_{T,1}+p_{T,2});p_{T,1};Entries",50,0.,1.,nBinPt,binLimitsPt);
+      fHistList->Add(fh2DijetAsymPt[ij]);
+
+      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));
@@ -391,42 +735,540 @@ void AliAnalysisTaskJetSpectrum2::Init()
 
 }
 
-void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
-{
+void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
 
-  if(!AliAnalysisHelperJetTasks::Selected()&&fUseGlobalSelection){
+
+  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",(char*)__FILE__,__LINE__);
+    if (fDebug > 1)Printf("Not selected %s:%d SelectInfo %d  Class %d",(char*)__FILE__,__LINE__, AliAnalysisHelperJetTasks::Selected(),AliAnalysisHelperJetTasks::EventClass());
     PostData(1, fHistList);
     return;
   }
 
+
+  static AliAODEvent* aod = 0;
+
+  // take all other information from the aod we take the tracks from
+  if(!aod){
+   if(fUseAODTrackInput)aod = fAODIn;
+   else aod = fAODOut;
+  }
+
+
   //
   // Execute analysis for current event
   //
-  AliESDEvent *fESD = 0;
-  if(fUseAODJetInput){    
-    fAOD = dynamic_cast<AliAODEvent*>(InputEvent());
-    if(!fAOD){
-      Printf("%s:%d AODEvent not found in Input Manager %d",(char*)__FILE__,__LINE__,fUseAODJetInput);
+  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(fAODOut&&!aodRecJets){
+    aodRecJets = dynamic_cast<TClonesArray*>(fAODOut->FindListObject(fBranchRec.Data()));
+  }
+  if(fAODExtension&&!aodRecJets){
+    aodRecJets = dynamic_cast<TClonesArray*>(fAODExtension->GetAOD()->FindListObject(fBranchRec.Data()));
+  }
+  if(fAODIn&&!aodRecJets){
+    aodRecJets = dynamic_cast<TClonesArray*>(fAODIn->FindListObject(fBranchRec.Data()));
+  }
+
+
+
+  if(!aodRecJets){
+    Printf("%s:%d no reconstructed Jet array with name %s in AOD",(char*)__FILE__,__LINE__,fBranchRec.Data());
+    return;
+  }
+
+  TClonesArray *aodGenJets = 0;
+  if(fBranchGen.Length()>0){
+    if(fAODOut&&!aodGenJets){
+      aodGenJets = dynamic_cast<TClonesArray*>(fAODOut->FindListObject(fBranchGen.Data()));
+    }
+    if(fAODExtension&&!aodGenJets){
+      aodGenJets = dynamic_cast<TClonesArray*>(fAODExtension->GetAOD()->FindListObject(fBranchGen.Data()));
+    }
+    if(fAODIn&&!aodGenJets){
+      aodGenJets = dynamic_cast<TClonesArray*>(fAODIn->FindListObject(fBranchGen.Data()));
+    }
+
+    if(!aodGenJets){
+      Printf("%s:%d no generated Jet array with name %s in AOD",(char*)__FILE__,__LINE__,fBranchGen.Data());
       return;
     }
-    // fethc the header
   }
-  else{
-    //  assume that the AOD is in the general output...
-    fAOD  = AODEvent();
-    if(!fAOD){
-      Printf("%s:%d AODEvent not found in the Output",(char*)__FILE__,__LINE__);
+
+
+  if(false){
+    UserExecOld();
+    return;
+  }
+
+  // new Scheme
+  // first fill all the pure  histograms, i.e. full jets 
+  // in case of the correaltion limit to the n-leading jets
+
+  // reconstructed
+
+  
+  // generated
+
+
+  // second fill the correlation histograms, here we limit to the n-th leading jet in case of the reconstructed
+
+
+  TList genJetsList;         // full acceptance
+  TList genJetsListCut;      // acceptance cut
+  TList recJetsList;         // full acceptance
+  TList recJetsListCut;      // acceptance cut
+
+
+  GetListOfJets(&recJetsList,aodRecJets,0);
+  GetListOfJets(&recJetsListCut,aodRecJets,1);
+
+  if(fBranchGen.Length()>0){
+    GetListOfJets(&genJetsList,aodGenJets,0);
+    GetListOfJets(&genJetsListCut,aodGenJets,1);
+  }
+
+  Double_t eventW = 1;
+  Double_t ptHard = 0; 
+  Double_t nTrials = 1; // Trials for MC trigger 
+  fh1Trials->Fill("#sum{ntrials}",fAvgTrials); 
+
+  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;
     }
-    if(fDebug>0){
-      fESD = dynamic_cast<AliESDEvent*> (InputEvent());
+    AliGenPythiaEventHeader*  pythiaGenHeader = AliAnalysisHelperJetTasks::GetPythiaEventHeader(mcEvent);
+    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);
+    } 
+  }// (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());
+
+  // Event control and counting ...  
+  // MC
+  fh1PtHard->Fill(ptHard,eventW);
+  fh1PtHardNoW->Fill(ptHard,1);
+  fh1PtHardTrials->Fill(ptHard,nTrials);
+
+  // Real
+  fh1ZVtx->Fill(aod->GetPrimaryVertex()->GetZ());
+
+  // the loops for rec and gen should be indentical... pass it to a separate
+  // function ...
+  // Jet Loop
+  // Track Loop
+  // Jet Jet Loop
+  // Jet Track loop
+
+  FillJetHistos(recJetsListCut,recParticles,kJetRec);
+  FillTrackHistos(recParticles,kJetRec);
+
+  FillJetHistos(genJetsListCut,genParticles,kJetGen);
+  FillTrackHistos(genParticles,kJetGen);
+
+  // Here follows the jet matching part
+  // delegate to a separated method?
+
+  FillMatchHistos(recJetsList,genJetsList);
+
+  if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
+  PostData(1, fHistList);
+}
+
+void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particlesList,Int_t iType){
+
+  if(iType>=kJetTypes){
+    return;
+  }
+
+  Int_t nJets = jetsList.GetEntries(); 
+  fh1NJets[iType]->Fill(nJets);
+
+  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;
+  Int_t ij0 = -1;
+  Int_t ij1 = -1;
+
+
+  for(int ij = 0;ij < nJets;ij++){
+    AliAODJet *jet = (AliAODJet*)jetsList.At(ij);
+    Float_t ptJet = jet->Pt();
+    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 soring and acceptance cut...
+    if(ij==0){
+      ij0 = ij;
+      pT0 = ptJet;
+      phi0 = jet->Phi();
+      if(phi0<0)phi0+=TMath::Pi()*2.;
+    }
+    else if(ptJet>pT1){
+      // take only the backward hemisphere??                                                        
+      phi1 = jet->Phi();
+      Float_t dPhi = phi1 - phi0;
+      if(dPhi>TMath::Pi())dPhi = dPhi - 2.*TMath::Pi();
+      if(dPhi<(-1.*TMath::Pi()))dPhi = dPhi + 2.*TMath::Pi();
+      if(TMath::Abs(TMath::Pi()-dPhi)<fDeltaPhiWindow){
+       ij1 = ij;
+       pT1 = ptJet;
+      }
+    }
+    // fill jet histos for kmax jets
+    if(ij<kMaxJets){      
+      Float_t phiJet = jet->Phi();
+      if(phiJet<0)phiJet+=TMath::Pi()*2.;    
+      fh1TmpRho->Reset();
+      fh1PtIn[iType][ij]->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());
+       }
+      }
+      if(particlesList.GetSize()){
+
+       // Particles... correlated with jets...
+       for(int it = 0;it<particlesList.GetEntries();++it){
+         AliVParticle *part = (AliVParticle*)particlesList.At(it);
+         Float_t deltaR = jet->DeltaR(part);
+         if(ptJet>0)fh1TmpRho->Fill(deltaR,part->Pt()/ptJet);
+       }
+       // fill the jet shapes
+       Float_t rhoSum = 0;
+       for(int ibx = 1;ibx<=fh2RhoPt[iType][ij]->GetNbinsX();ibx++){
+         Float_t r = fh2RhoPt[iType][ij]->GetXaxis()->GetBinCenter(ibx);
+         Float_t rho = fh1TmpRho->GetBinContent(ibx);
+         rhoSum += rho;
+         fh2RhoPt[iType][ij]->Fill(r,ptJet,rho);
+         fh2PsiPt[iType][ij]->Fill(r,ptJet,rhoSum);
+       }
+      }// if we have particles
+    }// ij < kMaxJets
+  }// Jet Loop
+
+
+  // do something with dijets...
+  if(ij0>=0&&ij1>0){
+    AliAODJet *jet0 = (AliAODJet*)jetsList.At(ij0);
+    Double_t ptJet0 = jet0->Pt();
+    Double_t phiJet0 = jet0->Phi();
+    if(phiJet0<0)phiJet0+=TMath::Pi()*2.;      
+
+    AliAODJet *jet1 = (AliAODJet*)jetsList.At(ij1);
+    Double_t ptJet1 = jet1->Pt();
+    Double_t phiJet1 = jet1->Phi();
+    if(phiJet1<0)phiJet1+=TMath::Pi()*2.;      
+
+    Float_t deltaPhi = phiJet0 - phiJet1;
+    if(deltaPhi>TMath::Pi())deltaPhi = deltaPhi - 2.*TMath::Pi();
+    if(deltaPhi<(-1.*TMath::Pi()))deltaPhi = deltaPhi + 2.*TMath::Pi();      
+    deltaPhi = TMath::Abs(deltaPhi);
+    fh2DijetDeltaPhiPt[iType]->Fill(deltaPhi,ptJet0);      
+
+    Float_t asym = 9999;
+    if((ptJet0+ptJet1)>0)asym = (ptJet0-ptJet1)/(ptJet0+ptJet1);
+      fh2DijetAsymPt[iType]->Fill(asym,ptJet0);
+      fh2DijetPt2vsPt1[iType]->Fill(ptJet0,ptJet1);        
+      fh2DijetDifvsSum[iType]->Fill(ptJet0+ptJet1,ptJet0-ptJet1);        
+      Float_t minv = 2.*(jet0->P()*jet1->P()-
+                        jet0->Px()*jet1->Px()- 
+                        jet0->Py()*jet1->Py()- 
+                        jet0->Pz()*jet1->Pz());    // assume mass == 0;
+      if(minv<0)minv=0; // prevent numerical instabilities
+      minv = TMath::Sqrt(minv);
+      fh1DijetMinv[iType]->Fill(minv);            
+  }
+  
+
+
+  // count down the jets above thrueshold
+  Int_t nOver = nJets;
+  if(nOver>0){
+    TIterator *jetIter = jetsList.MakeIterator();
+    AliAODJet *tmpJet = (AliAODJet*)(jetIter->Next());  
+    Float_t pt = tmpJet->Pt();
+    if(tmpJet){
+      for(int i = 1;i <= fh2NJetsPt[iType]->GetNbinsX();i++){
+       Float_t ptCut = fh2NJetsPt[iType]->GetXaxis()->GetBinCenter(i);
+       while(pt<ptCut&&tmpJet){
+         nOver--;
+         tmpJet = (AliAODJet*)(jetIter->Next()); 
+         if(tmpJet){
+           pt = tmpJet->Pt();
+         }
+       }
+       if(nOver<=0)break;
+       fh2NJetsPt[iType]->Fill(ptCut,nOver);
+      }
+    }
+    delete jetIter;
+  }
+}
+
+void AliAnalysisTaskJetSpectrum2::FillTrackHistos(TList &particlesList,int iType){
+
+  Int_t nTrackOver = particlesList.GetSize();
+  // do the same for tracks and jets
+  if(nTrackOver>0){
+    TIterator *trackIter = particlesList.MakeIterator();
+    AliVParticle *tmpTrack = (AliVParticle*)(trackIter->Next());  
+    Float_t pt = tmpTrack->Pt();
+    for(int i = 1;i <= fh2NTracksPt[iType]->GetNbinsX();i++){
+      Float_t ptCut = fh2NTracksPt[iType]->GetXaxis()->GetBinCenter(i);
+      while(pt<ptCut&&tmpTrack){
+       nTrackOver--;
+       tmpTrack = (AliVParticle*)(trackIter->Next()); 
+       if(tmpTrack){
+         pt = tmpTrack->Pt();
+       }
+      }
+      if(nTrackOver<=0)break;
+      fh2NTracksPt[iType]->Fill(ptCut,nTrackOver);
     }
+
+    
+    trackIter->Reset();
+    AliVParticle *leading = (AliVParticle*)particlesList.At(0);
+    Float_t sumPt = 0;
+
+    while((tmpTrack = (AliVParticle*)(trackIter->Next()))){
+      Float_t tmpPt = tmpTrack->Pt();
+      fh1PtTracksIn[iType]->Fill(tmpPt);
+      sumPt += tmpPt;
+      Float_t tmpPhi = tmpTrack->Phi();
+      if(tmpPhi<0)tmpPhi+=TMath::Pi()*2.;    
+      if(tmpTrack==leading){
+       fh1PtTracksLeadingIn[iType]->Fill(tmpPt);
+       fh2LeadingTrackPtTrackPhi[iType]->Fill(tmpPt,tmpPhi);
+       continue;
+      }
+    }  
+    fh1SumPtTrack[iType]->Fill(sumPt);
+    delete trackIter;
   }
+
+}
+
+
+void AliAnalysisTaskJetSpectrum2::FillMatchHistos(TList &recJetsList,TList &genJetsList){
+
+
+  // Fill al the matching histos
+  // It is important that the acceptances for the mathing are as large as possible
+  // to avoid false matches on the edge of acceptance
+  // therefore we add some extra matching jets as overhead
+
+  static TArrayI aGenIndex(recJetsList.GetEntries());
+  if(aGenIndex.GetSize()<recJetsList.GetEntries())aGenIndex.Set(recJetsList.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",genJetsList.GetEntries(),aRecIndex.GetSize());
+    Printf("New Rec List %d gen indey Array %d",recJetsList.GetEntries(),aGenIndex.GetSize());
+  }
+  AliAnalysisHelperJetTasks::GetClosestJets(&genJetsList,TMath::Min((Int_t)fNMatchJets,(Int_t)genJetsList.GetEntries()),
+                                           &recJetsList,TMath::Min((Int_t)fNMatchJets,(Int_t)recJetsList.GetEntries()),
+                                           aGenIndex,aRecIndex,fDebug);
+
+  if(fDebug){
+    for(int i = 0;i< aGenIndex.GetSize();++i){ 
+      if(aGenIndex[i]>=0)Printf("iGenFound: %d -> %d",i,aGenIndex[i]); 
+    }
+    for(int i = 0;i< aRecIndex.GetSize();++i){
+      if(aRecIndex[i]>=0)Printf("iRecFound: %d -> %d",i,aRecIndex[i]); 
+    }
+  }
+
+  Double_t container[6];
+  Double_t containerPhiZ[6];
+
+  // loop over generated jets
+  // consider the 
+  for(int ig = 0;ig < genJetsList.GetEntries();++ig){
+    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;
+    fhnJetContainer[kStep0]->Fill(&container[3]);
+    if(JetSelected(genJet)){
+      fhnJetContainer[kStep1]->Fill(&container[3]);
+      Int_t ir = aRecIndex[ig];
+      if(ir>=0&&ir<recJetsList.GetEntries()){   
+       fhnJetContainer[kStep2]->Fill(&container[3]);
+       AliAODJet* recJet = (AliAODJet*)recJetsList.At(ir); 
+       if(JetSelected(recJet))fhnJetContainer[kStep4]->Fill(&container[3]);
+       if(JetSelected(recJet))fhnJetContainer[kStep3]->Fill(&container[3]);
+      }
+    }
+  }// loop over generated jets used for matching...
+
+
+
+  // loop over reconstructed jets
+  for(int ir = 0;ir < recJetsList.GetEntries();++ir){
+    AliAODJet *recJet = (AliAODJet*)recJetsList.At(ir);
+    Double_t etaRec = recJet->Eta();
+    Double_t ptRec = recJet->Pt();
+    Double_t phiRec = recJet->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;
+
+    fhnJetContainer[kStep0+kMaxStep]->Fill(container);
+    if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
   
+    if(JetSelected(recJet)){
+      fhnJetContainer[kStep1+kMaxStep]->Fill(container);
+      // Fill Correlation
+      Int_t ig = aGenIndex[ir];
+      if(ig>=0 && ig<genJetsList.GetEntries()){
+       fhnJetContainer[kStep2+kMaxStep]->Fill(container);
+       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;
+       containerPhiZ[3] = ptGen;
+       // 
+       // we accept only jets which are detected within a smaller window, to avoid ambigious pair association at the edges of the acceptance
+       // 
+       if(JetSelected(genJet))fhnJetContainer[kStep4+kMaxStep]->Fill(container);
+       fhnJetContainer[kStep3+kMaxStep]->Fill(container);
+       fhnCorrelation->Fill(container);
+       if(ptGen>0){
+         Float_t delta = (ptRec-ptGen)/ptGen;
+         fh2RelPtFGen->Fill(ptGen,delta);
+         fh2PtFGen->Fill(ptGen,ptRec);
+       }
+       if(fhnCorrelationPhiZRec)fhnCorrelationPhiZRec->Fill(containerPhiZ);
+      } 
+      else{
+       containerPhiZ[3] = 0;
+       if(fhnCorrelationPhiZRec)fhnCorrelationPhiZRec->Fill(containerPhiZ);
+      }
+    }// loop over reconstructed jets
+  }
+  if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
+}
+
+
+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);
 
@@ -439,22 +1281,154 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
   }
 
   if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
-  TClonesArray *aodRecJets = dynamic_cast<TClonesArray*>(fAOD->FindListObject(fBranchRec.Data()));
+  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;
   }
 
-  // ==== General variables needed
+  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));
+        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; 
@@ -499,22 +1473,24 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
        pythiaGenHeader->TriggerJet(ip,p);
        pythiaGenJets[iCount].SetPxPyPzE(p[0],p[1],p[2],p[3]);
        
-       /*
-       if(fLimitGenJetEta){
-         if(pythiaGenJets[iCount].Eta()>fJetHeaderRec->GetJetEtaMax()||
-            pythiaGenJets[iCount].Eta()<fJetHeaderRec->GetJetEtaMin())continue;
-       }
-       */
-
        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
-         genJets[iCount].SetPxPyPzE(p[0],p[1],p[2],p[3]);
+         if(!fBkgSubtraction){
+           genJets[iCount].SetPxPyPzE(p[0],p[1],p[2],p[3]);
+           iCount++;
+         }
        }
-       iCount++;
       }
     }
-    if(fBranchGen.Length()==0)nGenJets = iCount;    
+    if(fBranchGen.Length()==0&&!fBkgSubtraction)nGenJets = iCount;    
   }// (fAnalysisType&kMCESD)==kMCESD)
 
 
@@ -536,10 +1512,11 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
   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){
-    TClonesArray *aodGenJets = dynamic_cast<TClonesArray*>(fAOD->FindListObject(fBranchGen.Data()));
+  if(fBranchGen.Length()>0&&!fBkgSubtraction){
     if(aodGenJets){
       Int_t iCount = 0;
       for(int ig = 0;ig < aodGenJets->GetEntries();++ig){
@@ -552,6 +1529,7 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
             tmp->Eta()<fJetHeaderRec->GetJetEtaMin())continue;
        }
        */
+       if(fMinJetPt>0&&tmp->Pt()<fMinJetPt)continue;
        genJets[iCount] = *tmp;
        iCount++;
       }
@@ -583,7 +1561,7 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
     AliAODJet *tmp = (AliAODJet*)(aodRecJets->At(ir));
     Float_t tmpPt = tmp->Pt();
     if(tmpPt>ptOld){
-      Printf("%s:%d Jets Not Sorted!! %d:%.3E %d%.3E",(char*)__FILE__,__LINE__,ir,tmpPt,ir-1,ptOld);
+      Printf("%s:%d Jets Not Sorted %s !! %d:%.3E %d:%.3E",(char*)__FILE__,__LINE__,fBranchRec.Data(),ir,tmpPt,ir-1,ptOld);
     }
     ptOld = tmpPt;
   }
@@ -611,9 +1589,8 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
     AliAODJet *leading = (AliAODJet*)aodRecJets->At(0);
     Float_t phi = leading->Phi();
     if(phi<0)phi+=TMath::Pi()*2.;    
-    Float_t eta = leading->Eta();
     pt = leading->Pt();
-     while((tmpRec = (AliAODJet*)(recIter->Next()))){
+    while((tmpRec = (AliAODJet*)(recIter->Next()))){
       Float_t tmpPt = tmpRec->Pt();
       fh1PtJetsRecIn->Fill(tmpPt);
       if(tmpRec==leading){
@@ -627,9 +1604,9 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
       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);
+      //  Float_t dEta = eta - tmpRec->Eta();
+      //      fh2JetsLeadingPhiEta->Fill(dPhi,dEta);
+      //      fh2JetsLeadingPhiPt->Fill(dPhi,pt);
     }  
     delete recIter;
   }
@@ -658,7 +1635,6 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
     AliVParticle *leading = (AliVParticle*)recParticles.At(0);
     Float_t phi = leading->Phi();
     if(phi<0)phi+=TMath::Pi()*2.;    
-    Float_t eta = leading->Eta();
     pt  = leading->Pt();
     while((tmpRec = (AliVParticle*)(recIter->Next()))){
       Float_t tmpPt = tmpRec->Pt();
@@ -674,9 +1650,9 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
       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);
+      //      Float_t dEta = eta - tmpRec->Eta();
+      //      fh2TracksLeadingPhiEta->Fill(dPhi,dEta);
+      //      fh2TracksLeadingPhiPt->Fill(dPhi,pt);
     }  
     delete recIter;
   }
@@ -693,14 +1669,17 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
     delete genIter;
   }
   
-  fh1NRecJets->Fill(nRecJets);
   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;
-    recJets[ir] = *tmp;
+    if(tmp->Pt()<fMinJetPt)continue;
+    recJets[iCountRec] = *tmp;
+    iCountRec++;
   }
+  nRecJets = iCountRec;
 
 
   if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
@@ -713,12 +1692,28 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
     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){
+    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]); 
     }
@@ -728,6 +1723,7 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
 
 
   Double_t container[6];
+  Double_t containerPhiZ[6];
 
   // loop over generated jets
 
@@ -741,38 +1737,48 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
     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)<fRecEtaWindow){
+    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);
-       if(genJets[ig].DeltaR(part)<radiusGen){
+       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);
        }
+
       }
-      if(ir>=0&&ir<nRecJets){
-       fhnJetContainer[kStep3]->Fill(&container[3],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)<fRecEtaWindow)fhnJetContainer[kStep4]->Fill(&container[3],eventW);
+      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){
@@ -781,6 +1787,7 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
     if(TMath::Abs(part->Eta())<0.9){
       Float_t pt = part->Pt();
       fh1PtTrackRec->Fill(pt,eventW);
+      //      fh2TrackPtTrackPhi->Fill(pt,part->Phi());
       sumPt += pt;
     }
   }
@@ -794,14 +1801,20 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
     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;
-
-    if(ptRec>10.&&fDebug>0){
+    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(),fInputHandler->GetTree()->GetReadEntry());
+      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());
@@ -821,10 +1834,16 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
 
     fhnJetContainer[kStep0+kMaxStep]->Fill(container,eventW);
     if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
-    if(TMath::Abs(etaRec)<fRecEtaWindow){
+  
+    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();
@@ -833,20 +1852,35 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
          if(phi<0)phi+=TMath::Pi()*2.;    
          Float_t dPhi = phi - phiRec;
          Float_t dEta = eta - etaRec;
-         if(dPhi<(-1.*TMath::Pi()))phiRec+=TMath::Pi()*2.;    
+         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);
        }
-       if(recJets[ir].DeltaR(part)<radiusRec){
+
+       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){
@@ -856,25 +1890,29 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
       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)<fRecEtaWindow)fhnJetContainer[kStep4+kMaxStep]->Fill(container,eventW);
-      if(TMath::Abs(etaRec)<fRecEtaWindow){
+      
+      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 etarec in window
-
+       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
 
@@ -891,19 +1929,19 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
   // link it
   //
   const Int_t kNvar   = 3 ; //number of variables on the grid:pt,eta, phi
-  const Double_t kPtmin = 5.0, kPtmax = 105.; // we do not want to have empty bins at the beginning...
+  const Double_t kPtmin = 0.0, kPtmax = 320.; // we do not want to have empty bins at the beginning...
   const Double_t kEtamin = -3.0, kEtamax = 3.0;
   const Double_t kPhimin = 0., kPhimax = 2. * TMath::Pi();
+  const Double_t kZmin = 0., kZmax = 1;
 
   // can we neglect migration in eta and phi?
   // phi should be no problem since we cover full phi and are phi symmetric
   // eta migration is more difficult  due to needed acceptance correction
   // in limited eta range
 
-
   //arrays for the number of bins in each dimension
   Int_t iBin[kNvar];
-  iBin[0] = 100; //bins in pt
+  iBin[0] = 320; //bins in pt
   iBin[1] =  1; //bins in eta 
   iBin[2] = 1; // bins in phi
 
@@ -920,7 +1958,7 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
 
 
   for(int i = 0;i < kMaxStep*2;++i){
-    fhnJetContainer[i] = new THnSparseF(Form("fhnJetContainer%d",i),Form("THnSparse jet info %d"),kNvar,iBin);
+    fhnJetContainer[i] = new THnSparseF(Form("fhnJetContainer%d",i),Form("THnSparse jet info %d",i),kNvar,iBin);
     for (int k=0; k<kNvar; k++) {
       fhnJetContainer[i]->SetBinEdges(k,binEdges[k]);
     }
@@ -941,14 +1979,42 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
   }
   fhnCorrelation->Sumw2();
 
+  // for second correlation histogram
+
+
+  const Int_t kNvarPhiZ   = 4; 
+  //arrays for the number of bins in each dimension
+  Int_t iBinPhiZ[kNvarPhiZ];
+  iBinPhiZ[0] = 80; //bins in pt
+  iBinPhiZ[1] = 72; //bins in phi 
+  iBinPhiZ[2] = 20; // bins in Z
+  iBinPhiZ[3] = 80; //bins in ptgen
+
+  //arrays for lower bounds :
+  Double_t* binEdgesPhiZ[kNvarPhiZ];
+  for(Int_t ivar = 0; ivar < kNvarPhiZ; ivar++)
+    binEdgesPhiZ[ivar] = new Double_t[iBinPhiZ[ivar] + 1];
+
+  for(Int_t i=0; i<=iBinPhiZ[0]; i++) binEdgesPhiZ[0][i]=(Double_t)kPtmin  + (kPtmax-kPtmin)/(Double_t)iBinPhiZ[0]*(Double_t)i;
+  for(Int_t i=0; i<=iBinPhiZ[1]; i++) binEdgesPhiZ[1][i]=(Double_t)kPhimin  + (kPhimax-kPhimin)/iBinPhiZ[1]*(Double_t)i;
+  for(Int_t i=0; i<=iBinPhiZ[2]; i++) binEdgesPhiZ[2][i]=(Double_t)kZmin  + (kZmax-kZmin)/iBinPhiZ[2]*(Double_t)i;
+  for(Int_t i=0; i<=iBinPhiZ[3]; i++) binEdgesPhiZ[3][i]=(Double_t)kPtmin  + (kPtmax-kPtmin)/(Double_t)iBinPhiZ[3]*(Double_t)i;
+
+  fhnCorrelationPhiZRec = new THnSparseF("fhnCorrelationPhiZRec","THnSparse with correlations",kNvarPhiZ,iBinPhiZ);
+  for (int k=0; k<kNvarPhiZ; k++) {
+    fhnCorrelationPhiZRec->SetBinEdges(k,binEdgesPhiZ[k]);
+  }
+  fhnCorrelationPhiZRec->Sumw2();
+
+
   // Add a histogram for Fake jets
-  //  thnDim[3] = AliPID::kSPECIES;
-  //  fFakeElectrons = new THnSparseF("fakeEkectrons", "Output for Fake Electrons", kNvar + 1, thnDim);
-  // for(Int_t idim = 0; idim < kNvar; idim++)
-  //  fFakeElectrons->SetBinEdges(idim, binEdges[idim]);
+
   for(Int_t ivar = 0; ivar < kNvar; ivar++)
     delete [] binEdges[ivar];
 
+  for(Int_t ivar = 0; ivar < kNvarPhiZ; ivar++)
+    delete [] binEdgesPhiZ[ivar];
+
 }
 
 void AliAnalysisTaskJetSpectrum2::Terminate(Option_t */*option*/)
@@ -974,11 +2040,12 @@ Int_t  AliAnalysisTaskJetSpectrum2::GetListOfTracks(TList *list,Int_t type){
     for(int it = 0;it < aod->GetNumberOfTracks();++it){
       AliAODTrack *tr = aod->GetTrack(it);
       if((fFilterMask>0)&&!(tr->TestFilterBit(fFilterMask)))continue;
-      if(TMath::Abs(tr->Eta())>0.9)continue;
+      if(TMath::Abs(tr->Eta())>fTrackRecEtaWindow)continue;
+      if(tr->Pt()<fMinTrackPt)continue;
       if(fDebug>0){
        if(tr->Pt()>20){
          Printf("High pT track found in Event %d with p_T, %E",(int)Entry(),tr->Pt());
-         Printf("%s read event, %d",fInputHandler->GetTree()->GetCurrentFile()->GetName(),fInputHandler->GetTree()->GetReadEntry());
+         Printf("%s read event, %d",fInputHandler->GetTree()->GetCurrentFile()->GetName(),(Int_t)fInputHandler->GetTree()->GetReadEntry());
          tr->Print();
          //    tr->Dump();
          AliESDEvent *fESD = dynamic_cast<AliESDEvent*> (InputEvent());
@@ -1000,6 +2067,7 @@ Int_t  AliAnalysisTaskJetSpectrum2::GetListOfTracks(TList *list,Int_t type){
     for(int it = 0;it < mcEvent->GetNumberOfTracks();++it){
       if(!mcEvent->IsPhysicalPrimary(it))continue;
       AliMCParticle* part = (AliMCParticle*)mcEvent->GetTrack(it);
+      if(part->Pt()<fMinTrackPt)continue;
       if(type == kTrackKineAll){
        list->Add(part);
        iCount++;
@@ -1020,6 +2088,7 @@ Int_t  AliAnalysisTaskJetSpectrum2::GetListOfTracks(TList *list,Int_t type){
     if(!tca)return iCount;
     for(int it = 0;it < tca->GetEntriesFast();++it){
       AliAODMCParticle *part = dynamic_cast<AliAODMCParticle*>(tca->At(it));
+      if(part->Pt()<fMinTrackPt)continue;
       if(!part->IsPhysicalPrimary())continue;
       if(type == kTrackAODMCAll){
        list->Add(part);
@@ -1031,7 +2100,7 @@ Int_t  AliAnalysisTaskJetSpectrum2::GetListOfTracks(TList *list,Int_t type){
          list->Add(part);
        }
        else {
-         if(TMath::Abs(part->Eta())>0.9)continue;
+         if(TMath::Abs(part->Eta())>fTrackRecEtaWindow)continue;
          list->Add(part);
        }
        iCount++;
@@ -1042,3 +2111,52 @@ Int_t  AliAnalysisTaskJetSpectrum2::GetListOfTracks(TList *list,Int_t type){
   return iCount;
 
 }
+
+
+
+Bool_t  AliAnalysisTaskJetSpectrum2::JetSelected(AliAODJet *jet){
+  Bool_t selected = false;
+  
+  if(!jet)return selected;
+
+  if(fabs(jet->Eta())<fJetRecEtaWindow&&jet->Pt()>fMinJetPt){
+    selected = kTRUE;
+  }
+  return selected;
+
+}
+
+Int_t  AliAnalysisTaskJetSpectrum2::GetListOfJets(TList *list,TClonesArray* jarray,Int_t type){
+
+  if(fDebug>2)Printf("%s:%d Selecting jets with cuts %d",(char*)__FILE__,__LINE__,type);
+  Int_t iCount = 0;
+
+  if(!jarray){
+    Printf("%s:%d no Jet array",(char*)__FILE__,__LINE__);
+    return iCount;
+  }
+
+
+  for(int ij=0;ij<jarray->GetEntries();ij++){
+    AliAODJet* jet = (AliAODJet*)jarray->At(ij);
+    if(!jet)continue;
+    if(type==0){
+      // No cut at all, main purpose here is sorting      
+      list->Add(jet);
+      iCount++;
+    }
+    else if(type == 1){
+      // eta cut
+      if(JetSelected(jet)){
+       list->Add(jet);
+       iCount++;
+      }
+    }
+  }
+
+  list->Sort();
+  return iCount;
+
+}
+
+