Merge branch 'main' into adopt-physmon-plotting-ranges

CI/physmon/workflows/physmon_ckf_tracking.py

@@ -90,12 +90,12 @@ def run_ckf_tracking(truthSmearedSeeded, truthEstimatedSeeded, label):
             s,
             setup.trackingGeometry,
             setup.field,
-            TruthSeedRanges(pt=(500.0 * u.MeV, None), nHits=(9, None)),
+            TruthSeedRanges(pt=(500 * u.MeV, None), nHits=(9, None)),
             ParticleSmearingSigmas(
                 pRel=0.01
             ),  # only used by SeedingAlgorithm.TruthSmeared
             SeedFinderConfigArg(
-                r=(None, 200 * u.mm),  # rMin=default, 33mm
+                r=(33 * u.mm, 200 * u.mm),
                 deltaR=(1 * u.mm, 60 * u.mm),
                 collisionRegion=(-250 * u.mm, 250 * u.mm),
                 z=(-2000 * u.mm, 2000 * u.mm),
@@ -105,7 +105,7 @@ def run_ckf_tracking(truthSmearedSeeded, truthEstimatedSeeded, label):
                 minPt=500 * u.MeV,
                 impactMax=3 * u.mm,
             ),
-            SeedFinderOptionsArg(bFieldInZ=1.99724 * u.T, beamPos=(0.0, 0.0)),
+            SeedFinderOptionsArg(bFieldInZ=2 * u.T),
             TruthEstimatedSeedingAlgorithmConfigArg(deltaR=(10.0 * u.mm, None)),
             seedingAlgorithm=SeedingAlgorithm.TruthSmeared
             if truthSmearedSeeded

CI/physmon/workflows/physmon_vertexing.py

@@ -17,12 +17,9 @@
 
 from acts.examples.reconstruction import (
     addSeeding,
-    TruthSeedRanges,
-    ParticleSmearingSigmas,
     SeedFinderConfigArg,
     SeedFinderOptionsArg,
     SeedingAlgorithm,
-    TruthEstimatedSeedingAlgorithmConfigArg,
     addCKFTracks,
     addAmbiguityResolution,
     AmbiguityResolutionConfig,
@@ -92,7 +89,7 @@ def run_vertexing(fitter, mu, events):
             setup.trackingGeometry,
             setup.field,
             SeedFinderConfigArg(
-                r=(None, 200 * u.mm),  # rMin=default, 33mm
+                r=(33 * u.mm, 200 * u.mm),
                 deltaR=(1 * u.mm, 60 * u.mm),
                 collisionRegion=(-250 * u.mm, 250 * u.mm),
                 z=(-2000 * u.mm, 2000 * u.mm),
@@ -102,20 +99,18 @@ def run_vertexing(fitter, mu, events):
                 minPt=500 * u.MeV,
                 impactMax=3 * u.mm,
             ),
-            SeedFinderOptionsArg(bFieldInZ=1.99724 * u.T),
+            SeedFinderOptionsArg(bFieldInZ=2 * u.T),
             seedingAlgorithm=SeedingAlgorithm.Default,
             geoSelectionConfigFile=setup.geoSel,
-            rnd=rnd,  # only used by SeedingAlgorithm.TruthSmeared
         )
 
         addCKFTracks(
             s,
             setup.trackingGeometry,
             setup.field,
             TrackSelectorConfig(
-                pt=(500 * u.MeV, None),
                 loc0=(-4.0 * u.mm, 4.0 * u.mm),
-                absEta=(None, 3.0),
+                pt=(500 * u.MeV, None),
                 nMeasurementsMin=6,
             ),
         )

Core/include/Acts/EventData/TrackContainer.hpp

@@ -236,6 +236,13 @@ class TrackContainer {
     container().ensureDynamicColumns_impl(other.container());
   }
 
+  /// Clear the content of the track container
+  template <bool RO = ReadOnly, typename = std::enable_if_t<!RO>>
+  void clear() {
+    m_container->clear();
+    m_traj->clear();
+  }
+
  protected:
   template <typename T, HashedString key, bool RO = ReadOnly,
             typename = std::enable_if_t<!RO>>

Core/src/Material/Interactions.cpp

@@ -201,10 +201,10 @@ float Acts::computeEnergyLossLandau(const MaterialSlab& slab, int /* unused */,
   const auto rq = Acts::RelativisticQuantities(m, qOverP, q);
   const auto eps = computeEpsilon(Ne, thickness, rq);
   const auto dhalf = computeDeltaHalf(I, Ne, rq);
-  const auto t = computeMassTerm(Me, rq);
-  // uses RPP2018 eq. 33.11
+  const auto u = computeMassTerm(Me, rq);
+  // uses RPP2018 eq. 33.12
   const auto running =
-      std::log(t / I) + std::log(eps / I) + 0.2f - rq.beta2 - 2 * dhalf;
+      std::log(u / I) + std::log(eps / I) + 0.2f - rq.beta2 - 2 * dhalf;
   return eps * running;
 }
 

Core/src/TrackFitting/GainMatrixSmoother.cpp

@@ -26,8 +26,6 @@ Result<void> GainMatrixSmoother::calculate(
     const Logger& logger) const {
   ACTS_VERBOSE("Prev. predicted covariance\n"
                << predictedCovariance(prev_ts) << "\n, inverse: \n"
-               << predictedCovariance(prev_ts).inverse()
-               << "\n, regularized inverse: \n"
                << predictedCovariance(prev_ts).inverse());
 
   // Gain smoothing matrix

Examples/Algorithms/TrackFinding/src/TrackFindingAlgorithm.cpp

@@ -134,8 +134,9 @@ ActsExamples::ProcessCode ActsExamples::TrackFindingAlgorithm::execute(
   unsigned int nSeed = 0;
 
   for (std::size_t iseed = 0; iseed < initialParameters.size(); ++iseed) {
-    trackContainerTemp->clear();
-    trackStateContainerTemp->clear();
+    // Clear trackContainerTemp and trackStateContainerTemp
+    tracksTemp.clear();
+
     auto result =
         (*m_cfg.findTracks)(initialParameters.at(iseed), options, tracksTemp);
     m_nTotalSeeds++;

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

@@ -17,6 +17,6 @@ using SimBarcode = ::ActsFatras::Barcode;
 
 using SimHit = ::ActsFatras::Hit;
 /// Store hits ordered by geometry identifier.
-using SimHitContainer = GeometryIdMultiset<::ActsFatras::Hit>;
+using SimHitContainer = GeometryIdMultiset<SimHit>;
 
 }  // end of namespace ActsExamples

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

@@ -50,8 +50,7 @@ struct SecondaryVertexIdGetter {
 using SimParticle = ::ActsFatras::Particle;
 /// Store particles ordered by particle identifier.
 using SimParticleContainer =
-    ::boost::container::flat_set<::ActsFatras::Particle,
-                                 detail::CompareParticleId>;
+    ::boost::container::flat_set<SimParticle, detail::CompareParticleId>;
 
 /// Iterate over groups of particles belonging to the same primary vertex.
 inline GroupBy<SimParticleContainer::const_iterator,

Examples/Scripts/Python/digitization.py

@@ -27,6 +27,7 @@ def runDigitization(
         PhiConfig,
         ParticleConfig,
         addFatras,
+        addDigitization,
     )
 
     s = s or acts.examples.Sequencer(
@@ -60,7 +61,6 @@ def runDigitization(
         field,
         rnd=rnd,
     )
-    from acts.examples.simulation import addDigitization
 
     addDigitization(
         s,

Examples/Scripts/Python/full_chain_odd.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-import os, argparse, pathlib, contextlib, acts, acts.examples
+import os, argparse, pathlib, acts, acts.examples
 from acts.examples.simulation import (
     addParticleGun,
     MomentumConfig,