X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2Fmapping%2FAliMpMotifReader.h;h=f284e1fe2551a4dd975ca7a1a00ec4f0ab1af974;hb=fb2d9d49abc001f645ffd650eef1cc9e533a6378;hp=dd4cf5722cd8deed54cb34e6c85cac4560df5c06;hpb=2a7ea2e676e334e9d722e39ce0adc85a4dcadbee;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/mapping/AliMpMotifReader.h b/MUON/mapping/AliMpMotifReader.h
index dd4cf5722cd..f284e1fe255 100644
--- a/MUON/mapping/AliMpMotifReader.h
+++ b/MUON/mapping/AliMpMotifReader.h
@@ -2,57 +2,42 @@
  * See cxx source for full Copyright notice                               */
 
 // $Id$
-// $MpId: AliMpMotifReader.h,v 1.7 2006/03/17 11:37:51 ivana Exp $
+// $MpId: AliMpMotifReader.h,v 1.9 2006/05/24 13:58:18 ivana Exp $
 
 /// \ingroup motif
 /// \class AliMpMotifReader
 /// \brief Class that takes care of reading the motifs data.
 ///
-/// Authors: David Guez, Ivana Hrivnacova; IPN Orsay
+/// \author David Guez, Ivana Hrivnacova; IPN Orsay
 
 #ifndef ALI_MP_MOTIF_READER_H
 #define ALI_MP_MOTIF_READER_H
 
 #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   
@@ -60,17 +45,23 @@ class AliMpMotifReader : public TObject
     AliMpMotifSpecial*  BuildMotifSpecial(const TString& motifID,
                                           AliMpMotifType* motifType,
                                           Double_t scale=1.0);
+    TString MotifSpecialName(const TString& motifID, Double_t scale);
     
-  protected:
+  private:
+    /// Not implemented
+    AliMpMotifReader();
+    /// Not implemented
     AliMpMotifReader(const AliMpMotifReader& right);
+    /// Not implemented
     AliMpMotifReader&  operator = (const AliMpMotifReader& right);
 
-  private:
     // 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