change binning histos

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetMass.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetMass.cxx
index eeec5c89cb69dd2e37ad9a74c9a0765304c28cc4..639ae40fea4a7a40c34678d9978d1516a16702ab 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetMass.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetMass.cxx
@@ -41,12 +41,9 @@ AliAnalysisTaskEmcalJetMass::AliAnalysisTaskEmcalJetMass() :
   fContainerBase(0),
   fMinFractionShared(0),
   fJetMassType(kRaw),
-  fh2PtJet1VsLeadPtAllSel(0),
-  fh2PtJet1VsLeadPtTagged(0),
-  fh2PtJet1VsLeadPtTaggedMatch(0),
-  fh2PtVsMassJet1All(0),
-  fh2PtVsMassJet1Tagged(0),
-  fh2PtVsMassJet1TaggedMatch(0),
+  fh3PtJet1VsMassVsLeadPtAllSel(0),
+  fh3PtJet1VsMassVsLeadPtTagged(0),
+  fh3PtJet1VsMassVsLeadPtTaggedMatch(0),
   fpPtVsMassJet1All(0),
   fpPtVsMassJet1Tagged(0),
   fpPtVsMassJet1TaggedMatch(0),
@@ -60,40 +57,34 @@ AliAnalysisTaskEmcalJetMass::AliAnalysisTaskEmcalJetMass() :
 {
   // Default constructor.
 
-  fh2PtJet1VsLeadPtAllSel        = new TH2F*[fNcentBins];
-  fh2PtJet1VsLeadPtTagged        = new TH2F*[fNcentBins];
-  fh2PtJet1VsLeadPtTaggedMatch   = new TH2F*[fNcentBins];
-  fh2PtVsMassJet1All             = new TH2F*[fNcentBins];
-  fh2PtVsMassJet1Tagged          = new TH2F*[fNcentBins];
-  fh2PtVsMassJet1TaggedMatch     = new TH2F*[fNcentBins];
-  fpPtVsMassJet1All              = new TProfile*[fNcentBins];
-  fpPtVsMassJet1Tagged           = new TProfile*[fNcentBins];
-  fpPtVsMassJet1TaggedMatch      = new TProfile*[fNcentBins];
-  fh2MassVsAreaJet1All           = new TH2F*[fNcentBins];
-  fh2MassVsAreaJet1Tagged        = new TH2F*[fNcentBins];
-  fh2MassVsAreaJet1TaggedMatch   = new TH2F*[fNcentBins];
-  fh2MassVsNConstJet1All         = new TH2F*[fNcentBins];
-  fh2MassVsNConstJet1Tagged      = new TH2F*[fNcentBins];
-  fh2MassVsNConstJet1TaggedMatch = new TH2F*[fNcentBins];
-  fh2EtMassOverEtRSq             = new TH2F*[fNcentBins];
+  fh3PtJet1VsMassVsLeadPtAllSel        = new TH3F*[fNcentBins];
+  fh3PtJet1VsMassVsLeadPtTagged        = new TH3F*[fNcentBins];
+  fh3PtJet1VsMassVsLeadPtTaggedMatch   = new TH3F*[fNcentBins];
+  fpPtVsMassJet1All                    = new TProfile*[fNcentBins];
+  fpPtVsMassJet1Tagged                 = new TProfile*[fNcentBins];
+  fpPtVsMassJet1TaggedMatch            = new TProfile*[fNcentBins];
+  fh2MassVsAreaJet1All                 = new TH2F*[fNcentBins];
+  fh2MassVsAreaJet1Tagged              = new TH2F*[fNcentBins];
+  fh2MassVsAreaJet1TaggedMatch         = new TH2F*[fNcentBins];
+  fh2MassVsNConstJet1All               = new TH2F*[fNcentBins];
+  fh2MassVsNConstJet1Tagged            = new TH2F*[fNcentBins];
+  fh2MassVsNConstJet1TaggedMatch       = new TH2F*[fNcentBins];
+  fh2EtMassOverEtRSq                   = new TH2F*[fNcentBins];
 
   for (Int_t i = 0; i < fNcentBins; i++) {
-    fh2PtJet1VsLeadPtAllSel[i]        = 0;
-    fh2PtJet1VsLeadPtTagged[i]        = 0;
-    fh2PtJet1VsLeadPtTaggedMatch[i]   = 0;
-    fh2PtVsMassJet1All[i]             = 0;
-    fh2PtVsMassJet1Tagged[i]          = 0;
-    fh2PtVsMassJet1TaggedMatch[i]     = 0;
-    fpPtVsMassJet1All[i]              = 0;
-    fpPtVsMassJet1Tagged[i]           = 0;
-    fpPtVsMassJet1TaggedMatch[i]      = 0;
-    fh2MassVsAreaJet1All[i]           = 0;
-    fh2MassVsAreaJet1Tagged[i]        = 0;
-    fh2MassVsAreaJet1TaggedMatch[i]   = 0;
-    fh2MassVsNConstJet1All[i]         = 0;
-    fh2MassVsNConstJet1Tagged[i]      = 0;
-    fh2MassVsNConstJet1TaggedMatch[i] = 0;
-    fh2EtMassOverEtRSq[i]             = 0;
+    fh3PtJet1VsMassVsLeadPtAllSel[i]        = 0;
+    fh3PtJet1VsMassVsLeadPtTagged[i]        = 0;
+    fh3PtJet1VsMassVsLeadPtTaggedMatch[i]   = 0;
+    fpPtVsMassJet1All[i]                    = 0;
+    fpPtVsMassJet1Tagged[i]                 = 0;
+    fpPtVsMassJet1TaggedMatch[i]            = 0;
+    fh2MassVsAreaJet1All[i]                 = 0;
+    fh2MassVsAreaJet1Tagged[i]              = 0;
+    fh2MassVsAreaJet1TaggedMatch[i]         = 0;
+    fh2MassVsNConstJet1All[i]               = 0;
+    fh2MassVsNConstJet1Tagged[i]            = 0;
+    fh2MassVsNConstJet1TaggedMatch[i]       = 0;
+    fh2EtMassOverEtRSq[i]                   = 0;
   }
 
   SetMakeGeneralHistograms(kTRUE);
@@ -105,12 +96,9 @@ AliAnalysisTaskEmcalJetMass::AliAnalysisTaskEmcalJetMass(const char *name) :
   fContainerBase(0),
   fMinFractionShared(0),
   fJetMassType(kRaw),
-  fh2PtJet1VsLeadPtAllSel(0),
-  fh2PtJet1VsLeadPtTagged(0),
-  fh2PtJet1VsLeadPtTaggedMatch(0),
-  fh2PtVsMassJet1All(0),
-  fh2PtVsMassJet1Tagged(0),
-  fh2PtVsMassJet1TaggedMatch(0),
+  fh3PtJet1VsMassVsLeadPtAllSel(0),
+  fh3PtJet1VsMassVsLeadPtTagged(0),
+  fh3PtJet1VsMassVsLeadPtTaggedMatch(0),
   fpPtVsMassJet1All(0),
   fpPtVsMassJet1Tagged(0),
   fpPtVsMassJet1TaggedMatch(0),
@@ -124,40 +112,34 @@ AliAnalysisTaskEmcalJetMass::AliAnalysisTaskEmcalJetMass(const char *name) :
 {
   // Standard constructor.
 
-  fh2PtJet1VsLeadPtAllSel        = new TH2F*[fNcentBins];
-  fh2PtJet1VsLeadPtTagged        = new TH2F*[fNcentBins];
-  fh2PtJet1VsLeadPtTaggedMatch   = new TH2F*[fNcentBins];
-  fh2PtVsMassJet1All             = new TH2F*[fNcentBins];
-  fh2PtVsMassJet1Tagged          = new TH2F*[fNcentBins];
-  fh2PtVsMassJet1TaggedMatch     = new TH2F*[fNcentBins];
-  fpPtVsMassJet1All              = new TProfile*[fNcentBins];
-  fpPtVsMassJet1Tagged           = new TProfile*[fNcentBins];
-  fpPtVsMassJet1TaggedMatch      = new TProfile*[fNcentBins];
-  fh2MassVsAreaJet1All           = new TH2F*[fNcentBins];
-  fh2MassVsAreaJet1Tagged        = new TH2F*[fNcentBins];
-  fh2MassVsAreaJet1TaggedMatch   = new TH2F*[fNcentBins];
-  fh2MassVsNConstJet1All         = new TH2F*[fNcentBins];
-  fh2MassVsNConstJet1Tagged      = new TH2F*[fNcentBins];
-  fh2MassVsNConstJet1TaggedMatch = new TH2F*[fNcentBins];
-  fh2EtMassOverEtRSq             = new TH2F*[fNcentBins];
+  fh3PtJet1VsMassVsLeadPtAllSel        = new TH3F*[fNcentBins];
+  fh3PtJet1VsMassVsLeadPtTagged        = new TH3F*[fNcentBins];
+  fh3PtJet1VsMassVsLeadPtTaggedMatch   = new TH3F*[fNcentBins];
+  fpPtVsMassJet1All                    = new TProfile*[fNcentBins];
+  fpPtVsMassJet1Tagged                 = new TProfile*[fNcentBins];
+  fpPtVsMassJet1TaggedMatch            = new TProfile*[fNcentBins];
+  fh2MassVsAreaJet1All                 = new TH2F*[fNcentBins];
+  fh2MassVsAreaJet1Tagged              = new TH2F*[fNcentBins];
+  fh2MassVsAreaJet1TaggedMatch         = new TH2F*[fNcentBins];
+  fh2MassVsNConstJet1All               = new TH2F*[fNcentBins];
+  fh2MassVsNConstJet1Tagged            = new TH2F*[fNcentBins];
+  fh2MassVsNConstJet1TaggedMatch       = new TH2F*[fNcentBins];
+  fh2EtMassOverEtRSq                   = new TH2F*[fNcentBins];
 
   for (Int_t i = 0; i < fNcentBins; i++) {
-    fh2PtJet1VsLeadPtAllSel[i]        = 0;
-    fh2PtJet1VsLeadPtTagged[i]        = 0;
-    fh2PtJet1VsLeadPtTaggedMatch[i]   = 0;
-    fh2PtVsMassJet1All[i]             = 0;
-    fh2PtVsMassJet1Tagged[i]          = 0;
-    fh2PtVsMassJet1TaggedMatch[i]     = 0;
-    fpPtVsMassJet1All[i]              = 0;
-    fpPtVsMassJet1Tagged[i]           = 0;
-    fpPtVsMassJet1TaggedMatch[i]      = 0;
-    fh2MassVsAreaJet1All[i]           = 0;
-    fh2MassVsAreaJet1Tagged[i]        = 0;
-    fh2MassVsAreaJet1TaggedMatch[i]   = 0;
-    fh2MassVsNConstJet1All[i]         = 0;
-    fh2MassVsNConstJet1Tagged[i]      = 0;
-    fh2MassVsNConstJet1TaggedMatch[i] = 0;
-    fh2EtMassOverEtRSq[i]             = 0;
+    fh3PtJet1VsMassVsLeadPtAllSel[i]        = 0;
+    fh3PtJet1VsMassVsLeadPtTagged[i]        = 0;
+    fh3PtJet1VsMassVsLeadPtTaggedMatch[i]   = 0;
+    fpPtVsMassJet1All[i]                    = 0;
+    fpPtVsMassJet1Tagged[i]                 = 0;
+    fpPtVsMassJet1TaggedMatch[i]            = 0;
+    fh2MassVsAreaJet1All[i]                 = 0;
+    fh2MassVsAreaJet1Tagged[i]              = 0;
+    fh2MassVsAreaJet1TaggedMatch[i]         = 0;
+    fh2MassVsNConstJet1All[i]               = 0;
+    fh2MassVsNConstJet1Tagged[i]            = 0;
+    fh2MassVsNConstJet1TaggedMatch[i]       = 0;
+    fh2EtMassOverEtRSq[i]                   = 0;
   }
 
   SetMakeGeneralHistograms(kTRUE);
@@ -179,15 +161,15 @@ void AliAnalysisTaskEmcalJetMass::UserCreateOutputObjects()
   Bool_t oldStatus = TH1::AddDirectoryStatus();
   TH1::AddDirectory(kFALSE);
 
-  const Int_t nBinsPt  = 250;
+  const Int_t nBinsPt  = 200;
   const Double_t minPt = -50.;
-  const Double_t maxPt = 200.;
+  const Double_t maxPt = 150.;
 
-  const Int_t nBinsM  = 150;
-  const Double_t minM = -50.;
-  const Double_t maxM = 100.;
+  const Int_t nBinsM  = 100;
+  const Double_t minM = -20.;
+  const Double_t maxM = 80.;
 
-  const Int_t nBinsArea = 100;
+  const Int_t nBinsArea = 50;
   const Double_t minArea = 0.;
   const Double_t maxArea = 1.;
 
@@ -198,49 +180,34 @@ void AliAnalysisTaskEmcalJetMass::UserCreateOutputObjects()
   TString histName = "";
   TString histTitle = "";
   for (Int_t i = 0; i < fNcentBins; i++) {
-    histName = TString::Format("fh2PtJet1VsLeadPtAllSel_%d",i);
-    histTitle = TString::Format("%s;#it{p}_{T,jet1};#it{p}_{T,lead trk}",histName.Data());
-    fh2PtJet1VsLeadPtAllSel[i] = new TH2F(histName.Data(),histTitle.Data(),nBinsPt,minPt,maxPt,20,0.,20.);
-    fOutput->Add(fh2PtJet1VsLeadPtAllSel[i]);
-
-    histName = TString::Format("fh2PtJet1VsLeadPtTagged_%d",i);
-    histTitle = TString::Format("%s;#it{p}_{T,jet1};#it{p}_{T,lead trk}",histName.Data());
-    fh2PtJet1VsLeadPtTagged[i] =  new TH2F(histName.Data(),histTitle.Data(),nBinsPt,minPt,maxPt,20,0.,20.);
-    fOutput->Add(fh2PtJet1VsLeadPtTagged[i]);
-
-    histName = TString::Format("fh2PtJet1VsLeadPtTaggedMatch_%d",i);
-    histTitle = TString::Format("%s;#it{p}_{T,jet1};#it{p}_{T,lead trk}",histName.Data());
-    fh2PtJet1VsLeadPtTaggedMatch[i] =  new TH2F(histName.Data(),histTitle.Data(),nBinsPt,minPt,maxPt,20,0.,20.);
-    fOutput->Add(fh2PtJet1VsLeadPtTaggedMatch[i]);
-
-    histName = TString::Format("fh2PtVsMassJet1All_%d",i);
-    histTitle = TString::Format("%s;#it{p}_{T,jet1};#it{M}_{jet1}",histName.Data());
-    fh2PtVsMassJet1All[i] = new TH2F(histName.Data(),histTitle.Data(),nBinsPt,minPt,maxPt,nBinsM,minM,maxM);
-    fOutput->Add(fh2PtVsMassJet1All[i]);
-
-    histName = TString::Format("fh2PtVsMassJet1Tagged_%d",i);
-    histTitle = TString::Format("%s;#it{p}_{T,jet1};#it{M}_{jet1}",histName.Data());
-    fh2PtVsMassJet1Tagged[i] = new TH2F(histName.Data(),histTitle.Data(),nBinsPt,minPt,maxPt,nBinsM,minM,maxM);
-    fOutput->Add(fh2PtVsMassJet1Tagged[i]);
-
-    histName = TString::Format("fh2PtVsMassJet1TaggedMatch_%d",i);
-    histTitle = TString::Format("%s;#it{p}_{T,jet1};#it{M}_{jet1}",histName.Data());
-    fh2PtVsMassJet1TaggedMatch[i] = new TH2F(histName.Data(),histTitle.Data(),nBinsPt,minPt,maxPt,nBinsM,minM,maxM);
-    fOutput->Add(fh2PtVsMassJet1TaggedMatch[i]);
+    histName = TString::Format("fh3PtJet1VsMassVsLeadPtAllSel_%d",i);
+    histTitle = TString::Format("%s;#it{p}_{T,jet1};#it{M}_{jet1};#it{p}_{T,lead trk}",histName.Data());
+    fh3PtJet1VsMassVsLeadPtAllSel[i] = new TH3F(histName.Data(),histTitle.Data(),nBinsPt,minPt,maxPt,nBinsM,minM,maxM,20,0.,20.);
+    fOutput->Add(fh3PtJet1VsMassVsLeadPtAllSel[i]);
+
+    histName = TString::Format("fh3PtJet1VsMassVsLeadPtTagged_%d",i);
+    histTitle = TString::Format("%s;#it{p}_{T,jet1};#it{M}_{jet1};#it{p}_{T,lead trk}",histName.Data());
+    fh3PtJet1VsMassVsLeadPtTagged[i] =  new TH3F(histName.Data(),histTitle.Data(),nBinsPt,minPt,maxPt,nBinsM,minM,maxM,20,0.,20.);
+    fOutput->Add(fh3PtJet1VsMassVsLeadPtTagged[i]);
+
+    histName = TString::Format("fh3PtJet1VsMassVsLeadPtTaggedMatch_%d",i);
+    histTitle = TString::Format("%s;#it{p}_{T,jet1};#it{M}_{jet1};#it{p}_{T,lead trk}",histName.Data());
+    fh3PtJet1VsMassVsLeadPtTaggedMatch[i] =  new TH3F(histName.Data(),histTitle.Data(),nBinsPt,minPt,maxPt,nBinsM,minM,maxM,20,0.,20.);
+    fOutput->Add(fh3PtJet1VsMassVsLeadPtTaggedMatch[i]);
 
     histName = TString::Format("fpPtVsMassJet1All_%d",i);
     histTitle = TString::Format("%s;#it{p}_{T,jet1};Avg #it{M}_{jet1}",histName.Data());
-    fpPtVsMassJet1All[i] = new TProfile(histName.Data(),histTitle.Data(),nBinsM,minM,maxM);
+    fpPtVsMassJet1All[i] = new TProfile(histName.Data(),histTitle.Data(),nBinsPt,minPt,maxPt);
     fOutput->Add(fpPtVsMassJet1All[i]);
 
     histName = TString::Format("fpPtVsMassJet1Tagged_%d",i);
     histTitle = TString::Format("%s;#it{p}_{T,jet1};Avg #it{M}_{jet1}",histName.Data());
-    fpPtVsMassJet1Tagged[i] = new TProfile(histName.Data(),histTitle.Data(),nBinsM,minM,maxM);
+    fpPtVsMassJet1Tagged[i] = new TProfile(histName.Data(),histTitle.Data(),nBinsPt,minPt,maxPt);
     fOutput->Add(fpPtVsMassJet1Tagged[i]);
 
     histName = TString::Format("fpPtVsMassJet1TaggedMatch_%d",i);
     histTitle = TString::Format("%s;#it{p}_{T,jet1};Avg #it{M}_{jet1}",histName.Data());
-    fpPtVsMassJet1TaggedMatch[i] = new TProfile(histName.Data(),histTitle.Data(),nBinsM,minM,maxM);
+    fpPtVsMassJet1TaggedMatch[i] = new TProfile(histName.Data(),histTitle.Data(),nBinsPt,minPt,maxPt);
     fOutput->Add(fpPtVsMassJet1TaggedMatch[i]);
 
     histName = TString::Format("fh2MassVsAreaJet1All_%d",i);
@@ -316,8 +283,7 @@ Bool_t AliAnalysisTaskEmcalJetMass::FillHistograms()
 
       Double_t ptJet1 = jet1->Pt() - GetRhoVal(fContainerBase)*jet1->Area();
       Double_t mJet1 = GetJetMass(jet1);
-      fh2PtJet1VsLeadPtAllSel[fCentBin]->Fill(ptJet1,jet1->MaxTrackPt());
-      fh2PtVsMassJet1All[fCentBin]->Fill(ptJet1,mJet1);
+      fh3PtJet1VsMassVsLeadPtAllSel[fCentBin]->Fill(ptJet1,mJet1,jet1->MaxTrackPt());
       fpPtVsMassJet1All[fCentBin]->Fill(ptJet1,mJet1);
       fh2MassVsAreaJet1All[fCentBin]->Fill(mJet1,jet1->Area());
       fh2MassVsNConstJet1All[fCentBin]->Fill(mJet1,jet1->GetNumberOfConstituents());
@@ -325,26 +291,24 @@ Bool_t AliAnalysisTaskEmcalJetMass::FillHistograms()
       if(jet1->GetTagStatus()<1 || !jet1->GetTaggedJet())
        continue;
 
-      fh2PtJet1VsLeadPtTagged[fCentBin]->Fill(ptJet1,jet1->MaxTrackPt());
-      fh2PtVsMassJet1Tagged[fCentBin]->Fill(ptJet1,mJet1);
+      fh3PtJet1VsMassVsLeadPtTagged[fCentBin]->Fill(ptJet1,mJet1,jet1->MaxTrackPt());
       fpPtVsMassJet1Tagged[fCentBin]->Fill(ptJet1,mJet1);
       fh2MassVsAreaJet1Tagged[fCentBin]->Fill(mJet1,jet1->Area());
       fh2MassVsNConstJet1Tagged[fCentBin]->Fill(mJet1,jet1->GetNumberOfConstituents());
 
       Double_t fraction = jetCont->GetFractionSharedPt(jet1);
       if(fMinFractionShared>0. && fraction>fMinFractionShared) {
-       fh2PtJet1VsLeadPtTaggedMatch[fCentBin]->Fill(ptJet1,jet1->MaxTrackPt());
-       fh2PtVsMassJet1TaggedMatch[fCentBin]->Fill(ptJet1,mJet1);
+       fh3PtJet1VsMassVsLeadPtTaggedMatch[fCentBin]->Fill(ptJet1,mJet1,jet1->MaxTrackPt());
        fpPtVsMassJet1TaggedMatch[fCentBin]->Fill(ptJet1,mJet1);
        fh2MassVsAreaJet1TaggedMatch[fCentBin]->Fill(mJet1,jet1->Area());
        fh2MassVsNConstJet1TaggedMatch[fCentBin]->Fill(mJet1,jet1->GetNumberOfConstituents());
       }
       
-      Double_t Et2 = jet1->M()*jet1->M() + jet1->Pt()*jet1->Pt();
+      Double_t Et2 = mJet1*mJet1 + ptJet1*ptJet1;
       Double_t Et = 0.;    Double_t massOverEtR = 0.;
       if(Et2>0.) Et = TMath::Sqrt(Et2);
       if((Et*jetCont->GetJetRadius())>0.) 
-       massOverEtR = jet1->M()/(Et*jetCont->GetJetRadius());
+       massOverEtR = mJet1/(Et*jetCont->GetJetRadius());
       fh2EtMassOverEtRSq[fCentBin]->Fill(Et,massOverEtR*massOverEtR);
     }
   }
@@ -368,12 +332,10 @@ Bool_t AliAnalysisTaskEmcalJetMass::RetrieveEventObjects() {
   //
   // retrieve event objects
   //
-
   if (!AliAnalysisTaskEmcalJet::RetrieveEventObjects())
     return kFALSE;
 
   return kTRUE;
-
 }
 
 //_______________________________________________________________________

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetMass.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetMass.h
index ec481540490b99571887fd060c37298c3b061a7e..f100393a3c02ecef72dd2f7b1b23e881568e42a7 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetMass.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetMass.h
@@ -43,12 +43,9 @@ class AliAnalysisTaskEmcalJetMass : public AliAnalysisTaskEmcalJet {
   Double_t                            fMinFractionShared;          // only fill histos for jets if shared fraction larger than X
   JetMassType                         fJetMassType;                // jet mass type to be used
 
-  TH2F            **fh2PtJet1VsLeadPtAllSel;         //!all jets after std selection vs leading track pt
-  TH2F            **fh2PtJet1VsLeadPtTagged;         //!tagged jets vs leading track pt
-  TH2F            **fh2PtJet1VsLeadPtTaggedMatch;    //!tagged jets vs leading track pt matched to MC
-  TH2F            **fh2PtVsMassJet1All;              //!pT vs mass of all jets
-  TH2F            **fh2PtVsMassJet1Tagged;           //!pT vs mass of tagged jets
-  TH2F            **fh2PtVsMassJet1TaggedMatch;      //!pT vs mass of tagged jets matched to MC
+  TH3F            **fh3PtJet1VsMassVsLeadPtAllSel;         //!all jets after std selection pt vs mass vs leading track pt
+  TH3F            **fh3PtJet1VsMassVsLeadPtTagged;         //!tagged jets pt vs mass vs leading track pt
+  TH3F            **fh3PtJet1VsMassVsLeadPtTaggedMatch;    //!tagged jets pt vs mass vs leading track pt matched to MC
   TProfile        **fpPtVsMassJet1All;               //!pT vs avg mass of all jets
   TProfile        **fpPtVsMassJet1Tagged;            //!pT vs avg mass of tagged jets
   TProfile        **fpPtVsMassJet1TaggedMatch;       //!pT vs avg mass of tagged jets matched to MC
@@ -64,7 +61,7 @@ class AliAnalysisTaskEmcalJetMass : public AliAnalysisTaskEmcalJet {
   AliAnalysisTaskEmcalJetMass(const AliAnalysisTaskEmcalJetMass&);            // not implemented
   AliAnalysisTaskEmcalJetMass &operator=(const AliAnalysisTaskEmcalJetMass&); // not implemented
 
-  ClassDef(AliAnalysisTaskEmcalJetMass, 5)
+  ClassDef(AliAnalysisTaskEmcalJetMass, 6)
 };
 #endif
 

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.cxx
index 3fb881ec20e3d0b130ac39ac946cee04b47306c9..bae29fe2e5f82cbfc2652550e4703742da1d4c32 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.cxx
@@ -87,7 +87,7 @@ AliAnalysisTaskJetShapeConst::AliAnalysisTaskJetShapeConst() :
   }
 
   SetMakeGeneralHistograms(kTRUE);
-  DefineOutput(2, TTree::Class());
+  if(fCreateTree) DefineOutput(2, TTree::Class());
 }
 
 //________________________________________________________________________
@@ -141,7 +141,7 @@ AliAnalysisTaskJetShapeConst::AliAnalysisTaskJetShapeConst(const char *name) :
   }
 
   SetMakeGeneralHistograms(kTRUE);
-  DefineOutput(2, TTree::Class());
+  if(fCreateTree) DefineOutput(2, TTree::Class());
 }
 
 //________________________________________________________________________
@@ -164,9 +164,9 @@ void AliAnalysisTaskJetShapeConst::UserCreateOutputObjects()
   const Double_t minPt = -50.;
   const Double_t maxPt = 150.;
 
-  const Int_t nBinsM  = 150;
-  const Double_t minM = -50.;
-  const Double_t maxM = 100.;
+  const Int_t nBinsM  = 100;
+  const Double_t minM = -20.;
+  const Double_t maxM = 80.;
 
   const Int_t nBinsMT  = 50;
   const Double_t minMT = 0.;

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.cxx
index 98eb2dcef99f29d93a97d03af6c59954fe3a91c4..aa9b0969f2ccf24e30cd9a38cd1f95548e0df88d 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.cxx
@@ -113,7 +113,7 @@ AliAnalysisTaskJetShapeDeriv::AliAnalysisTaskJetShapeDeriv() :
   }
 
   SetMakeGeneralHistograms(kTRUE);
-  DefineOutput(2, TTree::Class());
+  if(fCreateTree) DefineOutput(2, TTree::Class());
 }
 
 //________________________________________________________________________
@@ -193,7 +193,7 @@ AliAnalysisTaskJetShapeDeriv::AliAnalysisTaskJetShapeDeriv(const char *name) :
   }
 
   SetMakeGeneralHistograms(kTRUE);
-  DefineOutput(2, TTree::Class());
+  if(fCreateTree) DefineOutput(2, TTree::Class());
 }
 
 //________________________________________________________________________
@@ -216,9 +216,9 @@ void AliAnalysisTaskJetShapeDeriv::UserCreateOutputObjects()
   const Double_t minPt = -50.;
   const Double_t maxPt = 150.;
 
-  const Int_t nBinsM  = 150;
-  const Double_t minM = -50.;
-  const Double_t maxM = 100.;
+  const Int_t nBinsM  = 100;
+  const Double_t minM = -20.;
+  const Double_t maxM = 80.;
 
   const Int_t nBinsMT  = 50;
   const Double_t minMT = 0.;

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoMassBase.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoMassBase.cxx
index 6c8c33012972734068171f622640660dca22373f..a4b0b45e8e1ea34e64ccac47c1f838af80da84cd 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoMassBase.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoMassBase.cxx
@@ -33,7 +33,6 @@ AliAnalysisTaskRhoMassBase::AliAnalysisTaskRhoMassBase() :
   fCompareRhoMass(0),
   fCompareRhoMassScaled(0),
   fHistJetMassvsCent(0),
-  fHistJetRhoMassvsCent(0),
   fHistRhoMassvsCent(0),
   fHistRhoMassScaledvsCent(0),
   fHistDeltaRhoMassvsCent(0),
@@ -47,9 +46,6 @@ AliAnalysisTaskRhoMassBase::AliAnalysisTaskRhoMassBase() :
   fHistGammaVsNtrack(0)
 {
   // Constructor.
-
-  for (Int_t i = 0; i < 4; i++)
-    fHistJetRhoMassvsEta[i] = 0;
 }
 
 //________________________________________________________________________
@@ -67,7 +63,6 @@ AliAnalysisTaskRhoMassBase::AliAnalysisTaskRhoMassBase(const char *name, Bool_t
   fCompareRhoMass(0),
   fCompareRhoMassScaled(0),
   fHistJetMassvsCent(0),
-  fHistJetRhoMassvsCent(0),
   fHistRhoMassvsCent(0),
   fHistRhoMassScaledvsCent(0),
   fHistDeltaRhoMassvsCent(0),
@@ -82,9 +77,6 @@ AliAnalysisTaskRhoMassBase::AliAnalysisTaskRhoMassBase(const char *name, Bool_t
 {
   // Constructor.
 
-  for (Int_t i = 0; i < 4; i++)
-    fHistJetRhoMassvsEta[i] = 0;
-
   SetMakeGeneralHistograms(histo);
 }
 
@@ -98,13 +90,21 @@ void AliAnalysisTaskRhoMassBase::UserCreateOutputObjects()
 
   AliAnalysisTaskEmcalJet::UserCreateOutputObjects();
 
-  fHistRhoMassvsCent = new TH2F("fHistRhoMassvsCent", "fHistRhoMassvsCent", 101, -1,  100, fNbins, fMinBinPt, fMaxBinPt/2.);
+  const Int_t nBinsRhom = 200;
+  const Double_t minRhom = 0.;
+  const Double_t maxRhom = 20.;
+
+  const Int_t nBinsM  = 100;
+  const Double_t minM = -20.;
+  const Double_t maxM = 80.;
+
+  fHistRhoMassvsCent = new TH2F("fHistRhoMassvsCent", "fHistRhoMassvsCent", 101, -1,  100, nBinsRhom,minRhom,maxRhom);
   fHistRhoMassvsCent->GetXaxis()->SetTitle("Centrality (%)");
   fHistRhoMassvsCent->GetYaxis()->SetTitle("#rho_{m} (GeV/c * rad^{-1})");
   fOutput->Add(fHistRhoMassvsCent);
 
   if (fParticleCollArray.GetEntriesFast()>0) {
-    fHistRhoMassvsNtrack = new TH2F("fHistRhoMassvsNtrack", "fHistRhoMassvsNtrack", 150, 0, 6000, fNbins, fMinBinPt, fMaxBinPt/2);
+    fHistRhoMassvsNtrack = new TH2F("fHistRhoMassvsNtrack", "fHistRhoMassvsNtrack", 150, 0, 6000, nBinsRhom,minRhom,maxRhom);
     fHistRhoMassvsNtrack->GetXaxis()->SetTitle("No. of tracks");
     fHistRhoMassvsNtrack->GetYaxis()->SetTitle("#rho_{m} (GeV/c * rad^{-1})");
     fOutput->Add(fHistRhoMassvsNtrack);
@@ -117,32 +117,17 @@ void AliAnalysisTaskRhoMassBase::UserCreateOutputObjects()
   }
 
   if (fClusterCollArray.GetEntriesFast()>0) {
-    fHistRhoMassvsNcluster = new TH2F("fHistRhoMassvsNcluster", "fHistRhoMassvsNcluster", 50, 0, 1500, fNbins, fMinBinPt, fMaxBinPt/2);
+    fHistRhoMassvsNcluster = new TH2F("fHistRhoMassvsNcluster", "fHistRhoMassvsNcluster", 50, 0, 1500, nBinsRhom,minRhom,maxRhom);
     fHistRhoMassvsNcluster->GetXaxis()->SetTitle("No. of tracks");
     fHistRhoMassvsNcluster->GetYaxis()->SetTitle("#rho_{m} (GeV/c * rad^{-1})");
     fOutput->Add(fHistRhoMassvsNcluster);
   }
 
   if (fJetCollArray.GetEntriesFast()>0) {
-    fHistJetMassvsCent = new TH2F("fHistJetMassvsCent", "fHistJetMassvsCent", 101, -1,  100, fNbins, fMinBinPt, fMaxBinPt);
+    fHistJetMassvsCent = new TH2F("fHistJetMassvsCent", "fHistJetMassvsCent", 101, -1,  100, nBinsM,minM,maxM);
     fHistJetMassvsCent->GetXaxis()->SetTitle("Centrality (%)");
     fHistJetMassvsCent->GetYaxis()->SetTitle("#it{M}_{jet} (GeV/c)");
     fOutput->Add(fHistJetMassvsCent);
-
-    fHistJetRhoMassvsCent = new TH2F("fHistJetRhoMassvsCent", "fHistJetRhoMassvsCent", 101, -1, 100, fNbins, fMinBinPt, fMaxBinPt*2);
-    fHistJetRhoMassvsCent->GetXaxis()->SetTitle("Centrality (%)");
-    fHistJetRhoMassvsCent->GetYaxis()->SetTitle("Jet #rho_{m} (GeV/c)");
-    fOutput->Add(fHistJetRhoMassvsCent);
-
- 
-    TString name;
-    for (Int_t i = 0; i < 4; i++) {
-      name = Form("fHistJetRhoMassvsEta_%d",i);
-      fHistJetRhoMassvsEta[i] = new TH2F(name, name, fNbins, fMinBinPt, fMaxBinPt*2, 16, -0.8, 0.8);
-      fHistJetRhoMassvsEta[i]->GetXaxis()->SetTitle("#rho_{m} (GeV/c)");
-      fHistJetRhoMassvsEta[i]->GetYaxis()->SetTitle("#eta");
-      fOutput->Add(fHistJetRhoMassvsEta[i]);
-    }
   }
   
   if (!fCompareRhoMassName.IsNull()) {
@@ -239,9 +224,6 @@ Bool_t AliAnalysisTaskRhoMassBase::FillHistograms()
        continue;
       
       fHistJetMassvsCent->Fill(fCent, jet->M());
-      fHistJetRhoMassvsCent->Fill(fCent, jet->M() / jet->Area());
-      fHistJetRhoMassvsEta[fCentBin]->Fill(jet->M() / jet->Area(), jet->Eta());
-
       NjetAcc++;
     }
   }

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoMassBase.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoMassBase.h
index 4fcdfaf75b6c45b7c9b50e6a66773bdee5d16c40..eebc9de312c74c87dc0b56b2061a19e4b93547e9 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoMassBase.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoMassBase.h
@@ -52,8 +52,6 @@ class AliAnalysisTaskRhoMassBase : public AliAnalysisTaskEmcalJet {
   AliRhoParameter       *fCompareRhoMassScaled;          //!scaled rho object to compare
 
   TH2F                  *fHistJetMassvsCent;             //!jet mass vs. centrality
-  TH2F                  *fHistJetRhoMassvsCent;          //!jet mass/area vs. centrality
-  TH2F                  *fHistJetRhoMassvsEta[4];        //!rho mass vs. eta
   TH2F                  *fHistRhoMassvsCent;             //!rho mass vs. centrality
   TH2F                  *fHistRhoMassScaledvsCent;       //!rho mass scaled vs. centrality
   TH2F                  *fHistDeltaRhoMassvsCent;        //!delta rho mass vs. centrality
@@ -72,6 +70,6 @@ class AliAnalysisTaskRhoMassBase : public AliAnalysisTaskEmcalJet {
   AliAnalysisTaskRhoMassBase(const AliAnalysisTaskRhoMassBase&);             // not implemented
   AliAnalysisTaskRhoMassBase& operator=(const AliAnalysisTaskRhoMassBase&);  // not implemented
   
-  ClassDef(AliAnalysisTaskRhoMassBase, 1); // Rho mass base task
+  ClassDef(AliAnalysisTaskRhoMassBase, 2); // Rho mass base task
 };
 #endif

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskJetShapeConst.C b/PWGJE/EMCALJetTasks/macros/AddTaskJetShapeConst.C
index 619bd4c5c86776d26778deed6ef65c3113bef68d..7b73c651ef8a745880c1a0691ae84d58bb90649b 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskJetShapeConst.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskJetShapeConst.C
@@ -10,7 +10,8 @@ AliAnalysisTaskJetShapeConst *AddTaskJetShapeConst(const char * njetsBase,
                                                   Int_t        pSel           = AliVEvent::kAny,
                                                   TString      trigClass      = "",
                                                   TString      kEmcalTriggers = "",
-                                                  TString      tag            = "MCMatch")
+                                                  TString      tag            = "MCMatch",
+                                                  Bool_t       bCreateTree    = kFALSE)
 {
 
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
@@ -66,6 +67,7 @@ AliAnalysisTaskJetShapeConst *AddTaskJetShapeConst(const char * njetsBase,
   task->SetCentralityEstimator(CentEst);
   task->SelectCollisionCandidates(pSel);
   task->SetUseAliAnaUtils(kFALSE);
+  task->SetCreateTree(bCreateTree);
 
   //Connnect input
   mgr->ConnectInput (task, 0, mgr->GetCommonInputContainer() );
@@ -75,11 +77,10 @@ AliAnalysisTaskJetShapeConst *AddTaskJetShapeConst(const char * njetsBase,
   TString outputfile = Form("%s",AliAnalysisManager::GetCommonFileName());
   AliAnalysisDataContainer *coutput1 = mgr->CreateContainer(contName.Data(), TList::Class(),AliAnalysisManager::kOutputContainer,outputfile);
   mgr->ConnectOutput(task,1,coutput1);
-  AliAnalysisDataContainer *coutput2 = mgr->CreateContainer(Form("%sTree",contName.Data()), TTree::Class(),AliAnalysisManager::kOutputContainer,outputfile);
-  mgr->ConnectOutput(task,2,coutput2);
+  if(bCreateTree) {
+    AliAnalysisDataContainer *coutput2 = mgr->CreateContainer(Form("%sTree",contName.Data()), TTree::Class(),AliAnalysisManager::kOutputContainer,outputfile);
+    mgr->ConnectOutput(task,2,coutput2);
+  }
 
   return task;
-
-
-
 }

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskJetShapeDeriv.C b/PWGJE/EMCALJetTasks/macros/AddTaskJetShapeDeriv.C
index 9eebbffa9daaeef37b2a2a34c1e03b9ede589dcc..e451fd8ef2b21f73f43f4396550431ceb6baa35e 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskJetShapeDeriv.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskJetShapeDeriv.C
@@ -9,7 +9,8 @@ AliAnalysisTaskJetShapeDeriv *AddTaskJetShapeDeriv(const char * njetsBase,
                                                   Int_t        pSel           = AliVEvent::kAny,
                                                   TString      trigClass      = "",
                                                   TString      kEmcalTriggers = "",
-                                                  TString      tag            = "MCMatch")
+                                                  TString      tag            = "MCMatch",
+                                                  Bool_t       bCreateTree    = kFALSE)
 {
 
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
@@ -56,6 +57,7 @@ AliAnalysisTaskJetShapeDeriv *AddTaskJetShapeDeriv(const char * njetsBase,
   task->SetCentralityEstimator(CentEst);
   task->SelectCollisionCandidates(pSel);
   task->SetUseAliAnaUtils(kFALSE);
+  task->SetCreateTree(bCreateTree);
 
   //Connnect input
   mgr->ConnectInput (task, 0, mgr->GetCommonInputContainer() );
@@ -65,11 +67,10 @@ AliAnalysisTaskJetShapeDeriv *AddTaskJetShapeDeriv(const char * njetsBase,
   TString outputfile = Form("%s",AliAnalysisManager::GetCommonFileName());
   AliAnalysisDataContainer *coutput1 = mgr->CreateContainer(contName.Data(), TList::Class(),AliAnalysisManager::kOutputContainer,outputfile);
   mgr->ConnectOutput(task,1,coutput1);
-  AliAnalysisDataContainer *coutput2 = mgr->CreateContainer(Form("%sTree",contName.Data()), TTree::Class(),AliAnalysisManager::kOutputContainer,outputfile);
-  mgr->ConnectOutput(task,2,coutput2);
+  if(bCreateTree) {
+    AliAnalysisDataContainer *coutput2 = mgr->CreateContainer(Form("%sTree",contName.Data()), TTree::Class(),AliAnalysisManager::kOutputContainer,outputfile);
+    mgr->ConnectOutput(task,2,coutput2);
+  }
 
   return task;
-
-
-
 }