X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2Fmapping%2FAliMpSectorReader.h;h=d44ba95d2b5e9a54b27a8baf655abd2fb3f210d0;hb=986c0fd379f3eab79564add7996b3b6e412dff5d;hp=c40f60711f9c2b30c69c6e5fa123adcf05ac92cc;hpb=197883c2195f7e41057531083b863dc91f49d375;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/mapping/AliMpSectorReader.h b/MUON/mapping/AliMpSectorReader.h
index c40f60711f9..d44ba95d2b5 100755
--- a/MUON/mapping/AliMpSectorReader.h
+++ b/MUON/mapping/AliMpSectorReader.h
@@ -2,27 +2,26 @@
  * See cxx source for full Copyright notice                               */
 
 // $Id$
-// $MpId: AliMpSectorReader.h,v 1.3 2005/08/26 15:43:36 ivana Exp $
+// $MpId: AliMpSectorReader.h,v 1.7 2006/05/24 13:58:21 ivana Exp $
 
 /// \ingroup sector
 /// \class AliMpSectorReader
 /// \brief Class that takes care of reading the sector data.
 ///
-/// Authors: David Guez, Ivana Hrivnacova; IPN Orsay
+/// \author David Guez, Ivana Hrivnacova; IPN Orsay
 
 #ifndef ALI_MP_SECTOR_READER_H
 #define ALI_MP_SECTOR_READER_H
 
-#include <fstream>
-
 #include <TObject.h>
-#include <TString.h>
 
-#include "AliMpSectorTypes.h"
-#include "AliMpStationType.h"
+#include "AliMpStation12Type.h"
 #include "AliMpPlaneType.h"
 #include "AliMpXDirection.h"
-#include "AliMpIntPair.h"
+
+#include <TString.h>
+
+#include <fstream>
 
 class AliMpSector;
 class AliMpZone;
@@ -33,59 +32,60 @@ class AliMpMotifReader;
 class AliMpVMotif;
 class AliMpMotifSpecial;
 class AliMpMotifType;
+class AliMpDataStreams;
 
 class AliMpSectorReader : public TObject
 {
   public:
-    AliMpSectorReader(AliMpStationType station, AliMpPlaneType plane);
-    AliMpSectorReader();
+    AliMpSectorReader(const AliMpDataStreams& dataStreams,
+                      AliMq::Station12Type station, AliMp::PlaneType plane);
     virtual ~AliMpSectorReader();
   
     // methods   
     AliMpSector*  BuildSector();
-
-    // set methods
-    void SetVerboseLevel(Int_t verboseLevel); 
     
-  protected:
+  private:  
+    /// Not implemented
+    AliMpSectorReader();
+    /// Not implemented
     AliMpSectorReader(const AliMpSectorReader& right);
-    AliMpSectorReader&  operator = (const AliMpSectorReader& right);
+    /// Not implemented
+    AliMpSectorReader& operator = (const AliMpSectorReader& right);
 
-  private:  
     // methods
-    void  ReadSectorData(ifstream& in);
-    void  ReadZoneData(ifstream& in);
-    void  ReadSubZoneData(ifstream& in, AliMpZone* zone);
-    void  ReadRowSegmentsData(ifstream& in,
+    void  ReadSectorData(istream& in);
+    void  ReadZoneData(istream& in);
+    void  ReadSubZoneData(istream& in, AliMpZone* zone);
+    void  ReadRowSegmentsData(istream& in,
                           AliMpZone* zone, AliMpSubZone* subZone);
-    AliMpVMotif*  ReadMotifData(ifstream& in, AliMpZone* zone);
-    void  ReadSectorSpecialData(ifstream& in, AliMpXDirection direction);
-    void  ReadMotifsSpecialData(ifstream& in);
-    void  ReadRowSpecialData(ifstream& in, AliMpXDirection direction);
-    void  ReadRowSegmentSpecialData(ifstream& in,
+    AliMpVMotif*  ReadMotifData(istream& in, AliMpZone* zone);
+    void  ReadSectorSpecialData(istream& in, AliMp::XDirection direction);
+    void  ReadMotifsSpecialData(istream& in);
+    void  ReadRowSpecialData(istream& in, AliMp::XDirection direction);
+    void  ReadRowSegmentSpecialData(istream& in,
                           AliMpVRowSegmentSpecial* segment,
-			  AliMpXDirection direction);
+			  AliMp::XDirection direction);
     
     // static data members
-    static const TString  fgkSectorKeyword;        // sector keyword
-    static const TString  fgkZoneKeyword;          // zone keyword
-    static const TString  fgkSubZoneKeyword;       // subzone keyword
-    static const TString  fgkRowKeyword;           // row keyword
-    static const TString  fgkEofKeyword;           // eof keyword
-    static const TString  fgkSectorSpecialKeyword; // sector special keyword
-    static const TString  fgkMotifKeyword;         // motif keyword
-    static const TString  fgkRowSpecialKeyword;    // row special keyword
-    static const TString  fgkPadRowsKeyword;       // pad rows keyword
-    static const TString  fgkPadRowSegmentKeyword; // pad row segment keyword
+    static const TString  fgkSectorKeyword;        ///< sector keyword
+    static const TString  fgkZoneKeyword;          ///< zone keyword
+    static const TString  fgkSubZoneKeyword;       ///< subzone keyword
+    static const TString  fgkRowKeyword;           ///< row keyword
+    static const TString  fgkEofKeyword;           ///< eof keyword
+    static const TString  fgkSectorSpecialKeyword; ///< sector special keyword
+    static const TString  fgkMotifKeyword;         ///< motif keyword
+    static const TString  fgkRowSpecialKeyword;    ///< row special keyword
+    static const TString  fgkPadRowsKeyword;       ///< pad rows keyword
+    static const TString  fgkPadRowSegmentKeyword; ///< pad row segment keyword
   
     // data members  
-    AliMpStationType  fStationType; // station type 
-    AliMpPlaneType    fPlaneType;   // plane type 
-    AliMpSector*      fSector;      // sector
-    AliMpMotifReader* fMotifReader; // motif reader
-    Int_t             fVerboseLevel;// verbose level
+    const AliMpDataStreams&  fkDataStreams; ///< data streams
+    AliMq::Station12Type  fStationType; ///< station type 
+    AliMp::PlaneType      fPlaneType;   ///< plane type 
+    AliMpSector*          fSector;      ///< sector
+    AliMpMotifReader*     fMotifReader; ///< motif reader
 
-  ClassDef(AliMpSectorReader,1)  // Data reader
+  ClassDef(AliMpSectorReader,0)  // Data reader
 };
 
 #endif //ALI_MP_READER_H