X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTrackerDDLDecoderEventHandler.h;h=8bc9ffbc4fcac1b9047c50d63dfbf47c84106ddd;hb=29cdb6fe3e05c0d8a20a765f60ff8c4a51386b7d;hp=d1df33b3b2dc7babe2c1598964ba6bb1a16127c7;hpb=29b6be6ad44a53b52ae3f60070c88e8720ad83d6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONTrackerDDLDecoderEventHandler.h b/MUON/AliMUONTrackerDDLDecoderEventHandler.h
index d1df33b3b2d..8bc9ffbc4fc 100644
--- a/MUON/AliMUONTrackerDDLDecoderEventHandler.h
+++ b/MUON/AliMUONTrackerDDLDecoderEventHandler.h
@@ -126,6 +126,8 @@ public:
 		kBusPatchLengthMismatch = 28,  /// The bus patch length and total length fields do not correspond. One or both of these values is incorrect.
 		kNoDDLTrailerWords = 29,       /// No end of DDL markers found in the trailer words.
 		kTooFewDDLTrailerWords = 30,   /// Only one end of DDL marker trailer word found but expected two.
+		kUnknownDspError = 31,         /// The DSP error code is non-zero but of an unrecognised format.
+		kTokenLost = 32,               /// The DSP contains a token lost error code that can affect the deadtime.
 		// match up error codes with AliMUONRawStreamTracker:
 		kGlitchFound = 1,              /// Found a glitch. This means a 1 byte word has been randomly inserted into the raw data by mistake.
 		kBadPaddingWord = 2,           /// The padding word does not contain the correct value.
@@ -177,7 +179,7 @@ public:
 	void OnEndOfBlock(const AliMUONBlockHeaderStruct* /*header*/, const void* /*data*/) {}
 	
 	/// OnNewDSP is called whenever a new DSP header is found in the payload.
-	/// Every DSP header recevied by a call to OnNewDSP is associated to the
+	/// Every DSP header received by a call to OnNewDSP is associated to the
 	/// block header received in the most recent call to OnNewBlock.
 	/// The default behaviour of this method is to do nothing.
 	/// - param const AliMUONDSPHeaderStruct*  This is a pointer to the DSP header
@@ -227,7 +229,7 @@ public:
 	void OnEndOfBusPatch(const AliMUONBusPatchHeaderStruct* /*header*/, const void* /*data*/) {}
 	
 	/// OnData is called for every raw data word found within a bus patch.
-	/// Every data ward recevied by a call to OnData is associated to the bus patch
+	/// Every data ward received by a call to OnData is associated to the bus patch
 	/// header received in the most recent call to OnNewBusPatch.
 	/// The default behaviour of this method is to do nothing.
 	/// - param UInt_t  This is the raw data word as found within the bus patch payload.
@@ -238,7 +240,7 @@ public:
 	
 	/// Whenever a parsing error of the DDL payload is encountered because of
 	/// corruption of the raw data (eg. bit flips) the OnError method is called
-	/// imediately at the point this error is discovered.
+	/// immediately at the point this error is discovered.
 	/// The default behaviour of this method is to do nothing.
 	/// - param ErrorCode  This is an error code indicating the kind of problem
 	///               encountered with the DDL payload.
@@ -246,7 +248,7 @@ public:
 	///         indicating the exact location where the parsing error happened
 	///         or i.e. the location of the corruption.
 	/// Note that a relative offset in bytes from the start of the memory buffer
-	/// can be calculated by: storing the buffer pointer recevied in OnNewBuffer
+	/// can be calculated by: storing the buffer pointer received in OnNewBuffer
 	/// earlier in fBufferStart for example, and then the offset is given by:
 	///   offset = (unsigned long)location - (unsigned long)fBufferStart;
 	void OnError(ErrorCode /*error*/, const void* /*location*/) {}
@@ -269,7 +271,7 @@ public:
 	}
 	
 	/// This is a utility method which converts an error code to a string
-	/// respresentation for printing purposes.
+	/// representation for printing purposes.
 	/// \param code  The error code as received in OnError for example.
 	/// \return  An ANSI string containing the name of the error code symbol.
 	static const char* ErrorCodeToString(ErrorCode code);
@@ -314,6 +316,8 @@ inline const char* AliMUONTrackerDDLDecoderEventHandler::ErrorCodeToString(Error
 	case kBusPatchLengthMismatch: return "kBusPatchLengthMismatch";
 	case kNoDDLTrailerWords: return "kNoDDLTrailerWords";
 	case kTooFewDDLTrailerWords: return "kTooFewDDLTrailerWords";
+	case kUnknownDspError: return "kUnknownDspError";
+	case kTokenLost: return "kTokenLost";
 	case kGlitchFound: return "kGlitchFound";
 	case kBadPaddingWord: return "kBadPaddingWord";
 	case kParityError: return "kParityError";
@@ -384,6 +388,10 @@ inline const char* AliMUONTrackerDDLDecoderEventHandler::ErrorCodeToMessage(Erro
 		return "No end of DDL data key found in the trailer words.";
 	case kTooFewDDLTrailerWords:
 		return "Only one end of DDL data key word found in the trailer but expected two.";
+	case kUnknownDspError:
+		return "The DSP error code is non-zero but of an unrecognised format.";
+	case kTokenLost:
+		return "The DSP contains a token lost error code that can affect the deadtime.";
 	case kGlitchFound:
 		return "Found a glitch. This means a 1 byte word has been randomly"
 		       " inserted into the raw data by mistake.";