Merge branch 'master' of https://git.cern.ch/reps/AliRoot

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

diff --git a/ITS/AliITSLoader.cxx b/ITS/AliITSLoader.cxx
index 681f6800880a2a0cf9d7c92a2482b74074cf0430..bab70821400244fe660464443423da41c9ab3777 100644 (file)
--- a/ITS/AliITSLoader.cxx
+++ b/ITS/AliITSLoader.cxx
@@ -15,11 +15,16 @@
 
 /* $Id$ */
 
+#include <TClonesArray.h>
 #include <TClass.h>
+#include <TGeoManager.h>
+#include <TTree.h>
 
 #include "AliITSdigit.h"
 #include "AliITSLoader.h"
 #include "AliRunLoader.h"
+#include "AliObjectLoader.h"
+#include "AliITSInitGeometry.h"
 #include "AliLog.h"
 
 ///////////////////////////////////////////////////////////////////////////
@@ -28,55 +33,47 @@
 // 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)
 
 /**********************************************************************/
   AliITSLoader::AliITSLoader():AliLoader(),
-fITSpid(0),
 fGeom(0){
   // Default constructor
 }
 /*********************************************************************/
 AliITSLoader::AliITSLoader(const Char_t *name,const Char_t *topfoldername):
 AliLoader(name,topfoldername),
-fITSpid(0),
 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);
@@ -85,38 +82,37 @@ fGeom(0){
 /**********************************************************************/
 AliITSLoader::AliITSLoader(const Char_t *name,TFolder *topfolder): 
   AliLoader(name,topfolder),
-fITSpid(0),
 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);
@@ -206,7 +202,7 @@ void AliITSLoader::SetupDigits(TObjArray *digPerDet,Int_t n,
     TClonesArray *cl = 0;
     TTree *td = 0;
     TBranch *br = 0;
-    Char_t branch[13];
+    Char_t branch[14];
     const Char_t *det[3] = {"SPD","SDD","SSD"};
 
     if(!digPerDet){
@@ -227,8 +223,8 @@ void AliITSLoader::SetupDigits(TObjArray *digPerDet,Int_t n,
     for(i=0;i<n;i++){
         if(digPerDet->At(i)==0){ // set up TClones Array
             digPerDet->AddAt(new TClonesArray(digclass[i],1000),i);
-            if(n==3) sprintf(branch,"ITSDigits%s",det[i]);
-            else     sprintf(branch,"ITSDigits%d",i+1);
+            if(n==3) snprintf(branch,13,"ITSDigits%s",det[i]);
+            else     snprintf(branch,13,"ITSDigits%d",i+1);
             br = td->GetBranch(branch);
             br->SetAddress(&((*digPerDet)[i]));
             continue; // do next one.
@@ -244,8 +240,8 @@ void AliITSLoader::SetupDigits(TObjArray *digPerDet,Int_t n,
                   "derived from AliITSdigit",i,digPerDet->At(i));
         } // end if
         cl->Clear();
-        if(n==3) sprintf(branch,"ITSDigits%s",det[i]);
-        else     sprintf(branch,"ITSDigits%d",i+1);
+        if(n==3) snprintf(branch,13,"ITSDigits%s",det[i]);
+        else     snprintf(branch,13,"ITSDigits%d",i+1);
         br = td->GetBranch(branch);
         br->SetAddress(&((*digPerDet)[i]));
         continue;
@@ -327,22 +323,14 @@ AliITSgeom* AliITSLoader::GetITSgeom(Bool_t force) {
     delete fGeom;
     fGeom = 0;
   }
-  AliRunLoader *runLoader = GetRunLoader();
-  if (!runLoader->GetAliRun()) runLoader->LoadgAlice();
-  if (!runLoader->GetAliRun()) {
-    Error("GetITSgeom", "couldn't get AliRun object");
-    return NULL;
+  if(!gGeoManager){
+    AliError("gGeoManager is a null pointer - ITS geometry not built");
+    return fGeom;
   }
-  
-  TDirectory *curdir = gDirectory;
-  runLoader->CdGAFile();
-  fGeom = (AliITSgeom*)gDirectory->Get("AliITSgeom");
-  curdir->cd();
-  if(!fGeom){
-    Error("GetITSgeom","no ITS geometry available");
-    return NULL;
-  }
-  AliDebug(1,"AliITSgeom object has been fetched from galice.root file");
+  AliITSInitGeometry initgeom;
+  fGeom = initgeom.CreateAliITSgeom();
+  AliDebug(1,"AliITSgeom object has been initialized from TGeo\n");
+  AliDebug(1,Form("Geometry name: %s",(initgeom.GetGeometryName()).Data()));
   return fGeom;
 }
 //______________________________________________________________________
@@ -365,3 +353,32 @@ void AliITSLoader::SetITSgeom(AliITSgeom *geom){
     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;
+}