Coverity

Author: mattleblanc

test/_common.jl

@@ -10,6 +10,11 @@ using Logging
 using LorentzVectorHEP
 using JSON
 using Test
+using StructArrays
+
+using JetReconstruction: EERecoJet,
+                         fill_reco_array!, insert_new_jet!, copy_to_slot!,
+                         dij_dist, valencia_distance, valencia_distance_inv
 
 logger = ConsoleLogger(stdout, Logging.Warn)
 global_logger(logger)

test/test-ee-reconstruction.jl

@@ -26,3 +26,57 @@ for r in [2.0, 4.0]
                                 (cs) -> exclusive_jets(cs; njets = 4), "exclusive njets")
     run_reco_test(eekt_njets)
 end
+
+# Optimization/helper coverage
+
+@testset "E2p integer fast paths in fill/insert (e+e-)" begin
+    E1, E2 = 3.0, 2.0
+    # PseudoJet signature is (px, py, pz, E); give nonzero momentum to avoid 1/0 in EEJet
+    pj1 = PseudoJet(1.0, 0.0, 0.0, E1)
+    pj2 = PseudoJet(1.0, 0.0, 0.0, E2)
+    particles = EEJet[]
+    push!(particles, EEJet(pj1; cluster_hist_index = 1))
+    push!(particles, EEJet(pj2; cluster_hist_index = 2))
+
+    eereco = StructArray{EERecoJet}(undef, 2)
+    R = 1.0
+    R2 = R^2
+
+    fill_reco_array!(eereco, particles, R2, 1)
+    @test eereco.E2p[1] ≈ E1^2
+    @test eereco.E2p[2] ≈ E2^2
+
+    fill_reco_array!(eereco, particles, R2, 2)
+    @test eereco.E2p[1] ≈ E1^4
+    @test eereco.E2p[2] ≈ E2^4
+
+    merged = EEJet(1.0, 0.0, 0.0, 5.0; cluster_hist_index = 0)
+    insert_new_jet!(eereco, 1, 3, R2, merged, 1)
+    @test eereco.E2p[1] ≈ 5.0^2
+
+    insert_new_jet!(eereco, 2, 4, R2, merged, 2)
+    @test eereco.E2p[2] ≈ 5.0^4
+end
+
+@testset "copy_to_slot! copies fields" begin
+    eereco = StructArray{EERecoJet}(undef, 2)
+    eereco.index[1] = 10
+    eereco.nni[1] = 1
+    eereco.nndist[1] = 3.14
+    eereco.dijdist[1] = 2.71
+    eereco.nx[1] = 0.1
+    eereco.ny[1] = 0.2
+    eereco.nz[1] = 0.3
+    eereco.E2p[1] = 7.0
+    copy_to_slot!(eereco, 1, 2)
+    @test eereco.index[2] == 10
+    @test eereco.dijdist[2] == 2.71
+    @test eereco.E2p[2] == 7.0
+end
+
+@testset "dij_dist fallback error (non-Algorithm)" begin
+    eereco = StructArray{EERecoJet}(undef, 1)
+    eereco.nndist[1] = 0.0
+    eereco.E2p[1] = 1.0
+    @test_throws ArgumentError dij_dist(eereco, 1, 0, 1.0, :Foo, 1.0)
+end

test/test-valencia.jl

@@ -65,10 +65,6 @@ valencia_exclusive_d500_b1g1 = ComparisonTestValencia(events_file_ee,
                                                       "exclusive dcut=500 beta=1.0 gamma=1.0 R=1.0")
 run_reco_test(valencia_exclusive_d500_b1g1)
 
-# Bring required types/functions into scope for targeted unit tests
-using JetReconstruction: EERecoJet, PseudoJet, EEJet, ee_genkt_algorithm, dij_dist,
-                         valencia_distance
-
 # Test dij_dist for Valencia algorithm
 @testset "dij_dist Valencia" begin
     # Minimal eereco with two reco jets; only nx,ny,nz,E2p are used by valencia_distance
@@ -78,6 +74,17 @@ using JetReconstruction: EERecoJet, PseudoJet, EEJet, ee_genkt_algorithm, dij_di
     @test dij ≈ valencia_distance(eereco, 1, 2, 0.8)
 end
 
+# Valencia distance wrapper coverage
+@testset "Valencia distance wrappers" begin
+    # Minimal eereco with two reco jets and identical directions so angle=0
+    eereco = EERecoJet[EERecoJet(1, 0, Inf, Inf, 1.0, 0.0, 0.0, 9.0),
+                       EERecoJet(2, 0, Inf, Inf, 1.0, 0.0, 0.0, 4.0)]
+    R = 2.0
+    invR2 = inv(R * R)
+    @test valencia_distance_inv(eereco, 1, 2, invR2) == 0.0
+    @test valencia_distance(eereco, 1, 2, R) == 0.0
+end
+
 # Test ee_genkt_algorithm for Valencia algorithm (covers β override and dij_factor selection)
 @testset "ee_genkt_algorithm Valencia" begin
     particles = [PseudoJet(1.0, 0.0, 0.0, 1.0)]