Fixed cases when nROFs could be calculated wrongly

Author: JianLIUhep

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

@@ -120,6 +120,7 @@ class RawPixelDecoder final : public PixelReader
 
   void setSkipRampUpData(bool v = true) { mSkipRampUpData = v; }
   bool getSkipRampUpData() const { return mSkipRampUpData; }
+  auto getNROFsProcessed() const { return mROFCounter; }
 
   struct LinkEntry {
     int entry = -1;

Detectors/ITSMFT/common/reconstruction/src/RawPixelDecoder.cxx

@@ -95,6 +95,8 @@ int RawPixelDecoder<Mapping>::decodeNextTrigger()
       collectROFCableData(iru);
     }
 
+    mROFCounter++;
+
     if (!doIRMajorityPoll()) {
       continue; // no links with data
     }
@@ -114,7 +116,6 @@ int RawPixelDecoder<Mapping>::decodeNextTrigger()
 
     if (mNChipsFiredROF || (mAlloEmptyROFs && mNLinksDone < mNLinksInTF)) { // fill some statistics
       mTrigger = mLinkForTriggers ? mLinkForTriggers->trigger : 0;
-      mROFCounter++;
       mNChipsFired += mNChipsFiredROF;
       mNPixelsFired += mNPixelsFiredROF;
       mCurRUDecodeID = 0; // getNextChipData will start from here

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

@@ -159,14 +159,15 @@ void STFDecoder<Mapping>::run(ProcessingContext& pc)
 
     mDecoder->setDecodeNextAuto(false);
     o2::InteractionRecord lastIR{}, firstIR{0, pc.services().get<o2::framework::TimingInfo>().firstTForbit};
-    int nTriggersProcessed = 0;
+    int nTriggersProcessed = mDecoder->getNROFsProcessed();
     while (mDecoder->decodeNextTrigger() >= 0) {
       if ((!lastIR.isDummy() && lastIR >= mDecoder->getInteractionRecord()) || firstIR > mDecoder->getInteractionRecord()) {
         const int MaxErrLog = 2;
         static int errLocCount = 0;
         if (errLocCount++ < MaxErrLog) {
           LOGP(warn, "Impossible ROF IR {}, previous was {}, TF 1st IR was {}, discarding in decoding", mDecoder->getInteractionRecord().asString(), lastIR.asString(), firstIR.asString());
         }
+        nTriggersProcessed = 0x7fffffff; // to account for a problem with event
         continue;
       }
       lastIR = mDecoder->getInteractionRecord();
@@ -182,8 +183,8 @@ void STFDecoder<Mapping>::run(ProcessingContext& pc)
       if (mDoClusters && !mClusterer->getMaxROFDepthToSquash()) { // !!! THREADS !!!
         mClusterer->process(mNThreads, *mDecoder.get(), &clusCompVec, mDoPatterns ? &clusPattVec : nullptr, &clusROFVec);
       }
-      nTriggersProcessed++;
     }
+    nTriggersProcessed = mDecoder->getNROFsProcessed() - nTriggersProcessed - 1;
 
     const auto& alpParams = o2::itsmft::DPLAlpideParam<o2::detectors::DetID::ITS>::Instance();
     int expectedTFSize = static_cast<int>(o2::constants::lhc::LHCMaxBunches * o2::base::GRPGeomHelper::instance().getGRPECS()->getNHBFPerTF() / alpParams.roFrameLengthInBC); // 3564*32 / ROF Length in BS = number of ROFs per TF