Account EmptyChips in active chips status

Author: shahor02

Detectors/ITSMFT/common/reconstruction/include/ITSMFTReconstruction/AlpideCoder.h

@@ -122,7 +122,7 @@ class AlpideCoder
 
   /// decode alpide data for the next non-empty chip from the buffer
   template <class T, typename CG>
-  static int decodeChip(ChipPixelData& chipData, T& buffer, CG cidGetter)
+  static int decodeChip(ChipPixelData& chipData, T& buffer, std::vector<uint16_t>& seenChips, CG cidGetter)
   {
     // read record for single non-empty chip, updating on change module and cycle.
     // return number of records filled (>0), EOFFlag or Error
@@ -198,6 +198,7 @@ class AlpideCoder
 #endif
           return unexpectedEOF("CHIP_EMPTY:Timestamp"); // abandon cable data
         }
+        seenChips.push_back(chipIDGlo);
         chipData.resetChipID();
         expectInp = ExpectChipHeader | ExpectChipEmpty;
         continue;
@@ -438,6 +439,9 @@ class AlpideCoder
         prevPix = currPix++;
       }
     }
+    if (chipData.getData().size()) {
+      seenChips.push_back(chipData.getChipID());
+    }
     return chipData.getData().size();
   }
 

Detectors/ITSMFT/common/reconstruction/include/ITSMFTReconstruction/RUDecodeData.h

@@ -36,6 +36,7 @@ struct RUDecodeData {
 
   std::array<PayLoadCont, MaxCablesPerRU> cableData{};     // cable data in compressed ALPIDE format
   std::vector<o2::itsmft::ChipPixelData> chipsData{};      // fully decoded data in 1st nChipsFired chips
+  std::vector<uint16_t> seenChipIDs{};                     // IDs of all chips seen during ROF decoding, including empty ones
   std::array<int, MaxLinksPerRU> links{};                  // link entry RSTODO: consider removing this and using pointer
   std::array<uint8_t, MaxCablesPerRU> cableHWID{};         // HW ID of cable whose data is in the corresponding slot of cableData
   std::array<uint8_t, MaxCablesPerRU> cableLinkID{};       // ID of the GBT link transmitting this cable data
@@ -79,6 +80,7 @@ int RUDecodeData::decodeROF(const Mapping& mp, const o2::InteractionRecord ir)
 
   std::array<bool, Mapping::getNChips()> doneChips{};
   auto* chipData = &chipsData[0];
+  seenChipIDs.clear();
   for (int icab = 0; icab < ruInfo->nCables; icab++) { // cableData is ordered in such a way to have chipIDs in increasing order
     if (!cableData[icab].getSize()) {
       continue;
@@ -95,7 +97,7 @@ int RUDecodeData::decodeROF(const Mapping& mp, const o2::InteractionRecord ir)
     int ret = 0;
     // dumpcabledata(icab);
 
-    while ((ret = AlpideCoder::decodeChip(*chipData, cableData[icab], chIdGetter)) || chipData->isErrorSet()) { // we register only chips with hits or errors flags set
+    while ((ret = AlpideCoder::decodeChip(*chipData, cableData[icab], seenChipIDs, chIdGetter)) || chipData->isErrorSet()) { // we register only chips with hits or errors flags set
       setROFInfo(chipData, cableLinkPtr[icab]);
       auto nhits = chipData->getData().size();
       if (nhits && doneChips[chipData->getChipID()]) {

Detectors/ITSMFT/common/reconstruction/include/ITSMFTReconstruction/RawPixelDecoder.h

@@ -60,8 +60,8 @@ class RawPixelDecoder final : public PixelReader
   void collectROFCableData(int iru);
   int decodeNextTrigger() final;
 
-  template <class DigitContainer, class ROFContainer, class STATVEC>
-  int fillDecodedDigits(DigitContainer& digits, ROFContainer& rofs, STATVEC& chipStatus);
+  template <class DigitContainer, class ROFContainer>
+  int fillDecodedDigits(DigitContainer& digits, ROFContainer& rofs);
 
   template <class STATVEC>
   void fillChipsStatus(STATVEC& chipStatus);
@@ -128,6 +128,7 @@ class RawPixelDecoder final : public PixelReader
 
   uint16_t getSquashingDepth() { return 0; }
   bool doIRMajorityPoll();
+  bool isRampUpStage() const { return mROFRampUpStage; }
   void reset();
 
  private:
@@ -179,8 +180,8 @@ class RawPixelDecoder final : public PixelReader
 ///______________________________________________________________
 /// Fill decoded digits to global vector
 template <class Mapping>
-template <class DigitContainer, class ROFContainer, class STATVEC>
-int RawPixelDecoder<Mapping>::fillDecodedDigits(DigitContainer& digits, ROFContainer& rofs, STATVEC& chipStatus)
+template <class DigitContainer, class ROFContainer>
+int RawPixelDecoder<Mapping>::fillDecodedDigits(DigitContainer& digits, ROFContainer& rofs)
 {
   if (mInteractionRecord.isDummy()) {
     return 0; // nothing was decoded
@@ -190,7 +191,6 @@ int RawPixelDecoder<Mapping>::fillDecodedDigits(DigitContainer& digits, ROFConta
   for (unsigned int iru = 0; iru < mRUDecodeVec.size(); iru++) {
     for (int ic = 0; ic < mRUDecodeVec[iru].nChipsFired; ic++) {
       const auto& chip = mRUDecodeVec[iru].chipsData[ic];
-      chipStatus[chip.getChipID()] = 1;
       for (const auto& hit : mRUDecodeVec[iru].chipsData[ic].getData()) {
         digits.emplace_back(chip.getChipID(), hit.getRow(), hit.getCol());
       }
@@ -205,8 +205,8 @@ int RawPixelDecoder<Mapping>::fillDecodedDigits(DigitContainer& digits, ROFConta
 ///______________________________________________________________
 /// Fill decoded digits to global vector
 template <>
-template <class DigitContainer, class ROFContainer, class STATVEC>
-int RawPixelDecoder<ChipMappingMFT>::fillDecodedDigits(DigitContainer& digits, ROFContainer& rofs, STATVEC& chipStatus)
+template <class DigitContainer, class ROFContainer>
+int RawPixelDecoder<ChipMappingMFT>::fillDecodedDigits(DigitContainer& digits, ROFContainer& rofs)
 {
   if (mInteractionRecord.isDummy()) {
     return 0; // nothing was decoded
@@ -216,7 +216,6 @@ int RawPixelDecoder<ChipMappingMFT>::fillDecodedDigits(DigitContainer& digits, R
   for (auto chipData = mOrderedChipsPtr.rbegin(); chipData != mOrderedChipsPtr.rend(); ++chipData) {
     assert(mLastReadChipID < (*chipData)->getChipID());
     mLastReadChipID = (*chipData)->getChipID();
-    chipStatus[mLastReadChipID] = 1;
     for (const auto& hit : (*chipData)->getData()) {
       digits.emplace_back(mLastReadChipID, hit.getRow(), hit.getCol());
     }
@@ -233,13 +232,12 @@ template <class Mapping>
 template <class STATVEC>
 void RawPixelDecoder<Mapping>::fillChipsStatus(STATVEC& chipStatus)
 {
-  if (mInteractionRecord.isDummy()) {
+  if (mInteractionRecord.isDummy() || mROFRampUpStage) {
     return; // nothing was decoded
   }
   for (unsigned int iru = 0; iru < mRUDecodeVec.size(); iru++) {
-    for (int ic = 0; ic < mRUDecodeVec[iru].nChipsFired; ic++) {
-      const auto& chip = mRUDecodeVec[iru].chipsData[ic];
-      chipStatus[chip.getChipID()] = 1;
+    for (auto chID : mRUDecodeVec[iru].seenChipIDs) {
+      chipStatus[chID] = 1;
     }
   }
 }

Detectors/ITSMFT/common/reconstruction/include/ITSMFTReconstruction/RawPixelReader.h

@@ -1256,7 +1256,8 @@ class RawPixelReader : public PixelReader
       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
+      std::vector<uint16_t> dummyStat;
+      while ((res = mCoder.decodeChip(*chipData, cableData, dummyStat, 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

Detectors/ITSMFT/common/workflow/src/STFDecoderSpec.cxx

@@ -171,14 +171,12 @@ void STFDecoder<Mapping>::run(ProcessingContext& pc)
         continue;
       }
       lastIR = mDecoder->getInteractionRecord();
+      mDecoder->fillChipsStatus(chipStatus);
       if (mDoDigits || mClusterer->getMaxROFDepthToSquash()) {      // call before clusterization, since the latter will hide the digits
-        mDecoder->fillDecodedDigits(digVec, digROFVec, chipStatus); // lot of copying involved
-
+        mDecoder->fillDecodedDigits(digVec, digROFVec);             // lot of copying involved
         if (mDoCalibData) {
           mDecoder->fillCalibData(calVec);
         }
-      } else {
-        mDecoder->fillChipsStatus(chipStatus);
       }
       if (mDoClusters && !mClusterer->getMaxROFDepthToSquash()) { // !!! THREADS !!!
         mClusterer->process(mNThreads, *mDecoder.get(), &clusCompVec, mDoPatterns ? &clusPattVec : nullptr, &clusROFVec);