Merge remote-tracking branch 'upstream/main' into releases

CI/check_fpe_masks.py

@@ -2,7 +2,6 @@
 from pathlib import Path
 import os
 import re
-import sys
 
 import asyncio
 import aiohttp
@@ -53,12 +52,10 @@ async def check(token: str, repo: str):
 
                                 loc = f"{rel}:{i}"
                                 this_ok = True
-                                issue_info = number
                                 try:
                                     issue = await gh.getitem(
                                         f"repos/{repo}/issues/{number}"
                                     )
-                                    issue_info = issue["html_url"]
                                 except gidgethub.BadRequest as e:
                                     print(
                                         f":red_circle: [bold]FPE mask at {loc} has invalid issue number {number}[/bold]"

CI/check_include_guards.py

@@ -1,10 +1,7 @@
 #!/usr/bin/env python3
-from __future__ import print_function
-
 import argparse
 import os
 from glob import glob
-from concurrent.futures import ProcessPoolExecutor
 import re
 from fnmatch import fnmatch
 import sys

CI/clang_tidy/run_clang_tidy.py

@@ -5,7 +5,6 @@
 import subprocess
 from subprocess import check_call, check_output, CalledProcessError
 from pathlib import Path
-import json
 import re
 import sys
 import os
@@ -58,9 +57,6 @@ def main():
         args.source.exists() and args.source.is_dir()
     ), f"{args.source} is not a directory"
 
-    with (args.build / "compile_commands.json").open() as f:
-        compilation_database = json.load(f)
-
     futures = []
     files = []
     active_files = {}

CI/fix_pragma.py

@@ -1,10 +1,7 @@
 #!/usr/bin/env python3
-from __future__ import print_function
-
 import argparse
 import os
 from glob import glob
-from concurrent.futures import ProcessPoolExecutor
 import re
 
 code_format = """

CI/perf_headwind.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys
 
-from headwind.spec import CollectorResult, Run, Metric
+from headwind.spec import CollectorResult, Metric
 
 import pandas as pd
 

CI/physmon/summary.py

@@ -3,7 +3,6 @@
 
 import argparse
 import re
-import functools
 import os
 import csv
 

CI/physmon/workflows/physmon_ckf_tracking.py

@@ -136,9 +136,12 @@ def run_ckf_tracking(truthSmearedSeeded, truthEstimatedSeeded, label):
                 pt=(500 * u.MeV, None),
                 loc0=(-4.0 * u.mm, 4.0 * u.mm),
                 nMeasurementsMin=6,
+                maxHoles=2,
+                maxOutliers=2,
             ),
             CkfConfig(
                 seedDeduplication=False if truthSmearedSeeded else True,
+                stayOnSeed=False if truthSmearedSeeded else True,
             ),
             outputDirRoot=tp,
         )

CI/physmon/workflows/physmon_track_finding_ttbar.py

@@ -102,9 +102,12 @@
             pt=(500 * u.MeV, None),
             loc0=(-4.0 * u.mm, 4.0 * u.mm),
             nMeasurementsMin=6,
+            maxHoles=2,
+            maxOutliers=2,
         ),
         CkfConfig(
             seedDeduplication=True,
+            stayOnSeed=True,
         ),
         outputDirRoot=tp,
     )

CI/physmon/workflows/physmon_vertexing.py

@@ -20,6 +20,7 @@
     SeedFinderConfigArg,
     SeedFinderOptionsArg,
     SeedingAlgorithm,
+    CkfConfig,
     addCKFTracks,
     addAmbiguityResolution,
     AmbiguityResolutionConfig,
@@ -119,6 +120,12 @@ def run_vertexing(fitter, mu, events):
                 loc0=(-4.0 * u.mm, 4.0 * u.mm),
                 pt=(500 * u.MeV, None),
                 nMeasurementsMin=6,
+                maxHoles=2,
+                maxOutliers=2,
+            ),
+            CkfConfig(
+                seedDeduplication=True,
+                stayOnSeed=True,
             ),
         )
 

CI/release.py

@@ -2,7 +2,6 @@
 import os
 import asyncio
 from typing import List, Optional, Tuple
-import re
 from pathlib import Path
 import sys
 import http

CI/util.py

@@ -1,4 +1,3 @@
-import os
 import contextlib
 import sys
 

Core/include/Acts/Detector/ProtoBinning.hpp

@@ -10,6 +10,7 @@
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Common.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
 #include "Acts/Utilities/BinningType.hpp"
 #include "Acts/Utilities/detail/AxisFwd.hpp"
 
@@ -130,6 +131,54 @@ struct ProtoBinning {
 
 /// @brief A binning description, it helps for screen output
 struct BinningDescription {
+  /// Convert the binning description into a bin utility
+  ///
+  /// @param binUtility the bin utility to be converted into a BinningDescription
+  static BinningDescription fromBinUtility(const BinUtility& binUtility) {
+    BinningDescription bDesc;
+    for (const auto& bData : binUtility.binningData()) {
+      // One proto binning per binning data
+      Acts::detail::AxisBoundaryType boundaryType =
+          bData.option == open ? Acts::detail::AxisBoundaryType::Bound
+                               : Acts::detail::AxisBoundaryType::Closed;
+      std::vector<ActsScalar> edges;
+      if (bData.type == equidistant) {
+        bDesc.binning.push_back(ProtoBinning(bData.binvalue, boundaryType,
+                                             bData.min, bData.max, bData.bins(),
+                                             0u));
+
+      } else {
+        std::for_each(bData.boundaries().begin(), bData.boundaries().end(),
+                      [&](ActsScalar edge) { edges.push_back(edge); });
+        bDesc.binning.push_back(
+            ProtoBinning(bData.binvalue, boundaryType, edges, 0u));
+      }
+    }
+    return bDesc;
+  }
+
+  /// Convert to a BinUtility - only basic types are supported
+  ///
+  BinUtility toBinUtility() const {
+    BinUtility binUtility;
+    for (const auto& b : binning) {
+      Acts::BinningOption bOption =
+          b.boundaryType == Acts::detail::AxisBoundaryType::Bound
+              ? Acts::open
+              : Acts::closed;
+      if (b.axisType == Acts::detail::AxisType::Equidistant) {
+        binUtility += BinUtility(b.bins(), b.edges.front(), b.edges.back(),
+                                 bOption, b.binValue);
+      } else {
+        std::vector<float> edges;
+        std::for_each(b.edges.begin(), b.edges.end(),
+                      [&](ActsScalar edge) { edges.push_back(edge); });
+        binUtility += BinUtility(edges, bOption, b.binValue);
+      }
+    }
+    return binUtility;
+  }
+
   /// The contained binnings
   std::vector<ProtoBinning> binning;
 

Core/include/Acts/EventData/VectorTrackContainer.hpp

@@ -109,7 +109,6 @@ class VectorTrackContainerBase {
 
   bool checkConsistency() const {
     std::size_t size = m_tipIndex.size();
-    (void)size;
 
     bool result = true;
     result = result && m_tipIndex.size() == size;

Core/include/Acts/Geometry/ProtoLayerHelper.hpp

@@ -36,14 +36,11 @@ class ProtoLayerHelper {
 
   /// Constructor with explicit config
   ///
-  /// @param config Explicit config struct
   /// @param logger logging instance
-  ProtoLayerHelper(const Config& config,
+  ProtoLayerHelper(const Config& /*config*/,
                    std::unique_ptr<const Logger> logger =
                        getDefaultLogger("ProtoLayerHelper", Logging::INFO))
-      : m_logger(std::move(logger)) {
-    (void)config;
-  }
+      : m_logger(std::move(logger)) {}
   ~ProtoLayerHelper() = default;
 
   /// Sort the surfaces into ProtoLayers