Move GenerateFixedBinArray to AliAnalysisTaskEmcal and change data type from Float...

diff --git a/PWG/EMCAL/AliAnalysisTaskEmcal.cxx b/PWG/EMCAL/AliAnalysisTaskEmcal.cxx
index fc652043a70e7c86e17d1b738e163cd96fe25f48..192b0dc26d33b265cd6be33abaa1d70c04e1d415 100644 (file)
--- a/PWG/EMCAL/AliAnalysisTaskEmcal.cxx
+++ b/PWG/EMCAL/AliAnalysisTaskEmcal.cxx
@@ -1219,3 +1219,23 @@ void AliAnalysisTaskEmcal::AddObjectToEvent(TObject *obj)
     AliFatal(Form("%s: Container with name %s already present. Aborting", GetName(), obj->GetName()));
   }
 }
+
+//________________________________________________________________________
+void AliAnalysisTaskEmcal::GenerateFixedBinArray(Int_t n, Double_t min, Double_t max, Double_t* array) const
+{
+  Double_t binWidth = (max-min)/n;
+  array[0] = min;
+  for (Int_t i = 1; i <= n; i++) {
+    array[i] = array[i-1]+binWidth;
+  }
+}
+
+//________________________________________________________________________
+Double_t* AliAnalysisTaskEmcal::GenerateFixedBinArray(Int_t n, Double_t min, Double_t max) const
+{
+  Double_t *array = new Double_t[n+1];
+
+  GenerateFixedBinArray(n, min, max, array);
+
+  return array;
+}

diff --git a/PWG/EMCAL/AliAnalysisTaskEmcal.h b/PWG/EMCAL/AliAnalysisTaskEmcal.h
index 12dae067e30e879113dfd883882c3454e5f4c895..e24fdb9704734a4cd5079ce431281f0116fb62e4 100644 (file)
--- a/PWG/EMCAL/AliAnalysisTaskEmcal.h
+++ b/PWG/EMCAL/AliAnalysisTaskEmcal.h
@@ -84,6 +84,8 @@ class AliAnalysisTaskEmcal : public AliAnalysisTaskSE {
   void                        SetVzRange(Double_t min, Double_t max)                { fMinVz             = min  ; fMaxVz   = max          ; }
 
  protected:
+  Double_t*                   GenerateFixedBinArray(Int_t n, Double_t min, Double_t max) const;
+  void                        GenerateFixedBinArray(Int_t n, Double_t min, Double_t max, Double_t* array) const;
   void                        SetMakeGeneralHistograms(Bool_t g)                    { fGeneralHistograms = g                              ; }
   Bool_t                      AcceptCluster(AliVCluster *clus, Int_t c = 0)      const;
   Bool_t                      AcceptTrack(AliVParticle *track, Int_t c = 0)      const;

diff --git a/PWGJE/EMCALJetTasks/AliAnalysisTaskDeltaPt.cxx b/PWGJE/EMCALJetTasks/AliAnalysisTaskDeltaPt.cxx
index b70416402e41ee1533ef46c70f5ec6eb04b472dd..dbbc190480a8bf0175e1453b757861152a4b87f2 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliAnalysisTaskDeltaPt.cxx
+++ b/PWGJE/EMCALJetTasks/AliAnalysisTaskDeltaPt.cxx
@@ -262,11 +262,11 @@ void AliAnalysisTaskDeltaPt::UserCreateOutputObjects()
   TString histname;
 
   const Int_t nbinsZ = 12;
-  Float_t binsZ[nbinsZ+1] = {0,1,2,3,4,5,6,7,8,9,10,20,1000};
+  Double_t binsZ[nbinsZ+1] = {0,1,2,3,4,5,6,7,8,9,10,20,1000};
 
-  Float_t *binsPt       = GenerateFixedBinArray(fNbins, fMinBinPt, fMaxBinPt);
-  Float_t *binsCorrPt   = GenerateFixedBinArray(fNbins*2, -fMaxBinPt, fMaxBinPt);
-  Float_t *binsArea     = GenerateFixedBinArray(50, 0, 2);
+  Double_t *binsPt       = GenerateFixedBinArray(fNbins, fMinBinPt, fMaxBinPt);
+  Double_t *binsCorrPt   = GenerateFixedBinArray(fNbins*2, -fMaxBinPt, fMaxBinPt);
+  Double_t *binsArea     = GenerateFixedBinArray(50, 0, 2);
 
   for (Int_t i = 0; i < fNcentBins; i++) {
     if (fTracksCont || fCaloClustersCont) {

diff --git a/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJet.cxx b/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJet.cxx
index ac1f33d0e18b173dba0012365ccf623b355f4cae..ca2b25f1c74e0677b02a245d76c21bdc3e1eee42 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJet.cxx
+++ b/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJet.cxx
@@ -76,20 +76,6 @@ Bool_t AliAnalysisTaskEmcalJet::AcceptBiasJet(AliEmcalJet *jet, Int_t c)
   return cont->AcceptBiasJet(jet);
 }
 
-//________________________________________________________________________
-Float_t* AliAnalysisTaskEmcalJet::GenerateFixedBinArray(Int_t n, Float_t min, Float_t max) const
-{
-  Float_t *bins = new Float_t[n+1];
-
-  Float_t binWidth = (max-min)/n;
-  bins[0] = min;
-  for (Int_t i = 1; i <= n; i++) {
-    bins[i] = bins[i-1]+binWidth;
-  }
-
-  return bins;
-}
-
 //________________________________________________________________________
 Double_t AliAnalysisTaskEmcalJet::GetLeadingHadronPt(AliEmcalJet *jet, Int_t c)
 {

diff --git a/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJet.h b/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJet.h
index dcf2797fc3ec72fe4d8bf1331048e539f4f39812..2ac5c8bc03b0f1631ccb23bce4f61b1c87720930 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJet.h
+++ b/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJet.h
@@ -53,7 +53,6 @@ class AliAnalysisTaskEmcalJet : public AliAnalysisTaskEmcal {
   AliJetContainer            *GetJetContainer(const char* name)                                        const;
 
  protected:
-  Float_t*                    GenerateFixedBinArray(Int_t n, Float_t min, Float_t max) const;
   virtual Bool_t              AcceptJet(AliEmcalJet* jet, Int_t c =0);
   Bool_t                      AcceptBiasJet(AliEmcalJet* jet, Int_t c =0);
   Double_t                    GetLeadingHadronPt(AliEmcalJet* jet, Int_t c =0);

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskDeltaPtJEmb.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskDeltaPtJEmb.cxx
index 48673ec69539bb4a649aad3686e86ae1419a75f0..5cad62176a0abe3748a81d501a10a2af3abca890 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskDeltaPtJEmb.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskDeltaPtJEmb.cxx
@@ -154,11 +154,11 @@ void AliAnalysisTaskDeltaPtJEmb::UserCreateOutputObjects()
   TString histname;
 
   const Int_t nbinsZ = 12;
-  Float_t binsZ[nbinsZ+1] = {0,1,2,3,4,5,6,7,8,9,10,20,1000};
+  Double_t binsZ[nbinsZ+1] = {0,1,2,3,4,5,6,7,8,9,10,20,1000};
 
-  Float_t *binsPt       = GenerateFixedBinArray(fNbins, fMinBinPt, fMaxBinPt);
-  Float_t *binsCorrPt   = GenerateFixedBinArray(fNbins*2, -fMaxBinPt, fMaxBinPt);
-  Float_t *binsArea     = GenerateFixedBinArray(50, 0, 2);
+  Double_t *binsPt       = GenerateFixedBinArray(fNbins, fMinBinPt, fMaxBinPt);
+  Double_t *binsCorrPt   = GenerateFixedBinArray(fNbins*2, -fMaxBinPt, fMaxBinPt);
+  Double_t *binsArea     = GenerateFixedBinArray(50, 0, 2);
 
   for (Int_t i = 0; i < fNcentBins; i++) {
     histname = "fHistEmbJetsPtArea_";