Mapping corrections and updated geometry (Laurent, Ivana)

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

diff --git a/MUON/mapping/AliMpMotifReader.h b/MUON/mapping/AliMpMotifReader.h
index c1d354b72db8bbc7543a250a19d3f479e40e0d97..f284e1fe2551a4dd975ca7a1a00ec4f0ab1af974 100644 (file)
--- a/MUON/mapping/AliMpMotifReader.h
+++ b/MUON/mapping/AliMpMotifReader.h
@@ -15,44 +15,29 @@
 
 #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;
 class AliMpMotifSpecial;
 class AliMpMotifType;
+class AliMpDataStreams;
 
 class AliMpMotifReader : public TObject
 {
   public:
-#ifdef WITH_STL
-    typedef std::map<std::string, std::pair<Int_t,Int_t> > PadMapType;
-    typedef PadMapType::iterator PadMapTypeIterator;
-#endif    
-#ifdef WITH_ROOT
-    typedef TExMap PadMapType;
-#endif    
-
-  public:
-    AliMpMotifReader(AliMpStationType station, AliMpPlaneType plane);
-    AliMpMotifReader();
+    AliMpMotifReader(const AliMpDataStreams& dataStreams,
+                     AliMp::StationType station, 
+                     AliMq::Station12Type station12,
+                     AliMp::PlaneType plane);
     virtual ~AliMpMotifReader();
   
     // methods   
@@ -63,14 +48,20 @@ class AliMpMotifReader : public TObject
     TString MotifSpecialName(const TString& motifID, Double_t scale);
     
   private:
+    /// Not implemented
+    AliMpMotifReader();
+    /// Not implemented
     AliMpMotifReader(const AliMpMotifReader& right);
+    /// Not implemented
     AliMpMotifReader&  operator = (const AliMpMotifReader& right);
 
     // data members  
-    AliMpStationType  fStationType; ///< station type 
-    AliMpPlaneType    fPlaneType;   ///< plane type 
+    const AliMpDataStreams& fkDataStreams;///< data streams
+    AliMp::StationType    fStationType;   ///< station type 
+    AliMq::Station12Type  fStation12Type; ///< station12 type 
+    AliMp::PlaneType      fPlaneType;     ///< plane type 
 
-  ClassDef(AliMpMotifReader,1)  // Data reader
+  ClassDef(AliMpMotifReader,0)  // Data reader
 };
 
 #endif //ALI_MP_MOTIF_READER_H