ctpdev: warning removal (#12472)

* fix: warnings removal

* clang

Author: lietava

DataFormats/Detectors/CTP/include/DataFormatsCTP/Configuration.h

@@ -63,7 +63,7 @@ struct CTPInput {
   std::uint64_t inputMask = 0;
   o2::detectors::DetID::ID detID = 16; // CTP
   bool neg = 1;
-  int getIndex() const { return ((inputMask > 0) ? 1 + log2(inputMask) : 0xff); }
+  uint32_t getIndex() const { return ((inputMask > 0) ? 1 + log2(inputMask) : 0xff); }
   std::string getInputDetName() const { return o2::detectors::DetID::getName(detID); }
   void setRun3DetName(std::string& run2Name);
   void printStream(std::ostream& strem) const;
@@ -124,8 +124,8 @@ struct CTPInputsConfiguration {
   void printStream(std::ostream& strem) const;
   static CTPInputsConfiguration defaultInputConfig;
   static void initDefaultInputConfig();
-  static std::string getInputNameFromIndex100(int index);
-  static std::string getInputNameFromIndex(int index);
+  static std::string getInputNameFromIndex100(uint32_t index);
+  static std::string getInputNameFromIndex(uint32_t index);
   static int getInputIndexFromName(std::string& name);
   ClassDefNV(CTPInputsConfiguration, 0);
 };
@@ -164,7 +164,7 @@ class CTPConfiguration
   bool isBCMaskInConfig(const std::string maskname) const;
   const BCMask* isBCMaskInConfigP(const std::string bcmask) const;
   const CTPInput* isInputInConfig(const std::string inpname) const;
-  const CTPInput* isInputInConfig(const int index) const;
+  const CTPInput* isInputInConfig(const uint32_t index) const;
   const CTPDescriptor* isDescriptorInConfig(const std::string descname, int& index) const;
   void createInputsInDecriptorsFromNames();
   uint64_t getDecrtiptorInputsMask(const std::string& name) const;

DataFormats/Detectors/CTP/include/DataFormatsCTP/Digits.h

@@ -55,9 +55,9 @@ struct CTPDigit {
   void setInputMask(gbtword80_t mask);
   void setClassMask(gbtword80_t mask);
   bool isInputEmpty() const { return CTPInputMask.count() == 0; }
-  const bool isClassEmpty() const { return CTPClassMask.count() == 0; }
-  const bool isEmpty() const { return isInputEmpty() && isClassEmpty(); }
-  const bool operator==(const CTPDigit& d) const
+  bool isClassEmpty() const { return CTPClassMask.count() == 0; }
+  bool isEmpty() const { return isInputEmpty() && isClassEmpty(); }
+  bool operator==(const CTPDigit& d) const
   {
     return intRecord == d.intRecord && CTPInputMask == d.CTPInputMask && CTPClassMask == d.CTPClassMask;
   }

DataFormats/Detectors/CTP/include/DataFormatsCTP/Scalers.h

@@ -93,7 +93,7 @@ class CTPRunScalers
   void printFromZero(std::ostream& stream) const;
   void printClasses(std::ostream& stream) const;
   std::vector<uint32_t> getClassIndexes() const;
-  int getScalerIndexForClass(int cls) const;
+  int getScalerIndexForClass(uint32_t cls) const;
   std::vector<CTPScalerRecordO2>& getScalerRecordO2() { return mScalerRecordO2; };
   int readScalers(const std::string& rawscalers);
   int convertRawToO2();
@@ -150,7 +150,7 @@ class CTPRunScalers
   o2::detectors::DetID::mask_t mDetectorMask;
   std::vector<CTPScalerRecordRaw> mScalerRecordRaw;
   std::vector<CTPScalerRecordO2> mScalerRecordO2;
-  int processScalerLine(const std::string& line, int& level, int& nclasses);
+  int processScalerLine(const std::string& line, int& level, uint32_t& nclasses);
   int copyRawToO2ScalerRecord(const CTPScalerRecordRaw& rawrec, CTPScalerRecordO2& o2rec, overflows_t& classesoverflows, std::array<uint32_t, 48>& overflows);
   int updateOverflows(const CTPScalerRecordRaw& rec0, const CTPScalerRecordRaw& rec1, overflows_t& classesoverflows) const;
   int updateOverflows(const CTPScalerRaw& scal0, const CTPScalerRaw& scal1, std::array<uint32_t, 6>& overflow) const;

DataFormats/Detectors/CTP/src/Configuration.cxx

@@ -95,7 +95,7 @@ int BCMask::setBCmask(std::vector<std::string>& tokens)
     }
   } else {
     // list of integers
-    for (int i = 2; i < tokens.size(); i++) {
+    for (uint32_t i = 2; i < tokens.size(); i++) {
       uint32_t bc;
       try {
         bc = std::stoull(tokens[i]);
@@ -223,7 +223,7 @@ int CTPConfiguration::addInput(std::string& inp, int clsindex, std::map<int, std
   }
   // add to desc
   // check if already there
-  for (int i = 0; i < mInputs.size(); i++) {
+  for (uint32_t i = 0; i < mInputs.size(); i++) {
     if (mInputs[i].name == ctpinp.name) {
       LOG(info) << "input found at:" << i;
       descInputsIndex[clsindex].push_back(i);
@@ -365,7 +365,7 @@ int CTPConfiguration::processConfigurationLineRun3(std::string& line, int& level
         // jusko notation
       } else {
         // list of integers
-        for (int i = 2; i < ntokens; i++) {
+        for (uint32_t i = 2; i < ntokens; i++) {
           uint32_t bc;
           try {
             bc = std::stoull(tokens[i]);
@@ -420,7 +420,7 @@ int CTPConfiguration::processConfigurationLineRun3(std::string& line, int& level
       LOG(info) << "Cluster:" << line;
       cluster.name = tokens[2];
       o2::detectors::DetID::mask_t mask;
-      for (int item = 3; item < ntokens; item++) {
+      for (uint32_t item = 3; item < ntokens; item++) {
         std::string detname = tokens[item];
         capitaliseString(detname);
         // LOG(info) << "Detector:" << detname;
@@ -455,7 +455,7 @@ int CTPConfiguration::processConfigurationLineRun3(std::string& line, int& level
       CTPDescriptor desc;
       desc.name = "d" + cls.name;
       // LOG(info) << "point:" << cls.cluster << " " << &mClusters.front();
-      for (int i = 2; i < tokens.size(); i++) {
+      for (uint32_t i = 2; i < tokens.size(); i++) {
         std::string token = tokens[i];
         bool isGenerator = 0;
         for (auto const& gen : CTPGenerator::Generators) {
@@ -479,7 +479,7 @@ int CTPConfiguration::processConfigurationLineRun3(std::string& line, int& level
           cls.downScale = std::stoul(token, nullptr, 16);
         } else if (token.find("bcm") != std::string::npos) { // bcmask
           // std::cout << "Mask" << std::endl;
-          int i = 0;
+          uint32_t i = 0;
           for (auto const& bcm : mBCMasks) {
             if (bcm.name == token) {
               cls.BCClassMask.push_back(&bcm);
@@ -613,7 +613,7 @@ int CTPConfiguration::processConfigurationLineRun3v2(std::string& line, int& lev
       }
       CTPDescriptor desc;
       desc.name = tokens[0];
-      for (int i = 1; i < tokens.size(); i++) {
+      for (uint32_t i = 1; i < tokens.size(); i++) {
         const CTPInput* inp = isInputInConfig(tokens[i]);
         if (inp != nullptr) {
           desc.inputs.push_back(inp);
@@ -655,7 +655,7 @@ int CTPConfiguration::processConfigurationLineRun3v2(std::string& line, int& lev
       LOG(info) << "Cluster:" << line;
       cluster.name = tokens[2];
       o2::detectors::DetID::mask_t mask;
-      for (int item = 3; item < ntokens; item++) {
+      for (uint32_t item = 3; item < ntokens; item++) {
         std::string detname = tokens[item];
         capitaliseString(detname);
         // LOG(info) << "Detector:" << detname;
@@ -812,7 +812,7 @@ const CTPInput* CTPConfiguration::isInputInConfig(const std::string inpname) con
   LOG(info) << "isInputInConfig NOT found:" << inpname;
   return nullptr;
 }
-const CTPInput* CTPConfiguration::isInputInConfig(const int index) const
+const CTPInput* CTPConfiguration::isInputInConfig(const uint32_t index) const
 {
   for (const auto& inp : mInputs) {
     // std::cout << "isInputINConfig:" << inp.name << " " << inp.getIndex() << " " << index << std::endl;
@@ -1067,9 +1067,9 @@ void CTPInputsConfiguration::initDefaultInputConfig()
 }
 /// Return input name from default inputs configuration.
 /// Take into account convention that L0 inputs has (index+100) in the first version of CTP config file (*.rcfg)
-std::string CTPInputsConfiguration::getInputNameFromIndex100(int index)
+std::string CTPInputsConfiguration::getInputNameFromIndex100(uint32_t index)
 {
-  int indexcor = index;
+  uint32_t indexcor = index;
   if (index > 100) {
     indexcor = index - 100;
   }
@@ -1087,7 +1087,7 @@ std::string CTPInputsConfiguration::getInputNameFromIndex100(int index)
 }
 /// Return input name from default inputs configuration.
 /// Index has to be in range [1::48]
-std::string CTPInputsConfiguration::getInputNameFromIndex(int index)
+std::string CTPInputsConfiguration::getInputNameFromIndex(uint32_t index)
 {
   if (index > o2::ctp::CTP_NINPUTS) {
     LOG(warn) << "getInputNameFRomIndex: index too big:" << index;

DataFormats/Detectors/CTP/src/Digits.cxx

@@ -30,13 +30,13 @@ void CTPDigit::printStream(std::ostream& stream) const
 
 void CTPDigit::setInputMask(gbtword80_t mask)
 {
-  for (int i = 0; i < CTP_NINPUTS; i++) {
+  for (uint32_t i = 0; i < CTP_NINPUTS; i++) {
     CTPInputMask[i] = mask[i];
   }
 }
 void CTPDigit::setClassMask(gbtword80_t mask)
 {
-  for (int i = 0; i < CTP_NCLASSES; i++) {
+  for (uint32_t i = 0; i < CTP_NCLASSES; i++) {
     CTPClassMask[i] = mask[i];
   }
 }

DataFormats/Detectors/CTP/src/RunManager.cxx

@@ -27,8 +27,8 @@ std::string CTPRunManager::mCCDBHost = "http://o2-ccdb.internal";
 ///
 void CTPRunManager::init()
 {
-  for (auto r : mActiveRuns) {
-    r = nullptr;
+  for (uint32_t i = 0; i < NRUNS; i++) {
+    mActiveRuns[i] = nullptr;
   }
   loadScalerNames();
   LOG(info) << "CCDB host:" << mCCDBHost;
@@ -136,7 +136,7 @@ int CTPRunManager::addScalers(uint32_t irun, std::time_t time)
     }
   }
   */
-  int NINPS = 48;
+  uint32_t NINPS = 48;
   int offset = 599;
   for (uint32_t i = 0; i < NINPS; i++) {
     uint32_t inpcount = mCounters[offset + i];
@@ -200,7 +200,7 @@ int CTPRunManager::processMessage(std::string& topic, const std::string& message
   double timeStamp = std::stold(tokens.at(0));
   std::time_t tt = timeStamp;
   LOG(info) << "Processing scalers, all good, time:" << tokens.at(0) << " " << std::asctime(std::localtime(&tt));
-  for (int i = 1; i < tokens.size(); i++) {
+  for (uint32_t i = 1; i < tokens.size(); i++) {
     mCounters[i - 1] = std::stoull(tokens.at(i));
     if (i < (NRUNS + 1)) {
       std::cout << mCounters[i - 1] << " ";
@@ -340,15 +340,15 @@ void CTPRunManager::printCounters()
 {
   int NDET = 18;
   int NINPS = 48;
-  int NCLKFP = 7;
+  // int NCLKFP = 7;
   int NLTG_start = NRUNS;
   int NCLKFP_start = NLTG_start + NDET * 32;
   int NINPS_start = NCLKFP_start + 7;
   int NCLS_start = NINPS_start + NINPS;
   std::cout << "====> CTP counters:" << std::endl;
   std::cout << "RUNS:" << std::endl;
   int ipos = 0;
-  for (int i = 0; i < NRUNS; i++) {
+  for (uint32_t i = 0; i < NRUNS; i++) {
     std::cout << ipos << ":" << mCounters[i] << " ";
     ipos++;
   }
@@ -410,7 +410,7 @@ void CTPRunManager::printCounters()
   }
   std::cout << std::endl;
   std::cout << " REST:" << std::endl;
-  for (int i = NCLS_start + 6 * 64; i < mCounters.size(); i++) {
+  for (uint32_t i = NCLS_start + 6 * 64; i < mCounters.size(); i++) {
     if ((ipos % 10) == 0) {
       std::cout << std::endl;
       std::cout << ipos << ":";

DataFormats/Detectors/CTP/src/Scalers.cxx

@@ -89,7 +89,7 @@ void CTPScalerRecordO2::printFromZero(std::ostream& stream, CTPScalerRecordO2& r
   stream << "printFromZero Orbit:" << intRecord.orbit - record0.intRecord.orbit << " BC:" << intRecord.bc;
   stream << " miliSeconds:" << std::setprecision(20) << epochTime - record0.epochTime << std::endl;
   // this-record0
-  for (int i = 0; i < scalers.size(); i++) {
+  for (uint32_t i = 0; i < scalers.size(); i++) {
     scalers[i].printFromZero(stream, record0.scalers[i]);
   }
   stream << std::endl;
@@ -130,7 +130,7 @@ void CTPRunScalers::printFromZero(std::ostream& stream) const
 void CTPRunScalers::printClasses(std::ostream& stream) const
 {
   stream << "CTP classes:";
-  for (int i = 0; i < mClassMask.size(); i++) {
+  for (uint32_t i = 0; i < mClassMask.size(); i++) {
     if (mClassMask[i]) {
       stream << " " << i;
     }
@@ -148,7 +148,7 @@ std::vector<uint32_t> CTPRunScalers::getClassIndexes() const
   return indexes;
 }
 // cls counted from 0
-int CTPRunScalers::getScalerIndexForClass(int cls) const
+int CTPRunScalers::getScalerIndexForClass(uint32_t cls) const
 {
   if (cls < 0 || cls >= 64) {
     LOG(error) << "Class index out of range:" << cls;
@@ -172,7 +172,7 @@ int CTPRunScalers::readScalers(const std::string& rawscalers)
   int ret = 0;
   int level = 0;
   std::string line;
-  int nclasses = 0;
+  uint32_t nclasses = 0;
   int nlines = 0;
   while (std::getline(iss, line)) {
     o2::utils::Str::trim(line);
@@ -192,7 +192,7 @@ int CTPRunScalers::readScalers(const std::string& rawscalers)
   }
   return 0;
 }
-int CTPRunScalers::processScalerLine(const std::string& line, int& level, int& nclasses)
+int CTPRunScalers::processScalerLine(const std::string& line, int& level, uint32_t& nclasses)
 {
   //std::cout << "Processing line" << std::endl;
   if (line.size() == 0) {
@@ -225,13 +225,13 @@ int CTPRunScalers::processScalerLine(const std::string& line, int& level, int& n
       return 2;
     } else {
       mRunNumber = std::stol(tokens[0]);
-      int numofclasses = std::stoi(tokens[1]);
+      uint32_t numofclasses = std::stoi(tokens[1]);
       if ((numofclasses + 2) != ntokens) {
         LOG(error) << "Wrong syntax of second line in CTP scalers";
         return 3;
       }
       mClassMask.reset();
-      for (int i = 0; i < numofclasses; i++) {
+      for (uint32_t i = 0; i < numofclasses; i++) {
         int index = std::stoi(tokens[i + 2]);
         mClassMask[index] = 1;
       }
@@ -336,7 +336,7 @@ int CTPRunScalers::copyRawToO2ScalerRecord(const CTPScalerRecordRaw& rawrec, CTP
     o2scal.createCTPScalerO2FromRaw(rawscal, classesoverflows[k]);
     o2rec.scalers.push_back(o2scal);
   }
-  for (int i = 0; i < rawrec.scalersInps.size(); i++) {
+  for (uint32_t i = 0; i < rawrec.scalersInps.size(); i++) {
     uint64_t inpo2 = (uint64_t)(rawrec.scalersInps[i]) + 0xffffffffull * (uint64_t)(overflows[i]);
     o2rec.scalersInps.push_back(inpo2);
   }
@@ -441,15 +441,15 @@ int CTPRunScalers::updateOverflows(const CTPScalerRecordRaw& rec0, const CTPScal
     LOG(warning) << "rec0 orbit:" << rec0.intRecord.orbit << "> rec1 orbit:" << rec1.intRecord.orbit << " skipping this record";
     return 1;
   }
-  for (int i = 0; i < rec0.scalers.size(); i++) {
+  for (uint32_t i = 0; i < rec0.scalers.size(); i++) {
     int k = (getClassIndexes())[i];
     updateOverflows(rec0.scalers[i], rec1.scalers[i], classesoverflows[k]);
   }
   return 0;
 }
 int CTPRunScalers::checkConsistency(const CTPScalerRecordO2& rec0, const CTPScalerRecordO2& rec1, errorCounters& eCnts) const
 {
-  for (int i = 0; i < rec0.scalers.size(); i++) {
+  for (uint32_t i = 0; i < rec0.scalers.size(); i++) {
     checkConsistency(rec0.scalers[i], rec1.scalers[i], eCnts);
   }
   return 0;
@@ -482,7 +482,7 @@ int CTPRunScalers::updateOverflows(const CTPScalerRaw& scal0, const CTPScalerRaw
 //
 int CTPRunScalers::updateOverflowsInps(const CTPScalerRecordRaw& rec0, const CTPScalerRecordRaw& rec1, std::array<uint32_t, 48>& overflow) const
 {
-  int NINPS = 48;
+  uint32_t NINPS = 48;
   if (rec0.scalersInps.size() < NINPS) {
     LOG(error) << "updateOverflowsInps.size < 48:" << rec0.scalersInps.size();
     return 1;
@@ -491,7 +491,7 @@ int CTPRunScalers::updateOverflowsInps(const CTPScalerRecordRaw& rec0, const CTP
     LOG(error) << "updateOverflowsInps.size < 48:" << rec1.scalersInps.size();
     return 2;
   }
-  for (int i = 0; i < NINPS; i++) {
+  for (uint32_t i = 0; i < NINPS; i++) {
     if (rec0.scalersInps[i] > rec1.scalersInps[i]) {
       overflow[i] += 1;
     }
@@ -508,14 +508,14 @@ int CTPRunScalers::printRates()
   LOG(info) << "Scaler rates for run:" << mRunNumber;
   CTPScalerRecordO2* scalrec0 = &mScalerRecordO2[0];
   uint32_t orbit0 = scalrec0->intRecord.orbit;
-  for (int i = 1; i < mScalerRecordO2.size(); i++) {
+  for (uint32_t i = 1; i < mScalerRecordO2.size(); i++) {
     CTPScalerRecordO2* scalrec1 = &mScalerRecordO2[i];
     double_t tt = (double_t)(scalrec1->intRecord.orbit - scalrec0->intRecord.orbit);
     double_t tinrun = (double_t)(scalrec1->intRecord.orbit - orbit0);
     tt = tt * 88e-6;
     tinrun = tinrun * 88e-6;
     std::cout << "==> Time wrt to SOR [s]:" << tinrun << " time intervale[s]:" << tt << std::endl;
-    for (int j = 0; j < scalrec1->scalers.size(); j++) {
+    for (uint32_t j = 0; j < scalrec1->scalers.size(); j++) {
       CTPScalerO2* s0 = &(scalrec0->scalers[j]);
       CTPScalerO2* s1 = &(scalrec1->scalers[j]);
       double_t rMB = (s1->lmBefore - s0->lmBefore) / tt;
@@ -544,7 +544,7 @@ int CTPRunScalers::printIntegrals()
   double_t timeL = mScalerRecordO2[mScalerRecordO2.size() - 1].epochTime;
   LOG(info) << "Scaler Integrals for run:" << mRunNumber << " duration:" << timeL - time0;
 
-  for (int i = 0; i < mScalerRecordO2[0].scalers.size(); i++) {
+  for (uint32_t i = 0; i < mScalerRecordO2[0].scalers.size(); i++) {
     std::cout << i << " LMB " << mScalerRecordO2[mScalerRecordO2.size() - 1].scalers[i].lmBefore - mScalerRecordO2[0].scalers[i].lmBefore << std::endl;
     std::cout << i << " LMA " << mScalerRecordO2[mScalerRecordO2.size() - 1].scalers[i].lmAfter - mScalerRecordO2[0].scalers[i].lmAfter << std::endl;
     std::cout << i << " L0B " << mScalerRecordO2[mScalerRecordO2.size() - 1].scalers[i].l0Before - mScalerRecordO2[0].scalers[i].l0Before << std::endl;
@@ -609,7 +609,7 @@ int CTPRunScalers::printClassBRateAndIntegral(int iclsscalerindex)
 //
 void CTPRunScalers::printLMBRateVsT() const
 {
-  for (int i = 1; i < mScalerRecordO2.size(); i++) { // loop over time
+  for (uint32_t i = 1; i < mScalerRecordO2.size(); i++) { // loop over time
     auto prev = &mScalerRecordO2[i - 1];
     auto curr = &mScalerRecordO2[i];
     double_t tt = (double_t)(curr->intRecord.orbit - prev->intRecord.orbit);

Detectors/CTP/reconstruction/src/RawDataDecoder.cxx

@@ -134,11 +134,11 @@ int RawDataDecoder::decodeRaw(o2::framework::InputRecord& inputs, std::vector<o2
   uint64_t countsMBV = 0;
   std::map<o2::InteractionRecord, CTPDigit> digitsMap;
   //
-  using InputSpec = o2::framework::InputSpec;
-  using ConcreteDataTypeMatcher = o2::framework::ConcreteDataTypeMatcher;
-  using Lifetime = o2::framework::Lifetime;
+  // using InputSpec = o2::framework::InputSpec;
+  // using ConcreteDataTypeMatcher = o2::framework::ConcreteDataTypeMatcher;
+  // using Lifetime = o2::framework::Lifetime;
   o2::framework::DPLRawParser parser(inputs, filter);
-  uint32_t payloadCTP;
+  uint32_t payloadCTP = 0;
   gbtword80_t remnant = 0;
   uint32_t size_gbt = 0;
   mTFOrbit = 0;
@@ -358,7 +358,7 @@ int RawDataDecoder::shiftNew(const o2::InteractionRecord& irin, uint32_t TFOrbit
 
 int RawDataDecoder::shiftInputs(std::map<o2::InteractionRecord, CTPDigit>& digitsMap, o2::pmr::vector<CTPDigit>& digits, uint32_t TFOrbit)
 {
-  int nClasswoInp = 0; // counting classes without input which should never happen
+  // int nClasswoInp = 0; // counting classes without input which should never happen
   int nLM = 0;
   int nL0 = 0;
   int nL1 = 0;