refactor: Split particle selection in Examples

CI/physmon/workflows/physmon_simulation.py

@@ -8,7 +8,6 @@
 from acts.examples.simulation import (
     addFatras,
     addGeant4,
-    ParticleSelectorConfig,
     addPythia8,
 )
 
@@ -58,7 +57,7 @@
                     acts.PdgParticle.eElectron,
                 ]
             ],
-            outputParticles="particles_input",
+            outputParticles="particles_generated",
             outputVertices="vertices_input",
             randomNumbers=rnd,
         )
@@ -67,7 +66,7 @@
     s.addWriter(
         acts.examples.RootParticleWriter(
             level=acts.logging.INFO,
-            inputParticles="particles_input",
+            inputParticles="particles_generated",
             filePath=tp / "particles.root",
         )
     )
@@ -78,9 +77,7 @@
         setup.field,
         rnd,
         enableInteractions=True,
-        preSelectParticles=None,
-        postSelectParticles=ParticleSelectorConfig(removeSecondaries=True),
-        inputParticles="particles_input",
+        inputParticles="particles_generated",
         outputParticles="particles_fatras",
         outputSimHits="simhits_fatras",
         outputDirRoot=tp / "fatras",
@@ -92,12 +89,10 @@
         setup.trackingGeometry,
         setup.field,
         rnd,
-        preSelectParticles=None,
-        postSelectParticles=ParticleSelectorConfig(removeSecondaries=True),
         killVolume=setup.trackingGeometry.highestTrackingVolume,
         killAfterTime=25 * u.ns,
         killSecondaries=True,
-        inputParticles="particles_input",
+        inputParticles="particles_generated",
         outputParticles="particles_geant4",
         outputSimHits="simhits_geant4",
         outputDirRoot=tp / "geant4",

CI/physmon/workflows/physmon_trackfinding_1muon.py

@@ -11,9 +11,10 @@
     EtaConfig,
     PhiConfig,
     ParticleConfig,
-    ParticleSelectorConfig,
     addFatras,
     addDigitization,
+    ParticleSelectorConfig,
+    addDigiParticleSelection,
 )
 
 from acts.examples.reconstruction import (
@@ -72,11 +73,6 @@ def run_ckf_tracking(label, seeding):
             setup.field,
             enableInteractions=True,
             rnd=rnd,
-            postSelectParticles=ParticleSelectorConfig(
-                pt=(0.9 * u.GeV, None),
-                hits=(9, None),
-                removeNeutral=True,
-            ),
         )
 
         addDigitization(
@@ -87,6 +83,15 @@ def run_ckf_tracking(label, seeding):
             rnd=rnd,
         )
 
+        addDigiParticleSelection(
+            s,
+            ParticleSelectorConfig(
+                pt=(0.9 * u.GeV, None),
+                measurements=(9, None),
+                removeNeutral=True,
+            ),
+        )
+
         addSeeding(
             s,
             setup.trackingGeometry,

CI/physmon/workflows/physmon_trackfinding_4muon_50vertices.py

@@ -11,9 +11,10 @@
     EtaConfig,
     PhiConfig,
     ParticleConfig,
-    ParticleSelectorConfig,
     addFatras,
     addDigitization,
+    ParticleSelectorConfig,
+    addDigiParticleSelection,
 )
 from acts.examples.reconstruction import (
     addSeeding,
@@ -69,11 +70,6 @@
         setup.trackingGeometry,
         setup.field,
         rnd=rnd,
-        postSelectParticles=ParticleSelectorConfig(
-            pt=(0.9 * u.GeV, None),
-            hits=(9, None),
-            removeNeutral=True,
-        ),
     )
 
     addDigitization(
@@ -84,6 +80,15 @@
         rnd=rnd,
     )
 
+    addDigiParticleSelection(
+        s,
+        ParticleSelectorConfig(
+            pt=(0.9 * u.GeV, None),
+            measurements=(9, None),
+            removeNeutral=True,
+        ),
+    )
+
     addSeeding(
         s,
         setup.trackingGeometry,

CI/physmon/workflows/physmon_trackfinding_ttbar_pu200.py

@@ -7,9 +7,11 @@
 import acts
 from acts.examples.simulation import (
     addPythia8,
+    ParticleSelectorConfig,
+    addGenParticleSelection,
     addFatras,
     addDigitization,
-    ParticleSelectorConfig,
+    addDigiParticleSelection,
 )
 from acts.examples.reconstruction import (
     addSeeding,
@@ -61,20 +63,19 @@
         outputDirRoot=tp,
     )
 
+    addGenParticleSelection(
+        s,
+        ParticleSelectorConfig(
+            rho=(0.0, 24 * u.mm),
+            absZ=(0.0, 1.0 * u.m),
+        ),
+    )
+
     addFatras(
         s,
         setup.trackingGeometry,
         setup.field,
         rnd=rnd,
-        preSelectParticles=ParticleSelectorConfig(
-            rho=(0.0, 24 * u.mm),
-            absZ=(0.0, 1.0 * u.m),
-        ),
-        postSelectParticles=ParticleSelectorConfig(
-            pt=(0.5 * u.GeV, None),
-            hits=(9, None),
-            removeNeutral=True,
-        ),
     )
 
     addDigitization(
@@ -85,6 +86,15 @@
         rnd=rnd,
     )
 
+    addDigiParticleSelection(
+        s,
+        ParticleSelectorConfig(
+            pt=(0.5 * u.GeV, None),
+            measurements=(9, None),
+            removeNeutral=True,
+        ),
+    )
+
     addSeeding(
         s,
         setup.trackingGeometry,

Examples/Framework/include/ActsExamples/Framework/Sequencer.hpp

@@ -177,7 +177,7 @@ class Sequencer {
   std::vector<SequenceElementWithFpeResult> m_sequenceElements;
   std::unique_ptr<const Acts::Logger> m_logger;
 
-  std::unordered_map<std::string, std::string> m_whiteboardObjectAliases;
+  std::unordered_multimap<std::string, std::string> m_whiteboardObjectAliases;
 
   std::unordered_map<std::string, const DataHandleBase *> m_whiteBoardState;
 

Examples/Framework/include/ActsExamples/Framework/WhiteBoard.hpp

@@ -18,7 +18,6 @@
 #include <stdexcept>
 #include <string>
 #include <string_view>
-#include <type_traits>
 #include <typeinfo>
 #include <unordered_map>
 #include <utility>
@@ -34,9 +33,10 @@ namespace ActsExamples {
 /// Its lifetime is bound to the lifetime of the white board.
 class WhiteBoard {
  public:
-  WhiteBoard(std::unique_ptr<const Acts::Logger> logger =
-                 Acts::getDefaultLogger("WhiteBoard", Acts::Logging::INFO),
-             std::unordered_map<std::string, std::string> objectAliases = {});
+  WhiteBoard(
+      std::unique_ptr<const Acts::Logger> logger =
+          Acts::getDefaultLogger("WhiteBoard", Acts::Logging::INFO),
+      std::unordered_multimap<std::string, std::string> objectAliases = {});
 
   // A WhiteBoard holds unique elements and can not be copied
   WhiteBoard(const WhiteBoard& other) = delete;
@@ -82,7 +82,7 @@ class WhiteBoard {
 
   std::unique_ptr<const Acts::Logger> m_logger;
   std::unordered_map<std::string, std::shared_ptr<IHolder>> m_store;
-  std::unordered_map<std::string, std::string> m_objectAliases;
+  std::unordered_multimap<std::string, std::string> m_objectAliases;
 
   const Acts::Logger& logger() const { return *m_logger; }
 
@@ -100,7 +100,7 @@ class WhiteBoard {
 
 inline ActsExamples::WhiteBoard::WhiteBoard(
     std::unique_ptr<const Acts::Logger> logger,
-    std::unordered_map<std::string, std::string> objectAliases)
+    std::unordered_multimap<std::string, std::string> objectAliases)
     : m_logger(std::move(logger)), m_objectAliases(std::move(objectAliases)) {}
 
 template <typename T>
@@ -111,10 +111,14 @@ inline void ActsExamples::WhiteBoard::add(const std::string& name, T&& object) {
   if (m_store.contains(name)) {
     throw std::invalid_argument("Object '" + name + "' already exists");
   }
+
   auto holder = std::make_shared<HolderT<T>>(std::forward<T>(object));
   m_store.emplace(name, holder);
   ACTS_VERBOSE("Added object '" << name << "' of type " << typeid(T).name());
-  if (auto it = m_objectAliases.find(name); it != m_objectAliases.end()) {
+
+  // deal with aliases
+  auto range = m_objectAliases.equal_range(name);
+  for (auto it = range.first; it != range.second; ++it) {
     m_store[it->second] = holder;
     ACTS_VERBOSE("Added alias object '" << it->second << "'");
   }

Examples/Framework/src/Framework/Sequencer.cpp

@@ -9,7 +9,6 @@
 #include "ActsExamples/Framework/Sequencer.hpp"
 
 #include "Acts/Plugins/FpeMonitoring/FpeMonitor.hpp"
-#include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/Logger.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
 #include "ActsExamples/Framework/DataHandle.hpp"
@@ -26,9 +25,7 @@
 #include <atomic>
 #include <cctype>
 #include <chrono>
-#include <cstdint>
 #include <cstdlib>
-#include <exception>
 #include <fstream>
 #include <functional>
 #include <iterator>
@@ -256,20 +253,26 @@ void Sequencer::addElement(const std::shared_ptr<SequenceElement>& element) {
 
 void Sequencer::addWhiteboardAlias(const std::string& aliasName,
                                    const std::string& objectName) {
-  auto [it, success] =
-      m_whiteboardObjectAliases.insert({objectName, aliasName});
-  if (!success) {
-    ACTS_INFO("Key '" << objectName << "' aliased to '" << aliasName
-                      << "' already set");
-    return;
+  const auto range = m_whiteboardObjectAliases.equal_range(objectName);
+  for (auto it = range.first; it != range.second; ++it) {
+    const auto& [key, value] = *it;
+    if (value == aliasName) {
+      ACTS_INFO("Key '" << objectName << "' aliased to '" << aliasName
+                        << "' already set");
+      return;
+    }
   }
 
-  ACTS_INFO("Key '" << objectName << "' aliased to '" << aliasName << "'");
+  m_whiteboardObjectAliases.insert({objectName, aliasName});
 
-  if (auto oit = m_whiteBoardState.find(objectName);
-      oit != m_whiteBoardState.end()) {
-    m_whiteBoardState[aliasName] = oit->second;
+  auto oit = m_whiteBoardState.find(objectName);
+  if (oit == m_whiteBoardState.end()) {
+    ACTS_ERROR("Key '" << objectName << "' does not exist");
+    return;
   }
+
+  ACTS_INFO("Key '" << objectName << "' aliased to '" << aliasName << "'");
+  m_whiteBoardState[aliasName] = oit->second;
 }
 
 std::vector<std::string> Sequencer::listAlgorithmNames() const {

Examples/Python/python/acts/examples/reconstruction.py

@@ -2149,9 +2149,9 @@ def addVertexFitting(
         trackParameters = converter.config.outputTrackParameters
 
     tracks = tracks if tracks is not None else ""
-    inputParticles = "particles_input"
+    inputParticles = "particles"
     selectedParticles = "particles_selected"
-    inputTruthVertices = "vertices_input"
+    inputTruthVertices = "vertices_truth"
 
     if vertexFinder == VertexFinder.Truth:
         findVertices = TruthVertexFinder(
@@ -2245,7 +2245,7 @@ def addSingleSeedVertexFinding(
     )
     s.addAlgorithm(findSingleSeedVertex)
 
-    inputParticles = "particles_input"
+    inputParticles = "particles"
     selectedParticles = "particles_selected"
 
     if outputDirRoot is not None: