get rid of compiler warnings

lubynets · lubynets · commit 4bbf64ab7c7d · 2025-10-28T13:43:59.000+01:00
diff --git a/core/BranchConfig.cpp b/core/BranchConfig.cpp
@@ -14,7 +14,7 @@ void BranchConfig::GenerateId() {
   id_ = id_hasher(name_);
 }
 
-BranchConfig::BranchConfig(std::string name, DetType type, std::string title) : name_(std::move(name)), type_(type), title_(std::move(title)) {
+BranchConfig::BranchConfig(std::string name, DetType type, std::string title) : name_(std::move(name)), title_(std::move(title)), type_(type) {
   GenerateId();
 
   if (type_ == DetType::kTrack) {
@@ -156,12 +156,12 @@ void VectorConfig<T>::Print() const {
     std::vector<std::string> result;
     std::vector<int> newlinepositions{-1};
     int it{0};
-    while (it < std::string::npos) {
+    while (it < static_cast<int>(std::string::npos)) {
       it = input.find("\n", it + 1);
       newlinepositions.emplace_back(it);
     }
     newlinepositions.back() = input.size();
-    for (int ip = 0; ip < newlinepositions.size() - 1; ++ip) {
+    for (int ip = 0; ip < static_cast<int>(newlinepositions.size()) - 1; ++ip) {
       result.emplace_back(input.substr(newlinepositions.at(ip) + 1, newlinepositions.at(ip + 1) - newlinepositions.at(ip) - 1));
     }
     return result;
@@ -174,7 +174,7 @@ void VectorConfig<T>::Print() const {
     } else {
       auto est = SplitString(entry.second.title_);
       print_row({{std::to_string(entry.second.id_), 10}, {entry.first, name_strlen}, {est.at(0), 50}});
-      for (int iest = 1; iest < est.size(); ++iest) {
+      for (int iest = 1; iest < static_cast<int>(est.size()); ++iest) {
         print_row({{"", 10}, {"", name_strlen}, {est.at(iest), 50}});
       }
     }
diff --git a/core/Configuration.cpp b/core/Configuration.cpp
@@ -19,14 +19,12 @@ namespace AnalysisTree {
 
 void Configuration::Streamer(TBuffer& rb) {
   if (rb.IsReading()) {
-    bool read_ok = false;
     UInt_t rs = 0, rc = 0;
     auto version_from_file = rb.ReadVersion(&rs, &rc, Configuration::Class());
     if (version_from_file == Class()->GetClassVersion()) {
       Configuration::Class()->ReadBuffer(rb, this, version_from_file, rs, rc);
       // populate the transient field
       this->matches_index_ = MakeMatchingIndex(matches_);
-      read_ok = true;
     } else if (version_from_file == 3) {
       //      below structure description for version 3 of this class
       Warning(__func__, "Reading AnalysisTree::Configuration of version %d in compatibility mode. "
@@ -40,14 +38,12 @@ void Configuration::Streamer(TBuffer& rb) {
       this->matches_ = MakeMatchConfigsFromIndex(conf_v3.matches_);
       // populate the transient field
       this->matches_index_ = conf_v3.matches_;
-      read_ok = true;
     } else {
       Warning(__func__, "Current version of AnalysisTree::Configuration (%d) "
                         "is different from the version from file (%d) and no rule to read this version was implemented. "
                         "Contact developers if dedicated Streamer implementation is needed for this version.",
               Configuration::Class()->GetClassVersion(),
               version_from_file);
-      read_ok = false;
     }
 
   } else {
diff --git a/core/Configuration.test.cpp b/core/Configuration.test.cpp
@@ -31,8 +31,6 @@ TEST(Configuration, Basics) {
   EXPECT_EQ(config.GetNumberOfBranches(), 1);
   //  EXPECT_EQ(config.GetLastId(), 0);
 
-  const auto& br1 = config.GetBranchConfig("RecTrack");
-  //  EXPECT_EQ(br1.GetId(), 0);
 }
 
 TEST(Configuration, Match) {
diff --git a/infra/AnalysisEntry.cpp b/infra/AnalysisEntry.cpp
@@ -32,7 +32,7 @@ bool AnalysisEntry::ApplyCutOnBranches(std::vector<const Branch*>& br, std::vect
   std::vector<size_t> id_vec;
   bch_vec.reserve(br.size());
   id_vec.reserve(br.size());
-  for (int i = 0; i < br.size(); i++) {
+  for (int i = 0; i < static_cast<int>(br.size()); i++) {
     BranchChannel* bchptr = new BranchChannel(br.at(i), ch.at(i));
     if (cuts.at(i) != nullptr) {
       if (!cuts.at(i)->Apply(*bchptr)) {
@@ -71,7 +71,7 @@ double AnalysisEntry::FillVariable(const Variable& var, std::vector<const Branch
   std::vector<size_t> id_vec;
   bch_vec.reserve(br.size());
   id_vec.reserve(br.size());
-  for (int i = 0; i < br.size(); i++) {
+  for (int i = 0; i < static_cast<int>(br.size()); i++) {
     BranchChannel* bchptr = new BranchChannel(br.at(i), id.at(i));
     bch_vec.emplace_back(bchptr);
     id_vec.emplace_back(br.at(i)->GetId());
diff --git a/infra/Branch.cpp b/infra/Branch.cpp
@@ -169,6 +169,12 @@ void Branch::CopyContentsRaw(Branch* other) {
       *ANALYSISTREE_UTILS_GET<EventHeader*>(data_) = *ANALYSISTREE_UTILS_GET<EventHeader*>(other->data_);
       break;
     }
+    case DetType::kGeneric: {
+      *ANALYSISTREE_UTILS_GET<GenericDetector*>(data_) = *ANALYSISTREE_UTILS_GET<GenericDetector*>(other->data_);
+      break;
+    }
+    default:
+      throw std::runtime_error("Branch::CopyContentsRaw(): unexpected branch type of 'this'");
   }
 }
 
diff --git a/infra/GenericContainerFiller.cpp b/infra/GenericContainerFiller.cpp
@@ -55,7 +55,7 @@ void GenericContainerFiller::Init() {
 
   config_.AddBranchConfig(branchConfig);
 
-  for (int iV = 0; iV < branch_values_.size(); iV++) {
+  for (int iV = 0; iV < static_cast<int>(branch_values_.size()); iV++) {
     SetAddressFICS(branch_map_.at(iV).name_, branch_map_.at(iV), branch_values_.at(iV));
   }
 
@@ -95,8 +95,8 @@ void GenericContainerFiller::Finish() {
 void GenericContainerFiller::Run(int nEntries) {
   Init();
 
-  const size_t nTreeEntries = tree_in_->GetEntries();
-  const size_t nRunEntries = (nEntries < 0 || nEntries > nTreeEntries) ? nTreeEntries : nEntries;
+  const int nTreeEntries = tree_in_->GetEntries();
+  const int nRunEntries = (nEntries < 0 || nEntries > nTreeEntries) ? nTreeEntries : nEntries;
 
   int previousTriggerVar{-799};
   for (int iEntry = 0; iEntry < nRunEntries; iEntry++) {
@@ -108,8 +108,8 @@ void GenericContainerFiller::Run(int nEntries) {
 }
 
 int GenericContainerFiller::DetermineFieldIdByName(const std::vector<IndexMap>& iMap, const std::string& name) {
-  auto distance = std::distance(iMap.begin(), std::find_if(iMap.begin(), iMap.end(), [&name](const IndexMap& p) { return p.name_ == name; }));
-  if (distance == iMap.size()) throw std::runtime_error("DetermineFieldIdByName(): name " + name + " is missing");
+  const auto distance = static_cast<int>(std::distance(iMap.begin(), std::find_if(iMap.begin(), iMap.end(), [&name](const IndexMap& p) { return p.name_ == name; })));
+  if (distance == static_cast<int>(iMap.size())) throw std::runtime_error("DetermineFieldIdByName(): name " + name + " is missing");
   return distance;
 }
 
@@ -126,7 +126,7 @@ void GenericContainerFiller::SetAddressFICS(const std::string& branchName, const
 }
 
 void GenericContainerFiller::SetFieldsFICS(const std::vector<IndexMap>& imap, Container& container, const std::vector<FICS>& ficc) {
-  for (int iV = 0; iV < ficc.size(); iV++) {
+  for (int iV = 0; iV < static_cast<int>(ficc.size()); iV++) {
     if (imap.at(iV).field_type_ == "TLeafF") container.SetField(ficc.at(iV).float_, imap.at(iV).index_);
     else if (imap.at(iV).field_type_ == "TLeafI")
       container.SetField(ficc.at(iV).int_, imap.at(iV).index_);
@@ -137,4 +137,4 @@ void GenericContainerFiller::SetFieldsFICS(const std::vector<IndexMap>& imap, Co
     else
       throw std::runtime_error("GenericContainerFiller::SetFieldsFICS(): unsupported filed type " + imap.at(iV).field_type_);
   }
-}
+}
diff --git a/infra/HelperFunctions.hpp b/infra/HelperFunctions.hpp
@@ -61,7 +61,7 @@ inline std::vector<AnalysisTree::SimpleCut> CreateRangeCuts(const std::vector<fl
   if (precision < 0) precision = evaluateMaxDigisAfterComma(ranges);
 
   std::vector<AnalysisTree::SimpleCut> sliceCuts;
-  for (int iRange = 0; iRange < ranges.size() - 1; iRange++) {
+  for (int iRange = 0; iRange < static_cast<int>(ranges.size()) - 1; iRange++) {
     const std::string cutName = cutNamePrefix + ToStringWithPrecision(ranges.at(iRange), precision) + "_" + ToStringWithPrecision(ranges.at(iRange + 1), precision);
     sliceCuts.emplace_back(AnalysisTree::RangeCut(branchFieldName, ranges.at(iRange), ranges.at(iRange + 1), cutName));
   }
diff --git a/infra/SimpleCut.cpp b/infra/SimpleCut.cpp
@@ -43,8 +43,8 @@ SimpleCut EqualsCut(const Variable& var, int value, const std::string& title) {
   return {var, value, title};
 }
 
-SimpleCut OpenCut(const std::string& branchName, const std::string& title) {
-  return SimpleCut({branchName + ".ones"}, [](const std::vector<double>& par) { return true; });
+SimpleCut OpenCut(const std::string& branchName) {
+  return SimpleCut({branchName + ".ones"}, [](const std::vector<double>&) { return true; });
 }
 
 SimpleCut::SimpleCut(const Variable& var, int value, std::string title) : title_(std::move(title)) {
diff --git a/infra/SimpleCut.hpp b/infra/SimpleCut.hpp
@@ -89,7 +89,7 @@ class SimpleCut {
   * is iterated and an iteration with no-cut is needed)
   * @param branchName name of the branch, which is present in other cuts
   */
-  friend SimpleCut OpenCut(const std::string& branchName, const std::string& title);
+  friend SimpleCut OpenCut(const std::string& branchName);
 
   /**
    * @brief Evaluates cut
@@ -139,7 +139,7 @@ SimpleCut RangeCut(const std::string& variable_name, double lo, double hi, const
 SimpleCut EqualsCut(const std::string& variable_name, int value, const std::string& title = "");
 SimpleCut RangeCut(const Variable& var, double lo, double hi, const std::string& title = "");
 SimpleCut EqualsCut(const Variable& var, int value, const std::string& title = "");
-SimpleCut OpenCut(const std::string& branchName, const std::string& title = "alwaysTrue");
+SimpleCut OpenCut(const std::string& branchName);
 
 }// namespace AnalysisTree
 #endif//ANALYSISTREE_SIMPLECUT_H
diff --git a/infra/Variable.cpp b/infra/Variable.cpp
@@ -79,7 +79,7 @@ double Variable::GetValue(std::vector<const BranchChannel*>& bch, std::vector<si
   vars_.clear();
   for (const auto& field : fields_) {
     bool success{false};
-    for (int i = 0; i < bch.size(); i++) {
+    for (int i = 0; i < static_cast<int>(bch.size()); i++) {
       if (field.GetBranchId() == id.at(i)) {
         vars_.emplace_back(bch.at(i)->Value(field));
         success = true;

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ void BranchConfig::GenerateId() {`
`14`	`14`	`id_ = id_hasher(name_);`
`15`	`15`	`}`
`16`	`16`
`17`		`-BranchConfig::BranchConfig(std::string name, DetType type, std::string title) : name_(std::move(name)), type_(type), title_(std::move(title)) {`
	`17`	`+BranchConfig::BranchConfig(std::string name, DetType type, std::string title) : name_(std::move(name)), title_(std::move(title)), type_(type) {`
`18`	`18`	`GenerateId();`
`19`	`19`
`20`	`20`	`if (type_ == DetType::kTrack) {`
`@@ -156,12 +156,12 @@ void VectorConfig<T>::Print() const {`
`156`	`156`	`std::vector<std::string> result;`
`157`	`157`	`std::vector<int> newlinepositions{-1};`
`158`	`158`	`int it{0};`
`159`		`- while (it < std::string::npos) {`
	`159`	`+ while (it < static_cast<int>(std::string::npos)) {`
`160`	`160`	`it = input.find("\n", it + 1);`
`161`	`161`	`newlinepositions.emplace_back(it);`
`162`	`162`	`}`
`163`	`163`	`newlinepositions.back() = input.size();`
`164`		`- for (int ip = 0; ip < newlinepositions.size() - 1; ++ip) {`
	`164`	`+ for (int ip = 0; ip < static_cast<int>(newlinepositions.size()) - 1; ++ip) {`
`165`	`165`	`result.emplace_back(input.substr(newlinepositions.at(ip) + 1, newlinepositions.at(ip + 1) - newlinepositions.at(ip) - 1));`
`166`	`166`	`}`
`167`	`167`	`return result;`
`@@ -174,7 +174,7 @@ void VectorConfig<T>::Print() const {`
`174`	`174`	`} else {`
`175`	`175`	`auto est = SplitString(entry.second.title_);`
`176`	`176`	`print_row({{std::to_string(entry.second.id_), 10}, {entry.first, name_strlen}, {est.at(0), 50}});`
`177`		`- for (int iest = 1; iest < est.size(); ++iest) {`
	`177`	`+ for (int iest = 1; iest < static_cast<int>(est.size()); ++iest) {`
`178`	`178`	`print_row({{"", 10}, {"", name_strlen}, {est.at(iest), 50}});`
`179`	`179`	`}`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@ TEST(Configuration, Basics) {`
`31`	`31`	`EXPECT_EQ(config.GetNumberOfBranches(), 1);`
`32`	`32`	`// EXPECT_EQ(config.GetLastId(), 0);`
`33`	`33`
`34`		`- const auto& br1 = config.GetBranchConfig("RecTrack");`
`35`		`- // EXPECT_EQ(br1.GetId(), 0);`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`TEST(Configuration, Match) {`
Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,12 @@ void Branch::CopyContentsRaw(Branch* other) {`
`169`	`169`	`ANALYSISTREE_UTILS_GET<EventHeader>(data_) = ANALYSISTREE_UTILS_GET<EventHeader>(other->data_);`
`170`	`170`	`break;`
`171`	`171`	`}`
	`172`	`+ case DetType::kGeneric: {`
	`173`	`+ ANALYSISTREE_UTILS_GET<GenericDetector>(data_) = ANALYSISTREE_UTILS_GET<GenericDetector>(other->data_);`
	`174`	`+ break;`
	`175`	`+ }`
	`176`	`+ default:`
	`177`	`+ throw std::runtime_error("Branch::CopyContentsRaw(): unexpected branch type of 'this'");`
`172`	`178`	`}`
`173`	`179`	`}`
`174`	`180`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ inline std::vector<AnalysisTree::SimpleCut> CreateRangeCuts(const std::vector<fl`
`61`	`61`	`if (precision < 0) precision = evaluateMaxDigisAfterComma(ranges);`
`62`	`62`
`63`	`63`	`std::vector<AnalysisTree::SimpleCut> sliceCuts;`
`64`		`- for (int iRange = 0; iRange < ranges.size() - 1; iRange++) {`
	`64`	`+ for (int iRange = 0; iRange < static_cast<int>(ranges.size()) - 1; iRange++) {`
`65`	`65`	`const std::string cutName = cutNamePrefix + ToStringWithPrecision(ranges.at(iRange), precision) + "_" + ToStringWithPrecision(ranges.at(iRange + 1), precision);`
`66`	`66`	`sliceCuts.emplace_back(AnalysisTree::RangeCut(branchFieldName, ranges.at(iRange), ranges.at(iRange + 1), cutName));`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ SimpleCut EqualsCut(const Variable& var, int value, const std::string& title) {`
`43`	`43`	`return {var, value, title};`
`44`	`44`	`}`
`45`	`45`
`46`		`-SimpleCut OpenCut(const std::string& branchName, const std::string& title) {`
`47`		`- return SimpleCut({branchName + ".ones"}, [](const std::vector<double>& par) { return true; });`
	`46`	`+SimpleCut OpenCut(const std::string& branchName) {`
	`47`	`+ return SimpleCut({branchName + ".ones"}, [](const std::vector<double>&) { return true; });`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`SimpleCut::SimpleCut(const Variable& var, int value, std::string title) : title_(std::move(title)) {`