Dphi as pseudo pt for tracklets + matching cut on muons

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

diff --git a/HLT/TPCLib/AliHLTTPCDigitReader32Bit.cxx b/HLT/TPCLib/AliHLTTPCDigitReader32Bit.cxx
index fd14fe3bf2bb21767a4c73e7ba61de63ab916235..e19f68a26ef34a1034d1792a3da63d864f6b18d7 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCDigitReader32Bit.cxx
+++ b/HLT/TPCLib/AliHLTTPCDigitReader32Bit.cxx
@@ -1,4 +1,4 @@
-
+// $Id$
 //**************************************************************************
 //* This file is property of and copyright by the ALICE HLT Project        * 
 //* ALICE Experiment at CERN, All rights reserved.                         *
@@ -17,35 +17,30 @@
 //* provided "as is" without express or implied warranty.                  *
 //**************************************************************************
 
-/** @file   AliHLTTPCDigitReader32Bit.cxx
-    @author Kenneth Aamodt
-    @date   
-    @brief  DigitReader implementation for the 32 bit offline decoder
-*/
-
-#if __GNUC__>= 3
-using namespace std;
-#endif
+/// @file   AliHLTTPCDigitReader32Bit.cxx
+/// @author Kenneth Aamodt
+/// @date   
+/// @brief  DigitReader implementation for the 32 bit offline decoder
+///
 
 #include <cassert>
 #include "AliHLTTPCDigitReader32Bit.h"
 #include "AliHLTTPCMapping.h"
 #include "AliRawReader.h"
 #include "AliRawReaderMemory.h"
-#ifndef HAVE_NOT_ALTRORAWSTREAMV3
 #include "AliAltroRawStreamV3.h"
-#endif HAVE_NOT_ALTRORAWSTREAMV3
-#include "AliHLTTPCTransform.h"
+
+using namespace std;
 
 ClassImp(AliHLTTPCDigitReader32Bit)
 
 AliHLTTPCDigitReader32Bit::AliHLTTPCDigitReader32Bit()
   :
   AliHLTTPCDigitReader(),
-  fRawReader(NULL),
   fRawReaderMemory(NULL),
   fAltroRawStreamV3(NULL),
-  fMapping(NULL)
+  fMapping(NULL),
+  fSkipDataReadingFlag(kFALSE)
 {
   // see header file for class documentation
   // or
@@ -68,12 +63,10 @@ AliHLTTPCDigitReader32Bit::~AliHLTTPCDigitReader32Bit()
     fRawReaderMemory=NULL;
   }
 
-#ifndef HAVE_NOT_ALTRORAWSTREAMV3
   if (fAltroRawStreamV3){
     delete fAltroRawStreamV3;
     fAltroRawStreamV3 = NULL;
   }
-#endif //HAVE_NOT_ALTRORAWSTREAMV3
 
   if(fMapping){
     delete fMapping;
@@ -97,9 +90,8 @@ 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){
     delete fAltroRawStreamV3;
     fAltroRawStreamV3=NULL;
@@ -109,10 +101,8 @@ int AliHLTTPCDigitReader32Bit::InitBlock(void* ptr,unsigned long size, Int_t pat
   if (!fAltroRawStreamV3){
     return -ENODEV;
   }
-  fAltroRawStreamV3->NextDDL();
-#else
-  HLTError("AltroRawStreamV3 is not available in this AliRoot version");
-#endif //HAVE_NOT_ALTRORAWSTREAMV3
+
+  fSkipDataReadingFlag = fAltroRawStreamV3->NextDDL();
 
   if(!fMapping){
     fMapping = new AliHLTTPCMapping(patch);
@@ -126,7 +116,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,22 +132,17 @@ void AliHLTTPCDigitReader32Bit::SetUnsorted(bool unsorted)
 bool AliHLTTPCDigitReader32Bit::NextChannel()
 {
   // see header file for class documentation
-#ifndef HAVE_NOT_ALTRORAWSTREAMV3
-  return fAltroRawStreamV3->NextChannel(); 
-#else
-  return false;
-#endif //HAVE_NOT_ALTRORAWSTREAMV3
+  if(fSkipDataReadingFlag == kFALSE){
+    return kFALSE;
+  }
 
+  return fAltroRawStreamV3->NextChannel(); 
 }
 
 int AliHLTTPCDigitReader32Bit::NextBunch()
 {
   // see header file for class documentation
-#ifndef HAVE_NOT_ALTRORAWSTREAMV3
   return fAltroRawStreamV3->NextBunch();
-#else
-  return false;
-#endif //HAVE_NOT_ALTRORAWSTREAMV3
 }
 
 bool AliHLTTPCDigitReader32Bit::NextSignal()
@@ -176,31 +161,19 @@ const UInt_t* AliHLTTPCDigitReader32Bit::GetSignals()
 const UShort_t* AliHLTTPCDigitReader32Bit::GetSignalsShort()
 {
   // see header file for class documentation
-#ifndef HAVE_NOT_ALTRORAWSTREAMV3
   return fAltroRawStreamV3->GetSignals();
-#else
-  return false;
-#endif //HAVE_NOT_ALTRORAWSTREAMV3
 }
 
 int AliHLTTPCDigitReader32Bit::GetRow()
 {
   // see header file for class documentation
-#ifndef HAVE_NOT_ALTRORAWSTREAMV3
   return fMapping->GetRow(fAltroRawStreamV3->GetHWAddress());
-#else
-  return -1;
-#endif //HAVE_NOT_ALTRORAWSTREAMV3
 }
 
 int AliHLTTPCDigitReader32Bit::GetPad()
 {
   // see header file for class documentation
-#ifndef HAVE_NOT_ALTRORAWSTREAMV3
   return fMapping->GetPad(fAltroRawStreamV3->GetHWAddress());
-#else
-  return -1;
-#endif //HAVE_NOT_ALTRORAWSTREAMV3
 }
 
 int AliHLTTPCDigitReader32Bit::GetSignal()
@@ -213,20 +186,14 @@ int AliHLTTPCDigitReader32Bit::GetTime()
 {
   // see header file for class documentation
   int iResult=-1;
-#ifndef HAVE_NOT_ALTRORAWSTREAMV3
   iResult=fAltroRawStreamV3->GetStartTimeBin()-fAltroRawStreamV3->GetBunchLength()+1;
-#endif //HAVE_NOT_ALTRORAWSTREAMV3
   return iResult;
 }
 
 int AliHLTTPCDigitReader32Bit::GetBunchSize()
 {
   // see header file for class documentation
-#ifndef HAVE_NOT_ALTRORAWSTREAMV3
   return fAltroRawStreamV3->GetBunchLength();
-#else
-  return -1;
-#endif //HAVE_NOT_ALTRORAWSTREAMV3
 }
 
 int AliHLTTPCDigitReader32Bit::GetRowOffset() const
@@ -237,11 +204,7 @@ int AliHLTTPCDigitReader32Bit::GetRowOffset() const
 AliHLTUInt32_t AliHLTTPCDigitReader32Bit::GetAltroBlockHWaddr() const
 {
   // see header file for class documentation
-#ifndef HAVE_NOT_ALTRORAWSTREAMV3
   return (AliHLTUInt32_t)fAltroRawStreamV3->GetHWAddress();
-#else
-  return 0;
-#endif //HAVE_NOT_ALTRORAWSTREAMV3
 }
 
 AliHLTUInt32_t AliHLTTPCDigitReader32Bit::GetAltroBlockHWaddr(Int_t row, Int_t pad) const