Skip to content

Commit df41f40

Browse files
committed
Rename group_distance to max_interaction_distance
1 parent 27ac784 commit df41f40

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/Event/Event.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ function Event(location::AbstractCoordinatePoint{T}, energy::RealQuantity = one(
2626
return evt
2727
end
2828

29-
function Event(locations::Vector{<:AbstractCoordinatePoint{T}}, energies::Vector{<:RealQuantity} = ones(T, length(locations)); group_distance::Union{<:Real, <:LengthQuantity} = NaN)::Event{T} where {T <: SSDFloat}
30-
d::T = T(to_internal_units(group_distance))
31-
@assert isnan(d) || d >= 0 "Group distance must be positive or NaN (no grouping), but $(group_distance) was given."
29+
function Event(locations::Vector{<:AbstractCoordinatePoint{T}}, energies::Vector{<:RealQuantity} = ones(T, length(locations)); max_interaction_distance::Union{<:Real, <:LengthQuantity} = NaN)::Event{T} where {T <: SSDFloat}
30+
d::T = T(to_internal_units(max_interaction_distance))
31+
@assert isnan(d) || d >= 0 "Max. interaction distance must be positive or NaN (no grouping), but $(max_interaction_distance) was given."
3232
evt = Event{T}()
3333
if isnan(d) # default: no grouping, the charges from different hits drift independently
3434
evt.locations = VectorOfArrays(broadcast(pt -> [CartesianPoint(pt)], locations))
@@ -64,14 +64,14 @@ end
6464
function Event(locations::Vector{<:AbstractCoordinatePoint{T}}, energies::Vector{<:RealQuantity}, N::Int;
6565
particle_type::Type{PT} = Gamma, number_of_shells::Int = 2,
6666
radius::Vector{<:Union{<:Real, <:LengthQuantity}} = radius_guess.(T.(to_internal_units.(energies)), particle_type),
67-
group_distance::Union{<:Real, <:LengthQuantity} = NaN
67+
max_interaction_distance::Union{<:Real, <:LengthQuantity} = NaN
6868
)::Event{T} where {T <: SSDFloat, PT <: ParticleType}
6969

7070

7171
@assert eachindex(locations) == eachindex(energies) == eachindex(radius)
7272

73-
d::T = T(to_internal_units(group_distance))
74-
@assert isnan(d) || d >= 0 "Group distance must be positive or NaN (no grouping), but $(group_distance) was given."
73+
d::T = T(to_internal_units(max_interaction_distance))
74+
@assert isnan(d) || d >= 0 "Max. interaction distance must be positive or NaN (no grouping), but $(max_interaction_distance) was given."
7575

7676
if isnan(d) # default: no grouping, the charges from different hits drift independently
7777
Event(

0 commit comments

Comments
 (0)