[MCH] use DsIndex type for DS indices (#12883)

Author: pillot

Detectors/MUON/MCH/GlobalMapping/include/MCHGlobalMapping/Mapper.h

@@ -22,7 +22,7 @@
 namespace o2::mch::dcs
 {
 /** get the list of dual sampa indices corresponding to a given DCS Alias */
-std::set<int> aliasToDsIndices(std::string_view alias);
+std::set<DsIndex> aliasToDsIndices(std::string_view alias);
 
 /** get indices of all dual sampas of a set of cathodes (={deId,plane}).
  * returned set might be empty if input Cathodes are not valid ones. */

Detectors/MUON/MCH/GlobalMapping/src/HV.cxx

@@ -14,7 +14,6 @@
 #include "MCHConditions/Chamber.h"
 #include "MCHConditions/DetectionElement.h"
 #include "MCHConditions/Number.h"
-#include "MCHGlobalMapping/DsIndex.h"
 #include "MCHMappingInterface/Segmentation.h"
 #include "MCHRawElecMap/DsDetId.h"
 #include "MCHRawElecMap/Mapper.h"
@@ -37,13 +36,13 @@ double findXmean(const o2::mch::mapping::Segmentation& seg, int dsId)
   return xmean / n;
 }
 
-std::set<int> hvAliasToDsIndices(std::string_view alias)
+std::set<DsIndex> hvAliasToDsIndices(std::string_view alias)
 {
   const auto chamber = aliasToChamber(alias);
   bool slat = isSlat(chamber);
   int deId = aliasToDetElemId(alias).value();
-  std::set<int> indices;
-  for (auto dsIndex = 0; dsIndex < o2::mch::NumberOfDualSampas; ++dsIndex) {
+  std::set<DsIndex> indices;
+  for (DsIndex dsIndex = 0; dsIndex < o2::mch::NumberOfDualSampas; ++dsIndex) {
     const auto& dd = getDsDetId(dsIndex);
     if (dd.deId() != deId) {
       continue;

Detectors/MUON/MCH/GlobalMapping/src/HV.h

@@ -15,9 +15,11 @@
 #include <set>
 #include <string>
 
+#include "MCHGlobalMapping/DsIndex.h"
+
 namespace o2::mch::dcs
 {
-std::set<int> hvAliasToDsIndices(std::string_view alias);
+std::set<DsIndex> hvAliasToDsIndices(std::string_view alias);
 }
 
 #endif

Detectors/MUON/MCH/GlobalMapping/src/LV.cxx

@@ -15,7 +15,6 @@
 #include "MCHConditions/Chamber.h"
 #include "MCHConditions/Plane.h"
 #include "MCHConstants/DetectionElements.h"
-#include "MCHGlobalMapping/DsIndex.h"
 #include "MCHRawElecMap/Mapper.h"
 #include "Quadrant.h"
 #include "Slat.h"
@@ -33,10 +32,10 @@ std::set<Cathode> lvAliasToCathode(std::string_view alias)
   }
 }
 
-std::set<int> lvAliasToDsIndices(std::string_view alias)
+std::set<DsIndex> lvAliasToDsIndices(std::string_view alias)
 {
   auto cathodes = lvAliasToCathode(alias);
-  std::set<int> dsIndices;
+  std::set<DsIndex> dsIndices;
   for (auto cathode : cathodes) {
     auto deId = cathode.deId;
     auto plane = cathode.plane;

Detectors/MUON/MCH/GlobalMapping/src/LV.h

@@ -15,9 +15,11 @@
 #include <set>
 #include <string>
 
+#include "MCHGlobalMapping/DsIndex.h"
+
 namespace o2::mch::dcs
 {
-std::set<int> lvAliasToDsIndices(std::string_view alias);
+std::set<DsIndex> lvAliasToDsIndices(std::string_view alias);
 }
 
 #endif

Detectors/MUON/MCH/GlobalMapping/src/Mapper.cxx

@@ -28,7 +28,7 @@
 namespace o2::mch::dcs
 {
 
-std::set<int> solarAliasToDsIndices(std::string_view alias)
+std::set<DsIndex> solarAliasToDsIndices(std::string_view alias)
 {
   const auto chamber = aliasToChamber(alias);
   if (dcs::isQuadrant(chamber)) {
@@ -38,7 +38,7 @@ std::set<int> solarAliasToDsIndices(std::string_view alias)
   }
 }
 
-std::set<int> aliasToDsIndices(std::string_view alias)
+std::set<DsIndex> aliasToDsIndices(std::string_view alias)
 {
   auto m = aliasToMeasurementType(alias);
   switch (m) {

Detectors/MUON/MCH/GlobalMapping/src/Quadrant.cxx

@@ -90,7 +90,7 @@ Cathode lvAliasToCathode(std::string_view alias)
   }
 }
 
-std::set<int> solarAliasToDsIndices(std::string_view alias)
+std::set<DsIndex> solarAliasToDsIndices(std::string_view alias)
 {
   /** For St12, to get the solar alias to dual sampas relationship
    * we "just" have to convert the solar crate number to a LV

Detectors/MUON/MCH/GlobalMapping/src/Quadrant.h

@@ -13,13 +13,14 @@
 #define O2_MCH_GLOBAL_MAPPING_QUADRANT_H
 
 #include "MCHConditions/Cathode.h"
+#include "MCHGlobalMapping/DsIndex.h"
 #include <set>
 #include <string>
 
 namespace o2::mch::dcs::quadrant
 {
 Cathode lvAliasToCathode(std::string_view alias);
-std::set<int> solarAliasToDsIndices(std::string_view alias);
+std::set<DsIndex> solarAliasToDsIndices(std::string_view alias);
 } // namespace o2::mch::dcs::quadrant
 
 #endif

Detectors/MUON/MCH/GlobalMapping/src/Slat.cxx

@@ -12,7 +12,6 @@
 #include "MCHConditions/DetectionElement.h"
 #include "MCHConditions/Number.h"
 #include "MCHConditions/SolarCrate.h"
-#include "MCHGlobalMapping/DsIndex.h"
 #include "MCHRawElecMap/Mapper.h"
 #include "Slat.h"
 #include <vector>
@@ -74,7 +73,7 @@ std::set<dcs::Cathode> lvAliasToCathode(std::string_view alias)
   return cathodes;
 }
 
-std::set<int> solarAliasToDsIndices(std::string_view alias)
+std::set<DsIndex> solarAliasToDsIndices(std::string_view alias)
 {
   /** For St345 the relation solar alias to dual sampas
    * is a bit more involved than for quadrants.
@@ -85,7 +84,7 @@ std::set<int> solarAliasToDsIndices(std::string_view alias)
    */
   int solarCrate = aliasToSolarCrate(alias);
   static auto solarIds = raw::getSolarUIDs<raw::ElectronicMapperGenerated>();
-  std::set<int> dsIndices;
+  std::set<DsIndex> dsIndices;
   for (auto solarId : solarIds) {
     if (solarId / 8 == solarCrate) {
       auto dsDetIds = raw::getDualSampas<raw::ElectronicMapperGenerated>(solarId);

Detectors/MUON/MCH/GlobalMapping/src/Slat.h

@@ -12,14 +12,15 @@
 #ifndef O2_MCH_GLOBAL_MAPPING_SLAT_H
 #define O2_MCH_GLOBAL_MAPPING_SLAT_H
 
-#include <set>
 #include "MCHConditions/Cathode.h"
+#include "MCHGlobalMapping/DsIndex.h"
+#include <set>
 #include <string>
 
 namespace o2::mch::dcs::slat
 {
 std::set<dcs::Cathode> lvAliasToCathode(std::string_view alias);
-std::set<int> solarAliasToDsIndices(std::string_view alias);
+std::set<DsIndex> solarAliasToDsIndices(std::string_view alias);
 } // namespace o2::mch::dcs::slat
 
 #endif