Skip to content

Commit 2510d5e

Browse files
committed
adapt to changed jet selection signature
1 parent 0e46653 commit 2510d5e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/C_JetReconstruction/C_JetReconstruction.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ function jets_selection(selector, clustersequence::Ptr{C_ClusterSequence{T}},
386386
try
387387
c_clusterseq = unsafe_load(clustersequence)
388388
clusterseq = ClusterSequence{T}(c_clusterseq)
389-
jets_result = selector(clusterseq; T = U, kwargs...)
389+
jets_result = selector(clusterseq, U; kwargs...)
390390
c_results = C_JetsResult{U}(make_c_array(jets_result)...)
391391
unsafe_store!(result, c_results)
392392
catch e

test/test-c-interface.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ function test_pseudojet()
4747
struct_approx_equal(jet, c_jet)
4848
end
4949

50-
function test_jet_reconstruct(filename; algorithm, R, strategy, recombine, power = 0.0,
51-
T = PseudoJet)
50+
function test_jet_reconstruct(filename, ::Type{T} = PseudoJet; algorithm, R, strategy,
51+
recombine, power = 0.0) where {T}
5252
@testset "C-interface jet reconstruct" begin
5353
events = JetReconstruction.read_final_state_particles(filename)
5454
results = Vector{ClusterSequence{T}}(undef, length(events))
@@ -93,7 +93,7 @@ function test_inclusive_jets(cluster_seq_ptrs::Vector{Ptr{C_JetReconstruction.C_
9393
ptmin,
9494
results_ptr)
9595
@test C_JetReconstruction.StatusCode.T(ret) == C_JetReconstruction.StatusCode.OK
96-
results = inclusive_jets(cluster_seq; ptmin = ptmin, T = T)
96+
results = inclusive_jets(cluster_seq, T; ptmin = ptmin)
9797
compare_results(results_ptr, results)
9898
C_JetReconstruction.jetreconstruction_JetsResult_free_members_(results_ptr)
9999
end
@@ -111,7 +111,7 @@ function test_exclusive_jets_njets(cluster_seq_ptrs::Vector{Ptr{C_JetReconstruct
111111
Csize_t(njets),
112112
results_ptr)
113113
@test C_JetReconstruction.StatusCode.T(ret) == C_JetReconstruction.StatusCode.OK
114-
results = exclusive_jets(cluster_seq; njets = njets, T = T)
114+
results = exclusive_jets(cluster_seq, T; njets = njets)
115115
compare_results(results_ptr, results)
116116
C_JetReconstruction.jetreconstruction_JetsResult_free_members_(results_ptr)
117117
end
@@ -129,7 +129,7 @@ function test_exclusive_jets_dcut(cluster_seq_ptrs::Vector{Ptr{C_JetReconstructi
129129
dcut,
130130
results_ptr)
131131
@test C_JetReconstruction.StatusCode.T(ret) == C_JetReconstruction.StatusCode.OK
132-
results = exclusive_jets(cluster_seq; dcut = dcut, T = T)
132+
results = exclusive_jets(cluster_seq, T; dcut = dcut)
133133
compare_results(results_ptr, results)
134134
C_JetReconstruction.jetreconstruction_JetsResult_free_members_(results_ptr)
135135
end

0 commit comments

Comments
 (0)