@@ -29,7 +29,7 @@ Compute dij distance for (Durham, EEKt, Valencia) using simple conditionals.
2929Beam index `j==0` returns a large sentinel. For Valencia we use the full
3030Valencia metric (independent of `dij_factor`).
3131"""
32- @inline function dij_dist (eereco, i, j, dij_factor, algorithm, R= 4.0 )
32+ @inline function dij_dist (eereco, i, j, dij_factor, algorithm, R = 4.0 )
3333 if ! (algorithm isa JetAlgorithm. Algorithm)
3434 throw (ArgumentError (" algorithm must be a JetAlgorithm.Algorithm" ))
3535 end
@@ -62,11 +62,10 @@ Calculate the Valencia distance between two jets `i` and `j` as
6262Base. @propagate_inbounds @inline function valencia_distance (eereco, i, j, R)
6363 invR2 = inv (R * R)
6464 @muladd angular_dist = 1.0 - eereco[i]. nx * eereco[j]. nx - eereco[i]. ny * eereco[j]. ny -
65- eereco[i]. nz * eereco[j]. nz
65+ eereco[i]. nz * eereco[j]. nz
6666 return min (eereco[i]. E2p, eereco[j]. E2p) * 2 * angular_dist * invR2
6767end
6868
69-
7069"""
7170 valencia_beam_distance(eereco, i, γ, β) -> Float64
7271
202201 @inbounds for j in 1 : N
203202 if j != i
204203 this_metric = algorithm == JetAlgorithm. Valencia ?
205- valencia_distance (eereco, i, j, R) :
206- angular_distance (eereco, i, j)
204+ valencia_distance (eereco, i, j, R) :
205+ angular_distance (eereco, i, j)
207206 better_i = this_metric < eereco[i]. nndist
208207 eereco. nndist[i] = better_i ? this_metric : eereco. nndist[i]
209208 eereco. nni[i] = better_i ? j : eereco. nni[i]
0 commit comments