Use rejectlist in MID hit map builder

Author: dstocco

Detectors/MUON/MID/Tracking/include/MIDTracking/HitMapBuilder.h

@@ -55,7 +55,8 @@ class HitMapBuilder
 
   /// Sets the masked channels
   /// \param maskedChannels vector of masked channels
-  void setMaskedChannels(const std::vector<ColumnData>& maskedChannels);
+  /// \param clear clear the current masks
+  void setMaskedChannels(const std::vector<ColumnData>& maskedChannels, bool clear);
 
  private:
   /// Checks if the track crossed the same element

Detectors/MUON/MID/Tracking/src/HitMapBuilder.cxx

@@ -23,9 +23,11 @@ namespace mid
 
 HitMapBuilder::HitMapBuilder(const GeometryTransformer& geoTrans) : mMapping(), mHitFinder(geoTrans) {}
 
-void HitMapBuilder::setMaskedChannels(const std::vector<ColumnData>& maskedChannels)
+void HitMapBuilder::setMaskedChannels(const std::vector<ColumnData>& maskedChannels, bool clear)
 {
-  mMaskedChannels.clear();
+  if (clear) {
+    mMaskedChannels.clear();
+  }
   std::array<int, 2> nLines{4, 1};
   for (auto& mask : maskedChannels) {
     for (int icath = 0; icath < 2; ++icath) {

Detectors/MUON/MID/Workflow/src/TrackerSpec.cxx

@@ -102,15 +102,25 @@ class TrackerDeviceDPL
 
   void finaliseCCDB(o2::framework::ConcreteDataMatcher& matcher, void* obj)
   {
-    if (mCheckMasked && matcher == of::ConcreteDataMatcher(header::gDataOriginMID, "MASKED_CHANNELS", 0)) {
-      LOG(info) << "Update MID_MASKED_CHANNELS";
-      auto* badChannels = static_cast<std::vector<ColumnData>*>(obj);
-      mHitMapBuilder->setMaskedChannels(*badChannels);
-      return;
-    }
     if (o2::base::GRPGeomHelper::instance().finaliseCCDB(matcher, obj)) {
       return;
     }
+    if (mCheckMasked) {
+      bool rebuildMaskedChannels = false;
+      if (matcher == of::ConcreteDataMatcher(header::gDataOriginMID, "BAD_CH_TRK", 0)) {
+        LOG(info) << "Update MID_BAD_CH_TRK";
+        mBadChannels = *static_cast<std::vector<ColumnData>*>(obj);
+        rebuildMaskedChannels = true;
+      } else if (matcher == of::ConcreteDataMatcher(header::gDataOriginMID, "REJECTLIST_TRK", 0)) {
+        LOG(info) << "Update MID_REJECTLIST_TRK";
+        mRejectList = *static_cast<std::vector<ColumnData>*>(obj);
+        rebuildMaskedChannels = true;
+      }
+      if (rebuildMaskedChannels) {
+        mHitMapBuilder->setMaskedChannels(mBadChannels, true);
+        mHitMapBuilder->setMaskedChannels(mRejectList, false);
+      }
+    }
   }
 
  private:
@@ -129,6 +139,7 @@ class TrackerDeviceDPL
       mHitMapBuilder = std::make_unique<HitMapBuilder>(geoTrans);
     }
     pc.inputs().get<std::vector<ColumnData>*>("mid_bad_channels_forTracks");
+    pc.inputs().get<std::vector<ColumnData>*>("mid_rejectlist_forTracks");
   }
 
   bool mIsMC = false;
@@ -142,14 +153,17 @@ class TrackerDeviceDPL
   std::chrono::duration<double> mTimerTracker{0}; ///< tracker timer
   std::chrono::duration<double> mTimerBuilder{0}; ///< hit map builder timer
   unsigned int mNROFs{0};                         /// Total number of processed ROFs
+  std::vector<ColumnData> mBadChannels{};         ///< Bad channels
+  std::vector<ColumnData> mRejectList{};          ///< Reject list
 };
 
 framework::DataProcessorSpec getTrackerSpec(bool isMC, bool checkMasked)
 {
   std::vector<of::InputSpec> inputSpecs;
   inputSpecs.emplace_back("mid_clusters", header::gDataOriginMID, "CLUSTERS");
   inputSpecs.emplace_back("mid_clusters_rof", header::gDataOriginMID, "CLUSTERSROF");
-  inputSpecs.emplace_back("mid_bad_channels_forTracks", header::gDataOriginMID, "MASKED_CHANNELS", 0, of::Lifetime::Condition, of::ccdbParamSpec("MID/Calib/BadChannels"));
+  inputSpecs.emplace_back("mid_bad_channels_forTracks", header::gDataOriginMID, "BAD_CH_TRK", 0, of::Lifetime::Condition, of::ccdbParamSpec("MID/Calib/BadChannels"));
+  inputSpecs.emplace_back("mid_rejectlist_forTracks", header::gDataOriginMID, "REJECTLIST_TRK", 0, of::Lifetime::Condition, of::ccdbParamSpec("MID/Calib/RejectList"));
   auto ggRequest = std::make_shared<o2::base::GRPGeomRequest>(false,                             // orbitResetTime
                                                               false,                             // GRPECS=true
                                                               false,                             // GRPLHCIF