From Magali: small modifications.

[u/mrichter/AliRoot.git] / HLT / TPCLib / AliHLTTPCDigitReader32Bit.cxx

diff --git a/HLT/TPCLib/AliHLTTPCDigitReader32Bit.cxx b/HLT/TPCLib/AliHLTTPCDigitReader32Bit.cxx
index fd14fe3bf2bb21767a4c73e7ba61de63ab916235..1365693d7a9cf1579960a0723815a8bcd18b7b60 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCDigitReader32Bit.cxx
+++ b/HLT/TPCLib/AliHLTTPCDigitReader32Bit.cxx
@@ -34,7 +34,7 @@ using namespace std;
 #include "AliRawReaderMemory.h"
 #ifndef HAVE_NOT_ALTRORAWSTREAMV3
 #include "AliAltroRawStreamV3.h"
-#endif HAVE_NOT_ALTRORAWSTREAMV3
+#endif //HAVE_NOT_ALTRORAWSTREAMV3
 #include "AliHLTTPCTransform.h"
 
 ClassImp(AliHLTTPCDigitReader32Bit)
@@ -45,7 +45,8 @@ AliHLTTPCDigitReader32Bit::AliHLTTPCDigitReader32Bit()
   fRawReader(NULL),
   fRawReaderMemory(NULL),
   fAltroRawStreamV3(NULL),
-  fMapping(NULL)
+  fMapping(NULL),
+  fSkipDataReadingFlag(kFALSE)
 {
   // see header file for class documentation
   // or
@@ -97,7 +98,7 @@ int AliHLTTPCDigitReader32Bit::InitBlock(void* ptr,unsigned long size, Int_t pat
   fRawReaderMemory->SetMemory(reinterpret_cast<UChar_t*>(ptr), ULong_t(size));
   fRawReaderMemory->SetEquipmentID(ddlno);
   fRawReaderMemory->Reset();
-  fRawReaderMemory->NextEvent();
+  fSkipDataReadingFlag = fRawReaderMemory->NextEvent();
 
 #ifndef HAVE_NOT_ALTRORAWSTREAMV3
   if(fAltroRawStreamV3 != NULL){
@@ -109,7 +110,9 @@ int AliHLTTPCDigitReader32Bit::InitBlock(void* ptr,unsigned long size, Int_t pat
   if (!fAltroRawStreamV3){
     return -ENODEV;
   }
-  fAltroRawStreamV3->NextDDL();
+
+  fSkipDataReadingFlag = fAltroRawStreamV3->NextDDL();
+
 #else
   HLTError("AltroRawStreamV3 is not available in this AliRoot version");
 #endif //HAVE_NOT_ALTRORAWSTREAMV3
@@ -126,7 +129,7 @@ int AliHLTTPCDigitReader32Bit::InitBlock(void* ptr,unsigned long size, Int_t pat
 int AliHLTTPCDigitReader32Bit::Reset()
 {
   // see header file for class documentation
-  fRawReaderMemory->Reset();
+  fRawReaderMemory->ClearBuffers();
   return 0;
 }
 
@@ -142,6 +145,10 @@ void AliHLTTPCDigitReader32Bit::SetUnsorted(bool unsorted)
 bool AliHLTTPCDigitReader32Bit::NextChannel()
 {
   // see header file for class documentation
+  if(fSkipDataReadingFlag == kFALSE){
+    return kFALSE;
+  }
+
 #ifndef HAVE_NOT_ALTRORAWSTREAMV3
   return fAltroRawStreamV3->NextChannel(); 
 #else