- Using AliMUONStringIntMap instead of AliMUONGeometrySVMap

- Reordered includes, forward declarations

diff --git a/MUON/AliMUONGeometry.cxx b/MUON/AliMUONGeometry.cxx
index 26732fa6b87d51e3505a491d10fc45bfffab7f41..16f901db974d512f8de45a191b36931868cb7efb 100644 (file)
--- a/MUON/AliMUONGeometry.cxx
+++ b/MUON/AliMUONGeometry.cxx
@@ -21,19 +21,19 @@
 //
 // Author: Ivana Hrivnacova, IPN Orsay
 
-#include <iostream>
-
-#include <TObjArray.h>
-#include <Riostream.h>
-#include <TSystem.h>
-
 #include "AliMUONGeometry.h"
 #include "AliMUONGeometryTransformer.h"
 #include "AliMUONGeometryModule.h"
-#include "AliMUONGeometrySVMap.h"
+#include "AliMUONStringIntMap.h"
 #include "AliMUONGeometryStore.h"
+
 #include "AliLog.h"
 
+#include <TObjArray.h>
+#include <Riostream.h>
+#include <TSystem.h>
+
+#include <iostream>
 
 ClassImp(AliMUONGeometry)
  
@@ -135,7 +135,7 @@ void AliMUONGeometry::FillData3(const TString& sensVolumePath,
   }    
     
   // Get module sensitive volumes map
-  AliMUONGeometrySVMap* svMap = module->GetSVMap();     
+  AliMUONStringIntMap* svMap = module->GetSVMap();     
 
   // Map the sensitive volume to detection element
   svMap->Add(sensVolumePath, detElemId); 
@@ -182,10 +182,10 @@ void AliMUONGeometry::WriteData3(ofstream& out) const
   for (Int_t i=0; i<fModules->GetEntriesFast(); i++) {
     AliMUONGeometryModule* geometry 
       = (AliMUONGeometryModule*)fModules->At(i);
-    AliMUONGeometrySVMap* svMap
+    AliMUONStringIntMap* svMap
       = geometry->GetSVMap();
 
-    svMap->WriteMap(out);
+    svMap->Print("SV", out);
     out << endl;  
   }    
 }

diff --git a/MUON/AliMUONGeometry.h b/MUON/AliMUONGeometry.h
index 9063161337180cdf666e11a714c0dc054470f3ef..4e732d3cba383e77c6ad58ff2fb170a930e6f825 100644 (file)
--- a/MUON/AliMUONGeometry.h
+++ b/MUON/AliMUONGeometry.h
@@ -15,11 +15,11 @@
 #include <TObject.h>
 #include <TGeoMatrix.h>
 
-class TObjArray;
-
 class AliMUONGeometryModule;
 class AliMUONGeometryTransformer;
 
+class TObjArray;
+
 class AliMUONGeometry : public TObject
 {
   public:
@@ -33,7 +33,6 @@ class AliMUONGeometry : public TObject
     Bool_t  ReadSVMap(const TString& fileName);
     Bool_t  WriteSVMap(const TString& fileName) const;
 
-
     // get methods
     const AliMUONGeometryModule* GetModule(
                                     Int_t index, Bool_t warn = true) const;

diff --git a/MUON/AliMUONv1.cxx b/MUON/AliMUONv1.cxx
index e9381365437f0465da3f710e4cea95c8425b71c3..d26135d7192a1974c5832061fc1b1cb2d79f6bdb 100644 (file)
--- a/MUON/AliMUONv1.cxx
+++ b/MUON/AliMUONv1.cxx
@@ -19,15 +19,7 @@
 //  Manager and hits classes for set:MUON version 1    //
 /////////////////////////////////////////////////////////
 
-#include <TRandom.h>
-#include <TF1.h>
-#include <TClonesArray.h>
-#include <TRandom.h> 
-#include <TVirtualMC.h>
-#include <TGeoMatrix.h>
-
 #include "AliMUONv1.h"
-#include "AliConst.h" 
 #include "AliMUONConstants.h"
 #include "AliMUONSegFactory.h"
 #include "AliMUONResponseFactory.h"
@@ -38,13 +30,22 @@
 #include "AliMUONGeometry.h"   
 #include "AliMUONGeometryTransformer.h"        
 #include "AliMUONGeometryModule.h"     
-#include "AliMUONGeometrySVMap.h"      
+#include "AliMUONStringIntMap.h"       
 #include "AliMUONGeometryDetElement.h" 
+
+#include "AliConst.h" 
 #include "AliMagF.h"
 #include "AliRun.h"
 #include "AliMC.h"
 #include "AliLog.h"
 
+#include <TRandom.h>
+#include <TF1.h>
+#include <TClonesArray.h>
+#include <TRandom.h> 
+#include <TVirtualMC.h>
+#include <TGeoMatrix.h>
+
 #include <string>
 
 ClassImp(AliMUONv1)
@@ -249,7 +250,7 @@ TString  AliMUONv1::CurrentVolumePath() const
     gMC->CurrentVolOffID(imother++, copyNo);
     TString add = "/";
     add += name;
-    add += ".";
+    add += "_";
     add += copyNo;
     path.Insert(0,add); 
   }

diff --git a/MUON/AliMUONv1.h b/MUON/AliMUONv1.h
index 6ef8bd722e875ccbcc181c1899b874c68f785b42..eb057d99e33b5a678c0c357abbf82bbe05116571 100644 (file)
--- a/MUON/AliMUONv1.h
+++ b/MUON/AliMUONv1.h
@@ -14,10 +14,10 @@
 //  Manager and hits classes for set:MUON version 1    //
 /////////////////////////////////////////////////////////
  
-#include <TLorentzVector.h>
-
 #include "AliMUON.h"
 
+#include <TLorentzVector.h>
+
 class TF1;
 class TGeoCombiTrans;
 class TString;