Merge pull request #829 in B2/basf2 from bugfix/BII-9262-channel-masking-release-06-00 to release/06-00

* commit 'c0bd9e674a7f93634c555ee130b95ad2d74791da':
  Fixing channel masking

Author: GiacomoXT

top/modules/TOPChannelMasker/src/TOPChannelMaskerModule.cc

@@ -8,6 +8,7 @@
 
 #include <top/modules/TOPChannelMasker/TOPChannelMaskerModule.h>
 #include <top/reconstruction_cpp/TOPRecoManager.h>
+#include <top/geometry/TOPGeometryPar.h>
 
 using namespace std;
 
@@ -116,17 +117,32 @@ namespace Belle2 {
           digit.getHitQuality() == TOPDigit::c_Uncalibrated) {
         digit.setHitQuality(TOPDigit::c_Good);
       }
-      // skip digit if not c_Good
       if (digit.getHitQuality() != TOPDigit::c_Good) continue;
+
       // now do the new masking of c_Good
-      if (not m_channelMask->isActive(digit.getModuleID(), digit.getChannel())) {
+      auto slotID = digit.getModuleID();
+      auto channel = digit.getChannel();
+      if (not m_channelMask->isActive(slotID, channel)) {
         digit.setHitQuality(TOPDigit::c_Masked);
+        continue;
       }
-      if (m_maskUncalibratedChannelT0 and not digit.isChannelT0Calibrated()) {
+      if (m_maskUncalibratedChannelT0 and not m_channelT0->isCalibrated(slotID, channel)) {
         digit.setHitQuality(TOPDigit::c_Uncalibrated);
+        continue;
       }
-      if (m_maskUncalibratedTimebase and not digit.isTimeBaseCalibrated()) {
-        digit.setHitQuality(TOPDigit::c_Uncalibrated);
+      if (m_maskUncalibratedTimebase) {
+        const auto& fe_mapper = TOPGeometryPar::Instance()->getFrontEndMapper();
+        const auto* fe = fe_mapper.getMap(slotID, channel / 128);
+        if (not fe) {
+          B2ERROR("No front-end map found" << LogVar("slotID", slotID) << LogVar("channel", channel));
+          digit.setHitQuality(TOPDigit::c_Uncalibrated);
+          continue;
+        }
+        auto scrodID = fe->getScrodID();
+        const auto* sampleTimes = m_timebase->getSampleTimes(scrodID, channel);
+        if (not sampleTimes->isCalibrated()) {
+          digit.setHitQuality(TOPDigit::c_Uncalibrated);
+        }
       }
     }