Adding code to patch St1 HV mapping

[u/mrichter/AliRoot.git] / MUON / AliMUONGeometry.cxx

diff --git a/MUON/AliMUONGeometry.cxx b/MUON/AliMUONGeometry.cxx
index 5eb40531ccacfec3e1bb7b4d0c43c66d79b70361..f1d3a95d8dc46984ae4c4643d88add7448062e3b 100644 (file)
--- a/MUON/AliMUONGeometry.cxx
+++ b/MUON/AliMUONGeometry.cxx
@@ -14,18 +14,20 @@
  **************************************************************************/
 
 // $Id$
-//
-// ----------------------------
+
+//-----------------------------------------------------------------------------
 // Class AliMUONGeometry
 // ----------------------------
 // Manager class for geometry construction via geometry builders.
 // Author: Ivana Hrivnacova, IPN Orsay
+//-----------------------------------------------------------------------------
 
 #include "AliMUONGeometry.h"
 #include "AliMUONGeometryTransformer.h"
 #include "AliMUONGeometryModule.h"
 #include "AliMUONStringIntMap.h"
-#include "AliMUONGeometryStore.h"
+
+#include "AliMpDEManager.h"
 
 #include "AliLog.h"
 
@@ -35,6 +37,9 @@
 
 #include <iostream>
 
+using std::cerr;
+using std::endl;
+using std::ios;
 /// \cond CLASSIMP
 ClassImp(AliMUONGeometry)
 /// \endcond
@@ -53,7 +58,8 @@ AliMUONGeometry::AliMUONGeometry(Bool_t isOwner)
   fModules->SetOwner(isOwner);
   
   // Geometry parametrisation
-  fTransformer = new AliMUONGeometryTransformer(false);  
+  fTransformer = new AliMUONGeometryTransformer();
+  fTransformer->SetOwner(false); 
 }
 
 //______________________________________________________________________________
@@ -98,7 +104,7 @@ void AliMUONGeometry::FillData3(const TString& sensVolumePath,
 /// Fill the mapping of the sensitive volume path to the detection element.
 
   // Module Id
-  Int_t moduleId = AliMUONGeometryStore::GetModuleId(detElemId);
+  Int_t moduleId = AliMpDEManager::GetGeomModuleId(detElemId);
     
   // Get module
   AliMUONGeometryModule* module 
@@ -273,7 +279,7 @@ AliMUONGeometry::GetModuleByDEId(Int_t detElemId, Bool_t warn) const
 /// Return the geometry module specified by detElemId
 
   // Get module index
-  Int_t index = AliMUONGeometryStore::GetModuleId(detElemId);
+  Int_t index = AliMpDEManager::GetGeomModuleId(detElemId);
 
   return GetModule(index, warn);
 }