use extractor

acts-project · Nov 27, 2024 · a45a733 · a45a733
1 parent e88d7a1
commit a45a733
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 11 deletions.
diff --git a/Examples/Python/tests/conftest.py b/Examples/Python/tests/conftest.py
@@ -209,6 +209,13 @@ def _basic_prop_seq_factory(geo, s=None):
             rnd=rng,
         )
 
+        trkParamExtractor = acts.examples.ParticleTrackParamExtractor(
+            level=acts.logging.WARNING,
+            inputParticles="particles_input",
+            outputTrackParameters="params_particles_input",
+        )
+        s.addAlgorithm(trkParamExtractor)
+
         nav = acts.Navigator(trackingGeometry=geo)
         stepper = acts.StraightLineStepper()
 
@@ -218,11 +225,11 @@ def _basic_prop_seq_factory(geo, s=None):
             level=acts.logging.WARNING,
             propagatorImpl=prop,
             sterileLogger=False,
-            inputTrackParameters="particle_track_parameters",
+            inputTrackParameters="params_particles_input",
             outputSummaryCollection="propagation_summary",
         )
-
         s.addAlgorithm(alg)
+
         return s, alg
 
     return _basic_prop_seq_factory

diff --git a/Examples/Python/tests/test_propagation.py b/Examples/Python/tests/test_propagation.py
@@ -60,16 +60,23 @@ def test_steppers(conf_const, trk_geo):
             acts.Propagator(stepper=s, navigator=nav)
         )
 
+        trkParamExtractor = acts.examples.ParticleTrackParamExtractor(
+            level=acts.logging.WARNING,
+            inputParticles="particles_input",
+            outputTrackParameters="params_particles_input",
+        )
+        s.addAlgorithm(trkParamExtractor)
+
         alg = conf_const(
             acts.examples.PropagationAlgorithm,
             level=acts.logging.WARNING,
             propagatorImpl=prop,
-            inputTrackParameters="particle_track_parameters",
+            inputTrackParameters="params_particles_input",
             outputSummaryCollection="propagation_summary",
             sterileLogger=False,
         )
-
         seq.addAlgorithm(alg)
+
         chkAlg = AssertCollectionExistsAlg(
             "propagation_summary", "chk_alg", level=acts.logging.WARNING
         )

diff --git a/Examples/Scripts/Python/material_validation.py b/Examples/Scripts/Python/material_validation.py
@@ -40,16 +40,22 @@ def runMaterialValidation(
         rnd=rnd,
     )
 
+    trkParamExtractor = acts.examples.ParticleTrackParamExtractor(
+        level=acts.logging.INFO,
+        inputParticles="particles_input",
+        outputTrackParameters="params_particles_input",
+    )
+    s.addAlgorithm(trkParamExtractor)
+
     alg = acts.examples.PropagationAlgorithm(
         propagatorImpl=prop,
         level=acts.logging.INFO,
         sterileLogger=True,
         recordMaterialInteractions=True,
-        inputTrackParameters="particle_track_parameters",
+        inputTrackParameters="params_particles_input",
         outputSummaryCollection="propagation_summary",
         outputMaterialCollection="material_tracks",
     )
-
     s.addAlgorithm(alg)
 
     s.addWriter(

diff --git a/Examples/Scripts/Python/material_validation_itk.py b/Examples/Scripts/Python/material_validation_itk.py
@@ -10,6 +10,8 @@
 
 
 def runMaterialValidation(
+    nevents,
+    ntracks,
     trackingGeometry,
     decorators,
     field,
@@ -18,7 +20,8 @@ def runMaterialValidation(
     dumpPropagationSteps=False,
     s=None,
 ):
-    s = s or Sequencer(events=1000, numThreads=-1)
+    # Create a sequencer
+    s = s or Sequencer(events=nevents, numThreads=-1)
 
     rnd = acts.examples.RandomNumbers(seed=42)
 
@@ -44,16 +47,22 @@ def runMaterialValidation(
         rnd=rnd,
     )
 
+    trkParamExtractor = acts.examples.ParticleTrackParamExtractor(
+        level=acts.logging.INFO,
+        inputParticles="particles_input",
+        outputTrackParameters="params_particles_input",
+    )
+    s.addAlgorithm(trkParamExtractor)
+
     alg = acts.examples.PropagationAlgorithm(
         propagatorImpl=prop,
         level=acts.logging.INFO,
         sterileLogger=False,
         recordMaterialInteractions=True,
-        inputTrackParameters="particle_track_parameters",
+        inputTrackParameters="params_particles_input",
         outputPropagationSteps="propagation_steps",
         outputMaterialTracks="material-tracks",
     )
-
     s.addAlgorithm(alg)
 
     s.addWriter(

diff --git a/Examples/Scripts/Python/propagation.py b/Examples/Scripts/Python/propagation.py
@@ -31,6 +31,13 @@ def runPropagation(trackingGeometry, field, outputDir, s=None, decorators=[]):
         rnd=rnd,
     )
 
+    trkParamExtractor = acts.examples.ParticleTrackParamExtractor(
+        level=acts.logging.WARNING,
+        inputParticles="particles_input",
+        outputTrackParameters="params_particles_input",
+    )
+    s.addAlgorithm(trkParamExtractor)
+
     nav = acts.Navigator(trackingGeometry=trackingGeometry)
 
     stepper = acts.EigenStepper(field)
@@ -43,7 +50,7 @@ def runPropagation(trackingGeometry, field, outputDir, s=None, decorators=[]):
         propagatorImpl=propagator,
         level=acts.logging.INFO,
         sterileLogger=True,
-        inputTrackParameters="particle_track_parameters",
+        inputTrackParameters="params_particles_input",
         outputSummaryCollection="propagation_summary",
     )
     s.addAlgorithm(propagationAlgorithm)

diff --git a/Examples/Scripts/Python/vertex_fitting.py b/Examples/Scripts/Python/vertex_fitting.py
@@ -65,9 +65,16 @@ def runVertexFitting(
     if inputTrackSummary is None or inputParticlePath is None:
         logger.info("Using smeared particles")
 
+        trkParamExtractor = acts.examples.ParticleTrackParamExtractor(
+            level=acts.logging.WARNING,
+            inputParticles=selectedParticles,
+            outputTrackParameters="params_particles_input",
+        )
+        s.addAlgorithm(trkParamExtractor)
+
         ptclSmearing = TrackParameterSmearing(
             level=acts.logging.INFO,
-            inputTrackParameters="particle_track_parameters",
+            inputTrackParameters="params_particles_input",
             outputTrackParameters=trackParameters,
             randomNumbers=rnd,
         )