Fix runtime/arrays

Author: vkucera

Common/CCDB/macros/upload_event_selection_params.C

@@ -33,12 +33,12 @@ void upload_event_selection_params()
   // ccdb.truncate("EventSelection/EventSelectionParams");
   ccdb.init("https://alice-ccdb.cern.ch");
 
-  const int nPeriodsMax = 100;
-  EventSelectionParams* par[nPeriodsMax];
-  string period[nPeriodsMax];
-  int runFirst[nPeriodsMax];
-  int runLast[nPeriodsMax];
-  bool isNew[nPeriodsMax] = {0};
+  constexpr int NPeriodsMax{100};
+  std::array<EventSelectionParams*, NPeriodsMax> par{};
+  std::array<string, NPeriodsMax> period{};
+  std::array<int, NPeriodsMax> runFirst{};
+  std::array<int, NPeriodsMax> runLast{};
+  std::array<bool, NPeriodsMax> isNew{};
 
   int n = 0;
   period[n] = "pp2010";

Common/Tools/Multiplicity/MultModule.h

@@ -480,7 +480,7 @@ class MultModule
     LOGF(info, "Metadata information: isMC? %i", metadataInfo.isMC());
     const auto& workflows = context.services().template get<o2::framework::RunningWorkflowInfo const>();
 
-    TString listOfRequestors[nTablesConst];
+    std::array<TString, nTablesConst> listOfRequestors{};
     for (int i = 0; i < nTablesConst; i++) {
       int f = internalOpts.enabledTables->get(tableNames[i].c_str(), "enable");
       if (f == 1) {

Common/Tools/Multiplicity/multCalibrator.cxx

@@ -30,6 +30,7 @@
 
 #include <cmath>
 #include <iostream> // FIXME
+#include <vector>
 
 using namespace std;
 
@@ -353,8 +354,8 @@ TH1F* multCalibrator::GetCalibrationHistogram(TH1* histoRaw, const TString& lHis
     // place squarely at the middle to ensure it's all fine
     lMiddleOfBins[lB - 1] = 0.5 * (lDesiredBoundaries[lB] + lDesiredBoundaries[lB - 1]);
   }
-  Double_t lBounds[lNDesiredBoundaries + 1];
-  Double_t lPrecision[lNDesiredBoundaries + 1];
+  std::vector<Double_t> lBounds(lNDesiredBoundaries + 1);
+  std::vector<Double_t> lPrecision(lNDesiredBoundaries + 1);
 
   if (fAnchorPointValue > 0) {
     lBounds[0] = 0;
@@ -382,7 +383,7 @@ TH1F* multCalibrator::GetCalibrationHistogram(TH1* histoRaw, const TString& lHis
       cout << histoRaw->GetName() << " boundaries, percentile: " << lDesiredBoundaries[ii] << "%\t Signal value = " << lBounds[lDisplacedii] << "\tprecision = " << lPrecision[ii] << "% " << lPrecisionString.Data() << endl;
     }
   }
-  TH1F* hCalib = new TH1F(lHistoName.Data(), "", fAnchorPointValue < 0 ? lNDesiredBoundaries - 1 : lNDesiredBoundaries, lBounds);
+  TH1F* hCalib = new TH1F(lHistoName.Data(), "", fAnchorPointValue < 0 ? lNDesiredBoundaries - 1 : lNDesiredBoundaries, lBounds.data());
   hCalib->SetDirectory(0);
   hCalib->SetBinContent(0, 100.5);
   hCalib->SetBinContent(1, 100.5);

PWGEM/Dilepton/Tasks/emEfficiencyEE.cxx

@@ -1043,19 +1043,15 @@ struct AnalysisTrackSelection {
   template <uint32_t TEventFillMap, uint32_t TTrackFillMap, typename TEvents, typename TEventsMC, typename TTracks, typename TTracksMC, typename TAmbigTracks>
   void runRecTrackMore(TEvents const& events, TEventsMC const& /*eventsMC*/, TTracks const& groupedTracks, TTracksMC const& tracksMC, TAmbigTracks const& ambiTracksMid)
   {
-
-    std::map<uint64_t, int> fRecTrackLabels[fTrackCuts.size() + 1];
+    std::vector<std::map<uint64_t, int>> fRecTrackLabels(fTrackCuts.size() + 1);
 
     uint32_t filterMap = 0;
     trackSel.reserve(groupedTracks.size());
 
     for (auto& track : groupedTracks) {
 
       // How many time the associated MC track was seen for this cut
-      Int_t fRecCounters[fTrackCuts.size() + 1];
-      for (unsigned int k = 0; k < fTrackCuts.size() + 1; k++) {
-        fRecCounters[k] = 0;
-      }
+      std::vector<Int_t> fRecCounters(fTrackCuts.size() + 1, 0);
 
       filterMap = 0;
       Int_t ambiguousinfo = 0;
@@ -1157,10 +1153,7 @@ struct AnalysisTrackSelection {
       uint32_t mcDecision = 0;
       int isig = 0;
       Int_t mctrackindex = -999;
-      Int_t doublereconstructedtrack[fTrackCuts.size() + 1];
-      for (unsigned int k = 0; k < fTrackCuts.size() + 1; k++) {
-        doublereconstructedtrack[k] = 0;
-      }
+      std::vector<Int_t> doublereconstructedtrack(fTrackCuts.size() + 1, 0);
       for (auto sig = fMCSignals.begin(); sig != fMCSignals.end(); sig++, isig++) {
         if constexpr ((TTrackFillMap & VarManager::ObjTypes::Track) > 0) {
           if (track.has_mcParticle()) {

PWGHF/HFC/Macros/FitCorrel.C

@@ -110,10 +110,7 @@ void fitCorrelDs(const TString& cfgFileName = "config_CorrAnalysis.json")
   const int nBinsPtCand = binsPtCandIntervalsVec.size() - 1;
   const int nBinsPtHad = binsPtHadIntervals.size() - 1;
 
-  double binsPtCandIntervals[nBinsPtCand + 1];
-  for (int i = 0; i < nBinsPtCand + 1; i++) {
-    binsPtCandIntervals[i] = binsPtCandIntervalsVec[i];
-  }
+  std::vector<double> binsPtCandIntervals{binsPtCandIntervalsVec};
 
   const Value& fitFuncValue = config["FitFunction"];
   readArray(fitFuncValue, fitFunc);
@@ -122,17 +119,14 @@ void fitCorrelDs(const TString& cfgFileName = "config_CorrAnalysis.json")
   int const fixMean = config["FixMean"].GetInt();
 
   int const nBaselinePoints = config["nBaselinePoints"].GetInt();
-  vector<int> pointsForBaselineVec;
+  std::vector<int> pointsForBaselineVec;
   const Value& pointsForBaselineValue = config["binsForBaseline"];
   readArray(pointsForBaselineValue, pointsForBaselineVec);
   if (pointsForBaselineVec.size() != nBaselinePoints) {
     cout << "ERROR: size of the vector pointsForBaseline is different from the number of nBaselinePoints" << endl;
     return;
   }
-  int pointsForBaseline[nBaselinePoints];
-  for (int i = 0; i < nBaselinePoints; i++) {
-    pointsForBaseline[i] = pointsForBaselineVec[i];
-  }
+  std::vector<int> pointsForBaseline{pointsForBaselineVec};
 
   std::cout << "=========================== " << std::endl;
   std::cout << "Input variables from config" << std::endl;
@@ -202,7 +196,7 @@ void fitCorrelDs(const TString& cfgFileName = "config_CorrAnalysis.json")
       corrFitter[iBinPtHad][iBinPtCand]->setHistoIsReflected(refl);
       corrFitter[iBinPtHad][iBinPtCand]->setFixBaseline(fixBase);
       corrFitter[iBinPtHad][iBinPtCand]->setBaselineUpOrDown(shiftBaseUp, shiftBaseDown);
-      corrFitter[iBinPtHad][iBinPtCand]->setPointsForBaseline(nBaselinePoints, pointsForBaseline);
+      corrFitter[iBinPtHad][iBinPtCand]->setPointsForBaseline(nBaselinePoints, pointsForBaseline.data());
       corrFitter[iBinPtHad][iBinPtCand]->setv2(v2AssocPart[iBinPtCand], v2Dmeson[iBinPtCand]);
       corrFitter[iBinPtHad][iBinPtCand]->setReflectedCorrHisto(isReflected);
 
@@ -222,14 +216,14 @@ void fitCorrelDs(const TString& cfgFileName = "config_CorrAnalysis.json")
       canvasCorrPhi[iBinPtHad]->Divide(3, 2);
     }
     // histograms with fir parameters
-    hBaselin[iBinPtHad] = new TH1D(Form("hBaselin_PtBinAssoc%d", iBinPtHad + 1), "", nBinsPtCand, binsPtCandIntervals);
-    hNSYield[iBinPtHad] = new TH1D(Form("hNSYield_PtBinAssoc%d", iBinPtHad + 1), "", nBinsPtCand, binsPtCandIntervals);
-    hNSSigma[iBinPtHad] = new TH1D(Form("hNSSigma_PtBinAssoc%d", iBinPtHad + 1), "", nBinsPtCand, binsPtCandIntervals);
-    hASYield[iBinPtHad] = new TH1D(Form("hASYield_PtBinAssoc%d", iBinPtHad + 1), "", nBinsPtCand, binsPtCandIntervals);
-    hASSigma[iBinPtHad] = new TH1D(Form("hASSigma_PtBinAssoc%d", iBinPtHad + 1), "", nBinsPtCand, binsPtCandIntervals);
-    hBeta[iBinPtHad] = new TH1D(Form("hBeta_PtBinAssoc%d", iBinPtHad + 1), "", nBinsPtCand, binsPtCandIntervals);
-    hNSYieldBinCount[iBinPtHad] = new TH1D(Form("hNSYieldBinCount_PtBinAssoc%d", iBinPtHad + 1), "", nBinsPtCand, binsPtCandIntervals);
-    hASYieldBinCount[iBinPtHad] = new TH1D(Form("hASYieldBinCount_PtBinAssoc%d", iBinPtHad + 1), "", nBinsPtCand, binsPtCandIntervals);
+    hBaselin[iBinPtHad] = new TH1D(Form("hBaselin_PtBinAssoc%d", iBinPtHad + 1), "", nBinsPtCand, binsPtCandIntervals.data());
+    hNSYield[iBinPtHad] = new TH1D(Form("hNSYield_PtBinAssoc%d", iBinPtHad + 1), "", nBinsPtCand, binsPtCandIntervals.data());
+    hNSSigma[iBinPtHad] = new TH1D(Form("hNSSigma_PtBinAssoc%d", iBinPtHad + 1), "", nBinsPtCand, binsPtCandIntervals.data());
+    hASYield[iBinPtHad] = new TH1D(Form("hASYield_PtBinAssoc%d", iBinPtHad + 1), "", nBinsPtCand, binsPtCandIntervals.data());
+    hASSigma[iBinPtHad] = new TH1D(Form("hASSigma_PtBinAssoc%d", iBinPtHad + 1), "", nBinsPtCand, binsPtCandIntervals.data());
+    hBeta[iBinPtHad] = new TH1D(Form("hBeta_PtBinAssoc%d", iBinPtHad + 1), "", nBinsPtCand, binsPtCandIntervals.data());
+    hNSYieldBinCount[iBinPtHad] = new TH1D(Form("hNSYieldBinCount_PtBinAssoc%d", iBinPtHad + 1), "", nBinsPtCand, binsPtCandIntervals.data());
+    hASYieldBinCount[iBinPtHad] = new TH1D(Form("hASYieldBinCount_PtBinAssoc%d", iBinPtHad + 1), "", nBinsPtCand, binsPtCandIntervals.data());
 
     for (int iBinPtCand = 0; iBinPtCand < nBinsPtCand; iBinPtCand++) {
       setTH1HistoStyle(hCorrPhi[iBinPtCand][iBinPtHad], "", "#Delta#phi [rad]", "#frac{1}{N_{D_{s}}}#frac{dN^{assoc}}{d#Delta#phi} [rad^{-1}]", kFullCircle, kRed + 1, 1.4, kRed + 1, 3);

PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx

@@ -687,7 +687,7 @@ struct StrangenessBuilder {
     LOGF(info, "Configuring tables to generate");
     auto& workflows = context.services().get<RunningWorkflowInfo const>();
 
-    TString listOfRequestors[nTables];
+    std::array<TString, nTables> listOfRequestors{};
     for (int i = 0; i < nTables; i++) {
       // adjust bookkeeping histogram
       h->GetXaxis()->SetBinLabel(i + 1, tableNames[i].c_str());

PWGLF/Utils/mcCentralityModule.h

@@ -257,7 +257,7 @@ struct BuilderModule {
 
     nEnabledTables = 0;
 
-    TString listOfRequestors[nTablesConst];
+    std::array<TString, nTablesConst> listOfRequestors{};
     for (int i = 0; i < nTablesConst; i++) {
       int f = baseOpts.enabledTables->get(tableNames[i].c_str(), "enable");
       if (f == 1) {