Update for MCH display and bad channel tagging (#12495)

Author: victorvalenciatorres

Detectors/MUON/MCH/Conditions/CMakeLists.txt

@@ -34,6 +34,7 @@ o2_add_executable(
     O2::Framework
     O2::MCHMappingImpl4
     O2::MCHRawElecMap
+    O2::MCHGlobalMapping
     )
 
 if(BUILD_TESTING)

Detectors/MUON/MCH/Conditions/src/bad-channels-ccdb.cxx

@@ -19,6 +19,7 @@
 #include "DataFormatsMCH/DsChannelId.h"
 #include "MCHRawElecMap/Mapper.h"
 #include "MCHMappingInterface/Segmentation.h"
+#include "MCHGlobalMapping/DsIndex.h"
 
 namespace po = boost::program_options;
 
@@ -50,6 +51,7 @@ void uploadBadChannels(const std::string ccdbUrl,
                        uint64_t startTimestamp,
                        uint64_t endTimestamp,
                        std::vector<uint16_t> solarsToReject,
+                       std::vector<uint16_t> dsToReject,
                        bool makeDefault)
 {
   BadChannelsVector bv;
@@ -71,12 +73,29 @@ void uploadBadChannels(const std::string ccdbUrl,
     }
   }
 
+  for (auto ds : dsToReject) {
+    if (ds >= o2::mch::NumberOfDualSampas) {
+      std::cout << "Error: invalid DS index" << std::endl;
+      continue;
+    }
+    o2::mch::raw::DsDetId dsDetId = o2::mch::getDsDetId(ds);
+    o2::mch::mapping::Segmentation seg(dsDetId.deId());
+    for (uint8_t channel = 0; channel < 64; channel++) {
+      auto dsElecId = det2elec(dsDetId);
+      auto padId = seg.findPadByFEE(dsDetId.dsId(), channel);
+      if (seg.isValid(padId)) {
+        const auto c = o2::mch::DsChannelId(dsElecId->solarId(), dsElecId->elinkId(), channel);
+        bv.emplace_back(c);
+      }
+    }
+  }
+
   o2::ccdb::CcdbApi api;
   api.init(ccdbUrl);
   std::map<std::string, std::string> md;
   auto dest = ccdbPath(badChannelType);
   std::cout << "storing default MCH bad channels (valid from "
-            << startTimestamp << "to " << endTimestamp << ") to "
+            << startTimestamp << " to " << endTimestamp << ") to "
             << dest << "\n";
 
   if (makeDefault) {
@@ -120,7 +139,8 @@ int main(int argc, char** argv)
       ("query,q",po::bool_switch(&query),"dump bad channel object from CCDB")
       ("verbose,v",po::bool_switch(&verbose),"verbose output")
       ("solar,s",po::value<std::vector<uint16_t>>()->multitoken(),"solar ids to reject")
-      ;
+      ("dsToReject,d", po::value<std::vector<uint16_t>>()->multitoken(), "dual sampas indices to reject")
+        ;
   // clang-format on
 
   po::options_description cmdline;
@@ -152,11 +172,15 @@ int main(int argc, char** argv)
 
   if (put) {
     std::vector<uint16_t> solarsToReject;
+    std::vector<uint16_t> dsToReject;
     if (vm.count("solar")) {
       solarsToReject = vm["solar"].as<std::vector<uint16_t>>();
     }
+    if (vm.count("dsToReject")) {
+      dsToReject = vm["dsToReject"].as<std::vector<uint16_t>>();
+    }
 
-    uploadBadChannels(ccdbUrl, badChannelType, startTimestamp, endTimestamp, solarsToReject, uploadDefault);
+    uploadBadChannels(ccdbUrl, badChannelType, startTimestamp, endTimestamp, solarsToReject, dsToReject, uploadDefault);
   }
   return 0;
 }

Detectors/MUON/MCH/Contour/include/MCHContour/SVGWriter.h

@@ -90,6 +90,29 @@ class SVGWriter
     }
   }
 
+  template <typename T>
+  void polygon(const o2::mch::contour::Polygon<T>& p, const std::string& fillColor)
+  {
+    // modification
+    mSVGBuffer << R"(<polygon fill=")" << fillColor << R"(" points=")";
+    auto vertices = getVertices(p);
+    for (auto j = 0; j < vertices.size(); ++j) {
+      auto v = vertices[j];
+      mSVGBuffer << v.x << "," << v.y << ' ';
+    }
+    mSVGBuffer << R"("/>)"
+               << "\n";
+  }
+
+  template <typename T>
+  void contour(const o2::mch::contour::Contour<T>& c, const std::string& color)
+  {
+
+    for (auto& p : c.getPolygons()) {
+      polygon(p, color);
+    }
+  }
+
   void points(const std::vector<std::pair<double, double>>& pts, double radius = 0.05)
   {
     for (auto& p : pts) {
@@ -104,8 +127,7 @@ class SVGWriter
 
   void writeSVG(std::ostream& os)
   {
-    os << boost::format(R"(<svg width="%d" height="%d" viewBox="%f %f %f %f">
-)") % mWidth %
+    os << boost::format(R"(<svg width="%d" height="%d" viewBox="%f %f %f %f">)") % mWidth %
             mHeight % mViewingBox.xmin() % mViewingBox.ymin() % mViewingBox.width() % mViewingBox.height();
 
     os << mSVGBuffer.str();