]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - HMPID/AliHMPIDRawStream.cxx
Fixes in the memory managment, additional protections
[u/mrichter/AliRoot.git] / HMPID / AliHMPIDRawStream.cxx
index c137d6f0d400c8560f53b14497e9246af77e47f9..89657a1087deb967bab0031afdfc44f0776b70d1 100644 (file)
 #include "AliRawReader.h"
 #include "AliLog.h"
 
+static Bool_t stDeb = kFALSE;      
+//static Bool_t stDeb = kTRUE;      
 
 ClassImp(AliHMPIDRawStream)
 
-//_____________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 AliHMPIDRawStream::AliHMPIDRawStream(AliRawReader* rawReader) :
+  fNPads(0),
+  fCharge(0x0),
+  fPad(0x0),
   fDDLNumber(-1),
   fRawReader(rawReader),
-  fData(NULL),
-  fPosition(-1)
+  fData(0x0),
+  fNumOfErr(0x0),
+  fPosition(-1),
+  fWord(0),
+  fZeroSup(kTRUE),
+  fPos(0x0),
+  iPos(0)
 {
   // Constructor
-  Init();
 
   fRawReader->Reset();
   fRawReader->Select("HMPID");
 }
-//-----------------------------------------------------------------------------
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 AliHMPIDRawStream::AliHMPIDRawStream() :
+  fNPads(0),
+  fCharge(0x0),
+  fPad(0x0),
   fDDLNumber(-1),
   fRawReader(0x0),
-  fData(NULL),
-  fPosition(-1)
+  fData(0x0),
+  fNumOfErr(0x0),
+  fPosition(-1),
+  fWord(0),
+  fZeroSup(kTRUE),
+  fPos(0x0),
+  iPos(0)
 {
-  // Constructor
-  Init();
 }
-//_____________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 AliHMPIDRawStream::~AliHMPIDRawStream()
 {
   // destructor
+    DelVars();
 }
-
-//_____________________________________________________________________________
-void AliHMPIDRawStream::Init()
-{
-  // Initalize the container
-  // with the pad charges
-  for(Int_t h = 0; h < kNDDL; h++) {  
-    for(Int_t i = 0; i < kNRows; i++){
-      for(Int_t j = 0; j < kNDILOGICAdd; j++){
-       for(Int_t k = 0; k < kNPadAdd; k++){
-         fCharge[h][i][j][k] = -1;
-         fPad[h][i][j][k]=-1;
-       }
-      }
-    }
-  }
-  fZeroSup=kTRUE;
-  
-  for(Int_t l=1; l < kSumErr; l++) fNumOfErr[l]=0;               //reset errors
-}//Init()
-//_____________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDRawStream::Reset()
 {
   // reset raw stream params
   // Reinitalize the containers
-  Init();
   fDDLNumber = -1;
   fPosition = -1;
   fData = NULL;
   if (fRawReader) fRawReader->Reset();
 }
-//_____________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Bool_t AliHMPIDRawStream::Next()
 {
   // read next DDL raw data from the HMPID raw data stream
@@ -97,7 +92,7 @@ Bool_t AliHMPIDRawStream::Next()
     if (!fRawReader->ReadNextData(fData)) return kFALSE;
   } while (fRawReader->GetDataSize() == 0);
   
+     
   /*
   Event type is selected as in $ALICE_ROOT/RAW/event.h  
   #define START_OF_RUN                    ((eventTypeType) 1)
@@ -116,145 +111,349 @@ Bool_t AliHMPIDRawStream::Next()
   #define EVENT_TYPE_MIN                  1
   #define EVENT_TYPE_MAX                  13 
   */
-      
+
+  fPosition = 0;
+  Bool_t status;
+          
   if(fRawReader->GetType() == 7)  {                             //New: Select Physics events, Old: Raw data size is not 0 and not 47148 (pedestal)
-  
     fDDLNumber = fRawReader->GetDDLID();
-    fPosition = 0;
+    if (fDDLNumber<0) {
+      AliWarning("Negative DDL number!");
+      return kFALSE;
+    }
+
+    if(stDeb) Printf("DDL %i started to be decoded!.",fDDLNumber);
+    InitVars(fRawReader->GetDataSize()/4);
+    status = ReadHMPIDRawData();
+   
+    if(stDeb) {
+      if(status) Printf("Event DDL %i successfully decoded!.",fDDLNumber);
+      else Printf("Event DDL %i ERROR in decoding!.",fDDLNumber);
+//      DumpData(fRawReader->GetDataSize());
+    }
+    DelVars();
+//    stDeb=kFALSE;
+  }
+//  return status;
+  return kTRUE;
+}
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+void AliHMPIDRawStream::InitVars(Int_t n)
+{
+  fNPads = 0;
+  if (n>0) fCharge = new Int_t[n];
+  if (n>0) fPad = new Int_t[n];
+  fNumOfErr = new Int_t*[kNDDL];                                 // Store the numner of errors for a given error type and a given DD
+  for(Int_t i=0;i<kNDDL;i++) {
+    fNumOfErr[i] = new Int_t [kSumErr];
+    for (Int_t j=0; j<kSumErr; j++) fNumOfErr[i][j] = 0;
+  }
+  //for debug purpose
+  if (n>0) fPos = new Int_t[4*n];                     //reset debug
+  iPos = 0;
+}    
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+void AliHMPIDRawStream::DelVars()
+{
+  fNPads = 0;
+  if (fCharge) {
+    delete [] fCharge;
+    fCharge = 0x0;
+  }
+  if (fPad) {
+    delete [] fPad;
+    fPad = 0x0;
+  }
+  if (fNumOfErr) {
+    for(Int_t i=0;i<kNDDL;i++) if(fNumOfErr[i]) delete [] fNumOfErr[i];
+    delete [] fNumOfErr;
+    fNumOfErr = 0x0;
+  }
+  if (fPos) {
+    delete [] fPos;
+    fPos = 0x0;
+  }
+}    
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Bool_t AliHMPIDRawStream::ReadHMPIDRawData()
+{
+  Int_t cntGlob = fRawReader->GetDataSize()/4;
+  Int_t cnt = cntGlob;
+  Int_t nwSeg;
+  Int_t cntSegment;
+
+  fWord = GetWord(cnt);cnt--;
+
   
-    Init();
+  while (cnt>0) {
     
-    // Look over rows
-    for(Int_t iRow = 1; iRow <= kNRows; iRow++) {
-      UInt_t rowMarker = GetNextWord();                                 // Read row marker
-      
-      Int_t numRows= rowMarker >> 16 & 0xfff;                        // Number of words after the row marker         
-      
-      if ( numRows > 490 ) {      //The row marker is fixed and we cannot have more than 490 words!!!
-       fRawReader->AddMajorErrorLog(kRowMarkerSizeErr);
-        AliWarning(Form("Wrong row marker size %x for row %d, value: %d expected < 490!",rowMarker,iRow,numRows));
-        fNumOfErr[kRowMarkerSizeErr]++;
-       return kTRUE;
-      }//check for row marker
-      
-      if ((rowMarker >> 0 & 0xffff) != 0x32a8  ) {      //The row marker is fixed and we cannot have more than 490 words!!!
-       fRawReader->AddMajorErrorLog(kRowMarkerErr);
-        AliWarning(Form("Wrong row marker %x for row %d, expected 0x32a8!",rowMarker,iRow));
-         fNumOfErr[kRowMarkerErr]++;
-       return kTRUE;
-      }//check for row marker
-      UInt_t dilogic = 0, row = 0;
-      UInt_t cntData=0;
-      UInt_t cntEoE=0;
-      //molnarl: lets read how many rows we have from the marker; 10 dilogic EoE so we can get the number of data words they should be in order
-      for(Int_t iWordInRow=0; iWordInRow<numRows;iWordInRow++) //loop over words 
-       {     
-         UInt_t tmpword=GetNextWord();               
-         UInt_t eOfEvent = tmpword;                     // always assume that it is an EoE. If bit 
-         if (!((eOfEvent >> 27) & 0x1)) {               // if it is not EoE then data!
-           UInt_t data=tmpword;
-           row = (data >> 22) & 0x1f;                                                  //row information in raw word is between bits: 22...26
-           if (row < 1 || row > kNRows) {                                              //select bits from 22 and with 0x1f ask for the next 5 bits 
-             fRawReader->AddMajorErrorLog(kWrongRowErr,Form("row %d",row));
-             AliWarning(Form("Wrong row index: %d, expected (1 -> %d)!",row,kNRows));
-              fNumOfErr[kWrongRowErr]++;
-             // row = iRow;
-           }
-           dilogic = (data >> 18) & 0xf;                                              //dilogic info in raw word is between bits: 18...21
-           if (dilogic < 1 || dilogic > kNDILOGICAdd) {
-             fRawReader->AddMajorErrorLog(kWrongDilogicErr,Form("dil %d",dilogic));
-             AliWarning(Form("Wrong DILOGIC index: %d, expected (1 -> %d)!",dilogic,kNDILOGICAdd));
-              fNumOfErr[kWrongDilogicErr]++;
-             //dilogic = iDILOGIC;
-           }
-           UInt_t pad = (data >> 12) & 0x3f;                                                    //pad info in raw word is between bits: 12...17
-           if (pad >= kNPadAdd) {
-             fRawReader->AddMajorErrorLog(kWrongPadErr,Form("pad %d",pad));
-             AliWarning(Form("Wrong pad index: %d, expected (0 -> %d)!",pad,kNPadAdd));
-              fNumOfErr[kWrongPadErr]++;
-             //pad = iPad;
-           }
-           fCharge[fDDLNumber][row][dilogic][pad] = data & 0xfff;  cntData++;
-           
-         }//not EoE but data!
-         //if it is EoE
-         else{
-           if (!((eOfEvent >> 27) & 0x1)) {                                                  //check 27th bit in EoE. It must be 1!
-             fRawReader->AddMajorErrorLog(kEoEFlagErr);
-             AliWarning(Form("Missing end-of-event flag! (%x)",eOfEvent));
-              fNumOfErr[kEoEFlagErr]++;
-             return kTRUE;
-           }
-           UInt_t wc = eOfEvent & 0x7f;
-           if (wc != cntData) {
-             fRawReader->AddMajorErrorLog(kEoESizeErr,Form("eoe size=%d",wc));
-             AliWarning(Form("Wrong end-of-event word-count: %d, expected: %d!",wc,cntData));
-              fNumOfErr[kEoESizeErr]++;
-             return kTRUE;
-           }
-           UInt_t da = (eOfEvent >> 18) & 0xf;
-           if (cntData!=0 && da != dilogic) {
-             fRawReader->AddMajorErrorLog(kEoEDILOGICErr,Form("eoe dil %d != %d",da,dilogic));
-             AliWarning(Form("Wrong DILOGIC address found in end-of-event: %d, expected %d!",da,dilogic));
-              fNumOfErr[kEoEDILOGICErr]++;
-             return kTRUE;
-           }
-           UInt_t ca = (eOfEvent >> 22) & 0x1f;
-           if (cntData!=0 &&  ca != row) {
-             fRawReader->AddMajorErrorLog(kEoERowErr,Form("eoe row %d != %d",ca,row));
-             AliWarning(Form("Wrong row index found in end-of-event: %d, expected %d!",ca,row));
-              fNumOfErr[kEoERowErr]++;
-             return kTRUE;
-           }
-           cntData=0;  cntEoE++;//zero it and wait for new data words
-         } //EoE word
-         
-       } //loop over rows within two markers
-      
-      
-      
-      // Read the segment marker
-      // One maker per 8 rows
-      
-      if (iRow%8 == 0) {
-       UInt_t segWord = GetNextWord();          
-       if ((segWord >> 8) != 0xab0f59) {
-         fRawReader->AddMajorErrorLog(kBadSegWordErr);
-         AliWarning(Form("Wrong segment word signature: %x, expected 0xab0f59!",(segWord >> 8)));
-          fNumOfErr[kBadSegWordErr]++;
-         return kTRUE;
-       }
-       
-       if ((segWord & 0xff) != (((UInt_t)iRow + 7) / 8)) {
-         fRawReader->AddMajorErrorLog(kWrongSegErr,Form("seg %d != %d",segWord & 0xff,(iRow + 7) / 8));
-         AliWarning(Form("Segment index (%d) does not correspond to the one expected from row index (%d)!",segWord & 0xff,(iRow + 7) / 8));
-          fNumOfErr[kWrongSegErr]++;
-         return kTRUE;
-       }
-      }
-    }//loop of Row   
-  }//REal data files selected by data lenght
+    nwSeg = (fWord >> kbit8) & 0xfff;
+    if(!CheckSegment()) return kFALSE;
+    if(!ReadSegment(cntSegment)) return kFALSE;
+
+    if(nwSeg != cntSegment) {if(stDeb){Printf("Error in Segment counters: %i different wrt %i",nwSeg,cntSegment);} return kFALSE;}
+    fWord = GetWord(cntSegment+1,kBwd);
+    cnt-=cntSegment+1;
+  }
+  
+  return kTRUE;
+  
+}
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Bool_t AliHMPIDRawStream::ReadSegment(Int_t &cntSegment)
+{
+  cntSegment = (fWord >> kbit8) & 0xfff;
+  Int_t cnt = cntSegment;
+  Int_t cntRow;
+  Int_t nwRow;
+
+  fWord = GetWord(cnt,kBwd);
+  
+  while (cnt>0) {
+
+    cntRow  = (fWord >> kbit16) & 0xfff;
+    if(!CheckRowMarker()) return kFALSE;
+    if(!ReadRow(nwRow)) return kFALSE;
+
+    if(nwRow != cntRow) {if(stDeb){Printf("Error in Row counters: %i different wrt %i",nwRow,cntRow);} return kFALSE;}
+    fWord = GetWord(cntRow+1);
+    cnt -= cntRow+1;
+    
+  }
+
+  cntSegment -= cnt;
+  
+  return kTRUE;
+    
+}    
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Bool_t AliHMPIDRawStream::ReadRow(Int_t &cntRow)
+{
+  Int_t cnt;
+  Int_t cntDilogic;
+  Int_t nwDil;
+  
+  cntRow  = (fWord >> kbit16) & 0xfff;
+  cnt = cntRow;  
+  
+  fWord = GetWord(cntRow);
+  
+  while (cnt>0) {
+    
+    if(!CheckEoE(nwDil)) return kFALSE;
+    if(!ReadDilogic(cntDilogic)) return kFALSE;
+    
+    if(nwDil != cntDilogic) {if(stDeb){Printf("Error in Dilogic counters: %i different wrt %i",nwDil,cntDilogic);}return kFALSE;}
+    cnt -= cntDilogic;
+    fWord = GetWord(1,kBwd); // go to next Dilogic bank...
+    cnt--;
+//    Printf(" cnt %i cntDilogic %i ",cnt,cntDilogic);
+  }
   
-  AliDebug(1,"Stop."); 
+  cntRow -= cnt;  
+  
+  return kTRUE;
+  
+}
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Bool_t AliHMPIDRawStream::ReadDilogic(Int_t &cntDilogic)
+{
+  cntDilogic = fWord & 0x7f;
+  
+  Int_t cnt = cntDilogic;
+  
+//  Printf(" cnt DILOGIC %i at %i word %08X",cnt,fPosition,fWord);
+
+  for(Int_t iDil=0;iDil<cntDilogic;iDil++) {
+    UInt_t dilogic = 0, row = 0;
+    fWord = GetWord(1,kBwd);
+//check on row number      
+    cnt--;
+    row = (fWord >> kbit22) & 0x1f;
+    if(!CheckRow(row)) continue;
+//check dilogic number     
+    dilogic = (fWord >> kbit18) & 0xf;                                              //dilogic info in raw word is between bits: 18...21
+    if(!CheckDilogic(dilogic)) continue;
+//check pad number
+    UInt_t pad = (fWord >> kbit12) & 0x3f;                                          //pad info in raw word is between bits: 12...17
+    if(!CheckPad(pad)) continue;
+    Int_t charge = fWord & 0xfff;
+    fPad[fNPads] = GetPad(fDDLNumber,row,dilogic,pad);
+    fCharge[fNPads] = charge;
+    fNPads++;
+  }
+
+  cntDilogic -= cnt;  
+  return kTRUE;  
+}
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Bool_t AliHMPIDRawStream::CheckSegment()
+{
+  UInt_t markSegment = 0xAB0;
+  /*
+  if (iRow%8 == 0) {
+    UInt_t segWord = GetWord();          
+    if ((segWord >> 20) != statusSegWord) {
+      fRawReader->AddMajorErrorLog(kBadSegWordErr);
+      AliWarning(Form("Wrong segment word signature: %x, expected 0xab0!",(segWord >> 20)));
+      fNumOfErr[kBadSegWordErr]++;
+      return kTRUE;
+    }
+*/
+  UInt_t segMarker = (fWord >> kbit20) & 0xfff;
+  if (segMarker != markSegment ) {
+    //fRawReader->AddMajorErrorLog(kWrongSegErr,Form("Segment marker %0X wrong (expected %0X) at %i in word %0X!",segMarker,markSegment,fPosition,fWord));
+    if(stDeb){ AliWarning(Form("Segment marker %X wrong (expected %0X)! at %i in word %0X!",segMarker,markSegment,fPosition,fWord));}
+    fNumOfErr[fDDLNumber][kWrongSegErr]++;
+    return kFALSE;
+  }
+  
+  UInt_t segAddress = fWord & 0xff;
+  if (segAddress<1 ||segAddress>3) {
+    //fRawReader->AddMajorErrorLog(kWrongSegErr,Form("Segment address %d not in the valid range [1-3] at %i in word %0X",segAddress,fPosition,fWord));
+    if(stDeb){AliWarning(Form("Segment address %d not in the valid range [1-3]",segAddress));}
+    fNumOfErr[fDDLNumber][kWrongSegErr]++;
+    return kFALSE;
+  }
+//  Printf("Segment Marker found at %i! Number of segment is %i",fPosition,segAddress);
   return kTRUE;
 }
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Bool_t AliHMPIDRawStream::CheckRow(UInt_t row)
+{
+//check on row number      
+//  Printf("ROW %i word %0X",row,fWord);
+  if(row>=1 && row <=kNRows) return kTRUE;
+  
+  //fRawReader->AddMajorErrorLog(kWrongRowErr,Form("row %d",row));
+  if(stDeb){AliWarning(Form("Wrong row index: %d, expected (1 -> %d) word %0X at %i...",row,kNRows,fWord,fPosition));}
+  fNumOfErr[fDDLNumber][kWrongRowErr]++;
+  return kFALSE;
+}
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Bool_t AliHMPIDRawStream::CheckDilogic(UInt_t dilogic)
+{
+//check dilogic number     
+  if (dilogic>= 1 && dilogic <=kNDILOGICAdd) return kTRUE;
+
+  //fRawReader->AddMajorErrorLog(kWrongDilogicErr,Form("dil %d",dilogic));
+  if(stDeb){AliWarning(Form("Wrong DILOGIC index: %d, expected (1 -> %d)!",dilogic,kNDILOGICAdd));}
+  fNumOfErr[fDDLNumber][kWrongDilogicErr]++;
+  //dilogic = iDILOGIC;
+  return kFALSE;
+}      
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Bool_t AliHMPIDRawStream::CheckPad(UInt_t pad)
+{
+//check pad number     
+  if (pad < kNPadAdd) return kTRUE;
+  
+  //fRawReader->AddMajorErrorLog(kWrongPadErr,Form("pad %d",pad));
+  if(stDeb){AliWarning(Form("Wrong pad index: %d, expected (0 -> %d)!",pad,kNPadAdd));}
+  fNumOfErr[fDDLNumber][kWrongPadErr]++;
+  return kFALSE;
+}    
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Bool_t AliHMPIDRawStream::CheckEoE(Int_t &nDil)
+{
+  if (!((fWord >> kbit27) & 0x1)) {                                                //check 27th bit in EoE. It must be 1!
+    //fRawReader->AddMajorErrorLog(kEoEFlagErr);
+    if(stDeb){AliWarning(Form("Missing end-of-event flag! (%08X) at %i",fWord,fPosition));}
+    fNumOfErr[fDDLNumber][kEoEFlagErr]++;
+    return kFALSE;
+  }
+  nDil = fWord & 0x7f;                                               //nDil=EoE word count
+  if(nDil < 0 || nDil > 48 ) { 
+
+    //fRawReader->AddMajorErrorLog(kEoESizeErr,Form("EoE size=%d",nDil));
+    if(stDeb){AliWarning(Form("Wrong end-of-event word-count: %08X",fWord));}
+    fNumOfErr[fDDLNumber][kEoESizeErr]++;
+    return kFALSE;
+  }
+//  UInt_t da = (eOfEvent >> 18) & 0xf;
+//  if (cntData!=0 && da != dilogic) {
+//    fRawReader->AddMajorErrorLog(kEoEDILOGICErr,Form("eoe dil %d != %d",da,dilogic));
+//    AliWarning(Form("Wrong DILOGIC address found in end-of-event: %d, expected %d!",da,dilogic));
+//    fNumOfErr[kEoEDILOGICErr]++;
+//    return kFALSE;  AliQAChecker::Instance()->Run(AliQA::kHMPID, task, obj) ;  
 
-//_____________________________________________________________________________
-UInt_t AliHMPIDRawStream::GetNextWord()
+//  }
+//  UInt_t ca = (eOfEvent >> 22) & 0x1f;
+//  if (cntData!=0 &&  ca != row) {
+//    fRawReader->AddMajorErrorLog(kEoERowErr,Form("eoe row %d != %d",ca,row));
+//    AliWarning(Form("Wrong row index found in end-of-event: %d, expected %d!",ca,row));
+//    fNumOfErr[kEoERowErr]++;
+//    return kFALSE;
+//  }
+  return kTRUE;
+}
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Bool_t AliHMPIDRawStream::CheckRowMarker()
+{
+  UInt_t nMAXwordsInRow = 0x1EA;
+  UInt_t statusControlRow = 0x32a8; // 0x36a8 for zero suppression
+//First check on row marker    
+  UInt_t rowControlWord = fWord >> kbit0 & 0xfbff;
+  
+  if(rowControlWord != statusControlRow) {
+    //fRawReader->AddMajorErrorLog(kRowMarkerErr);
+    if(stDeb){AliWarning(Form("Wrong row marker %x expected 0x32a8!",rowControlWord));
+              fNumOfErr[fDDLNumber][kRowMarkerErr]++;
+              return kFALSE; }
+   }
+//Second check on row marker    
+   UInt_t wordsInRow = fWord >> kbit16 & 0x0fff;                // Number of words after the row marker, bit 10 is skipped in this check
+  
+  if (wordsInRow > nMAXwordsInRow) {
+    //fRawReader->AddMajorErrorLog(kRowMarkerSizeErr);
+    if(stDeb){AliWarning(Form(" FATAL: Number of words %x in a row exceeds the expected value: 0x1EA !",wordsInRow));}
+    fNumOfErr[fDDLNumber][kRowMarkerSizeErr]++;
+    return kFALSE;
+  }
+  
+  return kTRUE;
+}
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+UInt_t AliHMPIDRawStream::GetWord(Int_t n,EDirection dir)
 {
-  // This method returns the next 32 bit word
+  // This method returns the n-th 32 bit word
   // inside the raw data payload.
   // The method is supposed to be endian (platform)
   // independent.
   if (!fData || fPosition < 0) AliFatal("Raw data payload buffer is not yet initialized !");
   
   UInt_t word = 0;
+  
+  if(dir==kBwd) n = -n; 
+  fPosition+=4*n-4;
+  
+  StorePosition();
+  
   word |= fData[fPosition++];
   word |= fData[fPosition++] << 8;
   word |= fData[fPosition++] << 16;
   word |= fData[fPosition++] << 24;
-  
+
   return word;
 }
-
-//_____________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+void AliHMPIDRawStream::DumpData(Int_t nw)
+{
+   for(Int_t i=0;i<nw;i+=4) {
+     if(!(i%16)) printf(" \n %8i) ",i);
+     printf("%02X%02X%02X%02X [ %06i ] ",fData[i+3],fData[i+2],fData[i+1],fData[i+0],fPos[i]);
+   }
+   Printf(" \n -----end of dump ----------- ");
+}
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+void AliHMPIDRawStream::StorePosition()
+{
+  if(fPos[fPosition]!=0) {
+//    Printf("Position already stored!!! Value %i at address %i",fPos[fPosition],fPosition); 
+    return;
+  }
+  iPos++;
+  fPos[fPosition] = iPos;
+//  if(stDeb)Printf("%i - Actual position %i",iPos,fPosition); 
+}
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++