Coding viloations fixed.

[u/mrichter/AliRoot.git] / TRD / AliTRDrawStreamBase.h

diff --git a/TRD/AliTRDrawStreamBase.h b/TRD/AliTRDrawStreamBase.h
index 1a72895d05ee94a5a438fca979547f5a2259fb21..27843671f2f8d3254913a85a8629179729c71ca8 100644 (file)
--- a/TRD/AliTRDrawStreamBase.h
+++ b/TRD/AliTRDrawStreamBase.h
@@ -13,7 +13,6 @@
 ///////////////////////////////////////////////////////////////////////////////\r
 \r
 #include "TObject.h"\r
-//#include "TString.h"\r
 #include "AliLog.h"\r
 \r
 class AliRawReader;\r
@@ -24,13 +23,6 @@ class AliTRDdigitsManager;
 #define TRDMAXMCM   4 * 16\r
 #define MAXTRACKLETSPERHC 256\r
 \r
-/* // old raw stream */\r
-/* #define TRD_OLD_STREAM -1 */\r
-/* // read simulated data */\r
-/* #define TRD_SIM_STREAM 0 */\r
-/* // read real data - including test beam 2007 */\r
-/* #define TRD_REAL_STREAM 1 */\r
-\r
 #define TRD_NOIMP() AliFatal("Not Implemented for this class. Use inherited.");\r
 \r
 class AliTRDrawStreamBase : public TObject\r
@@ -51,16 +43,20 @@ class AliTRDrawStreamBase : public TObject
     {\r
       kTRDsimStream  =  0,\r
       kTRDrealStream =  1,\r
-      kTRDfastStream =  2,\r
-      kTRDoldStream  = 99\r
+      kTRDfastStream =  2\r
     };\r
 \r
+  enum { kDDLOffset = 0x400 };                                // Offset for DDL numbers\r
+\r
   static   AliTRDrawStreamBase *GetRawStream();\r
   static   AliTRDrawStreamBase *GetRawStream(AliRawReader *reader);\r
 \r
   static  void      SetRawStreamVersion(Int_t iver) { fgRawStreamVersion = iver; }\r
   static  void      SetRawStreamVersion(const char *opt);\r
 \r
+  // this is a temporary solution!^M\r
+  // baseline should come with the HC header word 2 (count from 0!)^M\r
+\r
   virtual Bool_t    Next() {TRD_NOIMP(); return 0;}          \r
   //virtual Int_t     NextChamber(AliTRDdigitsManager */*man*/) {TRD_NOIMP(); return 0;} \r
   //virtual Int_t     NextChamber(AliTRDdigitsManager */*man*/, UInt_t **/*trackletContainer*/=NULL) {TRD_NOIMP(); return 0;}\r
@@ -68,6 +64,7 @@ class AliTRDrawStreamBase : public TObject
   virtual Bool_t    Init() {TRD_NOIMP(); return -1;}     \r
 \r
   virtual Bool_t    SetRawVersion(Int_t /*fraw*/) {TRD_NOIMP(); return 0;} \r
+  virtual void      SetNoErrorWarning() {TRD_NOIMP();}\r
   \r
   virtual Bool_t    IsCurrentPadShared() const {TRD_NOIMP(); return 0;}\r
   virtual void      SetSharedPadReadout(Bool_t /*fv*/) {TRD_NOIMP();} \r
@@ -106,6 +103,7 @@ class AliTRDrawStreamBase : public TObject
   virtual Int_t     GetCol() const {TRD_NOIMP(); return 0;}   \r
   virtual Int_t     GetRowMax() const {TRD_NOIMP(); return 0;}\r
   virtual Int_t     GetColMax() const {TRD_NOIMP(); return 0;}\r
+\r
   // compatibility\r
   virtual Int_t     GetMaxRow() const {TRD_NOIMP(); return 0;}\r
   virtual Int_t     GetMaxCol() const {TRD_NOIMP(); return 0;}\r
@@ -126,8 +124,6 @@ class AliTRDrawStreamBase : public TObject
  \r
   //----------------------------------------------------------\r
  \r
- protected:\r
-\r
  private:\r
 \r
   static Int_t fgRawStreamVersion;           // Raw stream version number\r