Added loading geometry and magnetic field

[u/mrichter/AliRoot.git] / MUON / AliMUONRawStreamTrigger.h

diff --git a/MUON/AliMUONRawStreamTrigger.h b/MUON/AliMUONRawStreamTrigger.h
index 0cc469dde9872cc3433c004db247b45bf9de2259..cc54b2ca6c618181457bb676d2e4bcaaa9fe7d9e 100644 (file)
--- a/MUON/AliMUONRawStreamTrigger.h
+++ b/MUON/AliMUONRawStreamTrigger.h
@@ -5,7 +5,7 @@
 
 /*$Id$*/
 
-/// \ingroup raw
+/// \ingroup base
 /// \class AliMUONRawStreamTrigger
 /// \brief Class for reading MUON raw digits
 ///
@@ -18,28 +18,24 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <TObject.h>
-#include <TClonesArray.h>
+#include "AliMUONPayloadTrigger.h"
 
 class AliRawReader;
 class AliMUONDDLTrigger;
-class AliMUONLocalStruct;
-class AliMUONRegHeader;
+
 
 class AliMUONRawStreamTrigger: public TObject {
   public :
     AliMUONRawStreamTrigger();
     AliMUONRawStreamTrigger(AliRawReader* rawReader);
-    AliMUONRawStreamTrigger(const AliMUONRawStreamTrigger& stream);
-    AliMUONRawStreamTrigger& operator = (const AliMUONRawStreamTrigger& stream);
     virtual ~AliMUONRawStreamTrigger();
 
     virtual Bool_t   Next();
     virtual Bool_t   NextDDL();
-    virtual void     ResetDDL();
 
     Int_t GetMaxDDL() const {return fMaxDDL;}
-    Int_t GetMaxReg() const {return fMaxReg;}
-    Int_t GetMaxLoc() const {return fMaxLoc;}
+    Int_t GetMaxReg() const {return fPayload->GetMaxReg();}
+    Int_t GetMaxLoc() const {return fPayload->GetMaxLoc();}
 
 
     void SetMaxDDL(Int_t ddl);
@@ -49,27 +45,23 @@ class AliMUONRawStreamTrigger: public TObject {
 
     void SetReader(AliRawReader* rawReader) {fRawReader = rawReader;}
 
-    AliMUONLocalStruct*     GetLocalInfo()  const {return fLocalStruct;}
-    AliMUONDDLTrigger*      GetDDLTrigger() const {return fDDLTrigger;}
-    Int_t                   GetDDL()        const {return fDDL - 1;}
+    AliMUONDDLTrigger* GetDDLTrigger() const {return fPayload->GetDDLTrigger();}
+    Int_t              GetDDL()        const {return fDDL - 1;}
 
-  protected :
+  private :
 
-    AliRawReader*    fRawReader;    // object for reading the raw data
- 
-    Int_t  fDDL;          // number of DDL
-    Int_t  fSubEntries;   // entries of buspatch structure
-    Bool_t fNextDDL;      // flag for next DDL to be read
+    AliRawReader*    fRawReader;     ///< object for reading the raw data
+    AliMUONPayloadTrigger* fPayload; ///< pointer to payload decoder
 
-    Int_t fMaxDDL;        // maximum number of DDL in DATE file
-    Int_t fMaxReg;        // maximum number of regional cards in DATE file
-    Int_t fMaxLoc;        // maximum number of local cards in DATE file
+    Int_t  fDDL;          ///< number of DDL
+    Int_t  fSubEntries;   ///< entries of buspatch structure
+    Bool_t fNextDDL;      ///< flag for next DDL to be read
+    Int_t  fMaxDDL;       ///< maximum number of DDL in DATE file
 
-    AliMUONDDLTrigger*       fDDLTrigger;   //! pointer for DDL structure
-    AliMUONRegHeader*        fRegHeader;    //! pointer for regional structure
-    AliMUONLocalStruct*      fLocalStruct;  //! pointer to local structure
+    AliMUONRawStreamTrigger(const AliMUONRawStreamTrigger& stream);
+    AliMUONRawStreamTrigger& operator = (const AliMUONRawStreamTrigger& stream);
 
-    ClassDef(AliMUONRawStreamTrigger, 2)    // base class for reading MUON trigger rawdata
+    ClassDef(AliMUONRawStreamTrigger, 3)    // base class for reading MUON trigger rawdata
 };
 
 #endif