MacOS build failure: defininig constexpr arrays

Author: nicolovalle

Modules/ITS/include/ITS/ITSClusterTask.h

@@ -140,13 +140,13 @@ class ITSClusterTask : public TaskInterface
   int minColSpanLongCluster = 128; // driven by o2::itsmft::ClusterPattern::MaxColSpan = 128
   int maxRowSpanLongCluster = 29;
 
-  const int mNStaves[NLayer] = { 12, 16, 20, 24, 30, 42, 48 };
-  const int mNHicPerStave[NLayer] = { 1, 1, 1, 8, 8, 14, 14 };
-  const int mNChipsPerHic[NLayer] = { 9, 9, 9, 14, 14, 14, 14 };
-  const int mNLanePerHic[NLayer] = { 3, 3, 3, 2, 2, 2, 2 };
-  const int ChipBoundary[NLayer + 1] = { 0, 108, 252, 432, 3120, 6480, 14712, 24120 };
-  const int StaveBoundary[NLayer + 1] = { 0, 12, 28, 48, 72, 102, 144, 192 };
-  const float mLength[NLayer] = { 14., 14., 14., 43., 43., 74., 74. };
+  static constexpr int mNStaves[NLayer] = { 12, 16, 20, 24, 30, 42, 48 };
+  static constexpr int mNHicPerStave[NLayer] = { 1, 1, 1, 8, 8, 14, 14 };
+  static constexpr int mNChipsPerHic[NLayer] = { 9, 9, 9, 14, 14, 14, 14 };
+  static constexpr int mNLanePerHic[NLayer] = { 3, 3, 3, 2, 2, 2, 2 };
+  static constexpr int ChipBoundary[NLayer + 1] = { 0, 108, 252, 432, 3120, 6480, 14712, 24120 };
+  static constexpr int StaveBoundary[NLayer + 1] = { 0, 12, 28, 48, 72, 102, 144, 192 };
+  static constexpr float mLength[NLayer] = { 14., 14., 14., 43., 43., 74., 74. };
   const std::string mYlabels[NLayer * 2] = { "L6B(S24#rightarrow47)", "L5B(S21#rightarrow41)", "L4B(S15#rightarrow29)", "L3B(S12#rightarrow23)", "L2B(S10#rightarrow19)", "L1B(S08#rightarrow15)", "L0B(S06#rightarrow11)", "L0T(S00#rightarrow05)", "L1T(S00#rightarrow07)", "L2T(S00#rightarrow09)", "L3T(S00#rightarrow11)", "L4T(S00#rightarrow14)", "L5T(S00#rightarrow20)", "L6T(S00#rightarrow23)" };
 
   int mEnableLayers[NLayer] = { 0 };

Modules/ITS/src/ITSClusterTask.cxx

@@ -155,8 +155,8 @@ void ITSClusterTask::monitorData(o2::framework::ProcessingContext& ctx)
     const auto& ROF = clusRofArr[iROF];
     const auto bcdata = ROF.getBCData();
     int nClustersForBunchCrossing = 0;
-    int nLongClusters[ChipBoundary[3]] = {};
-    int nHitsFromClusters[ChipBoundary[3]] = {}; // only IB is implemented at the moment
+    int nLongClusters[ChipBoundary[NLayerIB]] = {};
+    int nHitsFromClusters[ChipBoundary[NLayerIB]] = {}; // only IB is implemented at the moment
 
     for (int icl = ROF.getFirstEntry(); icl < ROF.getFirstEntry() + ROF.getNEntries(); icl++) {
 
@@ -181,9 +181,11 @@ void ITSClusterTask::monitorData(o2::framework::ProcessingContext& ctx)
       if (ClusterID != o2::itsmft::CompCluster::InvalidPatternID) { // Normal (frequent) cluster shapes
         if (!mDict->isGroup(ClusterID)) {
           npix = mDict->getNpixels(ClusterID);
+
           // TODO: is there way other than calling the pattern?
           colspan = mDict->getPattern(ClusterID).getColumnSpan();
           rowspan = mDict->getPattern(ClusterID).getRowSpan();
+
           if (mDoPublishDetailedSummary == 1) {
             locC = mDict->getClusterCoordinates(cluster);
           }
@@ -277,11 +279,9 @@ void ITSClusterTask::monitorData(o2::framework::ProcessingContext& ctx)
     for (int ichip = 0; ichip < ChipBoundary[NLayerIB]; ichip++) {
 
       int nLong = TMath::Min(nLongClusters[ichip], 21);
-
       if (nLong < 1) {
         continue;
       }
-
       int ilayer = -1;
       while (ichip >= ChipBoundary[ilayer + 1]) {
         ilayer++;