Fixes for #93692: Physics selection does not work in QA for 2012 data - missing trigger

[u/mrichter/AliRoot.git] / MUON / AliMUONRawStreamTrackerHP.cxx

diff --git a/MUON/AliMUONRawStreamTrackerHP.cxx b/MUON/AliMUONRawStreamTrackerHP.cxx
index 6aafeba2cca6f4e758dbbbb33101b5784043f807..73fa28b13a529f9b9ff6fd3ff53833f51e8fbed6 100644 (file)
--- a/MUON/AliMUONRawStreamTrackerHP.cxx
+++ b/MUON/AliMUONRawStreamTrackerHP.cxx
@@ -713,7 +713,7 @@ void AliMUONRawStreamTrackerHP::AliDecoderEventHandler::OnError(
                // We subtract 1 from the current numbers of blocks, DSPs
                // and bus patches to get the iBlock, iDsp and iBus indices.
                detail = Form(
-                       "At byte %d in DDL %d, event %d, iBlock %d, iDsp %d [DSP ID: %d (0x%X)],"
+                       "At byte %lu in DDL %d, event %d, iBlock %d, iDsp %d [DSP ID: %d (0x%X)],"
                        " iBus %d [bus patch ID: %d (0x%X)].",
                        (unsigned long)location - (unsigned long)fBufferStart + sizeof(AliRawDataHeader),
                        AliDAQ::DdlID("MUONTRK", fRawStream->GetDDL()),
@@ -797,7 +797,7 @@ void AliMUONRawStreamTrackerHP::AliDecoderEventHandler::OnError(
                        // fCurrentBusPatch->GetData() returns a pointer to the start of
                        // bus patches data, so the difference divided by 4 gives the 32
                        // bit word number.
-                       word = ((unsigned long)location - (unsigned long)fCurrentBusPatch->GetData())
+                       word = (reinterpret_cast<size_t>(location) - reinterpret_cast<size_t>(fCurrentBusPatch->GetData()))
                                / sizeof(UInt_t);
                        message = Form(
                                "Parity error in word %d for manuId %d and channel %d in buspatch %d. %s",
@@ -822,8 +822,8 @@ void AliMUONRawStreamTrackerHP::AliDecoderEventHandler::OnError(
                case kMediumErrorDetail:
                        word = *reinterpret_cast<const UInt_t*>(location);
                        message = Form(
-                               "Lost token error detected in DSP 0x%X of DDL %d and code %d.",
-                               ((word & 0xFFFF0000) >> 16),
+                               "Lost token error detected with address 0x%X of DDL %d and code %d.",
+                               ((word & 0xFFFF0000)),
                                fRawStream->GetDDL(),
                                (word & 0xF)
                        );
@@ -833,11 +833,10 @@ void AliMUONRawStreamTrackerHP::AliDecoderEventHandler::OnError(
                        word = *reinterpret_cast<const UInt_t*>(location);
                        message = Form(
                                "Lost token error detected with address 0x%X and code %d. %s",
-                               ((word & 0xFFFF0000) >> 16),
+                               ((word & 0xFFFF0000)),
                                (word & 0xF),
                                detail
                        );
-                       message = Form("Lost token error detected. %s.", detail);
                        break;
                }
                logAsMajorError = false;
@@ -851,7 +850,7 @@ void AliMUONRawStreamTrackerHP::AliDecoderEventHandler::OnError(
                        break;
                case kMediumErrorDetail:
                        message = Form(
-                               "%s (At byte %d)",
+                               "%s (At byte %lu)",
                                ErrorCodeToMessage(error),
                                (unsigned long)location - (unsigned long)fBufferStart + sizeof(AliRawDataHeader)
                        );