Fixes for compilation

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODHistoManager.cxx b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODHistoManager.cxx
index 182b127f7de7d1d8578e69febe838260a9e2f0db..a991038ed8b30c0915dc74ede5a392fc7b7fa770 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODHistoManager.cxx
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODHistoManager.cxx
@@ -34,6 +34,7 @@
 #include "AliAnalysisTaskESDfilter.h"
 #include "AliAnalysisDataContainer.h"
 #include "AliSpectraAODHistoManager.h"
+
 #include <iostream>
 
 using namespace std;
@@ -43,6 +44,18 @@ ClassImp(AliSpectraAODHistoManager)
 
 using namespace AliSpectraNameSpace;
 
+
+const char * kParticleSpecies[] =
+   {
+       "PionPlus",
+       "KaonPlus",
+       "ProtonPlus",
+       "PionMinus",
+       "KaonMinus",
+       "ProtonMinus",
+   };
+
+
 AliSpectraAODHistoManager::AliSpectraAODHistoManager(const char *name): TNamed(name, "AOD Spectra Histo Manager"), fOutputList(0)
 {
   // ctor

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODHistoManager.h b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODHistoManager.h
index 88642ac9d3e4aa65cbe9aa933ea19d717b8eea6a..1d3565b947ca5588f5dbbebea7051a5e3cb6be78 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODHistoManager.h
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODHistoManager.h
@@ -21,7 +21,7 @@ class TH2;
 #include "TNamed.h"
 #include "TList.h"
 #include "Histograms.h" // Change this file if you want to add an histogram
-#include "HistogramNames.h"
+#include "HistogramNames.h" // generate this automatically running createNames.py 
 
 namespace AliSpectraNameSpace
 {
@@ -36,15 +36,7 @@ namespace AliSpectraNameSpace
      kSpUndefined,
    }; // Particle species used in plotting
 
-   const char * kParticleSpecies[] =
-   {
-       "PionPlus",
-       "KaonPlus",
-       "ProtonPlus",
-       "PionMinus",
-       "KaonMinus",
-       "ProtonMinus",
-   };
+   extern const char * kParticleSpecies[];
 
    enum AODHistoType_t
    {

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODTrackCuts.cxx b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODTrackCuts.cxx
index 680712e8044aaf310d33cb92e574030b6d9df3d2..d072b48bfc97406edc31b0e793729893477924ba 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODTrackCuts.cxx
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODTrackCuts.cxx
@@ -40,6 +40,20 @@
 
 using namespace std;
 
+const char * AliSpectraAODTrackCuts::kBinLabel[] ={"TrkBit",
+                                                  "TrkCuts",
+                                                  "TrkEta",
+                                                  "TrkDCA",
+                                                  "TrkP",
+                                                  "TrkPt",
+                                                  "TrkPtTOF",
+                                                  "TOFMatching",
+                                                  "kTOFout",
+                                                  "kTIME",
+                                                  "kTOFpid",
+                                                  "Accepted"};
+
+
 ClassImp(AliSpectraAODTrackCuts)
 
 

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODTrackCuts.h b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODTrackCuts.h
index ee04974b705b447595a858ffeedfbf476376bcbb..dad40cf0c85e1d5cb1f94aab5df0eadefef1a7db 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODTrackCuts.h
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODTrackCuts.h
@@ -23,19 +23,6 @@ class AliAODTrack;
  
 using namespace AliSpectraNameSpace;
 
-const char * kBinLabel[] ={"TrkBit",
-                          "TrkCuts",
-                          "TrkEta",
-                          "TrkDCA",
-                          "TrkP",
-                          "TrkPt",
-                          "TrkPtTOF",
-                          "TOFMatching",
-                          "kTOFout",
-                          "kTIME",
-                          "kTOFpid",
-                          "Accepted"};
-
 class AliSpectraAODTrackCuts : public TNamed
 {
  public:
@@ -106,6 +93,8 @@ class AliSpectraAODTrackCuts : public TNamed
    TH1F             *fHistoNMatchedNeg;       // Matched negative tracks
    TH2F             *fHistoEtaPhiHighPt;       // EtaPhi distr at high pt (>1.5 GeV/c)
    AliAODTrack      *fTrack;           //! Track pointer
+   static const char * kBinLabel[]; // labels of stat histo
+
    
    AliSpectraAODTrackCuts(const AliSpectraAODTrackCuts&);
    AliSpectraAODTrackCuts& operator=(const AliSpectraAODTrackCuts&);

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/HistogramNames.h b/PWGLF/SPECTRA/PiKaPr/TestAOD/HistogramNames.h
index 6f9c548c75445ab6686b2b6b89c738ba39519cb0..69ed2bab205f9090bd722268874de61e21f2a204 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/HistogramNames.h
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/HistogramNames.h
@@ -5,93 +5,7 @@
 
 namespace AliSpectraNameSpace
 {
-   const char * kHistName[] =
-   {
-     "hHistPtGenTruePrimaryPionPlus",
-     "hHistPtGenTruePrimaryKaonPlus",
-     "hHistPtGenTruePrimaryProtonPlus",
-     "hHistPtGenTruePrimaryPionMinus",
-     "hHistPtGenTruePrimaryKaonMinus",
-     "hHistPtGenTruePrimaryProtonMinus",
-     "hHistPtGen",
-     "hHistPtRecSigmaPionPlus",
-     "hHistPtRecSigmaKaonPlus",
-     "hHistPtRecSigmaProtonPlus",
-     "hHistPtRecSigmaPionMinus",
-     "hHistPtRecSigmaKaonMinus",
-     "hHistPtRecSigmaProtonMinus",
-     "hHistPtRecTruePionPlus",
-     "hHistPtRecTrueKaonPlus",
-     "hHistPtRecTrueProtonPlus",
-     "hHistPtRecTruePionMinus",
-     "hHistPtRecTrueKaonMinus",
-     "hHistPtRecTrueProtonMinus",
-     "hHistPtRecTrueMuonPlus",
-     "hHistPtRecTrueMuonMinus",
-     "hHistPtRecPrimaryPionPlus",
-     "hHistPtRecPrimaryKaonPlus",
-     "hHistPtRecPrimaryProtonPlus",
-     "hHistPtRecPrimaryPionMinus",
-     "hHistPtRecPrimaryKaonMinus",
-     "hHistPtRecPrimaryProtonMinus",
-     "hHistPtRecPrimaryMuonPlus",
-     "hHistPtRecPrimaryMuonMinus",
-     "hHistPtRecSigmaPrimaryPionPlus",
-     "hHistPtRecSigmaPrimaryKaonPlus",
-     "hHistPtRecSigmaPrimaryProtonPlus",
-     "hHistPtRecSigmaPrimaryPionMinus",
-     "hHistPtRecSigmaPrimaryKaonMinus",
-     "hHistPtRecSigmaPrimaryProtonMinus",
-     "hHistPtRecSigmaSecondaryMaterialPionPlus",
-     "hHistPtRecSigmaSecondaryMaterialKaonPlus",
-     "hHistPtRecSigmaSecondaryMaterialProtonPlus",
-     "hHistPtRecSigmaSecondaryMaterialPionMinus",
-     "hHistPtRecSigmaSecondaryMaterialKaonMinus",
-     "hHistPtRecSigmaSecondaryMaterialProtonMinus",
-     "hHistPtRecSigmaSecondaryWeakDecayPionPlus",
-     "hHistPtRecSigmaSecondaryWeakDecayKaonPlus",
-     "hHistPtRecSigmaSecondaryWeakDecayProtonPlus",
-     "hHistPtRecSigmaSecondaryWeakDecayPionMinus",
-     "hHistPtRecSigmaSecondaryWeakDecayKaonMinus",
-     "hHistPtRecSigmaSecondaryWeakDecayProtonMinus",
-     "hHistPtRecTruePrimaryPionPlus",
-     "hHistPtRecTruePrimaryKaonPlus",
-     "hHistPtRecTruePrimaryProtonPlus",
-     "hHistPtRecTruePrimaryPionMinus",
-     "hHistPtRecTruePrimaryKaonMinus",
-     "hHistPtRecTruePrimaryProtonMinus",
-     "hHistPtRecTruePrimaryMuonPlus",
-     "hHistPtRecTruePrimaryMuonMinus",
-     "hHistPtRec",
-     "hHistPtRecPrimary",
-     "hHistPIDTPC",
-     "hHistPIDTOF",
-     "hHistPIDTPCPion",
-     "hHistPIDTPCKaon",
-     "hHistPIDTPCProton",
-     "hHistPIDTPCPionRec",
-     "hHistPIDTPCKaonRec",
-     "hHistPIDTPCProtonRec",
-     "hHistNSigPionTPC",
-     "hHistNSigKaonTPC",
-     "hHistNSigProtonTPC",
-     "hHistNSigPionPtTPC",
-     "hHistNSigKaonPtTPC",
-     "hHistNSigProtonPtTPC",
-     "hHistNSigPionTOF",
-     "hHistNSigKaonTOF",
-     "hHistNSigProtonTOF",
-     "hHistNSigPionPtTOF",
-     "hHistNSigKaonPtTOF",
-     "hHistNSigProtonPtTOF",
-     "hHistNSigPionTPCTOF",
-     "hHistNSigKaonTPCTOF",
-     "hHistNSigProtonTPCTOF",
-     "hHistNSigPionPtTPCTOF",
-     "hHistNSigKaonPtTPCTOF",
-     "hHistNSigProtonPtTPCTOF",
-     "hNHist",
-   };
+  extern const char * kHistName[] ;
 }
 
 #endif