]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
flag jets with too high p_T track
[u/mrichter/AliRoot.git] / PWG4 / JetTasks / AliAnalysisTaskJetSpectrum2.cxx
index 4bf25bf6721b9f10b72228a323ee0ed08af8ffc8..1a162dc85fe9d865fd873479ee3afa39f7214f99 100644 (file)
@@ -1,5 +1,5 @@
 // **************************************
-// Task used for the correction of determiantion of reconstructed jet spectra
+// used for the correction of determiantion of reconstructed jet spectra
 // Compares input (gen) and output (rec) jets   
 // *******************************************
 
@@ -22,6 +22,7 @@
  
 #include <TROOT.h>
 #include <TRandom.h>
+#include <TRandom3.h>
 #include <TSystem.h>
 #include <TInterpreter.h>
 #include <TChain.h>
 #include <TH2F.h>
 #include <TH3F.h>
 #include <TProfile.h>
+#include <TProfile2D.h>
 #include <TList.h>
 #include <TLorentzVector.h>
 #include <TClonesArray.h>
+#include <TRefArray.h>
 #include  "TDatabasePDG.h"
 
 #include "AliAnalysisTaskJetSpectrum2.h"
 #include "AliAnalysisManager.h"
 #include "AliJetFinder.h"
+#include "AliTHn.h"
 #include "AliJetHeader.h"
 #include "AliJetReader.h"
 #include "AliJetReaderHeader.h"
@@ -48,6 +52,7 @@
 #include "AliAODHandler.h"
 #include "AliAODTrack.h"
 #include "AliAODJet.h"
+#include "AliAODJetEventBackground.h"
 #include "AliAODMCParticle.h"
 #include "AliMCEventHandler.h"
 #include "AliMCEvent.h"
 
 ClassImp(AliAnalysisTaskJetSpectrum2)
 
-AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(): AliAnalysisTaskSE(),
-                                                           fJetHeaderRec(0x0),
-                                                           fJetHeaderGen(0x0),
-                                                           fAOD(0x0),
-                                                           fhnCorrelation(0x0),
-  fhnCorrelationPhiZRec(0x0),
+AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(): 
+  AliAnalysisTaskSE(),
+  fJetHeaderRec(0x0),
+  fJetHeaderGen(0x0),
+  fAODIn(0x0),
+  fAODOut(0x0),
+  fAODExtension(0x0),
+  fhnJetContainer(0x0),
+  fhnCorrelation(0x0),
+  fhnEvent(0x0),
   f1PtScale(0x0),
-                                                           fBranchRec("jets"),
-                                                           fBranchGen(""),
-                                                           fUseAODJetInput(kFALSE),
-                                                           fUseAODTrackInput(kFALSE),
-                                                           fUseAODMCInput(kFALSE),
-                                                           fUseGlobalSelection(kFALSE),
-                                                           fUseExternalWeightOnly(kFALSE),
-                                                           fLimitGenJetEta(kFALSE),
-                                                           fFilterMask(0),
+  fBranchRec("jets"),
+  fBranchGen(""),
+  fBranchBkgRec(""), 
+  fBranchBkgGen(""), 
+  fNonStdFile(""),
+  fRandomizer(0x0),
+  fUseAODJetInput(kFALSE),
+  fUseAODTrackInput(kFALSE),
+  fUseAODMCInput(kFALSE),
+  fUseGlobalSelection(kFALSE),
+  fUseExternalWeightOnly(kFALSE),
+  fLimitGenJetEta(kFALSE),
+  fDoMatching(kFALSE),
+  fNMatchJets(5),
+  fNRPBins(3),
+  fJetTriggerExcludeMask(AliAODJet::kHighTrackPtTriggered),
+  fFilterMask(0),
   fEventSelectionMask(0),
-                                                           fAnalysisType(0),
+  fAnalysisType(0),
   fTrackTypeRec(kTrackUndef),
   fTrackTypeGen(kTrackUndef),
+  fEventClass(0),
+  fRPMethod(0),
   fAvgTrials(1),
   fExternalWeight(1),    
-                                                           fRecEtaWindow(0.5),
+  fJetRecEtaWindow(0.5),
+  fTrackRecEtaWindow(0.5),
   fMinJetPt(0),
-                                                           fDeltaPhiWindow(20./180.*TMath::Pi()),
+  fMinTrackPt(0.15),
+  fDeltaPhiWindow(90./180.*TMath::Pi()),
+  fCentrality(100),
+  fRPAngle(0),
+  fMultRec(0),
+  fMultGen(0),
   fh1Xsec(0x0),
   fh1Trials(0x0),
   fh1PtHard(0x0),
   fh1PtHardNoW(0x0),  
   fh1PtHardTrials(0x0),
-  fh1NGenJets(0x0),
-  fh1NRecJets(0x0),
-  fh1PtTrackRec(0x0),   
-  fh1SumPtTrackRec(0x0),  
-  fh1SumPtTrackAreaRec(0x0),  
+  fh1ZVtx(0x0),
+  fh1RP(0x0),
+  fh1Centrality(0x0),
   fh1TmpRho(0x0),
-  fh1PtJetsRecIn(0x0),
-  fh1PtJetsLeadingRecIn(0x0),
-  fh1PtTracksRecIn(0x0),
-  fh1PtTracksLeadingRecIn(0x0),
-  fh1PtTracksGenIn(0x0),
-  fh2NRecJetsPt(0x0),
-  fh2NRecTracksPt(0x0),
-  fh2JetsLeadingPhiEta(0x0),
-  fh2JetsLeadingPhiPt(0x0),
-  fh2TracksLeadingPhiEta(0x0),
-  fh2TracksLeadingPhiPt(0x0),
-  fh2TracksLeadingJetPhiPt(0x0),
-  fh2JetPtJetPhi(0x0),
-  fh2TrackPtTrackPhi(0x0),
-  fh2DijetDeltaPhiPt(0x0),      
-  fh2DijetAsymPt(0x0),          
-  fh2DijetAsymPtCut(0x0),       
-  fh2DijetDeltaPhiDeltaEta(0x0),
-  fh2DijetPt2vsPt1(0x0),        
-  fh2DijetDifvsSum(0x0),        
-  fh1DijetMinv(0x0),            
-  fh1DijetMinvCut(0x0),         
+  fh2MultRec(0x0),
+  fh2MultGen(0x0),
+  fh2RPCentrality(0x0),
+  fh2PtFGen(0x0),
+  fh2RelPtFGen(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){    
+    fFlagJetType[ij] = 1; // default = on
+    fh1NJets[ij] = 0;
+    fh1SumPtTrack[ij] = 0;
+    fh1PtJetsIn[ij] = 0;
+    fh1PtJetsInRej[ij] = 0;
+    fh1PtTracksIn[ij] = 0;
+    fh1PtTracksInLow[ij] = 0;
+    fh2NJetsPt[ij]  = 0;
+    fh2NTracksPt[ij]  = 0;
+    fp2MultRPPhiTrackPt[ij] = 0;
+    fp2CentRPPhiTrackPt[ij] = 0;
+    fhnJetPt[ij] = 0;
+    fhnJetPtQA[ij] = 0;
+    fhnTrackPt[ij] = 0;
+    fhnTrackPtQA[ij] = 0;
+    for(int i = 0;i <= kMaxJets;++i){
+      fh2LTrackPtJetPt[ij][i] = 0;
+      fh1PtIn[ij][i] = 0;
+    }
+
+    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),
+  fhnJetContainer(0x0),
   fhnCorrelation(0x0),
-  fhnCorrelationPhiZRec(0x0),
+  fhnEvent(0x0),
   f1PtScale(0x0),
   fBranchRec("jets"),
   fBranchGen(""),
+  fBranchBkgRec(""),
+  fBranchBkgGen(""),
+  fNonStdFile(""),
+  fRandomizer(0x0),
   fUseAODJetInput(kFALSE),
   fUseAODTrackInput(kFALSE),
   fUseAODMCInput(kFALSE),
   fUseGlobalSelection(kFALSE),
   fUseExternalWeightOnly(kFALSE),
   fLimitGenJetEta(kFALSE),
+  fDoMatching(kFALSE),
+  fNMatchJets(5),
+  fNRPBins(3),
+  fJetTriggerExcludeMask(AliAODJet::kHighTrackPtTriggered),
   fFilterMask(0),
   fEventSelectionMask(0),
   fAnalysisType(0),
   fTrackTypeRec(kTrackUndef),
   fTrackTypeGen(kTrackUndef),
+  fEventClass(0),
+  fRPMethod(0),
   fAvgTrials(1),
   fExternalWeight(1),    
-  fRecEtaWindow(0.5),
+  fJetRecEtaWindow(0.5),
+  fTrackRecEtaWindow(0.5),
   fMinJetPt(0),
-  fDeltaPhiWindow(20./180.*TMath::Pi()),
+  fMinTrackPt(0.15),
+  fDeltaPhiWindow(90./180.*TMath::Pi()),
+  fCentrality(100),
+  fRPAngle(0),
+  fMultRec(0),
+  fMultGen(0),
   fh1Xsec(0x0),
   fh1Trials(0x0),
   fh1PtHard(0x0),
   fh1PtHardNoW(0x0),  
   fh1PtHardTrials(0x0),
-  fh1NGenJets(0x0),
-  fh1NRecJets(0x0),
-  fh1PtTrackRec(0x0),   
-  fh1SumPtTrackRec(0x0),  
-  fh1SumPtTrackAreaRec(0x0),  
+  fh1ZVtx(0x0),
+  fh1RP(0x0),
+  fh1Centrality(0x0),
   fh1TmpRho(0x0),
-  fh1PtJetsRecIn(0x0),
-  fh1PtJetsLeadingRecIn(0x0),
-  fh1PtTracksRecIn(0x0),
-  fh1PtTracksLeadingRecIn(0x0),
-  fh1PtTracksGenIn(0x0),
-  fh2NRecJetsPt(0x0),
-  fh2NRecTracksPt(0x0),
-  fh2JetsLeadingPhiEta(0x0),
-  fh2JetsLeadingPhiPt(0x0),
-  fh2TracksLeadingPhiEta(0x0),
-  fh2TracksLeadingPhiPt(0x0),
-  fh2TracksLeadingJetPhiPt(0x0),
-  fh2JetPtJetPhi(0x0),
-  fh2TrackPtTrackPhi(0x0),
-  fh2DijetDeltaPhiPt(0x0),      
-  fh2DijetAsymPt(0x0),          
-  fh2DijetAsymPtCut(0x0),       
-  fh2DijetDeltaPhiDeltaEta(0x0),
-  fh2DijetPt2vsPt1(0x0),        
-  fh2DijetDifvsSum(0x0),        
-  fh1DijetMinv(0x0),            
-  fh1DijetMinvCut(0x0),         
+  fh2MultRec(0x0),
+  fh2MultGen(0x0),
+  fh2RPCentrality(0x0),
+  fh2PtFGen(0x0),
+  fh2RelPtFGen(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){    
+    fFlagJetType[ij] = 1; // default = on
+    fh1NJets[ij] = 0;
+    fh1SumPtTrack[ij] = 0;
+    fh1PtJetsIn[ij] = 0;
+    fh1PtJetsInRej[ij] = 0;
+    fh1PtTracksIn[ij] = 0;
+    fh1PtTracksInLow[ij] = 0;
+    fh2NJetsPt[ij]  = 0;
+    fh2NTracksPt[ij]  = 0;
+    fp2MultRPPhiTrackPt[ij] = 0;
+    fp2CentRPPhiTrackPt[ij] = 0;
+    fhnJetPt[ij] = 0;
+    fhnJetPtQA[ij] = 0;
+    fhnTrackPt[ij] = 0;
+    fhnTrackPtQA[ij] = 0;
+    for(int i = 0;i <= kMaxJets;++i){
+      fh2LTrackPtJetPt[ij][i] = 0;
+      fh1PtIn[ij][i] = 0;
+    }
+
+    fh1DijetMinv[ij] = 0;      
+    fh2DijetDeltaPhiPt[ij] = 0;  
+    fh2DijetAsymPt[ij] = 0; 
+    fh2DijetPt2vsPt1[ij] = 0;
+    fh2DijetDifvsSum[ij] = 0;
+  } 
+
   DefineOutput(1, TList::Class());  
 }
 
@@ -228,10 +256,31 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
 
 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?aodH->GetExtension(fNonStdFile.Data()):0);    
+    if(!fAODExtension){
+      if(fDebug>1)Printf("AODExtension found for %s",fNonStdFile.Data());
+    }
+  }
+
 
   TTree *tree = AliAnalysisManager::GetAnalysisManager()->GetTree();
   Float_t xsection = 0;
@@ -254,70 +303,73 @@ Bool_t AliAnalysisTaskJetSpectrum2::Notify()
     Float_t nEntries = (Float_t)tree->GetTree()->GetEntries();
     if(ftrials>=nEntries && nEntries>0.)fAvgTrials = ftrials/nEntries;
   }  
+
+  if(fDebug)Printf("Reading File %s",fInputHandler->GetTree()->GetCurrentFile()->GetName());
+
   return kTRUE;
 }
 
 void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
 {
 
-  //
-  // Create the output container
-  //
-
-
+  
   // Connect the AOD
 
-
-  MakeJetContainer();
-
-
   if (fDebug > 1) printf("AnalysisTaskJetSpectrum2::UserCreateOutputObjects() \n");
-
   OpenFile(1);
-  if(!fHistList)fHistList = new TList();
+  if(!fHistList)fHistList = new TList(); 
+  PostData(1, fHistList); // post data in any case once
+
+  if(!fRandomizer)fRandomizer = new TRandom3(0);
+
   fHistList->SetOwner(kTRUE);
-  Bool_t oldStatus = TH1::AddDirectoryStatus();
+  Bool_t oldStatus = TH1::AddDirectoryStatus(); 
   TH1::AddDirectory(kFALSE);
 
+
+  
+  // event npsparse cent, mult
+  const Int_t nBinsSparse0 = 2;
+  const Int_t nBins0[nBinsSparse0] = {     100, 500};
+  const Double_t xmin0[nBinsSparse0]  = {    0,   0};
+  const Double_t xmax0[nBinsSparse0]  = {  100,5000};
+      
+
+  fhnEvent = new THnSparseF("fhnEvent",";cent;mult",nBinsSparse0,
+                           nBins0,xmin0,xmax0);
+  fHistList->Add(fhnEvent);
+
+  if(fDoMatching){
+    MakeJetContainer();
+    fHistList->Add(fhnCorrelation);
+    fHistList->Add(fhnJetContainer);
+  }
   //
   //  Histogram
     
-  const Int_t nBinPt = 240;
+
+
+  const Int_t nBinPt = 100;
   Double_t binLimitsPt[nBinPt+1];
   for(Int_t iPt = 0;iPt <= nBinPt;iPt++){
     if(iPt == 0){
       binLimitsPt[iPt] = 0.0;
     }
     else {// 1.0
-      binLimitsPt[iPt] =  binLimitsPt[iPt-1] + 1.0;
+      binLimitsPt[iPt] =  binLimitsPt[iPt-1] + 2.5;
     }
   }
-  
   const Int_t nBinPhi = 90;
   Double_t binLimitsPhi[nBinPhi+1];
   for(Int_t iPhi = 0;iPhi<=nBinPhi;iPhi++){
     if(iPhi==0){
-      binLimitsPhi[iPhi] = -1.*TMath::Pi();
+      binLimitsPhi[iPhi] = 0;
     }
     else{
       binLimitsPhi[iPhi] = binLimitsPhi[iPhi-1] + 1/(Float_t)nBinPhi * TMath::Pi()*2;
     }
   }
 
-
-  const Int_t nBinPhi2 = 360;
-  Double_t binLimitsPhi2[nBinPhi2+1];
-  for(Int_t iPhi2 = 0;iPhi2<=nBinPhi2;iPhi2++){
-    if(iPhi2==0){
-      binLimitsPhi2[iPhi2] = 0.;
-    }
-    else{
-      binLimitsPhi2[iPhi2] = binLimitsPhi2[iPhi2-1] + 1/(Float_t)nBinPhi2 * TMath::Pi()*2;
-    }
-  }
-
-
-
   const Int_t nBinEta = 40;
   Double_t binLimitsEta[nBinEta+1];
   for(Int_t iEta = 0;iEta<=nBinEta;iEta++){
@@ -329,154 +381,187 @@ 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);
-
-  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);
+  fHistList->Add(fh1PtHardTrials);
   
-  fh1PtJetsRecIn  = new TH1F("fh1PtJetsRecIn","Rec 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);
-  // 
-
-  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);
+  fh1ZVtx = new TH1F("fh1ZVtx","z vtx;z_{vtx} (cm)",400,-20,20);
+  fHistList->Add(fh1ZVtx);
 
-  fh2JetPtJetPhi = new TH2F("fh2JetPtJetPhi","Reconstructed jet phi vs. pt",nBinPt,binLimitsPt,nBinPhi2,binLimitsPhi2);
-  fh2TrackPtTrackPhi = new TH2F("fh2TrackPtTrackPhi","Reconstructed track phi vs. pt",nBinPt,binLimitsPt,nBinPhi2,binLimitsPhi2);
 
+  fh1RP = new TH1F("fh1RP","RP;#Psi",440, -1.*TMath::Pi(), 2.*TMath::Pi());
+  fHistList->Add(fh1RP);
 
-  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);
+  fh1Centrality = new TH1F("fh1Centrality","cent;cent (%)",103,-1,102);
+  fHistList->Add(fh1Centrality);
 
-    fh2PhiPt[ij] =  new TH2F(Form("fh2PhiPtRec_j%d",ij),"Jet pt vs delta phi;#Delta#phi;p_{T,jet}",
-                            nBinPhi,binLimitsPhi,nBinPt,binLimitsPt);
+  fh2MultRec = new TH2F("fh2MultRec","multiplicity rec;# tracks;# jetrefs",500,0,5000,500,0.,5000);
+  fHistList->Add(fh2MultRec);
+  fh2MultGen = new TH2F("fh2MultGen","multiplicity gen;# tracks;# jetrefs",400,0,5000,500,0.,5000);
+  fHistList->Add(fh2MultGen);
 
-    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};",
-                               20,0.,1.,nBinPt,binLimitsPt);
-    fh2PsiPtRec[ij] =  new TH2F(Form("fh2PsiPtRec_j%d",ij),"jet shape psi for jets;r;p_{T,rec};",
-                               20,0.,1.,nBinPt,binLimitsPt);
+  fh2RPCentrality = new TH2F("fh2RPCentrality" ,"Reaction Plane Angle" , 20, 0.,100., 180, 0, TMath::Pi());
+  fHistList->Add(fh2RPCentrality);
 
-    fh2RhoPtGen[ij] =  new TH2F(Form("fh2RhoPtGen_j%d",ij),"jet shape rho for jets;r;p_{T,gen};",
-                               20,0.,1.,nBinPt,binLimitsPt);
-    fh2PsiPtGen[ij] =  new TH2F(Form("fh2PsiPtGen_j%d",ij),"jet shape psi for jets;r;p_{T,gen};",
-                               20,0.,1.,nBinPt,binLimitsPt);
-    if(!fh1TmpRho)fh1TmpRho = new TH1F("fh1TmpRho","tmp histo for jet shape",20,0.,1);
+  fh2PtFGen = new TH2F("fh2PtFGen",Form("%s vs. %s;p_{T,gen};p_{T,rec}",fBranchRec.Data(),fBranchGen.Data()),nBinPt,binLimitsPt,nBinPt,binLimitsPt);
+  fHistList->Add(fh2PtFGen);
 
+  fh2RelPtFGen = new TH2F("fh2RelPtFGen",";p_{T,gen};p_{T,rec}-p_{T,gen}/p_{T,Gen}",nBinPt,binLimitsPt,241,-2.41,2.41);
+  fHistList->Add(fh2RelPtFGen);
+  
+  for(int ij = 0;ij <kJetTypes;++ij){    
+    TString cAdd = "";
+    TString cJetBranch = "";
+    if(ij==kJetRec){
+      cAdd = "Rec";
+      cJetBranch = fBranchRec.Data();
+    }
+    else if (ij==kJetGen){
+      cAdd = "Gen";
+      cJetBranch = fBranchGen.Data();
+    }
+    else if (ij==kJetRecFull){
+      cAdd = "RecFull";
+      cJetBranch = fBranchRec.Data();
+    }
+    else if (ij==kJetGenFull){
+      cAdd = "GenFull";
+      cJetBranch = fBranchGen.Data();
+    }
 
-    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);
+    if(cJetBranch.Length()==0)fFlagJetType[ij] = 0;
+    if(!fFlagJetType[ij])continue;
 
-    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);
-  }
+    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]);
 
-  // Dijet histograms
+    fh1PtJetsInRej[ij]  = new TH1F(Form("fh1PtJets%sInRej",cAdd.Data()),Form("%s jets p_T;p_{T} (GeV/c)",cAdd.Data()),nBinPt,binLimitsPt);
+    fHistList->Add(fh1PtJetsInRej[ij]);
+    
+    fh1PtTracksIn[ij] = new TH1F(Form("fh1PtTracks%sIn",cAdd.Data()),Form("%s track p_T;p_{T} (GeV/c)",cAdd.Data()),nBinPt,binLimitsPt);
+    fHistList->Add(fh1PtTracksIn[ij]);
+    
+    fh1PtTracksInLow[ij] = new TH1F(Form("fh1PtTracks%sInLow",cAdd.Data()),Form("%s track p_T;p_{T} (GeV/c)",cAdd.Data()),100,0.,5.);
+    fHistList->Add(fh1PtTracksInLow[ij]);
+    
+    fh1SumPtTrack[ij] = new TH1F(Form("fh1SumPtTrack%s",cAdd.Data()),Form("Sum %s track p_T;p_{T} (GeV/c)",cAdd.Data()),1000,0.,3000.);
+    fHistList->Add(fh1SumPtTrack[ij]);
+    
+    fh2NJetsPt[ij]  = new TH2F(Form("fh2N%sJetsPt",cAdd.Data()),Form("Number of %s jets above threshhold;p_{T,cut} (GeV/c);N_{jets}",cAdd.Data()),nBinPt,binLimitsPt,50,-0.5,49.5);
+    fHistList->Add(fh2NJetsPt[ij]);
+    
+    fh2NTracksPt[ij]  = new TH2F(Form("fh2N%sTracksPt",cAdd.Data()),Form("Number of %s tracks above threshhold;p_{T,cut} (GeV/c);N_{tracks}",cAdd.Data()),nBinPt,binLimitsPt,1000,0.,5000);
+    fHistList->Add(fh2NTracksPt[ij]);
 
-  fh2DijetDeltaPhiPt       = new TH2F("fh2DeltaPhiPt","Difference in the azimuthal angle;#Delta#phi;p_{T,1};Entries",180,0.,TMath::Pi(),nBinPt,binLimitsPt);
-  fh2DijetAsymPt            = new TH2F("fh2DijetAsym","Pt asymmetry;#Deltap_{T}/(p_{T,1}+p_{T,2});p_{T,1};Entries",50,0.,1.,nBinPt,binLimitsPt);
-  fh2DijetAsymPtCut         = new TH2F("fh2DijetAsymCut","Pt asymmetry after delta phi cut;#Deltap_{T}/(p_{T,1}+p_{T,2});p_{T,1};Entries",50,0.,1.,nBinPt,binLimitsPt);
-  fh2DijetDeltaPhiDeltaEta = new TH2F("fh2DijetDeltaPhiDeltaEta","Difference in the azimuthal angle;#Delta#phi;Entries",180,0.,TMath::Pi(),20,-2.,2.);
-  fh2DijetPt2vsPt1          = new TH2F("fh2DijetPt2vsPt1","Pt2 versus Pt1;p_{T,1} (GeV/c);p_{T,2} (GeV/c)",250,0.,250.,250,0.,250.);
-  fh2DijetDifvsSum          = new TH2F("fh2DijetDifvsSum","Pt difference vs Pt sum;p_{T,1}+p_{T,2} (GeV/c);#Deltap_{T} (GeV/c)",400,0.,400.,150,0.,150.);
-  fh1DijetMinv               = new TH1F("fh1DijetMinv","Dijet invariant mass;m_{JJ}",nBinPt,binLimitsPt);
-  fh1DijetMinvCut           = new TH1F("fh1DijetMinvCut","Dijet invariant mass;m_{JJ}",nBinPt,binLimitsPt);
+    
+    fp2MultRPPhiTrackPt[ij] = new TProfile2D(Form("fp2MultRPPhiTrackPt%s",cAdd.Data()),"RP phi vs Number of tracks;# tracks;#Delta#phi_{RP}; <p_{T}>",20,0,4000,181,-1./180.*TMath::Pi(),TMath::Pi(),"S");
+    fHistList->Add(fp2MultRPPhiTrackPt[ij]);
+    fp2CentRPPhiTrackPt[ij] = new TProfile2D(Form("fp2CentRPPhiTrackPt%s",cAdd.Data()),"RP phi vs cent;# cent;#Delta#phi_{RP}; <p_{T}>",10,0,100,181,-1./180.*TMath::Pi(),TMath::Pi(),"S");
+    fHistList->Add(fp2CentRPPhiTrackPt[ij]);    
+
+    // Bins:  Jet number: pTJet, cent, mult, RP, Area.   total bins = 4.5M
+    const Int_t nBinsSparse1 = 6;
+    const Int_t nBins1[nBinsSparse1] = {     kMaxJets+1,100, 10,  25,    fNRPBins, 10};
+    const Double_t xmin1[nBinsSparse1]  = {        -0.5,  0,  0,   0,        -0.5, 0.};
+    const Double_t xmax1[nBinsSparse1]  = {kMaxJets+0.5,250,100,5000,fNRPBins-0.5,1.0};
+    
+    fhnJetPt[ij] = new THnSparseF(Form("fhnJetPt%s",cAdd.Data()),";jet number;p_{T,jet};cent;# tracks;RP;area",nBinsSparse1,nBins1,xmin1,xmax1);
+    fHistList->Add(fhnJetPt[ij]);
+    
+    // Bins:  Jet number: pTJet, cent, eta, phi, Area.   total bins = 9.72 M
+    const Int_t nBinsSparse2 = 6;
+      const Int_t nBins2[nBinsSparse2] = {     kMaxJets+1, 25,   5,  18,             360, 10};
+      const Double_t xmin2[nBinsSparse2]  = {        -0.5,  0,   0,-0.9,              0,  0.};
+      const Double_t xmax2[nBinsSparse2]  = {kMaxJets+0.5,250, 100, 0.9, 2.*TMath::Pi(),1.0};
+      fhnJetPtQA[ij] = new THnSparseF(Form("fhnJetPtQA%s",cAdd.Data()),";jet number;p_{T,jet};cent;#eta;#phi;area",nBinsSparse2,nBins2,xmin2,xmax2);
+      fHistList->Add(fhnJetPtQA[ij]);
+
+      // Bins:track number  pTtrack, cent, mult, RP.   total bins = 224 k
+      const Int_t nBinsSparse3 = 5;
+      const Int_t nBins3[nBinsSparse3] = {       2,    100,     10,  20,    fNRPBins};
+      const Double_t xmin3[nBinsSparse3]  = { -0.5,     0,   0,      0,        -0.5};
+      const Double_t xmax3[nBinsSparse3]  = { 1.5,    200, 100,   4000,fNRPBins-0.5};  
+
+      // change the binning ot the pT axis:
+      Double_t *xPt3 = new Double_t[nBins3[1]+1];
+      xPt3[0] = 0.;
+      for(int i = 1; i<=nBins3[1];i++){
+       if(xPt3[i-1]<2)xPt3[i] = xPt3[i-1] + 0.05; // 1 - 40
+       else if(xPt3[i-1]<4)xPt3[i] = xPt3[i-1] + 0.2; // 41 - 50
+       else if(xPt3[i-1]<10)xPt3[i] = xPt3[i-1] + 0.5; // 50 - 62
+       else if(xPt3[i-1]<20)xPt3[i] = xPt3[i-1] +  1.; // 62 - 72
+       else if(xPt3[i-1]<30)xPt3[i] = xPt3[i-1] + 2.5; // 74 - 78
+       else xPt3[i] = xPt3[i-1] + 5.; // 78 - 100 = 140 
+      }
+      
+      fhnTrackPt[ij] = new THnSparseF(Form("fhnTrackPt%s",cAdd.Data()),";track number;p_{T};cent;#tracks;RP",nBinsSparse3,nBins3,xmin3,xmax3);
+      fhnTrackPt[ij]->SetBinEdges(1,xPt3);
+      fHistList->Add(fhnTrackPt[ij]);
+      delete [] xPt3;
+
+      // Track QA bins track nr, pTrack, cent, eta, phi bins 5.4 M
+      const Int_t nBinsSparse4 = 5;
+      const Int_t nBins4[nBinsSparse4] =    {    2, 50,  10,  20, 360};
+      const Double_t xmin4[nBinsSparse4]  = { -0.5,  0,   0, -1.0,   0.};
+      const Double_t xmax4[nBinsSparse4]  = {  1.5,150, 100,  1.0,2.*TMath::Pi()};  
+
+      // change the binning ot the pT axis:
+      Double_t *xPt4 = new Double_t[nBins4[1]+1];
+      xPt4[0] = 0.;
+      for(int i = 1; i<=nBins4[1];i++){
+       if(xPt4[i-1]<2)xPt4[i] = xPt4[i-1] + 0.1;
+       else if(xPt4[i-1]<10)xPt4[i] = xPt4[i-1] + 0.5;
+       else if(xPt4[i-1]<20)xPt4[i] = xPt4[i-1] +  1.;
+       else if(xPt4[i-1]<30)xPt4[i] = xPt4[i-1] +  2.5;
+       else xPt4[i] = xPt4[i-1] + 5.;
+      }
+      fhnTrackPtQA[ij] = new THnSparseF(Form("fhnTrackPtQA%s",cAdd.Data()),";track number;p_{T};cent;#eta;#phi",nBinsSparse4,nBins4,xmin4,xmax4);
+      fhnTrackPtQA[ij]->SetBinEdges(1,xPt4);
+      fHistList->Add(fhnTrackPtQA[ij]);
+      delete [] xPt4;
+
+      for(int i = 0;i <= kMaxJets;++i){
+       fh1PtIn[ij][i] = new TH1F(Form("fh1Pt%sIn_j%d",cAdd.Data(),i),Form("%s p_T input ;p_{T}",cAdd.Data()),nBinPt,binLimitsPt);
+       fHistList->Add(fh1PtIn[ij][i]);
+
+
+       if(!fh1TmpRho)fh1TmpRho = new TH1F("fh1TmpRho","tmp histo for jet shape",40,0.,2);
+       fh2LTrackPtJetPt[ij][i] = new TH2F(Form("fh2LTrackPtJetPt%s_j%d",cAdd.Data(),i),
+                                          Form("pt of leadin track within a jet vs jet %s;p_{T,lead in jet};p_{T.jet};",
+                                               cAdd.Data()),
+                                          200,0.,200.,nBinPt,binLimitsPt);
+       fHistList->Add(fh2LTrackPtJetPt[ij][i]);
+      }
 
 
+      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,2};Entries",180,0.,TMath::Pi(),nBinPt,binLimitsPt);
+      fHistList->Add(fh2DijetDeltaPhiPt[ij]);
 
-  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);
-    }
-    fHistList->Add(fh1PtJetsRecIn);
-    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(fh2JetsLeadingPhiEta );
-    fHistList->Add(fh2JetsLeadingPhiPt );
-    fHistList->Add(fh2TracksLeadingPhiEta);
-    fHistList->Add(fh2TracksLeadingPhiPt);
-    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]);
-       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(fhnCorrelationPhiZRec);
-    fHistList->Add(fh2JetPtJetPhi);
-    fHistList->Add(fh2TrackPtTrackPhi);
-
-    fHistList->Add(fh2DijetDeltaPhiPt);       
-    fHistList->Add(fh2DijetAsymPt);       
-    fHistList->Add(fh2DijetAsymPtCut);               
-    fHistList->Add(fh2DijetDeltaPhiDeltaEta);        
-    fHistList->Add(fh2DijetPt2vsPt1);                
-    fHistList->Add(fh2DijetDifvsSum);                
-    fHistList->Add(fh1DijetMinv);                    
-    fHistList->Add(fh1DijetMinvCut);                 
-  }
+      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]);
+    }   
   // =========== Switch on Sumw2 for all histos ===========
   for (Int_t i=0; i<fHistList->GetEntries(); ++i) {
     TH1 *h1 = dynamic_cast<TH1*>(fHistList->At(i));
@@ -500,8 +585,8 @@ void AliAnalysisTaskJetSpectrum2::Init()
 
 }
 
-void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
-{
+void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
+
 
   Bool_t selected = kTRUE;
 
@@ -512,80 +597,168 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
     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);
-      return;
+  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){
+    if(fDebug){
+
+       Printf("%s:%d no reconstructed Jet array with name %s in AOD",(char*)__FILE__,__LINE__,fBranchRec.Data());
+       if(fAODIn){
+         Printf("Input AOD >>>>");
+         fAODIn->Print();    
+       }
+       if(fAODExtension){
+         Printf("AOD Extension >>>>");
+         fAODExtension->Print();
+       }
+       if(fAODOut){
+         Printf("Output AOD >>>>");
+         fAODOut->Print();    
+       }
     }
-    // fethc the header
+       return;
   }
-  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__);
+
+  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;
     }
-    if(fDebug>0){
-      fESD = dynamic_cast<AliESDEvent*> (InputEvent());
+  }
+
+  TClonesArray *aodBackRecJets = 0;
+  if(fBranchBkgRec.Length()>0){
+    if(fAODOut&&!aodBackRecJets){
+      aodBackRecJets = dynamic_cast<TClonesArray*>(fAODOut->FindListObject(fBranchBkgRec.Data()));
+    }
+    if(fAODExtension&&!aodBackRecJets){
+      aodBackRecJets = dynamic_cast<TClonesArray*>(fAODExtension->GetAOD()->FindListObject(fBranchBkgRec.Data()));
+    }
+    if(fAODIn&&!aodBackRecJets){
+      aodBackRecJets = dynamic_cast<TClonesArray*>(fAODIn->FindListObject(fBranchBkgRec.Data()));
+    }
+
+    if(!aodBackRecJets){
+      Printf("%s:%d no background rec Jet array with name %s in AOD",(char*)__FILE__,__LINE__,fBranchBkgRec.Data());
+      return;
     }
   }
-  
 
 
+  TClonesArray *aodBackGenJets = 0;
+
+  if(fBranchBkgGen.Length()>0){
+    if(fAODOut&&!aodBackGenJets){
+      aodBackGenJets = dynamic_cast<TClonesArray*>(fAODOut->FindListObject(fBranchBkgGen.Data()));
+    }
+    if(fAODExtension&&!aodBackGenJets){
+      aodBackGenJets = dynamic_cast<TClonesArray*>(fAODExtension->GetAOD()->FindListObject(fBranchBkgGen.Data()));
+    }
+    if(fAODIn&&!aodBackGenJets){
+      aodBackGenJets = dynamic_cast<TClonesArray*>(fAODIn->FindListObject(fBranchBkgGen.Data()));
+    }
+
+    if(!aodBackGenJets){
+      Printf("%s:%d no background rec Jet array with name %s in AOD",(char*)__FILE__,__LINE__,fBranchBkgGen.Data());
+      return;
+    }
+  }
+
+  // new Scheme
+  // first fill all the pure  histograms, i.e. full jets 
+  // in case of the correaltion limit to the n-leading jets
 
-  if (fDebug > 1)printf("Analysing event # %5d\n", (Int_t) fEntry);
+  // reconstructed
 
   
-  AliAODHandler *aodH = dynamic_cast<AliAODHandler*>(AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler());
+  // generated
 
-  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 = dynamic_cast<TClonesArray*>(fAOD->FindListObject(fBranchRec.Data()));
-  if(!aodRecJets){
-    Printf("%s:%d no reconstructed Jet array with name %s in AOD",(char*)__FILE__,__LINE__,fBranchRec.Data());
-    return;
-  }
+  // second fill the correlation histograms, here we limit to the n-th leading jet in case of the reconstructed
+
 
-  // ==== General variables needed
 
+  TList genJetsList;         // full acceptance
+  TList genJetsListCut;      // acceptance cut
+  TList recJetsList;         // full acceptance
+  TList recJetsListCut;      // acceptance cut
 
-  // We use statice array, not to fragment the memory
-  AliAODJet genJets[kMaxJets];
-  Int_t nGenJets = 0;
-  AliAODJet recJets[kMaxJets];
-  Int_t nRecJets = 0;
-  ///////////////////////////
 
+  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); 
+
+  // Getting some global properties
+  fCentrality = GetCentrality();
+  if(fCentrality<=0)fCentrality = 0;
+  fh1Centrality->Fill(fCentrality);
 
-  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();
@@ -595,7 +768,6 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
       return;
     }
     AliGenPythiaEventHeader*  pythiaGenHeader = AliAnalysisHelperJetTasks::GetPythiaEventHeader(mcEvent);
-    Int_t iCount = 0;  
     if(pythiaGenHeader){
       nTrials = pythiaGenHeader->Trials();
       ptHard  = pythiaGenHeader->GetPtHard();
@@ -608,32 +780,7 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
       // 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
-         genJets[iCount].SetPxPyPzE(p[0],p[1],p[2],p[3]);
-         iCount++;
-       }
-      }
-    }
-    if(fBranchGen.Length()==0)nGenJets = iCount;    
+    } 
   }// (fAnalysisType&kMCESD)==kMCESD)
 
 
@@ -642,447 +789,441 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
   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__);
+  //  CalculateReactionPlaneAngle(&recParticles);
+  fRPAngle = 0;
+  
+  if(fRPMethod==0)fRPAngle = aod->GetHeader()->GetEventplane();
+  else if(fRPMethod==1||fRPMethod==2){
+    fRPAngle = aod->GetHeader()->GetQTheta(fRPMethod);
+  }
+  fh1RP->Fill(fRPAngle);
+  fh2RPCentrality->Fill(fCentrality,fRPAngle);
+  // Event control and counting ...  
+  // MC
   fh1PtHard->Fill(ptHard,eventW);
   fh1PtHardNoW->Fill(ptHard,1);
   fh1PtHardTrials->Fill(ptHard,nTrials);
 
-  // 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(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();
-    }
+  // Real
+  if(aod->GetPrimaryVertex()){// No vtx for pure MC
+    fh1ZVtx->Fill(aod->GetPrimaryVertex()->GetZ());
+  }
+
+
+  Int_t recMult1 = recParticles.GetEntries();
+  Int_t genMult1 = genParticles.GetEntries();
+
+  Int_t recMult2 = MultFromJetRefs(aodBackRecJets);
+  Int_t genMult2 = MultFromJetRefs(aodBackGenJets);
+
+  fh2MultRec->Fill(recMult1,recMult2);
+  fh2MultGen->Fill(genMult1,genMult2);
+  fMultRec = recMult1;
+  if(fMultRec<=0)fMultRec = recMult2;
+  fMultGen = genMult1;
+  if(fMultGen<=0)fMultGen = genMult2;
+
+  Double_t var0[2] = {0,};
+  var0[0] = fCentrality;
+  var0[1] = fMultRec;
+  fhnEvent->Fill(var0);
+
+  // the loops for rec and gen should be indentical... pass it to a separate
+  // function ...
+  // Jet Loop
+  // Track Loop
+  // Jet Jet Loop
+  // Jet Track loop
+
+  FillJetHistos(recJetsListCut,recParticles,kJetRec);
+  FillJetHistos(recJetsList,recParticles,kJetRecFull);
+  FillTrackHistos(recParticles,kJetRec);
+
+  FillJetHistos(genJetsListCut,genParticles,kJetGen);
+  FillJetHistos(genJetsList,genParticles,kJetGenFull);
+  FillTrackHistos(genParticles,kJetGen);
+
+  // Here follows the jet matching part
+  // delegate to a separated method?
+
+  if(fDoMatching){
+    FillMatchHistos(recJetsList,genJetsList);
   }
 
-  fh1NGenJets->Fill(nGenJets);
-  // We do not want to exceed the maximum jet number
-  nGenJets = TMath::Min(nGenJets,kMaxJets);
+  if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
+  PostData(1, fHistList);
+}
 
-  // Fetch the reconstructed jets...
+void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particlesList,Int_t iType){
 
-  nRecJets = aodRecJets->GetEntries();
+  if(iType>=kJetTypes){
+    return;
+  }
+  if(!fFlagJetType[iType])return;
 
-  nRecJets = aodRecJets->GetEntries();
-  fh1NRecJets->Fill(nRecJets);
+  Int_t refMult = fMultRec;
+  if(iType==kJetGen||iType==kJetGenFull){
+    refMult = fMultGen;
+  }
 
-  // Do something with the all rec jets
-  Int_t nRecOver = nRecJets;
+  Int_t nJets = jetsList.GetEntries(); 
+  fh1NJets[iType]->Fill(nJets);
 
-  // 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);
+  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;
+
+  Double_t var1[6] = {0,}; // jet number;p_{T,jet};cent;# tracks;RP;area
+  var1[2] = fCentrality; 
+  var1[3] = refMult;
+
+  Double_t var2[6] = {0,}; // jet number;p_{T,jet};cent;#eta;#phi;area
+  var2[2] = fCentrality;
+
+  for(int ij = 0;ij < nJets;ij++){
+    AliAODJet *jet = (AliAODJet*)jetsList.At(ij);
+    Float_t ptJet = jet->Pt();
+    if(jet->Trigger()&fJetTriggerExcludeMask){
+      fh1PtJetsInRej[iType]->Fill(ptJet);
+      continue;
+    }
+    fh1PtJetsIn[iType]->Fill(ptJet);
+    if(ptJet>ptOld){
+      Printf("%s:%d Jets Type %d Not Sorted !! %d:%.3E %d:%.3E",(char*)__FILE__,__LINE__,iType,ij,ptJet,ij-1,ptOld);
     }
-    ptOld = tmpPt;
+    ptOld = ptJet;
+    
+    // find the dijets assume sorting and acceptance cut...
+    if(ij==0){
+      ij0 = ij;
+      pT0 = ptJet;
+      phi0 = jet->Phi();
+      if(phi0<0)phi0+=TMath::Pi()*2.;
+    }
+    else if(ptJet>pT1){
+      // take only the backward hemisphere??                                                        
+      phi1 = jet->Phi();
+      if(phi1<0)phi1+=TMath::Pi()*2.;
+      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
+
+      Float_t phiJet = jet->Phi();
+      Float_t etaJet = jet->Eta();
+      if(phiJet<0)phiJet+=TMath::Pi()*2.;    
+      fh1TmpRho->Reset();
+      if(ij<kMaxJets)fh1PtIn[iType][ij]->Fill(ptJet);
+
+      fh1PtIn[iType][kMaxJets]->Fill(ptJet);
+      // fill leading jets...
+      AliVParticle *leadTrack = LeadingTrackFromJetRefs(jet);
+      //      AliVParticle *leadTrack = LeadingTrackInCone(jet,&particlesList);
+      Int_t phiBin = GetPhiBin(phiJet-fRPAngle);
+
+      var1[1] = ptJet;
+      var1[4] = phiBin;
+      var1[5] = jet->EffectiveAreaCharged();
+
+      var2[1] = ptJet;
+      var2[3] = etaJet;
+      var2[4] = phiJet;
+      var2[5] = jet->EffectiveAreaCharged();
+      if(ij<kMaxJets){
+       if(leadTrack)fh2LTrackPtJetPt[iType][ij]->Fill(leadTrack->Pt(),ptJet);
+       var1[0] = ij;
+       var2[0] = ij;
+       fhnJetPt[iType]->Fill(var1);
+       fhnJetPtQA[iType]->Fill(var2);
+      }
+      var1[0] = kMaxJets;// fill for all jets
+      var2[0] = kMaxJets;// fill for all jets
+      fhnJetPt[iType]->Fill(var1);
+      fhnJetPtQA[iType]->Fill(var2);
+      if(leadTrack)fh2LTrackPtJetPt[iType][kMaxJets]->Fill(leadTrack->Pt(),ptJet);
+
+      if(particlesList.GetSize()&&ij<kMaxJets){
+       // Particles... correlated with jets...
+       for(int it = 0;it<particlesList.GetEntries();++it){
+         AliVParticle *part = (AliVParticle*)particlesList.At(it);
+         Float_t deltaR = jet->DeltaR(part);
+         if(ptJet>0)fh1TmpRho->Fill(deltaR,part->Pt()/ptJet);
+       }
+       // fill the jet shapes
+      }// if we have particles
+  }// 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,ptJet1);      
+
+    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);            
   }
+  
 
 
-  if(nRecOver>0){
-    TIterator *recIter = aodRecJets->MakeIterator();
-    AliAODJet *tmpRec = (AliAODJet*)(recIter->Next());  
-    Float_t pt = tmpRec->Pt();
-    if(tmpRec){
-      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();
+  // count down the jets above thrueshold
+  Int_t nOver = nJets;
+  if(nOver>0){
+    TIterator *jetIter = jetsList.MakeIterator();
+    AliAODJet *tmpJet = (AliAODJet*)(jetIter->Next());  
+    if(tmpJet){
+      Float_t pt = tmpJet->Pt();
+      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(nRecOver<=0)break;
-       fh2NRecJetsPt->Fill(ptCut,nRecOver);
+       if(nOver<=0)break;
+       fh2NJetsPt[iType]->Fill(ptCut,nOver);
       }
     }
-    recIter->Reset();
-    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()))){
-      Float_t tmpPt = tmpRec->Pt();
-      fh1PtJetsRecIn->Fill(tmpPt);
-      if(tmpRec==leading){
-       fh1PtJetsLeadingRecIn->Fill(tmpPt);
-       continue;
-      }
-      // correlation
-      Float_t tmpPhi =  tmpRec->Phi();
+    delete jetIter;
+  }
+}
+
+void AliAnalysisTaskJetSpectrum2::FillTrackHistos(TList &particlesList,int iType){
+
+  if(fFlagJetType[iType]<=0)return;
+  Int_t refMult = fMultRec;
+  if(iType==kJetGen||iType==kJetGenFull){
+    refMult = fMultGen;
 
-      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();
+  // 
+  Double_t var3[5]; // track number;p_{T};cent;#tracks;RP
+  var3[2] = fCentrality;
+  var3[3] = refMult;
+  Double_t var4[5]; // track number;p_{T};cent;#eta;#phi
+  var4[2] = fCentrality;
+  Int_t nTrackOver = particlesList.GetSize();
   // do the same for tracks and jets
   if(nTrackOver>0){
-    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){
+    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--;
-       tmpRec = (AliVParticle*)(recIter->Next()); 
-       if(tmpRec){
-         pt = tmpRec->Pt();
+       tmpTrack = (AliVParticle*)(trackIter->Next()); 
+       if(tmpTrack){
+         pt = tmpTrack->Pt();
        }
       }
       if(nTrackOver<=0)break;
-      fh2NRecTracksPt->Fill(ptCut,nTrackOver);
+      fh2NTracksPt[iType]->Fill(ptCut,nTrackOver);
     }
+
     
-    recIter->Reset();
-    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();
-      fh1PtTracksRecIn->Fill(tmpPt);
-      if(tmpRec==leading){
-       fh1PtTracksLeadingRecIn->Fill(tmpPt);
-       continue;
-      }
-      // correlation
-      Float_t tmpPhi =  tmpRec->Phi();
+    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);
+      fh1PtTracksInLow[iType]->Fill(tmpPt);
 
+      sumPt += tmpPt;
+      Float_t tmpPhi = tmpTrack->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);
+
+      
+      Float_t phiRP = tmpPhi-fRPAngle;
+      if(phiRP>TMath::Pi())phiRP -= TMath::Pi();
+      if(phiRP<0)phiRP += TMath::Pi();
+      if(phiRP<0)phiRP += TMath::Pi();
+      const float allPhi = -1./180.*TMath::Pi();
+
+      fp2MultRPPhiTrackPt[iType]->Fill(refMult,phiRP,tmpPt);
+      fp2MultRPPhiTrackPt[iType]->Fill(refMult,allPhi,tmpPt);
+
+      fp2CentRPPhiTrackPt[iType]->Fill(fCentrality,phiRP,tmpPt);
+      fp2CentRPPhiTrackPt[iType]->Fill(fCentrality,allPhi,tmpPt);
+
+      Int_t phiBin = GetPhiBin(tmpPhi-fRPAngle);
+      var3[0] = 1;
+      var3[1] = tmpPt;
+      var3[4] = phiBin;
+      
+      var4[0] = 1;
+      var4[1] = tmpPt;
+      var4[3] = tmpTrack->Eta();
+      var4[4] = tmpPhi;
+
+
+      fhnTrackPt[iType]->Fill(var3);
+      fhnTrackPtQA[iType]->Fill(var4);
+
+      if(tmpTrack==leading){
+       var3[0] = 0;
+       var4[0] = 0;
+       fhnTrackPt[iType]->Fill(var3);
+       fhnTrackPtQA[iType]->Fill(var4);
+       continue;
+      }
     }  
-    delete recIter;
+    fh1SumPtTrack[iType]->Fill(sumPt);
+    delete trackIter;
   }
-  
-  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);
-  
-  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[ir] = *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;
-  }
+void AliAnalysisTaskJetSpectrum2::FillMatchHistos(TList &recJetsList,TList &genJetsList){
 
-  AliAnalysisHelperJetTasks::GetClosestJets(genJets,nGenJets,recJets,nRecJets,
-                                           iGenIndex,iRecIndex,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]); 
-    }
-  }
+  // 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
-
-  // 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();
+  // 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 = genJets[ig].Eta();
-    
+    Double_t etaGen = genJet->Eta();
     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){
-      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);
-       fh1TmpRho->Fill(deltaR,part->Pt()/ptGen);
-       if(deltaR<radiusGen){
-         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);
+    fhnJetContainer->Fill(&container[3],kStep0);
+    if(JetSelected(genJet)){
+      fhnJetContainer->Fill(&container[3],kStep1);
+      Int_t ir = aRecIndex[ig];
+      if(ir>=0&&ir<recJetsList.GetEntries()){   
+       fhnJetContainer->Fill(&container[3],kStep2);
+       AliAODJet* recJet = (AliAODJet*)recJetsList.At(ir); 
+       if(JetSelected(recJet))fhnJetContainer->Fill(&container[3],kStep4);
+       if(JetSelected(recJet))fhnJetContainer->Fill(&container[3],kStep3);
       }
     }
-    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);
-    }
-  }// 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 generated jets used for matching...
 
-  
-  // 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...
-  if(ir==1){
-    Double_t etaRec1 = recJets[0].Eta();
-    Double_t ptRec1 = recJets[0].Pt();
-    Double_t phiRec1 = recJets[0].Phi();
-    if(phiRec1<0)phiRec1+=TMath::Pi()*2.;    
+  // 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...
     
-  
-    if(TMath::Abs(etaRec1)<fRecEtaWindow
-      &&TMath::Abs(etaRec)<fRecEtaWindow){
-  
-      Float_t deltaPhi = phiRec1 - phiRec;
-      
-      if(deltaPhi>TMath::Pi())deltaPhi = deltaPhi - 2.*TMath::Pi();
-      if(deltaPhi<(-1.*TMath::Pi()))deltaPhi = deltaPhi + 2.*TMath::Pi();      
-      deltaPhi = TMath::Abs(deltaPhi);
-      fh2DijetDeltaPhiPt->Fill(deltaPhi,ptRec1);      
-      Float_t asym = (ptRec1-ptRec)/(ptRec1+ptRec);
-      fh2DijetAsymPt->Fill(asym,ptRec1);
-      fh2DijetDeltaPhiDeltaEta->Fill(deltaPhi,etaRec1-etaRec);
-      fh2DijetPt2vsPt1->Fill(ptRec1,ptRec);        
-      fh2DijetDifvsSum->Fill(ptRec1+ptRec,ptRec1-ptRec);        
-      Float_t minv = 2.*(recJets[0].P()*recJets[1].P()-
-                        recJets[0].Px()*recJets[1].Px()- 
-                        recJets[0].Py()*recJets[1].Py()- 
-                        recJets[0].Pz()*recJets[1].Py());
-      minv = TMath::Sqrt(minv);
-      // with mass == 0;
-      
-      fh1DijetMinv->Fill(minv);            
-      if((TMath::Pi()-deltaPhi)<fDeltaPhiWindow){
-       fh1DijetMinvCut->Fill(minv);         
-       fh2DijetAsymPtCut->Fill(asym,ptRec1);      
-      }
-    }
-  }
-
-
     container[0] = ptRec;
     container[1] = etaRec;
     container[2] = phiRec;
-    containerPhiZ[0] = ptRec;
-    containerPhiZ[1] = phiRec;
-    if(ptRec>30.&&fDebug>0){
-      // 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);
+    fhnJetContainer->Fill(container,kStep0+kMaxStep);
     if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
   
-    Float_t zLeading = -1;
-    if(TMath::Abs(etaRec)<fRecEtaWindow){
-      fh2JetPtJetPhi->Fill(ptRec,phiRec);
-      fhnJetContainer[kStep1+kMaxStep]->Fill(container,eventW);
-      fh1PtRecIn[ir]->Fill(ptRec,eventW);
-      // fill the fragmentation function
+    if(JetSelected(recJet)){
+      fhnJetContainer->Fill(container,kStep1+kMaxStep);
+      // Fill Correlation
+      Int_t ig = aGenIndex[ir];
+      if(ig>=0 && ig<genJetsList.GetEntries()){
+       fhnJetContainer->Fill(container,kStep2+kMaxStep);
+       if (fDebug > 10)Printf("%s:%d ig = %d ir = %d",(char*)__FILE__,__LINE__,ig,ir);
+       AliAODJet *genJet = (AliAODJet*)genJetsList.At(ig);
+       Double_t ptGen  = genJet->Pt();
+       Double_t phiGen = genJet->Phi();
+       if(phiGen<0)phiGen+=TMath::Pi()*2.; 
+       Double_t etaGen = genJet->Eta();
       
-      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);
-       fh1TmpRho->Fill(deltaR,part->Pt()/ptRec);
-
-
-       if(deltaR<radiusRec){
-         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);
+       container[3] = ptGen;
+       container[4] = etaGen;
+       container[5] = phiGen;
+       // 
+       // we accept only jets which are detected within a smaller window, to avoid ambigious pair association at the edges of the acceptance
+       // 
+       if(JetSelected(genJet))fhnJetContainer->Fill(container,kStep4+kMaxStep);
+       fhnJetContainer->Fill(container,kStep3+kMaxStep);
+       fhnCorrelation->Fill(container,0);
+       if(ptGen>0){
+         Float_t delta = (ptRec-ptGen)/ptGen;
+         fh2RelPtFGen->Fill(ptGen,delta);
+         fh2PtFGen->Fill(ptGen,ptRec);
        }
-      }
-      // 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);
-      }
-    }
-
-
-    containerPhiZ[2] = zLeading;
-
-    // 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)<fRecEtaWindow)fhnJetContainer[kStep4+kMaxStep]->Fill(container,eventW);
-      if(TMath::Abs(etaRec)<fRecEtaWindow){
-       fhnJetContainer[kStep3+kMaxStep]->Fill(container,eventW);
-       fhnCorrelation->Fill(container);
-       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__);
+      } 
+    }// loop over reconstructed jets
+  }
   if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
-  PostData(1, fHistList);
 }
 
 
@@ -1092,10 +1233,9 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
   // link it
   //
   const Int_t kNvar   = 3 ; //number of variables on the grid:pt,eta, phi
-  const Double_t kPtmin = 0.0, kPtmax = 160.; // we do not want to have empty bins at the beginning...
+  const Double_t kPtmin = 0.0, kPtmax = 250.; // we do not want to have empty bins at the beginning...
   const Double_t kEtamin = -3.0, kEtamax = 3.0;
   const Double_t kPhimin = 0., kPhimax = 2. * TMath::Pi();
-  const Double_t kZmin = 0., kZmax = 1;
 
   // can we neglect migration in eta and phi?
   // phi should be no problem since we cover full phi and are phi symmetric
@@ -1104,7 +1244,7 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
 
   //arrays for the number of bins in each dimension
   Int_t iBin[kNvar];
-  iBin[0] = 160; //bins in pt
+  iBin[0] = 125; //bins in pt
   iBin[1] =  1; //bins in eta 
   iBin[2] = 1; // bins in phi
 
@@ -1120,12 +1260,11 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
   for(Int_t i=0; i<=iBin[2]; i++) binEdges[2][i]=(Double_t)kPhimin  + (kPhimax-kPhimin)/iBin[2]*(Double_t)i;
 
 
-  for(int i = 0;i < kMaxStep*2;++i){
-    fhnJetContainer[i] = new THnSparseF(Form("fhnJetContainer%d",i),Form("THnSparse jet info %d"),kNvar,iBin);
-    for (int k=0; k<kNvar; k++) {
-      fhnJetContainer[i]->SetBinEdges(k,binEdges[k]);
-    }
+  fhnJetContainer = new AliTHn(Form("fahnJetContainer"),Form("AliTHn jet info"),kMaxStep*2,kNvar,iBin);
+  for (int k=0; k<kNvar; k++) {
+    fhnJetContainer->SetBinLimits(k,binEdges[k]);
   }
+
   //create correlation matrix for unfolding
   Int_t thnDim[2*kNvar];
   for (int k=0; k<kNvar; k++) {
@@ -1135,48 +1274,15 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
     thnDim[k+kNvar] = iBin[k];
   }
 
-  fhnCorrelation = new THnSparseF("fhnCorrelation","THnSparse with correlations",2*kNvar,thnDim);
+  fhnCorrelation = new AliTHn("fahnCorrelation","AliTHn with correlations",1,2*kNvar,thnDim);
   for (int k=0; k<kNvar; k++) {
-    fhnCorrelation->SetBinEdges(k,binEdges[k]);
-    fhnCorrelation->SetBinEdges(k+kNvar,binEdges[k]);
-  }
-  fhnCorrelation->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]);
+    fhnCorrelation->SetBinLimits(k,binEdges[k]);
+    fhnCorrelation->SetBinLimits(k+kNvar,binEdges[k]);
   }
-  fhnCorrelationPhiZRec->Sumw2();
-
-
-  // Add a histogram for Fake jets
 
   for(Int_t ivar = 0; ivar < kNvar; ivar++)
     delete [] binEdges[ivar];
 
-  for(Int_t ivar = 0; ivar < kNvarPhiZ; ivar++)
-    delete [] binEdgesPhiZ[ivar];
 
 }
 
@@ -1203,16 +1309,17 @@ 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());
          if(fESD){
-           AliESDtrack *esdTr = (AliESDtrack*)fESD->GetTrack(tr->GetID());
+           AliESDtrack *esdTr = (AliESDtrack*)fESD->GetTrack(TMath::Abs(tr->GetID()+1));
            esdTr->Print("");
            // esdTr->Dump();
          }
@@ -1229,6 +1336,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++;
@@ -1249,6 +1357,8 @@ 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)continue;
+      if(part->Pt()<fMinTrackPt)continue;
       if(!part->IsPhysicalPrimary())continue;
       if(type == kTrackAODMCAll){
        list->Add(part);
@@ -1260,7 +1370,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++;
@@ -1271,3 +1381,124 @@ Int_t  AliAnalysisTaskJetSpectrum2::GetListOfTracks(TList *list,Int_t type){
   return iCount;
 
 }
+
+
+Float_t AliAnalysisTaskJetSpectrum2::GetCentrality(){
+    AliAODEvent *aod = 0;
+    if(fUseAODTrackInput)aod = dynamic_cast<AliAODEvent*>(InputEvent());
+    else aod = AODEvent();
+    if(!aod){
+      return 101;
+    }
+    return aod->GetHeader()->GetCentrality();
+}
+
+
+
+Bool_t  AliAnalysisTaskJetSpectrum2::JetSelected(AliAODJet *jet){
+  Bool_t selected = false;
+  
+  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;
+
+}
+
+
+Int_t AliAnalysisTaskJetSpectrum2::MultFromJetRefs(TClonesArray* jets){
+  if(!jets)return 0;
+
+  Int_t refMult = 0;
+  for(int ij = 0;ij < jets->GetEntries();++ij){
+    AliAODJet* jet = (AliAODJet*)jets->At(ij);
+    if(!jet)continue;
+    TRefArray *refs = jet->GetRefTracks();
+    if(!refs)continue;
+    refMult += refs->GetEntries();
+  }
+  return refMult;
+
+}
+
+
+AliVParticle *AliAnalysisTaskJetSpectrum2::LeadingTrackFromJetRefs(AliAODJet* jet){
+  if(!jet)return 0;
+  TRefArray *refs = jet->GetRefTracks();
+  if(!refs) return 0;
+  AliVParticle *leading = 0;
+  Float_t fMaxPt = 0;
+  for(int i = 0;i<refs->GetEntries();i++){
+    AliVParticle *tmp = dynamic_cast<AliVParticle*>(refs->At(i));
+    if(!tmp)continue;
+    if(tmp->Pt()>fMaxPt){
+      leading = tmp;
+      fMaxPt = tmp->Pt();
+    }
+  }
+  return leading;
+}
+
+
+AliVParticle *AliAnalysisTaskJetSpectrum2::LeadingTrackInCone(AliAODJet* jet,TList *list,Float_t r){
+  if(!jet)return 0;
+  if(!list) return 0;
+  AliVParticle *leading = 0;
+  Float_t fMaxPt = 0;
+  for(int i = 0;i<list->GetEntries();i++){
+    AliVParticle *tmp = (AliVParticle*)(list->At(i));
+    if(!tmp)continue;
+    if(jet->DeltaR(tmp)>r)continue;
+    if(tmp->Pt()>fMaxPt){
+      leading = tmp;
+      fMaxPt = tmp->Pt();
+    }
+  }
+  return leading;
+}
+
+Int_t AliAnalysisTaskJetSpectrum2::GetPhiBin(Double_t phi)
+{
+    Int_t phibin=-1;
+    if(!(TMath::Abs(phi)<=2*TMath::Pi())){AliError("phi w.r.t. RP out of defined range");return -1;}
+    Double_t phiwrtrp=TMath::ACos(TMath::Abs(TMath::Cos(phi)));
+    phibin=Int_t(fNRPBins*phiwrtrp/(0.5*TMath::Pi()));
+    if(phibin<0||phibin>=fNRPBins){AliError("Phi Bin not defined");}
+    return phibin;
+}
+