remove duplicated setting, and some cosmetics

[u/mrichter/AliRoot.git] / TOF / AliTOFDecoder.cxx

diff --git a/TOF/AliTOFDecoder.cxx b/TOF/AliTOFDecoder.cxx
index 3736fb0b8513bbfd83a133c59750959f7e3544fb..c71d00a75c33cacd04c46b55648f8bfea723aac2 100644 (file)
--- a/TOF/AliTOFDecoder.cxx
+++ b/TOF/AliTOFDecoder.cxx
@@ -217,12 +217,13 @@ 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);
-  AliDebug(1, Form("EvID1 = %d, EvID2 = %d, currentMiniEventID = %d", currentEventID1, cdh->GetEventID2(), currentMiniEventID));
+  currentEventID1 = cdhV3 ? cdhV3->GetEventID1() : currentEventID1;
   if (!cdh && !cdhV3)
     AliWarning("CDH not valid: deltaBunchID not reliable ");
+  else
+    AliDebug(1, Form("EvID1 = %d, EvID2 = %d, currentMiniEventID = %d", currentEventID1, cdh? cdh->GetEventID2() : cdhV3->GetEventID2(), currentMiniEventID));
 
   /*** V2718 patch ***/
   if (fV2718Patch){
@@ -945,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