Merge branch 'main' into chore-use-ranges-find

Author: kodiakhq[bot]

CMakeLists.txt

@@ -242,7 +242,7 @@ endif()
 # they can be easily upgraded, although they might not be used if the
 # dependency is included via `add_subdirectory(...)`.
 set(_acts_actsvg_version 0.4.56)
-set(_acts_boost_version 1.77.0) # first version with C++20 support
+set(_acts_boost_version 1.78.0)
 set(_acts_dd4hep_version 1.26)
 set(_acts_geant4_version 11.1.3)
 set(_acts_edm4hep_version 0.10.5)
@@ -266,10 +266,6 @@ set(_acts_algebraplugins_version 0.28.0)
 set(_acts_annoy_version 1.17.3)
 set(_acts_fastjet_version 3.4.1)
 
-# recommended dependency version. if there is an opportunity to reach
-# this version we will try so.
-set(_acts_boost_recommended_version 1.78.0)
-
 # Help with compiler flags discovery
 include(ActsFunctions)
 
@@ -296,13 +292,6 @@ if(ACTS_SETUP_BOOST)
         find_package(Boost ${_acts_boost_version} REQUIRED COMPONENTS)
     endif()
 
-    if(Boost_VERSION VERSION_LESS _acts_boost_recommended_version)
-        message(
-            WARNING
-            "Found Boost ${Boost_VERSION} - recommended is at least ${_acts_boost_recommended_version}"
-        )
-    endif()
-
     if(Boost_VERSION VERSION_EQUAL "1.85.0")
         set(_boost_version_severity WARNING)
         if(ACTS_BUILD_EXAMPLES)

Examples/Algorithms/Fatras/src/FatrasSimulation.cpp

@@ -39,8 +39,6 @@
 #include <utility>
 #include <vector>
 
-#include <boost/version.hpp>
-
 namespace {
 
 /// Simple struct to select surfaces where hits should be generated.
@@ -266,34 +264,11 @@ ActsExamples::ProcessCode ActsExamples::FatrasSimulation::execute(
   }
 
   // order output containers
-#if BOOST_VERSION >= 107800
   SimParticleStateContainer particlesInitial(particlesInitialUnordered.begin(),
                                              particlesInitialUnordered.end());
   SimParticleStateContainer particlesFinal(particlesFinalUnordered.begin(),
                                            particlesFinalUnordered.end());
   SimHitContainer simHits(simHitsUnordered.begin(), simHitsUnordered.end());
-#else
-  // working around a nasty boost bug
-  // https://github.com/boostorg/container/issues/244
-
-  SimParticleStateContainer particlesInitial;
-  SimParticleStateContainer particlesFinal;
-  SimHitContainer simHits;
-
-  particlesInitial.reserve(particlesInitialUnordered.size());
-  particlesFinal.reserve(particlesFinalUnordered.size());
-  simHits.reserve(simHitsUnordered.size());
-
-  for (const auto &p : particlesInitialUnordered) {
-    particlesInitial.insert(p);
-  }
-  for (const auto &p : particlesFinalUnordered) {
-    particlesFinal.insert(p);
-  }
-  for (const auto &h : simHitsUnordered) {
-    simHits.insert(h);
-  }
-#endif
 
   SimParticleContainer particlesSimulated;
   particlesSimulated.reserve(particlesInitial.size());

Examples/Algorithms/Geant4/src/Geant4Simulation.cpp

@@ -43,7 +43,6 @@
 #include <G4VUserPhysicsList.hh>
 #include <G4Version.hh>
 #include <Randomize.hh>
-#include <boost/version.hpp>
 
 namespace ActsExamples {
 
@@ -308,16 +307,8 @@ ProcessCode Geant4Simulation::execute(const AlgorithmContext& ctx) const {
       ctx, SimParticleContainer(eventStore().particlesSimulated.begin(),
                                 eventStore().particlesSimulated.end()));
 
-#if BOOST_VERSION < 107800
-  SimHitContainer container;
-  for (const auto& hit : eventStore().hits) {
-    container.insert(hit);
-  }
-  m_outputSimHits(ctx, std::move(container));
-#else
   m_outputSimHits(
       ctx, SimHitContainer(eventStore().hits.begin(), eventStore().hits.end()));
-#endif
 
   // Output the propagation summaries if requested
   if (m_cfg.recordPropagationSummaries) {

Examples/Algorithms/Geant4/src/SensitiveSteppingAction.cpp

@@ -33,9 +33,6 @@
 #include <G4UnitsTable.hh>
 #include <G4VPhysicalVolume.hh>
 #include <G4VTouchable.hh>
-#include <boost/version.hpp>
-
-#if BOOST_VERSION >= 107800
 #include <boost/describe.hpp>
 
 BOOST_DESCRIBE_ENUM(G4StepStatus, fWorldBoundary, fGeomBoundary,
@@ -49,7 +46,6 @@ BOOST_DESCRIBE_ENUM(G4ProcessType, fNotDefined, fTransportation,
 
 BOOST_DESCRIBE_ENUM(G4TrackStatus, fAlive, fStopButAlive, fStopAndKill,
                     fKillTrackAndSecondaries, fSuspend, fPostponeToNextEvent);
-#endif
 
 namespace {
 
@@ -242,12 +238,9 @@ void SensitiveSteppingAction::UserSteppingAction(const G4Step* step) {
       (postStepPoint->GetProcessDefinedStep()->GetProcessType() == fDecay);
 
   auto print = [](auto s) {
-#if BOOST_VERSION >= 107800
     return boost::describe::enum_to_string(s, "unmatched");
-#else
-    return s;
-#endif
   };
+
   ACTS_VERBOSE("status: pre="
                << print(preStepPoint->GetStepStatus())
                << ", post=" << print(postStepPoint->GetStepStatus())

Examples/Framework/include/ActsExamples/EventData/Index.hpp

@@ -53,15 +53,10 @@ inline InverseMultimap<value_t> invertIndexMultimap(
 
   // adopting the unordered sequence will reestablish the correct order
   InverseMultimap<value_t> inverse;
-#if BOOST_VERSION < 107800
-  for (const auto& i : unordered) {
-    inverse.insert(i);
-  }
-#else
+
   std::ranges::sort(unordered);
   inverse.insert(boost::container::ordered_range_t{}, unordered.begin(),
                  unordered.end());
-#endif
 
   return inverse;
 }

Examples/Scripts/MaterialMapping/MaterialComposition.cpp

@@ -20,22 +20,16 @@
 
 #include <TApplication.h>
 #include <boost/program_options.hpp>
-#include <boost/version.hpp>
+#include <boost/timer/progress_display.hpp>
 #include <nlohmann/json.hpp>
 
 #define BOOST_AVAILABLE 1
-#if BOOST_VERSION < 107200
-// Boost <=1.71 and lower do not have progress_display.hpp as a replacement yet
-#include <boost/progress.hpp>
-
-using progress_display = boost::progress_display;
-#else
 // Boost >=1.72 can use this as a replacement
 #include <boost/timer/progress_display.hpp>
 
 using progress_display = boost::timer::progress_display;
-#endif
 
+// this must be last
 #include "materialComposition.C"
 
 using namespace boost::program_options;

Examples/Scripts/TrackingPerformance/TrackSummary.cpp

@@ -23,21 +23,12 @@
 
 #include <TApplication.h>
 #include <boost/program_options.hpp>
-#include <boost/version.hpp>
+#include <boost/timer/progress_display.hpp>
 #include <nlohmann/json.hpp>
 
 #define BOOST_AVAILABLE 1
-#if BOOST_VERSION < 107200
-// Boost <=1.71 and lower do not have progress_display.hpp as a replacement yet
-#include <boost/progress.hpp>
-
-using progress_display = boost::progress_display;
-#else
-// Boost >=1.72 can use this as a replacement
-#include <boost/timer/progress_display.hpp>
 
 using progress_display = boost::timer::progress_display;
-#endif
 
 #define NLOHMANN_AVAILABLE 1
 #include "trackSummaryAnalysis.C"
@@ -47,7 +38,7 @@ using namespace boost::program_options;
 using Interval = ActsExamples::Options::Interval;
 using VariableReals = ActsExamples::Options::VariableReals;
 
-int main(int argc, char** argv) {
+int main(int argc, char **argv) {
   std::cout << "*** ACTS Perigee parameters and Track summary plotting "
             << std::endl;
 
@@ -95,14 +86,14 @@ int main(int argc, char** argv) {
     // Define the parameters for the residual/pull analysis
     std::vector<std::string> resPullPars = {"d0",  "z0",   "phi0", "theta0",
                                             "qop", "time", "pt"};
-    for (const auto& rp : resPullPars) {
+    for (const auto &rp : resPullPars) {
       ao(rp.c_str(), bool_switch(),
          (std::string("Residual/pulls for ") + rp).c_str());
     }
     // Define the auxiliary track information
     std::vector<std::string> auxPars = {"chi2ndf", "measurements", "holes",
                                         "outliers", "shared"};
-    for (const auto& aux : auxPars) {
+    for (const auto &aux : auxPars) {
       ao(aux.c_str(), bool_switch(),
          (std::string("Auxiliary information for ") + aux).c_str());
     }
@@ -151,7 +142,7 @@ int main(int argc, char** argv) {
       ptBorders = {0., std::numeric_limits<double>::infinity()};
     }
 
-    TApplication* tApp =
+    TApplication *tApp =
         vm["silent"].as<bool>()
             ? nullptr
             : new TApplication("TrackSummary", nullptr, nullptr);
@@ -198,7 +189,7 @@ int main(int argc, char** argv) {
       tApp->Run();
     }
 
-  } catch (std::exception& e) {
+  } catch (std::exception &e) {
     std::cerr << e.what() << "\n";
   }