New version of SPD raw-data reconstruction. The format now correponds to the actual...

[u/mrichter/AliRoot.git] / HLT / misc / AliL3DDLDataFileHandler.cxx

diff --git a/HLT/misc/AliL3DDLDataFileHandler.cxx b/HLT/misc/AliL3DDLDataFileHandler.cxx
index 80a383e9b6195ebe728f2ce333b915503f8617f9..d3bb3bb66a3f3cf0d282db33002d719cddcd07e7 100644 (file)
--- a/HLT/misc/AliL3DDLDataFileHandler.cxx
+++ b/HLT/misc/AliL3DDLDataFileHandler.cxx
@@ -11,15 +11,15 @@
 #include "AliL3MemHandler.h"
 #include "AliL3DigitData.h"
 #ifdef use_newio
-#include "../RAW/AliRawReaderRoot.h"
-#include "../RAW/AliRawReaderDate.h"
+#include "AliRawReaderRoot.h"
+#include "AliRawReaderDate.h"
 #else
 #include "AliL3DDLTPCRawStream.h"
 #include "AliL3DDLRawReaderFile.h"
 #endif
 #include "AliL3DDLDataFileHandler.h"
 
-#if __GNUC__ == 3
+#if __GNUC__ >= 3
 using namespace std;
 #endif
 
@@ -141,9 +141,10 @@ void AliL3DDLDataFileHandler::CloseReaderInput()
 }
 
 #ifdef use_newio
-Bool_t AliL3DDLDataFileHandler::IsDigit(Int_t /*i*/) const
+Bool_t AliL3DDLDataFileHandler::IsDigit(Int_t /*i*/)
 {
   // dummy
+  AliL3MemHandler::IsDigit();
   return kTRUE;
 }
 #endif
@@ -222,7 +223,7 @@ AliL3DigitRowData * AliL3DDLDataFileHandler::DDLData2Memory(UInt_t &nrow,Int_t e
   }
 #ifdef use_newio
     fReader->Reset();
-    fReader->Select(0,ddls[0],ddls[ddlsToSearch-1]);
+    fReader->Select("TPC",ddls[0],ddls[ddlsToSearch-1]);
     fTPCStream->Reset();
 #else
     fTPCStream->SetDDLID(ddls[i]); //ddl to read out
@@ -230,7 +231,7 @@ AliL3DigitRowData * AliL3DDLDataFileHandler::DDLData2Memory(UInt_t &nrow,Int_t e
     Int_t zerosup = AliL3Transform::GetZeroSup();
     Int_t adcsat = AliL3Transform::GetADCSat();
     Int_t slice,srow;
-    Int_t lrow;
+    Int_t lrow=-1;
 
     while (fTPCStream->Next()){
 
@@ -390,7 +391,7 @@ AliL3DigitRowData * AliL3DDLDataFileHandler::DDLData2Memory(UInt_t &nrow,Int_t e
 
 #ifdef use_newio
   fReader->Reset();
-  fReader->Select(0,ddls[0],ddls[ddlsToSearch-1]);
+  fReader->Select("TPC",ddls[0],ddls[ddlsToSearch-1]);
   fTPCStream->Reset();
 #else
   fTPCStream->SetDDLID(ddls[i]); //ddl to read out