new SDD preprocessor + removal of eff C++ warning (base) - E. Crescio

[u/mrichter/AliRoot.git] / ITS / AliITSRawStreamSSD.cxx

diff --git a/ITS/AliITSRawStreamSSD.cxx b/ITS/AliITSRawStreamSSD.cxx
index f7de2d037dc012ba21b4996c867c0844ffb56b1c..317be9d4680406d89f8200b86eee198b631c5171 100644 (file)
--- a/ITS/AliITSRawStreamSSD.cxx
+++ b/ITS/AliITSRawStreamSSD.cxx
@@ -13,21 +13,21 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
+/* $Id$ */
+
 ///////////////////////////////////////////////////////////////////////////////
-//
-// This is a class for reading ITS SSD raw data files and providing
-// information about digits
-//
+///
+/// This class provides access to ITS SSD digits in raw data.
+///
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "AliITSRawStreamSSD.h"
+#include "AliRawReader.h"
 
 ClassImp(AliITSRawStreamSSD)
 
 
-const Int_t AliITSRawStreamSSD::kDDLsNumber;
-const Int_t AliITSRawStreamSSD::kModulesPerDDL;
-const Int_t AliITSRawStreamSSD::kDDLModuleMap[kDDLsNumber][kModulesPerDDL] = {
+const Int_t AliITSRawStreamSSD::fgkDDLModuleMap[kDDLsNumber][kModulesPerDDL] = {
     //104
     //DDL[32][]=
     { 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510,
@@ -207,11 +207,13 @@ const Int_t AliITSRawStreamSSD::kDDLModuleMap[kDDLsNumber][kModulesPerDDL] = {
 };
 
 
-AliITSRawStreamSSD::AliITSRawStreamSSD() : 
-  fRawReader("SSDslice", kTRUE)
+AliITSRawStreamSSD::AliITSRawStreamSSD(AliRawReader* rawReader) :
+  AliITSRawStream(rawReader),
+fData(0)
 {
 // create an object to read ITS SSD raw digits
 
+  fRawReader->Select("ITSSSD");
 }
 
 
@@ -221,10 +223,10 @@ Bool_t AliITSRawStreamSSD::Next()
 // returns kFALSE if there is no digit left
 
   fPrevModuleID = fModuleID;
-  if (!fRawReader.ReadNextInt(fData)) return kFALSE;
+  if (!fRawReader->ReadNextInt(fData)) return kFALSE;
   
   UInt_t relModuleID = (fData >> 21) & 0x000007FF;
-  fModuleID = kDDLModuleMap[fRawReader.GetDDLID()][relModuleID];
+  fModuleID = fgkDDLModuleMap[fRawReader->GetDDLID()][relModuleID];
   fCoord1 = (fData >> 20) & 0x00000001;
   fCoord2 = (fData >> 10) & 0x000003FF;
   fSignal = (fData & 0x000003FF) + 1;