Merge branch 'main' into fix/unify-chi2-track-trackstate

.github/workflows/checks.yml

@@ -44,6 +44,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
       - name: Check
         run: >
           sudo apt-get install -y git
@@ -53,6 +55,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
       - name: Check
         run: >
           CI/check_include_guards.py . --fail-global --exclude "*thirdparty/*"
@@ -68,6 +72,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
       - name: Check
         run: >
           CI/check_end_of_file.py . --exclude "thirdparty/*" --reject-multiple-newlines --github
@@ -93,6 +99,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
       - name: Check
         run: >
           CI/check_smearing_config.py .
@@ -101,6 +109,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
       - name: Check
         run: >
           docs/parse_cmake_options.py CMakeLists.txt --write docs/getting_started.md --verify
@@ -109,6 +119,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
       - name: Install codespell
         run: >
           pip install codespell==2.2.5
@@ -130,6 +142,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
       - name: Install dependencies
         run: >
           pip install -r CI/requirements_fpe_masks.txt

.gitlab-ci.yml

@@ -440,18 +440,9 @@ lcg_104:
 
   parallel:
     matrix:
-      - OS: [centos7]
-        COMPILER: 
-          - gcc11
-          - gcc12
-
       - OS: [alma9]
         COMPILER: 
-          - gcc11
-          - gcc12
           - gcc13
           - clang16
 
-      - OS: [centos8]
-        COMPILER: [gcc11]
 

Core/include/Acts/Seeding/SeedFinder.ipp

@@ -723,7 +723,7 @@ inline void SeedFinder<external_spacepoint_t, platform_t>::filterCandidates(
 
       // sqrt(S2)/B = 2 * helixradius
       // calculated radius must not be smaller than minimum radius
-      if (S2 < B2 * options.minHelixDiameter2 * m_config.helixCut) {
+      if (S2 < B2 * options.minHelixDiameter2) {
         continue;
       }
 

Core/include/Acts/Seeding/SeedFinderConfig.hpp

@@ -101,9 +101,9 @@ struct SeedFinderConfig {
   // xyz
   float toleranceParam = 1.1 * Acts::UnitConstants::mm;
 
-  // Parameter which can loosen the tolerance of the track seed to form to a
-  // helix, useful for (e.g.) misaligned seeding
-  float helixCut = 1.;
+  // Parameter which can loosen the tolerance of the track seed to form a
+  // helix. This is useful for e.g. misaligned seeding.
+  float helixCutTolerance = 1.;
 
   // Geometry Settings
   // Detector ROI
@@ -130,6 +130,7 @@ struct SeedFinderConfig {
   // default is 5%
   // TODO: necessary to make amount of material dependent on detector region?
   float radLengthPerSeed = 0.05;
+
   // alignment uncertainties, used for uncertainties in the
   // non-measurement-plane of the modules
   // which otherwise would be 0
@@ -279,7 +280,8 @@ struct SeedFinderOptions {
     // TODO: change using ACTS units
     options.pTPerHelixRadius = 1_T * 1e6 * options.bFieldInZ;
     options.minHelixDiameter2 =
-        std::pow(config.minPt * 2 / options.pTPerHelixRadius, 2);
+        std::pow(config.minPt * 2 / options.pTPerHelixRadius, 2) *
+        config.helixCutTolerance;
     options.pT2perRadius =
         std::pow(config.highland / options.pTPerHelixRadius, 2);
     options.sigmapT2perRadius =

Core/include/Acts/Seeding/SeedFinderFTFConfig.hpp

@@ -42,6 +42,10 @@ struct SeedFinderFTFConfig {
   /// for load space points
   unsigned int maxSeedsPerSpM = 5;
 
+  // Parameter which can loosen the tolerance of the track seed to form a
+  // helix. This is useful for e.g. misaligned seeding.
+  float helixCutTolerance = 1.;
+
   float m_phiSliceWidth{};
   float m_nMaxPhiSlice{};
   bool m_useClusterWidth = false;

Core/include/Acts/Seeding/SeedFinderOrthogonalConfig.hpp

@@ -101,6 +101,10 @@ struct SeedFinderOrthogonalConfig {
   // TODO: necessary to make amount of material dependent on detector region?
   float radLengthPerSeed = 0.05;
 
+  // Parameter which can loosen the tolerance of the track seed to form a
+  // helix. This is useful for e.g. misaligned seeding.
+  float helixCutTolerance = 1.;
+
   // derived values, set on SeedFinder construction
   float highland = 0;
   float maxScatteringAngle2 = 0;