]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
From Salvatore
authorloizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 13 Sep 2012 10:37:42 +0000 (10:37 +0000)
committerloizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 13 Sep 2012 10:37:42 +0000 (10:37 +0000)
- Updates for add task macros to make lego train conf easier
- Removed some includes not needed
- Added new histograms to spectra and rho tasks
- Other minor fixes

15 files changed:
PWG/EMCAL/AliAnalysisTaskEmcal.cxx
PWGJE/EMCALJetTasks/AliAnalysisTaskDeltaPt.cxx
PWGJE/EMCALJetTasks/AliAnalysisTaskRhoBase.cxx
PWGJE/EMCALJetTasks/AliAnalysisTaskRhoBase.h
PWGJE/EMCALJetTasks/AliEmcalJet.h
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.cxx
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.h
PWGJE/EMCALJetTasks/macros/AddTaskDeltaPt.C
PWGJE/EMCALJetTasks/macros/AddTaskJetRespPtHard.C
PWGJE/EMCALJetTasks/macros/AddTaskJetResponseMaker.C
PWGJE/EMCALJetTasks/macros/AddTaskRho.C
PWGJE/EMCALJetTasks/macros/AddTaskRhoAverage.C
PWGJE/EMCALJetTasks/macros/AddTaskRhoBase.C
PWGJE/EMCALJetTasks/macros/AddTaskSAJF.C
PWGJE/EMCALJetTasks/macros/AddTaskSAQA.C

index 5bd0583e30a0364cd7659127270ab2cd054bf7d7..8feab085656ad505bf1185d6c1bed5625aaeffc7 100644 (file)
@@ -6,7 +6,6 @@
 
 #include "AliAnalysisTaskEmcal.h"
 
-#include <TChain.h>
 #include <TClonesArray.h>
 #include <TList.h>
 #include <TObject.h>
index 86c8a749e58d280b08075aebd68354177c451a3a..0b60acaeb39fe8bbc1d558bbb978943d4f2cea1b 100644 (file)
@@ -4,23 +4,17 @@
 //
 // Author: S.Aiola
 
-#include <TObject.h>
-#include <TChain.h>
 #include <TClonesArray.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TList.h>
 #include <TLorentzVector.h>
 #include <TRandom3.h>
-#include <TParameter.h>
 
-#include "AliAnalysisManager.h"
-#include "AliCentrality.h"
 #include "AliVCluster.h"
 #include "AliVParticle.h"
 #include "AliVTrack.h"
 #include "AliEmcalJet.h"
-#include "AliVEventHandler.h"
 #include "AliRhoParameter.h"
 #include "AliLog.h"
 
@@ -328,7 +322,7 @@ Bool_t AliAnalysisTaskDeltaPt::FillHistograms()
   // Embedding
   // _________________________________
 
-  if (!fJets)
+  if (!fEmbJets)
     return kTRUE;
 
   AliEmcalJet *embJet  = 0;
index 2fe8f4b8b865041e1540182e268bc8ade50be622..969706deb98e6e320d30944add91c83d60dcfbbc 100644 (file)
@@ -10,7 +10,6 @@
 #include <TH2F.h>
 #include <TClonesArray.h>
 
-#include "AliAnalysisManager.h"
 #include "AliLog.h"
 #include "AliRhoParameter.h"
 #include "AliEmcalJet.h"
@@ -27,7 +26,7 @@ AliAnalysisTaskRhoBase::AliAnalysisTaskRhoBase() :
   fCompareRhoScaledName(),
   fRhoFunction(0),
   fScaleFunction(0),
-  fInEventSigmaRho(71.66),
+  fInEventSigmaRho(35.83),
   fRhoScaled(0),
   fCompareRho(0),
   fCompareRhoScaled(0),
@@ -49,8 +48,11 @@ AliAnalysisTaskRhoBase::AliAnalysisTaskRhoBase() :
   fHistRhoScaledvsNcluster(0)
 {
   // Constructor.
+
   for (Int_t i = 0; i < 4; i++) {
-    fHistNjUEvsNj[i] = 0;
+    fHistJetNconstVsPt[i] = 0;
+  }
+  for (Int_t i = 0; i < 12; i++) {
     fHistNjUEoverNjVsNj[i] = 0;
   }
 }
@@ -63,7 +65,7 @@ AliAnalysisTaskRhoBase::AliAnalysisTaskRhoBase(const char *name, Bool_t histo) :
   fCompareRhoScaledName(),
   fRhoFunction(0),
   fScaleFunction(0),
-  fInEventSigmaRho(71.66),
+  fInEventSigmaRho(35.83),
   fRhoScaled(0),
   fCompareRho(0),
   fCompareRhoScaled(0),
@@ -87,7 +89,9 @@ AliAnalysisTaskRhoBase::AliAnalysisTaskRhoBase(const char *name, Bool_t histo) :
   // Constructor.
 
   for (Int_t i = 0; i < 4; i++) {
-    fHistNjUEvsNj[i] = 0;
+    fHistJetNconstVsPt[i] = 0;
+  }
+  for (Int_t i = 0; i < 12; i++) {
     fHistNjUEoverNjVsNj[i] = 0;
   }
 
@@ -136,18 +140,22 @@ void AliAnalysisTaskRhoBase::UserCreateOutputObjects()
       fOutput->Add(fHistNjetvsNtrack);
     }
 
+
+    TString name;
     for (Int_t i = 0; i < 4; i++) {
-      TString name1(Form("NjUEvsNj_%d",i));
-      fHistNjUEvsNj[i] = new TH2F(name1, name1, 150, -0.5, 149.5, 150, -0.5, 149.5);
-      fHistNjUEvsNj[i]->GetXaxis()->SetTitle("N_{jet}");
-      fHistNjUEvsNj[i]->GetYaxis()->SetTitle("N_{jet_{UE}}");
-      fOutput->Add(fHistNjUEvsNj[i]);
-
-      TString name2(Form("NjUEoverNjVsNj_%d",i));
-      fHistNjUEoverNjVsNj[i] = new TH2F(name2, name2, 150, -0.5, 149.5, 120, -0.01, 1.19);
-      fHistNjUEoverNjVsNj[i]->GetXaxis()->SetTitle("N_{jet_{UE}} / N_{jet}");
-      fHistNjUEoverNjVsNj[i]->GetYaxis()->SetTitle("N_{jet}");
-      fOutput->Add(fHistNjUEoverNjVsNj[i]);
+      name = Form("fHistJetNconstVsPt_%d",i);
+      fHistJetNconstVsPt[i] = new TH2F(name, name, 150, -0.5, 149.5, fNbins, fMinBinPt, fMaxBinPt);
+      fHistJetNconstVsPt[i]->GetXaxis()->SetTitle("# of constituents");
+      fHistJetNconstVsPt[i]->GetYaxis()->SetTitle("p_{T,jet} (GeV/c)");
+      fOutput->Add(fHistJetNconstVsPt[i]);
+
+      for (Int_t j = 0; j < 3; j++) {
+       name = Form("NjUEoverNjVsNj_%d_%d",i,j+1);
+       fHistNjUEoverNjVsNj[i*3+j] = new TH2F(name, name, 150, -0.5, 149.5, 120, 0.01, 1.21);
+       fHistNjUEoverNjVsNj[i*3+j]->GetXaxis()->SetTitle("N_{jet}");
+       fHistNjUEoverNjVsNj[i*3+j]->GetYaxis()->SetTitle("N_{jet_{UE}} / N_{jet}");
+       fOutput->Add(fHistNjUEoverNjVsNj[i*3+j]);
+      }
     }
   }
   
@@ -216,10 +224,14 @@ Bool_t AliAnalysisTaskRhoBase::FillHistograms()
     Nclusters = fCaloClusters->GetEntriesFast();
 
   if (fJets) {
-    Int_t Njets    = fJets->GetEntries();
-    Int_t NjetAcc  = 0;
-    Int_t NjetUE   = 0;
-    Double_t rhoPlusSigma = fRho->GetVal() + fInEventSigmaRho;
+    Int_t    Njets         = fJets->GetEntries();
+    Int_t    NjetAcc       = 0;
+    Int_t    NjetUE1Sigma  = 0;
+    Int_t    NjetUE2Sigma  = 0;
+    Int_t    NjetUE3Sigma  = 0;
+    Double_t rhoPlus1Sigma = fRho->GetVal() + fInEventSigmaRho;
+    Double_t rhoPlus2Sigma = fRho->GetVal() + 2*fInEventSigmaRho;
+    Double_t rhoPlus3Sigma = fRho->GetVal() + 3*fInEventSigmaRho;
 
     for (Int_t i = 0; i < Njets; ++i) {
       
@@ -240,16 +252,25 @@ Bool_t AliAnalysisTaskRhoBase::FillHistograms()
        fHistJetAreavsNtrack->Fill(Ntracks, jet->Area());
       }
 
-      if (jet->Pt() < rhoPlusSigma * jet->Area())
-       NjetUE++;
+      fHistJetNconstVsPt[fCentBin]->Fill(jet->GetNumberOfConstituents(), jet->Pt());
+
+      if (jet->Pt() < rhoPlus1Sigma * jet->Area())
+       NjetUE1Sigma++;
+
+      if (jet->Pt() < rhoPlus2Sigma * jet->Area())
+       NjetUE2Sigma++;
+
+      if (jet->Pt() < rhoPlus3Sigma * jet->Area())
+       NjetUE3Sigma++;
       
       NjetAcc++;
     }
-
-    fHistNjUEvsNj[fCentBin]->Fill(NjetAcc,NjetUE);
     
-    if (NjetAcc>0)
-      fHistNjUEoverNjVsNj[fCentBin]->Fill(NjetAcc,1.*NjetUE/NjetAcc);
+    if (NjetAcc>0) {
+      fHistNjUEoverNjVsNj[fCentBin*3  ]->Fill(NjetAcc,1.*NjetUE1Sigma/NjetAcc);
+      fHistNjUEoverNjVsNj[fCentBin*3+1]->Fill(NjetAcc,1.*NjetUE2Sigma/NjetAcc);
+      fHistNjUEoverNjVsNj[fCentBin*3+2]->Fill(NjetAcc,1.*NjetUE3Sigma/NjetAcc);
+    }
 
     fHistNjetvsCent->Fill(fCent, NjetAcc);
     if (fTracks)
index ed7802723db05ff28a523abce06c38d1fafe15c1..65ac7037d13c2f6a28b61464e85baafba25fea5e 100644 (file)
@@ -52,8 +52,8 @@ class AliAnalysisTaskRhoBase : public AliAnalysisTaskEmcalJet {
   TH2F                  *fHistJetPtvsNtrack;             //!jet pt vs. no. of tracks
   TH2F                  *fHistJetAreavsNtrack;           //!jet area vs. no. of tracks
   TH2F                  *fHistNjetvsNtrack;              //!no. of jets vs. no. of tracks
-  TH2F                  *fHistNjUEvsNj[4];               //!no. of jets below rho*A+sigma_rho vs. no. of jets
-  TH2F                  *fHistNjUEoverNjVsNj[4];         //!ratio no. of jets below rho*A+sigma_rho over. no. of jets vs. no. of jets
+  TH2F                  *fHistNjUEoverNjVsNj[12];        //!ratio no. of jets below rho*A+sigma_rho over. no. of jets vs. no. of jets
+  TH2F                  *fHistJetNconstVsPt[4];          //!jet no. of constituents vs. pt
 
   TH2F                  *fHistRhovsCent;                 //!rho vs. centrality
   TH2F                  *fHistRhoScaledvsCent;           //!rhoscaled vs. centrality
@@ -71,6 +71,6 @@ class AliAnalysisTaskRhoBase : public AliAnalysisTaskEmcalJet {
   AliAnalysisTaskRhoBase(const AliAnalysisTaskRhoBase&);             // not implemented
   AliAnalysisTaskRhoBase& operator=(const AliAnalysisTaskRhoBase&);  // not implemented
   
-  ClassDef(AliAnalysisTaskRhoBase, 5); // Rho base task
+  ClassDef(AliAnalysisTaskRhoBase, 6); // Rho base task
 };
 #endif
index 3b28459e3d4a499159f41f264cc2e094507f741d..fb50bb724134152cde3100ddec7a75a1c4303a33 100644 (file)
@@ -57,6 +57,7 @@ class AliEmcalJet : public AliVParticle
   AliVCluster      *ClusterAt(Int_t idx, TClonesArray *ca)  const { if (!ca) return 0; return dynamic_cast<AliVCluster*>(ca->At(ClusterAt(idx))); }
   UShort_t          GetNumberOfClusters()        const { return fClusterIDs.GetSize();     }
   UShort_t          GetNumberOfTracks()          const { return fTrackIDs.GetSize();       }
+  UShort_t          GetNumberOfConstituents()    const { return GetNumberOfClusters()+GetNumberOfTracks();       }
   Double_t          FracEmcalArea()              const { return fAreaEmc/fArea;            }
   Bool_t            IsInsideEmcal()              const { return (fAreaEmc/fArea>0.999);    }
   Bool_t            IsInEmcal()                  const { return (fAreaEmc>0);              }
@@ -136,6 +137,6 @@ class AliEmcalJet : public AliVParticle
   Double_t          fPtSub;               //!          background subtracted pt (not stored set from outside) 
   Double_t          fPtVectSub;           //!          background vector subtracted pt (not stored set from outside) 
 
-  ClassDef(AliEmcalJet,8) // Emcal jet class in cylindrical coordinates
+  ClassDef(AliEmcalJet,9) // Emcal jet class in cylindrical coordinates
 };
 #endif
index e221bc2324d5a711274208c34046a49d7f7ca1b7..e51df0c3f20decb1d47299b2294407b30f341303 100644 (file)
@@ -4,24 +4,17 @@
 //
 // Author: S.Aiola
 
-#include <TObject.h>
-#include <TChain.h>
 #include <TClonesArray.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TH3F.h>
 #include <TList.h>
 #include <TLorentzVector.h>
-#include <TRandom3.h>
-#include <TParameter.h>
 
-#include "AliAnalysisManager.h"
-#include "AliCentrality.h"
 #include "AliVCluster.h"
 #include "AliVParticle.h"
 #include "AliVTrack.h"
 #include "AliEmcalJet.h"
-#include "AliVEventHandler.h"
 #include "AliRhoParameter.h"
 #include "AliLog.h"
 
@@ -33,7 +26,8 @@ ClassImp(AliAnalysisTaskSAJF)
 AliAnalysisTaskSAJF::AliAnalysisTaskSAJF() : 
   AliAnalysisTaskEmcalJet("AliAnalysisTaskSAJF", kTRUE),
   fLeadingHadronType(0),
-  fHistRhoVSleadJetPt(0)
+  fHistRhoVSleadJetPt(0),
+  fNjetsVsCent(0)
 
 {
   // Default constructor.
@@ -51,6 +45,7 @@ AliAnalysisTaskSAJF::AliAnalysisTaskSAJF() :
     fHistConstituents[i] = 0;
     fHistTracksJetPt[i] = 0;
     fHistClustersJetPt[i] = 0;
+    fHistJetNconstVsPt[i] = 0;
   }
 
   SetMakeGeneralHistograms(kTRUE);
@@ -60,7 +55,8 @@ AliAnalysisTaskSAJF::AliAnalysisTaskSAJF() :
 AliAnalysisTaskSAJF::AliAnalysisTaskSAJF(const char *name) : 
   AliAnalysisTaskEmcalJet(name, kTRUE),
   fLeadingHadronType(0),
-  fHistRhoVSleadJetPt(0)
+  fHistRhoVSleadJetPt(0),
+  fNjetsVsCent(0)
 {
   // Standard constructor.
 
@@ -77,6 +73,7 @@ AliAnalysisTaskSAJF::AliAnalysisTaskSAJF(const char *name) :
     fHistConstituents[i] = 0;
     fHistTracksJetPt[i] = 0;
     fHistClustersJetPt[i] = 0;
+    fHistJetNconstVsPt[i] = 0;
   }
 
   SetMakeGeneralHistograms(kTRUE);
@@ -110,10 +107,15 @@ void AliAnalysisTaskSAJF::UserCreateOutputObjects()
   AliAnalysisTaskEmcalJet::UserCreateOutputObjects();
 
   fHistRhoVSleadJetPt = new TH2F("fHistRhoVSleadJetPt","fHistRhoVSleadJetPt", fNbins, fMinBinPt, fMaxBinPt, fNbins, fMinBinPt, fMaxBinPt);
-  fHistRhoVSleadJetPt->GetXaxis()->SetTitle("#rho * area [GeV/c]");
-  fHistRhoVSleadJetPt->GetYaxis()->SetTitle("Leading jet p_{T} [GeV/c]");
+  fHistRhoVSleadJetPt->GetXaxis()->SetTitle("#rho * area (GeV/c)");
+  fHistRhoVSleadJetPt->GetYaxis()->SetTitle("Leading jet p_{T} (GeV/c)");
   fOutput->Add(fHistRhoVSleadJetPt);
 
+  fNjetsVsCent = new TH2F("fNjetsVsCent","fNjetsVsCent", 100, 0, 100, 150, -0.5, 149.5);
+  fNjetsVsCent->GetXaxis()->SetTitle("Centrality (%)");
+  fNjetsVsCent->GetYaxis()->SetTitle("# of jets");
+  fOutput->Add(fNjetsVsCent);
+
   const Int_t nbinsZ = 12;
   Float_t binsZ[nbinsZ+1] = {0,1,2,3,4,5,6,7,8,9,10,20,1000};
 
@@ -123,6 +125,7 @@ void AliAnalysisTaskSAJF::UserCreateOutputObjects()
   Float_t *binsEta      = GenerateFixedBinArray(50,-1, 1);
   Float_t *binsPhi      = GenerateFixedBinArray(101, 0, TMath::Pi() * 2.02);
   Float_t *bins120      = GenerateFixedBinArray(120, 0, 1.2);
+  Float_t *bins150      = GenerateFixedBinArray(150, -0.5, 149.5);
 
   TString histname;
 
@@ -218,10 +221,10 @@ void AliAnalysisTaskSAJF::UserCreateOutputObjects()
 
     histname = "fHistConstituents_";
     histname += i;
-    fHistConstituents[i] = new TH3F(histname.Data(), histname.Data(), 100, 1, 101, 100, -0.5, 99.5, fNbins, fMinBinPt, fMaxBinPt);
+    fHistConstituents[i] = new TH2F(histname.Data(), histname.Data(), 100, 1, 101, 100, -0.5, 99.5);
     fHistConstituents[i]->GetXaxis()->SetTitle("p_{T,part} (GeV/c)");
     fHistConstituents[i]->GetYaxis()->SetTitle("no. of particles");
-    fHistConstituents[i]->GetZaxis()->SetTitle("p_{T,jet} (GeV/c)");
+    fHistConstituents[i]->GetZaxis()->SetTitle("counts");
     fOutput->Add(fHistConstituents[i]);
 
     histname = "fHistTracksJetPt_";
@@ -241,6 +244,14 @@ void AliAnalysisTaskSAJF::UserCreateOutputObjects()
       fHistClustersJetPt[i]->GetZaxis()->SetTitle("counts");
       fOutput->Add(fHistClustersJetPt[i]);
     }
+
+    histname = "fHistJetNconstVsPt_";
+    histname += i;
+    fHistJetNconstVsPt[i] = new TH3F(histname.Data(), histname.Data(), 150, bins150, fNbins, binsPt, nbinsZ, binsZ);
+    fHistJetNconstVsPt[i]->GetXaxis()->SetTitle("# of constituents");
+    fHistJetNconstVsPt[i]->GetYaxis()->SetTitle("p_{T,jet} (GeV/c)");
+    fHistJetNconstVsPt[i]->GetZaxis()->SetTitle("p_{T,lead} (GeV/c)");
+    fOutput->Add(fHistJetNconstVsPt[i]);
   }
 
   PostData(1, fOutput); // Post data for ALL output slots >0 here, to get at least an empty histogram
@@ -307,20 +318,23 @@ Bool_t AliAnalysisTaskSAJF::FillHistograms()
   if (jet2)
     fHist2LeadingJetPt[fCentBin]->Fill(jet2->Pt());
 
-  DoJetLoop();
+  Int_t njets = DoJetLoop();
+
+  fNjetsVsCent->Fill(fCent, njets);
 
   return kTRUE;
 }
 
 //________________________________________________________________________
-void AliAnalysisTaskSAJF::DoJetLoop()
+Int_t AliAnalysisTaskSAJF::DoJetLoop()
 {
   // Do the jet loop.
 
   if (!fJets)
-    return;
+    return 0;
 
   const Int_t njets = fJets->GetEntriesFast();
+  Int_t nAccJets = 0;
 
   TH1F constituents("constituents", "constituents", 
                    fHistConstituents[0]->GetNbinsX(), fHistConstituents[0]->GetXaxis()->GetXmin(), fHistConstituents[0]->GetXaxis()->GetXmax()); 
@@ -351,6 +365,7 @@ void AliAnalysisTaskSAJF::DoJetLoop()
     fHistJetPhiEta[fCentBin]->Fill(jet->Eta(), jet->Phi(), ptLeading);
     fHistJetsPtArea[fCentBin]->Fill(jet->Pt(), jet->Area(), ptLeading);
     fHistJetsCorrPtArea[fCentBin]->Fill(corrPt, jet->Area(), ptLeading);
+    fHistJetNconstVsPt[fCentBin]->Fill(jet->GetNumberOfConstituents(), jet->Pt(), ptLeading);
 
     if (fCaloClusters)
       fHistJetsNEFvsPt[fCentBin]->Fill(jet->NEF(), jet->Pt(), ptLeading);
@@ -381,11 +396,14 @@ void AliAnalysisTaskSAJF::DoJetLoop()
     }
 
     for (Int_t i = 1; i <= constituents.GetNbinsX(); i++) {
-      fHistConstituents[fCentBin]->Fill(constituents.GetBinCenter(i), constituents.GetBinContent(i), jet->Pt());
+      fHistConstituents[fCentBin]->Fill(constituents.GetBinCenter(i), constituents.GetBinContent(i));
     }
 
     constituents.Reset();
+    nAccJets++;
   } //jet loop 
+
+  return nAccJets;
 }
 
 //________________________________________________________________________
index 7ffba44e2f407d077b17cfdc372e210b9e1c7ccc..cd2fc04420792e3a903fbed29169e7607539e24e 100644 (file)
@@ -26,7 +26,7 @@ class AliAnalysisTaskSAJF : public AliAnalysisTaskEmcalJet {
 
  protected:
   Bool_t                      FillHistograms()                                              ;
-  void                        DoJetLoop()                                                   ;
+  Int_t                       DoJetLoop()                                                   ;
   Float_t*                    GenerateFixedBinArray(Int_t n, Float_t min, Float_t max) const;
 
   Int_t                       fLeadingHadronType;          // 0 = charged, 1 = neutral, 2 = both
@@ -37,6 +37,7 @@ class AliAnalysisTaskSAJF : public AliAnalysisTaskEmcalJet {
   TH1F                       *fHist2LeadingJetPt[4];       //!Second leading jet pt spectrum
   TH1F                       *fHistLeadingJetCorrPt[4];    //!Corrected leading jet pt spectrum
   TH2F                       *fHistRhoVSleadJetPt;         //!Area(leadjet) * rho vs. leading jet pt
+  TH2F                       *fNjetsVsCent;                //!No. of jets vs. centrality
 
   // Inclusive jets histograms
   TH3F                       *fHistJetPhiEta[4];           //!Phi-Eta distribution of jets
@@ -44,14 +45,15 @@ class AliAnalysisTaskSAJF : public AliAnalysisTaskEmcalJet {
   TH3F                       *fHistJetsCorrPtArea[4];      //!Jet corr pt vs. area
   TH3F                       *fHistJetsNEFvsPt[4];         //!Jet neutral energy fraction vs. jet pt
   TH3F                       *fHistJetsZvsPt[4];           //!Constituent Pt over Jet Pt ratio vs. jet pt
-  TH3F                       *fHistConstituents[4];        //!x axis = constituents pt; y axis = no. of constituents; z axis = jet pt
+  TH2F                       *fHistConstituents[4];        //!x axis = constituents pt; y axis = no. of constituents
   TH2F                       *fHistTracksJetPt[4];         //!Track pt vs. jet pt
   TH2F                       *fHistClustersJetPt[4];       //!Cluster pt vs. jet pt
+  TH3F                       *fHistJetNconstVsPt[4];       //!Jet no. of constituents vs. pt
 
  private:
   AliAnalysisTaskSAJF(const AliAnalysisTaskSAJF&);            // not implemented
   AliAnalysisTaskSAJF &operator=(const AliAnalysisTaskSAJF&); // not implemented
 
-  ClassDef(AliAnalysisTaskSAJF, 11) // jet analysis task
+  ClassDef(AliAnalysisTaskSAJF, 12) // jet analysis task
 };
 #endif
index 37957888536532d3ec31c3de16f9ec13137365fc..9a430abe2f374108f78258dae92c5690438e7b61 100644 (file)
@@ -1,3 +1,4 @@
+// $Id$
 
 AliAnalysisTaskDeltaPt* AddTaskDeltaPt(
   const char *ntracks            = "Tracks",
@@ -11,8 +12,9 @@ AliAnalysisTaskDeltaPt* AddTaskDeltaPt(
   const char *nrho               = "Rho",
   Double_t    jetradius          = 0.2,
   Double_t    jetptcut           = 1,
-  Double_t    jetareacut         = 0.8,
-  Double_t    ptcut              = 0.15,
+  Double_t    jetareacut         = 0.557,
+  Double_t    trackptcut         = 0.15,
+  Double_t    clusptcut          = 0.30,
   UInt_t      type               = AliAnalysisTaskEmcal::kTPC,
   const char *taskname           = "AliAnalysisTaskDeltaPt"
 )
@@ -56,7 +58,8 @@ AliAnalysisTaskDeltaPt* AddTaskDeltaPt(
   jetTask->SetRandTracksName(nrandtracks);
   jetTask->SetRandClusName(nrandclusters);
   jetTask->SetRhoName(nrho);
-  jetTask->SetPtCut(ptcut);
+  jetTask->SetClusPtCut(clusptcut);
+  jetTask->SetTrackPtCut(trackptcut);
   jetTask->SetJetRadius(jetradius);
   jetTask->SetJetPtCut(jetptcut);
   jetTask->SetPercAreaCut(jetareacut);
index e9810d557d1ea5e6f1ce7500b830b6734cda9ad7..e37a1d86f12aa39d5b0d4c5dc21a9e0b6753f127 100644 (file)
@@ -5,12 +5,11 @@ AliJetResponseMaker* AddTaskJetRespPtHard(const char *ntracks            = "Trac
                                          const char *njets              = "Jets",
                                          const char *nmcjets            = "MCJets",
                                          const char *nmctracks          = "MCParticles",
-                                         Double_t    jetradius          = 0.4,
+                                         Double_t    jetradius          = 0.2,
                                          Double_t    jetptcut           = 1,
-                                         Double_t    jetareacut         = 0.8,
-                                         Double_t    ptcut              = 0.15,
-                                         Double_t    jetBiasTrack       = 10,
-                                         Double_t    jetBiasClus        = 10,
+                                         Double_t    jetareacut         = 0.557,
+                                         Double_t    jetBiasTrack       = 5,
+                                         Double_t    jetBiasClus        = 5,
                                          Double_t    maxDistance        = 0.25,
                                          UInt_t      type               = AliAnalysisTaskEmcal::kTPC,
                                          Int_t       minPtBin           = 1, 
@@ -27,7 +26,7 @@ AliJetResponseMaker* AddTaskJetRespPtHard(const char *ntracks            = "Trac
 
   for (Int_t i = minPtBin; i <= maxPtBin; i++) {
     AddTaskJetResponseMaker(ntracks, nclusters, njets, nmcjets, nmctracks, 
-                           jetradius, jetptcut, jetareacut, ptcut, jetBiasTrack, 
+                           jetradius, jetptcut, jetareacut, jetBiasTrack, 
                            jetBiasClus, maxDistance, type, i, taskname, jetTask + i - minPtBin);
     jetTask[i - minPtBin].SetDoMatching(domatch);
     if (biggerMatrix) 
index cf2b42d4de6ef3cffe4b1f670e4aefc05acc45e5..f1cc287d8b495a546d992aea00a448697572272a 100644 (file)
@@ -4,14 +4,13 @@ AliJetResponseMaker* AddTaskJetResponseMaker(
   const char *ntracks            = "Tracks",
   const char *nclusters          = "CaloClusters",
   const char *njets              = "Jets",
-  const char *nmcjets            = "MCJets",
   const char *nmctracks          = "MCParticles",
-  Double_t    jetradius          = 0.4,
+  const char *nmcjets            = "MCJets",
+  Double_t    jetradius          = 0.2,
   Double_t    jetptcut           = 1,
-  Double_t    jetareacut         = 0.8,
-  Double_t    ptcut              = 0.15,
-  Double_t    jetBiasTrack       = 10,
-  Double_t    jetBiasClus        = 10,
+  Double_t    jetareacut         = 0.557,
+  Double_t    jetBiasTrack       = 5,
+  Double_t    jetBiasClus        = 5,
   Double_t    maxDistance        = 0.25,
   UInt_t      type               = AliAnalysisTaskEmcal::kTPC,
   Int_t       ptHardBin          = -999,
@@ -40,26 +39,13 @@ AliJetResponseMaker* AddTaskJetResponseMaker(
   // Init the task and do settings
   //-------------------------------------------------------
 
-  TString name(taskname);
-  name += "_";
-  name += njets;
-  name += "_Track";
-  name += jetBiasTrack;
-  name += "_Clus";
-  name += jetBiasClus;
-  name += "_R0";
-  name += floor(jetradius*10+0.5);
-  name += "_PtCut";
-  name += floor(ptcut*1000+0.5);
-  name += "_";
-  if (type == AliAnalysisTaskEmcal::kTPC) 
+  TString name(Form("%s_%s_Track%f_Clus%f_R0%d_",taskname,njets,jetBiasTrack,jetBiasClus,(Int_t)floor(jetradius*100+0.5)));
+  if (type == AliAnalysisTaskEmcal::kTPC)
     name += "TPC";
   else if (type == AliAnalysisTaskEmcal::kEMCAL) 
     name += "EMCAL";
-  else if (type == AliAnalysisTaskEmcal::kTPCSmall) 
-    name += "TPCSmall";
-  else if (type == AliAnalysisTaskEmcal::kEMCALOnly) 
-    name += "EMCALOnly";
+  else if (type == AliAnalysisTaskEmcal::kUser) 
+    name += "USER";
   if (ptHardBin != -999) {
     name += "_PtHard";
     name += ptHardBin;
@@ -77,7 +63,6 @@ AliJetResponseMaker* AddTaskJetResponseMaker(
   jetTask->SetJetsName(njets);
   jetTask->SetMCJetsName(nmcjets);
   jetTask->SetMCTracksName(nmctracks);
-  jetTask->SetPtCut(ptcut);
   jetTask->SetJetRadius(jetradius);
   jetTask->SetJetPtCut(jetptcut);
   jetTask->SetPercAreaCut(jetareacut);
index d6d44466336630e1d2e2c881205c84b2dbf437a1..a296e06022c6b565f35af2c9940c62c946767258 100644 (file)
@@ -9,7 +9,6 @@ AliAnalysisTaskRho* AddTaskRho(
    UInt_t         type        = AliAnalysisTaskEmcal::kTPC,
    Double_t       jetareacut  = 0.01,
    Double_t       emcareacut  = 0,
-   Double_t       ptcut       = 0.15,
    TF1           *sfunc       = 0,
    const UInt_t   exclJets    = 2,
    const Bool_t   histo       = kFALSE,
@@ -53,7 +52,6 @@ AliAnalysisTaskRho* AddTaskRho(
   rhotask->SetRhoName(nRho);
   rhotask->SetJetAreaCut(jetareacut);
   rhotask->SetAreaEmcCut(emcareacut);
-  rhotask->SetPtCut(ptcut);
   rhotask->SetJetPtCut(0);
   rhotask->SetJetRadius(jetradius);
   rhotask->SetExcludeLeadJets(exclJets);
index ae9f3b4b433d86eeb17508cebec1665b6980eee0..379e82978476beafb4c8a43243797f449d163da0 100644 (file)
@@ -9,7 +9,8 @@ AliAnalysisTaskRhoAverage* AddTaskRhoAverage(
    UInt_t         type        = AliAnalysisTaskEmcal::kTPC,
    Double_t       jetareacut  = 0.01,
    Double_t       emcareacut  = 0,
-   Double_t       ptcut       = 0.15,
+   Double_t       trackptcut  = 0.15,
+   Double_t       clusptcut   = 0.30,
    TF1           *sfunc       = 0,
    const UInt_t   exclPart    = 2,
    const UInt_t   rhotype     = 1,
@@ -54,7 +55,8 @@ AliAnalysisTaskRhoAverage* AddTaskRhoAverage(
   rhotask->SetRhoName(nRho);
   rhotask->SetJetAreaCut(jetareacut);
   rhotask->SetAreaEmcCut(emcareacut);
-  rhotask->SetPtCut(ptcut);
+  rhotask->SetClusPtCut(clusptcut);
+  rhotask->SetTrackPtCut(trackptcut);
   rhotask->SetJetPtCut(0);
   rhotask->SetJetRadius(jetradius);
   rhotask->SetExcludeLeadPart(exclPart);
index 0b7d26b96aa17e8b6797c74054914c0e25787398..1ce8c5f2212a7b8b2272dea02fc415200a83d4b3 100644 (file)
@@ -9,7 +9,6 @@ AliAnalysisTaskRhoBase* AddTaskRhoBase(
    UInt_t         type        = AliAnalysisTaskEmcal::kTPC,
    Double_t       jetareacut  = 0.01,
    Double_t       emcareacut  = 0,
-   Double_t       ptcut       = 0.15,
    TF1           *sfunc       = 0,
    TF1           *rfunc       = 0,
    const Bool_t   histo       = kFALSE,
@@ -48,7 +47,6 @@ AliAnalysisTaskRhoBase* AddTaskRhoBase(
   rhotask->SetRhoName(nRho);
   rhotask->SetJetAreaCut(jetareacut);
   rhotask->SetAreaEmcCut(emcareacut);
-  rhotask->SetPtCut(ptcut);
   rhotask->SetJetPtCut(0);
   rhotask->SetJetRadius(jetradius);
 
index 631a565a1826e90988b0f3548f08573f8dfacb4a..6aa2d827f616680838486bf309e4982fdc789fcb 100644 (file)
@@ -7,8 +7,7 @@ AliAnalysisTaskSAJF* AddTaskSAJF(
   const char *nrho               = "Rho",
   Double_t    jetradius          = 0.2,
   Double_t    jetptcut           = 1,
-  Double_t    jetareacut         = 0.8,
-  Double_t    ptcut              = 0.15,
+  Double_t    jetareacut         = 0.557,
   UInt_t      type               = AliAnalysisTaskEmcal::kTPC,
   Int_t       leadhadtype        = 0,
   const char *taskname           = "AliAnalysisTaskSAJF"
@@ -48,7 +47,6 @@ AliAnalysisTaskSAJF* AddTaskSAJF(
   jetTask->SetClusName(nclusters);
   jetTask->SetJetsName(njets);
   jetTask->SetRhoName(nrho);
-  jetTask->SetPtCut(ptcut);
   jetTask->SetJetRadius(jetradius);
   jetTask->SetJetPtCut(jetptcut);
   jetTask->SetPercAreaCut(jetareacut);
index 98eb07037b5f316d14b0dc038266a9952aa2936c..3ef7fed64264b8832a68f5b92cade3bca8d1f785 100644 (file)
@@ -6,8 +6,9 @@ AliAnalysisTaskSAQA* AddTaskSAQA(
   const char *njets              = "Jets",
   Double_t    jetradius          = 0.2,
   Double_t    jetptcut           = 1,
-  Double_t    jetareacut         = 0.8,
-  Double_t    ptcut              = 0.15,
+  Double_t    jetareacut         = 0.557,
+  Double_t    trackptcut         = 0.15,
+  Double_t    clusptcut          = 0.30,
   UInt_t      type               = AliAnalysisTaskEmcal::kTPC,
   const char *taskname           = "AliAnalysisTaskSAQA"
 )
@@ -32,13 +33,21 @@ AliAnalysisTaskSAQA* AddTaskSAQA(
   //-------------------------------------------------------
   // Init the task and do settings
   //-------------------------------------------------------
-  TString name(Form("%s_%s_%s_%s_R0%d_",taskname,njets,ntracks,nclusters,(Int_t)floor(jetradius*100+0.5)));
-  if (type == AliAnalysisTaskEmcal::kTPC) 
-    name += "TPC";
-  else if (type == AliAnalysisTaskEmcal::kEMCAL) 
-    name += "EMCAL";
-  else if (type == AliAnalysisTaskEmcal::kUser) 
-    name += "USER";
+  
+  TString name;
+  if (strcmp(njets,"")) {
+    name = Form("%s_%s_%s_%s_R0%d_",taskname,njets,ntracks,nclusters,(Int_t)floor(jetradius*100+0.5));
+    if (type == AliAnalysisTaskEmcal::kTPC) 
+      name += "TPC";
+    else if (type == AliAnalysisTaskEmcal::kEMCAL) 
+      name += "EMCAL";
+    else if (type == AliAnalysisTaskEmcal::kUser) 
+      name += "USER";
+  }
+  else {
+    name = Form("%s_%s_%s_",taskname,ntracks,nclusters);
+  }
+
   AliAnalysisTaskSAQA* qaTask = new AliAnalysisTaskSAQA(name);
   qaTask->SetTracksName(ntracks);
   qaTask->SetClusName(nclusters);
@@ -46,7 +55,8 @@ AliAnalysisTaskSAQA* AddTaskSAQA(
   qaTask->SetJetRadius(jetradius);
   qaTask->SetJetPtCut(jetptcut);
   qaTask->SetPercAreaCut(jetareacut);
-  qaTask->SetPtCut(ptcut);
+  qaTask->SetTrackPtCut(trackptcut);
+  qaTask->SetClusPtCut(clusptcut);
   qaTask->SetAnaType(type);
 
   //-------------------------------------------------------