Set ITS/MFT global chip ID during decoding

shahor02 · shahor02 · commit aed1af5426f6 · 2020-11-03T19:30:34.000+01:00
diff --git a/Detectors/ITSMFT/common/reconstruction/include/ITSMFTReconstruction/AlpideCoder.h b/Detectors/ITSMFT/common/reconstruction/include/ITSMFTReconstruction/AlpideCoder.h
@@ -118,8 +118,8 @@ class AlpideCoder
   static void setNoiseThreshold(int t) { mNoiseThreshold = t; }
 
   /// decode alpide data for the next non-empty chip from the buffer
-  template <class T>
-  static int decodeChip(ChipPixelData& chipData, T& buffer)
+  template <class T, typename CG>
+  static int decodeChip(ChipPixelData& chipData, T& buffer, CG cidGetter)
   {
     // read record for single non-empty chip, updating on change module and cycle.
     // return number of records filled (>0), EOFFlag or Error
@@ -141,7 +141,7 @@ class AlpideCoder
       uint8_t dataCM = dataC & (~MaskChipID);
       //
       if ((expectInp & ExpectChipEmpty) && dataCM == CHIPEMPTY) { // empty chip was expected
-        //chipData.setChipID(dataC & MaskChipID);                   // here we set the chip ID within the module // now set upstream
+        chipData.setChipID(cidGetter(dataC & MaskChipID));        // here we set the global chip ID
         if (!buffer.next(timestamp)) {
 #ifdef ALPIDE_DECODING_STAT
           chipData.setError(ChipStat::TruncatedChipEmpty);
@@ -153,7 +153,7 @@ class AlpideCoder
       }
 
       if ((expectInp & ExpectChipHeader) && dataCM == CHIPHEADER) { // chip header was expected
-        //chipData.setChipID(dataC & MaskChipID);                     // here we set the chip ID within the module // now set upstream
+        chipData.setChipID(cidGetter(dataC & MaskChipID));          // here we set the global chip ID
         if (!buffer.next(timestamp)) {
 #ifdef ALPIDE_DECODING_STAT
           chipData.setError(ChipStat::TruncatedChipHeader);
diff --git a/Detectors/ITSMFT/common/reconstruction/include/ITSMFTReconstruction/RUDecodeData.h b/Detectors/ITSMFT/common/reconstruction/include/ITSMFTReconstruction/RUDecodeData.h
@@ -73,26 +73,18 @@ int RUDecodeData::decodeROF(const Mapping& mp)
     if (!cableData[icab].getSize()) {
       continue;
     }
-    int cid = AlpideCoder::getChipID(cableData[icab]);
-    if (cid < 0) {
-      continue;
-    }
-    chipData->setChipID(mp.getGlobalChipID(cid, cableHWID[icab], *ruInfo));
-    while (AlpideCoder::decodeChip(*chipData, cableData[icab]) || chipData->isErrorSet()) { // we register only chips with hits or errors flags set
-      // convert HW chip id within the module to absolute chip id
-      //chipData->setChipID(mp.getGlobalChipID(chipData->getChipID(), cableHWID[icab], *ruInfo));
+    auto cabHW = cableHWID[icab];
+    auto chIdGetter = [this, &mp, cabHW](int cid) {
+      return mp.getGlobalChipID(cid, cabHW, *this->ruInfo);
+    };
+    while (AlpideCoder::decodeChip(*chipData, cableData[icab], chIdGetter) || chipData->isErrorSet()) { // we register only chips with hits or errors flags set
       setROFInfo(chipData, cableLinkPtr[icab]);
       ntot += chipData->getData().size();
 #ifdef ALPIDE_DECODING_STAT
       fillChipStatistics(icab, chipData);
 #endif
       if (++nChipsFired < chipsData.size()) { // fetch next free chip
         chipData = &chipsData[nChipsFired];
-        cid = AlpideCoder::getChipID(cableData[icab]);
-        if (cid < 0) {
-          continue;
-        }
-        chipData->setChipID(mp.getGlobalChipID(cid, cableHWID[icab], *ruInfo));
       } else {
         break; // last chip decoded
       }
diff --git a/Detectors/ITSMFT/common/reconstruction/include/ITSMFTReconstruction/RawPixelReader.h b/Detectors/ITSMFT/common/reconstruction/include/ITSMFTReconstruction/RawPixelReader.h
@@ -1256,8 +1256,12 @@ class RawPixelReader : public PixelReader
         RDHUtils::printRDH(reinterpret_cast<const o2::header::RAWDataHeader*>(getGBTLink(decData.links[decData.cableLinkID[icab]])->lastRDH));
       }
 #endif
-
-      while ((res = mCoder.decodeChip(*chipData, cableData))) { // we register only chips with hits or errors flags set
+      auto cabHW = decData.cableHWID[icab];
+      auto ri = decData.ruInfo;
+      auto chIdGetter = [this, cabHW, ri](int cid) {
+        return this->mMAP.getGlobalChipID(cid, cabHW, *ri);
+      };
+      while ((res = mCoder.decodeChip(*chipData, cableData, chIdGetter))) { // we register only chips with hits or errors flags set
         if (res > 0) {
 #ifdef _RAW_READER_ERROR_CHECKS_
           // for the IB staves check if the cable ID is the same as the chip ID on the module
@@ -1271,7 +1275,7 @@ class RawPixelReader : public PixelReader
           }
 #endif
           // convert HW chip id within the module to absolute chip id
-          chipData->setChipID(mMAP.getGlobalChipID(chipData->getChipID(), decData.cableHWID[icab], *decData.ruInfo));
+          // chipData->setChipID(mMAP.getGlobalChipID(chipData->getChipID(), decData.cableHWID[icab], *decData.ruInfo));
           chipData->setInteractionRecord(mInteractionRecord);
           chipData->setTrigger(mTrigger);
           mDecodingStat.nNonEmptyChips++;
