From e8ea8cf2cc9641ec8bccbaa642310764f9f36592 Mon Sep 17 00:00:00 2001
From: fronchet <fronchet@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 22 Jun 2011 20:02:15 +0000
Subject: [PATCH] changing AliEMCALGeoUtils --> AliEMCALGeomery

---
 HLT/EMCAL/AliHLTEMCALGeometry.cxx |  3 ++-
 HLT/EMCAL/AliHLTEMCALGeometry.h   | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/HLT/EMCAL/AliHLTEMCALGeometry.cxx b/HLT/EMCAL/AliHLTEMCALGeometry.cxx
index 00ddf2a2c40..0863b6dd4a6 100644
--- a/HLT/EMCAL/AliHLTEMCALGeometry.cxx
+++ b/HLT/EMCAL/AliHLTEMCALGeometry.cxx
@@ -104,7 +104,8 @@ AliHLTEMCALGeometry::GetGeometryFromCDB()
 
 	  if(gGeoManager)
 	    {
-	      fGeo = new AliEMCALGeoUtils("EMCAL_COMPLETE","EMCAL");
+	      fGeo = AliEMCALGeometry::GetInstance("EMCAL_COMPLETEV1");
+	      //fGeo = new AliEMCALGeoUtils("EMCAL_COMPLETE","EMCAL");
 	      fReco = new AliEMCALRecoUtils;
 	      // FIXME
 	      // need to be parametrized
diff --git a/HLT/EMCAL/AliHLTEMCALGeometry.h b/HLT/EMCAL/AliHLTEMCALGeometry.h
index 0226f7b1e54..cd34d9797cf 100644
--- a/HLT/EMCAL/AliHLTEMCALGeometry.h
+++ b/HLT/EMCAL/AliHLTEMCALGeometry.h
@@ -17,7 +17,8 @@
  **************************************************************************/
 
 #include "AliHLTCaloGeometry.h"
-#include "AliEMCALGeoUtils.h"
+//#include "AliEMCALGeoUtils.h"
+#include "AliEMCALGeometry.h"
 #include "AliEMCALRecoUtils.h"
 
 class TGeoManager;
@@ -25,7 +26,8 @@ class AliCDBManager;
 class AliCDBPath;
 class AliHLTEMCALRecPointDataStruct;
 
-class AliEMCALGeoUtils;
+//class AliEMCALGeoUtils;
+class AliEMCALGeometry;
 
 class  AliHLTEMCALGeometry : public AliHLTCaloGeometry
 {
@@ -46,9 +48,9 @@ private:
 	AliHLTEMCALGeometry & operator = (const AliHLTEMCALGeometry &);	
 
 	// EMCal Geometry
-	AliEMCALGeoUtils *fGeo;
+	//AliEMCALGeoUtils *fGeo;
 	AliEMCALRecoUtils *fReco;
-
+	AliEMCALGeometry *fGeo;
 };
 
 #endif
-- 
2.39.3