new options to add channels from DE Ids and HV/LV DCS aliases (#13034)

Author: pillot

Detectors/MUON/MCH/Conditions/README.md

@@ -21,7 +21,7 @@ The BadChannel and RejectList objects can be uploaded, e.g. for debug purposes,
 
 ```shell
 $ o2-mch-bad-channels-ccdb --help
-This program dump MCH bad channels CCDB object
+This program get/set MCH bad channels CCDB object
 Usage:
   -h [ --help ]                         produce help message
   -c [ --ccdb ] arg (=http://localhost:6464)
@@ -37,12 +37,15 @@ Usage:
   -q [ --query ]                        dump bad channel object from CCDB
   -v [ --verbose ]                      verbose output
   -s [ --solar ] arg                    solar ids to reject
+  -d [ --ds ] arg                       dual sampas indices to reject
+  -e [ --de ] arg                       DE ids to reject
+  -a [ --alias ] arg                    DCS alias (HV or LV) to reject
 
 ```
 
 For instance, to create a debug RejectList object which declares solar number 32 as bad within a local CCDB, from Tuesday 1 November 2022 00:00:01 UTC to Saturday 31 December 2022 23:59:59, use :
 
 ```shell
 $ o2-mch-bad-channels-ccdb -p -s 32 -t RejectList --starttimestamp 1667260801000 --endtimestamp 1672531199000
-storing default MCH bad channels (valid from 1667260801000to 1672531199000) to MCH/Calib/RejectList
+storing default MCH bad channels (valid from 1667260801000 to 1672531199000) to MCH/Calib/RejectList
 ```

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

@@ -17,9 +17,12 @@
 #include <string>
 #include <vector>
 #include "DataFormatsMCH/DsChannelId.h"
-#include "MCHRawElecMap/Mapper.h"
-#include "MCHMappingInterface/Segmentation.h"
+#include "MCHConditions/DCSAliases.h"
+#include "MCHConstants/DetectionElements.h"
 #include "MCHGlobalMapping/DsIndex.h"
+#include "MCHGlobalMapping/Mapper.h"
+#include "MCHMappingInterface/Segmentation.h"
+#include "MCHRawElecMap/Mapper.h"
 
 namespace po = boost::program_options;
 
@@ -46,50 +49,81 @@ void queryBadChannels(const std::string ccdbUrl,
   }
 }
 
-void uploadBadChannels(const std::string ccdbUrl,
-                       const std::string badChannelType,
-                       uint64_t startTimestamp,
-                       uint64_t endTimestamp,
-                       std::vector<uint16_t> solarsToReject,
-                       std::vector<uint16_t> dsToReject,
-                       bool makeDefault)
+void rejectDS(const o2::mch::raw::DsDetId& dsDetId, BadChannelsVector& bv)
 {
-  BadChannelsVector bv;
-
-  auto det2elec = o2::mch::raw::createDet2ElecMapper<o2::mch::raw::ElectronicMapperGenerated>();
+  static auto det2elec = o2::mch::raw::createDet2ElecMapper<o2::mch::raw::ElectronicMapperGenerated>();
+  const auto& seg = o2::mch::mapping::segmentation(dsDetId.deId());
+  auto dsElecId = det2elec(dsDetId);
+  seg.forEachPadInDualSampa(dsDetId.dsId(), [&](int pad) {
+    uint8_t channel = seg.padDualSampaChannel(pad);
+    const auto c = o2::mch::DsChannelId(dsElecId->solarId(), dsElecId->elinkId(), channel);
+    bv.emplace_back(c);
+  });
+}
 
-  for (auto solar : solarsToReject) {
+void rejectSolars(const std::vector<uint16_t> solarIds, BadChannelsVector& bv)
+{
+  for (auto solar : solarIds) {
     auto ds = o2::mch::raw::getDualSampas<o2::mch::raw::ElectronicMapperGenerated>(solar);
     for (const auto& dsDetId : 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(solar, dsElecId->elinkId(), channel);
-          bv.emplace_back(c);
-        }
-      }
+      rejectDS(dsDetId, bv);
     }
   }
+}
 
-  for (auto ds : dsToReject) {
+void rejectDSs(const std::vector<uint16_t> dsIdxs, BadChannelsVector& bv)
+{
+  for (auto ds : dsIdxs) {
     if (ds >= o2::mch::NumberOfDualSampas) {
-      std::cout << "Error: invalid DS index" << std::endl;
+      std::cout << "Error: invalid DS index " << ds << 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);
-      }
+    rejectDS(dsDetId, bv);
+  }
+}
+
+void rejectHVLVs(const std::vector<std::string> dcsAliases, BadChannelsVector& bv)
+{
+  for (auto alias : dcsAliases) {
+    if (!o2::mch::dcs::isValid(alias)) {
+      std::cout << "Error: invalid alias " << alias << std::endl;
+      continue;
+    }
+    for (auto ds : o2::mch::dcs::aliasToDsIndices(alias)) {
+      o2::mch::raw::DsDetId dsDetId = o2::mch::getDsDetId(ds);
+      rejectDS(dsDetId, bv);
     }
   }
+}
+
+void rejectDEs(const std::vector<uint16_t> deIds, BadChannelsVector& bv)
+{
+  static auto det2elec = o2::mch::raw::createDet2ElecMapper<o2::mch::raw::ElectronicMapperGenerated>();
+  for (auto de : deIds) {
+    if (!o2::mch::constants::isValidDetElemId(de)) {
+      std::cout << "Error: invalid DE ID " << de << std::endl;
+      continue;
+    }
+    const auto& seg = o2::mch::mapping::segmentation(de);
+    seg.forEachPad([&](int pad) {
+      auto ds = seg.padDualSampaId(pad);
+      o2::mch::raw::DsDetId dsDetId(de, ds);
+      auto dsElecId = det2elec(dsDetId);
+      uint8_t channel = seg.padDualSampaChannel(pad);
+      const auto c = o2::mch::DsChannelId(dsElecId->solarId(), dsElecId->elinkId(), channel);
+      bv.emplace_back(c);
+    });
+  }
+}
 
+void uploadBadChannels(const std::string ccdbUrl,
+                       const std::string badChannelType,
+                       uint64_t startTimestamp,
+                       uint64_t endTimestamp,
+                       const BadChannelsVector& bv,
+                       bool makeDefault)
+{
   o2::ccdb::CcdbApi api;
   api.init(ccdbUrl);
   std::map<std::string, std::string> md;
@@ -139,7 +173,9 @@ 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")
+      ("ds,d", po::value<std::vector<uint16_t>>()->multitoken(), "dual sampas indices to reject")
+      ("de,e", po::value<std::vector<uint16_t>>()->multitoken(), "DE ids to reject")
+      ("alias,a", po::value<std::vector<std::string>>()->multitoken(), "DCS alias (HV or LV) to reject")
         ;
   // clang-format on
 
@@ -171,16 +207,21 @@ int main(int argc, char** argv)
   }
 
   if (put) {
-    std::vector<uint16_t> solarsToReject;
-    std::vector<uint16_t> dsToReject;
+    BadChannelsVector bv;
     if (vm.count("solar")) {
-      solarsToReject = vm["solar"].as<std::vector<uint16_t>>();
+      rejectSolars(vm["solar"].as<std::vector<uint16_t>>(), bv);
+    }
+    if (vm.count("ds")) {
+      rejectDSs(vm["ds"].as<std::vector<uint16_t>>(), bv);
+    }
+    if (vm.count("de")) {
+      rejectDEs(vm["de"].as<std::vector<uint16_t>>(), bv);
     }
-    if (vm.count("dsToReject")) {
-      dsToReject = vm["dsToReject"].as<std::vector<uint16_t>>();
+    if (vm.count("alias")) {
+      rejectHVLVs(vm["alias"].as<std::vector<std::string>>(), bv);
     }
 
-    uploadBadChannels(ccdbUrl, badChannelType, startTimestamp, endTimestamp, solarsToReject, dsToReject, uploadDefault);
+    uploadBadChannels(ccdbUrl, badChannelType, startTimestamp, endTimestamp, bv, uploadDefault);
   }
   return 0;
 }