In MUONChamberMaterialBudget.C

[u/mrichter/AliRoot.git] / MUON / mapping / AliMpMotifReader.h

diff --git a/MUON/mapping/AliMpMotifReader.h b/MUON/mapping/AliMpMotifReader.h
index 13c7cc57af3933d3218e6e3dc089d3d3b40b3949..f284e1fe2551a4dd975ca7a1a00ec4f0ab1af974 100644 (file)
--- a/MUON/mapping/AliMpMotifReader.h
+++ b/MUON/mapping/AliMpMotifReader.h
@@ -15,25 +15,15 @@
 
 #include <TObject.h>
 
-#include "AliMpContainers.h"
-
 #include "AliMpStationType.h"
 #include "AliMpStation12Type.h"
 #include "AliMpPlaneType.h"
-#include "AliMpIntPair.h"
-#include "AliMpContainers.h"
 
-#ifdef WITH_ROOT
 #include <TExMap.h>
-#endif    
 #include <TString.h>
-#include <TVector2.h>
 #include <Riostream.h>
 
 #include <fstream>
-#ifdef WITH_STL
-#include <map>
-#endif    
 
 class AliMpMotifMap;
 class AliMpVMotif;
@@ -43,18 +33,6 @@ class AliMpDataStreams;
 
 class AliMpMotifReader : public TObject
 {
-  public:
-#ifdef WITH_STL
-    /// Map of int pair to string
-    typedef std::map<std::string, std::pair<Int_t,Int_t> > PadMapType;
-    /// Map of int pair to string iterator
-    typedef PadMapType::iterator PadMapTypeIterator;
-#endif    
-#ifdef WITH_ROOT
-    /// Map of int pair to string
-    typedef TExMap PadMapType;
-#endif    
-
   public:
     AliMpMotifReader(const AliMpDataStreams& dataStreams,
                      AliMp::StationType station, 
@@ -78,7 +56,7 @@ class AliMpMotifReader : public TObject
     AliMpMotifReader&  operator = (const AliMpMotifReader& right);
 
     // data members  
-    const AliMpDataStreams& fDataStreams; ///< data streams
+    const AliMpDataStreams& fkDataStreams;///< data streams
     AliMp::StationType    fStationType;   ///< station type 
     AliMq::Station12Type  fStation12Type; ///< station12 type 
     AliMp::PlaneType      fPlaneType;     ///< plane type