Merge branch 'main' into maputils

.pre-commit-config.yaml

@@ -86,3 +86,10 @@ repos:
       language: system
       entry: docs/parse_cmake_options.py --write docs/getting_started.md
       files: ^CMakeLists.txt$
+
+  - repo: local
+    hooks:
+    - id: leftover_conflict_markers
+      name: Leftover conflict markers
+      language: system
+      entry: git diff --staged --check

CI/physmon/phys_perf_mon.sh

@@ -20,8 +20,8 @@ shopt -s extglob
 
 
 mode=${1:-all}
-if ! [[ $mode = @(all|kf|gsf|gx2f|fullchains|simulation) ]]; then
-    echo "Usage: $0 <all|kf|gsf|gx2f|fullchains|simulation> (outdir)"
+if ! [[ $mode = @(all|kf|gsf|gx2f|refit_kf|refit_gsf|fullchains|simulation) ]]; then
+    echo "Usage: $0 <all|kf|gsf|gx2f|refit_kf|refit_gsf|fullchains|simulation> (outdir)"
     exit 1
 fi
 
@@ -152,6 +152,12 @@ fi
 if [[ "$mode" == "all" || "$mode" == "gx2f" ]]; then
     run_physmon_gen "Truth Tracking GX2F" "trackfitting_gx2f"
 fi
+if [[ "$mode" == "all" || "$mode" == "refit_kf" ]]; then
+    run_physmon_gen "Truth Tracking KF refit" "trackrefitting_kf"
+fi
+if [[ "$mode" == "all" || "$mode" == "refit_gsf" ]]; then
+    run_physmon_gen "Truth Tracking GSF refit" "trackrefitting_gsf"
+fi
 if [[ "$mode" == "all" || "$mode" == "fullchains" ]]; then
     run_physmon_gen "CKF single muon" "trackfinding_1muon"
     run_physmon_gen "CKF muon 50" "trackfinding_4muon_50vertices"
@@ -411,6 +417,26 @@ if [[ "$mode" == "all" || "$mode" == "gx2f" ]]; then
         --config CI/physmon/config/trackfitting_gx2f.yml
 fi
 
+if [[ "$mode" == "all" || "$mode" == "kf_refit" ]]; then
+    run_histcmp \
+        $outdir/data/trackrefitting_kf/performance_trackrefitting.root \
+        $refdir/trackrefitting_kf/performance_trackrefitting.root \
+        "Truth tracking (KF refit)" \
+        trackrefitting_kf/performance_trackrefitting.html \
+        trackrefitting_kf/performance_trackrefitting_plots \
+        --config CI/physmon/config/trackfitting_kf.yml
+fi
+
+if [[ "$mode" == "all" || "$mode" == "gsf_refit" ]]; then
+    run_histcmp \
+        $outdir/data/trackrefitting_gsf/performance_trackrefitting.root \
+        $refdir/trackrefitting_gsf/performance_trackrefitting.root \
+        "Truth tracking (GSF refit)" \
+        trackrefitting_gsf/performance_trackrefitting.html \
+        trackrefitting_gsf/performance_trackrefitting_plots \
+        --config CI/physmon/config/trackfitting_gsf.yml
+fi
+
 if [[ "$mode" == "all" || "$mode" == "fullchains" ]]; then
     trackfinding "trackfinding | single muon | truth smeared seeding" trackfinding_1muon/truth_smeared
     trackfinding "trackfinding | single muon | truth estimated seeding" trackfinding_1muon/truth_estimated

CI/physmon/workflows/physmon_trackfinding_1muon.py

@@ -11,13 +11,13 @@
     EtaConfig,
     PhiConfig,
     ParticleConfig,
+    ParticleSelectorConfig,
     addFatras,
     addDigitization,
 )
 
 from acts.examples.reconstruction import (
     addSeeding,
-    TruthSeedRanges,
     ParticleSmearingSigmas,
     SeedFinderConfigArg,
     SeedFinderOptionsArg,
@@ -72,6 +72,11 @@ def run_ckf_tracking(label, seeding):
             setup.field,
             enableInteractions=True,
             rnd=rnd,
+            postSelectParticles=ParticleSelectorConfig(
+                pt=(0.9 * u.GeV, None),
+                measurements=(9, None),
+                removeNeutral=True,
+            ),
         )
 
         addDigitization(
@@ -86,7 +91,6 @@ def run_ckf_tracking(label, seeding):
             s,
             setup.trackingGeometry,
             setup.field,
-            TruthSeedRanges(pt=(500 * u.MeV, None), nHits=(9, None)),
             ParticleSmearingSigmas(  # only used by SeedingAlgorithm.TruthSmeared
                 # zero eveything so the CKF has a chance to find the measurements
                 d0=0,
@@ -134,7 +138,7 @@ def run_ckf_tracking(label, seeding):
             setup.trackingGeometry,
             setup.field,
             TrackSelectorConfig(
-                pt=(500 * u.MeV, None),
+                pt=(0.9 * u.GeV, None),
                 loc0=(-4.0 * u.mm, 4.0 * u.mm),
                 nMeasurementsMin=6,
                 maxHoles=2,

CI/physmon/workflows/physmon_trackfinding_4muon_50vertices.py

@@ -11,12 +11,12 @@
     EtaConfig,
     PhiConfig,
     ParticleConfig,
+    ParticleSelectorConfig,
     addFatras,
     addDigitization,
 )
 from acts.examples.reconstruction import (
     addSeeding,
-    TruthSeedRanges,
     SeedFinderConfigArg,
     SeedFinderOptionsArg,
     SeedingAlgorithm,
@@ -69,6 +69,11 @@
         setup.trackingGeometry,
         setup.field,
         rnd=rnd,
+        postSelectParticles=ParticleSelectorConfig(
+            pt=(0.9 * u.GeV, None),
+            measurements=(9, None),
+            removeNeutral=True,
+        ),
     )
 
     addDigitization(
@@ -83,7 +88,6 @@
         s,
         setup.trackingGeometry,
         setup.field,
-        TruthSeedRanges(pt=(500.0 * u.MeV, None), nHits=(9, None)),
         SeedFinderConfigArg(
             r=(33 * u.mm, 200 * u.mm),
             deltaR=(1 * u.mm, 60 * u.mm),
@@ -116,7 +120,7 @@
         setup.trackingGeometry,
         setup.field,
         TrackSelectorConfig(
-            pt=(500 * u.MeV, None),
+            pt=(0.9 * u.GeV, None),
             loc0=(-4.0 * u.mm, 4.0 * u.mm),
             nMeasurementsMin=6,
             maxHoles=2,

CI/physmon/workflows/physmon_trackfinding_ttbar_pu200.py

@@ -13,7 +13,6 @@
 )
 from acts.examples.reconstruction import (
     addSeeding,
-    TruthSeedRanges,
     SeedFinderConfigArg,
     SeedFinderOptionsArg,
     SeedingAlgorithm,
@@ -68,6 +67,11 @@
             rho=(0.0, 24 * u.mm),
             absZ=(0.0, 1.0 * u.m),
         ),
+        postSelectParticles=ParticleSelectorConfig(
+            pt=(0.5 * u.GeV, None),
+            measurements=(9, None),
+            removeNeutral=True,
+        ),
     )
 
     addDigitization(
@@ -82,7 +86,6 @@
         s,
         setup.trackingGeometry,
         setup.field,
-        TruthSeedRanges(pt=(500.0 * u.MeV, None), nHits=(9, None)),
         SeedFinderConfigArg(
             r=(33 * u.mm, 200 * u.mm),
             deltaR=(1 * u.mm, 60 * u.mm),

CI/physmon/workflows/physmon_trackrefitting_gsf.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+
+import tempfile
+from pathlib import Path
+import shutil
+
+import acts
+from truth_tracking_gsf_refitting import runRefittingGsf
+
+from physmon_common import makeSetup
+
+setup = makeSetup()
+
+with tempfile.TemporaryDirectory() as temp:
+    s = acts.examples.Sequencer(
+        events=10000,
+        numThreads=-1,
+        logLevel=acts.logging.INFO,
+    )
+
+    tp = Path(temp)
+    runRefittingGsf(
+        trackingGeometry=setup.trackingGeometry,
+        field=setup.field,
+        digiConfigFile=setup.digiConfig,
+        outputDir=tp,
+        s=s,
+    )
+
+    s.run()
+
+    perf_file = tp / "performance_gsf_refit.root"
+    assert perf_file.exists(), "Performance file not found"
+    shutil.copy(perf_file, setup.outdir / "performance_trackrefitting.root")

CI/physmon/workflows/physmon_trackrefitting_kf.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+
+import tempfile
+from pathlib import Path
+import shutil
+
+import acts
+from truth_tracking_kalman_refitting import runRefittingKf
+
+from physmon_common import makeSetup
+
+setup = makeSetup()
+
+with tempfile.TemporaryDirectory() as temp:
+    s = acts.examples.Sequencer(
+        events=10000,
+        numThreads=-1,
+        logLevel=acts.logging.INFO,
+    )
+
+    tp = Path(temp)
+    runRefittingKf(
+        trackingGeometry=setup.trackingGeometry,
+        field=setup.field,
+        digiConfigFile=setup.digiConfig,
+        outputDir=tp,
+        s=s,
+    )
+
+    s.run()
+
+    perf_file = tp / "performance_kf_refit.root"
+    assert perf_file.exists(), "Performance file not found"
+    shutil.copy(perf_file, setup.outdir / "performance_trackrefitting.root")

CMakeLists.txt

@@ -31,7 +31,6 @@ option(ACTS_FORCE_ASSERTIONS "Force assertions regardless of build type" OFF)
 option(ACTS_USE_SYSTEM_LIBS "Use system libraries by default" OFF)
 # plugins related options
 option(ACTS_USE_SYSTEM_ACTSVG "Use the ActSVG system library" ${ACTS_USE_SYSTEM_LIBS})
-option(ACTS_USE_SYSTEM_GEOMODEL "Use a system-provided GeoModel installation" ${ACTS_USE_SYSTEM_LIBS})
 option(ACTS_USE_SYSTEM_COVFIE "Use a system-provided covfie installation" ${ACTS_USE_SYSTEM_LIBS})
 option(ACTS_USE_SYSTEM_DETRAY "Use a system-provided detray installation" ${ACTS_USE_SYSTEM_LIBS})
 option(ACTS_USE_SYSTEM_TRACCC "Use a system-provided traccc installation" ${ACTS_USE_SYSTEM_LIBS})
@@ -229,7 +228,6 @@ set(_acts_actsvg_version 0.4.50)
 set(_acts_boost_version 1.71.0)
 set(_acts_dd4hep_version 1.21)
 set(_acts_edm4hep_version 0.7)
-set(_acts_geomodel_version 6.3.0)
 set(_acts_eigen3_version 3.4.0)
 set(_acts_podio_version 1.0.1) # will try this first
 set(_acts_podio_fallback_version 0.16) # if not found, will try this one
@@ -374,8 +372,24 @@ if(ACTS_BUILD_PLUGIN_JSON)
     endif()
 endif()
 if(ACTS_BUILD_PLUGIN_GEOMODEL)
-    find_package(GeoModelCore ${_acts_geomodel_version} REQUIRED CONFIG)
-    find_package(GeoModelIO ${_acts_geomodel_version} REQUIRED CONFIG)
+    find_package(GeoModelCore CONFIG)
+    if(NOT GeoModelCore_FOUND)
+        message(
+            FATAL_ERROR
+            "GeoModel not found. Please install GeoModel or set ACTS_BUILD_PLUGIN_GEOMODEL to OFF."
+        )
+    endif()
+
+    set(_gm_ver_min 6.3.0)
+
+    if(GeoModelCore_VERSION VERSION_LESS _gm_ver_min)
+        message(
+            FATAL_ERROR
+            "GeoModel version ${GeoModelCore_VERSION} is insufficient. Please install GeoModel version ${_gm_ver_min} or newer."
+        )
+    endif()
+    # find other GeoModel components of EXACT same version
+    find_package(GeoModelIO ${GeoModelCore_VERSION} REQUIRED EXACT CONFIG)
 endif()
 if(ACTS_BUILD_PLUGIN_TGEO)
     find_package(

CMakePresets.json

@@ -46,7 +46,7 @@
             "inherits": "common",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Release",
-                "CMAKE_CXX_FLAGS": "-Werror",
+                "CMAKE_COMPILE_WARNING_AS_ERROR": "ON",
                 "ACTS_FORCE_ASSERTIONS": "ON",
                 "ACTS_ENABLE_LOG_FAILURE_THRESHOLD": "ON",
                 "ACTS_BUILD_BENCHMARKS": "ON",

Core/CMakeLists.txt

@@ -110,6 +110,7 @@ add_subdirectory(src/MagneticField)
 add_subdirectory(src/Material)
 add_subdirectory(src/Navigation)
 add_subdirectory(src/Propagator)
+add_subdirectory(src/Seeding)
 add_subdirectory(src/Surfaces)
 add_subdirectory(src/TrackFinding)
 add_subdirectory(src/TrackFitting)