Merge branch 'main' of github.com:acts-project/acts into felix-save-v…

…ertex-seed

.github/workflows/builds.yml

@@ -63,7 +63,6 @@ jobs:
           -DACTS_BUILD_EVERYTHING=ON
           -DACTS_BUILD_ODD=ON
           -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-          -DACTS_BUILD_EXAMPLES_BINARIES=ON
           -DACTS_BUILD_EXAMPLES_EDM4HEP=ON
           -DACTS_FORCE_ASSERTIONS=ON
           -DACTS_BUILD_ANALYSIS_APPS=ON
@@ -139,13 +138,6 @@ jobs:
       - name: Unpack build
         run: mkdir build && tar xf build.tar.gz -C build
 
-      - name: Examples
-        shell: bash
-        run: >
-          export LD_LIBRARY_PATH=$PWD/build/thirdparty/OpenDataDetector/factory:$LD_LIBRARY_PATH
-          && source /usr/local/bin/thisdd4hep_only.sh
-          && ./CI/run_examples.sh
-
       - name: Python level tests
         shell: bash
         env:
@@ -154,12 +146,7 @@ jobs:
           PYTEST_MD_REPORT_OUTPUT: pytest.md
         run: >
           /usr/local/bin/geant4-config --install-datasets
-          && source /usr/local/bin/thisroot.sh
-          && source /usr/local/bin/thisdd4hep_only.sh
-          && source /usr/local/bin/geant4.sh
-          && source build/python/setup.sh
-          && export PYTHONPATH=/usr/local/python:$PYTHONPATH
-          && export LD_LIBRARY_PATH=$PWD/build/thirdparty/OpenDataDetector/factory:$LD_LIBRARY_PATH
+          && source build/this_acts_withdeps.sh
           && pip3 install -r Examples/Python/tests/requirements.txt
           && pip3 install pytest-md-report
           && pytest -rFsv -k "not exatrkx" -v
@@ -200,16 +187,11 @@ jobs:
         run: >
           echo "::group::Dependencies"
           && git config --global safe.directory "$GITHUB_WORKSPACE"
-          && pip3 install histcmp==0.6.3 spyral-cli==1.1.1 matplotlib
+          && pip3 install histcmp==0.6.5 spyral-cli==1.1.1 matplotlib
           && pip3 install -r Examples/Scripts/requirements.txt
           && /usr/local/bin/geant4-config --install-datasets
-          && source /usr/local/bin/thisroot.sh
-          && source /usr/local/bin/thisdd4hep_only.sh
-          && source /usr/local/bin/geant4.sh
-          && source build/python/setup.sh
-          && export LD_LIBRARY_PATH=$PWD/build/thirdparty/OpenDataDetector/factory:$LD_LIBRARY_PATH
+          && source build/this_acts_withdeps.sh
           && echo "::endgroup::"
-          && export PYTHONPATH="${PYTHONPATH}":"${GITHUB_WORKSPACE}/Examples/Scripts/Python"
           && CI/physmon/phys_perf_mon.sh all physmon
           && cat physmon/summary.md >> $GITHUB_STEP_SUMMARY
 
@@ -422,7 +404,6 @@ jobs:
           -DCMAKE_CXX_FLAGS=-Werror
           -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
           -DACTS_LOG_FAILURE_THRESHOLD=WARNING
-          -DACTS_BUILD_EXAMPLES_BINARIES=ON
           -DACTS_FORCE_ASSERTIONS=ON
           -DACTS_USE_SYSTEM_BOOST=OFF
           -DACTS_USE_SYSTEM_EIGEN3=OFF

.github/workflows/docs.yml

@@ -50,6 +50,7 @@ jobs:
           --keep-going
           -t run_doxygen
           -t lazy_autodoc
+          -t white_papers
           -b linkcheck
           . _build/html/
 

.gitlab-ci.yml

@@ -105,7 +105,7 @@ build_exatrkx:
       -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
 
     - ccache -z
-    - cmake --build build -- -j3
+    - cmake --build build -- -j2
     - ccache -s
 
 test_exatrkx_unittests:
@@ -128,8 +128,7 @@ test_exatrkx_python:
   script:
     - apt-get update -y
     - apt-get install -y python3 libxxhash0
-    - source /usr/local/bin/thisroot.sh
-    - source build/python/setup.sh
+    - source build/this_acts_withdeps.sh
     - git clone $CLONE_URL src
     - cd src
     - git checkout $HEAD_SHA
@@ -205,12 +204,7 @@ linux_test_examples:
     - cd ..
 
     - /usr/local/bin/geant4-config --install-datasets
-    - "source /usr/local/bin/thisroot.sh || true"
-    - "source /usr/local/bin/thisdd4hep_only.sh || true"
-    - "source /usr/local/bin/geant4.sh || true"
-    - source build/python/setup.sh
-    - export PYTHONPATH=/usr/local/python:$PYTHONPATH
-    - export LD_LIBRARY_PATH=$PWD/build/thirdparty/OpenDataDetector/factory:$LD_LIBRARY_PATH
+    - source build/this_acts_withdeps.sh
     - cd src
     - pip3 install -r Examples/Python/tests/requirements.txt
     - pytest -rFsv -k "not exatrkx" -v
@@ -237,16 +231,11 @@ linux_physmon:
     - cd ..
 
     - git config --global safe.directory "$GITHUB_WORKSPACE"
-    - pip3 install histcmp==0.6.2 spyral-cli==1.1.0 matplotlib
+    - pip3 install histcmp==0.6.5 spyral-cli==1.1.0 matplotlib
     - pip3 install -r src/Examples/Scripts/requirements.txt
     - /usr/local/bin/geant4-config --install-datasets
-    - "source /usr/local/bin/thisroot.sh || true"
-    - "source /usr/local/bin/thisdd4hep_only.sh || true"
-    - "source /usr/local/bin/geant4.sh || true"
-    - source build/python/setup.sh
-    - export LD_LIBRARY_PATH=$PWD/build/thirdparty/OpenDataDetector/factory:$LD_LIBRARY_PATH
+    - source build/this_acts_withdeps.sh
     - cd src
-    - export PYTHONPATH="${PYTHONPATH}":"${PWD}/Examples/Scripts/Python"
     - CI/physmon/phys_perf_mon.sh all physmon
 
 ###############################
@@ -363,7 +352,7 @@ linux_ubuntu_2204_clang:
     # Figure out LCG platform name based on version number and OS
     - >
       if [ "$OS" = "alma9"  ]; then
-        if [ "$LCG_VERSION" = "104" ]; then
+        if [ "$LCG_VERSION" -ge "104" ]; then
           export LCG_PLATFORM="el9"
         else
           export LCG_PLATFORM="centos9"
@@ -448,3 +437,16 @@ lcg_104:
         COMPILER:
           - gcc13
           - clang16
+
+lcg_105:
+  <<: *lcg_base_job
+
+  variables:
+    LCG_VERSION: "105"
+
+  parallel:
+    matrix:
+      - OS: [alma9]
+        COMPILER:
+          - gcc13
+          - clang16

.merge-sentinel.yml

@@ -1,7 +1,6 @@
 rules:
   - required_checks:
       - Lint PR / Validate PR title
-      - WIP
       - milestone-set
     required_pattern:
       - "policy-bot: *"

CI/physmon/gx2f.yml

@@ -0,0 +1,48 @@
+checks:
+  "*":
+    Chi2Test:
+      threshold: 0.01
+    KolmogorovTest:
+      threshold: 0.68
+    RatioCheck:
+      threshold: 3
+    ResidualCheck:
+      threshold: 3
+    IntegralCheck:
+      threshold: 3
+
+  "nStates_*":
+    KolmogorovTest: null
+  "nMeasurements_*":
+    KolmogorovTest: null
+
+  pullmean_phi_vs_eta:
+    IntegralCheck:
+      threshold: 4
+  pullmean_theta_vs_eta:
+    IntegralCheck: null
+  pullmean_z0_vs_eta:
+    IntegralCheck: null
+
+  pullwidth_phi_vs_eta:
+    IntegralCheck:
+      threshold: 4.3
+  reswidth_d0_vs_eta:
+    IntegralCheck:
+      threshold: 4
+  resmean_d0_vs_eta:
+    IntegralCheck:
+      threshold: 4
+
+  pullwidth_*:
+    Chi2Test: null
+    KolmogorovTest: null
+  pullmean_*:
+    Chi2Test: null
+    KolmogorovTest: null
+  reswidth_*:
+    Chi2Test: null
+    KolmogorovTest: null
+  resmean_*:
+    Chi2Test: null
+    KolmogorovTest: null

CI/physmon/phys_perf_mon.sh

@@ -4,14 +4,13 @@ set -e
 set -x
 
 
-mode=${1:all}
+mode=${1:-all}
 if ! [[ $mode = @(all|kalman|gsf|fullchains|vertexing|simulation) ]]; then
     echo "Usage: $0 <all|kalman|gsf|fullchains|vertexing|simulation> (outdir)"
     exit 1
 fi
 
-outdir=${2:physmon}
-[ -z "$outdir" ] && outdir=physmon
+outdir=${2:-physmon}
 mkdir -p $outdir
 
 refdir=CI/physmon/reference
@@ -60,6 +59,9 @@ fi
 if [[ "$mode" == "all" || "$mode" == "gsf" ]]; then
     run_physmon_gen "Truth Tracking GSF" "truth_tracking_gsf"
 fi
+if [[ "$mode" == "all" || "$mode" == "gx2f" ]]; then
+    run_physmon_gen "Truth Tracking GX2F" "truth_tracking_gx2f"
+fi
 if [[ "$mode" == "all" || "$mode" == "fullchains" ]]; then
     run_physmon_gen "CKF Tracking" "ckf_tracking"
     run_physmon_gen "Track finding ttbar" "track_finding_ttbar"
@@ -341,6 +343,15 @@ if [[ "$mode" == "all" || "$mode" == "kalman" ]]; then
         -c CI/physmon/truth_tracking.yml
 fi
 
+if [[ "$mode" == "all" || "$mode" == "gx2f" ]]; then
+    run_histcmp \
+        $outdir/performance_gx2f.root \
+        $refdir/performance_gx2f.root \
+        "Truth tracking (GX2F)" \
+        gx2f \
+        -c CI/physmon/gx2f.yml
+fi
+
 if [[ "$mode" == "all" || "$mode" == "vertexing" ]]; then
     Examples/Scripts/vertex_mu_scan.py \
         $outdir/performance_vertexing_*mu*.root \

CI/physmon/vertexing_config.yml

@@ -89,6 +89,11 @@ histograms:
     nbins: 100
     min: -0.01
     max: 1.01
+
+  "sumPt2":
+    nbins: 100
+    min: 0
+    max: 700
 
 extra_histograms:
   - expression: df["nRecoVtx"] / df["nTrueVtx"]

CI/physmon/vertexing_ttbar_config.yml

@@ -83,6 +83,11 @@ histograms:
     nbins: 100
     min: 0.999
     max: 1
+
+  "sumPt2":
+    nbins: 100
+    min: 0
+    max: 400
 
 extra_histograms:
   - expression: df["nRecoVtx"] / df["nTrueVtx"]

CI/physmon/workflows/physmon_truth_tracking_gx2f.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+import tempfile
+from pathlib import Path
+import shutil
+
+import acts
+from truth_tracking_gx2f import runTruthTrackingGx2f
+
+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)
+    runTruthTrackingGx2f(
+        trackingGeometry=setup.trackingGeometry,
+        field=setup.field,
+        outputDir=tp,
+        digiConfigFile=setup.digiConfig,
+        s=s,
+    )
+
+    s.run()
+    del s
+
+    perf_file = tp / "performance_gx2f.root"
+    assert perf_file.exists(), "Performance file not found"
+    shutil.copy(perf_file, setup.outdir / "performance_gx2f.root")