Merge branch 'main' into feat-root-spacepoint2-reader-writer

Author: andiwand

.github/workflows/devcontainer-ci.yml

@@ -0,0 +1,35 @@
+name: Devcontainer CI
+
+on:
+  push:
+  pull_request:
+    branches:
+      - main
+      - 'release/**'
+      - 'develop/**'
+
+jobs:
+  devcontainer-build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: Install devcontainer CLI
+      run: |
+        npm install -g @devcontainers/cli
+
+    - name: Build devcontainer
+      run: |
+        devcontainer up --workspace-folder .
+
+    - name: Run configure_acts
+      run: |
+        devcontainer exec --workspace-folder . bash -c "configure_acts"
+
+    - name: Run build_acts with ActsCore target
+      run: |
+        devcontainer exec --workspace-folder . bash -c "build_acts --target ActsCore"

Examples/Algorithms/Geant4/src/SensitiveSurfaceMapper.cpp

@@ -303,7 +303,7 @@ bool SensitiveSurfaceMapper::checkMapping(
   std::ranges::sort(allSurfaces);
 
   std::vector<const Acts::Surface*> found;
-  for (const auto [_, surfacePtr] : state.g4VolumeToSurfaces) {
+  for (const auto& [_, surfacePtr] : state.g4VolumeToSurfaces) {
     found.push_back(surfacePtr);
   }
   std::ranges::sort(found);

Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SpacePointMaker.hpp

@@ -75,6 +75,8 @@ class SpacePointMaker final : public IAlgorithm {
   /// @return a process code indication success or failure
   ProcessCode execute(const AlgorithmContext& ctx) const override;
 
+  ProcessCode initialize() override;
+
   /// Const access to the config
   const Config& config() const { return m_cfg; }
 

Examples/Algorithms/TrackFinding/src/SpacePointMaker.cpp

@@ -20,6 +20,7 @@
 #include "ActsExamples/EventData/Measurement.hpp"
 #include "ActsExamples/EventData/SimSpacePoint.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
+#include "ActsExamples/Framework/ProcessCode.hpp"
 #include "ActsExamples/Utilities/GroupBy.hpp"
 
 #include <algorithm>
@@ -91,10 +92,6 @@ ActsExamples::SpacePointMaker::SpacePointMaker(Config cfg,
                             << " geometry selection duplicates");
     m_cfg.geometrySelection.erase(geoSelLastUnique, geoSelEnd);
   }
-  ACTS_INFO("Space point geometry selection:");
-  for (const auto& geoId : m_cfg.geometrySelection) {
-    ACTS_INFO("  " << geoId);
-  }
   auto spBuilderConfig = Acts::SpacePointBuilderConfig();
   spBuilderConfig.trackingGeometry = m_cfg.trackingGeometry;
 
@@ -121,6 +118,15 @@ ActsExamples::SpacePointMaker::SpacePointMaker(Config cfg,
   }
 }
 
+ActsExamples::ProcessCode ActsExamples::SpacePointMaker::initialize() {
+  ACTS_INFO("Space point geometry selection:");
+  for (const auto& geoId : m_cfg.geometrySelection) {
+    ACTS_INFO("  " << geoId);
+  }
+
+  return ProcessCode::SUCCESS;
+}
+
 void ActsExamples::SpacePointMaker::initializeStripPartners() {
   ACTS_INFO("Strip space point geometry selection:");
   for (const auto& geoId : m_cfg.stripGeometrySelection) {

Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepSimInputConverter.hpp

@@ -21,14 +21,19 @@
 
 namespace edm4hep {
 class MCParticle;
-}
+class SimTrackerHit;
+}  // namespace edm4hep
 
 namespace podio {
 class Frame;
 }
 
 namespace ActsExamples {
 
+namespace detail {
+struct ParticleInfo;
+}
+
 class DD4hepDetector;
 
 /// Read particles from EDM4hep.
@@ -54,10 +59,6 @@ class EDM4hepSimInputConverter final : public EDM4hepInputConverter {
     /// Output simulated vertices collection.
     std::string outputSimVertices;
 
-    /// Directory into which to write graphviz files for particles
-    /// Empty string means no output
-    std::string graphvizOutput = "";
-
     /// DD4hep detector for cellID resolution.
     std::shared_ptr<DD4hepDetector> dd4hepDetector;
 
@@ -66,6 +67,15 @@ class EDM4hepSimInputConverter final : public EDM4hepInputConverter {
 
     /// Whether to sort sim hits in time to produce index sequence
     bool sortSimHitsInTime = false;
+
+    std::optional<double> particleRMin = std::nullopt;
+    std::optional<double> particleRMax = std::nullopt;
+
+    std::optional<double> particleZMin = std::nullopt;
+    std::optional<double> particleZMax = std::nullopt;
+
+    std::optional<double> particlePtMin = std::nullopt;
+    std::optional<double> particlePtMax = std::nullopt;
   };
 
   using ParentRelationship = std::unordered_map<std::size_t, std::size_t>;
@@ -83,14 +93,16 @@ class EDM4hepSimInputConverter final : public EDM4hepInputConverter {
   ProcessCode convert(const AlgorithmContext& ctx,
                       const podio::Frame& frame) const override;
 
-  void processChildren(const edm4hep::MCParticle& particle, SimBarcode parentId,
-                       std::vector<SimParticle>& particles,
-                       ParentRelationship& parentRelationship,
-                       std::unordered_map<int, std::size_t>& particleMap,
-                       std::size_t& nSecondaryVertices,
-                       std::size_t& maxGen) const;
+  void processChildren(
+      const edm4hep::MCParticle& particle, SimBarcode parentId,
+      std::vector<SimBarcode>& particles,
+      ParentRelationship& parentRelationship,
+      std::unordered_map<int, detail::ParticleInfo>& particleMap,
+      std::size_t& nSecondaryVertices, std::size_t& maxGen) const;
 
-  static void setSubParticleIds(std::span<SimParticle> particles);
+  static void setSubParticleIds(std::span<SimBarcode> particles);
+
+  bool acceptParticle(const edm4hep::MCParticle& particle) const;
 
   Config m_cfg;
 
@@ -105,9 +117,6 @@ class EDM4hepSimInputConverter final : public EDM4hepInputConverter {
 
   WriteDataHandle<SimVertexContainer> m_outputSimVertices{this,
                                                           "OutputSimVertices"};
-
-  void graphviz(std::ostream& os, const std::vector<SimParticle>& particles,
-                const ParentRelationship& parents) const;
 };
 
 }  // namespace ActsExamples