Forgotten commit

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

diff --git a/MUON/AliMUONGeometryModule.cxx b/MUON/AliMUONGeometryModule.cxx
index 86a54174226fb4725e5865e698767f54de503fb2..01f3c9197f55104bb61655075fa5f4802186ae19 100644 (file)
--- a/MUON/AliMUONGeometryModule.cxx
+++ b/MUON/AliMUONGeometryModule.cxx
@@ -14,7 +14,8 @@
  **************************************************************************/
 
 // $Id$
-//
+
+//-----------------------------------------------------------------------------
 // Class AliMUONGeometryModule
 // -----------------------------
 // Class for definition of the detector module parameters
@@ -22,31 +23,31 @@
 //  sensitive volumes and detection elements).
 //
 // Author: Ivana Hrivnacova, IPN Orsay
-
-#include <TVirtualMC.h>
-#include <TGeoMatrix.h>
-#include <TObjArray.h>
-#include <TArrayI.h>
-#include <Riostream.h>
-
-#include "AliLog.h"    
+//-----------------------------------------------------------------------------
 
 #include "AliMUONGeometryModule.h"
 #include "AliMUONGeometryModuleTransformer.h"
 #include "AliMUONGeometryEnvelope.h"
 #include "AliMUONGeometryEnvelopeStore.h"
 #include "AliMUONGeometryDetElement.h" 
-#include "AliMUONGeometryStore.h"      
-#include "AliMUONGeometrySVMap.h"      
+#include "AliMUONStringIntMap.h"       
 
+#include "AliLog.h"    
+
+#include <TVirtualMC.h>
+#include <TGeoMatrix.h>
+#include <TObjArray.h>
+#include <TArrayI.h>
+#include <Riostream.h>
+
+/// \cond CLASSIMP
 ClassImp(AliMUONGeometryModule)
+/// \endcond
 
 //______________________________________________________________________________
 AliMUONGeometryModule::AliMUONGeometryModule(Int_t moduleId)
  : TObject(),
    fIsVirtual(true),
-   fMotherVolume("ALIC"),
-   fVolume("NONE"),
    fNofSVs(0),
    fSVVolumeIds(0),
    fEnvelopes(0),
@@ -59,7 +60,7 @@ AliMUONGeometryModule::AliMUONGeometryModule(Int_t moduleId)
   fSVVolumeIds = new TArrayI(20);
 
   // Sensitive volumes map
-  fSVMap = new AliMUONGeometrySVMap(100);
+  fSVMap = new AliMUONStringIntMap();
 
   // Geometry parametrisation
   fTransformer = new AliMUONGeometryModuleTransformer(moduleId);
@@ -74,8 +75,6 @@ AliMUONGeometryModule::AliMUONGeometryModule(Int_t moduleId)
 AliMUONGeometryModule::AliMUONGeometryModule()
  : TObject(),
    fIsVirtual(true),
-   fMotherVolume(),
-   fVolume(),
    fNofSVs(0),
    fSVVolumeIds(0),
    fEnvelopes(0),
@@ -85,16 +84,6 @@ AliMUONGeometryModule::AliMUONGeometryModule()
 /// Default constructor
 }
 
-
-//______________________________________________________________________________
-AliMUONGeometryModule::AliMUONGeometryModule(const AliMUONGeometryModule& rhs)
-  : TObject(rhs)
-{
-/// Protected copy constructor
-
-  AliFatal("Copy constructor is not implemented.");
-}
-
 //______________________________________________________________________________
 AliMUONGeometryModule::~AliMUONGeometryModule() 
 {
@@ -106,20 +95,6 @@ AliMUONGeometryModule::~AliMUONGeometryModule()
   delete fTransformer;
 }
 
-//______________________________________________________________________________
-AliMUONGeometryModule& 
-AliMUONGeometryModule::operator = (const AliMUONGeometryModule& rhs) 
-{
-/// Protected assignement operator
-
-  // check assignement to self
-  if (this == &rhs) return *this;
-
-  AliFatal("Assignment operator is not implemented.");
-    
-  return *this;  
-}
-
 //
 // private methods
 //
@@ -141,16 +116,6 @@ Int_t AliMUONGeometryModule::GetSVIndex(Int_t svVolId) const
 // public methods
 //
 
-//______________________________________________________________________________
-void AliMUONGeometryModule::SetVolume(const TString& volumeName)
-{ 
-/// Set the concrete volume associated with this module.
-/// The module in not virtual in this case
-
-  fVolume = volumeName;
-  fIsVirtual = false;
-}
-
 //______________________________________________________________________________
 void  AliMUONGeometryModule::SetTransformation(const TGeoCombiTrans& transform)
 {
@@ -159,6 +124,14 @@ void  AliMUONGeometryModule::SetTransformation(const TGeoCombiTrans& transform)
   fTransformer->SetTransformation(transform);
 }  
 
+//______________________________________________________________________________
+void AliMUONGeometryModule::SetVolumePath(const TString& volumePath)
+{ 
+/// Set the volume path to transformer
+
+  fTransformer->SetVolumePath(volumePath);
+}
+
 //______________________________________________________________________________
 void  AliMUONGeometryModule::SetSensitiveVolume(Int_t svVolId)
 {
@@ -192,9 +165,9 @@ void  AliMUONGeometryModule::SetAlign(Bool_t align)
 AliMUONGeometryDetElement* 
 AliMUONGeometryModule::FindBySensitiveVolume(const TString& sensVolume) const
 {
-/// Find TGeoCombiTrans for the detector element Id specified by aligned volume 
+/// Find detection element which the sensitive volume specified by name belongs to
 
-  Int_t detElemId = fSVMap->GetDetElemId(sensVolume);
+  Int_t detElemId = fSVMap->Get(sensVolume);
 
   if (!detElemId) return 0; 
         // The specified sensitive volume is not in the map