Merge branch 'main' into ckf-targetlimit-after-reset

acts-project · Dec 16, 2024 · bb98a62 · bb98a62
2 parents 7938bd9 + ba4cc8c
commit bb98a62
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 820 deletions.
diff --git a/Examples/Algorithms/Fatras/include/ActsExamples/Fatras/FatrasSimulation.hpp b/Examples/Algorithms/Fatras/include/ActsExamples/Fatras/FatrasSimulation.hpp
@@ -18,7 +18,6 @@
 #include "ActsExamples/Framework/ProcessCode.hpp"
 #include "ActsExamples/Framework/RandomNumbers.hpp"
 #include "ActsExamples/MagneticField/MagneticField.hpp"
-#include "ActsFatras/Physics/NuclearInteraction/NuclearInteraction.hpp"
 
 #include <cstddef>
 #include <memory>
@@ -48,8 +47,6 @@ class FatrasSimulation final : public IAlgorithm {
     /// The simulated hits output collection.
     std::string outputSimHits;
     /// Parametrisation of nuclear interaction
-    std::string imputParametrisationNuclearInteraction =
-        "nuclearInteractionParameters";
     /// Random number service.
     std::shared_ptr<const RandomNumbers> randomNumbers;
     /// The tracking geometry that should be used.

diff --git a/Examples/Python/src/ExampleAlgorithms.cpp b/Examples/Python/src/ExampleAlgorithms.cpp
@@ -35,11 +35,10 @@ void addExampleAlgorithms(Context& ctx) {
 
   ACTS_PYTHON_DECLARE_ALGORITHM(
       ActsExamples::FatrasSimulation, mex, "FatrasSimulation", inputParticles,
-      outputParticles, outputSimHits, imputParametrisationNuclearInteraction,
-      randomNumbers, trackingGeometry, magneticField, pMin, emScattering,
-      emEnergyLossIonisation, emEnergyLossRadiation, emPhotonConversion,
-      generateHitsOnSensitive, generateHitsOnMaterial, generateHitsOnPassive,
-      averageHitsPerParticle);
+      outputParticles, outputSimHits, randomNumbers, trackingGeometry,
+      magneticField, pMin, emScattering, emEnergyLossIonisation,
+      emEnergyLossRadiation, emPhotonConversion, generateHitsOnSensitive,
+      generateHitsOnMaterial, generateHitsOnPassive, averageHitsPerParticle);
 
   ACTS_PYTHON_DECLARE_ALGORITHM(ActsExamples::ParticlesPrinter, mex,
                                 "ParticlesPrinter", inputParticles);

diff --git a/Fatras/CMakeLists.txt b/Fatras/CMakeLists.txt
@@ -10,7 +10,6 @@ add_library(
     src/EventData/ProcessType.cpp
     src/Kernel/SimulationError.cpp
     src/Physics/BetheHeitler.cpp
-    src/Physics/NuclearInteraction/NuclearInteraction.cpp
     src/Physics/PhotonConversion.cpp
     src/Physics/StandardInteractions.cpp
     src/Utilities/LandauDistribution.cpp