Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add closest point and distance computation to SurfaceBounds #3990

Open
wants to merge 44 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
87106e9
tmp
andiwand Dec 12, 2024
4d5d10d
tmp
andiwand Dec 13, 2024
9bcc7f6
tmp
andiwand Dec 17, 2024
e6e0cc2
draft
andiwand Dec 17, 2024
bdf87b6
clean annulus
andiwand Dec 18, 2024
f856077
tmp
andiwand Dec 18, 2024
7f29993
tmp
andiwand Dec 18, 2024
a595467
tmp
andiwand Dec 18, 2024
793c950
includes
andiwand Dec 18, 2024
0c965e7
tmp
andiwand Dec 18, 2024
7a1c005
tmp
andiwand Dec 18, 2024
79ada20
make compile
andiwand Dec 18, 2024
17db365
tmp
andiwand Dec 18, 2024
289109a
jacobians
andiwand Dec 18, 2024
a034c42
Merge branch 'main' of github.com:acts-project/acts into tmp-distance…
andiwand Dec 18, 2024
edb6882
metric
andiwand Dec 19, 2024
a2bf8be
remove some unintended changes
andiwand Dec 19, 2024
43c7d23
default inside impl; fix compilation
andiwand Dec 19, 2024
26e68b3
Merge branch 'main' of github.com:acts-project/acts into tmp-distance…
andiwand Dec 19, 2024
7ea4115
deduplicate inside
andiwand Dec 19, 2024
890b472
remove bounds check helpers
andiwand Dec 19, 2024
c30f1cc
Merge branch 'main' of github.com:acts-project/acts into tmp-distance…
andiwand Dec 19, 2024
b9e2168
doc
andiwand Dec 19, 2024
cf9a545
rename tolerance mode
andiwand Dec 19, 2024
ef18a08
fix doc
andiwand Dec 19, 2024
c1de29d
rename tolerance mode
andiwand Dec 19, 2024
5032c8b
simplify distance
andiwand Dec 19, 2024
bf236b4
fix and docs
andiwand Dec 19, 2024
217b138
small fix
andiwand Dec 19, 2024
a0d665d
remove cartesian to bound jacobians
andiwand Dec 19, 2024
529a109
fix doc; tolerance less annulus inside check
andiwand Dec 19, 2024
97c568e
deal with different coordinate systems in annulus bounds
andiwand Dec 19, 2024
385c66d
try fix annulus closest point
andiwand Dec 19, 2024
cd13630
minor
andiwand Dec 19, 2024
c8be68f
minor
andiwand Dec 19, 2024
5727270
Merge branch 'main' of github.com:acts-project/acts into tmp-distance…
andiwand Dec 19, 2024
c6a4219
fixes and ref updates
andiwand Dec 19, 2024
c283860
Merge branch 'main' of github.com:acts-project/acts into tmp-distance…
andiwand Jan 21, 2025
d1c2343
adapt annulus bounds test; yet to check if correct
andiwand Jan 21, 2025
54bf281
Merge branch 'main' of github.com:acts-project/acts into tmp-distance…
andiwand Jan 21, 2025
9e80dbb
one more case
andiwand Jan 21, 2025
0e36076
after debugginRg
andiwand Jan 22, 2025
72f2fb5
revert
andiwand Jan 22, 2025
45d5f8d
update refs
andiwand Jan 22, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tmp
  • Loading branch information
andiwand committed Dec 18, 2024
commit 7f29993ce60064682a95dd984bd33180f8fbbc6b
4 changes: 2 additions & 2 deletions Core/include/Acts/Surfaces/AnnulusBounds.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ class AnnulusBounds : public DiscBounds {
eSize = 7
};

AnnulusBounds() = delete;

/// @brief Default constructor from parameters
/// @param minR inner radius, in module system
/// @param maxR outer radius, in module system
Expand Down Expand Up @@ -87,6 +85,8 @@ class AnnulusBounds : public DiscBounds {
return valvector;
}

bool inside(const Vector2& lposition) const final;

Vector2 closestPoint(const Vector2& lposition,
const std::optional<SquareMatrix2>& metric) const final;

Expand Down
3 changes: 0 additions & 3 deletions Core/include/Acts/Surfaces/ConeBounds.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ namespace Acts {
///
/// @image html ConeBounds.gif
///

class ConeBounds : public SurfaceBounds {
public:
enum BoundValues : int {
Expand All @@ -46,8 +45,6 @@ class ConeBounds : public SurfaceBounds {
eSize = 5
};

ConeBounds() = delete;

/// Constructor - open cone with alpha, by default a full cone
/// but optionally can make a conical section
///
Expand Down
14 changes: 14 additions & 0 deletions Core/src/Surfaces/AnnulusBounds.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,20 @@ std::vector<Vector2> AnnulusBounds::vertices(
m_outLeftStripXY};
}

SquareMatrix2 AnnulusBounds::boundToCartesianJacobian(
const Vector2& lposition) const {
return SquareMatrix2::Identity(); // TODO
}

SquareMatrix2 AnnulusBounds::cartesianToBoundJacobian(
const Vector2& lposition) const {
return SquareMatrix2::Identity(); // TODO
}

bool AnnulusBounds::inside(const Vector2& lposition) const {
return inside(lposition, 0., 0.);
}

Vector2 AnnulusBounds::closestPoint(
const Vector2& lposition,
const std::optional<SquareMatrix2>& metric) const {
Expand Down