further patch from Salvatore

diff --git a/PWGJE/EMCALJetTasks/AliAnalysisTaskDeltaPt.cxx b/PWGJE/EMCALJetTasks/AliAnalysisTaskDeltaPt.cxx
index 140eb38a881c3cece76b71c51c80be096356abbb..c274a934a833d4c632345c9053d87460cbf746f0 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliAnalysisTaskDeltaPt.cxx
+++ b/PWGJE/EMCALJetTasks/AliAnalysisTaskDeltaPt.cxx
@@ -56,6 +56,8 @@ AliAnalysisTaskDeltaPt::AliAnalysisTaskDeltaPt() :
     fHistDeltaPtRC[i] = 0;
     fHistDeltaPtRCExLJ[i] = 0;
     fHistDeltaPtRCRand[i] = 0;
+    fHistEmbRejectedJetsPhiEta[i] = 0;
+    fHistEmbRejectedJetsPtArea[i] = 0;
     fHistEmbNotFoundPt[i] = 0;
     fHistEmbNotFoundPhiEta[i] = 0;
     fHistEmbJetsPtArea[i] = 0;
@@ -104,6 +106,8 @@ AliAnalysisTaskDeltaPt::AliAnalysisTaskDeltaPt(const char *name) :
     fHistDeltaPtRC[i] = 0;
     fHistDeltaPtRCExLJ[i] = 0;
     fHistDeltaPtRCRand[i] = 0;
+    fHistEmbRejectedJetsPhiEta[i] = 0;
+    fHistEmbRejectedJetsPtArea[i] = 0;
     fHistEmbNotFoundPt[i] = 0;
     fHistEmbNotFoundPhiEta[i] = 0;
     fHistEmbJetsPtArea[i] = 0;
@@ -133,7 +137,7 @@ void AliAnalysisTaskDeltaPt::UserCreateOutputObjects()
   AliAnalysisTaskEmcalJet::UserCreateOutputObjects();
 
   if (!fTracksName.IsNull() || !fCaloName.IsNull()) {
-    fHistRCPhiEta = new TH2F("fHistRCPhiEta","fHistRCPhiEta", 50, -1, 1, 101, 0, TMath::Pi() * 2.02);
+    fHistRCPhiEta = new TH2F("fHistRCPhiEta","fHistRCPhiEta", 100, -1, 1, 201, 0, TMath::Pi() * 2.01);
     fHistRCPhiEta->GetXaxis()->SetTitle("#eta");
     fHistRCPhiEta->GetYaxis()->SetTitle("#phi");
     fOutput->Add(fHistRCPhiEta);
@@ -147,12 +151,12 @@ void AliAnalysisTaskDeltaPt::UserCreateOutputObjects()
   }
 
   if (!fEmbJetsName.IsNull()) {
-    fHistEmbJetsPhiEta = new TH2F("fHistEmbJetsPhiEta","fHistEmbJetsPhiEta", 50, -1, 1, 101, 0, TMath::Pi() * 2.02);
+    fHistEmbJetsPhiEta = new TH2F("fHistEmbJetsPhiEta","fHistEmbJetsPhiEta", 100, -1, 1, 201, 0, TMath::Pi() * 2.01);
     fHistEmbJetsPhiEta->GetXaxis()->SetTitle("#eta");
     fHistEmbJetsPhiEta->GetYaxis()->SetTitle("#phi");
     fOutput->Add(fHistEmbJetsPhiEta);
     
-    fHistLeadPartPhiEta = new TH2F("fHistLeadPartPhiEta","fHistLeadPartPhiEta", 50, -1, 1, 101, 0, TMath::Pi() * 2.02);
+    fHistLeadPartPhiEta = new TH2F("fHistLeadPartPhiEta","fHistLeadPartPhiEta", 100, -1, 1, 201, 0, TMath::Pi() * 2.01);
     fHistLeadPartPhiEta->GetXaxis()->SetTitle("#eta");
     fHistLeadPartPhiEta->GetYaxis()->SetTitle("#phi");
     fOutput->Add(fHistLeadPartPhiEta);
@@ -223,7 +227,6 @@ void AliAnalysisTaskDeltaPt::UserCreateOutputObjects()
       fOutput->Add(fHistDeltaPtRCRand[i]);
     }
 
-
     if (!fEmbJetsName.IsNull()) {
       histname = "fHistEmbJetsPtArea_";
       histname += i;
@@ -264,7 +267,7 @@ void AliAnalysisTaskDeltaPt::UserCreateOutputObjects()
 
       histname = "fHistEmbNotFoundPhiEta_";
       histname += i;
-      fHistEmbNotFoundPhiEta[i] = new TH2F(histname.Data(), histname.Data(), 40, -2, 2, 64, 0, 6.4);
+      fHistEmbNotFoundPhiEta[i] = new TH2F(histname.Data(), histname.Data(), 100, -1, 1, 201, 0, TMath::Pi() * 2.01);
       fHistEmbNotFoundPhiEta[i]->GetXaxis()->SetTitle("#eta");
       fHistEmbNotFoundPhiEta[i]->GetYaxis()->SetTitle("#phi");
       fOutput->Add(fHistEmbNotFoundPhiEta[i]);
@@ -276,6 +279,20 @@ void AliAnalysisTaskDeltaPt::UserCreateOutputObjects()
       fHistEmbNotFoundPt[i]->GetYaxis()->SetTitle("counts");
       fOutput->Add(fHistEmbNotFoundPt[i]);
 
+      histname = "fHistEmbRejectedJetsPhiEta_";
+      histname += i;
+      fHistEmbRejectedJetsPhiEta[i] = new TH2F(histname.Data(), histname.Data(), 100, -1, 1, 201, 0, TMath::Pi() * 2.01);
+      fHistEmbRejectedJetsPhiEta[i]->GetXaxis()->SetTitle("#eta");
+      fHistEmbRejectedJetsPhiEta[i]->GetYaxis()->SetTitle("#phi");
+      fOutput->Add(fHistEmbRejectedJetsPhiEta[i]);
+
+      histname = "fHistEmbRejectedJetsPtArea_";
+      histname += i;
+      fHistEmbRejectedJetsPtArea[i] = new TH2F(histname.Data(), histname.Data(), 40, 0, fJetRadius * fJetRadius * TMath::Pi() * 3, fNbins, fMinBinPt, fMaxBinPt);
+      fHistEmbRejectedJetsPtArea[i]->GetXaxis()->SetTitle("area");
+      fHistEmbRejectedJetsPtArea[i]->GetYaxis()->SetTitle("#it{p}_{T,jet}^{emb,raw} (GeV/#it{c})");
+      fOutput->Add(fHistEmbRejectedJetsPtArea[i]);
+
       histname = "fHistEmbBkgArea_";
       histname += i;
       fHistEmbBkgArea[i] = new TH2F(histname.Data(), histname.Data(), 40, 0, fJetRadius * fJetRadius * TMath::Pi() * 3, fNbins, fMinBinPt, fMaxBinPt);
@@ -384,6 +401,14 @@ Bool_t AliAnalysisTaskDeltaPt::FillHistograms()
     Int_t countEmbJets = 0;
     
     while (embJet != 0) {
+      if (!AcceptJet(embJet)) {
+       fHistEmbRejectedJetsPhiEta[fCentBin]->Fill(embJet->Eta(), embJet->Phi());
+       fHistEmbRejectedJetsPtArea[fCentBin]->Fill(embJet->Area(), embJet->Pt());
+       
+       embJet = NextEmbeddedJet();
+       continue;
+      }
+
       AliDebug(2,Form("Elaborating embedded jet n. %d", countEmbJets));
       countEmbJets++;
       
@@ -571,10 +596,7 @@ AliEmcalJet* AliAnalysisTaskDeltaPt::NextEmbeddedJet(Int_t i)
 
     if (jet->MCPt() < fMCJetPtThreshold)
       continue;
-      
-    if (!AcceptJet(jet))
-      continue;
-
+     
     return jet;
   }
 

diff --git a/PWGJE/EMCALJetTasks/AliAnalysisTaskDeltaPt.h b/PWGJE/EMCALJetTasks/AliAnalysisTaskDeltaPt.h
index 6c124af8344c4cfdbb3a37cd7547a8200e1836a7..bad38e34bd4e5480ae4d14e333bd95e69690fb00 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliAnalysisTaskDeltaPt.h
+++ b/PWGJE/EMCALJetTasks/AliAnalysisTaskDeltaPt.h
@@ -73,6 +73,8 @@ class AliAnalysisTaskDeltaPt : public AliAnalysisTaskEmcalJet {
   // Jet embedding
   TH2                        *fHistEmbNotFoundPhiEta[4];   //!Phi-Eta of "not found" embedded particles
   TH1                        *fHistEmbNotFoundPt[4];       //!Pt of "not found" embedded particles
+  TH2                        *fHistEmbRejectedJetsPhiEta[4];//!Phi-Eta of rejected embedded jets
+  TH1                        *fHistEmbRejectedJetsPtArea[4];//!Pt-area of rejected embedded jets
   TH3                        *fHistEmbJetsPtArea[4];       //!Pt vs. area of embedded jets
   TH3                        *fHistEmbJetsCorrPtArea[4];   //!Pt-rho*A vs. area of embedded jets
   TH2                        *fHistEmbPartPtvsJetPt[4];    //!MC jet pt total jet pt

diff --git a/PWGJE/EMCALJetTasks/AliJetConstituentTagCopier.cxx b/PWGJE/EMCALJetTasks/AliJetConstituentTagCopier.cxx
index 59b4e2ae59d7baa39c4db8f948b2bf8366c4a0c7..1d698177e546eedbca50bb821f0888a83bcab564 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliJetConstituentTagCopier.cxx
+++ b/PWGJE/EMCALJetTasks/AliJetConstituentTagCopier.cxx
@@ -8,6 +8,7 @@
 
 #include <TClonesArray.h>
 #include <TH1I.h>
+#include <TMath.h>
 
 #include "AliVCluster.h"
 #include "AliVParticle.h"
@@ -113,7 +114,9 @@ void AliJetConstituentTagCopier::DoClusterLoop(TClonesArray *array)
       continue;
     Int_t mcLabel = cluster->GetLabel();
     if (mcLabel > 0) {
-      Int_t index = fMCParticlesMap->GetBinContent(mcLabel);
+      Int_t index = fMCParticlesMap->At(mcLabel);
+      if (index < 0)
+       continue;
       AliVParticle *part = static_cast<AliVParticle*>(fMCParticles->At(index));
       if (!part) {
        AliError(Form("%s: Could not get MC particle %d", GetName(), index));
@@ -136,14 +139,18 @@ void AliJetConstituentTagCopier::DoTrackLoop(TClonesArray *array)
     }
     if (!AcceptTrack(track))
       continue;
-    Int_t mcLabel = track->GetLabel();
+    Int_t mcLabel = TMath::Abs(track->GetLabel());
     if (mcLabel != 0) {
-      Int_t index = fMCParticlesMap->GetBinContent(mcLabel);
+      Int_t index = fMCParticlesMap->At(mcLabel);
+      if (index < 0)
+       continue;
       AliVParticle *part = static_cast<AliVParticle*>(fMCParticles->At(index));
       if (!part) {
        AliError(Form("%s: Could not get MC particle %d", GetName(), index));
        continue;
       }
+      AliDebug(2, Form("Track %d, pt = %f, eta = %f, phi = %f, label = %d is matched with particle %d, pt = %f, eta = %f, phi = %f", 
+                      i, track->Pt(), track->Eta(), track->Phi(), mcLabel, index, part->Pt(), part->Eta(), part->Phi()));
       UInt_t bits = (UInt_t)part->TestBits(TObject::kBitMask);
       track->SetBit(bits);
     }
@@ -167,9 +174,11 @@ void AliJetConstituentTagCopier::DoEmcalParticleLoop(TClonesArray *array)
     if (cluster)
       mcLabel = cluster->GetLabel();
     else if (track)
-      mcLabel = track->GetLabel();
+      mcLabel = TMath::Abs(track->GetLabel());
     if (mcLabel != 0) {
-      Int_t index = fMCParticlesMap->GetBinContent(mcLabel);
+      Int_t index = fMCParticlesMap->At(mcLabel);
+      if (index < 0)
+       continue;
       AliVParticle *part = static_cast<AliVParticle*>(fMCParticles->At(index));
       if (!part) {
        AliError(Form("%s: Could not get MC particle %d", GetName(), index));

diff --git a/PWGJE/EMCALJetTasks/AliJetEmbeddingFromAODTask.cxx b/PWGJE/EMCALJetTasks/AliJetEmbeddingFromAODTask.cxx
index 75c39efc69ff510989dd19023055b28b8683cacb..52b3c3878168ff487c3804d223007215ce42d959 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliJetEmbeddingFromAODTask.cxx
+++ b/PWGJE/EMCALJetTasks/AliJetEmbeddingFromAODTask.cxx
@@ -51,6 +51,9 @@ AliJetEmbeddingFromAODTask::AliJetEmbeddingFromAODTask() :
   fTriggerMask(AliVEvent::kAny),
   fZVertexCut(10),
   fIncludeNoITS(kTRUE),
+  fUseNegativeLabels(kTRUE),
+  fTrackEfficiency(1),
+  fIsMC(kFALSE),
   fTotalFiles(2050),
   fAttempts(5),
   fEsdTreeMode(kFALSE),
@@ -94,6 +97,9 @@ AliJetEmbeddingFromAODTask::AliJetEmbeddingFromAODTask(const char *name, Bool_t
   fTriggerMask(AliVEvent::kAny),
   fZVertexCut(10),
   fIncludeNoITS(kTRUE),
+  fUseNegativeLabels(kTRUE),
+  fTrackEfficiency(1),
+  fIsMC(kFALSE),
   fTotalFiles(2050),
   fAttempts(5),
   fEsdTreeMode(kFALSE),
@@ -431,13 +437,23 @@ void AliJetEmbeddingFromAODTask::Run()
          }
        }
        
+       if (fTrackEfficiency < 1) {
+         Double_t r = gRandom->Rndm();
+         if (fTrackEfficiency < r) 
+           continue;
+       }
+       
        Int_t label = 0;
-
-       if (fOutMCParticles) {
-         label = track->GetLabel();
-
-         if (label == 0)
+       if (fIsMC) {
+         if (fUseNegativeLabels)
+           label = track->GetLabel();
+         else 
+           label = TMath::Abs(track->GetLabel());
+         
+         if (label == 0) {
+           AliWarning(Form("%s: Track %d with label==0", GetName(), i));
            label = 99999;
+         }
        }
 
        AliDebug(3, Form("Embedding track with pT = %f, eta = %f, phi = %f, label = %d", track->Pt(), track->Eta(), track->Phi(), label));

diff --git a/PWGJE/EMCALJetTasks/AliJetEmbeddingFromAODTask.h b/PWGJE/EMCALJetTasks/AliJetEmbeddingFromAODTask.h
index 49f5c58933be00c677055388df540ca1c7095db2..09466a8ee6c618dd4704abcff406630a07b687ca 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliJetEmbeddingFromAODTask.h
+++ b/PWGJE/EMCALJetTasks/AliJetEmbeddingFromAODTask.h
@@ -34,9 +34,12 @@ class AliJetEmbeddingFromAODTask : public AliJetModelBaseTask {
   void           SetTriggerMask(UInt_t mask)                       { fTriggerMask        = mask  ; }
   void           SetAODfilterBits(Int_t b0 = 0, Int_t b1 = 0)      { fAODfilterBits[0]   = b0    ; fAODfilterBits[1] = b1  ; }
   void           SetIncludeNoITS(Bool_t f)                         { fIncludeNoITS       = f     ; }
+  void           SetUseNegativeLabels(Bool_t f)                    { fUseNegativeLabels  = f     ; }
+  void           SetTrackEfficiency(Double_t eff = 0.95)           { fTrackEfficiency    = eff   ; }
   void           SetTotalFiles(Int_t n)                            { fTotalFiles         = n     ; }
   void           SetAttempts(Int_t n)                              { fAttempts           = n     ; }
   void           SetRandomAccess(Bool_t r=kTRUE)                   { fRandomAccess       = r     ; }
+  void           SetMC(Bool_t a)                                   { fIsMC               = a     ; }
 
  protected:
   Bool_t          ExecOnce()            ;// intialize task
@@ -61,6 +64,9 @@ class AliJetEmbeddingFromAODTask : public AliJetModelBaseTask {
   Double_t       fZVertexCut          ;//  Z vertex cut
   Int_t          fAODfilterBits[2]    ;//  AOD track filter bit map
   Bool_t         fIncludeNoITS        ;//  True = includes tracks with failed ITS refit
+  Bool_t         fUseNegativeLabels   ;//  Whether or not should use negative MC labels
+  Double_t       fTrackEfficiency     ;//  Track efficiency
+  Bool_t         fIsMC                ;//  Whether the embedding AOD is MC or not
   Int_t          fTotalFiles          ;//  Total number of files per pt hard bin
   Int_t          fAttempts            ;//  Attempts to be tried before giving up in opening the next file
   Bool_t         fEsdTreeMode         ;//! True = embed from ESD (must be a skimmed ESD!)
@@ -84,6 +90,6 @@ class AliJetEmbeddingFromAODTask : public AliJetModelBaseTask {
   AliJetEmbeddingFromAODTask(const AliJetEmbeddingFromAODTask&);            // not implemented
   AliJetEmbeddingFromAODTask &operator=(const AliJetEmbeddingFromAODTask&); // not implemented
 
-  ClassDef(AliJetEmbeddingFromAODTask, 4) // Jet embedding from AOD task
+  ClassDef(AliJetEmbeddingFromAODTask, 5) // Jet embedding from AOD task
 };
 #endif

diff --git a/PWGJE/EMCALJetTasks/AliJetEmbeddingFromPYTHIATask.cxx b/PWGJE/EMCALJetTasks/AliJetEmbeddingFromPYTHIATask.cxx
index e1116f55e1b1432eadec4e7f89ffc9622a694cb5..69eb4baf26552a0dfeadd726550e0214b63d6860 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliJetEmbeddingFromPYTHIATask.cxx
+++ b/PWGJE/EMCALJetTasks/AliJetEmbeddingFromPYTHIATask.cxx
@@ -34,6 +34,7 @@ AliJetEmbeddingFromPYTHIATask::AliJetEmbeddingFromPYTHIATask() :
   SetSuffix("PYTHIAEmbedding");
   fTotalFiles = 2000;
   fRandomAccess = kTRUE;
+  SetMC(kTRUE);
 }
 
 //________________________________________________________________________
@@ -51,6 +52,7 @@ AliJetEmbeddingFromPYTHIATask::AliJetEmbeddingFromPYTHIATask(const char *name, B
   SetSuffix("PYTHIAEmbedding");
   fTotalFiles = 2000;
   fRandomAccess = kTRUE;
+  SetMC(kTRUE);
 }
 
 //________________________________________________________________________

diff --git a/PWGJE/EMCALJetTasks/AliJetModelBaseTask.cxx b/PWGJE/EMCALJetTasks/AliJetModelBaseTask.cxx
index 6d6ff247800c41041e4237c77c245777fdd1f453..8edc28e9e2d539d0bcb4b4eb6437e2ef09601aa2 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliJetModelBaseTask.cxx
+++ b/PWGJE/EMCALJetTasks/AliJetModelBaseTask.cxx
@@ -165,8 +165,10 @@ void AliJetModelBaseTask::UserExec(Option_t *)
   }
   
   // Reset name (it is cleared each event by the analysis manager)
-  if (fMCParticlesMap)
-    fMCParticlesMap->SetName(fMCParticlesName + "_Map");
+  if (fOutMCParticlesMap) {
+    new (fOutMCParticlesMap) TH1I(fOutMCParticlesName + "_Map", fOutMCParticlesName + "_Map",9999,0,1);
+    fOutMCParticlesMap->TArrayI::Reset(-1);
+  }
 
   AliVCaloCells *tempCaloCells = 0;
 
@@ -617,6 +619,8 @@ AliAODMCParticle* AliJetModelBaseTask::AddMCParticle(AliAODMCParticle *part, Int
   AliAODMCParticle *aodpart = new ((*fOutMCParticles)[nPart]) AliAODMCParticle(*part);
 
   fOutMCParticlesMap->SetBinContent(origIndex + fMCLabelShift, nPart);
+  AliDebug(2, Form("Setting bin %d to %d (fMCLabelShift=%d, origIndex=%d)", 
+                  origIndex + fMCLabelShift, fOutMCParticlesMap->At(origIndex + fMCLabelShift), fMCLabelShift, origIndex));
 
   return aodpart;
 }
@@ -692,15 +696,13 @@ void AliJetModelBaseTask::CopyMCParticles()
   if (!fMCParticlesMap)
     return;
 
-  Int_t shift = 0;
-
   for (Int_t i = 0; i < fMCParticlesMap->GetNbinsX()+2; i++) {
     fOutMCParticlesMap->SetBinContent(i, fMCParticlesMap->GetBinContent(i));
     if (fMCParticlesMap->GetBinContent(i) != 0)
-      shift = i;
+      fMCLabelShift = i;
   }
 
-  fMCLabelShift = shift;
+  AliDebug(2,Form("MC particles copied. fMCLabelShift=%d",fMCLabelShift));
 }
 
 //________________________________________________________________________

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.cxx
index e87590ce54113ac298c84a3cca7755a595bdbf80..ddc082e9f226424b32ab1922d0ede22d399887bf 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.cxx
@@ -32,8 +32,9 @@ AliAnalysisTaskSAJF::AliAnalysisTaskSAJF() :
 
   for (Int_t i = 0; i < 4; i++) {
     fHistEvents[i] = 0;
-    fHistLeadingJetPt[i] = 0;
-    fHistLeadingJetCorrPt[i] = 0;
+    fHistLeadingJetPhiEta[i] = 0;
+    fHistLeadingJetPtArea[i] = 0;
+    fHistLeadingJetCorrPtArea[i] = 0;
     fHistRhoVSleadJetPt[i] = 0;
     fHistJetPhiEta[i] = 0;
     fHistJetsPtArea[i] = 0;
@@ -61,8 +62,9 @@ AliAnalysisTaskSAJF::AliAnalysisTaskSAJF(const char *name) :
 
   for (Int_t i = 0; i < 4; i++) {
     fHistEvents[i] = 0;
-    fHistLeadingJetPt[i] = 0;
-    fHistLeadingJetCorrPt[i] = 0;
+    fHistLeadingJetPhiEta[i] = 0;
+    fHistLeadingJetPtArea[i] = 0;
+    fHistLeadingJetCorrPtArea[i] = 0;
     fHistRhoVSleadJetPt[i] = 0;
     fHistJetPhiEta[i] = 0;
     fHistJetsPtArea[i] = 0;
@@ -125,20 +127,27 @@ void AliAnalysisTaskSAJF::UserCreateOutputObjects()
     fHistEvents[i]->GetXaxis()->SetBinLabel(5, "OK");
     fOutput->Add(fHistEvents[i]);
 
-    histname = "fHistLeadingJetPt_";
+    histname = "fHistLeadingJetPhiEta_";
     histname += i;
-    fHistLeadingJetPt[i] = new TH1F(histname.Data(), histname.Data(), fNbins, fMinBinPt, fMaxBinPt);
-    fHistLeadingJetPt[i]->GetXaxis()->SetTitle("p_{T}^{raw} (GeV/c)");
-    fHistLeadingJetPt[i]->GetYaxis()->SetTitle("counts");
-    fOutput->Add(fHistLeadingJetPt[i]);
+    fHistLeadingJetPhiEta[i] = new TH2F(histname.Data(), histname.Data(), 50,-1, 1, 101, 0, TMath::Pi() * 2.02);
+    fHistLeadingJetPhiEta[i]->GetXaxis()->SetTitle("#eta");
+    fHistLeadingJetPhiEta[i]->GetYaxis()->SetTitle("#phi");
+    fOutput->Add(fHistLeadingJetPhiEta[i]);
+
+    histname = "fHistLeadingJetPtArea_";
+    histname += i;
+    fHistLeadingJetPtArea[i] = new TH2F(histname.Data(), histname.Data(), fNbins, fMinBinPt, fMaxBinPt, 30, 0, fJetRadius * fJetRadius * TMath::Pi() * 3);
+    fHistLeadingJetPtArea[i]->GetXaxis()->SetTitle("p_{T}^{raw} (GeV/c)");
+    fHistLeadingJetPtArea[i]->GetYaxis()->SetTitle("area");
+    fOutput->Add(fHistLeadingJetPtArea[i]);
 
     if (!fRhoName.IsNull()) {
-      histname = "fHistLeadingJetCorrPt_";
+      histname = "fHistLeadingJetCorrPtArea_";
       histname += i;
-      fHistLeadingJetCorrPt[i] = new TH1F(histname.Data(), histname.Data(), fNbins * 2, -fMaxBinPt, fMaxBinPt);
-      fHistLeadingJetCorrPt[i]->GetXaxis()->SetTitle("p_{T}^{corr} (GeV/c)");
-      fHistLeadingJetCorrPt[i]->GetYaxis()->SetTitle("counts");
-      fOutput->Add(fHistLeadingJetCorrPt[i]);
+      fHistLeadingJetCorrPtArea[i] = new TH2F(histname.Data(), histname.Data(), fNbins * 2, -fMaxBinPt, fMaxBinPt, 30, 0, fJetRadius * fJetRadius * TMath::Pi() * 3);
+      fHistLeadingJetCorrPtArea[i]->GetXaxis()->SetTitle("p_{T}^{corr} (GeV/c)");
+      fHistLeadingJetCorrPtArea[i]->GetYaxis()->SetTitle("area");
+      fOutput->Add(fHistLeadingJetCorrPtArea[i]);
       
       histname = "fHistRhoVSleadJetPt_";
       histname += i;
@@ -317,11 +326,13 @@ Bool_t AliAnalysisTaskSAJF::FillHistograms()
     if (!AcceptJet(jet))
       continue;
 
+    fHistLeadingJetPhiEta[fCentBin]->Fill(jet->Eta(), jet->Phi());
+    fHistLeadingJetPtArea[fCentBin]->Fill(jet->Pt(), jet->Area());
+
     Float_t corrPt = jet->Pt() - fRhoVal * jet->Area();
 
-    if (fHistLeadingJetCorrPt[fCentBin])
-      fHistLeadingJetCorrPt[fCentBin]->Fill(corrPt);
-    fHistLeadingJetPt[fCentBin]->Fill(jet->Pt());
+    if (fHistLeadingJetCorrPtArea[fCentBin])
+      fHistLeadingJetCorrPtArea[fCentBin]->Fill(corrPt, jet->Area());
 
     if (i==0 && fHistRhoVSleadJetPt[fCentBin]) 
       fHistRhoVSleadJetPt[fCentBin]->Fill(fRhoVal, jet->Pt());

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.h
index 5f0abee871ec340203f0e3bc9c91a1abfaef2ccf..3d132c146b2193f6b5be007448d1ff71bfba4c1b 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.h
@@ -28,8 +28,9 @@ class AliAnalysisTaskSAJF : public AliAnalysisTaskEmcalJet {
 
   // General histograms
   TH1F                       *fHistEvents[4];              //!Events accepted/rejected
-  TH1F                       *fHistLeadingJetPt[4];        //!Leading jet pt spectrum
-  TH1F                       *fHistLeadingJetCorrPt[4];    //!Corrected leading jet pt spectrum
+  TH2F                       *fHistLeadingJetPhiEta[4];    //!Leading jet phi-eta
+  TH2F                       *fHistLeadingJetPtArea[4];    //!Leading jet pt spectrum vs. area
+  TH2F                       *fHistLeadingJetCorrPtArea[4];//!Corrected leading jet pt spectrum vs. area
   TH2F                       *fHistRhoVSleadJetPt[4];      //!Area(leadjet) * rho vs. leading jet pt
   TH2F                       *fNjetsVsCent;                //!No. of jets vs. centrality