histogram setup from cuts/parameter file

diff --git a/PWG4/totEt/AliAnalysisEt.cxx b/PWG4/totEt/AliAnalysisEt.cxx
index 6b2b7277364cc96b5f8bdeb9bf1805874483b9aa..b195b7e78aa56fb35e881473de9fd8aaa8f8c5ce 100644 (file)
--- a/PWG4/totEt/AliAnalysisEt.cxx
+++ b/PWG4/totEt/AliAnalysisEt.cxx
@@ -181,6 +181,18 @@ void AliAnalysisEt::CreateHistograms()
     if (fCuts->GetHistMakeTree()) {
       CreateTree();
     }
+
+    nbinsMult = fCuts->GetHistNbinsMult();
+    minMult = fCuts->GetHistMinMult();
+    maxMult = fCuts->GetHistMaxMult();
+
+    nbinsEt = fCuts->GetHistNbinsTotEt();
+    minEt = fCuts->GetHistMinTotEt();
+    maxEt = fCuts->GetHistMaxTotEt();
+
+    nbinsPt = fCuts->GetHistNbinsParticlePt();
+    minPt = fCuts->GetHistMinParticlePt();
+    maxPt = fCuts->GetHistMaxParticlePt();
   }
 
     TString histname = "fHistEt" + fHistogramNameSuffix;

diff --git a/PWG4/totEt/AliAnalysisEtCuts.cxx b/PWG4/totEt/AliAnalysisEtCuts.cxx
index 4cc0c1c4d1bcbb42e72b5b14811f037868424e82..4d7884a3a8e5115b80a6b26e96cf5e014e834b7d 100644 (file)
--- a/PWG4/totEt/AliAnalysisEtCuts.cxx
+++ b/PWG4/totEt/AliAnalysisEtCuts.cxx
@@ -58,6 +58,18 @@ AliAnalysisEtCuts::AliAnalysisEtCuts() :
   ,fMonteCarloNeutralParticle(0)
 
   ,fHistMakeTree(kTRUE)
+  ,fHistNbinsMult(200)
+  ,fHistMinMult(-0.5)
+  ,fHistMaxMult(199.5)
+  ,fHistNbinsTotEt(1000)
+  ,fHistMinTotEt(0.0001)
+  ,fHistMaxTotEt(100)
+  ,fHistNbinsParticleEt(1000)
+  ,fHistMinParticleEt(0)
+  ,fHistMaxParticleEt(10)
+  ,fHistNbinsParticlePt(200) 
+  ,fHistMinParticlePt(0)
+  ,fHistMaxParticlePt(20)
 { // ctor
 }
 
@@ -65,4 +77,11 @@ AliAnalysisEtCuts::~AliAnalysisEtCuts()
 { // dtor
 }
 
+void AliAnalysisEtCuts::SetPbPbDefaults()
+{ // just increase seom histogram max values for now
+  // enough to multiply conservative p+p defaults by a factor 100?
+  fHistMaxMult = 20000;
+  fHistMaxTotEt = 10000;
+}
+
 

diff --git a/PWG4/totEt/AliAnalysisEtCuts.h b/PWG4/totEt/AliAnalysisEtCuts.h
index 05a776e5b08085aaac3d62d3a2a24ac2402cc2e4..c1f49006167156a5a9f510a244c648997c4bd170 100644 (file)
--- a/PWG4/totEt/AliAnalysisEtCuts.h
+++ b/PWG4/totEt/AliAnalysisEtCuts.h
@@ -17,6 +17,8 @@ class AliAnalysisEtCuts : public TNamed
   AliAnalysisEtCuts();
   virtual ~AliAnalysisEtCuts();
 
+  virtual void SetPbPbDefaults();
+
   // Getters
   // Common
   Double_t GetCommonEtaCut() const { return fCommonEtaCut; }
@@ -58,6 +60,22 @@ class AliAnalysisEtCuts : public TNamed
   Double_t GetMonteCarloNeutralParticle() const { return fMonteCarloNeutralParticle; }
   // Hist: TTree and histogram info
   Bool_t GetHistMakeTree() const { return fHistMakeTree; }
+  //
+  Int_t GetHistNbinsMult() const { return fHistNbinsMult; }
+  Double_t GetHistMinMult() const { return fHistMinMult; }
+  Double_t GetHistMaxMult() const { return fHistMinMult; }
+  //
+  Int_t GetHistNbinsTotEt() const { return fHistNbinsTotEt; }
+  Double_t GetHistMinTotEt() const { return fHistMinTotEt; }
+  Double_t GetHistMaxTotEt() const { return fHistMaxTotEt; }
+  //
+  Int_t GetHistNbinsParticleEt() const { return fHistNbinsParticleEt; }
+  Double_t GetHistMinParticleEt() const { return fHistMinParticleEt; }
+  Double_t GetHistMaxParticleEt() const { return fHistMaxParticleEt; }
+  //
+  Int_t GetHistNbinsParticlePt() const { return fHistNbinsParticlePt; }
+  Double_t GetHistMinParticlePt() const { return fHistMaxParticlePt; }
+  Double_t GetHistMaxParticlePt() const { return fHistMaxParticlePt; }
 
   // Setters
   // Common
@@ -99,6 +117,23 @@ class AliAnalysisEtCuts : public TNamed
   void SetMonteCarloNeutralParticle(const Double_t val) { fMonteCarloNeutralParticle = val; }
   // Hist: TTree and histogram info
   void SetHistMakeTree(const Bool_t val) { fHistMakeTree = val; }
+  //
+  void SetHistNbinsMult(const Int_t val) { fHistNbinsMult = val; }
+  void SetHistMinMult(const Double_t val) { fHistMinMult = val; }
+  void SetHistMaxMult(const Double_t val) { fHistMaxMult = val; }
+  //
+  void SetHistNbinsTotEt(const Int_t val) { fHistNbinsTotEt = val; }
+  void SetHistMinTotEt(const Double_t val) { fHistMinTotEt = val; }
+  void SetHistMaxTotEt(const Double_t val) { fHistMaxTotEt = val; }
+  //
+  void SetHistNbinsParticleEt(const Int_t val) { fHistNbinsParticleEt = val; }
+  void SetHistMinParticleEt(const Double_t val) { fHistMinParticleEt = val; }
+  void SetHistMaxParticleEt(const Double_t val) { fHistMaxParticleEt = val; }
+  //
+  void SetHistNbinsParticlePt(const Int_t val) { fHistNbinsParticlePt = val; }
+  void SetHistMinParticlePt(const Double_t val) { fHistMinParticlePt = val; }
+  void SetHistMaxParticlePt(const Double_t val) { fHistMaxParticlePt = val; }
+
 
  protected:
 
@@ -148,6 +183,22 @@ class AliAnalysisEtCuts : public TNamed
 
   // Hist: TTree and histogram info
   Bool_t fHistMakeTree; // whether to make a summary tree or not
+  //
+  Int_t fHistNbinsMult; // number of bins in multiplicity histograms
+  Double_t fHistMinMult; // minimum value in multiplicity histograms
+  Double_t fHistMaxMult; // maximum value in multiplicity histograms
+
+  Int_t fHistNbinsTotEt; // number of bins in event Et histograms
+  Double_t fHistMinTotEt; // minimum value in event Et histograms
+  Double_t fHistMaxTotEt; // maximum value in event Et histograms
+
+  Int_t fHistNbinsParticleEt; // number of bins in particle Et histograms
+  Double_t fHistMinParticleEt; // minimum value in particle Et histograms
+  Double_t fHistMaxParticleEt; // maximum value in particle Et histograms
+
+  Int_t fHistNbinsParticlePt; // number of bins in particle Pt histograms
+  Double_t fHistMinParticlePt; // minimum value in particle Pt histograms
+  Double_t fHistMaxParticlePt; // maximum value in particle Pt histograms
 
 private:
   //Declare private to avoid compilation warning

diff --git a/PWG4/totEt/AliAnalysisEtReconstructed.cxx b/PWG4/totEt/AliAnalysisEtReconstructed.cxx
index d2efb27d241aba160dd71d84cbe55c18b20dfc30..be6437cf59931b933cfd9193d6ae6e3682a9aeb4 100644 (file)
--- a/PWG4/totEt/AliAnalysisEtReconstructed.cxx
+++ b/PWG4/totEt/AliAnalysisEtReconstructed.cxx
@@ -307,29 +307,40 @@ void AliAnalysisEtReconstructed::CreateHistograms()
 { // add some extra histograms to the ones from base class
     AliAnalysisEt::CreateHistograms();
 
+    Int_t nbinsEt = 1000;
+    Double_t minEt = 0;
+    Double_t maxEt = 10;
+
+    // possibly change histogram limits
+    if (fCuts) {
+      nbinsEt = fCuts->GetHistNbinsParticleEt();
+      minEt = fCuts->GetHistMinParticleEt();
+      maxEt = fCuts->GetHistMaxParticleEt();
+    }
+
     TString histname;
     histname = "fHistChargedPionEnergyDeposit" + fHistogramNameSuffix;
-    fHistChargedPionEnergyDeposit = new TH2F(histname.Data(), "Energy deposited by #pi^{+/-}", 1000, 0, 10, 1000, 0, 10);
+    fHistChargedPionEnergyDeposit = new TH2F(histname.Data(), "Energy deposited by #pi^{+/-}", nbinsEt, minEt, maxEt, nbinsEt, minEt, maxEt);
     fHistChargedPionEnergyDeposit->SetXTitle("Energy deposited in calorimeter");
     fHistChargedPionEnergyDeposit->SetYTitle("Energy of track");
     
     histname = "fHistProtonEnergyDeposit" + fHistogramNameSuffix;
-    fHistProtonEnergyDeposit = new TH2F(histname.Data(), "Energy deposited by protons", 1000, 0, 10, 1000, 0, 10);
+    fHistProtonEnergyDeposit = new TH2F(histname.Data(), "Energy deposited by protons", nbinsEt, minEt, maxEt, nbinsEt, minEt, maxEt);
     fHistProtonEnergyDeposit->SetXTitle("Energy deposited in calorimeter");
     fHistProtonEnergyDeposit->SetYTitle("Energy of track");
     
     histname = "fHistAntiProtonEnergyDeposit" + fHistogramNameSuffix;
-    fHistAntiProtonEnergyDeposit = new TH2F(histname.Data(), "Energy deposited by anti-protons", 1000, 0, 10, 1000, 0, 10);
+    fHistAntiProtonEnergyDeposit = new TH2F(histname.Data(), "Energy deposited by anti-protons", nbinsEt, minEt, maxEt, nbinsEt, minEt, maxEt);
     fHistAntiProtonEnergyDeposit->SetXTitle("Energy deposited in calorimeter");
     fHistAntiProtonEnergyDeposit->SetYTitle("Energy of track");
     
     histname = "fHistChargedKaonEnergyDeposit" + fHistogramNameSuffix;
-    fHistChargedKaonEnergyDeposit = new TH2F(histname.Data(), "Energy deposited by K^{+/-}", 1000, 0, 10, 1000, 0, 10);
+    fHistChargedKaonEnergyDeposit = new TH2F(histname.Data(), "Energy deposited by K^{+/-}", nbinsEt, minEt, maxEt, nbinsEt, minEt, maxEt);
     fHistChargedKaonEnergyDeposit->SetXTitle("Energy deposited in calorimeter");
     fHistChargedKaonEnergyDeposit->SetYTitle("Energy of track");
     
     histname = "fHistMuonEnergyDeposit" + fHistogramNameSuffix;
-    fHistMuonEnergyDeposit = new TH2F(histname.Data(), "Energy deposited by #mu^{+/-}", 1000, 0, 10, 1000, 0, 10);
+    fHistMuonEnergyDeposit = new TH2F(histname.Data(), "Energy deposited by #mu^{+/-}", nbinsEt, minEt, maxEt, nbinsEt, minEt, maxEt);
     fHistMuonEnergyDeposit->SetXTitle("Energy deposited in calorimeter");
     fHistMuonEnergyDeposit->SetYTitle("Energy of track");