]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TOF/AliTOFRawStream.cxx
Reject clusters that are matched to more than one track
[u/mrichter/AliRoot.git] / TOF / AliTOFRawStream.cxx
index 4f45f2bbb026bc79f8cefcde3fa4e394e72eb150..9109fce54aaa64fd56b64fa135d4287abfadf8d4 100644 (file)
@@ -125,6 +125,17 @@ Revision 0.01  2005/07/22 A. De Caro
 
 #include "AliRawEventHeaderBase.h"
 #include "AliRawDataHeader.h"
+#include "AliRawDataHeaderV3.h"
+
+#include "AliTOFDecoderV2.h"
+#include "AliTOFTDCHit.h"
+#include "AliTOFDecoderSummaryData.h"
+#include "AliTOFDRMSummaryData.h"
+#include "AliTOFLTMSummaryData.h"
+#include "AliTOFTRMSummaryData.h"
+#include "AliTOFChainSummaryData.h"
+#include "AliTOFTDCHitBuffer.h"
+#include "AliTOFTDCErrorBuffer.h"
 
 ClassImp(AliTOFRawStream)
 
@@ -151,71 +162,72 @@ const Int_t AliTOFRawStream::fgkddlBCshift[72] =
 };
 
 const Int_t AliTOFRawStream::fgkStrip0MapCrate0[]=
-  {3,5,1,9,11,7,15,17,13,2,-1,0,7,9,5,13,15,11,0,-1,17,-1,5,3};
+  {1,3,5,7,9,11,13,15,17,0,2,4,6,8,10,12,14,16,18,1,3,5,7,-1};
 const Int_t AliTOFRawStream::fgkStrip1MapCrate0[]=
-  {4,0,2,10,6,8,16,12,14,3,18,1,8,4,6,14,10,12,1,16,18,2,6,4};
+  {0,2,4,6,8,10,12,14,16,18,1,3,5,7,9,11,13,15,17,0,2,4,6,-1};
 const Int_t AliTOFRawStream::fgkStrip0MapCrate1[]=
-  {0,2,4,6,8,10,12,14,16,-1,0,2,4,6,8,10,12,14,-1,17,0,2,4,6};
+  {1,3,5,7,9,11,13,15,17,0,2,4,6,8,10,12,14,16,18,1,3,5,7,-1};
 const Int_t AliTOFRawStream::fgkStrip1MapCrate1[]=
-  {1,3,5,7,9,11,13,15,17,18,1,3,5,7,9,11,13,15,16,18,1,3,5,7};
+  {0,2,4,6,8,10,12,14,16,18,1,3,5,7,9,11,13,15,17,0,2,4,6,-1};
 const Int_t AliTOFRawStream::fgkStrip0MapCrate2[]=
-  {15,13,17,9,7,11,3,1,5,16,-1,18,11,9,13,5,3,7,14,-1,1,-1,9,11};
+  {17,15,13,11, 9,7,5,3,1,18,16,14,12,10,8,6,4,2, 0,13,11, 9,7,-1};
 const Int_t AliTOFRawStream::fgkStrip1MapCrate2[]=
-  {14,18,16,8,12,10,2,6,4,15,0,17,10,14,12,4,8,6,13,2,0,12,8,10};
+  {18,16,14,12,10,8,6,4,2, 0,17,15,13,11,9,7,5,3, 1,14,12,10,8,-1};
 const Int_t AliTOFRawStream::fgkStrip0MapCrate3[]=
-  {18,16,14,12,10,8,6,4,2,-1,18,16,14,12,10,8,6,4,-1,1,14,12,10,8};
+  {17,15,13,11, 9,7,5,3,1,18,16,14,12,10,8,6,4,2, 0,13,11, 9,7,-1};
 const Int_t AliTOFRawStream::fgkStrip1MapCrate3[]=
-  {17,15,13,11,9,7,5,3,1,0,17,15,13,11,9,7,5,3,2,0,13,11,9,7};
+  {18,16,14,12,10,8,6,4,2, 0,17,15,13,11,9,7,5,3, 1,14,12,10,8,-1};
 
 
 const Int_t AliTOFRawStream::fgkModule0MapCrate0[]=
-  {0,0,0,0,0,0,0,0,0,1,-1,1,1,1,1,1,1,1,2,-1,1,-1,2,2};
+  {0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,2,2,2,2,-1};
 const Int_t AliTOFRawStream::fgkModule1MapCrate0[]=
-  {0,0,0,0,0,0,0,0,0,1,0,1,1,1,1,1,1,1,2,1,1,2,2,2};
+  {0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,2,2,2,2,-1};
 const Int_t AliTOFRawStream::fgkModule0MapCrate1[]=
-  {0,0,0,0,0,0,0,0,0,-1,1,1,1,1,1,1,1,1,-1,1,2,2,2,2,2};
+  {0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,2,2,2,2,-1};
 const Int_t AliTOFRawStream::fgkModule1MapCrate1[]=
-  {0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2};
+  {0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,2,2,2,2,-1};
+
 const Int_t AliTOFRawStream::fgkModule0MapCrate2[]=
-  {4,4,4,4,4,4,4,4,4,3,-1,3,3,3,3,3,3,3,2,-1,3,-1,2,2};
+  {4,4,4,4,4,4,4,4,4,3,3,3,3,3,3,3,3,3,3,2,2,2,2,-1};
 const Int_t AliTOFRawStream::fgkModule1MapCrate2[]=
-  {4,4,4,4,4,4,4,4,4,3,4,3,3,3,3,3,3,3,2,3,3,2,2,2};
+  {4,4,4,4,4,4,4,4,4,4,3,3,3,3,3,3,3,3,3,2,2,2,2,-1};
 const Int_t AliTOFRawStream::fgkModule0MapCrate3[]=
-  {4,4,4,4,4,4,4,4,4,-1,3,3,3,3,3,3,3,3,-1,3,2,2,2,2,2};
+  {4,4,4,4,4,4,4,4,4,3,3,3,3,3,3,3,3,3,3,2,2,2,2,-1};
 const Int_t AliTOFRawStream::fgkModule1MapCrate3[]=
-  {4,4,4,4,4,4,4,4,4,4,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2};
+  {4,4,4,4,4,4,4,4,4,4,3,3,3,3,3,3,3,3,3,2,2,2,2,-1};
 
 const Int_t AliTOFRawStream::fgkChannelMap0[5][19]=
-  {{1,2,2,0,0,1,4,5,5,3,3,4,7,8,8,6,6,7,10},
-   {11,11,9,9,13,14,14,12,12,13,16,17,17,15,15,16,19,20,20},
-   {18,18,21,23,23,22,22,23,23,22,22,21,21,20,20,-1,-1,-1,-1},
-   {19,19,18,17,17,16,16,15,15,14,14,13,13,12,12,11,11,10,10},
+  {{0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9},
+   {9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,18},
+   {19,19,20,20,21,21,22,22,22,21,21,20,20,19,19,-1,-1,-1,-1},
+   {18,18,17,17,16,16,15,15,14,14,13,13,12,12,11,11,10,10,9},
    {9,8,8,7,7,6,6,5,5,4,4,3,3,2,2,1,1,0,0}
   };
 
 const Int_t AliTOFRawStream::fgkChainMap0[5][19]=
-{{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-{0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,-1,-1,-1,-1},
-{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
-{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}
-};
+  {{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+   {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+   {0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,-1,-1,-1,-1},
+   {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
+   {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}
+  };
 
 const Int_t AliTOFRawStream::fgkChannelMap24[5][19]=
-{{0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9},
-{10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,19,19},
-{20,20,21,21,22,22,23,23,22,22,23,23,21,18,18,-1,-1,-1,-1},
-{20,20,19,16,15,15,17,17,16,13,12,12,14,14,13,9,9,11,11},
-{10,7,6,6,8,8,7,4,3,3,5,5,4,1,0,0,2,2,1}
-};
+  {{0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9},
+   {9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,18},
+   {19,19,20,20,21,21,22,22,22,21,21,20,20,19,19,-1,-1,-1,-1},
+   {18,18,17,17,16,16,15,15,14,14,13,13,12,12,11,11,10,10,9},
+   {9,8,8,7,7,6,6,5,5,4,4,3,3,2,2,1,1,0,0}
+  };
 
 const Int_t AliTOFRawStream::fgkChainMap24[5][19]=
-{{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
-{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
-{1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,-1,-1,-1,-1},
-{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
-};
+  {{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
+   {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
+   {1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,-1,-1,-1,-1},
+   {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+   {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
+  };
 
 Bool_t AliTOFRawStream::fgApplyBCCorrections = kTRUE;
 //_____________________________________________________________________________
@@ -223,6 +235,7 @@ AliTOFRawStream::AliTOFRawStream(AliRawReader* rawReader):
   fRawReader(rawReader),
   fTOFrawData(new TClonesArray("AliTOFrawData",1000)),
   fDecoder(new AliTOFDecoder()),
+  fDecoderV2(new AliTOFDecoderV2()),
   fDDL(-1),
   fTRM(-1),
   fTRMchain(-1),
@@ -290,6 +303,7 @@ AliTOFRawStream::AliTOFRawStream():
   fRawReader(0x0),
   fTOFrawData(new TClonesArray("AliTOFrawData",1000)),
   fDecoder(new AliTOFDecoder()),
+  fDecoderV2(new AliTOFDecoderV2()),
   fDDL(-1),
   fTRM(-1),
   fTRMchain(-1),
@@ -354,6 +368,7 @@ AliTOFRawStream::AliTOFRawStream(const AliTOFRawStream& stream) :
   fRawReader(stream.fRawReader),
   fTOFrawData(stream.fTOFrawData),
   fDecoder(new AliTOFDecoder()),
+  fDecoderV2(new AliTOFDecoderV2()),
   fDDL(stream.fDDL),
   fTRM(stream.fTRM),
   fTRMchain(stream.fTRMchain),
@@ -457,7 +472,7 @@ AliTOFRawStream& AliTOFRawStream::operator = (const AliTOFRawStream& stream)
   fInsideLTM = stream.fInsideLTM;
   fInsideTRMchain0 = stream.fInsideTRMchain0;
   fInsideTRMchain1 = stream.fInsideTRMchain1;
-  
+
   for (Int_t i=0;i<AliDAQ::NumberOfDdls("TOF");i++){ 
     fDataBuffer[i] = stream.fDataBuffer[i];
     fPackedDataBuffer[i] = stream.fPackedDataBuffer[i];
@@ -487,14 +502,16 @@ AliTOFRawStream& AliTOFRawStream::operator = (const AliTOFRawStream& stream)
 //_____________________________________________________________________________
 AliTOFRawStream::~AliTOFRawStream()
 {
-// destructor
+  // destructor
 
   fPackedDigits = 0;
-
   delete fDecoder;
-
-  fTOFrawData->Clear();
-  delete fTOFrawData;
+  delete fDecoderV2;
+  
+  if (fTOFrawData) {
+    fTOFrawData->Clear("C");
+    delete fTOFrawData;
+  }
 
   //delete fCableLengthMap;
 
@@ -615,6 +632,11 @@ Bool_t AliTOFRawStream::Next()
   }
 
   fDDL  = fRawReader->GetDDLID();
+  if (fDDL==-1) {
+    fRawReader->AddMajorErrorLog(kDDLdataReading);
+    AliWarning("Error when load DDL. Go to next DDL");
+    return kFALSE;
+  }
 
   fWordType = GetField(data,WORD_TYPE_MASK,WORD_TYPE_POSITION);
 
@@ -1344,24 +1366,24 @@ void AliTOFRawStream::EquipmentId2VolumeId(Int_t nDDL, Int_t nTRM, Int_t iChain,
   if (iPlate==-1) {
     /*if (fRawReader)
       fRawReader->AddMajorErrorLog(kPlateError,"plate = -1");*/
-    printf("Warning -> AliTOFRawStream::EquipmentId2VolumeId: Problems with the plate number (%2d %2d %2d)!\n",
-          nDDL, nTRM, nTDC);
+    AliWarningGeneral("AliTOFRawStream", Form("Warning -> AliTOFRawStream::EquipmentId2VolumeId: Problems with the plate number (%2d %2d %2d)!\n",
+                        nDDL, nTRM, nTDC));
   }
 
   Int_t iStrip = Equip2VolNstrip(iDDL, nTRM, nTDC);
   if (iStrip==-1) {
     /*if (fRawReader)
       fRawReader->AddMajorErrorLog(kStripError,"strip = -1");*/
-    printf("Warning -> AliTOFRawStream::EquipmentId2VolumeId: Problems with the strip number (%2d %2d %2d)!\n",
-          nDDL, nTRM, nTDC);
+    AliWarningGeneral("AliTOFRawStream", Form("Warning -> AliTOFRawStream::EquipmentId2VolumeId: Problems with the strip number (%2d %2d %2d)!\n",
+                        nDDL, nTRM, nTDC));
   }
 
   Int_t iPadAlongTheStrip  = Equip2VolNpad(iDDL, iChain, nTDC, iCH);
   if (iPadAlongTheStrip==-1) {
     /*if (fRawReader)
       fRawReader->AddMajorErrorLog(kPadAlongStripError,"pad = -1");*/
-    printf("Warning -> AliTOFRawStream::EquipmentId2VolumeId: Problems with the pad number along the strip (%2d %1d %2d %1d)!\n",
-          nDDL, iChain, nTDC, iCH);
+    AliWarningGeneral("AliTOFRawStream", Form("Warning -> AliTOFRawStream::EquipmentId2VolumeId: Problems with the pad number along the strip (%2d %1d %2d %1d)!\n",
+                        nDDL, iChain, nTDC, iCH));
   }
   
   Int_t iPadX  = (Int_t)(iPadAlongTheStrip/(Float_t(AliTOFGeometry::NpadZ())));
@@ -1399,6 +1421,7 @@ Bool_t AliTOFRawStream::DecodeDDL(Int_t nDDLMin, Int_t nDDLMax, Int_t verbose =
   }  
 
   //select required DDLs
+  fRawReader->Reset();
   fRawReader->Select("TOF", nDDLMin, nDDLMax);
 
   if (verbose)
@@ -1414,7 +1437,8 @@ Bool_t AliTOFRawStream::Decode(Int_t verbose = 0) {
 
   Int_t currentEquipment;
   Int_t currentDDL;
-  const AliRawDataHeader *currentCDH;
+  const AliRawDataHeader *currentCDH = 0x0;
+  const AliRawDataHeaderV3 *currentCDHV3 = 0x0;
 
   //pointers
   UChar_t *data = 0x0;
@@ -1422,14 +1446,19 @@ Bool_t AliTOFRawStream::Decode(Int_t verbose = 0) {
   //loop and read DDL headers 
   while(fRawReader->ReadHeader()){
 
-    //memory leak prevention (actually data should be always 0x0 here)
-    if (data != 0x0)
-      delete [] data;
-
     //get equipment infos
     currentEquipment = fRawReader->GetEquipmentId();
+
     currentDDL = fRawReader->GetDDLID();
+    if (currentDDL==-1) {
+      fRawReader->AddMajorErrorLog(kDDLdataReading);
+      if (verbose)
+       AliWarning("Error when load DDL. Go to next DDL");
+      continue;
+    }
+
     currentCDH = fRawReader->GetDataHeader();
+    if (!currentCDH) currentCDHV3 = fRawReader->GetDataHeaderV3();
     const Int_t kDataSize = fRawReader->GetDataSize();
     const Int_t kDataWords = kDataSize / 4;
     data = new UChar_t[kDataSize];
@@ -1461,9 +1490,9 @@ Bool_t AliTOFRawStream::Decode(Int_t verbose = 0) {
     fDecoder->SetPackedDataBuffer(&fPackedDataBuffer[currentDDL]);
     
     //start decoding
-    if (fDecoder->Decode((UInt_t *)data, kDataWords, currentCDH) == kTRUE) {
+    if (fDecoder->Decode((UInt_t *)data, kDataWords, currentCDH, currentCDHV3) == kTRUE) {
       fRawReader->AddMajorErrorLog(kDDLDecoder,Form("DDL # = %d",currentDDL));
-      AliWarning(Form("Error while decoding DDL # %d: decoder returned with errors", currentDDL));
+      if (verbose) AliWarning(Form("Error while decoding DDL # %d: decoder returned with errors", currentDDL));
       ResetDataBuffer(currentDDL);
       ResetPackedDataBuffer(currentDDL);
     }
@@ -1480,6 +1509,68 @@ Bool_t AliTOFRawStream::Decode(Int_t verbose = 0) {
     
   return kFALSE;
   
+}
+//-----------------------------------------------------------------------------
+Bool_t AliTOFRawStream::DecodeV2(Int_t verbose = 0) {
+  //
+  // Enhanced decoder method
+  //
+
+  Int_t currentEquipment;
+  Int_t currentDDL;
+  //const AliRawDataHeader *currentCDH;
+
+  //pointers
+  UChar_t *data = 0x0;
+  
+  // read header
+  if (!fRawReader->ReadHeader()) return kTRUE;
+  
+  //get equipment infos
+  currentEquipment = fRawReader->GetEquipmentId();
+  currentDDL = fRawReader->GetDDLID();
+  //currentCDH = fRawReader->GetDataHeader();
+  const Int_t kDataSize = fRawReader->GetDataSize();
+  const Int_t kDataWords = kDataSize / 4;
+  data = new UChar_t[kDataSize];
+  
+  if (verbose)
+    AliInfo(Form("Found equipment # %d header (DDL # %d): %d bytes (%d words)", currentEquipment, currentDDL, kDataSize, kDataWords));
+  
+  if (verbose)
+    AliInfo(Form("Reading equipment #%d (DDL # %d) data...", currentEquipment, currentDDL));
+  
+  //read equipment payload
+  if (!fRawReader->ReadNext(data, kDataSize))
+    {
+      fRawReader->AddMajorErrorLog(kDDLdataReading);
+      if (verbose)
+       AliWarning("Error while reading DDL data. Go to next equipment");
+      delete [] data;
+      data = 0x0;
+      return kTRUE;
+    }
+  
+  if (verbose)
+    AliInfo(Form("Equipment # %d (DDL # %d) data has been read", currentEquipment, currentDDL));
+  
+  
+  //set up the decoder
+  fDecoderV2->SetVerbose(verbose);
+  
+  //start decoding
+  if (fDecoderV2->Decode((UInt_t *)data, kDataWords) == kTRUE) {
+    fRawReader->AddMajorErrorLog(kDDLDecoder,Form("DDL # = %d",currentDDL));
+    if (verbose) AliWarning(Form("Error while decoding DDL # %d: decoder returned with errors", currentDDL));
+  }
+  
+  delete [] data;
+  
+  if (verbose)
+    AliInfo("All done");
+    
+  return kFALSE;
+  
 }
 //---------------------------------------------------------------------------
 void
@@ -1540,20 +1631,15 @@ AliTOFRawStream::LoadRawDataBuffers(Int_t indexDDL, Int_t verbose)
     Int_t   hitChan = hitData->GetChan();
     Int_t   hitTimeBin = hitData->GetTimeBin();
     Int_t   hitTOTBin = hitData->GetTOTBin();
-
-    if (fgApplyBCCorrections) {
-      /* DDL BC shift time correction */
-      hitTimeBin += 1024 * fgkddlBCshift[indexDDL];
-      /* deltaBC shift time correction */
-      hitTimeBin += 1024 * (hitData->GetDeltaBunchID() - 37);
-    }
+    Int_t   hitDeltaBC = hitData->GetDeltaBunchID();
+    Int_t   hitL0L1Latency = hitData->GetL0L1Latency();
 
     Int_t hitLeading = hitData->GetTimeBin();
     Int_t hitTrailing = -1;
     Int_t hitError = -1;
     
     TClonesArray &arrayTofRawData =  *fTOFrawData;
-    new (arrayTofRawData[fPackedDigits++]) AliTOFrawData(hitSlotID, hitChain, hitTDC, hitChan, hitTimeBin, hitTOTBin, hitLeading, hitTrailing, hitPS, hitACQ, hitError);
+    new (arrayTofRawData[fPackedDigits++]) AliTOFrawData(hitSlotID, hitChain, hitTDC, hitChan, hitTimeBin, hitTOTBin, hitLeading, hitTrailing, hitPS, hitACQ, hitError, hitDeltaBC, hitL0L1Latency);
   }
 
   if (verbose > 0)
@@ -1571,6 +1657,189 @@ AliTOFRawStream::LoadRawDataBuffers(Int_t indexDDL, Int_t verbose)
   return kFALSE;
 }
 
+//---------------------------------------------------------------------------
+Bool_t
+AliTOFRawStream::LoadRawDataBuffersV2(Int_t indexDDL, Int_t verbose)
+{
+  //
+  // To load the buffers
+  //
+
+  /*
+   * decode raw data and fill output array with TOF hits.
+   * decode algorithm may return with errors due to inconsistent
+   * raw data format detected during decoding process.
+   * decoder algorithm has internal recover procedure to deal with
+   * errors in a safe condition.
+   * 
+   * the following conditions will cause total hit rejection from
+   * specific boards where the condition is detected:
+   *
+   * --- within DRM payload (full DRM skipped) ---
+   * - no header/trailer detected
+   *
+   * --- within TRM payload (full TRM skippped) ---
+   * - no header/trailer detected
+   * - empty event inserted
+   * - bad event counter
+   * - bad CRC
+   * - ACQ mode off
+   *
+   * --- within chain payload (full chain skipped) ---
+   * - no header/trailer detected
+   * - bad status
+   * - bad event counter
+   *
+   * --- HPTDC (ful TDC skipped) ---
+   * - error detected
+   *
+   */
+
+  fTOFrawData->Clear();
+  fPackedDigits = 0;
+  
+  if (verbose > 0)
+    AliInfo(Form("Decoding raw data for DDL # %d ...", indexDDL));
+
+  //check and fix valid DDL range
+  if (indexDDL < 0){
+    indexDDL = 0;
+    fRawReader->AddMinorErrorLog(kDDLMinError);
+    AliWarning("Wrong DDL range: setting first DDL ID to 0");
+  }
+  if (indexDDL > 71){
+    indexDDL = 71;
+    fRawReader->AddMinorErrorLog(kDDLMaxError);
+    AliWarning("Wrong DDL range: setting last DDL ID to 71");
+  }  
+
+  //select required DDLs
+  fRawReader->Reset();
+  fRawReader->Select("TOF", indexDDL, indexDDL);
+
+  /* decode */
+  if (DecodeV2(verbose)) return kTRUE;
+
+  /* read and check CDH info */
+  const AliRawDataHeader *currentCDH = fRawReader->GetDataHeader();
+  const AliRawDataHeaderV3 *currentCDHV3 = fRawReader->GetDataHeaderV3();
+  Int_t currentMiniEventID = currentCDH ? currentCDH->GetMiniEventID(): -1;
+  currentMiniEventID = currentCDHV3 ? currentCDHV3->GetMiniEventID(): currentMiniEventID;
+  Int_t currentEventID1 = currentCDH? currentCDH->GetEventID1() : -1;
+  currentEventID1 = currentCDHV3? currentCDHV3->GetEventID1() : currentEventID1;
+
+  /* read decoder summary data */
+  AliTOFDecoderSummaryData *decodersd;
+  AliTOFDRMSummaryData *drmsd;
+  //  AliTOFLTMSummaryData *ltmsd;
+  AliTOFTRMSummaryData *trmsd;  
+  AliTOFChainSummaryData *chainsd;
+  AliTOFTDCHitBuffer *hitBuffer;
+  AliTOFTDCHit *hit;
+  AliTOFTDCErrorBuffer *errorBuffer;
+  AliTOFTDCError *error;
+  Bool_t tdcErrorFlag[15];
+  decodersd = fDecoderV2->GetDecoderSummaryData();
+
+  /* check error detected/recovered */
+  if (decodersd->GetErrorDetected()) {
+      AliDebug(2, Form("Error detected while decoding DDL %d (errorSlotID mask = %04x)", indexDDL, decodersd->GetErrorSlotID()));
+    if (decodersd->GetRecoveringError()) {
+      AliDebug(2, "Couldn't recover from error");
+    }
+    else {
+      AliDebug(2, "Error recovered, anyway something is probably lost");
+    }
+  }
+  /* check DRM header/trailer */
+  drmsd = decodersd->GetDRMSummaryData();
+  if (!drmsd->GetHeader() || !drmsd->GetTrailer()) {
+    AliWarning("DRM header/trailer missing, skip DDL");
+    return kTRUE;
+  }
+  /* check partecipating mask */
+  if (drmsd->GetPartecipatingSlotID() != drmsd->GetDecoderSlotEnableMask()) {
+      AliDebug(2, Form("DRM slot enable mask differs from decoder slot enable mask (%08x != %08x) in DDL %d", drmsd->GetSlotEnableMask(), drmsd->GetDecoderSlotEnableMask(), indexDDL));
+    for (Int_t ibit = 0; ibit < 11; ibit++)
+      if ((drmsd->GetPartecipatingSlotID() & (0x1 << ibit)) && !(drmsd->GetDecoderSlotEnableMask() & (0x1 << ibit)))
+        AliDebug(2, Form("readout slot %d data is missing in decoder", ibit + 2));
+  }
+  
+  /* get DRM data */
+  Int_t currentL0BCID = drmsd->GetL0BCID();
+
+  /* loop over TRM to get hits */
+  Int_t hitACQ, hitPS, hitSlotID, hitChain, hitTDC, hitChan, hitTimeBin, hitTOTBin, hitDeltaBC, hitL0L1Latency, hitLeading, hitTrailing, hitError;
+  Int_t currentBunchID;
+
+  /* loop over TRMs */
+  for (Int_t itrm = 0; itrm < 10; itrm++) {
+    trmsd = drmsd->GetTRMSummaryData(itrm);
+    /* check header/trailer */
+    if (!trmsd->GetHeader() || !trmsd->GetTrailer()) continue;
+    /* skip if TRM empty event detected */
+    if (trmsd->GetEBit() != 0) continue;
+    /* skip if bad TRM event counter detected */
+    if (trmsd->GetEventCounter() != drmsd->GetLocalEventCounter()) continue;
+    /* skip if bad TRM CRC detected */
+    AliDebug(2,Form("~~~~~~ %02d %02d --- TRM CRC: as written in raw data =%d and as computed =%d ~~~~~~",indexDDL,itrm,trmsd->GetEventCRC(), trmsd->GetDecoderCRC()));
+    if (trmsd->GetEventCRC() != trmsd->GetDecoderCRC()) continue;
+
+    /* loop over chains */
+    for (Int_t ichain = 0; ichain < 2; ichain++) {
+      chainsd = trmsd->GetChainSummaryData(ichain);
+    /* check header/trailer */
+      if (!chainsd->GetHeader() || !chainsd->GetTrailer()) continue;
+      /* skip if chain bad status detected */
+      if (chainsd->GetStatus() != 0) continue;
+      /* skip if bad chain event counter detected */
+      if (chainsd->GetEventCounter() != drmsd->GetLocalEventCounter()) continue;
+
+      currentBunchID = chainsd->GetBunchID();
+      hitBuffer = chainsd->GetTDCPackedHitBuffer();
+      errorBuffer = chainsd->GetTDCErrorBuffer();
+
+      /* check TDC errors and set TDC error flag */
+      for (Int_t itdc = 0; itdc < 15; itdc++) tdcErrorFlag[itdc] = kFALSE;
+      for (Int_t ierr = 0; ierr < errorBuffer->GetEntries(); ierr++) {
+       error = errorBuffer->GetError(ierr);
+       tdcErrorFlag[error->GetTDCID()] = kTRUE;
+      }
+
+      /* loop over hits */
+      for (Int_t ihit = 0; ihit < hitBuffer->GetEntries(); ihit++) {
+
+       /* get hit */
+       hit = hitBuffer->GetHit(ihit);
+       /* skip hit if coming from a TDC with error detected */
+       if (tdcErrorFlag[hit->GetTDCID()]) continue;
+
+       /* set info */
+       hitACQ = trmsd->GetACQBits();
+       hitPS = hit->GetPSBits();
+       hitSlotID = trmsd->GetSlotID();
+       hitChain = chainsd->GetChain();
+       hitTDC = hit->GetTDCID();
+       hitChan = hit->GetChan();
+       hitTimeBin = hit->GetHitTime();
+       hitTOTBin = hit->GetTOTWidth();
+       hitDeltaBC = currentBunchID - currentEventID1;
+       hitL0L1Latency = currentMiniEventID - currentL0BCID;
+       
+       hitLeading = hitTimeBin;
+       hitTrailing = -1;
+       hitError = -1;
+       
+       /* add hit */
+       TClonesArray &arrayTofRawData =  *fTOFrawData;
+       new (arrayTofRawData[fPackedDigits++]) AliTOFrawData(hitSlotID, hitChain, hitTDC, hitChan, hitTimeBin, hitTOTBin, hitLeading, hitTrailing, hitPS, hitACQ, hitError, hitDeltaBC, hitL0L1Latency);
+      }
+    }
+  }
+
+  return kFALSE;
+}
+
 //---------------------------------------------------------------------------
 void AliTOFRawStream::Geant2EquipmentId(Int_t vol[], Int_t eqId[])
 {
@@ -2285,10 +2554,10 @@ void AliTOFRawStream::Raw2SDigits(AliRawReader* rawReader, TClonesArray * const
        else ftxt << "   " << digit[3] << endl;
       }
       */
-      AliDebug(2, Form(" Raw data reading %2d -> %2d %1d %2d %1d %2d (%d, %d, %d)",
+      AliDebug(2, Form(" Raw data reading %2d -> %2d %1d %2d %1d %2d (%d, %d)",
                       last,
                       detectorIndex[0], detectorIndex[1], detectorIndex[2], detectorIndex[4], detectorIndex[3],
-                      digit[0], digit[1], digit[3]));
+                      digit[0], digit[1]));
 
       tofRawDatum = 0;
     } // while loop
@@ -2309,11 +2578,11 @@ void AliTOFRawStream::Raw2SDigits(AliRawReader* rawReader, TClonesArray * const
 }
 
 void AliTOFRawStream::VolumeID2LTM(Int_t detind[],
-                                  Int_t iDDL,
-                                  Int_t iTRM,
-                                  Int_t iChain,
-                                  Int_t iTDC,
-                                  Int_t iChannel) const {
+                                  Int_t &iDDL,
+                                  Int_t &iTRM,
+                                  Int_t &iChain,
+                                  Int_t &iTDC,
+                                  Int_t &iChannel) const {
   //
   // To convert the TOF trigger macropad ID (i.e. detind)
   // into TOF OR signals equipment ID (i.e. iDDL, iTRM, iChain, iTDC, iChannel)
@@ -2362,7 +2631,7 @@ void AliTOFRawStream::LTM2VolumeID(Int_t iDDL,
     iSector0 = (Int_t)(iDDL/4);
     iSector1 = (Int_t)(iDDL/4);
     Int_t iChan= iChannel+(iTDC-kFirstTDCnumber)*8;
-    if(iDDL%4 == 0 || iDDL%4 == 1 ){
+    if( iDDL%4 == 1 ){
       if(iChain==0){      //CRATE 0
         iPadX0=0;
         iPadX1=0;
@@ -2381,7 +2650,7 @@ void AliTOFRawStream::LTM2VolumeID(Int_t iDDL,
       }
 
     }
-    if(iDDL%4 == 2 || iDDL%4 == 3 ){
+    if( iDDL%4 == 3 ){
       if(iChain==1){// CRATE 3
         iPadX0=0;
         iPadX1=0;
@@ -2400,14 +2669,34 @@ void AliTOFRawStream::LTM2VolumeID(Int_t iDDL,
       }
     }
   }
-  detind1[0]=iSector1;
-  detind1[1]=iModule1;
-  detind1[2]=iStrip1;
-  detind1[3]=iPadX1;
-  detind1[4]=0;
-  detind0[0]=iSector0;
-  detind0[1]=iModule0;
-  detind0[2]=iStrip0;
-  detind0[3]=iPadX0;
-  detind0[4]=0;
+
+  if(iStrip1==-1 || iModule1==-1){
+    detind1[0]=-1;
+    detind1[1]=-1;
+    detind1[2]=-1;
+    detind1[3]=-1;
+    detind1[4]=-1;
+  }
+  else{
+    detind1[0]=iSector1;
+    detind1[1]=iModule1;
+    detind1[2]=iStrip1;
+    detind1[3]=iPadX1;
+    detind1[4]=0;
+  }
+
+  if(iStrip0==-1 || iModule0==-1){
+    detind0[0]=-1;
+    detind0[1]=-1;
+    detind0[2]=-1;
+    detind0[3]=-1;
+    detind0[4]=-1;
+  }
+  else{
+    detind0[0]=iSector0;
+    detind0[1]=iModule0;
+    detind0[2]=iStrip0;
+    detind0[3]=iPadX0;
+    detind0[4]=0;
+  }
 }