revert unrelated

Author: andiwand

Examples/Algorithms/Geant4/include/ActsExamples/Geant4/EventStore.hpp

@@ -14,6 +14,7 @@
 #include "ActsExamples/EventData/SimHit.hpp"
 #include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Framework/DataHandle.hpp"
+#include "ActsFatras/EventData/ParticleOutcome.hpp"
 
 #include <set>
 #include <unordered_map>
@@ -65,7 +66,7 @@ struct EventStore {
   /// Particle hit count (for hit indexing)
   std::unordered_map<SimBarcode, std::size_t> particleHitCount;
   /// Particle status
-  std::unordered_map<SimBarcode, ActsFatras::SimulationOutcome> particleOutcome;
+  std::unordered_map<SimBarcode, ActsFatras::ParticleOutcome> particleOutcome;
   /// Geant4 Track ID to Barcode mapping
   std::unordered_map<G4int, SimBarcode> trackIdMapping;
   /// Geant4 Track ID subparticle counter (for subparticle indexing)

Examples/Algorithms/Geant4/src/ParticleKillAction.cpp

@@ -8,10 +8,11 @@
 
 #include "ActsExamples/Geant4/ParticleKillAction.hpp"
 
+#include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Units.hpp"
 #include "ActsExamples/Geant4/AlgebraConverters.hpp"
 #include "ActsFatras/EventData/Barcode.hpp"
-#include "ActsFatras/EventData/SimulationOutcome.hpp"
+#include "ActsFatras/EventData/ParticleOutcome.hpp"
 
 #include <ostream>
 #include <utility>
@@ -62,16 +63,16 @@ void ParticleKillAction::UserSteppingAction(const G4Step* step) {
     const ActsFatras::Barcode particleId = trackIt->second;
     if (outOfVolume) {
       eventStore().particleOutcome[particleId] =
-          ActsFatras::SimulationOutcome::KilledVolumeExit;
+          ActsFatras::ParticleOutcome::KilledVolumeExit;
     } else if (outOfTime) {
       eventStore().particleOutcome[particleId] =
-          ActsFatras::SimulationOutcome::KilledTime;
+          ActsFatras::ParticleOutcome::KilledTime;
     } else if (invalidSecondary) {
       eventStore().particleOutcome[particleId] =
-          ActsFatras::SimulationOutcome::KilledSecondaryParticle;
+          ActsFatras::ParticleOutcome::KilledSecondaryParticle;
     } else if (track->GetTrackStatus() == fStopAndKill) {
       eventStore().particleOutcome[particleId] =
-          ActsFatras::SimulationOutcome::KilledInteraction;
+          ActsFatras::ParticleOutcome::KilledInteraction;
     }
   }
 }

Examples/Algorithms/Geant4/src/ParticleTrackingAction.cpp

@@ -10,10 +10,10 @@
 
 #include "Acts/Definitions/PdgParticle.hpp"
 #include "Acts/Definitions/Units.hpp"
+#include "Acts/Utilities/MultiIndex.hpp"
 #include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Geant4/EventStore.hpp"
 #include "ActsFatras/EventData/Barcode.hpp"
-#include "ActsFatras/EventData/SimulationOutcome.hpp"
 
 #include <cassert>
 #include <ostream>
@@ -130,8 +130,8 @@ SimParticleState ParticleTrackingAction::convert(const G4Track& aTrack,
     numberOfHits = it->second;
   }
 
-  ActsFatras::SimulationOutcome particleOutcome =
-      ActsFatras::SimulationOutcome::Alive;
+  ActsFatras::ParticleOutcome particleOutcome =
+      ActsFatras::ParticleOutcome::Alive;
   if (auto it = eventStore().particleOutcome.find(particleId);
       it != eventStore().particleOutcome.end()) {
     particleOutcome = it->second;

Examples/Algorithms/Geant4/src/SensitiveSteppingAction.cpp

@@ -13,6 +13,7 @@
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Propagator/detail/SteppingLogger.hpp"
 #include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/MultiIndex.hpp"
 #include "ActsExamples/Geant4/AlgebraConverters.hpp"
 #include "ActsExamples/Geant4/EventStore.hpp"
 #include "ActsExamples/Geant4/SensitiveSurfaceMapper.hpp"
@@ -285,9 +286,8 @@ void SensitiveSteppingAction::UserSteppingAction(const G4Step* step) {
 
     assert(std::ranges::all_of(
         buffer, [&](const auto& h) { return h.geometryId() == geoId; }));
-    assert(std::ranges::all_of(buffer, [&](const auto& h) {
-      return h.particleBarcode() == particleId;
-    }));
+    assert(std::ranges::all_of(
+        buffer, [&](const auto& h) { return h.particleId() == particleId; }));
 
     eventStore().numberGeantSteps += buffer.size();
     eventStore().maxStepsForHit =

Examples/Algorithms/Printers/ActsExamples/Printers/ParticlesPrinter.cpp

@@ -12,7 +12,7 @@
 #include "Acts/Utilities/Logger.hpp"
 #include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
-#include "ActsFatras/EventData/GenerationProcess.hpp"
+#include "ActsFatras/EventData/ProcessType.hpp"
 
 #include <ostream>
 #include <stdexcept>

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

@@ -10,7 +10,7 @@
 
 #include "ActsExamples/Utilities/GroupBy.hpp"
 #include "ActsFatras/EventData/Particle.hpp"
-#include "ActsFatras/EventData/SimulationOutcome.hpp"
+#include "ActsFatras/EventData/ParticleOutcome.hpp"
 
 #include <boost/container/flat_set.hpp>
 
@@ -74,7 +74,7 @@ class SimParticle final {
   }
 
   /// Set the process type that generated this particle.
-  SimParticle& setProcess(ActsFatras::GenerationProcess proc) {
+  SimParticle& setProcess(ActsFatras::ProcessType proc) {
     initialState().setProcess(proc);
     finalState().setProcess(proc);
     return *this;
@@ -107,9 +107,7 @@ class SimParticle final {
   /// Particle identifier within an event.
   SimBarcode particleId() const { return initialState().particleId(); }
   /// Which type of process generated this particle.
-  ActsFatras::GenerationProcess process() const {
-    return initialState().process();
-  }
+  ActsFatras::ProcessType process() const { return initialState().process(); }
   /// PDG particle number that identifies the type.
   Acts::PdgParticle pdg() const { return initialState().pdg(); }
   /// Absolute PDG particle number that identifies the type.
@@ -172,9 +170,7 @@ class SimParticle final {
   std::uint32_t numberOfHits() const { return finalState().numberOfHits(); }
 
   /// Particle outcome.
-  ActsFatras::SimulationOutcome outcome() const {
-    return finalState().outcome();
-  }
+  ActsFatras::ParticleOutcome outcome() const { return finalState().outcome(); }
 
  private:
   SimParticleState m_initial;

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

@@ -10,7 +10,7 @@
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "ActsExamples/EventData/SimParticle.hpp"
-#include "ActsFatras/EventData/GenerationProcess.hpp"
+#include "ActsFatras/EventData/ProcessType.hpp"
 
 #include <boost/container/flat_set.hpp>
 
@@ -87,8 +87,7 @@ struct SimVertex {
   /// The vertex four-position
   Acts::Vector4 position4 = Acts::Vector4::Zero();
   /// The vertex process type
-  ActsFatras::GenerationProcess process =
-      ActsFatras::GenerationProcess::eUndefined;
+  ActsFatras::ProcessType process = ActsFatras::ProcessType::eUndefined;
   /// The incoming particles into the vertex
   SimBarcodeContainer incoming;
   /// The outgoing particles from the vertex
@@ -101,9 +100,9 @@ struct SimVertex {
   ///
   /// Associated particles are left empty by default and must be filled by the
   /// user after construction.
-  SimVertex(SimVertexBarcode id_, const Acts::Vector4& position4_,
-            ActsFatras::GenerationProcess process_ =
-                ActsFatras::GenerationProcess::eUndefined)
+  SimVertex(
+      SimVertexBarcode id_, const Acts::Vector4& position4_,
+      ActsFatras::ProcessType process_ = ActsFatras::ProcessType::eUndefined)
       : id(id_), position4(position4_), process(process_) {}
   // explicitly default rule-of-five.
   SimVertex() = default;

Examples/Framework/src/Root/MuonVisualization.cpp

@@ -225,7 +225,7 @@ void visualizeMuonSpacePoints(const std::string& outputPath,
     if (chambId != toChamberId(simHit.geometryId())) {
       continue;
     }
-    const auto simPartItr = simParticles.find(simHit.particleBarcode());
+    const auto simPartItr = simParticles.find(simHit.particleId());
     if (simPartItr == simParticles.end() ||
         (*simPartItr).hypothesis() != ParticleHypothesis::muon()) {
       continue;

Examples/Io/Csv/src/CsvParticleReader.cpp

@@ -16,7 +16,7 @@
 #include "ActsExamples/Io/Csv/CsvInputOutput.hpp"
 #include "ActsExamples/Utilities/Paths.hpp"
 #include "ActsFatras/EventData/Barcode.hpp"
-#include "ActsFatras/EventData/GenerationProcess.hpp"
+#include "ActsFatras/EventData/ProcessType.hpp"
 
 #include <cmath>
 #include <stdexcept>
@@ -69,8 +69,7 @@ ProcessCode CsvParticleReader::read(const AlgorithmContext& ctx) {
                               Acts::PdgParticle{data.particle_type},
                               data.q * Acts::UnitConstants::e,
                               data.m * Acts::UnitConstants::GeV);
-    particle.setProcess(
-        static_cast<ActsFatras::GenerationProcess>(data.process));
+    particle.setProcess(static_cast<ActsFatras::ProcessType>(data.process));
     particle.setPosition4(
         data.vx * Acts::UnitConstants::mm, data.vy * Acts::UnitConstants::mm,
         data.vz * Acts::UnitConstants::mm, data.vt * Acts::UnitConstants::mm);

Examples/Io/Root/src/RootParticleReader.cpp

@@ -13,8 +13,8 @@
 #include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
 #include "ActsExamples/Io/Root/RootUtility.hpp"
-#include "ActsFatras/EventData/GenerationProcess.hpp"
-#include "ActsFatras/EventData/SimulationOutcome.hpp"
+#include "ActsFatras/EventData/ParticleOutcome.hpp"
+#include "ActsFatras/EventData/ProcessType.hpp"
 
 #include <iostream>
 #include <stdexcept>
@@ -121,8 +121,7 @@ ProcessCode RootParticleReader::read(const AlgorithmContext& context) {
   for (unsigned int i = 0; i < nParticles; i++) {
     SimParticle p;
 
-    p.setProcess(
-        static_cast<ActsFatras::GenerationProcess>((*m_process).at(i)));
+    p.setProcess(static_cast<ActsFatras::ProcessType>((*m_process).at(i)));
     p.setPdg(static_cast<Acts::PdgParticle>((*m_particleType).at(i)));
     p.setCharge((*m_q).at(i) * Acts::UnitConstants::e);
     p.setMass((*m_m).at(i) * Acts::UnitConstants::GeV);
@@ -150,7 +149,7 @@ ProcessCode RootParticleReader::read(const AlgorithmContext& context) {
                                  (*m_pathInL0).at(i) * Acts::UnitConstants::mm);
     finalState.setNumberOfHits((*m_numberOfHits).at(i));
     finalState.setOutcome(
-        static_cast<ActsFatras::SimulationOutcome>((*m_outcome).at(i)));
+        static_cast<ActsFatras::ParticleOutcome>((*m_outcome).at(i)));
 
     particles.insert(p);
   }