Updates to jet QA task + minor things in the dijet task (from Marta)

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetAna.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetAna.cxx
index 1a077a5434688ab5d051a1cdabfdb75cf8a952c1..d87953294134b5c59180e8a24d4452c535d7c2d5 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetAna.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetAna.cxx
@@ -390,6 +390,11 @@ void AliAnalysisTaskEmcalDiJetAna::CorrelateTwoJets(const Int_t type) {
     if(!jetAssoc)
       continue;
 
+    if(type==0 || type==1) {
+      if(GetJetPt(jetAssoc,typea)>jetTrigPt)
+       continue;
+    }
+
     FillDiJetHistos(jetTrig,jetAssoc, type);
     
 

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetBase.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetBase.cxx
index 92d42832e7a50d366d2d46005ccab636d8456855..d4ab4318afefd28329b83377e49b6e7cbcd87e79 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetBase.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetBase.cxx
@@ -632,7 +632,7 @@ AliEmcalJet* AliAnalysisTaskEmcalDiJetBase::GetLeadingJetOppositeHemisphere(cons
     Double_t dPhi = GetDeltaPhi(jetTrig,jetAssoc);
     Double_t phiMin = 0.5*TMath::Pi();
     Double_t phiMax = 1.5*TMath::Pi();
-    if(dPhi<phiMin || phiMax>phiMax)
+    if(dPhi<phiMin || dPhi>phiMax)
       continue;
 
     Double_t jetAssocPt = GetJetPt(jetAssoc,typea);

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetResponse.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetResponse.cxx
index 82df38213abcb9ba4d2ee8a7f2b1bff937692189..7df6de25bda2a677c951c2bbe1138f5eb000b537 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetResponse.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetResponse.cxx
@@ -464,6 +464,11 @@ void AliAnalysisTaskEmcalDiJetResponse::CorrelateTwoJets(const Int_t type) {
       continue;
     }
 
+    if(type==0 || type==1) {
+      if(GetJetPt(jetAssocDet,typea)>GetJetPt(jetTrigDet,typet))
+       continue;
+    }
+
     FillDiJetResponse(jetTrigMC,jetAssocMC,jetTrigDet,jetAssocDet,type);
 
 

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetTriggerQA.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetTriggerQA.cxx
index b50cfcbc0c111747b4cf093ec428ad1272e2663a..c96abe648be2942b46bde23233c87e71a3c4917d 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetTriggerQA.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetTriggerQA.cxx
@@ -54,7 +54,11 @@ AliAnalysisTaskEmcalJetTriggerQA::AliAnalysisTaskEmcalJetTriggerQA() :
   fh2PtMeanPtConstituentsCharged(0),
   fh2PtMeanPtConstituentsNeutral(0),
   fh2PtNEF(0),
+  fh3NEFEtaPhi(0),
+  fh2NEFNConstituentsCharged(0),
+  fh2NEFNConstituentsNeutral(0),
   fh2Ptz(0),
+  fh2PtzCharged(0),
   fh2PtLeadJet1VsLeadJet2(0),
   fh3EEtaPhiCluster(0),
   fh3PtLeadJet1VsPatchEnergy(0),
@@ -94,7 +98,11 @@ AliAnalysisTaskEmcalJetTriggerQA::AliAnalysisTaskEmcalJetTriggerQA(const char *n
   fh2PtMeanPtConstituentsCharged(0),
   fh2PtMeanPtConstituentsNeutral(0),
   fh2PtNEF(0),
+  fh3NEFEtaPhi(0),
+  fh2NEFNConstituentsCharged(0),
+  fh2NEFNConstituentsNeutral(0),
   fh2Ptz(0),
+  fh2PtzCharged(0),
   fh2PtLeadJet1VsLeadJet2(0),
   fh3EEtaPhiCluster(0),
   fh3PtLeadJet1VsPatchEnergy(0),
@@ -372,9 +380,21 @@ void AliAnalysisTaskEmcalJetTriggerQA::UserCreateOutputObjects()
   fh2PtNEF = new TH2F("fh2PtNEF","fh2PtNEF;#it{p}_{T}^{jet};NEF",nBinsPt,minPt,maxPt,nBinsNEF,minNEF,maxNEF);
   fOutput->Add(fh2PtNEF);
 
+  fh3NEFEtaPhi = new TH3F("fh3NEFEtaPhi","fh3NEFEtaPhi;NEF;#eta;#varphi",nBinsNEF,minNEF,maxNEF,nBinsEta,minEta,maxEta,nBinsPhi,minPhi,maxPhi);
+  fOutput->Add(fh3NEFEtaPhi);
+
+  fh2NEFNConstituentsCharged = new TH2F("fh2NEFNConstituentsCharged","fh2NEFNConstituentsCharged;NEF;N_{charged constituents}",nBinsNEF,minNEF,maxNEF,nBinsConst,minConst,maxConst);
+  fOutput->Add(fh2NEFNConstituentsCharged);
+
+  fh2NEFNConstituentsNeutral = new TH2F("fh2NEFNConstituentsNeutral","fh2NEFNConstituentsNeutral;NEF;N_{clusters}",nBinsNEF,minNEF,maxNEF,nBinsConst,minConst,maxConst);
+  fOutput->Add(fh2NEFNConstituentsNeutral);
+
   fh2Ptz = new TH2F("fh2Ptz","fh2Ptz;#it{p}_{T}^{jet};z=p_{t,trk}^{proj}/p_{jet}",nBinsPt,minPt,maxPt,nBinsz,minz,maxz);
   fOutput->Add(fh2Ptz);
 
+  fh2PtzCharged = new TH2F("fh2PtzCharged","fh2Ptz;#it{p}_{T}^{ch jet};z=p_{t,trk}^{proj}/p_{ch jet}",nBinsPt,minPt,maxPt,nBinsz,minz,maxz);
+  fOutput->Add(fh2PtzCharged);
+
   fh2PtLeadJet1VsLeadJet2 = new TH2F("fh2PtLeadJet1VsLeadJet2","fh2PtLeadJet1VsLeadJet2;#it{p}_{T}^{jet 1};#it{p}_{T}^{jet 2}",nBinsPt,minPt,maxPt,nBinsPt,minPt,maxPt);
   fOutput->Add(fh2PtLeadJet1VsLeadJet2);
 
@@ -491,6 +511,9 @@ Bool_t AliAnalysisTaskEmcalJetTriggerQA::FillHistograms()
       fh2PtNConstituents->Fill(jetPt,jet->GetNumberOfConstituents());
 
       fh2PtNEF->Fill(jetPt,jet->NEF());
+      fh3NEFEtaPhi->Fill(jet->NEF(),jet->Eta(),jet->Phi());
+      fh2NEFNConstituentsCharged->Fill(jet->NEF(),jet->GetNumberOfTracks());
+      fh2NEFNConstituentsNeutral->Fill(jet->NEF(),jet->GetNumberOfClusters());
 
       AliVParticle *vp;
       Double_t sumPtCh = 0.;
@@ -498,9 +521,7 @@ Bool_t AliAnalysisTaskEmcalJetTriggerQA::FillHistograms()
        vp = static_cast<AliVParticle*>(jet->TrackAt(icc, fTracks));
        if(!vp) continue;
        fh2Ptz->Fill(jetPt,GetZ(vp,jet));
-       
        sumPtCh+=vp->Pt();
-       
       }
       
       if(jet->GetNumberOfTracks()>0)
@@ -548,6 +569,13 @@ Bool_t AliAnalysisTaskEmcalJetTriggerQA::FillHistograms()
       if(jetPt>ptLeadJet2) ptLeadJet2=jetPt;
       fh3PtEtaPhiJetCharged->Fill(jetPt,jet->Eta(),jet->Phi());
       fh3PtEtaAreaJetCharged->Fill(jetPt,jet->Eta(),jet->Area());
+
+      AliVParticle *vp;
+      for(Int_t icc=0; icc<jet->GetNumberOfTracks(); icc++) {
+       vp = static_cast<AliVParticle*>(jet->TrackAt(icc, fTracks));
+       if(!vp) continue;
+       fh2PtzCharged->Fill(jetPt,GetZ(vp,jet));
+      }
       
       //count jets above certain pT threshold
       Int_t ptbin = fh2NJetsPtCharged->GetYaxis()->FindBin(jetPt);

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetTriggerQA.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetTriggerQA.h
index fb84ec6abbb3fca86fcdc6dc83d4fbed83fa5f65..25d4e3214cce3e5fb9b7b4314eab346896b5988a 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetTriggerQA.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetTriggerQA.h
@@ -75,7 +75,11 @@ class AliAnalysisTaskEmcalJetTriggerQA : public AliAnalysisTaskEmcalJetDev {
   TH2F  *fh2PtMeanPtConstituentsCharged;    //! pt, <pt> charged constituents
   TH2F  *fh2PtMeanPtConstituentsNeutral;    //! pt, <pt> neutral constituents
   TH2F  *fh2PtNEF;                          //! pt, NEF (neutral energy fraction)
-  TH2F  *fh2Ptz;                            //! pt, z=pT,h,proj/p,jet
+  TH3F  *fh3NEFEtaPhi;                      //! NEF, eta, phi
+  TH2F  *fh2NEFNConstituentsCharged;        //! NEF, # charged jet constituents
+  TH2F  *fh2NEFNConstituentsNeutral;        //! NEF, # neutral jet constituents
+  TH2F  *fh2Ptz;                            //! pt, z=pT,h,proj/p,jet full jet
+  TH2F  *fh2PtzCharged;                     //! pt, z=pT,h,proj/p,jet charged jet
   TH2F  *fh2PtLeadJet1VsLeadJet2;           //! correlation between leading jet of the two branches
   TH3F  *fh3EEtaPhiCluster;                 //! cluster E, eta, phi
   TH3F  *fh3PtLeadJet1VsPatchEnergy;        //! leading jet energy vs leading patch energy vs jet trigger (J1/J2)
@@ -87,6 +91,6 @@ class AliAnalysisTaskEmcalJetTriggerQA : public AliAnalysisTaskEmcalJetDev {
   AliAnalysisTaskEmcalJetTriggerQA(const AliAnalysisTaskEmcalJetTriggerQA&);            // not implemented
   AliAnalysisTaskEmcalJetTriggerQA &operator=(const AliAnalysisTaskEmcalJetTriggerQA&); // not implemented
 
-  ClassDef(AliAnalysisTaskEmcalJetTriggerQA, 2)
+  ClassDef(AliAnalysisTaskEmcalJetTriggerQA, 3)
 };
 #endif