Skip to content

Commit b90bf15

Browse files
authored
Fixed spelling and opted for explicit typing (#960)
In core/include/detray/navigation/intersection/ray_line_intersector.hpp, there is a line which uses auto for type deduction, which was giving me problems with Fastor, because auto was resolving to an expression template and then causing compilation errors further down the line. I changed it to an explicit type (vector3_type) to force evaluation.
1 parent 6f0eed2 commit b90bf15

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

core/include/detray/navigation/intersection/ray_line_intersector.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ struct ray_intersector_impl<line2D<algebra_t>, algebra_t, do_debug> {
8686
}
8787

8888
// vector from track position to line center
89-
const auto t2l = _t - _p;
89+
const point3_type t2l = _t - _p;
9090

9191
// t2l projection on line direction
9292
const scalar_type t2l_on_line{vector::dot(t2l, _z)};

tests/benchmarks/cpu/intersect_surfaces.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ BENCHMARK(BM_INTERSECT_PORTAL_CYLINDERS)
212212
->Unit(benchmark::kMillisecond);
213213

214214
/// This benchmark runs intersection with the concentric cylinder intersector
215-
void BM_INTERSECT_CONCETRIC_CYLINDERS(benchmark::State &state) {
215+
void BM_INTERSECT_CONCENTRIC_CYLINDERS(benchmark::State &state) {
216216
unsigned int sfhit = 0u;
217217
unsigned int sfmiss = 0u;
218218

@@ -256,7 +256,7 @@ void BM_INTERSECT_CONCETRIC_CYLINDERS(benchmark::State &state) {
256256
}
257257
}
258258

259-
BENCHMARK(BM_INTERSECT_CONCETRIC_CYLINDERS)
259+
BENCHMARK(BM_INTERSECT_CONCENTRIC_CYLINDERS)
260260
#ifdef DETRAY_BENCHMARK_MULTITHREAD
261261
->ThreadRange(1, benchmark::CPUInfo::Get().num_cpus)
262262
#endif

tests/benchmarks/cpu/intersectors.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ BENCHMARK(BM_INTERSECT_CYLINDERS_SOA)
366366
->Unit(benchmark::kMillisecond);
367367

368368
/// This benchmark runs intersection with the concentric cylinder intersector
369-
void BM_INTERSECT_CONCETRIC_CYLINDERS_AOS(benchmark::State& state) {
369+
void BM_INTERSECT_CONCENTRIC_CYLINDERS_AOS(benchmark::State& state) {
370370

371371
using transform3_t = dtransform3D<algebra_s>;
372372
using scalar_t = dscalar<algebra_s>;
@@ -421,14 +421,14 @@ void BM_INTERSECT_CONCETRIC_CYLINDERS_AOS(benchmark::State& state) {
421421
#endif // DETRAY_BENCHMARK_PRINTOUTS
422422
}
423423

424-
BENCHMARK(BM_INTERSECT_CONCETRIC_CYLINDERS_AOS)
424+
BENCHMARK(BM_INTERSECT_CONCENTRIC_CYLINDERS_AOS)
425425
#ifdef DETRAY_BENCHMARK_MULTITHREAD
426426
->ThreadRange(1, benchmark::CPUInfo::Get().num_cpus)
427427
#endif
428428
->Unit(benchmark::kMillisecond);
429429

430430
/// This benchmark runs intersection with the concentric cylinder intersector
431-
void BM_INTERSECT_CONCETRIC_CYLINDERS_SOA(benchmark::State& state) {
431+
void BM_INTERSECT_CONCENTRIC_CYLINDERS_SOA(benchmark::State& state) {
432432

433433
using transform3_t = dtransform3D<algebra_v>;
434434
using scalar_t = dscalar<algebra_v>;
@@ -479,7 +479,7 @@ void BM_INTERSECT_CONCETRIC_CYLINDERS_SOA(benchmark::State& state) {
479479
#endif
480480
}
481481

482-
BENCHMARK(BM_INTERSECT_CONCETRIC_CYLINDERS_SOA)
482+
BENCHMARK(BM_INTERSECT_CONCENTRIC_CYLINDERS_SOA)
483483
#ifdef DETRAY_BENCHMARK_MULTITHREAD
484484
->ThreadRange(1, benchmark::CPUInfo::Get().num_cpus)
485485
#endif

0 commit comments

Comments
 (0)