Skip to content

Commit c4b3265

Browse files
niermann999niermann999
authored
Fix a few warnings about uninitialized values (#942)
Fix a few warnings that appear with gcc 14
1 parent 5153de2 commit c4b3265

File tree

3 files changed

+33
-30
lines changed

3 files changed

+33
-30
lines changed

‎core/include/detray/builders/detail/bin_association.hpp

+8-7
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ static inline void bin_association(const context_t & /*context*/,
6262
edges_intersect_generic<algebra_t> edges_assoc;
6363

6464
// Loop over all bins and associate the surfaces
65-
for (unsigned int bin_0 = 0; bin_0 < axis_0.nbins(); ++bin_0) {
66-
for (unsigned int bin_1 = 0; bin_1 < axis_1.nbins(); ++bin_1) {
65+
for (unsigned int bin_0 = 0u; bin_0 < axis_0.nbins(); ++bin_0) {
66+
for (unsigned int bin_1 = 0u; bin_1 < axis_1.nbins(); ++bin_1) {
6767

6868
auto r_borders = axis_0.bin_edges(bin_0);
6969
auto phi_borders = axis_1.bin_edges(bin_1);
@@ -129,8 +129,8 @@ static inline void bin_association(const context_t & /*context*/,
129129
edges_intersect_generic<algebra_t> edges_assoc;
130130

131131
// Loop over all bins and associate the surfaces
132-
for (unsigned int bin_0 = 0; bin_0 < axis_0.nbins(); ++bin_0) {
133-
for (unsigned int bin_1 = 0; bin_1 < axis_1.nbins(); ++bin_1) {
132+
for (unsigned int bin_0 = 0u; bin_0 < axis_0.nbins(); ++bin_0) {
133+
for (unsigned int bin_1 = 0u; bin_1 < axis_1.nbins(); ++bin_1) {
134134

135135
auto z_borders = axis_0.bin_edges(bin_0);
136136
auto phi_borders = axis_1.bin_edges(bin_1);
@@ -200,7 +200,7 @@ static inline void bin_association(const context_t & /*context*/,
200200
phi_min = math::min(phi, phi_min);
201201
phi_max = math::max(phi, phi_max);
202202
surface_contour.push_back({vg[2], phi});
203-
if (phi < 0.) {
203+
if (phi < 0.f) {
204204
s_c_neg.push_back({vg[2], phi});
205205
z_min_neg = math::min(vg[2], z_min_neg);
206206
z_max_neg = math::max(vg[2], z_max_neg);
@@ -211,9 +211,10 @@ static inline void bin_association(const context_t & /*context*/,
211211
}
212212
}
213213
// Check for phi wrapping
214-
std::vector<std::vector<point2_t>> surface_contours;
214+
std::vector<std::vector<point2_t>>
215+
surface_contours{};
215216
if (phi_max - phi_min > constant<scalar_t>::pi &&
216-
phi_max * phi_min < 0.) {
217+
phi_max * phi_min < 0.f) {
217218
s_c_neg.push_back(
218219
{z_max_neg, -constant<scalar_t>::pi});
219220
s_c_neg.push_back(

‎tests/unit_tests/cpu/geometry/tracking_surface.cpp

+23-21
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ enum class material_ids : unsigned int {
3535

3636
constexpr detray::test::scalar tol{5e-5f};
3737

38+
detray::dvector3D<detray::test::algebra> test_dir{0.f, 0.f, 1.f};
39+
3840
} // anonymous namespace
3941

4042
// This tests the construction of a surface descriptor object
@@ -160,17 +162,17 @@ GTEST_TEST(detray_geometry, surface_toy_detector) {
160162

161163
// Coordinate transformations
162164
point3 glob_pos = {4.f, 7.f, 4.f};
163-
point3 local = disc.global_to_local(ctx, glob_pos, {});
164-
point2 bound = disc.global_to_bound(ctx, glob_pos, {});
165+
point3 local = disc.global_to_local(ctx, glob_pos, test_dir);
166+
point2 bound = disc.global_to_bound(ctx, glob_pos, test_dir);
165167

166168
ASSERT_NEAR(local[0], std::sqrt(65.f), tol);
167169
ASSERT_NEAR(local[1], std::atan2(7.f, 4.f), tol);
168170
ASSERT_NEAR(bound[0], local[0], tol);
169171
ASSERT_NEAR(bound[1], local[1], tol);
170172

171173
// Roundtrip
172-
point3 global = disc.local_to_global(ctx, local, {});
173-
point3 global2 = disc.bound_to_global(ctx, bound, {});
174+
point3 global = disc.local_to_global(ctx, local, test_dir);
175+
point3 global2 = disc.bound_to_global(ctx, bound, test_dir);
174176

175177
ASSERT_NEAR(glob_pos[0], global[0], tol);
176178
ASSERT_NEAR(glob_pos[1], global[1], tol);
@@ -237,22 +239,22 @@ GTEST_TEST(detray_geometry, surface_toy_detector) {
237239
// Coordinate transformation roundtrip
238240
glob_pos = {4.f, 7.f, 4.f};
239241

240-
local = rec.global_to_local(ctx, glob_pos, {});
241-
global = rec.local_to_global(ctx, local, {});
242+
local = rec.global_to_local(ctx, glob_pos, test_dir);
243+
global = rec.local_to_global(ctx, local, test_dir);
242244
ASSERT_NEAR(glob_pos[0], global[0], tol);
243245
ASSERT_NEAR(glob_pos[1], global[1], tol);
244246
ASSERT_NEAR(glob_pos[2], global[2], tol);
245247

246248
glob_pos = {-71.902099f, -7.081735f, -460.f};
247249

248-
local = rec.global_to_local(ctx, glob_pos, {});
249-
global = rec.local_to_global(ctx, local, {});
250+
local = rec.global_to_local(ctx, glob_pos, test_dir);
251+
global = rec.local_to_global(ctx, local, test_dir);
250252
ASSERT_NEAR(glob_pos[0], global[0], tol);
251253
ASSERT_NEAR(glob_pos[1], global[1], tol);
252254
ASSERT_NEAR(glob_pos[2], global[2], tol);
253255

254-
bound = rec.global_to_bound(ctx, glob_pos, {});
255-
global = rec.bound_to_global(ctx, bound, {});
256+
bound = rec.global_to_bound(ctx, glob_pos, test_dir);
257+
global = rec.bound_to_global(ctx, bound, test_dir);
256258
ASSERT_NEAR(global[0], glob_pos[0], tol);
257259
ASSERT_NEAR(global[1], glob_pos[1], tol);
258260
ASSERT_NEAR(global[2], glob_pos[2], tol);
@@ -339,23 +341,23 @@ GTEST_TEST(detray_geometry, surface_toy_detector) {
339341
// Coordinate transformation roundtrip
340342
glob_pos = {4.f, 7.f, 4.f};
341343

342-
local = cyl.global_to_local(ctx, glob_pos, {});
343-
global = cyl.local_to_global(ctx, local, {});
344+
local = cyl.global_to_local(ctx, glob_pos, test_dir);
345+
global = cyl.local_to_global(ctx, local, test_dir);
344346
ASSERT_NEAR(glob_pos[0], global[0], tol);
345347
ASSERT_NEAR(glob_pos[1], global[1], tol);
346348
ASSERT_NEAR(glob_pos[2], global[2], tol);
347349

348350
glob_pos = {constant<scalar>::inv_sqrt2 * r,
349351
constant<scalar>::inv_sqrt2 * r, 2.f};
350352

351-
local = cyl.global_to_local(ctx, glob_pos, {});
352-
global = cyl.local_to_global(ctx, local, {});
353+
local = cyl.global_to_local(ctx, glob_pos, test_dir);
354+
global = cyl.local_to_global(ctx, local, test_dir);
353355
ASSERT_NEAR(glob_pos[0], global[0], tol);
354356
ASSERT_NEAR(glob_pos[1], global[1], tol);
355357
ASSERT_NEAR(glob_pos[2], global[2], tol);
356358

357-
bound = cyl.global_to_bound(ctx, glob_pos, {});
358-
global = cyl.bound_to_global(ctx, bound, {});
359+
bound = cyl.global_to_bound(ctx, glob_pos, test_dir);
360+
global = cyl.bound_to_global(ctx, bound, test_dir);
359361
ASSERT_NEAR(global[0], glob_pos[0], tol);
360362
ASSERT_NEAR(global[1], glob_pos[1], tol);
361363
ASSERT_NEAR(global[2], glob_pos[2], tol);
@@ -442,7 +444,7 @@ GTEST_TEST(detray_geometry, surface_wire_chamber) {
442444
// Coordinate transformation roundtrip
443445
point3 glob_pos = {4.f, 7.f, 4.f};
444446

445-
point3 local = line.global_to_local(ctx, glob_pos, dir);
447+
point3 local = line.global_to_local(ctx, glob_pos, test_dir);
446448
global = line.local_to_global(ctx, local, dir);
447449

448450
// @TODO: Needs a reduced tolerance, why?
@@ -453,15 +455,15 @@ GTEST_TEST(detray_geometry, surface_wire_chamber) {
453455

454456
glob_pos = center;
455457

456-
local = line.global_to_local(ctx, glob_pos, dir);
457-
global = line.local_to_global(ctx, local, dir);
458+
local = line.global_to_local(ctx, glob_pos, test_dir);
459+
global = line.local_to_global(ctx, local, test_dir);
458460
red_tol = 7.f * 1e-5f;
459461
ASSERT_NEAR(glob_pos[0], global[0], red_tol);
460462
ASSERT_NEAR(glob_pos[1], global[1], red_tol);
461463
ASSERT_NEAR(glob_pos[2], global[2], red_tol);
462464

463-
point2 bound = line.global_to_bound(ctx, glob_pos, dir);
464-
global = line.bound_to_global(ctx, bound, dir);
465+
point2 bound = line.global_to_bound(ctx, glob_pos, test_dir);
466+
global = line.bound_to_global(ctx, bound, test_dir);
465467
ASSERT_NEAR(global[0], glob_pos[0], red_tol);
466468
ASSERT_NEAR(global[1], glob_pos[1], red_tol);
467469
ASSERT_NEAR(global[2], glob_pos[2], red_tol);

‎tests/unit_tests/cpu/navigation/intersection/intersection_kernel.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ GTEST_TEST(detray_intersection, intersection_kernel_ray) {
173173
EXPECT_TRUE(sfi_init[i].direction);
174174
EXPECT_EQ(sfi_init[i].volume_link, 0u);
175175

176-
vector3 global;
176+
vector3 global{0.f, 0.f, 0.f};
177177

178178
if (sfi_init[i].sf_desc.mask().id() == mask_ids::e_rectangle2) {
179179
global =
@@ -296,7 +296,7 @@ GTEST_TEST(detray_intersection, intersection_kernel_helix) {
296296
static_context, std::array<scalar, 2>{0.f, 0.f}, scalar{0.f},
297297
scalar{0.f});
298298

299-
vector3 global;
299+
vector3 global{0.f, 0.f, 0.f};
300300

301301
if (surface.mask().id() == mask_ids::e_rectangle2) {
302302
global =

0 commit comments

Comments
 (0)