ALIROOT-5420 Fixed logics in the event ID decoding

diff --git a/TOF/AliTOFDecoder.cxx b/TOF/AliTOFDecoder.cxx
index 5993d01c7effc8792c12cb570e064b37fa6d1eae..c71d00a75c33cacd04c46b55648f8bfea723aac2 100644 (file)
--- a/TOF/AliTOFDecoder.cxx
+++ b/TOF/AliTOFDecoder.cxx
@@ -217,9 +217,9 @@ AliTOFDecoder::Decode(const UInt_t *rawData, Int_t nWords, const AliRawDataHeade
   Short_t  currentBunchID = -1;
   Short_t  currentL0BCID = -1;
   Short_t  currentMiniEventID = cdh ? cdh->GetMiniEventID() : (Short_t)(-1);
-  currentMiniEventID = cdhV3 ? cdhV3->GetMiniEventID() : (Short_t)(-1);
+  currentMiniEventID = cdhV3 ? cdhV3->GetMiniEventID() : currentMiniEventID;
   Short_t  currentEventID1 = cdh ? cdh->GetEventID1() : (Short_t)(-1);
-  currentEventID1 = cdhV3 ? cdhV3->GetEventID1() : (Short_t)(-1);
+  currentEventID1 = cdhV3 ? cdhV3->GetEventID1() : currentEventID1;
   if (!cdh && !cdhV3)
     AliWarning("CDH not valid: deltaBunchID not reliable ");
   else
@@ -946,9 +946,9 @@ void AliTOFDecoder::PrintStack(const UInt_t *rawData, Int_t nWords, const AliRaw
    */
 
  Short_t  currentMiniEventID = cdh ? cdh->GetMiniEventID() : (Short_t)(-1);
- currentMiniEventID = cdhV3 ? cdhV3->GetMiniEventID() : (Short_t)(-1);
+ currentMiniEventID = cdhV3 ? cdhV3->GetMiniEventID() : currentMiniEventID;
  Short_t  currentEventID1 = cdh ? cdh->GetEventID1() : (Short_t)(-1);
- currentEventID1 = cdhV3 ? cdhV3->GetEventID1() : (Short_t)(-1);
+ currentEventID1 = cdhV3 ? cdhV3->GetEventID1() : currentEventID1;
  if (!cdh && !cdhV3)
    AliWarning("CDH not valid: deltaBunchID not reliable ");
  else

diff --git a/TOF/AliTOFRawStream.cxx b/TOF/AliTOFRawStream.cxx
index 138ed7b0ac7d019ae120ad25891af828bbe7c98d..9109fce54aaa64fd56b64fa135d4287abfadf8d4 100644 (file)
--- a/TOF/AliTOFRawStream.cxx
+++ b/TOF/AliTOFRawStream.cxx
@@ -1724,9 +1724,9 @@ AliTOFRawStream::LoadRawDataBuffersV2(Int_t indexDDL, Int_t verbose)
   const AliRawDataHeader *currentCDH = fRawReader->GetDataHeader();
   const AliRawDataHeaderV3 *currentCDHV3 = fRawReader->GetDataHeaderV3();
   Int_t currentMiniEventID = currentCDH ? currentCDH->GetMiniEventID(): -1;
-  currentMiniEventID = currentCDHV3 ? currentCDHV3->GetMiniEventID(): -1;
+  currentMiniEventID = currentCDHV3 ? currentCDHV3->GetMiniEventID(): currentMiniEventID;
   Int_t currentEventID1 = currentCDH? currentCDH->GetEventID1() : -1;
-  currentEventID1 = currentCDHV3? currentCDHV3->GetEventID1() : -1;
+  currentEventID1 = currentCDHV3? currentCDHV3->GetEventID1() : currentEventID1;
 
   /* read decoder summary data */
   AliTOFDecoderSummaryData *decodersd;