fix typo

[u/mrichter/AliRoot.git] / ITS / AliITSLoader.cxx

diff --git a/ITS/AliITSLoader.cxx b/ITS/AliITSLoader.cxx
index 12bd812d34411d601b76a03a809e4bb5eacc58e2..bab70821400244fe660464443423da41c9ab3777 100644 (file)
--- a/ITS/AliITSLoader.cxx
+++ b/ITS/AliITSLoader.cxx
@@ -18,6 +18,7 @@
 #include <TClonesArray.h>
 #include <TClass.h>
 #include <TGeoManager.h>
+#include <TTree.h>
 
 #include "AliITSdigit.h"
 #include "AliITSLoader.h"
@@ -32,12 +33,6 @@
 // raw clusters, primary vertices
 // V0 and cascade
 // and tracks propagated to the origin
-//////////////////////////////////////////////////////////////////////////
-const TString AliITSLoader::fgkDefaultRawClustersContainerName = "TreeC";
-const TString AliITSLoader::fgkDefaultBackTracksContainerName = "TreeB";
-const TString AliITSLoader::fgkDefaultVerticesContainerName = "Vertex";
-const TString AliITSLoader::fgkDefaultV0ContainerName = "V0";
-const TString AliITSLoader::fgkDefaultCascadeContainerName = "Cascade";
 ClassImp(AliITSLoader)
 
 /**********************************************************************/
@@ -51,34 +46,34 @@ AliLoader(name,topfoldername),
 fGeom(0){
   //Constructor   
     AliDataLoader* rawClustersDataLoader = new AliDataLoader(
-        fDetectorName + ".RawCl.root",fgkDefaultRawClustersContainerName,
+        fDetectorName + ".RawCl.root",GetDefaultRawClustersContainerName(),
         "Raw Clusters");
     fDataLoaders->Add(rawClustersDataLoader);
     rawClustersDataLoader->SetEventFolder(fEventFolder);
     rawClustersDataLoader->SetFolder(GetDetectorDataFolder());
 
     AliDataLoader* backTracksDataLoader =  new AliDataLoader(
-        fDetectorName + ".BackTracks.root",fgkDefaultBackTracksContainerName,
+        fDetectorName + ".BackTracks.root",GetDefaultBackTracksContainerName(),
         "Back Propagated Tracks");
     fDataLoaders->Add(backTracksDataLoader);
     backTracksDataLoader->SetEventFolder(fEventFolder);
     backTracksDataLoader->SetFolder(GetDetectorDataFolder());
 
     AliDataLoader* vertexDataLoader = new AliDataLoader(
-        fDetectorName + ".Vertex.root",fgkDefaultVerticesContainerName,
+        fDetectorName + ".Vertex.root",GetDefaultVerticesContainerName(),
         "Primary Vertices","O");
     fDataLoaders->Add(vertexDataLoader);
     vertexDataLoader->SetEventFolder(fEventFolder);
     vertexDataLoader->SetFolder(GetDetectorDataFolder());
 
     AliDataLoader* v0DataLoader = new AliDataLoader(
-        fDetectorName + ".V0s.root",fgkDefaultV0ContainerName,"V0 Vertices");
+        fDetectorName + ".V0s.root",GetDefaultV0ContainerName(),"V0 Vertices");
     fDataLoaders->Add(v0DataLoader);
     v0DataLoader->SetEventFolder(fEventFolder);
     v0DataLoader->SetFolder(GetDetectorDataFolder());
 
     AliDataLoader* cascadeDataLoader = new AliDataLoader(
-        fDetectorName + ".Cascades.root",fgkDefaultCascadeContainerName,
+        fDetectorName + ".Cascades.root",GetDefaultCascadeContainerName(),
         "Cascades");
     fDataLoaders->Add(cascadeDataLoader);
     cascadeDataLoader->SetEventFolder(fEventFolder);
@@ -90,34 +85,34 @@ AliITSLoader::AliITSLoader(const Char_t *name,TFolder *topfolder):
 fGeom(0){
   //ctor  
     AliDataLoader*  rawClustersDataLoader = new AliDataLoader(
-        fDetectorName + ".RawCl.root",fgkDefaultRawClustersContainerName,
+        fDetectorName + ".RawCl.root",GetDefaultRawClustersContainerName(),
         "Raw Clusters"); 
     fDataLoaders->Add(rawClustersDataLoader);
     rawClustersDataLoader->SetEventFolder(fEventFolder);
     rawClustersDataLoader->SetFolder(GetDetectorDataFolder());
 
     AliDataLoader*  backTracksDataLoader =  new AliDataLoader(
-        fDetectorName + ".BackTracks.root",fgkDefaultBackTracksContainerName,
+        fDetectorName + ".BackTracks.root",GetDefaultBackTracksContainerName(),
         "Back Propagated Tracks");
     fDataLoaders->Add(backTracksDataLoader);
     backTracksDataLoader->SetEventFolder(fEventFolder);
     backTracksDataLoader->SetFolder(GetDetectorDataFolder());
 
     AliDataLoader* vertexDataLoader = new AliDataLoader(
-        fDetectorName + ".Vertex.root",fgkDefaultVerticesContainerName,
+        fDetectorName + ".Vertex.root",GetDefaultVerticesContainerName(),
         "Primary Vertices","O");
     fDataLoaders->Add(vertexDataLoader);
     vertexDataLoader->SetEventFolder(fEventFolder);
     vertexDataLoader->SetFolder(GetDetectorDataFolder());
 
     AliDataLoader* v0DataLoader = new AliDataLoader(
-        fDetectorName + ".V0.root",fgkDefaultV0ContainerName,"V0 Vertices");
+        fDetectorName + ".V0.root",GetDefaultV0ContainerName(),"V0 Vertices");
     fDataLoaders->Add(v0DataLoader);
     v0DataLoader->SetEventFolder(fEventFolder);
     v0DataLoader->SetFolder(GetDetectorDataFolder());
 
     AliDataLoader* cascadeDataLoader = new AliDataLoader(
-        fDetectorName + ".Cascade.root",fgkDefaultCascadeContainerName,
+        fDetectorName + ".Cascade.root",GetDefaultCascadeContainerName(),
         "Cascades");
     fDataLoaders->Add(cascadeDataLoader);
     cascadeDataLoader->SetEventFolder(fEventFolder);
@@ -357,3 +352,33 @@ void AliITSLoader::SetITSgeom(AliITSgeom *geom){
     }// end if
     fGeom=geom;
 }
+
+const TString& AliITSLoader::GetDefaultRawClustersContainerName() {
+  //default for Raw Clusters container name
+  static const TString kDefaultRawClustersContainerName = "TreeC";  
+  return kDefaultRawClustersContainerName;
+}
+
+const TString& AliITSLoader::GetDefaultBackTracksContainerName() {
+ //default for Back propag. tracks container name
+  static const TString kDefaultBackTracksContainerName = "TreeB";   
+  return kDefaultBackTracksContainerName;
+}
+
+const TString& AliITSLoader::GetDefaultVerticesContainerName() {
+  //default for primary vertices container name
+  static const TString kDefaultVerticesContainerName = "Vertex";     
+  return kDefaultVerticesContainerName;
+}
+
+const TString& AliITSLoader::GetDefaultV0ContainerName() {
+  //default for V0 container name
+  static const TString kDefaultV0ContainerName = "V0";
+  return kDefaultV0ContainerName;
+}
+
+const TString& AliITSLoader::GetDefaultCascadeContainerName() {
+  //default fo cascade container name
+  static const TString kDefaultCascadeContainerName = "Cascade";
+  return kDefaultCascadeContainerName;
+}