Added the geometry object as a data member ! Warning: from now on you get the geometr...

diff --git a/EMCAL/AliEMCAL.cxx b/EMCAL/AliEMCAL.cxx
index cb9dbef566d2312118ae2d4b4e3de9865d9a1ca8..aad20680a75e43a4efb399906f8dcdf3c662cbcd 100644 (file)
--- a/EMCAL/AliEMCAL.cxx
+++ b/EMCAL/AliEMCAL.cxx
@@ -49,6 +49,7 @@ AliEMCAL::AliEMCAL():AliDetector()
   fName="EMCAL";
   //fQATask = 0;
   fTreeQA = 0;
+  fGeom = 0 ; 
 }
 
 //____________________________________________________________________________
@@ -56,6 +57,7 @@ AliEMCAL::AliEMCAL(const char* name, const char* title): AliDetector(name,title)
 {
   //   ctor : title is used to identify the layout
   
+  fGeom = AliEMCALGeometry::GetInstance(GetTitle(),"") ; 
   //fQATask = 0;
   fTreeQA = 0;
 }
@@ -156,9 +158,11 @@ void AliEMCAL::CreateMaterials()
 AliEMCALGeometry * AliEMCAL::GetGeometry() const 
 {  
   // gets the pointer to the AliEMCALGeometry unique instance 
-  
-  return AliEMCALGeometry::GetInstance(GetTitle(),"") ;  
 
+  if (fGeom) 
+    return fGeom ; 
+  else 
+    return AliEMCALGeometry::GetInstance(GetTitle(),"") ;  
 }
 
 //____________________________________________________________________________

diff --git a/EMCAL/AliEMCAL.h b/EMCAL/AliEMCAL.h
index 670c5f5ff72c5e4ea36da13f6ef0a0f3eb60f9bc..00b8ca93f914c3a31c3ac5eb81d5b092c226c438 100644 (file)
--- a/EMCAL/AliEMCAL.h
+++ b/EMCAL/AliEMCAL.h
@@ -64,8 +64,9 @@ protected:
 
   //AliEMCALQAChecker * fQATask ; //! PHOS checkers container
   TTree * fTreeQA ;            // the QA tree that contains the alarms
+  AliEMCALGeometry * fGeom ;   // the geometry object
 
-  ClassDef(AliEMCAL,2) // Electromagnetic calorimeter (base class)
+  ClassDef(AliEMCAL,3) // Electromagnetic calorimeter (base class)
 
 } ;