Skip to content

Commit

Permalink
Merge branch 'main' into LoggerInGridCreation
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Oct 30, 2024
2 parents dfeefe4 + 645e4bc commit c14520b
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 50 deletions.
44 changes: 5 additions & 39 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,41 +1,7 @@
PLEASE FOLLOW THE CHECKLIST BELOW WHEN CREATING A NEW PULL REQUEST. THE
CHECKLIST IS FOR YOUR INFORMATION AND MUST BE REMOVED BEFORE SUBMITTING THE PULL
REQUEST.
PLEASE DESCRIBE YOUR CHANGES.
THIS MESSAGE ENDS UP AS THE COMMIT MESSAGE.
DO NOT USE @-MENTIONS HERE!

## Checklist
--- END COMMIT MESSAGE ---

- [ ] Does the PR title follow the `<prefix>: title` scheme?

The prefix must be one of:

- `fix`: for a bugfix
- `feat`: for a new feature
- `refactor`: for an improvement of an existing feature
- `perf`, `test`: for performance- or test-related changes
- `docs`: for documentation-related changes
- `build`, `ci`, `chore`: as appropriated for infrastructure changes

- [ ] Does this modify the public API as defined in `docs/versioning.rst`?

- [ ] Does the PR title contain a `!` to indicate a breaking change?
- [ ] Is there section starting with `BREAKING CHANGE:` in the PR body
that explains the breaking change?

- [ ] Is the PR ready to be merged?

- [ ] If not: is it marked as a draft PR?

- [ ] Does this PR close an existing issue?

- [ ] Is the issue correctly linked so it will be automatically closed
upon successful merge (See closing keywords link in the sidebar)?

- The CI will initially report a missing milestone. One of the maintainers will
handle assigning a milestone for book-keeping.

- An automated workflow will assign labels based on changed files, and whether
or not reference files were changed. These do not have to be set manually.

- If you push updates, and you know they will be superseded later on, consider adding
`[skip ci]` in the commit message. This will instruct the CI system not to run any
jobs on this commit.
Any further description goes here, @-mentions are ok here!
2 changes: 1 addition & 1 deletion .kodiak.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version = 1

merge.message.title = "pull_request_title"
merge.message.body = "pull_request_body"
merge.message.cut_body_before = "--- BEGIN COMMIT MESSAGE ---"
merge.message.cut_body_after = "--- END COMMIT MESSAGE ---"
merge.message.cut_body_and_text = true
merge.method = "squash"
merge.message.include_coauthors = true
Expand Down
3 changes: 2 additions & 1 deletion Core/include/Acts/EventData/Seed.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
namespace Acts {

template <typename external_spacepoint_t, std::size_t N = 3ul>
requires(N >= 3ul)
class Seed {
static_assert(N >= 3ul);

public:
using value_type = external_spacepoint_t;
static constexpr std::size_t DIM = N;
Expand Down
6 changes: 0 additions & 6 deletions Core/include/Acts/EventData/Seed.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,34 @@
namespace Acts {

template <typename external_spacepoint_t, std::size_t N>
requires(N >= 3ul)
template <typename... args_t>
requires(sizeof...(args_t) == N) &&
(std::same_as<external_spacepoint_t, args_t> && ...)
Seed<external_spacepoint_t, N>::Seed(const args_t&... points)
: m_spacepoints({&points...}) {}

template <typename external_spacepoint_t, std::size_t N>
requires(N >= 3ul)
void Seed<external_spacepoint_t, N>::setVertexZ(float vertex) {
m_vertexZ = vertex;
}

template <typename external_spacepoint_t, std::size_t N>
requires(N >= 3ul)
void Seed<external_spacepoint_t, N>::setQuality(float seedQuality) {
m_seedQuality = seedQuality;
}

template <typename external_spacepoint_t, std::size_t N>
requires(N >= 3ul)
const std::array<const external_spacepoint_t*, N>&
Seed<external_spacepoint_t, N>::sp() const {
return m_spacepoints;
}

template <typename external_spacepoint_t, std::size_t N>
requires(N >= 3ul)
float Seed<external_spacepoint_t, N>::z() const {
return m_vertexZ;
}

template <typename external_spacepoint_t, std::size_t N>
requires(N >= 3ul)
float Seed<external_spacepoint_t, N>::seedQuality() const {
return m_seedQuality;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ class CombinatorialKalmanFilter {
measurementSelector(trackStateCandidates, isOutlier, logger);
if (!selectorResult.ok()) {
ACTS_ERROR("Selection of calibrated measurements failed: "
<< selectorResult.error());
<< selectorResult.error().message());
resultTrackStateList =
ResultTrackStateList::failure(selectorResult.error());
} else {
Expand Down
5 changes: 3 additions & 2 deletions Core/include/Acts/TrackFinding/TrackSelector.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,9 @@ bool TrackSelector::isValidTrack(const track_proxy_t& track) const {

const Config* cutsPtr{nullptr};
if (!m_isUnbinned) {
if (absEta() < m_cfg.absEtaEdges.front() ||
_absEta >= m_cfg.absEtaEdges.back()) {
// return false if |eta| is outside its range, or nan.
if (!(absEta() >= m_cfg.absEtaEdges.front() &&
_absEta < m_cfg.absEtaEdges.back())) {
return false;
}
cutsPtr = &m_cfg.getCuts(_eta);
Expand Down
5 changes: 5 additions & 0 deletions Core/src/TrackFinding/MeasurementSelector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ MeasurementSelector::MeasurementSelector(const MeasurementSelectorCuts& cuts)
: MeasurementSelector({{GeometryIdentifier(), cuts}}) {}

MeasurementSelector::MeasurementSelector(const Config& config) {
if (config.empty()) {
throw std::invalid_argument(
"MeasurementSelector: Configuration must not be empty");
}

std::vector<InternalConfig::InputElement> tmp;
tmp.reserve(config.size());
for (std::size_t i = 0; i < config.size(); ++i) {
Expand Down

0 comments on commit c14520b

Please sign in to comment.