MID: fixes: use RDHUtils to access RDH fields

shahor02 · shahor02 · commit 77c18046a958 · 2020-06-19T10:36:32.000+02:00
diff --git a/Detectors/MUON/MID/Raw/src/CRUBareDecoder.cxx b/Detectors/MUON/MID/Raw/src/CRUBareDecoder.cxx
@@ -16,11 +16,13 @@
 #include "MIDRaw/CRUBareDecoder.h"
 
 #include "RawInfo.h"
+#include "DetectorsRaw/RDHUtils.h"
 
 namespace o2
 {
 namespace mid
 {
+using RDHUtils = o2::raw::RDHUtils;
 
 void CRUBareDecoder::reset()
 {
@@ -110,7 +112,7 @@ void CRUBareDecoder::addBoard(size_t ilink)
     eventType = EventType::Dead;
   }
   auto firstEntry = mData.size();
-  InteractionRecord intRec(localClock - sDelayBCToLocal, mBuffer.getRDH()->triggerOrbit);
+  InteractionRecord intRec(localClock - sDelayBCToLocal, RDHUtils::getTriggerOrbit(*mBuffer.getRDH()));
   mData.push_back({mELinkDecoders[ilink].getStatusWord(), mELinkDecoders[ilink].getTriggerWord(), crateparams::makeUniqueLocID(mCrateId, mELinkDecoders[ilink].getId()), mELinkDecoders[ilink].getInputs()});
   mROFRecords.emplace_back(intRec, eventType, firstEntry, 1);
 }
diff --git a/Detectors/MUON/MID/Raw/src/RawBuffer.cxx b/Detectors/MUON/MID/Raw/src/RawBuffer.cxx
@@ -17,11 +17,13 @@
 
 #include "MIDRaw/RawUnit.h"
 #include "RawInfo.h"
+#include "DetectorsRaw/RDHUtils.h"
 
 namespace o2
 {
 namespace mid
 {
+using RDHUtils = o2::raw::RDHUtils;
 
 template <typename T>
 unsigned int RawBuffer<T>::next(unsigned int nBits)
@@ -73,10 +75,10 @@ bool RawBuffer<T>::nextHeader()
   }
   mHeaderIndex = mNextHeaderIndex;
   mRDH = reinterpret_cast<const header::RAWDataHeader*>(&mBytes[mHeaderIndex]);
-  mEndOfPayloadIndex = mHeaderIndex + (mRDH->memorySize / mElementSizeInBytes);
+  mEndOfPayloadIndex = mHeaderIndex + (RDHUtils::getMemorySize(*mRDH) / mElementSizeInBytes);
   // Go to end of header, i.e. beginning of payload
-  mElementIndex = mHeaderIndex + (mRDH->headerSize / mElementSizeInBytes);
-  mNextHeaderIndex = mHeaderIndex + mRDH->offsetToNext / mElementSizeInBytes;
+  mElementIndex = mHeaderIndex + (RDHUtils::getHeaderSize(*mRDH) / mElementSizeInBytes);
+  mNextHeaderIndex = mHeaderIndex + RDHUtils::getOffsetToNext(*mRDH) / mElementSizeInBytes;
   mBitIndex = 0;
 
   return true;
@@ -134,7 +136,7 @@ bool RawBuffer<T>::isHBClosed()
   if (!mRDH) {
     return false;
   }
-  return mRDH->stop;
+  return RDHUtils::getStop(*mRDH);
 }
 
 template <typename T>
diff --git a/Detectors/MUON/MID/Raw/src/RawFileReader.cxx b/Detectors/MUON/MID/Raw/src/RawFileReader.cxx
@@ -17,11 +17,14 @@
 
 #include <iostream>
 #include "Headers/RAWDataHeader.h"
+#include "DetectorsRaw/RDHUtils.h"
 
 namespace o2
 {
 namespace mid
 {
+using RDHUtils = o2::raw::RDHUtils;
+
 template <typename T>
 bool RawFileReader<T>::init(const char* inFilename, bool readContinuous)
 {
@@ -96,7 +99,7 @@ bool RawFileReader<T>::replaceRDH(size_t headerIndex)
   /// Replaces the current RDH with a custom one if needed.
   /// This is done to be able to correctly read test data
   /// that have a wrong RDH
-  if (mCustomRDH.offsetToNext > 0) {
+  if (RDHUtils::getOffsetToNext(mCustomRDH) > 0) {
     header::RAWDataHeader* rdh = reinterpret_cast<header::RAWDataHeader*>(&mBytes[headerIndex]);
     *rdh = mCustomRDH;
     return true;
@@ -140,13 +143,13 @@ bool RawFileReader<T>::readHB(bool sendCompleteHBs)
     mBuffer.setBuffer(mBytes, RawBuffer<T>::ResetMode::bufferOnly);
     mBuffer.nextHeader();
     isHBClosed = mBuffer.isHBClosed();
-    gbtId = mBuffer.getRDH()->feeId;
+    gbtId = RDHUtils::getFEEID(*mBuffer.getRDH());
     if (gbtId >= crateparams::sNGBTs) {
       // FIXME: this is a problem of the header of some test files
       gbtId = 0;
     }
-    if (mBuffer.getRDH()->offsetToNext > raw::sHeaderSizeInBytes) {
-      read(mBuffer.getRDH()->offsetToNext - raw::sHeaderSizeInBytes);
+    if (RDHUtils::getOffsetToNext(*mBuffer.getRDH()) > raw::sHeaderSizeInBytes) {
+      read(RDHUtils::getOffsetToNext(*mBuffer.getRDH()) - raw::sHeaderSizeInBytes);
       // CAVEAT: to save memory / CPU time, the RawBuffer does not hold a copy of the buffer,
       // but just a span of it.
       // If we add bytes to mBytes, the vector can go beyond the capacity
@@ -171,4 +174,4 @@ template class RawFileReader<raw::RawUnit>;
 template class RawFileReader<uint8_t>;
 
 } // namespace mid
-} // namespace o2
+} // namespace o2

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,13 @@`
`16`	`16`	`#include "MIDRaw/CRUBareDecoder.h"`
`17`	`17`
`18`	`18`	`#include "RawInfo.h"`
	`19`	`+#include "DetectorsRaw/RDHUtils.h"`
`19`	`20`
`20`	`21`	`namespace o2`
`21`	`22`	`{`
`22`	`23`	`namespace mid`
`23`	`24`	`{`
	`25`	`+using RDHUtils = o2::raw::RDHUtils;`
`24`	`26`
`25`	`27`	`void CRUBareDecoder::reset()`
`26`	`28`	`{`
`@@ -110,7 +112,7 @@ void CRUBareDecoder::addBoard(size_t ilink)`
`110`	`112`	`eventType = EventType::Dead;`
`111`	`113`	`}`
`112`	`114`	`auto firstEntry = mData.size();`
`113`		`- InteractionRecord intRec(localClock - sDelayBCToLocal, mBuffer.getRDH()->triggerOrbit);`
	`115`	`+ InteractionRecord intRec(localClock - sDelayBCToLocal, RDHUtils::getTriggerOrbit(*mBuffer.getRDH()));`
`114`	`116`	`mData.push_back({mELinkDecoders[ilink].getStatusWord(), mELinkDecoders[ilink].getTriggerWord(), crateparams::makeUniqueLocID(mCrateId, mELinkDecoders[ilink].getId()), mELinkDecoders[ilink].getInputs()});`
`115`	`117`	`mROFRecords.emplace_back(intRec, eventType, firstEntry, 1);`
`116`	`118`	`}`