Merge branch 'main' into typos

AJPfleger · Oct 10, 2023 · ab6374a · ab6374a
2 parents 80a5666 + d8c447c
commit ab6374a
Show file tree

Hide file tree

Showing 16 changed files with 844 additions and 503 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -22,115 +22,6 @@ env:
   CCACHE_KEY_SUFFIX: r1
 
 jobs:
-  lcg:
-    runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/${{ matrix.image }}:v41
-    strategy:
-      matrix:
-        image:
-          - centos7-lcg100-gcc10
-          - centos7-lcg101-gcc11
-          - centos8-lcg100-gcc10
-          - centos8-lcg101-gcc11
-    env:
-      SETUP: source /opt/lcg_view/setup.sh
-      INSTALL_DIR: ${{ github.workspace }}/install
-      ACTS_LOG_FAILURE_THRESHOLD: WARNING
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Restore ccache
-        uses: actions/cache/restore@v3
-        id: ccache-restore
-        with:
-          path: ${{ github.workspace }}/ccache
-          key: ${{ runner.os  }}-ccache-${{ matrix.image }}_${{ env.CCACHE_KEY_SUFFIX }}_${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os  }}-ccache-${{ matrix.image }}_${{ env.CCACHE_KEY_SUFFIX }}_
-
-      - name: Configure
-        # setting CMAKE_CXX_STANDARD=17 is a workaround for a bug in the
-        # dd4hep CMake configuration that gets triggered on recent CMake
-        # versions 
-        run: >
-          ${SETUP} &&
-          ccache -z &&
-          cmake -B build -S .
-          -GNinja
-          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_CXX_FLAGS=-Werror
-          -DCMAKE_CXX_STANDARD=17
-          -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
-          -DACTS_LOG_FAILURE_THRESHOLD=WARNING
-          -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-          -DACTS_FORCE_ASSERTIONS=ON
-          -DACTS_BUILD_EXAMPLES=ON
-          -DACTS_BUILD_PLUGIN_DD4HEP=OFF
-          -DACTS_BUILD_PLUGIN_TGEO=ON
-          -DACTS_BUILD_PLUGIN_IDENTIFICATION=ON
-          -DACTS_BUILD_PLUGIN_JSON=ON
-          -DACTS_BUILD_FATRAS=ON
-          -DACTS_BUILD_PLUGIN_LEGACY=ON
-          -DACTS_BUILD_PLUGIN_AUTODIFF=OFF
-          -DACTS_BUILD_BENCHMARKS=ON
-          -DACTS_BUILD_UNITTESTS=ON
-          -DACTS_BUILD_INTEGRATIONTESTS=ON
-          -DACTS_BUILD_EXAMPLES_DD4HEP=OFF
-          -DACTS_BUILD_PLUGIN_EDM4HEP=OFF
-          -DACTS_BUILD_EXAMPLES_GEANT4=ON
-          -DACTS_BUILD_EXAMPLES_HEPMC3=ON
-          -DACTS_BUILD_EXAMPLES_PYTHIA8=ON
-          -DACTS_BUILD_FATRAS_GEANT4=ON
-          -DACTS_BUILD_FATRAS=ON
-          -DACTS_BUILD_ALIGNMENT=ON
-          -DACTS_BUILD_ANALYSIS_APPS=ON
-          -DACTS_BUILD_PLUGIN_ACTSVG=ON
-
-      - name: Build
-        run: ${SETUP} && cmake --build build
-
-      - name: ccache stats
-        run: ${SETUP} && ccache -s
-
-      - name: Save ccache
-        uses: actions/cache/save@v3
-        if: always()
-        with:
-          path: ${{ github.workspace }}/ccache
-          key: ${{ steps.ccache-restore.outputs.cache-primary-key }}
-
-      - name: Unit tests
-        run: ${SETUP} && cmake --build build --target test
-
-      - name: Integration tests
-        run: ${SETUP} && cmake --build build --target integrationtests
-
-      - name: Install
-        run: ${SETUP} && cmake --build build --target install
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: acts-${{ matrix.image }}
-          path: ${{ env.INSTALL_DIR }}
-
-      - name: Downstream configure
-        run: >
-          ${SETUP} &&
-          cmake -B build-downstream -S Tests/DownstreamProject
-          -GNinja
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_CXX_FLAGS=-Werror
-          -DCMAKE_CXX_STANDARD=17
-          -DCMAKE_PREFIX_PATH="${INSTALL_DIR}"
-          -DDD4HEP=OFF
-
-      - name: Downstream build
-        run: ${SETUP} && cmake --build build-downstream
-
-      - name: Downstream run
-        run: ${SETUP} && ./build-downstream/bin/ShowActsVersion
-
   linux_ubuntu:
     runs-on: ubuntu-latest
     container: ghcr.io/acts-project/ubuntu2204:v41

diff --git a/CI/physmon/phys_perf_mon.sh b/CI/physmon/phys_perf_mon.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+set -x
 
 
 mode=${1:all}
@@ -296,6 +297,22 @@ if [[ "$mode" == "all" || "$mode" == "fullchains" ]]; then
         --config CI/physmon/vertexing_config.yml
     ec=$(($ec | $?))
 
+    Examples/Scripts/generic_plotter.py \
+        $outdir/tracksummary_ckf_ttbar.root \
+        tracksummary \
+        $outdir/tracksummary_ckf_ttbar_hist.root \
+        --config CI/physmon/tracksummary_ckf_config.yml
+    ec=$(($ec | $?))
+
+    # remove ntuple file because it's large
+    rm $outdir/tracksummary_ckf_ttbar.root
+
+    run_histcmp \
+        $outdir/tracksummary_ckf_ttbar_hist.root \
+        $refdir/tracksummary_ckf_ttbar_hist.root \
+        "Track Summary CKF ttbar" \
+        tracksummary_ckf_ttbar
+
     # remove ntuple file because it's large
     rm $outdir/performance_amvf_ttbar.root
 

diff --git a/CI/physmon/reference/tracksummary_ckf_ttbar_hist.root b/CI/physmon/reference/tracksummary_ckf_ttbar_hist.root
diff --git a/Core/include/Acts/EventData/ParticleHypothesis.hpp b/Core/include/Acts/EventData/ParticleHypothesis.hpp
@@ -110,6 +110,9 @@ class NonNeutralChargedParticleHypothesis
                                                pion().mass(), absQ);
   }
 
+  static NonNeutralChargedParticleHypothesis chargedGeantino() {
+    return chargedGeantino(Acts::UnitConstants::e);
+  }
   static NonNeutralChargedParticleHypothesis chargedGeantino(float absQ) {
     return NonNeutralChargedParticleHypothesis(PdgParticle::eInvalid, 0, absQ);
   }
@@ -154,6 +157,9 @@ class ParticleHypothesis : public GenericParticleHypothesis<AnyCharge> {
   static ParticleHypothesis geantino() {
     return NeutralParticleHypothesis::geantino();
   }
+  static ParticleHypothesis chargedGeantino() {
+    return chargedGeantino(Acts::UnitConstants::e);
+  }
   static ParticleHypothesis chargedGeantino(float absQ) {
     return ParticleHypothesis(PdgParticle::eInvalid, 0, absQ);
   }

diff --git a/Core/include/Acts/Vertexing/AdaptiveGridDensityVertexFinder.hpp b/Core/include/Acts/Vertexing/AdaptiveGridDensityVertexFinder.hpp
@@ -77,7 +77,7 @@ class AdaptiveGridDensityVertexFinder {
   ///
   /// Only needed if cacheGridStateForTrackRemoval == true
   struct State {
-    // Map from z from the z bin values to the corresponding track density
+    // Map from the z bin values to the corresponding track density
     DensityMap mainDensityMap;
 
     // Map from input track to corresponding track density map

diff --git a/Core/include/Acts/Vertexing/AdaptiveGridDensityVertexFinder.ipp b/Core/include/Acts/Vertexing/AdaptiveGridDensityVertexFinder.ipp
@@ -60,22 +60,22 @@ auto Acts::AdaptiveGridDensityVertexFinder<trkGridSize, vfitter_t>::find(
   if (not state.mainDensityMap.empty()) {
     if (not m_cfg.estimateSeedWidth) {
       // Get z value of highest density bin
-      auto maxZres = m_cfg.gridDensity.getMaxZPosition(state.mainDensityMap);
+      auto maxZTRes = m_cfg.gridDensity.getMaxZTPosition(state.mainDensityMap);
 
-      if (!maxZres.ok()) {
-        return maxZres.error();
+      if (!maxZTRes.ok()) {
+        return maxZTRes.error();
       }
-      z = *maxZres;
+      z = (*maxZTRes).first;
     } else {
       // Get z value of highest density bin and width
-      auto maxZres =
-          m_cfg.gridDensity.getMaxZPositionAndWidth(state.mainDensityMap);
+      auto maxZTResAndWidth =
+          m_cfg.gridDensity.getMaxZTPositionAndWidth(state.mainDensityMap);
 
-      if (!maxZres.ok()) {
-        return maxZres.error();
+      if (!maxZTResAndWidth.ok()) {
+        return maxZTResAndWidth.error();
       }
-      z = (*maxZres).first;
-      width = (*maxZres).second;
+      z = (*maxZTResAndWidth).first.first;
+      width = (*maxZTResAndWidth).second;
     }
   }