Adding PiKP-only histograms and eliminating a number of switches where histograms...

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

diff --git a/MUON/AliMUONRawStreamTriggerHP.cxx b/MUON/AliMUONRawStreamTriggerHP.cxx
index 36787dbb8871574fe593e69813ff4b3105d381cf..aa9b12a2f460eecc31c570e3f1cf91dd6a7110f6 100644 (file)
--- a/MUON/AliMUONRawStreamTriggerHP.cxx
+++ b/MUON/AliMUONRawStreamTriggerHP.cxx
@@ -237,6 +237,10 @@ Bool_t AliMUONRawStreamTriggerHP::NextDDL()
        Swap(reinterpret_cast<UInt_t*>(fBuffer), dataSize / sizeof(UInt_t)); // Swap needed for mac power pc.
 #endif
        
+       fDDL++; // Remember to increment index to next DDL before the calls to
+               // fDecoder.Decode since the callback methods of the decoder might
+               // use AliMUONRawStreamTriggerHP::GetDDL()
+       
        // Check if this is a scalar event.
        bool scalerEvent = (GetReader()->GetDataHeader()->GetL1TriggerMessage() & 0x1) == 0x1;
        
@@ -261,7 +265,6 @@ Bool_t AliMUONRawStreamTriggerHP::NextDDL()
        // Update the current local structure pointer.
        fkCurrentLocalStruct = fDecoder.GetHandler().FirstLocalStruct();
 
-       fDDL++; // Remember to increment index to next DDL.
        return kTRUE;
 }
 
@@ -723,7 +726,7 @@ void AliMUONRawStreamTriggerHP::AliDecoderEventHandler::OnError(
                
        default:
                message = Form(
-                       "%s (At byte %d in DDL.)",
+                       "%s (At byte %lu in DDL.)",
                        ErrorCodeToMessage(error),
                        (unsigned long)location - (unsigned long)fBufferStart + sizeof(AliRawDataHeader)
                );