From: mverweij <marta.verweij@cern.ch>
Date: Wed, 19 Nov 2014 13:27:38 +0000 (+0100)
Subject: hjet mass ana update + bug fix
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=ad3928e348a2eaf6b95550ce2955e90c0e2c3db4

hjet mass ana update + bug fix
---

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalHJetMass.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalHJetMass.cxx
index 571bf4f36dd..eaaed67c6e4 100644
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalHJetMass.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalHJetMass.cxx
@@ -42,6 +42,7 @@ AliAnalysisTaskEmcalHJetMass::AliAnalysisTaskEmcalHJetMass() :
   fJetMassType(kRaw),
   fDPhiHJetMax(0.6),
   fh1PtHadron(0),
+  fh3PtHPtJDPhi(0),
   fh3PtJet1VsMassVsHPtAllSel(0),
   fh3PtJet1VsMassVsHPtTagged(0),
   fh3PtJet1VsMassVsHPtTaggedMatch(0),
@@ -51,7 +52,8 @@ AliAnalysisTaskEmcalHJetMass::AliAnalysisTaskEmcalHJetMass() :
 {
   // Default constructor.
 
-  fh1PtHadron                          = new TH1F*[fNcentBins];
+  fh1PtHadron                       = new TH1F*[fNcentBins];
+  fh3PtHPtJDPhi                     = new TH3F*[fNcentBins];
   fh3PtJet1VsMassVsHPtAllSel        = new TH3F*[fNcentBins];
   fh3PtJet1VsMassVsHPtTagged        = new TH3F*[fNcentBins];
   fh3PtJet1VsMassVsHPtTaggedMatch   = new TH3F*[fNcentBins];
@@ -60,7 +62,8 @@ AliAnalysisTaskEmcalHJetMass::AliAnalysisTaskEmcalHJetMass() :
   fh3PtJet1VsRatVsHPtTaggedMatch    = new TH3F*[fNcentBins];
 
   for (Int_t i = 0; i < fNcentBins; i++) {
-    fh1PtHadron[i]                          = 0;
+    fh1PtHadron[i]                       = 0;
+    fh3PtHPtJDPhi[i]                     = 0;
     fh3PtJet1VsMassVsHPtAllSel[i]        = 0;
     fh3PtJet1VsMassVsHPtTagged[i]        = 0;
     fh3PtJet1VsMassVsHPtTaggedMatch[i]   = 0;
@@ -82,6 +85,7 @@ AliAnalysisTaskEmcalHJetMass::AliAnalysisTaskEmcalHJetMass(const char *name) :
   fJetMassType(kRaw),
   fDPhiHJetMax(0.6),
   fh1PtHadron(0),
+  fh3PtHPtJDPhi(0),
   fh3PtJet1VsMassVsHPtAllSel(0),
   fh3PtJet1VsMassVsHPtTagged(0),
   fh3PtJet1VsMassVsHPtTaggedMatch(0),
@@ -91,7 +95,8 @@ AliAnalysisTaskEmcalHJetMass::AliAnalysisTaskEmcalHJetMass(const char *name) :
 {
   // Standard constructor.
 
-  fh1PtHadron                          = new TH1F*[fNcentBins];
+  fh1PtHadron                       = new TH1F*[fNcentBins];
+  fh3PtHPtJDPhi                     = new TH3F*[fNcentBins];
   fh3PtJet1VsMassVsHPtAllSel        = new TH3F*[fNcentBins];
   fh3PtJet1VsMassVsHPtTagged        = new TH3F*[fNcentBins];
   fh3PtJet1VsMassVsHPtTaggedMatch   = new TH3F*[fNcentBins];
@@ -100,7 +105,8 @@ AliAnalysisTaskEmcalHJetMass::AliAnalysisTaskEmcalHJetMass(const char *name) :
   fh3PtJet1VsRatVsHPtTaggedMatch    = new TH3F*[fNcentBins];
  
   for (Int_t i = 0; i < fNcentBins; i++) {
-    fh1PtHadron[i]                          = 0;
+    fh1PtHadron[i]                       = 0;
+    fh3PtHPtJDPhi[i]                     = 0;
     fh3PtJet1VsMassVsHPtAllSel[i]        = 0;
     fh3PtJet1VsMassVsHPtTagged[i]        = 0;
     fh3PtJet1VsMassVsHPtTaggedMatch[i]   = 0;
@@ -144,6 +150,10 @@ void AliAnalysisTaskEmcalHJetMass::UserCreateOutputObjects()
   const Double_t minPtH = 0.;
   const Double_t maxPtH = 100.;
 
+  const Int_t nBinsPhi  = 18*4;
+  const Double_t minPhi = -0.5*TMath::Pi();
+  const Double_t maxPhi = 1.5*TMath::Pi();
+
   TString histName = "";
   TString histTitle = "";
   for (Int_t i = 0; i < fNcentBins; i++) {
@@ -152,6 +162,11 @@ void AliAnalysisTaskEmcalHJetMass::UserCreateOutputObjects()
     fh1PtHadron[i] = new TH1F(histName.Data(),histTitle.Data(),200.,0.,200.);
     fOutput->Add(fh1PtHadron[i]);
 
+    histName = TString::Format("fh3PtHPtJDPhi_%d",i);
+    histTitle = TString::Format("%s;#it{p}_{T,h};#it{p}_{T,jet};#Delta#varphi_{h,jet}",histName.Data());
+    fh3PtHPtJDPhi[i] = new TH3F(histName.Data(),histTitle.Data(),nBinsPtH,minPtH,maxPtH,nBinsPt,minPt,maxPt,nBinsPhi,minPhi,maxPhi);
+    fOutput->Add(fh3PtHPtJDPhi[i]);
+
     histName = TString::Format("fh3PtJet1VsMassVsHPtAllSel_%d",i);
     histTitle = TString::Format("%s;#it{p}_{T,jet1};#it{M}_{jet1};#it{p}_{T,h}",histName.Data());
     fh3PtJet1VsMassVsHPtAllSel[i] = new TH3F(histName.Data(),histTitle.Data(),nBinsPt,minPt,maxPt,nBinsM,minM,maxM,nBinsPtH,minPtH,maxPtH);
@@ -205,7 +220,8 @@ Bool_t AliAnalysisTaskEmcalHJetMass::Run()
       if(jCont) {
 	jCont->ResetCurrentID();
 	while((jet = jCont->GetNextAcceptJet())) {
-	  Double_t dphi = GetDeltaPhi(vp,jet)+TMath::Pi();
+	  Double_t dphi = GetDeltaPhi(vp,jet)-TMath::Pi();
+	  fh3PtHPtJDPhi[fCentBin]->Fill(vp->Pt(),jet->Pt() - GetRhoVal(fContainerBase)*jet->Area(),dphi);
 	  if(dphi>fDPhiHJetMax) continue;
 	  FillHJetHistograms(vp->Pt(),jet);
 	}
diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalHJetMass.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalHJetMass.h
index 0821e689a4c..1280e074788 100644
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalHJetMass.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalHJetMass.h
@@ -52,6 +52,7 @@ class AliAnalysisTaskEmcalHJetMass : public AliAnalysisTaskEmcalJet {
   Double_t                            fDPhiHJetMax;                // maximum delta phi between hadron and jet
 
   TH1F            **fh1PtHadron;                        //!pt of hadrons
+  TH3F            **fh3PtHPtJDPhi;                      //!pt hadron vs pt jet vs delta phi
   TH3F            **fh3PtJet1VsMassVsHPtAllSel;         //!all jets after std selection pt vs mass vs track pt
   TH3F            **fh3PtJet1VsMassVsHPtTagged;         //!tagged jets pt vs mass vs track pt
   TH3F            **fh3PtJet1VsMassVsHPtTaggedMatch;    //!tagged jets pt vs mass vs track pt matched to MC
@@ -64,7 +65,7 @@ class AliAnalysisTaskEmcalHJetMass : public AliAnalysisTaskEmcalJet {
   AliAnalysisTaskEmcalHJetMass(const AliAnalysisTaskEmcalHJetMass&);            // not implemented
   AliAnalysisTaskEmcalHJetMass &operator=(const AliAnalysisTaskEmcalHJetMass&); // not implemented
 
-  ClassDef(AliAnalysisTaskEmcalHJetMass, 1)
+  ClassDef(AliAnalysisTaskEmcalHJetMass, 2)
 };
 #endif