]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TRD/AliTRDrawStreamTB.cxx
QA update by Sylwester
[u/mrichter/AliRoot.git] / TRD / AliTRDrawStreamTB.cxx
index 0e0df4cc88fab69aca1a32864e1ca8e135017f63..6ea59b7a1a96bd5840bb9d00a755050b047237de 100644 (file)
@@ -1,4 +1,4 @@
-/**************************************************************************
+#/**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
 #include "AliTRDdigitsManager.h"
 #include "AliTRDdataArrayS.h"
 #include "AliTRDdataArrayI.h"
+#include "AliTRDdataArrayDigits.h"
 #include "AliTRDSignalIndex.h"
+#include "AliTRDrecoParam.h"
+#include "AliTRDcalibDB.h"
+#include "Cal/AliTRDCalPadStatus.h"
+
+//[mj tracklet writing] #include "AliTRDrawTracklet.h"
 
 #include "AliLog.h"
 #include "AliRawReader.h"
 // Stack word masks
 #define STACK_HEADER_SIZE(w) GET_VALUE_AT(w,0xffff,16)
 #define STACK_LINK_WORD(w) ((w) & 0xfff)
+#define LINK0_DATA_TYPE_FLAG(w) (GET_VALUE_AT(w,0x3,4) == (0x0) ? 0 : 1) // 0 if physics data
+#define LINK1_DATA_TYPE_FLAG(w) (GET_VALUE_AT(w,0x3,20) == (0x0) ? 0 : 1) // 0 if physics data
+#define LINK0_MONITOR_FLAG(w) (GET_VALUE_AT(w,0xf,0) == (0x0) ? 0 : 1) // 0 if OK
+#define LINK1_MONITOR_FLAG(w) (GET_VALUE_AT(w,0xf,16) == (0x0) ? 0 : 1) // 0 if OK
 
 // HC word masks
 //#define HC_HEADER_MASK_ERR(w) ( ((w) & (0x80000003)) == (0x80000001) ? 0 : 1) // 0 if OK!!!
@@ -69,6 +79,7 @@
 // HC word 0
 #define HC_SPECIAL_RAW_VERSION(w) IS_BIT_SET(w,31)
 #define HC_MAJOR_RAW_VERSION(w) GET_VALUE_AT(w,0x7f,24)
+#define HC_MAJOR_RAW_VERSION_OPT(w) GET_VALUE_AT(w,0x7,24)
 #define HC_MINOR_RAW_VERSION(w) GET_VALUE_AT(w,0x7f,17)
 #define HC_EXTRA_WORDS(w) GET_VALUE_AT(w,0x7,14)
 #define HC_DCS_BOARD(w) GET_VALUE_AT(w,0xfff<<20,20)
@@ -83,8 +94,6 @@
 #define HC_PRETRIGGER_COUNTER(w) GET_VALUE_AT(w,0xf,6)
 #define HC_PRETRIGGER_PHASE(w) GET_VALUE_AT(w,0xf,6)
 
-//--------------------------------------------------------
-
 // MCM word and ADC mask
 #define MCM_HEADER_MASK_ERR(w) ( ((w) & (0xf)) == (0xc) ? 0 : 1) // 0 if OK!!!
 #define MCM_ADCMASK_MASK_ERR(w) ( ((w) & (0xf)) == (0xc) ? 0 : 1) // 0 if OK!!!
 #define MCM_ROB_NUMBER(w) GET_VALUE_AT(w,0x7,28)
 #define MCM_EVENT_COUNTER(w) GET_VALUE_AT(w,0x00fffff,4)
 #define MCM_ADCMASK_VAL(w) GET_VALUE_AT(w,0x1fffff,4)
+#define MCM_ADCMASK_NADC(w) GET_VALUE_AT(w,0x1f,25)
 
-//this should give 0x1fffff as a mask
-#define MCM_DUMMY_ADCMASK_VAL 0x001fffffc 
-//--------------------------------------------------------
-
-#define MAX_TRACKLETS_PERHC 256 // max number of tracklets per HC - large number for now
+#define MCM_DUMMY_ADCMASK_VAL 0x015fffffc  // updated 
+#define ADCDATA_VAL1 0x2  // updated 
+#define ADCDATA_VAL2 0x3  // updated 
 
 //--------------------------------------------------------
 #define ADC_WORD_MASK(w) ((w) & 0x3)
 //--------------------------------------------------------
+
+
 ClassImp(AliTRDrawStreamTB)
 
 Bool_t AliTRDrawStreamTB::fgExtraSkip = kFALSE;
 Bool_t AliTRDrawStreamTB::fgSkipCDH = kFALSE;
 Bool_t AliTRDrawStreamTB::fgWarnError = kTRUE;
-Bool_t AliTRDrawStreamTB::fgCleanDataOnly = kTRUE;
+Bool_t AliTRDrawStreamTB::fgCleanDataOnly = kFALSE;
 Bool_t AliTRDrawStreamTB::fgDebugFlag = kTRUE;
-Bool_t AliTRDrawStreamTB::fgDebugStreamFlag = kFALSE;
 Bool_t AliTRDrawStreamTB::fgStackNumberChecker = kTRUE;
-TTreeSRedirector *AliTRDrawStreamTB::fgDebugStreamer = 0;
+Bool_t AliTRDrawStreamTB::fgStackLinkNumberChecker = kTRUE;
+Bool_t AliTRDrawStreamTB::fgSkipData = kTRUE;
 UInt_t AliTRDrawStreamTB::fgStreamEventCounter = 0;
+UInt_t AliTRDrawStreamTB::fgFirstEquipmentID = 0;
 UInt_t AliTRDrawStreamTB::fgDumpHead = 0;
 Int_t  AliTRDrawStreamTB::fgCommonAdditive = 0;
 Int_t AliTRDrawStreamTB::fgEmptySignals[] = 
@@ -122,7 +133,7 @@ Int_t AliTRDrawStreamTB::fgEmptySignals[] =
   };
 
 AliTRDrawStreamTB::AliTRDrawStreamTB()
-  : TObject()
+  : AliTRDrawStreamBase()
   , fSM()
   , fStack(0)
   , fHC(0)
@@ -132,6 +143,7 @@ AliTRDrawStreamTB::AliTRDrawStreamTB()
   , fpBegin(0)
   , fpEnd(0)
   , fWordLength(0)
+  , fEquipmentID(0)
   , fStackNumber(-1)
   , fStackLinkNumber(-1)
   , fhcMCMcounter(0)
@@ -145,10 +157,10 @@ AliTRDrawStreamTB::AliTRDrawStreamTB()
   , fLastEventCounter(0)
   , fSharedPadsOn(kFALSE)
   , fMaxADCgeom(0)
+  , fBufferRead(0)
   , fGeometry(0)
   , fRawReader(0)
   , fTRDfeeParam(0)
-  , fDebugStreamOwned(kFALSE)
 {
   //
   // default constructor
@@ -162,7 +174,7 @@ AliTRDrawStreamTB::AliTRDrawStreamTB()
 
 //--------------------------------------------------------
 AliTRDrawStreamTB::AliTRDrawStreamTB(AliRawReader *rawReader)
-  : TObject()
+  : AliTRDrawStreamBase(rawReader)
   , fSM()
   , fStack(0)
   , fHC(0)
@@ -172,6 +184,7 @@ AliTRDrawStreamTB::AliTRDrawStreamTB(AliRawReader *rawReader)
   , fpBegin(0)
   , fpEnd(0)
   , fWordLength(0)
+  , fEquipmentID(0)
   , fStackNumber(-1)
   , fStackLinkNumber(-1)
   , fhcMCMcounter(0)
@@ -185,10 +198,10 @@ AliTRDrawStreamTB::AliTRDrawStreamTB(AliRawReader *rawReader)
   , fLastEventCounter(0)
   , fSharedPadsOn(kFALSE)
   , fMaxADCgeom(0)
+  , fBufferRead(0)
   , fGeometry(0)
   , fRawReader(rawReader)
   , fTRDfeeParam(0)
-  , fDebugStreamOwned(kFALSE)
 {
   //
   // default constructor
@@ -209,7 +222,7 @@ AliTRDrawStreamTB::AliTRDrawStreamTB(AliRawReader *rawReader)
 //------------------------------------------------------------
 
 AliTRDrawStreamTB::AliTRDrawStreamTB(const AliTRDrawStreamTB& /*st*/)
-  : TObject()
+  : AliTRDrawStreamBase()
   , fSM()
   , fStack(0)
   , fHC(0)
@@ -219,6 +232,7 @@ AliTRDrawStreamTB::AliTRDrawStreamTB(const AliTRDrawStreamTB& /*st*/)
   , fpBegin(0)
   , fpEnd(0)
   , fWordLength(0)
+  , fEquipmentID(0)
   , fStackNumber(-1)
   , fStackLinkNumber(-1)
   , fhcMCMcounter(0)
@@ -232,10 +246,10 @@ AliTRDrawStreamTB::AliTRDrawStreamTB(const AliTRDrawStreamTB& /*st*/)
   , fLastEventCounter(0)
   , fSharedPadsOn(kFALSE)
   , fMaxADCgeom(0)
+  , fBufferRead(0)
   , fGeometry(0)
   , fRawReader(0)
   , fTRDfeeParam(0)
-  , fDebugStreamOwned(kFALSE)
 {
   //
   // Copy constructor
@@ -244,13 +258,14 @@ AliTRDrawStreamTB::AliTRDrawStreamTB(const AliTRDrawStreamTB& /*st*/)
 }
 
 //------------------------------------------------------------
-void AliTRDrawStreamTB::SetRawVersion(Int_t fraw)
+Bool_t AliTRDrawStreamTB::SetRawVersion(Int_t fraw)
 {
   //
   // function provided for backward compatibility
   //
   AliWarning("Raw data version is read from raw data stream! No point of setting it in here.");
   fraw = 0; // avoid warnings
+  return kFALSE;
 }
 
 //------------------------------------------------------------
@@ -260,15 +275,6 @@ AliTRDrawStreamTB::~AliTRDrawStreamTB()
   // destructor
   //
   delete fGeometry;
-
-  if (fDebugStreamOwned == kTRUE)
-    {
-      if (fgDebugStreamer)
-       {
-         delete fgDebugStreamer;
-         fgDebugStreamer = 0;
-       }
-    }
 }
 
 //------------------------------------------------------------
@@ -283,41 +289,6 @@ AliTRDrawStreamTB::operator=(const AliTRDrawStreamTB &)
   return *this;
 }
 
-//------------------------------------------------------------
-
-void    
-AliTRDrawStreamTB::EnableDebug(TTreeSRedirector *debugStream)
-{
-  //
-  // replace the current debug streamer or create a new one if owned
-  //
-
-  if (debugStream == 0)
-    {
-      if (fDebugStreamOwned == kTRUE)
-       {
-         if (fgDebugStreamer)
-           delete fgDebugStreamer;
-       }
-
-      fDebugStreamOwned = kTRUE;
-      fgDebugStreamer    = new TTreeSRedirector("TRDrawDataDebug.root");
-      fgStreamEventCounter = 0;
-
-    }
-  else
-    {
-      if (fDebugStreamOwned == kTRUE)
-       {
-         if (fgDebugStreamer)
-           delete fgDebugStreamer;
-       }
-
-      fgDebugStreamer = debugStream;
-      fDebugStreamOwned = kFALSE;
-    }
-}
-
 //___________________________________________________________
 void 
 AliTRDrawStreamTB::SwapOnEndian()
@@ -325,12 +296,10 @@ AliTRDrawStreamTB::SwapOnEndian()
   //
   // Check the endian and swap if needed
   //
-
   int itemp = 1;
   char* ptemp = (char*) &itemp;
   if (ptemp[0] != 1)
     {
-      // need to swap...
       if (fgDebugFlag) AliDebug(8, "Swapping.");
 
       fpPos = fpBegin;
@@ -347,28 +316,11 @@ AliTRDrawStreamTB::SwapOnEndian()
     }
 }
 
-//------------------------------------------------------------
-void 
-AliTRDrawStreamTB::DumpErrorCount()
-{
-  //
-  // print the error statistics into the stdout
-  //
-
-  ;
-  //   AliInfo(Form("Error counts: HC0 %d HC1 %d MCM %d ADCmask %d ADC %d", 
-  //          fHC->fH0ErrorCounter,  fHC->fH1ErrorCounter, fMCM->fErrorCounter, fMCM->fMaskErrorCounter, adc.fErrorCounter));
-}
-
 //------------------------------------------------------------
 Bool_t 
 AliTRDrawStreamTB::DumpWords(UInt_t *px, UInt_t iw, UInt_t marker)
 {
-  //
-  // skip few words
-  // note: can be made faster
-  //
-    
+
   TString tsreturn = Form("\n[ Dump Sequence at 0x%08x ] : ", px);
   for (UInt_t i = 0; i < iw; i++)
     {
@@ -394,10 +346,8 @@ Bool_t
 AliTRDrawStreamTB::SkipWords(UInt_t iw)
 {
   //
-  // skip few words
-  // note: can be made faster
+  // Skip words corresponding to iw
   //
-  
   if ( fpPos + iw < fpEnd )
     {
       fpPos += iw;
@@ -406,17 +356,6 @@ AliTRDrawStreamTB::SkipWords(UInt_t iw)
   else
     {
       if (fgWarnError) AliWarning(Form("Skip %d words failed. %d available", iw, fpEnd - fpPos - 1));
-      if (fgDebugStreamer)
-       {
-         TTreeSRedirector &cstream = *fgDebugStreamer;
-         cstream << "SkipWords"
-                 << "Event=" << fgStreamEventCounter
-                 << ".nwords=" << iw
-//               << ".read=" << (Char_t*)(fpPos - fpBegin)
-//               << ".togo=" << (Char_t*)(fpEnd - fpPos)
-//               << ".length=" << (Char_t*)(fpEnd - fpBegin)
-                 << "\n";
-       }
       return kFALSE;
     }
 
@@ -427,9 +366,6 @@ AliTRDrawStreamTB::SkipWords(UInt_t iw)
 Bool_t 
 AliTRDrawStreamTB::SetReader(AliRawReader *reader)
 {
-  //
-  //
-  //
 
   if (reader != 0)
     {
@@ -459,8 +395,8 @@ AliTRDrawStreamTB::NextBuffer()
 {
   //
   // return -1 if no more buffers available
-  // return 0 DecodeSM failed (clean data required for example) but still maybe more data to come
-  // return 1 DecodeSM OK
+  // return  0 DecodeSM failed (clean data required for example) but still maybe more data to come
+  // return  1 DecodeSM OK
   // 
 
   if (fRawReader != 0)
@@ -487,7 +423,6 @@ AliTRDrawStreamTB::NextBuffer()
          if (length > 0)
            {
              if (fgDebugFlag)  AliDebug(9, Form("Buffer length : %d", length));
-             //return InitBuffer((void*)buffer, length);
              if (DecodeSM((void*)buffer, length) == kTRUE)
                return 1;
              else
@@ -510,17 +445,17 @@ AliTRDrawStreamTB::ResetCounters()
   //
   // reset some global counters
   //
+  fBufferRead = kFALSE; // important to read buffer
 
+  fEquipmentID = 0;
   fStackNumber = 0;
   fStackLinkNumber = 0;
-
   fDecodedADCs = 0;
 
   fSM.fActiveStacks = 0;
   fSM.fNexpectedHalfChambers = 0;
 
   fLinkTrackletCounter = 0;
-
   fLastEventCounter = 0;
   fEventCounter = 0;
 }
@@ -530,14 +465,24 @@ void
 AliTRDrawStreamTB::ResetIterators()
 {
   //
-  // reset the data iterators used in the Next()
+  // reset data which should be reset every sm
   //
-  fStackNumber = 0;
-  fStackLinkNumber = 0;
+  fStackNumber = 0;     // reset for Next() function 
+  fStackLinkNumber = 0; // reset for Next() function
   fhcMCMcounter = 0;  
   fmcmADCcounter = 0;
 }
 
+//------------------------------------------------------------
+void 
+AliTRDrawStreamTB::ResetPerHC()
+{
+  //
+  // reset every HC
+  //
+  fEventCounter = 0;
+}
+
 //------------------------------------------------------------
 
 Bool_t 
@@ -547,115 +492,157 @@ AliTRDrawStreamTB::Next()
   // returns with true on next adc read
   // returns false on errors and end of buffer
   // 
-
-  while (fStackNumber < 5 && fSM.fActiveStacks > 0)
-    {
-      if(fSM.fStackActive[fStackNumber] == kTRUE)
-       {
-         fStack = &fSM.fStacks[fStackNumber];
-         while (fStackLinkNumber < 12)
-           {
-             if (fStack->fLinksActive[fStackLinkNumber] == kTRUE)
-               {
-                 fHC = &fStack->fHalfChambers[fStackLinkNumber];
-                 if (!fHC)
-                   {
-                     AliError(Form("Super Strange. HC missing at stack %d link %d", fStackNumber, fStackLinkNumber));
-                     return kFALSE;
-                   }
-                 //if (fgDebugFlag)  AliDebug(2, DumpHCinfoH0(fHC));             
-                 if (fHC->fCorrupted == 0)
-                   {
-                     while (fhcMCMcounter < fHC->fMCMmax)
-                       {
-                         fMCM = &fHC->fMCMs[fhcMCMcounter];
-                         //if (fgDebugFlag)  AliDebug(2, DumpMCMinfo(fMCM));                                     
-                         if (!fMCM)
-                           {
-                             AliError(Form("Super Strange. HC missing at stack %d link %d atMCMslot %d", 
-                                           fStackNumber, fStackLinkNumber, fhcMCMcounter));
-                             return kFALSE;
-                           }
-                         while(fmcmADCcounter < fMCM->fADCmax)
-                           {
-                             //printf("%d %d %d %d\n", fStackNumber, fStackLinkNumber, fhcMCMcounter, fmcmADCcounter);
-                             fADC = &fMCM->fADCs[fmcmADCcounter];
-                             if (!fADC)
-                               {
-                                 AliError(Form("Super Strange. ADC missing at stack %d link %d MCMslot %d ADCslot %d", 
-                                               fStackNumber, fStackLinkNumber, fhcMCMcounter, fmcmADCcounter));
-                                 return kFALSE;
-                               }
-                             fmcmADCcounter++;
-                             //printf("ADC count %d \n",  fmcmADCcounter);
-                             if (fSharedPadsOn)
-                               {
-                                 return kTRUE;
-                               }
-                             else
-                               {
-                                 if (fADC->fIsShared == kFALSE)
+ if (fBufferRead)
+   {
+
+    while (fStackNumber < 5 && fSM.fActiveStacks > 0)
+      {
+        if(fSM.fStackActive[fStackNumber] == kTRUE)
+         {
+           fStack = &fSM.fStacks[fStackNumber];
+           while (fStackLinkNumber < 12)
+             {
+               if (fStack->fLinksActive[fStackLinkNumber] == kTRUE)
+                 {
+                   fHC = &fStack->fHalfChambers[fStackLinkNumber];
+                   if (!fHC)
+                     {
+                       AliError(Form("HC missing at stack %d link %d", fStackNumber, fStackLinkNumber));
+                       return kFALSE;
+                     }
+                   if (fHC->fCorrupted == 0)
+                     {
+                       while (fhcMCMcounter < fHC->fMCMmax)
+                         {
+                           fMCM = &fHC->fMCMs[fhcMCMcounter];
+                           if (!fMCM)
+                             {
+                               AliError(Form("HC missing at stack %d link %d atMCMslot %d", 
+                                           fStackNumber, fStackLinkNumber, fhcMCMcounter));
+                               return kFALSE;
+                             }
+                           while(fmcmADCcounter < fMCM->fADCmax)
+                             {
+                               fADC = &fMCM->fADCs[fmcmADCcounter];
+                               if (!fADC)
+                                 {
+                                   AliError(Form("ADC missing at stack %d link %d MCMslot %d ADCslot %d", 
+                                               fStackNumber, fStackLinkNumber, fhcMCMcounter, fmcmADCcounter));
+                                   return kFALSE;
+                                 }
+                               fmcmADCcounter++;
+                               if (fSharedPadsOn)
+                                 {
                                    return kTRUE;
-                               }
-                           } //while adc in MCM
-                         //printf("MCM count %d \n", fhcMCMcounter);
-                         fhcMCMcounter++;
-                         // next MCM should go through all active ADCs
-                         fmcmADCcounter = 0;
-                       } // while mcm
-                   } // if HC OK
-               }// if link active
-             fStackLinkNumber++;
-             // next stack link (HC) should go through all active MCMs
-             fhcMCMcounter = 0;
-           }// while links
-       }// if stack active
-      fStackNumber++;
-      // next stack should go through all links - start from 0
-      fStackLinkNumber = 0;
-    }
-
-  // in case rawreader manages the mem buffers
-  // lets go for the next buffer
-  if (fRawReader)
-    {
-      Int_t nextBuff = NextBuffer();
-      while (nextBuff != -1)
-       {
-         if (nextBuff > 0)
-           return Next();                
-         nextBuff = NextBuffer();
-       }
-    }
+                                 }
+                               else
+                                 {
+                                   if (fADC->fIsShared == kFALSE)
+                                     return kTRUE;
+                                 }
+                             } //while adc in MCM
+                           fhcMCMcounter++;
+                           // next MCM should go through all active ADCs
+                           fmcmADCcounter = 0;
+                         } // while mcm
+                     } // if HC OK
+                 }// if link active
+               fStackLinkNumber++;
+               // next stack link (HC) should go through all active MCMs
+               fhcMCMcounter = 0;
+             }// while links
+         }// if stack active
+        fStackNumber++;
+        // next stack should go through all links - start from 0
+        fStackLinkNumber = 0;
+      }
+   } // fBufferRead
+
+   // in case rawreader manages the mem buffers, go for the next buffer 
+   if (fRawReader)
+     {
+       Int_t nextBuff = NextBuffer();
+       while (nextBuff != -1)
+         {
+           if (nextBuff > 0)
+              {
+                fBufferRead = kTRUE;
+               return Next();            
+              }
+           nextBuff = NextBuffer();
+         }
+     }
 
   return kFALSE;
 }
 
 //------------------------------------------------------------
-
 Int_t 
 AliTRDrawStreamTB::NextChamber(AliTRDdigitsManager *digitsManager)
+//[mj tracklet writing] AliTRDrawStreamTB::NextChamber(AliTRDdigitsManager *digitsManager, TObjArray *trackletContainer)
 {
   //
   // Fills single chamber digit array 
   // Return value is the detector number
   //
 
-  AliTRDdataArrayS *digits = 0;
+  AliTRDcalibDB *cal = AliTRDcalibDB::Instance();
+  AliTRDdataArrayDigits *digits = 0;
   AliTRDdataArrayI *track0 = 0;
   AliTRDdataArrayI *track1 = 0;
   AliTRDdataArrayI *track2 = 0; 
   AliTRDSignalIndex *indexes = 0;
 
+  // Get the ADC baseline
+  Int_t adcBaseline = 0;
+  //   if (!AliTRDReconstructor::RecoParam())
+  //     {
+  //       AliError("RecoParam does not exist\n");
+  //       return 0;
+  //     }
+  //   else 
+  //     {
+  //       adcBaseline = ((Int_t) AliTRDReconstructor::RecoParam()->GetADCbaseline());
+  //     }
+
+  static AliTRDrecoParam * par = AliTRDrecoParam::GetLowFluxParam();
+  adcBaseline = par->GetADCbaseline();
   // Loop through the digits
   Int_t lastdet = -1;
-  Int_t det    = -1;
-  //   Int_t returnDet = -1;
+  Int_t det     = -1;
+  // Int_t returnDet = -1;
+  //[mj tracklet writing] Int_t lastside = -1;
+  //[mj tracklet writing] Int_t side     = -1;
   Int_t it = 0;
   while (Next()) 
     {      
       det    = GetDet();
-    
+      //[mj tracklet writing] 
+      /* 
+      side   = GetSide();
+      if (trackletContainer)
+        {
+         if ((det + side*AliTRDgeometry::kNdet) != (lastdet + lastside*AliTRDgeometry::kNdet))
+         {
+           if (det != lastdet)
+             {
+              if (lastdet != -1)
+                {
+                 return lastdet;
+                }
+             }
+
+           UInt_t *trackletwords = GetTrackletWords();
+           AliTRDrawTracklet *tracklets = new AliTRDrawTracklet();
+           tracklets->SetDet(det);
+           tracklets->SetSide(side);    
+
+           tracklets->SetTracklets(trackletwords);
+           trackletContainer->Add(tracklets);
+         
+           lastside = side; 
+          } 
+        } */
       if (det != lastdet) 
        { 
          // If new detector found
@@ -682,10 +669,14 @@ AliTRDrawStreamTB::NextChamber(AliTRDdigitsManager *digitsManager)
            }
 
          // Add a container for the digits of this detector
-         digits = (AliTRDdataArrayS *) digitsManager->GetDigits(det);
-         track0 = (AliTRDdataArrayI *) digitsManager->GetDictionary(det,0);
-         track1 = (AliTRDdataArrayI *) digitsManager->GetDictionary(det,1);
-         track2 = (AliTRDdataArrayI *) digitsManager->GetDictionary(det,2);
+         digits = (AliTRDdataArrayDigits *) digitsManager->GetDigits(det);
+
+          if (digitsManager->UsesDictionaries()) 
+            {
+             track0 = (AliTRDdataArrayI *) digitsManager->GetDictionary(det,0);
+             track1 = (AliTRDdataArrayI *) digitsManager->GetDictionary(det,1);
+             track2 = (AliTRDdataArrayI *) digitsManager->GetDictionary(det,2);
+           }
 
          if (!digits)
            {
@@ -698,7 +689,6 @@ AliTRDrawStreamTB::NextChamber(AliTRDdigitsManager *digitsManager)
                  AliError(Form("Unable to get digits for det %d. Event buffer is NOT clean!", det));
                }
              return -1;
-             //continue;
            }
 
          Int_t rowMax = GetRowMax();
@@ -709,9 +699,12 @@ AliTRDrawStreamTB::NextChamber(AliTRDdigitsManager *digitsManager)
          if (digits->GetNtime() == 0) 
            {
              digits->Allocate(rowMax, colMax, ntbins);
-             track0->Allocate(rowMax, colMax, ntbins);
-             track1->Allocate(rowMax, colMax, ntbins);
-             track2->Allocate(rowMax, colMax, ntbins);
+              if (digitsManager->UsesDictionaries()) 
+                {
+                 track0->Allocate(rowMax, colMax, ntbins);
+                 track1->Allocate(rowMax, colMax, ntbins);
+                 track2->Allocate(rowMax, colMax, ntbins);
+               }
            }
 
          indexes = digitsManager->GetIndexes(det);
@@ -722,25 +715,30 @@ AliTRDrawStreamTB::NextChamber(AliTRDdigitsManager *digitsManager)
          if (indexes->IsAllocated() == kFALSE)
            indexes->Allocate(rowMax, colMax, ntbins);
        }
-    
+
+      Char_t padStatus =  cal->GetPadStatus(det, GetCol(), GetRow());
+
       // ntimebins data are ready to read
       for (it = 0; it < GetNumberOfTimeBins(); it++)
        {
-         if (GetSignals()[it] > 0)
+         if ((GetSignals()[it] - adcBaseline) > 0)
            {
-             digits->SetDataUnchecked(GetRow(), GetCol(), it, GetSignals()[it]);
-             
+             digits->SetDataUnchecked(GetRow(), GetCol(), it, GetSignals()[it] - adcBaseline);
+             if(padStatus)
+               digits->SetPadStatus(GetRow(), GetCol(), it, padStatus);
+                     
              indexes->AddIndexTBin(GetRow(), GetCol(), it);
-             track0->SetDataUnchecked(GetRow(), GetCol(), it, 0);
-             track1->SetDataUnchecked(GetRow(), GetCol(), it, 0);
-             track2->SetDataUnchecked(GetRow(), GetCol(), it, 0);
+              if (digitsManager->UsesDictionaries()) 
+                {
+                 track0->SetDataUnchecked(GetRow(), GetCol(), it, 0);
+                 track1->SetDataUnchecked(GetRow(), GetCol(), it, 0);
+                 track2->SetDataUnchecked(GetRow(), GetCol(), it, 0);
+               }
            }
        } // tbins
     }// while Next()
 
-  // what happens if the last HC is turned off?
   return det;
-  //return -1;
 }
 
 //------------------------------------------------------------
@@ -748,7 +746,7 @@ Bool_t
 AliTRDrawStreamTB::Init()
 {
   //
-  // general init
+  // Initialize geometry and fee parameters 
   //
 
   TDirectory *saveDir = gDirectory; 
@@ -773,84 +771,48 @@ AliTRDrawStreamTB::Init()
 
   fMaxADCgeom = (Int_t)fGeometry->ADCmax();
 
-  // common additive is moved to be static for temp solution
-  // common additive should be delivered in the HC word 2 (3rd word)
-  //fCommonAdditive = 10;
-
-  ResetCounters();
+  ResetCounters(); // fBufferRead is set to kFALSE - important
 
+/*
   // in case rawreader manages the mem buffers
   // lets go for the next buffer
   if (fRawReader)
     {
       Int_t nextBuff = NextBuffer();
       while (nextBuff != -1)
-       {
-         if (nextBuff > 0)
-           return kTRUE;                 
-         nextBuff = NextBuffer();
-       }
-    }
-
-  if (fgDebugStreamFlag == kTRUE)
-    {
-      if (!fgDebugStreamer)
-       {
-         fgDebugStreamer    = new TTreeSRedirector("TRDrawDataDebug.root");
-         fgStreamEventCounter = 0;
-      
-         if (fgDebugStreamer)
-           {
-             AliInfo(Form("Debug Streamer Initialized! Remember to delete! %s::DeleteDebugStream()", this->IsA()->GetName()));
-             //fDebugStreamOwned = kTRUE;
-           }
-         else
-           {
-             AliError("Unable to init debug stream");
-           }
-       }
+        {
+          if (nextBuff > 0)
+            return kTRUE;
+          nextBuff = NextBuffer();
+        }
     }
-
+*/
   saveDir->cd();
 
   return kTRUE;
 }
 
-void AliTRDrawStreamTB::DeleteDebugStream()
-{
-  // 
-  // static helper function
-  //
-
-  if (fgDebugStreamer)
-    {
-      delete fgDebugStreamer;
-      fgDebugStreamer = 0;
-    }
-  
-}
-
 //------------------------------------------------------------
 Bool_t 
 AliTRDrawStreamTB::InitBuffer(void *buffer, UInt_t length)
 {
   // 
-  // init the class before reading from the buffer
-  // and read SM heading info:
-  // -- super module header
-  // -- stack headers + link status words
+  // set initial information about the buffer
   //
 
-  // not in the pre scan mode
-  fgStreamEventCounter++;
-  
+  if (fgDebugFlag)  AliDebug(5, Form("Equipment ID: %d",fRawReader->GetEquipmentId()));
+
+  if(fgStreamEventCounter == 0) fgFirstEquipmentID = fRawReader->GetEquipmentId();
+  fEquipmentID = fRawReader->GetEquipmentId(); 
+  if(fEquipmentID == fgFirstEquipmentID) fgStreamEventCounter++; // [mj] risky if the order of sm in data changed
+                                       // since it is still for debug event counter, doesn't give an effect on decoded data
   ResetCounters();
 
   fpBegin = (UInt_t *)buffer;
 
   if (WORD_SIZE == 0)
     {
-      AliFatal("Strange! Size of UInt_t == 0");
+      AliFatal("Strange word size. size of UInt_t == 0");
       return kFALSE;
     }
 
@@ -860,7 +822,7 @@ AliTRDrawStreamTB::InitBuffer(void *buffer, UInt_t length)
 
   if (fpBegin == 0 || length <= 0)
     {
-      AliError(Form("This will not work! Pointer to the buffer is 0x%08x of size %d", fpBegin, length));
+      AliError(Form("Buffer size or pointer is strange. pointer to the buffer is 0x%08x of size %d", fpBegin, length));
       return kFALSE;
     }
 
@@ -868,15 +830,22 @@ AliTRDrawStreamTB::InitBuffer(void *buffer, UInt_t length)
 
   if (fgDumpHead > 0)
     {
-      AliInfo("------------------------------------------------");
+      AliInfo(Form("---------- Dumping %u words from the beginnig of the buffer ----------",fgDumpHead));
       if (DumpWords(fpBegin, fgDumpHead) == kFALSE)
        {
          AliError("Dump failed. Not enough data.");      
        }
-      AliInfo("------------------------------------------------");
+      AliInfo(Form("---------- Dumping ended ----------------------------------------------"));
     }
 
-  //decode SM
+  return kTRUE;
+}
+
+//------------------------------------------------------------
+Bool_t 
+AliTRDrawStreamTB::DecodeGTUheader()
+{
+  // Decode Supermodule Index Word
   DecodeSMInfo(fpPos, &fSM);
 
   if (fgDebugFlag)  AliDebug(5, DumpSMInfo(&fSM));
@@ -884,16 +853,18 @@ AliTRDrawStreamTB::InitBuffer(void *buffer, UInt_t length)
   fpPos++;
   if (fpPos < fpEnd)
     {  
+      // fSM.fHeaderSize represent additional Supermodule header size which contains additional information regarding hardware design.
+      // For the moment, we skip decoding these words 
       if (SkipWords(fSM.fHeaderSize) == kTRUE)
        {
-         //decode stacks info
-         //for (Int_t istack = 0; istack < fSM.fActiveStacks; istack++)
          for (Int_t istack = 0; istack < 5; istack++)
            {
              if (fSM.fStackActive[istack] == kFALSE)
                continue;
 
              fStack = &fSM.fStacks[istack];
+
+              // Decode Stack Index Word of given stack
              DecodeStackInfo(fpPos, fStack);
              fpPos++;
 
@@ -901,11 +872,17 @@ AliTRDrawStreamTB::InitBuffer(void *buffer, UInt_t length)
              
              if (fgDebugFlag)  AliDebug(5, DumpStackInfo(fStack));
              
-             if (SkipWords(fStack->fHeaderSize) == kFALSE)
+             if (SkipWords(fStack->fHeaderSize-6) == kFALSE) // 6 is the 6 stack header words for 12 links 
                {
-                 if (fRawReader) fRawReader->AddMajorErrorLog(kDecodeStackInfo, "Stack head words missing");
+                 if (fRawReader) fRawReader->AddMajorErrorLog(kDecodeStackInfo, "Stack header words missing");
                  return kFALSE;
                }
+              for (Int_t iword=0; iword<6; iword++) // decode 6 stack header words
+                 {
+                   // Decode Stack Header Word of given stack
+                  DecodeStackHeader(fpPos, fStack, iword); 
+                  fpPos++;
+                 }
            }
        }
       else
@@ -915,25 +892,24 @@ AliTRDrawStreamTB::InitBuffer(void *buffer, UInt_t length)
     }
   else
     {
-      if (fgWarnError) AliWarning("No Stack info present. Strange.");
+      if (fgWarnError) AliWarning("No additional sm headers and stack index words present.");
       if (fRawReader) fRawReader->AddMajorErrorLog(kDecodeStackInfo, "Stack info missing");
       return kFALSE;
     }
 
-  if (fgDebugFlag)  AliDebug(5, Form("Expected half chambers : %d", fSM.fNexpectedHalfChambers));
-  
-  //fpPos++;
   if (fpPos < fpEnd)
     {
-      if (fgDebugFlag)  AliDebug(5, "Init OK.");
+      if (fgDebugFlag)  AliDebug(5, "GTU headers are OK.");
     }
   else
     {
-      if (fgWarnError) AliWarning("No data just after init. Strange.");
-      if (fRawReader) fRawReader->AddMajorErrorLog(kMissingData, "Missing data");
+      if (fgWarnError) AliWarning("No data just after GTU headers.");
+      if (fRawReader) fRawReader->AddMajorErrorLog(kMissingData, "Missing sm data");
       return kFALSE;
     }
 
+  if (fgDebugFlag)  AliDebug(5, Form("Expected half chambers from GTU header: %d", fSM.fNexpectedHalfChambers));
+
   return kTRUE;
 }
 
@@ -942,44 +918,44 @@ Bool_t
 AliTRDrawStreamTB::DecodeSM(void *buffer, UInt_t length)
 {
   //
-  // decode all sm at once
-  // still here for devel and debug
+  // decode one sm data in buffer
   //
   
-  //memset(&fSM, 0, sizeof(fSM));
-
-  ResetIterators();
+  ResetIterators(); 
 
   fSM.fClean = kTRUE;
-  if (InitBuffer(buffer, length) == kTRUE)
+  if (InitBuffer(buffer, length) == kFALSE)
     {
-      // no we are already set!
-      // fpPos++;      
-    }
-  else
-    {
-      if (fgWarnError) AliError("--- INIT failed. ---------------");      
+      if (fgWarnError) AliError("InitBuffer failed.");      
       fSM.fClean = kFALSE;
       return kFALSE;
     }
 
-  //decode data here
-  //fSM.fActiveStacks
+  if (DecodeGTUheader()== kFALSE)
+    return kFALSE;
+
   for (Int_t istack = 0; istack < 5; istack++)
     {
-      fStackNumber = istack;
+      fStackNumber = istack; 
       if (fSM.fStackActive[istack] == kFALSE)
        continue;
       
       fStack = &fSM.fStacks[istack];
 
-      //fStack[istack].fActiveLinks // max is 12
       for (Int_t ilink = 0; ilink < 12; ilink++)
        {
-         fStackLinkNumber = ilink;
+         fStackLinkNumber = ilink; 
          if (fStack->fLinksActive[ilink] == kFALSE)
            continue;
 
+          // check GTU link monitor 
+          if (!(fStack->fLinksDataType[ilink] == 0 && fStack->fLinksMonitor[ilink] == 0))
+            {
+              fStack->fLinkMonitorError[ilink] = 1;
+              SeekEndOfData(); // skip this HC data if GTU link monitor report error
+              continue; 
+            }
+
          if (fpPos >= fpEnd)
            {
              if (fRawReader) fRawReader->AddMajorErrorLog(kLinkDataMissing, "Link data missing");            
@@ -988,23 +964,12 @@ AliTRDrawStreamTB::DecodeSM(void *buffer, UInt_t length)
            }
 
          fHC = &fStack->fHalfChambers[ilink];
+          ResetPerHC();
 
          if (fSM.fTrackletEnable == kTRUE)
            {
              if (DecodeTracklets() == kFALSE)
                {
-                 //          if (fgWarnError) AliError(Form("--- Decode Tracklets failed. --------------- Link %d of %d", 
-                 //                                        ilink + 1, fStack->fActiveLinks));
-                 if (fgDebugStreamer)
-                   {
-                     TTreeSRedirector &cstream = *fgDebugStreamer;
-                     cstream << "TrackletDecodeError"
-                             << "Event=" << fgStreamEventCounter
-                             << ".Stack=" << fStackNumber
-                             << ".Link=" << fStackLinkNumber
-                             << ".EndOfTrackletCount=" << fEndOfTrackletCount
-                             << "\n";
-                   }
                  
                  fSM.fClean = kFALSE;
                  SeekEndOfData();
@@ -1015,7 +980,6 @@ AliTRDrawStreamTB::DecodeSM(void *buffer, UInt_t length)
                      AliError(Form("Debug Event Counter : %d", fgStreamEventCounter)); 
                    }
                  continue;
-                 //return kFALSE;
                }
            }
 
@@ -1028,45 +992,29 @@ AliTRDrawStreamTB::DecodeSM(void *buffer, UInt_t length)
          
          if (DecodeHC() == kFALSE)
            {
-//           if (fgWarnError) AliError(Form("--- Decode HC failed. --------------- Link %d of %d", 
-//                                         ilink + 1, fStack->fActiveLinks));
              fSM.fClean = kFALSE;
-             fHC->fCorrupted += 100;
-              if (fHC->fCorrupted < 1111)  SeekEndOfData(); // In case that we met END_OF_TRACKLET_MARKERNEW during DecodeADC() & DecodeMCMheader()
-                                                            // we don't seek ENDOFRAWDATAMARKER
+              if (fHC->fCorrupted < 16)  SeekEndOfData(); // In case that we meet END_OF_TRACKLET_MARKERNEW 
+                                                          // during ADC data decoding or MCM header decoding
+                                                          // we don't seek ENDOFRAWDATAMARKER
 
              if (fgWarnError) 
                {
                  AliError(Form("Failed HC : %s", DumpHCinfoH0(fHC)));
                  AliError(Form("Failed HC : %s", DumpHCinfoH1(fHC)));
-                 AliError(Form("Debug Event Counter : %d", fgStreamEventCounter)); 
-               }
-             // let us assume that we have the HC data although link mask says different
-             // recovery
-              /* //we don't need to do
-             if (fStackLinkNumber == -1)
-               {
-                 if (fgWarnError) AliWarning("Trying to recover to the right Link Mask.");
-                 ilink -= 1;
+                 AliError(Form("Debug Event Counter : %d\n\n\n", fgStreamEventCounter)); 
                }
-              */
                      
              continue;
-             //return kFALSE;
            }
          else
            {
-             // just finish off with the end of data markers
-             SeekEndOfData();
+             SeekEndOfData(); // make sure that finish off with the end of data markers
            }
 
-         //if (fgDebugFlag)  AliDebug(5, Form("++++ Done with link %d of %d", ilink + 1, fStack->fActiveLinks));
-
        } // ilink
     } // istack
 
-  // for next()
-  ResetIterators();
+  ResetIterators(); // need to do it again for Next() function 
 
   if (fSM.fClean == kTRUE)
     return kTRUE;
@@ -1078,7 +1026,7 @@ AliTRDrawStreamTB::DecodeSM(void *buffer, UInt_t length)
          AliWarning("Buffer with errors. Returning FALSE.");
          AliWarning(Form("--- Failed SM : %s ---", DumpSMInfo(&fSM)));
        }
-      fSM.fActiveStacks = 0; // Next will not give data
+      fSM.fActiveStacks = 0; // Next() will not give data
       return kFALSE;
     }
 
@@ -1091,7 +1039,7 @@ AliTRDrawStreamTB::DecodeSM()
 {
   //
   // decode SM data in case AliRawReader is in use
-
+  //    
   if (fRawReader)
     {      
       Int_t nextBuff = NextBuffer();
@@ -1149,15 +1097,39 @@ AliTRDrawStreamTB::SeekEndOfData()
       fpPos++;      
     }
   
-//   if (fEndOfDataCount == 0)
-//     {
-//       if (fgWarnError) AliWarning("End of buffer reached first. No end of data marker?");
-//       return kFALSE;
-//     }
-
   return kTRUE;
 }
 
+//------------------------------------------------------------
+Bool_t
+AliTRDrawStreamTB::SkipMCMdata(UInt_t iw)
+{
+
+  if (fgDebugFlag) AliDebug(11,Form("Skip %d words due to MCM header corruption.",iw));
+  UInt_t iwcounter = 0;  
+  while ( *fpPos != ENDOFRAWDATAMARKER && iwcounter < iw)
+    {
+      if ( *fpPos == END_OF_TRACKLET_MARKERNEW) 
+        {  
+          if (fgDebugFlag) AliDebug(11,"Met END_OF_TRACKLET_MARKERNEW");
+          fMCM->fCorrupted += 16;
+          fHC->fCorrupted += 16;
+          return kFALSE;
+        } 
+      fpPos++;
+      iwcounter++; 
+    }
+
+  if (iwcounter == iw)
+    {
+      fpPos++;
+      return kTRUE;
+    }
+
+  if (fgDebugFlag) AliDebug(11,"Met ENDOFRAWDATAMARKER");
+  return kFALSE;
+}
+
 //------------------------------------------------------------
 Bool_t 
 AliTRDrawStreamTB::SeekNextMCMheader()
@@ -1166,17 +1138,21 @@ AliTRDrawStreamTB::SeekNextMCMheader()
   // go to mcm marker
   //
 
-  // move back to the mcm pos
-  fpPos = fMCM->fPos + 1;
+  fpPos++;
 
   while ( *fpPos != ENDOFRAWDATAMARKER && fpPos < fpEnd )
     {
-      //if (CheckMCMMask(fpPos) == 0)
-      if (MCM_HEADER_MASK_ERR(*fpPos) == 0)      
+      if (MCM_HEADER_MASK_ERR(*fpPos) == 0 && MCM_HEADER_MASK_ERR(*(fpPos+1)) == 0)      
        {
-         if (fgWarnError) AliWarning(Form("^^^ Found : Pos 0x%08x : Val 0x%08x", fpPos, *fpPos));
+         if (fgDebugFlag) AliDebug(11,Form("^^^ Found : Pos 0x%08x : Val 0x%08x", fpPos, *fpPos));
          return kTRUE;
        }
+      if ( *fpPos == END_OF_TRACKLET_MARKERNEW) 
+        {  
+          fMCM->fCorrupted += 16;
+          fHC->fCorrupted += 16;
+          return kFALSE;
+        } 
       fpPos++;
     }
 
@@ -1196,72 +1172,32 @@ AliTRDrawStreamTB::DecodeTracklets()
   fLinkTrackletCounter = 0;
   fEndOfTrackletCount = 0;
 
+  //[mj tracklet writing] for (Int_t i = 0; i < MAX_TRACKLETS_PERHC; i++)
+  //[mj tracklet writing] fHC->fTrackletWords[i] = 0;
+
   if (fgDebugFlag)  AliDebug(10, Form("Decode tracklets at 0x%08x : 0x%08x", fpPos, *fpPos));
-  //cout << Form("Decode tracklets..") << endl;;
-  //printf("[I] Tracklet... ? \n");
 
   while ( *fpPos != END_OF_TRACKLET_MARKEROLD && *fpPos != END_OF_TRACKLET_MARKERNEW && fpPos < fpEnd )
     {
-
       if (fgDebugFlag)  AliDebug(10, Form("Tracklet found at 0x%08x : 0x%08x", fpPos, *fpPos));
 
-      //decode tracklets here...
       fLinkTrackletCounter++;
 
       if (fLinkTrackletCounter > MAX_TRACKLETS_PERHC)
        {
-         if (fgWarnError) AliWarning(Form("Max number of tracklets exceeded %d > %d. Something is wrong with the input data!", 
+         if (fgDebugFlag) AliDebug(11,Form("Max number of tracklets exceeded %d > %d.", 
                          fLinkTrackletCounter, MAX_TRACKLETS_PERHC));
-
          if (fRawReader) fRawReader->AddMajorErrorLog(kTrackletOverflow,"Too many tracklets"); 
+          fHC->fTrackletError = 1;
          return kFALSE;
        }
 
-      if (fgDebugStreamer)
-       {
-         // jan!
-         unsigned pid;
-         unsigned row;
-         signed defl;
-         signed ypos;
-         
-         double deflm;
-         double yposm;
-         
-         unsigned long val;
-         
-         val = *fpPos;
-
-         pid = val >> 24;
-         row = (val >> 20) & 0xF;
-         defl = (val >> 13) & 0x7F;
-         defl = defl << 25 >> 25;
-         ypos = val & 0x1FFF;
-         ypos = ypos << 19 >> 19;
-         
-         deflm = defl * 140.0e-6; /* m */
-         yposm = ypos * 160.0e-6; /* m */
-         
-         TTreeSRedirector &cstream = *fgDebugStreamer;
-         cstream << "MCMtracklets"
-                 << "Event=" << fgStreamEventCounter
-                 << ".stack=" << fStackNumber
-                 << ".link=" << fStackLinkNumber
-                 << ".pid=" << pid
-                 << ".row=" << row
-                 << ".defl=" << defl
-                 << ".ypos=" << ypos
-                 << ".deflm=" << deflm
-                 << ".yposm=" << yposm
-                 << "\n";
-       }
+      //[mj tracklet writing] fHC->fTrackletWords[fLinkTrackletCounter-1] = UInt_t(*fpPos); //store tracklet words into array 
       fpPos++;
     }
 
   while ( ( *fpPos == END_OF_TRACKLET_MARKEROLD || *fpPos == END_OF_TRACKLET_MARKERNEW ) && fpPos < fpEnd )
     {
-      //seek non end of tracklets
-      //printf("[I] End of tracklets. \n");
       if (fgDebugFlag)  AliDebug(10, Form("EoTracklets found at 0x%08x : 0x%08x", fpPos, *fpPos));
 
       fEndOfTrackletCount++;
@@ -1270,8 +1206,9 @@ AliTRDrawStreamTB::DecodeTracklets()
 
   if ( fEndOfTrackletCount < 2 )
     {
-      //if (fgWarnError) AliWarning(Form("End of tracklet marker words missing %d", 2 - fEndOfTrackletCount));
+      if (fgDebugFlag) AliDebug(11,"End of tracklets word missing"); 
       if (fRawReader) fRawReader->AddMajorErrorLog(kEOTrackeltsMissing, "End of tracklets word missing"); 
+      fHC->fTrackletError += 2;
       return kFALSE;
     }
 
@@ -1282,13 +1219,11 @@ AliTRDrawStreamTB::DecodeTracklets()
 Bool_t 
 AliTRDrawStreamTB::IsRowValid()
 {
-  //SLOW GEOM
   if ( (fHC->fStack == 2 && fMCM->fROW >= fGeometry->RowmaxC0()) ||
        (fHC->fStack != 2 && fMCM->fROW >= fGeometry->RowmaxC1()) || fMCM->fROW < 0 ) 
     {
-      if (fgWarnError) AliWarning(Form("SM%d L%dS%d: Wrong Padrow (%d) fROB=%d, fSIDE=%d, fMCM=%02d"
+      if (fgDebugFlag) AliDebug(11,Form("SM%d L%dS%d: Wrong Padrow (%d) fROB=%d, fSIDE=%d, fMCM=%02d"
                      , fHC->fSM, fHC->fLayer, fHC->fStack, fMCM->fROW, fMCM->fROB, fHC->fSide, fMCM->fMCM ));
-      if (fRawReader) fRawReader->AddMajorErrorLog(kWrongPadrow, "Wrong Row");
       return kFALSE;
     }
   return kTRUE;
@@ -1302,32 +1237,54 @@ AliTRDrawStreamTB::IsMCMheaderOK()
   // check the mcm header
   //
 
-  if ( fMCM->fCorrupted > 10 )
+  int expectedROB = -1;
+  if(!fHC->fSide) expectedROB = int(fHC->fMCMmax/16)*2;
+  else expectedROB = int(fHC->fMCMmax/16)*2 + 1;
+  int expectedMCM = 4*(3-int((fHC->fMCMmax%16)/4)) + fHC->fMCMmax%4;
+
+  if ( expectedROB != fMCM->fROB || expectedMCM != fMCM->fMCM)
     {
-      if (fRawReader) fRawReader->AddMajorErrorLog(kMCMheaderCorrupted,"ADC mask Corrupted"); 
-      if (fgWarnError) AliWarning(Form("Wrong ADC Mask word 0x%08x %s. Error : %d", *fMCM->fPos, DumpMCMadcMask(fMCM), fMCM->fCorrupted));
-      return kFALSE;
+      fMCM->fMCMhdCorrupted += 2;
+      AliDebug(11,Form("ROB expected %d ROB read %d,  MCM expected %d MCM read %d\n",expectedROB, fMCM->fROB, expectedMCM, fMCM->fMCM));
     }
 
-  if ( fMCM->fCorrupted > 0 )
+  // below two conditions are redundant  
+  /*
+  if ( fMCM->fMCM < 0 || fMCM->fMCM > 15 || fMCM->fROB < 0 || fMCM->fROB > 7 ) 
     {
-      if (fRawReader) fRawReader->AddMajorErrorLog(kMCMheaderCorrupted,"Corrupted"); 
-      if (fgWarnError) AliWarning(Form("Wrong MCM word 0x%08x %s. Error : %d", *fMCM->fPos, DumpMCMinfo(fMCM), fMCM->fCorrupted));
-      return kFALSE;
+      fMCM->fMCMhdCorrupted += 8;  // need to assign new number
+      if (fgDebugFlag) AliDebug(11,Form("ROB or MCM number is out of range. %s\n", DumpMCMinfo(fMCM)));
+    }
+  if (IsRowValid() == kFALSE)
+    {
+      fMCM->fMCMhdCorrupted += 16; // need to assign new number
+    }
+  */  
+    
+  if (fEventCounter == 0)
+    {
+      fEventCounter = fMCM->fEvCounter;
     }
 
-  if ( fMCM->fMCM < 0 || fMCM->fMCM > 15 || fMCM->fROB < 0 || fMCM->fROB > 7 ) 
+  if (fEventCounter != fMCM->fEvCounter)
     {
-      if (fRawReader) fRawReader->AddMajorErrorLog(kWrongMCMorROB,"Wrong ROB or MCM"); 
-      if (fgWarnError) AliWarning(Form("Wrong fMCM or fROB. %s Skip this data.", DumpMCMinfo(fMCM)));
-      return kFALSE;
+      fMCM->fMCMhdCorrupted += 4;      if (fgDebugFlag) AliDebug(11,Form("Event number(%d) of current MCM is different from that(%d) of reference MCM %s.\n", fMCM->fEvCounter, fEventCounter, DumpMCMinfo(fMCM)));
     }
 
-  if (IsRowValid() == kFALSE)
-    return kFALSE;
+  if (fEventCounter < fLastEventCounter)
+    {
+      fMCM->fMCMhdCorrupted += 8;      if (fgDebugFlag) AliDebug(11,Form("Event from the past? Current %d Last %d %s.\n", fEventCounter, fLastEventCounter, DumpMCMinfo(fMCM)));
+    }
+
+  if ( fMCM->fADCmaskCorrupted > 0 )
+      return kFALSE;
+
+  if ( fMCM->fMCMhdCorrupted > 0 )
+      return kFALSE;
 
   return kTRUE;
 }
+
 //------------------------------------------------------------
 Bool_t 
 AliTRDrawStreamTB::DecodeMCMheader()
@@ -1336,30 +1293,41 @@ AliTRDrawStreamTB::DecodeMCMheader()
   // decode the mcm header
   //
 
-  DecodeMCMheader(fpPos, fMCM);
+  DecodeMCMheader(fpPos, fMCM); 
+  if (fHC->fCorrupted >= 16)
+    {
+      fpPos--; 
+      return kFALSE;
+    }
 
-  fMCM->fROW = fTRDfeeParam->GetPadRowFromMCM(fMCM->fROB, fMCM->fMCM);
+  fMCM->fROW = fTRDfeeParam->GetPadRowFromMCM(fMCM->fROB, fMCM->fMCM); 
 
-  if (fHC->fRawVMajor > 2)
+  if ((fHC->fRawVMajor > 2 && fHC->fRawVMajor <5) || (fHC->fRawVMajor > 31 && fHC->fRawVMajor < 64)) //cover old and new version definition of ZS data
     {
       fpPos++;
       if ( fpPos < fpEnd )
        {
-         DecodeMask(fpPos, fMCM);
+         DecodeMask(fpPos, fMCM); 
+          if (fHC->fCorrupted >= 16)
+            {
+              fpPos--; 
+              return kFALSE;
+            }
          MCMADCwordsWithTbins(fHC->fTimeBins, fMCM);
          fMCM->fAdcDataPos = fpPos + 1;
        }
       else
        {
-         if (fgWarnError) AliWarning("Expected ADC mask word. Fail due to buffer END.");         
+         if (fgDebugFlag) AliDebug(11,"Expected ADC mask word. Fail due to buffer END.");        
          if (fRawReader) fRawReader->AddMajorErrorLog(kMCMADCMaskMissing,"Missing"); 
+          fHC->fCorrupted += 32;
          return kFALSE;
        }
     }
   else
     {
       UInt_t dummyMask = MCM_DUMMY_ADCMASK_VAL;
-      DecodeMask(&dummyMask, fMCM);
+      DecodeMask(&dummyMask, fMCM); 
       MCMADCwordsWithTbins(fHC->fTimeBins, fMCM);
       fMCM->fAdcDataPos = fpPos + 1;
     }
@@ -1371,39 +1339,9 @@ AliTRDrawStreamTB::DecodeMCMheader()
     }
 
   if (IsMCMheaderOK() == kFALSE)
-    {
-      if (fMCM->fCorrupted >= 1111)
-        {
-         fpPos--; // to prevent DecodeTracklets() fault due to previous fpPos++
-         fHC->fCorrupted += 1111;
-        }
       return kFALSE;
-    }
-
-  if (fEventCounter == 0)
-    {
-      fEventCounter = fMCM->fEvCounter;
-    }
-  
-  if (fEventCounter < fLastEventCounter)
-    {
-      if (fgWarnError) AliWarning(Form("Weird. Event from the past? Current %d Last %d %s", fEventCounter, fLastEventCounter, DumpMCMinfo(fMCM)));
-      if (fRawReader) fRawReader->AddMajorErrorLog(kMCMeventMissmatch, "Wrong MCM event counter ? Past-Future"); 
-      return kFALSE;
-    }
-  
-  if (fEventCounter != fMCM->fEvCounter)
-    {
-      if (fgWarnError) AliWarning(Form("Weird. Event missmatch? %d %s", fEventCounter, DumpMCMinfo(fMCM)));
-      if (fRawReader) fRawReader->AddMajorErrorLog(kMCMeventMissmatch, "Wrong MCM event counter ?"); 
-      return kFALSE;
-    }
-
-  //fLastEventCounter = fEventCounter;
-  //AliInfo(Form("Current MCM %s", DumpMCMinfo(fMCM)));
-    
+     
   return kTRUE;
-  //return IsMCMheaderOK();
 }
 
 //------------------------------------------------------------
@@ -1411,21 +1349,24 @@ Bool_t
 AliTRDrawStreamTB::IsHCheaderOK()
 {
   //
-  // check the half chamber header
+  // check insanity of half chamber header
   //
 
-  if (fHC->fCorrupted > 0)
+  if (fHC->fStack < 0 || fHC->fStack > 4)
     {
-      if (fgWarnError) AliWarning(Form("Wrong HC Header word. Word 0x%08x Error : %d", *fHC->fPos, fHC->fCorrupted));
-      if (fRawReader) fRawReader->AddMajorErrorLog(kHCHeaderCorrupt, "Corrupted"); 
+      if (fgDebugFlag) AliDebug(11,Form("Wrong Stack %d", fHC->fStack));
+      return kFALSE;
+    }
 
+  if (fHC->fLayer < 0 || fHC->fLayer >= AliTRDgeometry::kNlayer)
+    {
+      if (fgDebugFlag) AliDebug(11,Form("Wrong layer %d", fHC->fLayer));
       return kFALSE;
     }
 
-  if (fHC->fStack < 0 || fHC->fStack > 4)
+  if (fHC->fSide < 0 || fHC->fSide > 1)
     {
-      if (fgWarnError) AliWarning(Form("Wrong Stack %d", fHC->fStack));
-      if (fRawReader) fRawReader->AddMajorErrorLog(kHCHeaderWrongStack, "Wrong Stack");       
+      if (fgDebugFlag) AliDebug(11,Form("Wrong Side %d", fHC->fSide));
       return kFALSE;
     }
 
@@ -1433,64 +1374,45 @@ AliTRDrawStreamTB::IsHCheaderOK()
     {
      if (fHC->fStack != fStackNumber) 
        {
-        if (fgWarnError) AliWarning(Form("Missmatch: Stack in HC header %d HW-stack %d", 
+        if (fgDebugFlag) AliDebug(11,Form("Missmatch: Stack number between HC header %d and GTU link mask %d", 
                                       fHC->fStack, fStackNumber));
-        if (fRawReader) fRawReader->AddMajorErrorLog(kHCHeaderWrongStack, "Stack-HWstack");       
-        // Try this for recovery in DecodeSM(void*,UInt_t) after DecodeHC failed
-        // buffer will still will be marked as NOT clean
         fStackNumber = -1;
         return kFALSE;
      }
     }
 
-  if (fHC->fLayer < 0 || fHC->fLayer >= AliTRDgeometry::kNplan)
-    {
-      if (fgWarnError) AliWarning(Form("Wrong plane(layer) %d", fHC->fLayer));
-      if (fRawReader) fRawReader->AddMajorErrorLog(kHCHeaderWrongLayer, "Wrong Plane"); 
-      return kFALSE;
-    }
-
-  if ((fHC->fLayer * 2 != fStackLinkNumber) && (fHC->fLayer * 2 != fStackLinkNumber - 1)) 
+  if (fgStackLinkNumberChecker)
     {
-      if (fgWarnError) AliWarning(Form("Missmatch: plane(layer) in HCheader %d HW-Link %d | %s", 
-                                      fHC->fLayer, fStackLinkNumber, DumpStackInfo(fStack)));
-      if (fRawReader) fRawReader->AddMajorErrorLog(kHCHeaderWrongLayer, "Plane-Link missmatch"); 
-      // Try this for recovery in DecodeSM(void*,UInt_t) after DecodeHC failed
-      // buffer will still will be marked as NOT clean
-      fStackLinkNumber = -1;
-      return kFALSE;      
+     //if (fHC->fLayer * 2 + fHC->fSide != fStackLinkNumber) 
+     // let it make flexible to consider known fiber swapping
+     if ((fHC->fLayer * 2 != fStackLinkNumber) && (fHC->fLayer * 2 != fStackLinkNumber - 1))  
+       {
+        if (fgDebugFlag) AliDebug(11,Form("Missmatch: Layer number between HC header %d and GTU link mask %d | %s", 
+                                      fHC->fLayer, fStackLinkNumber, DumpStackInfo(fStack)));
+        fStackLinkNumber = -1;
+        return kFALSE;      
+       }
     }
 
-  if (fHC->fSide < 0 || fHC->fSide > 1)
-    {
-      if (fgWarnError) AliWarning(Form("Wrong Side %d", fHC->fSide));
-      if (fRawReader) fRawReader->AddMajorErrorLog(kHCHeaderWrongSide, "Wrong Side");       
-      return kFALSE;
-    }
-  
-  // SLOW GEOM
+  // SLOW GEOM : consistancy check with geometry
   fHC->fDET = fGeometry->GetDetector(fHC->fLayer, fHC->fStack, fHC->fSM);
   if (fHC->fDET < 0 || fHC->fDET >= AliTRDgeometry::kNdet)
     {
-      if (fgWarnError) AliWarning(Form("Wrong detector %d", fHC->fDET));      
+      if (fgDebugFlag) AliDebug(11,Form("Wrong detector %d", fHC->fDET));      
       if (fRawReader) fRawReader->AddMajorErrorLog(kHCHeaderWrongDet, "Wrong Det");       
       return kFALSE;
     }
 
-  // SLOW GEOM
-  // this check fails - raw data inconsistent with geometry?
   if (fHC->fSM != fGeometry->GetSector(fHC->fDET)
-      || fHC->fSM <0 || fHC->fSM >= AliTRDgeometry::kNsect)
+      || fHC->fSM <0 || fHC->fSM >= AliTRDgeometry::kNsector)
     {
-      if (fgWarnError) AliWarning(Form("Wrong SM(sector) %d (Geometry says: %d) Stack=%d Layer=%d Det=%d", 
+      if (fgDebugFlag) AliDebug(11,Form("Wrong SM(sector) %d (Geometry says: %d) Stack=%d Layer=%d Det=%d", 
                                       fHC->fSM, fGeometry->GetSector(fHC->fDET),
                                       fHC->fStack, fHC->fLayer, fHC->fDET));      
       if (fRawReader) fRawReader->AddMajorErrorLog(kHCHeaderWrongSM, "Wrong SM");       
       return kFALSE;
     }
 
-  // SLOW GEOM
-  // CPU EXPENSIVE!!!
   fHC->fROC    = fGeometry->GetDetectorSec(fHC->fLayer, fHC->fStack);
   if (fHC->fROC < 0)
     {
@@ -1511,14 +1433,6 @@ AliTRDrawStreamTB::IsHCheaderOK()
       if (fRawReader) fRawReader->AddMajorErrorLog(kHCHeaderWrongROC, "Wrong ROC Col Max");       
       return kFALSE;
     }
-  // extra - not needed
-  //   if (fHC->fSM <0 || fHC->fSM >= AliTRDgeometry::kNsect)
-  //     {
-  //       if (fgWarnError) AliWarning(Form("Wrong SM(sector) %d (Geometry says: %d) Stack=%d Layer=%d", 
-  //                 fHC->fSM, fGeometry->GetDetectorSec(fHC->fLayer, fHC->fStack),
-  //                 fHC->fStack, fHC->fLayer));      
-  //       return kFALSE;
-  //     }
   
   return kTRUE;
 }
@@ -1531,18 +1445,20 @@ AliTRDrawStreamTB::DecodeHCheader()
   // decode the half chamber header
   //
 
-  DecodeHCwordH0(fpPos, fHC);
+  if (DecodeHCwordH0(fpPos, fHC) == kFALSE)
+    return kFALSE;
     
   if (fHC->fNExtraWords > 0)
     {
       fpPos++;
       if (fpPos < fpEnd)
        {
-         DecodeHCwordH1(fpPos, fHC);
+         if (DecodeHCwordH1(fpPos, fHC) == kFALSE)
+            return kFALSE;
        }
       else
        {
-         if (fgWarnError) AliWarning("Expected HC header word 1. Fail due to buffer END.");
+         if (fgDebugFlag) AliDebug(11,"Expected HC header word 1. Fail due to buffer END.");
          if (fRawReader) fRawReader->AddMajorErrorLog(kHCWordMissing,"Next HC word 1 (count from 0) missing"); 
          return kFALSE;
        }
@@ -1554,6 +1470,8 @@ AliTRDrawStreamTB::DecodeHCheader()
   fHC->fDET = -1;
   if (IsHCheaderOK() == kFALSE)
     {
+      fHC->fH0Corrupted += 2;
+      if (fgDebugFlag) AliDebug(11,Form("H0 Header Insane. Word 0x%08x", *fHC->fPos));
       return kFALSE;
     }
   
@@ -1565,38 +1483,13 @@ Bool_t
 AliTRDrawStreamTB::DecodeHC()
 {
   //
-  // decode the hc data
-  // function for devel & debug
+  // decode hc header and data
   //
 
   if (DecodeHCheader() == kFALSE)
     {
-      if (fgDebugStreamer)
-       {
-         TTreeSRedirector &cstream = *fgDebugStreamer;
-         cstream << "HCDecodeError"
-                 << "Event=" << fgStreamEventCounter
-                 << ".stack=" << fStackNumber
-                 << ".link=" << fStackLinkNumber
-                 << ".hcCorrupted" << fHC->fCorrupted
-                 << ".hcRVmajor=" << fHC->fRawVMajor
-                 << ".hcDCSboard=" << fHC->fDCSboard
-                 << ".hcSM=" << fHC->fSM
-                 << ".hcStack=" << fHC->fStack
-                 << ".hcLayer=" << fHC->fLayer
-                 << ".hcSide=" << fHC->fSide
-                 << ".hcTbins=" << fHC->fTimeBins
-                 << ".hcBunchCross=" << fHC->fBunchCrossCounter
-                 << ".hcPreTrig=" << fHC->fPreTriggerCounter
-                 << ".hcPreTrigPh=" << fHC->fPreTriggerPhase
-                 << ".hcDet=" << fHC->fDET
-                 << ".hcROC=" << fHC->fROC
-                 << ".hc=RowMax" << fHC->fRowMax
-                 << ".hc=ColMax" << fHC->fColMax
-                 << "\n";
-       }
-      
-      if (fgWarnError) AliWarning("Header decode failed.");
+      if (fgWarnError) AliWarning(Form("HC Header decode failed. H0 Error: %d H1 Error: %d",fHC->fH0Corrupted,fHC->fH1Corrupted));
+      if (fRawReader) fRawReader->AddMajorErrorLog(kHCHeaderCorrupt, "HC header corrupted"); 
       return kFALSE;
     }
   else
@@ -1604,7 +1497,8 @@ AliTRDrawStreamTB::DecodeHC()
       fpPos++;
       if (fpPos >= fpEnd)
        {
-         if (fgWarnError) AliWarning("No MCM data? Not enough data in the buffer.");
+          fHC->fCorrupted += 1;
+         if (fgDebugFlag) AliDebug(11,"No MCM data? Not enough data in the buffer.");
          if (fRawReader) fRawReader->AddMajorErrorLog(kMCMdataMissing, "MCM data missing"); 
          return kFALSE;
        }
@@ -1615,7 +1509,8 @@ AliTRDrawStreamTB::DecodeHC()
     {
       if (fHC->fMCMmax > TRD_MAX_MCM)
        {
-         if (fgWarnError) AliWarning("More mcm data than expected!");
+          fHC->fCorrupted += 2;
+         if (fgDebugFlag) AliDebug(11,"More mcm data than expected!");
          if (fRawReader) fRawReader->AddMajorErrorLog(kMCMoverflow, "Too many mcms found!"); 
          return kFALSE;
        }
@@ -1624,49 +1519,41 @@ AliTRDrawStreamTB::DecodeHC()
 
       if (DecodeMCMheader() == kFALSE)
        {
-         if (fgDebugStreamer)
-           {
-             TTreeSRedirector &cstream = *fgDebugStreamer;
-             cstream << "MCMDecodeError"
-                     << "Event=" << fgStreamEventCounter
-                     << ".stack=" << fStackNumber
-                     << ".link=" << fStackLinkNumber
-                     << ".hcDCSboard=" << fHC->fDCSboard
-                     << ".hcSM=" << fHC->fSM
-                     << ".hcStack=" << fHC->fStack
-                     << ".hcLayer=" << fHC->fLayer
-                     << ".hcSide=" << fHC->fSide
-                     << ".hcBunchCross=" << fHC->fBunchCrossCounter
-                     << ".hcPreTrig=" << fHC->fPreTriggerCounter
-                     << ".hcPreTrigPh=" << fHC->fPreTriggerPhase
-                     << ".hcDet=" << fHC->fDET
-
-                     << ".mcmCorrupted=" << fMCM->fCorrupted
-                     << ".mcmROB=" << fMCM->fROB
-                     << ".mcmMCM=" << fMCM->fMCM
-                     << ".mcmADCMaskWord=" << fMCM->fADCMaskWord
-                     << ".mcmEventCounter=" << fMCM->fEvCounter
-
-                     << ".fEventCounter=" << fEventCounter 
-                     << ".fLastEventCounter=" << fLastEventCounter
-                     << "\n";
-           }
+          if (fHC->fCorrupted < 4) fHC->fCorrupted += 4; // benchmark hc data corruption as 4
          
-         return kFALSE;
+         if (fgSkipData == kTRUE || fHC->fCorrupted >= 16)
+              return kFALSE; // stop HC data reading
+          
+          fHC->fMCMmax++; // increase mcm counter to match with expected rob/mcm number
+
+          // in case we decide to keep reading data, skip this mcm data and find next mcm header 
+          if (fMCM->fADCmaskCorrupted < 2) 
+            {  
+              if (SkipMCMdata(fMCM->fADCcount*fMCM->fSingleADCwords) == kFALSE)
+                 return kFALSE;
+              continue;
+            }
+          else 
+            {
+              if (SeekNextMCMheader() == kFALSE)
+                 return kFALSE;
+              continue;
+            }
        }
 
       fHC->fMCMmax++;
-
       if (fMCM->fADCmax > 0)
        {
          fpPos++;
          if (fpPos >= fpEnd)
            {
+              fMCM->fCorrupted += 1;
+              if (fHC->fCorrupted < 4) fHC->fCorrupted += 4; // benchmark hc data corruption as 4
              if (fgDebugFlag)  AliDebug(9, Form("Buffer short of data. ADC data expected."));    
-             if (fRawReader) fRawReader->AddMajorErrorLog(kADCdataMissing, "ADC data missing"); 
+             return kFALSE;
            }
-         
-         //      for (Int_t iadc = 0; iadc < TRD_MAX_ADC; iadc++)
+
          for (Int_t iadc = 0; iadc < fMCM->fADCmax; iadc++)
            {
              fADC = &fMCM->fADCs[iadc];
@@ -1677,74 +1564,38 @@ AliTRDrawStreamTB::DecodeHC()
 
              if (fpPos + fMCM->fSingleADCwords >= fpEnd)
                {
-                 if (fgDebugStreamer)
-                   {
-                     TTreeSRedirector &cstream = *fgDebugStreamer;
-                     // means no data read
-                     Int_t ierr = -99;
-                     cstream << "ADCDecodeError"
-                             << "Event=" << fgStreamEventCounter
-                             << ".hcSM=" << fHC->fSM
-                             << ".hcStack=" << fHC->fStack
-                             << ".hcLayer=" << fHC->fLayer
-                             << ".mcmROB=" << fMCM->fROB
-                             << ".mcmMCM=" << fMCM->fMCM
-                             << ".mcmADCMaskWord=" << fMCM->fADCMaskWord
-                             << ".adcErr=" << ierr
-                             << ".adcNumber=" << ierr
-                             << "\n";                  
-                   }
                  
-                 if (fgWarnError) AliWarning(Form("This is ADC %d of %d. ADC number is %d.", iadc+1, fMCM->fADCmax, fMCM->fADCchannel[iadc]));
-                 if (fgWarnError) AliWarning("--> ADC (10 words) expected. Not enough data in the buffer.");
-                 if (fgWarnError) AliWarning(Form("--> ADC mask : %s", DumpMCMadcMask(fMCM)));
-
-                 if (fRawReader) fRawReader->AddMajorErrorLog(kADCdataMissing, "ADC data missing - less than expected"); 
+                  fMCM->fCorrupted += 2;
+                  if (fHC->fCorrupted < 4) fHC->fCorrupted += 4; // benchmark hc data corruption as 4
+                 if (fgDebugFlag) AliDebug(11,"ADC (10 words) expected. Not enough data in the buffer.");
                  return kFALSE;
                }
 
-             //DECODE the data here
-             if (DecodeADC() == kFALSE)
-               {
-                 // check if we are out of the det when the pad is shared
-                 if (fADC->fIsShared && fADC->fCorrupted == 111)
+              if (fHC->fRawVMajor < 64) // normal(real) ADC data
+                {
+                 if (DecodeADC() == kFALSE)
                    {
-                     fADC->fCOL = -1;
-                     fpPos = fADC->fPos + fMCM->fSingleADCwords;
+                      if (fMCM->fCorrupted < 4) fMCM->fCorrupted += 4; // benchmark mcm data corruption as 4
+                      if (fHC->fCorrupted < 4) fHC->fCorrupted += 4; // benchmark hc data corruption as 4
+                     if (fADC->fIsShared && fADC->fCorrupted == 16) // check if we are out of the det when the pad is shared
+                       {
+                         fADC->fCOL = -1;
+                         fpPos = fADC->fPos + fMCM->fSingleADCwords;
+                       }
+                     else
+                       {
+                         if (fgDebugFlag) AliDebug(11,Form("ADC decode failed."));
+                         if (fgSkipData == kTRUE || fHC->fCorrupted >= 16) 
+                             return kFALSE; // stop HC data reading
+                       }
                    }
-                  else if(fADC->fCorrupted >= 1111)
-                    {
-                      fHC->fCorrupted += 1111;
-                      return kFALSE;
-                    }
-                 else
-                   {
-                     if (fgWarnError) AliWarning(Form("ADC decode failed."));
-                     //fpPos = fMCM->fPpos + fMCMADCWords;
-
-                     if (fgDebugStreamer)
-                       {
-                         TTreeSRedirector &cstream = *fgDebugStreamer;
-                         cstream << "ADCDecodeError"
-                                 << "Event=" << fgStreamEventCounter
-                                 << ".hcSM=" << fHC->fSM
-                                 << ".hcStack=" << fHC->fStack
-                                 << ".hcLayer=" << fHC->fLayer
-                                 << ".mcmROB=" << fMCM->fROB
-                                 << ".mcmMCM=" << fMCM->fMCM
-                                 << ".mcmADCMaskWord=" << fMCM->fADCMaskWord
-                                 << ".adcErr=" << fADC->fCorrupted
-                                 << ".adcNumber=" << fADC->fADCnumber
-                                 << "\n";                      
-                       }
-
-                     fpPos = fADC->fPos + fMCM->fSingleADCwords;
-                     return kFALSE;
-                   }
-               }
-             //decode the ADC words here
-           }     
-       } //mcm data present
+                } 
+              else // test pattern data
+                {
+                  if (fgWarnError) AliError("These are test pattern data. You need other reader"); // will be served in other class
+                }
+           } 
+       } 
       else
        {
          fpPos++;
@@ -1753,15 +1604,14 @@ AliTRDrawStreamTB::DecodeHC()
 
   if (fpPos >= fpEnd)
     {
-      if (fgWarnError) AliWarning("We are at the end of buffer. There should be one more word left.");
-      //SeekEndOfData();  
+      if (fgDebugFlag) AliDebug(11,"We are at the end of buffer. There should be one more word left.");
       return kFALSE;
     }
 
   return kTRUE;
 }
-
 //------------------------------------------------------------
+
 Bool_t
 AliTRDrawStreamTB::DecodeADC()
 {
@@ -1770,16 +1620,10 @@ AliTRDrawStreamTB::DecodeADC()
   //
 
   fADC->fCorrupted = 0;
-  fMaskADCword = ADC_WORD_MASK(*fpPos);
-  fADC->fPos = fpPos;
-
-  if (*fpPos == END_OF_TRACKLET_MARKERNEW) // To read properly ZS data corrupted in this way
-    {
-      if (fgWarnError) AliError(Form("There should be ADC data. We met END_OF_TRACKLET_MARKER 0x%08x",*fpPos));
-      fADC->fCorrupted += 1111;
-      return kFALSE;
-    }
+  if(fADC->fADCnumber%2==1) fMaskADCword = ADC_WORD_MASK(ADCDATA_VAL1);
+  if(fADC->fADCnumber%2==0) fMaskADCword = ADC_WORD_MASK(ADCDATA_VAL2);
 
+  fADC->fPos = fpPos;
   fTbinADC = 0;
 
   for (Int_t i = 0; i < TRD_MAX_TBINS; i++)
@@ -1787,15 +1631,22 @@ AliTRDrawStreamTB::DecodeADC()
 
   for (Int_t iw = 0; iw < fMCM->fSingleADCwords; iw++)
     {
+      if (HC_HEADER_MASK_ERR(*fpPos) == 0 || *fpPos == END_OF_TRACKLET_MARKERNEW)
+        {
+          if (fgWarnError) AliError(Form("There should be ADC data. We meet HC header or END_OF_TRACKLET_MARKER 0x%08x",*fpPos));
+         fADC->fCorrupted += 16;
+          fHC->fCorrupted += 16; 
+          fpPos--;
+
+          return kFALSE;
+        }
       if (fMaskADCword != ADC_WORD_MASK(*fpPos))
        {
-         //this is corrupted data
          fADC->fCorrupted += 1;
-         if (fgWarnError) AliWarning(Form("Mask Change in ADC data Previous word (%d) : 0x%08x Previous mask : 0x%08x Current word(%d) : 0x%08x Current mask : 0x%08x", 
-                                          iw - 1, *(fpPos-1), fMaskADCword, iw, *fpPos, ADC_WORD_MASK(*fpPos)));
-         if (fRawReader) fRawReader->AddMajorErrorLog(kADCmaskMissmatch, "Mask change inside single channel"); 
-
-         break;
+          if (fgDebugFlag) AliDebug(11,Form("Wrong ADC data mask! ADC channel number: %02d [Expected mask: 0x%08x  Current mask: 0x%08x] MCM= %s Error : %d",
+                                           fADC->fADCnumber, fMaskADCword, ADC_WORD_MASK(*fpPos),DumpMCMinfo(fMCM),fADC->fCorrupted));
+          fpPos++;
+         continue;
        }
 
       // here we subtract the baseline ( == common additive)
@@ -1818,9 +1669,6 @@ AliTRDrawStreamTB::DecodeADC()
 
   if ( fADC->fADCnumber >= fMaxADCgeom - 1)
     {
-      // let us guess the Column
-      // take the one before last ADC and shift by one column
-      // later we check if we are inside the limits of the chamber
       fADC->fCOL = AliTRDfeeParam::Instance()->GetPadColFromADC(fMCM->fROB, fMCM->fMCM, fADC->fADCnumber - 1);
       fADC->fCOL--;
     }
@@ -1833,18 +1681,16 @@ AliTRDrawStreamTB::DecodeADC()
     {
       if (fADC->fIsShared == kFALSE)
        {
-         fADC->fCorrupted += 100;
-
-         if (fgWarnError) AliWarning(Form("Wrong column! ADCnumber %d MaxIs %d Col %d MaxIs %d MCM= %s", 
+         fADC->fCorrupted += 32;
+         if (fgDebugFlag) AliDebug(11,Form("Wrong column! ADCnumber %d MaxIs %d Col %d MaxIs %d MCM= %s", 
                                           fADC->fADCnumber, fMaxADCgeom, fADC->fCOL, fHC->fColMax, DumpMCMinfo(fMCM)));
-         if (fRawReader) fRawReader->AddMajorErrorLog(kWrongPadcolumn, "Wrong column");          
        }
       else
        {
-         // flag it - we are out of the det when the pad is shared
-         if (fgDebugFlag) AliDebug(10, Form("Column out of the detector! ADCnumber %d MaxIs %d Col %d MaxIs %d MCM= %s", 
+         // we are out of the det when the pad is shared
+         if (fgDebugFlag) AliDebug(11, Form("Column out of the detector! ADCnumber %d MaxIs %d Col %d MaxIs %d MCM= %s", 
                                             fADC->fADCnumber, fMaxADCgeom, fADC->fCOL, fHC->fColMax, DumpMCMinfo(fMCM)));
-         fADC->fCorrupted += 111;
+         fADC->fCorrupted += 32;
        }
     }
 
@@ -1858,15 +1704,19 @@ AliTRDrawStreamTB::DecodeADC()
 }
 
 //--------------------------------------------------------
+
+
 void AliTRDrawStreamTB::DecodeSMInfo(const UInt_t *word, struct AliTRDrawSM *sm) const
 {
   //
-  // Decode the data *word into SM info structure
+  // Decode Supermodule Index Word
+  // The Supermodule Index Word is a 32-Bit word wit following structure
+  // ssssssss ssssssss vvvv rrrr r d t mmmm
+  // s: Size of the Supermodule Header, v: Supermodule Header Version, r: Reserved for future use
+  // d: Track Data Enabled Bit, t: Tracklet Data Enabled Bit, m: Stack Mask 
   //
-    
-  sm->fPos = (UInt_t*)word;
+  sm->fPos = (UInt_t*)word; 
 
-  // do it once here
   UInt_t vword = *word;
   sm->fHeaderSize = SM_HEADER_SIZE(vword);
     
@@ -1879,7 +1729,6 @@ void AliTRDrawStreamTB::DecodeSMInfo(const UInt_t *word, struct AliTRDrawSM *sm)
   sm->fActiveStacks = 0;
   for (Int_t i = 0; i < 5; i++)
     {
-      //if ((stackMask >> i) & 0x1 > 0)
       if (IS_BIT_SET(stackMask,i) > 0)
        {
          sm->fStackActive[i] = kTRUE;
@@ -1898,7 +1747,6 @@ const char *AliTRDrawStreamTB::DumpSMInfo(const struct AliTRDrawSM *sm)
   //
   // Get SM structure into a const char
   //
-    
   return Form("[ SM Info 0x%08x] : Hsize %d TrackletEnable %d Stacks %d %d %d %d %d",
              *sm->fPos,
              sm->fHeaderSize, sm->fTrackletEnable,
@@ -1910,12 +1758,13 @@ const char *AliTRDrawStreamTB::DumpSMInfo(const struct AliTRDrawSM *sm)
 void AliTRDrawStreamTB::DecodeStackInfo(const UInt_t *word, struct AliTRDrawStack *st) const
 {
   //
-  // Decode stack info - active links
+  // Decode Stack #i Index Word
+  // The Stack #i Index Word is a 32-Bit word wit following structure
+  // ssssssss ssssssss vvvv mmmm mmmmmmmm
+  // s: Size of the Stack #i Header, v: Supermodule Header Version, m: Link Mask
   //
-
   st->fPos = (UInt_t*)word;
       
-  // do it once here
   UInt_t vword = *word;
   st->fHeaderSize = STACK_HEADER_SIZE(vword);
 
@@ -1923,55 +1772,80 @@ void AliTRDrawStreamTB::DecodeStackInfo(const UInt_t *word, struct AliTRDrawStac
   st->fActiveLinks = 0;
   for (Int_t i = 0; i < 12; i++)
     {
-      //if (linkMask & (0x1 << i) > 0)
       if (IS_BIT_SET(linkMask,i) > 0)
        {
          st->fLinksActive[i] = kTRUE;
-         st->fTrackletDecode[i] = kTRUE;
-         st->fHCDecode[i] = kTRUE;
          st->fActiveLinks++;
        }
       else
        {
-         st->fTrackletDecode[i] = kFALSE;
          st->fLinksActive[i] = kFALSE;
-         st->fHCDecode[i] = kFALSE;
        }
     }
 }
   
+//--------------------------------------------------------
+void AliTRDrawStreamTB::DecodeStackHeader(const UInt_t *word, struct AliTRDrawStack *st, Int_t iword) const
+{
+      st->fPos = (UInt_t*)word;
+      
+      UInt_t vword = *word;
+      st->fLinksDataType[2*iword]    = LINK0_DATA_TYPE_FLAG(vword);
+      st->fLinksMonitor[2*iword]     = LINK0_MONITOR_FLAG(vword);
+      st->fLinksDataType[2*iword+1]  = LINK1_DATA_TYPE_FLAG(vword);
+      st->fLinksMonitor[2*iword+1]   = LINK1_MONITOR_FLAG(vword);
+}
+
 //--------------------------------------------------------
 const char *AliTRDrawStreamTB::DumpStackInfo(const struct AliTRDrawStack *st)
 {
   //
   // format the string with the stack info
   //
+
+  return "Dupa Blada";
+
+  static char text[1000];
+  sprintf(text,
+         "[ Stack Info 0x%08x ] : Hsize %d Links Active %d %d %d %d %d %d %d %d %d %d %d %d",
+         *st->fPos,
+         st->fHeaderSize,
+         st->fLinksActive[0], st->fLinksActive[1], st->fLinksActive[2], st->fLinksActive[3],
+         st->fLinksActive[4], st->fLinksActive[5], st->fLinksActive[6], st->fLinksActive[7],
+         st->fLinksActive[8], st->fLinksActive[9], st->fLinksActive[10], st->fLinksActive[11]
+         );
+
+  printf(text);
+  return text;
+  /*
   return Form("[ Stack Info 0x%08x ] : Hsize %d Links Active %d %d %d %d %d %d %d %d %d %d %d %d",
              *st->fPos,
              st->fHeaderSize,
              st->fLinksActive[0], st->fLinksActive[1], st->fLinksActive[2], st->fLinksActive[3],
              st->fLinksActive[4], st->fLinksActive[5], st->fLinksActive[6], st->fLinksActive[7],
              st->fLinksActive[8], st->fLinksActive[9], st->fLinksActive[10], st->fLinksActive[11]);
+
+  */
 }
 
 //--------------------------------------------------------
-void AliTRDrawStreamTB::DecodeHCwordH0(const UInt_t *word, struct AliTRDrawHC *hc) const
+Bool_t AliTRDrawStreamTB::DecodeHCwordH0(const UInt_t *word, struct AliTRDrawHC *hc) const
 {
   //
   // decode the hc header word 0
   //
-
-  // do it once here
   UInt_t vword = *word;
 
-  hc->fCorrupted = HC_HEADER_MASK_ERR(vword);
-  if (hc->fCorrupted > 0)
+  hc->fH0Corrupted = HC_HEADER_MASK_ERR(vword);
+  if (hc->fH0Corrupted > 0)
     {
-      hc->fH0ErrorCounter++;
+     if (fgDebugFlag) AliDebug(11,Form("H0 Header Mask Error. Word 0x%08x", *fHC->fPos));
+     return kFALSE;
     }
 
   hc->fSpecialRawV =  HC_SPECIAL_RAW_VERSION(vword);
   hc->fRawVMajor = HC_MAJOR_RAW_VERSION(vword);
+  hc->fRawVMajorOpt = HC_MAJOR_RAW_VERSION_OPT(vword); 
   hc->fRawVMinor = HC_MINOR_RAW_VERSION(vword);
   hc->fNExtraWords = HC_EXTRA_WORDS(vword);
   hc->fDCSboard = HC_DCS_BOARD(vword);
@@ -1982,22 +1856,23 @@ void AliTRDrawStreamTB::DecodeHCwordH0(const UInt_t *word, struct AliTRDrawHC *h
 
   hc->fPos[0] = (UInt_t*)word;
 
+  return kTRUE;
 }
 
 //--------------------------------------------------------
-void AliTRDrawStreamTB::DecodeHCwordH1(const UInt_t *word, struct AliTRDrawHC *hc) const
+Bool_t AliTRDrawStreamTB::DecodeHCwordH1(const UInt_t *word, struct AliTRDrawHC *hc) const
 {
   //
-  // 
+  // decode the hc header word 1
   //
 
-  // do it once here
   UInt_t vword = *word;
 
-  hc->fCorrupted += 10 * HC_HEADER_MASK_ERR(vword);
-  if (hc->fCorrupted > 10)
-    {
-      hc->fH1ErrorCounter++;
+  hc->fH1Corrupted = HC_HEADER_MASK_ERR(vword);
+  if (hc->fH1Corrupted > 0)
+    { 
+     if (fgDebugFlag) AliDebug(11,Form("H1 Header Mask Error. Word 0x%08x", *fHC->fPos));
+     return kFALSE;
     }
 
   hc->fTimeBins = HC_NTIMEBINS(vword);
@@ -2006,13 +1881,15 @@ void AliTRDrawStreamTB::DecodeHCwordH1(const UInt_t *word, struct AliTRDrawHC *h
   hc->fPreTriggerPhase = HC_PRETRIGGER_PHASE(vword);
 
   hc->fPos[1] = (UInt_t*)word;
+
+  return kTRUE;
 }
   
 //--------------------------------------------------------
 const char *AliTRDrawStreamTB::DumpHCinfoH0(const struct AliTRDrawHC *hc)
 {
   //
-  // 
+  // dump the hc header word 0
   //
   if (!hc)
     return Form("Unable to dump. Null received as parameter!?!");
@@ -2025,7 +1902,7 @@ const char *AliTRDrawStreamTB::DumpHCinfoH0(const struct AliTRDrawHC *hc)
 const char *AliTRDrawStreamTB::DumpHCinfoH1(const struct AliTRDrawHC *hc)
 {
   //
-  // 
+  // dump the hc header word 1
   //
   if (!hc)
     return Form("Unable to dump. Null received as parameter!?!");
@@ -2040,23 +1917,21 @@ void AliTRDrawStreamTB::DecodeMCMheader(const UInt_t *word, struct AliTRDrawMCM
   //
   // decode the mcm header
   //
-
-  // do it once here
   UInt_t vword = *word;
 
-  mcm->fCorrupted = MCM_HEADER_MASK_ERR(vword);
-  //printf("0x%08x %d\n", word, MCM_HEADER_MASK_ERR(vword));
-  if (vword == END_OF_TRACKLET_MARKERNEW) // To read properly ZS data corrupted in this way
+  if (vword == END_OF_TRACKLET_MARKERNEW) 
     {
-      if (fgWarnError) AliError(Form("There should be MCM header. We met END_OF_TRACKLET_MARKER 0x%08x",vword));
-      mcm->fCorrupted += 1111;
+      if (fgWarnError) AliError(Form("There should be MCM header. We meet END_OF_TRACKLET_MARKER 0x%08x",vword));
+      mcm->fMCMhdCorrupted += 16;
+      fHC->fCorrupted += 16; //to finish data reading of this HC
     }
-  if (mcm->fCorrupted)
-    mcm->fErrorCounter++;
+
+  mcm->fMCMhdCorrupted = MCM_HEADER_MASK_ERR(vword); //if MCM header mask has error
+  if (fgDebugFlag && mcm->fMCMhdCorrupted != 0) AliDebug(11,Form("Wrong MCM header mask 0x%08x.\n", *fpPos));
+
   mcm->fROB = MCM_ROB_NUMBER(vword);
   mcm->fMCM = MCM_MCM_NUMBER(vword);
   mcm->fEvCounter = MCM_EVENT_COUNTER(vword);
-
   mcm->fPos = (UInt_t*)word;
 }
 
@@ -2066,26 +1941,30 @@ UInt_t AliTRDrawStreamTB::GetMCMadcMask(const UInt_t *word, struct AliTRDrawMCM
   //
   // get the adc mask
   //
-
-  // do it once here
   UInt_t vword = *word;
 
-  mcm->fADCindex = 0;
-  mcm->fADCmax   = 0;
-  mcm->fADCMask  = 0;
+  mcm->fADCmax    = 0;
+  mcm->fADCMask   = 0;
+  mcm->fADCcount  = 0;
   mcm->fADCMaskWord = vword;
-  //memset(mcm->fADCchannel, 0, sizeof(UInt_t) * 30);
-  //if ((word & 0x0000000F) == 0x0000000C)
+
+  if (vword == END_OF_TRACKLET_MARKERNEW)
+    {
+      if (fgWarnError) AliError(Form("There should be MCMadcMask. We meet END_OF_TRACKLET_MARKER 0x%08x",vword));
+      mcm->fADCmaskCorrupted += 16;
+      fHC->fCorrupted += 16; //to finish data reading of this HC
+    }
+
   if ( MCM_ADCMASK_MASK_ERR(vword) == 0 )
     {
-      //mcm->fADCMask = (word >> 4) & skADCmaskBits;
-      mcm->fADCMask = MCM_ADCMASK_VAL(vword);
+      mcm->fADCMask  = MCM_ADCMASK_VAL(vword);
+      mcm->fADCcount = MCM_ADCMASK_NADC(~vword);
     }
   else
     {
       mcm->fADCMask = 0xffffffff;
-      mcm->fCorrupted += 10;
-      mcm->fMaskErrorCounter++;
+      mcm->fADCmaskCorrupted = 1; // mcm adc mask error
+      if (fgDebugFlag) AliDebug(11,Form("Wrong ADC Mask word 0x%08x.\n", *fpPos));
     }
 
   return mcm->fADCMask;
@@ -2097,11 +1976,11 @@ void AliTRDrawStreamTB::DecodeMask(const UInt_t *word, struct AliTRDrawMCM *mcm)
   //
   // decode the adc mask - adcs to be read out
   //
-
   mcm->fMCMADCWords = 0;
   mcm->fSingleADCwords = 0;
   mcm->fADCmax = 0;
   mcm->fADCMask = GetMCMadcMask(word, mcm);
+
   if (mcm->fADCMask > 0)
     {
       for (Int_t i = 0; i < TRD_MAX_ADC; i++)
@@ -2114,6 +1993,11 @@ void AliTRDrawStreamTB::DecodeMask(const UInt_t *word, struct AliTRDrawMCM *mcm)
            }
        }
     }
+  if (mcm->fADCcount != mcm->fADCmax && fHC->fRawVMajor >= 32) // backward compatibility
+    {
+      mcm->fADCmaskCorrupted += 2; 
+      if (fgDebugFlag) AliDebug(11,Form("ADC counts from ADCMask are different %d %d : ADCMask word 0x%08x\n", mcm->fADCcount, mcm->fADCmax, *fMCM->fPos));
+    }
 }
 
 //--------------------------------------------------------
@@ -2143,7 +2027,6 @@ const char *AliTRDrawStreamTB::DumpMCMinfo(const struct AliTRDrawMCM *mcm)
 }
   
 //--------------------------------------------------------
-//TString DumpMCMadcMask(const struct AliTRDrawMCMInfo *mcm)
 const char *AliTRDrawStreamTB::DumpMCMadcMask(const struct AliTRDrawMCM *mcm)
 {
   //