]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
Fixes for running on MC for JetChem, lower limit for p_T of jets in spectrum and...
[u/mrichter/AliRoot.git] / PWG4 / JetTasks / AliAnalysisTaskJetSpectrum2.cxx
index a5f53f4823058e421d56777ff6ef10c96967c47c..c90873e9c5332f6f9a1827e77b95bf51c79f8d75 100644 (file)
 ClassImp(AliAnalysisTaskJetSpectrum2)
 
 AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(): AliAnalysisTaskSE(),
-  fJetHeaderRec(0x0),
-  fJetHeaderGen(0x0),
-  fAOD(0x0),
-  fhnCorrelation(0x0),
-  fBranchRec("jets"),
-  fBranchGen(""),
-  fUseAODInput(kFALSE),
-  fUseGlobalSelection(kFALSE),
-  fUseExternalWeightOnly(kFALSE),
-  fLimitGenJetEta(kFALSE),
-  fFilterMask(0),
-  fAnalysisType(0),
+                                                           fJetHeaderRec(0x0),
+                                                           fJetHeaderGen(0x0),
+                                                           fAOD(0x0),
+                                                           fhnCorrelation(0x0),
+                                                           fBranchRec("jets"),
+                                                           fBranchGen(""),
+                                                           fUseAODJetInput(kFALSE),
+                                                           fUseAODTrackInput(kFALSE),
+                                                           fUseAODMCInput(kFALSE),
+                                                           fUseGlobalSelection(kFALSE),
+                                                           fUseExternalWeightOnly(kFALSE),
+                                                           fLimitGenJetEta(kFALSE),
+                                                           fFilterMask(0),
+                                                           fAnalysisType(0),
   fTrackTypeRec(kTrackUndef),
   fTrackTypeGen(kTrackUndef),
   fAvgTrials(1),
   fExternalWeight(1),    
-  fRecEtaWindow(0.5),
+                                                           fRecEtaWindow(0.5),
+  fMinJetPt(0),
+                                                           fDeltaPhiWindow(20./180.*TMath::Pi()),
   fh1Xsec(0x0),
   fh1Trials(0x0),
   fh1PtHard(0x0),
@@ -90,6 +94,26 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(): AliAnalysisTaskSE(),
   fh1PtTrackRec(0x0),   
   fh1SumPtTrackRec(0x0),  
   fh1SumPtTrackAreaRec(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),
+  fh2DijetDeltaPhiPt(0x0),      
+  fh2DijetAsymPt(0x0),          
+  fh2DijetAsymPtCut(0x0),       
+  fh2DijetDeltaPhiDeltaEta(0x0),
+  fh2DijetPt2vsPt1(0x0),        
+  fh2DijetDifvsSum(0x0),        
+  fh1DijetMinv(0x0),            
+  fh1DijetMinvCut(0x0),         
   fHistList(0x0)  
 {
   for(int i = 0;i < kMaxStep*2;++i){
@@ -110,7 +134,9 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
   fhnCorrelation(0x0),
   fBranchRec("jets"),
   fBranchGen(""),
-  fUseAODInput(kFALSE),
+  fUseAODJetInput(kFALSE),
+  fUseAODTrackInput(kFALSE),
+  fUseAODMCInput(kFALSE),
   fUseGlobalSelection(kFALSE),
   fUseExternalWeightOnly(kFALSE),
   fLimitGenJetEta(kFALSE),
@@ -121,6 +147,8 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
   fAvgTrials(1),
   fExternalWeight(1),    
   fRecEtaWindow(0.5),
+  fMinJetPt(0),
+  fDeltaPhiWindow(20./180.*TMath::Pi()),
   fh1Xsec(0x0),
   fh1Trials(0x0),
   fh1PtHard(0x0),
@@ -131,6 +159,26 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
   fh1PtTrackRec(0x0),   
   fh1SumPtTrackRec(0x0),  
   fh1SumPtTrackAreaRec(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),
+  fh2DijetDeltaPhiPt(0x0),      
+  fh2DijetAsymPt(0x0),          
+  fh2DijetAsymPtCut(0x0),       
+  fh2DijetDeltaPhiDeltaEta(0x0),
+  fh2DijetPt2vsPt1(0x0),        
+  fh2DijetDifvsSum(0x0),        
+  fh1DijetMinv(0x0),            
+  fh1DijetMinvCut(0x0),         
   fHistList(0x0)
 {
 
@@ -195,7 +243,7 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
 
   OpenFile(1);
   if(!fHistList)fHistList = new TList();
-
+  fHistList->SetOwner(kTRUE);
   Bool_t oldStatus = TH1::AddDirectoryStatus();
   TH1::AddDirectory(kFALSE);
 
@@ -217,7 +265,7 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
   Double_t binLimitsPhi[nBinPhi+1];
   for(Int_t iPhi = 0;iPhi<=nBinPhi;iPhi++){
     if(iPhi==0){
-      binLimitsPhi[iPhi] = -0.5*TMath::Pi();
+      binLimitsPhi[iPhi] = -1.*TMath::Pi();
     }
     else{
       binLimitsPhi[iPhi] = binLimitsPhi[iPhi-1] + 1/(Float_t)nBinPhi * TMath::Pi()*2;
@@ -233,7 +281,7 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
       binLimitsEta[iEta] = -2.0;
     }
     else{
-      binLimitsEta[iEta] = binLimitsEta[iEta-1] + 1/(Float_t)nBinEta + 0.1;
+      binLimitsEta[iEta] = binLimitsEta[iEta-1] + 0.1;
     }
   }
 
@@ -256,8 +304,26 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
   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);
+  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);
+
   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);
@@ -265,7 +331,7 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
     fh2PhiPt[ij] =  new TH2F(Form("fh2PhiPtRec_j%d",ij),"Jet pt vs delta phi;#Delta#phi;p_{T,jet}",
                             nBinPhi,binLimitsPhi,nBinPt,binLimitsPt);
 
-    fh2PhiEta[ij] =  new TH2F(Form("fh2PhiEtaRec_j%d",ij),"delta eta vs delta phi for jets;#Delta#phi;p_{T,jet}",
+    fh2PhiEta[ij] =  new TH2F(Form("fh2PhiEtaRec_j%d",ij),"delta eta vs delta phi for jets;#Delta#phi;#Delta#eta",
                              nBinPhi,binLimitsPhi,nBinEta,binLimitsEta);
 
 
@@ -280,6 +346,19 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
                             nBinFrag,0.,10.,nBinPt,binLimitsPt);
   }
 
+  // Dijet histograms
+
+  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);
+
+
+
 
   const Int_t saveLevel = 3; // large save level more histos
   if(saveLevel>0){
@@ -288,23 +367,48 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
     fHistList->Add(fh1PtHard);
     fHistList->Add(fh1PtHardNoW);
     fHistList->Add(fh1PtHardTrials);
-    fHistList->Add(fh1NGenJets);
+    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]);
-      fHistList->Add( fh1PtGenIn[ij]);
+      if(fBranchGen.Length()>0){
+       fHistList->Add( fh1PtGenIn[ij]);
+       fHistList->Add( fh2FragGen[ij]);
+       fHistList->Add( fh2FragLnGen[ij]);
+      }
       fHistList->Add( fh2PhiPt[ij]);
       fHistList->Add( fh2PhiEta[ij]);
       fHistList->Add( fh2FragRec[ij]);
       fHistList->Add( fh2FragLnRec[ij]);
-      fHistList->Add( fh2FragGen[ij]);
-      fHistList->Add( fh2FragLnGen[ij]);
     }
     fHistList->Add(fhnCorrelation);
+
+
+    fHistList->Add(fh2DijetDeltaPhiPt);       
+    fHistList->Add(fh2DijetAsymPt);       
+    fHistList->Add(fh2DijetAsymPtCut);               
+    fHistList->Add(fh2DijetDeltaPhiDeltaEta);        
+    fHistList->Add(fh2DijetPt2vsPt1);                
+    fHistList->Add(fh2DijetDifvsSum);                
+    fHistList->Add(fh1DijetMinv);                    
+    fHistList->Add(fh1DijetMinvCut);                 
   }
 
   // =========== Switch on Sumw2 for all histos ===========
@@ -326,7 +430,6 @@ void AliAnalysisTaskJetSpectrum2::Init()
   // Initialization
   //
 
-  Printf(">>> AnalysisTaskJetSpectrum2::Init() debug level %d\n",fDebug);
   if (fDebug > 1) printf("AnalysisTaskJetSpectrum2::Init() \n");
 
 }
@@ -345,10 +448,10 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
   // Execute analysis for current event
   //
   AliESDEvent *fESD = 0;
-  if(fUseAODInput){    
+  if(fUseAODJetInput){    
     fAOD = dynamic_cast<AliAODEvent*>(InputEvent());
     if(!fAOD){
-      Printf("%s:%d AODEvent not found in Input Manager %d",(char*)__FILE__,__LINE__,fUseAODInput);
+      Printf("%s:%d AODEvent not found in Input Manager %d",(char*)__FILE__,__LINE__,fUseAODJetInput);
       return;
     }
     // fethc the header
@@ -405,7 +508,7 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
   }
 
   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
@@ -439,18 +542,19 @@ 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]);
+         iCount++;
        }
-       iCount++;
       }
     }
     if(fBranchGen.Length()==0)nGenJets = iCount;    
@@ -462,8 +566,14 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
   TList recParticles;
   TList genParticles;
 
-  GetListOfTracks(&recParticles,fTrackTypeRec);
-  GetListOfTracks(&genParticles,fTrackTypeGen);
+
+
+
+  Int_t nT = GetListOfTracks(&recParticles,fTrackTypeRec);
+  if(fDebug>2)Printf("%s:%d Selected Rec tracks: %d %d",(char*)__FILE__,__LINE__,nT,recParticles.GetEntries());
+  nT = GetListOfTracks(&genParticles,fTrackTypeGen);
+  if(fDebug>2)Printf("%s:%d Selected Gen tracks: %d %d",(char*)__FILE__,__LINE__,nT,genParticles.GetEntries());
+
 
   if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
   fh1PtHard->Fill(ptHard,eventW);
@@ -479,18 +589,21 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
        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{
-      Printf("%s:%d Generated jet branch %s not found",(char*)__FILE__,__LINE__,fBranchGen.Data());
-      fAOD->Print();
+      if(fDebug>1)Printf("%s:%d Generated jet branch %s not found",(char*)__FILE__,__LINE__,fBranchGen.Data());
+      if(fDebug>2)fAOD->Print();
     }
   }
 
@@ -502,17 +615,139 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
 
   nRecJets = aodRecJets->GetEntries();
 
-  
+  nRecJets = aodRecJets->GetEntries();
+  fh1NRecJets->Fill(nRecJets);
 
+  // Do something with the all rec jets
+  Int_t nRecOver = nRecJets;
+
+  // check that the jets are sorted
+  Float_t ptOld = 999999;
+  for(int ir = 0;ir < nRecJets;ir++){
+    AliAODJet *tmp = (AliAODJet*)(aodRecJets->At(ir));
+    Float_t tmpPt = tmp->Pt();
+    if(tmpPt>ptOld){
+      Printf("%s:%d Jets Not Sorted!! %d:%.3E %d%.3E",(char*)__FILE__,__LINE__,ir,tmpPt,ir-1,ptOld);
+    }
+    ptOld = tmpPt;
+  }
 
-  fh1NRecJets->Fill(nRecJets);
-  nRecJets = TMath::Min(nRecJets,kMaxJets);
 
+  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();
+         }
+       }
+       if(nRecOver<=0)break;
+       fh2NRecJetsPt->Fill(ptCut,nRecOver);
+      }
+    }
+    recIter->Reset();
+    AliAODJet *leading = (AliAODJet*)aodRecJets->At(0);
+    Float_t phi = leading->Phi();
+    if(phi<0)phi+=TMath::Pi()*2.;    
+    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();
+
+      if(tmpPhi<0)tmpPhi+=TMath::Pi()*2.;    
+      Float_t dPhi = phi - tmpRec->Phi();
+      if(dPhi>TMath::Pi())dPhi = dPhi - 2.*TMath::Pi();
+      if(dPhi<(-1.*TMath::Pi()))dPhi = dPhi + 2.*TMath::Pi();      
+      Float_t dEta = eta - tmpRec->Eta();
+      fh2JetsLeadingPhiEta->Fill(dPhi,dEta);
+      fh2JetsLeadingPhiPt->Fill(dPhi,pt);
+    }  
+    delete recIter;
+  }
+
+  Int_t nTrackOver = recParticles.GetSize();
+  // do the same for tracks and jets
+  if(nTrackOver>0){
+    TIterator *recIter = recParticles.MakeIterator();
+    AliVParticle *tmpRec = (AliVParticle*)(recIter->Next());  
+    Float_t pt = tmpRec->Pt();
+    //    Printf("Leading track p_t %3.3E",pt);
+    for(int i = 1;i <= fh2NRecTracksPt->GetNbinsX();i++){
+      Float_t ptCut = fh2NRecTracksPt->GetXaxis()->GetBinCenter(i);
+      while(pt<ptCut&&tmpRec){
+       nTrackOver--;
+       tmpRec = (AliVParticle*)(recIter->Next()); 
+       if(tmpRec){
+         pt = tmpRec->Pt();
+       }
+      }
+      if(nTrackOver<=0)break;
+      fh2NRecTracksPt->Fill(ptCut,nTrackOver);
+    }
+    
+    recIter->Reset();
+    AliVParticle *leading = (AliVParticle*)recParticles.At(0);
+    Float_t phi = leading->Phi();
+    if(phi<0)phi+=TMath::Pi()*2.;    
+    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();
+
+      if(tmpPhi<0)tmpPhi+=TMath::Pi()*2.;    
+      Float_t dPhi = phi - tmpRec->Phi();
+      if(dPhi>TMath::Pi())dPhi = dPhi - 2.*TMath::Pi();
+      if(dPhi<(-1.*TMath::Pi()))dPhi = dPhi + 2.*TMath::Pi();      
+      Float_t dEta = eta - tmpRec->Eta();
+      fh2TracksLeadingPhiEta->Fill(dPhi,dEta);
+      fh2TracksLeadingPhiPt->Fill(dPhi,pt);
+    }  
+    delete recIter;
+  }
+  
+  if(genParticles.GetSize()){
+    TIterator *genIter = genParticles.MakeIterator();
+    AliVParticle *tmpGen = 0;
+    while((tmpGen = (AliVParticle*)(genIter->Next()))){
+      if(TMath::Abs(tmpGen->Eta())<0.9){
+       Float_t tmpPt = tmpGen->Pt();
+       fh1PtTracksGenIn->Fill(tmpPt);
+      }  
+    }
+    delete genIter;
+  }
+  
+  nRecJets = TMath::Min(nRecJets,kMaxJets);
+  
+  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__);
@@ -520,11 +755,11 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
   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){
+
+  for(int i = 0;i<kMaxJets;++i){    
     iGenIndex[i] = iRecIndex[i] = -1;
   }
 
-
   AliAnalysisHelperJetTasks::GetClosestJets(genJets,nGenJets,recJets,nRecJets,
                                            iGenIndex,iRecIndex,fDebug);
   if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
@@ -599,32 +834,74 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
   fh1SumPtTrackAreaRec->Fill(sumPt*0.4*0.4/(2.*1.8),eventW);
   fh1SumPtTrackRec->Fill(sumPt,eventW);
 
-
+  
   // loop over reconstructed jets
   for(int ir = 0;ir < nRecJets;++ir){
     Double_t etaRec = recJets[ir].Eta();
     Double_t ptRec = recJets[ir].Pt();
     Double_t phiRec = recJets[ir].Phi();
     if(phiRec<0)phiRec+=TMath::Pi()*2.;    
+
+
+  // do something with dijets...
+  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.;    
+    
+  
+    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;
 
-    if(ptRec>10.&&fDebug>0){
+    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(),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());
       for(int it = 0;it < fAOD->GetNumberOfTracks();++it){
        AliAODTrack *tr = fAOD->GetTrack(it);
        if((fFilterMask>0)&&!(tr->TestFilterBit(fFilterMask)))continue;
        tr->Print();
-       tr->Dump();
+       //      tr->Dump();
        if(fESD){
          AliESDtrack *esdTr = (AliESDtrack*)fESD->GetTrack(tr->GetID());
          esdTr->Print("");
-         esdTr->Dump();
+         // esdTr->Dump();
        }
       }
     }
@@ -644,7 +921,8 @@ 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()/2))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);
        }
@@ -702,7 +980,7 @@ 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 = 160.; // 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();
 
@@ -714,7 +992,7 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
 
   //arrays for the number of bins in each dimension
   Int_t iBin[kNvar];
-  iBin[0] = 100; //bins in pt
+  iBin[0] = 160; //bins in pt
   iBin[1] =  1; //bins in eta 
   iBin[2] = 1; // bins in phi
 
@@ -757,6 +1035,9 @@ void AliAnalysisTaskJetSpectrum2::MakeJetContainer(){
   //  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];
+
 }
 
 void AliAnalysisTaskJetSpectrum2::Terminate(Option_t */*option*/)
@@ -769,18 +1050,34 @@ void AliAnalysisTaskJetSpectrum2::Terminate(Option_t */*option*/)
 
 Int_t  AliAnalysisTaskJetSpectrum2::GetListOfTracks(TList *list,Int_t type){
 
+  if(fDebug>2)Printf("%s:%d Selecting tracks with %d",(char*)__FILE__,__LINE__,type);
 
   Int_t iCount = 0;
-  if(type==kTrackAODIn||type==kTrackAODOut){
+  if(type==kTrackAOD){
     AliAODEvent *aod = 0;
-    if(type==kTrackAODIn)aod = dynamic_cast<AliAODEvent*>(InputEvent());
-    else if (type==kTrackAODOut) aod = AODEvent();
+    if(fUseAODTrackInput)aod = dynamic_cast<AliAODEvent*>(InputEvent());
+    else aod = AODEvent();
     if(!aod){
       return iCount;
     }
     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(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());
+         tr->Print();
+         //    tr->Dump();
+         AliESDEvent *fESD = dynamic_cast<AliESDEvent*> (InputEvent());
+         if(fESD){
+           AliESDtrack *esdTr = (AliESDtrack*)fESD->GetTrack(tr->GetID());
+           esdTr->Print("");
+           // esdTr->Dump();
+         }
+       }
+      }
       list->Add(tr);
       iCount++;
     }
@@ -803,9 +1100,10 @@ Int_t  AliAnalysisTaskJetSpectrum2::GetListOfTracks(TList *list,Int_t type){
       }
     }
   }
-  else if (type == kTrackAODMCCharged || type == kTrackAODMCAll ) {
-    AliAODEvent *aod = dynamic_cast<AliAODEvent*>(InputEvent());
-    if(!aod) aod = AODEvent();
+  else if (type == kTrackAODMCCharged || type == kTrackAODMCAll || type == kTrackAODMCChargedAcceptance) {
+    AliAODEvent *aod = 0;
+    if(fUseAODMCInput)aod = dynamic_cast<AliAODEvent*>(InputEvent());
+    else aod = AODEvent();
     if(!aod)return iCount;
     TClonesArray *tca = dynamic_cast<TClonesArray*>(aod->FindListObject(AliAODMCParticle::StdBranchName()));
     if(!tca)return iCount;
@@ -816,13 +1114,20 @@ Int_t  AliAnalysisTaskJetSpectrum2::GetListOfTracks(TList *list,Int_t type){
        list->Add(part);
        iCount++;
       }
-      else if (type == kTrackAODMCCharged){
+      else if (type == kTrackAODMCCharged || type == kTrackAODMCChargedAcceptance ){
        if(part->Charge()==0)continue;
-       list->Add(part);
+       if(kTrackAODMCCharged){
+         list->Add(part);
+       }
+       else {
+         if(TMath::Abs(part->Eta())>0.9)continue;
+         list->Add(part);
+       }
        iCount++;
       }
     }
   }// AODMCparticle
+  list->Sort();
   return iCount;
 
 }