Coverity 21238

[u/mrichter/AliRoot.git] / ITS / AliITSRawStreamSPD.h

diff --git a/ITS/AliITSRawStreamSPD.h b/ITS/AliITSRawStreamSPD.h
index b1be7acdab8755dcf0d880f8e3478febb8a7f623..5d7a70c933d828d44f36475bd6beae28ce8aeefb 100644 (file)
--- a/ITS/AliITSRawStreamSPD.h
+++ b/ITS/AliITSRawStreamSPD.h
@@ -11,6 +11,7 @@
 ///
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "AliRawReader.h"
 #include "AliITSRawStream.h"
 #include "AliITSRawStreamSPDErrorLog.h"
 
@@ -84,19 +85,22 @@ class AliITSRawStreamSPD: public AliITSRawStream {
     UInt_t GetHrowStart() const {return (UInt_t) ((fCalHeadWord[6]>>24) & 0x000000ff);}
     UInt_t GetHrowEnd() const {return (UInt_t) ((fCalHeadWord[6]>>16) & 0x000000ff);}
     UInt_t GetHrowValue() const {return (UInt_t) ((fCalHeadWord[6]>> 8) & 0x000000ff);}
+    UInt_t GetHrowSpan() const {return (UInt_t) ((fCalHeadWord[6]) & 0x000000ff);}    
     UInt_t GetHdacValue() const {return (Int_t) ((fCalHeadWord[6]) & 0x000000ff);}
     UInt_t GetHdacHigh(UInt_t hs) const;
     UInt_t GetHdacLow(UInt_t hs) const;
     UInt_t GetHTPAmp(UInt_t hs) const;
     Bool_t GetHminTHchipPresent(UInt_t chip) const;
+    UInt_t GetHglobalDBversion() const {return fCalHeadWord[16];}
     // use the methods below to extract the information from the fo calibration header:
     UInt_t GetFOHrouterNr() const {return GetHrouterNr();}
     UInt_t GetFOHtype() const {return GetHtype();}
     UInt_t GetFOHtriggers() const {return GetHtriggers();}
     Bool_t GetFOHchipPresent(UInt_t hs, UInt_t chip) const {return GetHchipPresent(hs,chip);}
     UInt_t GetFOHglobalDBversion() const {return fCalHeadWord[5];}
-    UInt_t GetFOHpixelCol() const {return fCalHeadWord[6] & 0x0000ffff;}
-    UInt_t GetFOHpixelRow() const {return (fCalHeadWord[6] >> 16) & 0x0000ffff;}
+    UInt_t GetFOHMatrixID() const {return fCalHeadWord[6] & 0x0000000f;}
+    UInt_t GetFOHpixelCol() const {return (fCalHeadWord[6] >> 20) & 0x0000001f;}
+    UInt_t GetFOHpixelRow() const {return (fCalHeadWord[6] >> 10) & 0x000000ff;}
     UInt_t GetFOHnumDacs() const;
     UInt_t GetFOHdacIndex(UInt_t index) const;
     UInt_t GetFOHdacValue(UInt_t index) const;
@@ -131,7 +135,7 @@ class AliITSRawStreamSPD: public AliITSRawStream {
       kTrailerErrorBitErr,
       kLinkRxDetectorFatalErr,
       kTSMtriggerErr,
-      kBCdiffErr
+      kHighMultiplicityFlag
     };
 
   private :
@@ -182,4 +186,3 @@ class AliITSRawStreamSPD: public AliITSRawStream {
 };
 
 #endif
-