move histogram settings in the isolation analysis to the histogram settings container...

diff --git a/PWG/CaloTrackCorrBase/AliHistogramRanges.cxx b/PWG/CaloTrackCorrBase/AliHistogramRanges.cxx
index 3077f91f9ae683a3657a27138e147721ba15efaa..94d7c1b055f5239ca2c9357baa15aaaf1d158048 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliHistogramRanges.cxx
+++ b/PWG/CaloTrackCorrBase/AliHistogramRanges.cxx
@@ -58,7 +58,9 @@ fHistoZBins(100),             fHistoZMax(1000),            fHistoZMin(-1000),
 fHistoSSBins(0),              fHistoSSMax(0),              fHistoSSMin(0),
 fHistoDiffTimeBins(0),        fHistoDiffTimeMax(0),        fHistoDiffTimeMin(0),
 fHistoTrackResidualEtaBins(0),fHistoTrackResidualEtaMax(0),fHistoTrackResidualEtaMin(0),
-fHistoTrackResidualPhiBins(0),fHistoTrackResidualPhiMax(0),fHistoTrackResidualPhiMin(0)
+fHistoTrackResidualPhiBins(0),fHistoTrackResidualPhiMax(0),fHistoTrackResidualPhiMin(0),
+fHistoNPtSumBins(0),          fHistoPtSumMax(0.),          fHistoPtSumMin(0.),
+fHistoNPtInConeBins(0),       fHistoPtInConeMax(0.),       fHistoPtInConeMin(0.)
 {
   //Default Ctor
   
@@ -75,8 +77,8 @@ void AliHistogramRanges::InitParameters()
   fHistoPtBins           = 240 ;  fHistoPtMax           = 120   ; fHistoPtMin           = 0.  ;
   fHistoPhiBins          = 120 ;  fHistoPhiMax          = TMath::TwoPi(); fHistoPhiMin  = 0.  ;
   fHistoEtaBins          = 100 ;  fHistoEtaMax          = 1     ; fHistoEtaMin          = -1  ;
-  fHistoDeltaPhiBins     = 310 ;  fHistoDeltaPhiMax     = 4.8   ; fHistoDeltaPhiMin     = -1.7 ;
-  fHistoDeltaEtaBins     = 200 ;  fHistoDeltaEtaMax     = 2     ; fHistoDeltaEtaMin     = -2 ;
+  fHistoDeltaPhiBins     = 310 ;  fHistoDeltaPhiMax     = 4.8   ; fHistoDeltaPhiMin     = -1.7;
+  fHistoDeltaEtaBins     = 200 ;  fHistoDeltaEtaMax     = 2     ; fHistoDeltaEtaMin     = -2  ;
   fHistoMassBins         = 200 ;  fHistoMassMax         = 1.    ; fHistoMassMin         = 0.  ;
   fHistoAsymBins         = 10  ;  fHistoAsymMax         = 1.    ; fHistoAsymMin         = 0.  ;
   fHistoV0SBins          = 100 ;  fHistoV0SMax          = 10000 ; fHistoV0SMin          = 0   ;
@@ -97,6 +99,8 @@ void AliHistogramRanges::InitParameters()
   fHistoZBins            = 100 ;  fHistoZMax            = 600   ; fHistoZMin            = -500;//cm
   fHistoSSBins           = 500 ;  fHistoSSMax           = 5     ; fHistoSSMin           = 0   ;  
   fHistoDiffTimeBins     = 800 ;  fHistoDiffTimeMax     = 400   ; fHistoDiffTimeMin     = -400;// ns
+  fHistoNPtSumBins       = 100 ;  fHistoPtSumMax        = 50    ; fHistoPtSumMin        = 0.  ;
+  fHistoNPtInConeBins    = 100 ;  fHistoPtInConeMax     = 50    ; fHistoPtInConeMin     = 0.  ;
   
   fHistoTrackResidualEtaBins = 100 ; fHistoTrackResidualEtaMax = 0.15 ; fHistoTrackResidualEtaMin = -0.15;
   fHistoTrackResidualPhiBins = 100 ; fHistoTrackResidualPhiMax = 0.15 ; fHistoTrackResidualPhiMin = -0.15;
@@ -131,9 +135,11 @@ void AliHistogramRanges::Print(const Option_t * /*opt*/) const
   printf("Histograms: %d < N clusters   < %d, Nbin = %d\n"           , fHistoNClustersMin,   fHistoNClustersMax,   fHistoNClustersBins);
   printf("Histograms: %3.1f < Ratio< %3.1f, Nbin = %d\n"             , fHistoRatioMin,       fHistoRatioMax,       fHistoRatioBins);
   printf("Histograms: %3.1f < Vertex Distance < %3.1f,   Nbin = %d\n", fHistoVertexDistMin,  fHistoVertexDistMax,  fHistoVertexDistBins);
+  printf("Histograms: %3.1f < pT sum < %3.1f,  Nbin = %d\n"          , fHistoPtSumMin,       fHistoPtSumMax,       fHistoNPtSumBins   );
+  printf("Histograms: %3.1f < pT in cone < %3.1f, Nbin = %d\n"       , fHistoPtInConeMin,    fHistoPtInConeMax,    fHistoNPtInConeBins);
   printf("Histograms: %2.2f < Residual Eta(Z) < %2.2f,   Nbin = %d\n", fHistoTrackResidualEtaMin, fHistoTrackResidualEtaMax,fHistoTrackResidualEtaBins);
   printf("Histograms: %2.2f < Residual Phi(R,X) < %2.2f, Nbin = %d\n", fHistoTrackResidualPhiMin, fHistoTrackResidualPhiMax,fHistoTrackResidualPhiBins);
-
+  
   printf("    \n") ;
   
 } 

diff --git a/PWG/CaloTrackCorrBase/AliHistogramRanges.h b/PWG/CaloTrackCorrBase/AliHistogramRanges.h
index 81536bbe81df60a0e20a861d625c2f1f1fa321d9..73d09c8dceb61d40870b26c07379d7e705c9aabf 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliHistogramRanges.h
+++ b/PWG/CaloTrackCorrBase/AliHistogramRanges.h
@@ -281,6 +281,23 @@ public:
   void    SetHistoTrackResidualPhiRangeAndNBins(Float_t min, Float_t max, Int_t n) {
     fHistoTrackResidualPhiBins = n ; fHistoTrackResidualPhiMax = max ; fHistoTrackResidualPhiMin = min           ; }
   
+  // Isolation task, sum pt
+  
+  void    SetHistoPtSumRangeAndNBins(Float_t min, Float_t max, Int_t n) {
+    fHistoNPtSumBins = n ;    fHistoPtSumMax = max ;    fHistoPtSumMin = min ; }
+  
+  Int_t   GetHistoNPtSumBins()           const { return fHistoNPtSumBins   ; }
+  Float_t GetHistoPtSumMin()             const { return fHistoPtSumMin     ; }
+  Float_t GetHistoPtSumMax()             const { return fHistoPtSumMax     ; }
+  
+  void    SetHistoPtInConeRangeAndNBins(Float_t min, Float_t max, Int_t n) {
+    fHistoNPtInConeBins = n ; fHistoPtInConeMax = max ; fHistoPtInConeMin = min  ; }
+  
+  Int_t   GetHistoNPtInConeBins()        const { return fHistoNPtInConeBins; }
+  Float_t GetHistoPtInConeMin()          const { return fHistoPtInConeMin  ; }
+  Float_t GetHistoPtInConeMax()          const { return fHistoPtInConeMax  ; }
+
+  
 private:    
   
   Int_t    fHistoPtBins   ;                   // Number of bins in pt axis
@@ -368,11 +385,18 @@ private:
   Int_t    fHistoTrackResidualPhiBins ;       // Number of bins in dPhi axis
   Float_t  fHistoTrackResidualPhiMax  ;       // Maximum value of dPhi (cluster-track) histogram range
   Float_t  fHistoTrackResidualPhiMin  ;       // Minimum value of dPhi (cluster-track) histogram range
+  Int_t    fHistoNPtSumBins;                  // Number of bins in Isolation PtSum histograms
+  Float_t  fHistoPtSumMax;                    // Isolation PtSum maximum in histogram
+  Float_t  fHistoPtSumMin;                       // Isolation PtSum minimum in histogram
+  Int_t    fHistoNPtInConeBins;               // Number of bins in Isolation PtInCone histogram
+  Float_t  fHistoPtInConeMax;                 // Isolation PtInCone maximum in histogram
+  Float_t  fHistoPtInConeMin;                 // Isolation PtInCone maximum in histogram
+
   
   AliHistogramRanges(              const AliHistogramRanges & h) ; // cpy ctor
   AliHistogramRanges & operator = (const AliHistogramRanges & h) ; // cpy assignment
   
-  ClassDef(AliHistogramRanges,3)
+  ClassDef(AliHistogramRanges,4)
 } ;
 
 

diff --git a/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx b/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx
index 052f11275ef0c29aee7bf3d3b036bd79bdf7e15e..4bfce36aa1d717a8be75c3bab181cdf2573924cd 100755 (executable)
--- a/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx
+++ b/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx
@@ -147,10 +147,7 @@ fhENoIsoPileUp(),                 fhPtNoIsoPileUp(),
 fhTimeENoCut(0),                  fhTimeESPD(0),                  fhTimeESPDMulti(0),
 fhTimeNPileUpVertSPD(0),          fhTimeNPileUpVertTrack(0),
 fhTimeNPileUpVertContributors(0),
-fhTimePileUpMainVertexZDistance(0), fhTimePileUpMainVertexZDiamond(0),
-// Histograms settings
-fHistoNPtSumBins(0),              fHistoPtSumMax(0.),              fHistoPtSumMin(0.),
-fHistoNPtInConeBins(0),           fHistoPtInConeMax(0.),           fHistoPtInConeMin(0.)
+fhTimePileUpMainVertexZDistance(0), fhTimePileUpMainVertexZDiamond(0)
 {
   //default ctor
   
@@ -1350,12 +1347,12 @@ TList *  AliAnaParticleIsolation::GetCreateOutputObjects()
   Float_t pOverEmax   = GetHistogramRanges()->GetHistoPOverEMax();
   Float_t pOverEmin   = GetHistogramRanges()->GetHistoPOverEMin();
   
-  Int_t   nptsumbins    = fHistoNPtSumBins;
-  Float_t ptsummax      = fHistoPtSumMax;
-  Float_t ptsummin      = fHistoPtSumMin;
-  Int_t   nptinconebins = fHistoNPtInConeBins;
-  Float_t ptinconemax   = fHistoPtInConeMax;
-  Float_t ptinconemin   = fHistoPtInConeMin;
+  Int_t   nptsumbins    = GetHistogramRanges()->GetHistoNPtSumBins();
+  Float_t ptsummax      = GetHistogramRanges()->GetHistoPtSumMax();
+  Float_t ptsummin      = GetHistogramRanges()->GetHistoPtSumMin();
+  Int_t   nptinconebins = GetHistogramRanges()->GetHistoNPtInConeBins();
+  Float_t ptinconemax   = GetHistogramRanges()->GetHistoPtInConeMax();
+  Float_t ptinconemin   = GetHistogramRanges()->GetHistoPtInConeMin();
   
   //Float_t ptthre    = GetIsolationCut()->GetPtThreshold();
   //Float_t ptsumthre = GetIsolationCut()->GetSumPtThreshold();
@@ -3009,15 +3006,6 @@ void AliAnaParticleIsolation::InitParameters()
   fPtFractions    [0] = 0.05;    fPtFractions    [1] = 0.075; fPtFractions    [2] = 0.1; fPtFractions    [3] = 1.25; fPtFractions    [4] = 1.5;
   fSumPtThresholds[0] = 1.;      fSumPtThresholds[1] = 2.;    fSumPtThresholds[2] = 3.;  fSumPtThresholds[3] = 4.;   fSumPtThresholds[4] = 5.;
   
-  //------------- Histograms settings -------
-  fHistoNPtSumBins = 100 ;
-  fHistoPtSumMax   = 50 ;
-  fHistoPtSumMin   = 0.  ;
-  
-  fHistoNPtInConeBins = 100 ;
-  fHistoPtInConeMax   = 50 ;
-  fHistoPtInConeMin   = 0.  ;
-  
 }
 
 //__________________________________________________
@@ -3933,9 +3921,6 @@ void AliAnaParticleIsolation::Print(const Option_t * opt) const
     
   }
   
-  printf("Histograms: %3.1f < pT sum < %3.1f,  Nbin = %d\n",    fHistoPtSumMin,    fHistoPtSumMax,    fHistoNPtSumBins   );
-  printf("Histograms: %3.1f < pT in cone < %3.1f, Nbin = %d\n", fHistoPtInConeMin, fHistoPtInConeMax, fHistoNPtInConeBins);
-  
   printf("    \n") ;
   
 } 

diff --git a/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.h b/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.h
index ba401f81c9418218767203cb44cd89d6017ed405..357ef653d40996197b661de114f9e7d782ca1c91 100755 (executable)
--- a/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.h
+++ b/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.h
@@ -128,22 +128,6 @@ class AliAnaParticleIsolation : public AliAnaCaloTrackCorrBaseClass {
   void         SwitchOnDecayTaggedHistoFill()        { fFillTaggedDecayHistograms = kTRUE ; }
   void         SwitchOffDecayTaggedHistoFill()       { fFillTaggedDecayHistograms = kFALSE; }
   
-  //Histogrammes setters and getters
-  
-  void         SetHistoPtSumRangeAndNBins(Float_t min, Float_t max, Int_t n)       {
-    fHistoNPtSumBins = n ;    fHistoPtSumMax = max ;    fHistoPtSumMin = min ;     }
-  
-  Int_t        GetHistoNPtSumBins()            const { return fHistoNPtSumBins   ; }
-  Float_t      GetHistoPtSumMin()              const { return fHistoPtSumMin     ; }
-  Float_t      GetHistoPtSumMax()              const { return fHistoPtSumMax     ; }
-  
-  void         SetHistoPtInConeRangeAndNBins(Float_t min, Float_t max, Int_t n)    {
-    fHistoNPtInConeBins = n ; fHistoPtInConeMax = max ; fHistoPtInConeMin = min  ; }
-  
-  Int_t        GetHistoNPtInConeBins()         const { return fHistoNPtInConeBins; }
-  Float_t      GetHistoPtInConeMin()           const { return fHistoPtInConeMin  ; }
-  Float_t      GetHistoPtInConeMax()           const { return fHistoPtInConeMax  ; }
-  
  // For primary histograms in arrays, index in the array, corresponding to a photon origin
   enum mcPrimTypes { kmcPrimPhoton = 0, kmcPrimPi0Decay = 1, kmcPrimOtherDecay  = 2,
                      kmcPrimPrompt = 3, kmcPrimFrag     = 4, kmcPrimISR         = 5       } ;
@@ -405,18 +389,10 @@ class AliAnaParticleIsolation : public AliAnaCaloTrackCorrBaseClass {
   TH2F *   fhTimePileUpMainVertexZDistance;       //! time of cluster vs difference of z main vertex and pile-up vertex 
   TH2F *   fhTimePileUpMainVertexZDiamond;        //! time of cluster vs difference of z diamond and pile-up vertex 
   
-  //Histograms settings
-  Int_t    fHistoNPtSumBins;                      // Number of bins in PtSum histograms
-  Float_t  fHistoPtSumMax;                        // PtSum maximum in histogram
-  Float_t  fHistoPtSumMin;                           // PtSum minimum in histogram
-  Int_t    fHistoNPtInConeBins;                   // Number of bins in PtInCone histogram
-  Float_t  fHistoPtInConeMax;                     // PtInCone maximum in histogram
-  Float_t  fHistoPtInConeMin;                     // PtInCone maximum in histogram 
-
   AliAnaParticleIsolation(              const AliAnaParticleIsolation & iso) ; // cpy ctor
   AliAnaParticleIsolation & operator = (const AliAnaParticleIsolation & iso) ; // cpy assignment
   
-  ClassDef(AliAnaParticleIsolation,26)
+  ClassDef(AliAnaParticleIsolation,27)
 } ;
 
 

diff --git a/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorr.C b/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorr.C
index bd933d957c77908f1c704ce916be65851139709c..de8ad551a7dab9a70cd4606c950edbd29dfebe6c 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorr.C
+++ b/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorr.C
@@ -1292,9 +1292,6 @@ AliAnaParticleIsolation* ConfigureIsolationAnalysis(TString particle="Photon",
 
   SetHistoRangeAndNBins(ana->GetHistogramRanges()); // see method below
   
-  ana->SetHistoPtInConeRangeAndNBins(0, 50 , 250);
-  ana->SetHistoPtSumRangeAndNBins   (0, 100, 250);
-  
   if(particle=="Hadron"  || particle.Contains("CTS"))
   {
     ana->GetHistogramRanges()->SetHistoPhiRangeAndNBins(0, TMath::TwoPi(), 200) ;
@@ -1612,6 +1609,10 @@ void SetHistoRangeAndNBins (AliHistogramRanges* histoRanges)
   histoRanges->SetHistoV0MultiplicityRangeAndNBins(0,5000,500);
   histoRanges->SetHistoTrackMultiplicityRangeAndNBins(0,5000,500);
   
+  // Isolation
+  histoRanges->SetHistoPtInConeRangeAndNBins(0, 50 , 250);
+  histoRanges->SetHistoPtSumRangeAndNBins   (0, 100, 250);
+  
 }
 
 //_____________________________

diff --git a/PWGGA/CaloTrackCorrelations/macros/AddTaskGammaJetCorrelation.C b/PWGGA/CaloTrackCorrelations/macros/AddTaskGammaJetCorrelation.C
index 57bd481b7d4e54623a717023c35c81594162b2c0..fd10d91a8f300aa4e52b64039fdd35ae36c8c36e 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/AddTaskGammaJetCorrelation.C
+++ b/PWGGA/CaloTrackCorrelations/macros/AddTaskGammaJetCorrelation.C
@@ -756,9 +756,6 @@ AliAnaParticleIsolation* ConfigureIsolationAnalysis(TString calorimeter = "EMCAL
 
   SetHistoRangeAndNBins(ana->GetHistogramRanges(),calorimeter); // see method below
   
-  ana->SetHistoPtInConeRangeAndNBins(0, 50 , 250);
-  ana->SetHistoPtSumRangeAndNBins   (0, 100, 250);
-  
   if(particle=="Hadron"  || particle.Contains("CTS"))
   {
     ana->GetHistogramRanges()->SetHistoPhiRangeAndNBins(0, TMath::TwoPi(), 200) ;
@@ -836,6 +833,10 @@ void SetHistoRangeAndNBins (AliHistogramRanges* histoRanges,TString calorimeter
   histoRanges->SetHistoV0MultiplicityRangeAndNBins(0,5000,500);
   histoRanges->SetHistoTrackMultiplicityRangeAndNBins(0,5000,500);
   
+  // Isolation
+  histoRanges->SetHistoPtInConeRangeAndNBins(0, 50 , 250);
+  histoRanges->SetHistoPtSumRangeAndNBins   (0, 100, 250);
+  
 }
 
 //_________________

diff --git a/PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C b/PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C
index 4b178f249122cfb539d5f6215e5a0458bd8a4458..fd80f33e2979c8359608fb4a55b2f9c778deac71 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C
+++ b/PWGGA/CaloTrackCorrelations/macros/AddTaskIsoPhoton.C
@@ -552,9 +552,6 @@ AliAnaParticleIsolation* ConfigureIsolationAnalysis(TString calorimeter = "EMCAL
 
   SetHistoRangeAndNBins(ana->GetHistogramRanges(),calorimeter); // see method below
   
-  ana->SetHistoPtInConeRangeAndNBins(0, 50 , 250);
-  ana->SetHistoPtSumRangeAndNBins   (0, 100, 250);
-  
   if(particle=="Hadron"  || particle.Contains("CTS"))
   {
     ana->GetHistogramRanges()->SetHistoPhiRangeAndNBins(0, TMath::TwoPi(), 200) ;
@@ -706,6 +703,10 @@ void SetHistoRangeAndNBins (AliHistogramRanges* histoRanges, TString calorimeter
   histoRanges->SetHistoV0MultiplicityRangeAndNBins(0,5000,500);
   histoRanges->SetHistoTrackMultiplicityRangeAndNBins(0,5000,500);
   
+  // Isolation
+  histoRanges->SetHistoPtInConeRangeAndNBins(0, 50 , 250);
+  histoRanges->SetHistoPtSumRangeAndNBins   (0, 100, 250);
+  
 }
 
 //_____________________________