Skip to content

Commit a300cae

Browse files
committed
update docs, fix typos, use workaround for Julia 1.10 docstrings for ccallable functions
1 parent b529257 commit a300cae

File tree

2 files changed

+33
-16
lines changed

2 files changed

+33
-16
lines changed

compile/cmake/JetReconstruction/JetReconstructionConfig.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Config file for the JetReconstruction.jl package
2-
# Manualy adjusted from standard cmake generated config file
2+
# Manually adjusted from standard cmake generated config file
33

44
set(JETRECONSTRUCTION_COMPILER "@JETRECONSTRUCTION_COMPILER@")
55

src/C_JetReconstruction/C_JetReconstruction.jl

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ function make_c_array(v::Vector{T}) where {T}
9090
return ptr, Csize_t(len)
9191
end
9292

93-
"""
93+
# Workaround for Julia 1.10 not accepting docstrings together with `@ccallable`
94+
@doc """
9495
jetreconstruction_PseudoJet_init(ptr::Ptr{PseudoJet}, px::Cdouble,
9596
py::Cdouble, pz::Cdouble,
9697
E::Cdouble, cluster_hist_index::Clong) -> Cint
@@ -104,10 +105,14 @@ C-binding for `PseudoJet` initialization.
104105
- `E::Cdouble`: The energy of the jet.
105106
- `cluster_hist_index::Clong`: The index of the cluster history.
106107
108+
# Note
109+
For an array of initial jets the `cluster_hist_index` should be 1+index of the jet in an array.
110+
107111
# Returns
108112
- `Cint`: An integer status code indicating the success or failure.
109113
110-
"""
114+
""" jetreconstruction_PseudoJet_init
115+
111116
Base.@ccallable function jetreconstruction_PseudoJet_init(ptr::Ptr{PseudoJet}, px::Cdouble,
112117
py::Cdouble, pz::Cdouble,
113118
E::Cdouble,
@@ -156,7 +161,8 @@ function free_members(ptr::Ptr{C_ClusterSequence{T}}) where {T}
156161
end
157162
end
158163

159-
"""
164+
# Workaround for Julia 1.10 not accepting docstrings together with `@ccallable`
165+
@doc """
160166
jetreconstruction_ClusterSequence_free_members_(ptr::Ptr{C_ClusterSequence{PseudoJet}}) -> Cvoid
161167
162168
C-binding for freeing the members of a `C_ClusterSequence` object pointed to by `ptr`.
@@ -166,7 +172,8 @@ C-binding for freeing the members of a `C_ClusterSequence` object pointed to by
166172
167173
# Returns
168174
- `Cvoid`: This function does not return a value.
169-
"""
175+
""" jetreconstruction_ClusterSequence_free_members_
176+
170177
Base.@ccallable function jetreconstruction_ClusterSequence_free_members_(ptr::Ptr{C_ClusterSequence{PseudoJet}})::Cvoid
171178
free_members(ptr)
172179
return nothing
@@ -229,7 +236,7 @@ end
229236
recombination_scheme::RecombinationScheme.Recombine,
230237
result::Ptr{C_ClusterSequence{U}})::Cint where {T, U}
231238
232-
Internal helper functions for calling `jet_reconstruct` with C-compatible data-structers.
239+
Internal helper functions for calling `jet_reconstruct` with C-compatible data-structures.
233240
234241
# Arguments
235242
- `particles::Ptr{T}`: Pointer to an array of pseudojet objects used for jet reconstruction.
@@ -266,7 +273,8 @@ function c_jet_reconstruct(particles::Ptr{T},
266273
return Cint(StatusCode.OK)
267274
end
268275

269-
"""
276+
# Workaround for Julia 1.10 not accepting docstrings together with `@ccallable`
277+
@doc """
270278
jetreconstruction_jet_reconstruct(particles::Ptr{PseudoJet},
271279
particles_length::Csize_t,
272280
algorithm::JetAlgorithm.Algorithm,
@@ -291,7 +299,8 @@ C-binding for `jet_reconstruct`.
291299
292300
# Notes
293301
- To avoid memory leaks the memory allocated for members of `result` should be freed with `jetreconstruction_ClusterSequence_free_members_`.
294-
"""
302+
""" jetreconstruction_jet_reconstruct
303+
295304
Base.@ccallable function jetreconstruction_jet_reconstruct(particles::Ptr{PseudoJet},
296305
particles_length::Csize_t,
297306
algorithm::JetAlgorithm.Algorithm,
@@ -333,7 +342,8 @@ function free_members(ptr::Ptr{C_JetsResult{T}}) where {T}
333342
end
334343
end
335344

336-
"""
345+
# Workaround for Julia 1.10 not accepting docstrings together with `@ccallable`
346+
@doc """
337347
jetreconstruction_JetsResult_free_members_(ptr::Ptr{C_JetsResult{PseudoJet}})::Cvoid
338348
339349
C-binding for freeing the members of a `C_JetsResult{PseudoJet}` object pointed to by `ptr`.
@@ -343,7 +353,8 @@ C-binding for freeing the members of a `C_JetsResult{PseudoJet}` object pointed
343353
344354
# Returns
345355
- `Cvoid`: This function does not return any value.
346-
"""
356+
""" jetreconstruction_JetsResult_free_members_
357+
347358
Base.@ccallable function jetreconstruction_JetsResult_free_members_(ptr::Ptr{C_JetsResult{PseudoJet}})::Cvoid
348359
free_members(ptr)
349360
return nothing
@@ -378,7 +389,8 @@ function jets_selection(selector, clustersequence::Ptr{C_ClusterSequence{T}},
378389
return Cint(StatusCode.OK)
379390
end
380391

381-
"""
392+
# Workaround for Julia 1.10 not accepting docstrings together with `@ccallable`
393+
@doc """
382394
jetreconstruction_exclusive_jets_dcut(clustersequence::Ptr{C_ClusterSequence{PseudoJet}},
383395
dcut::Cdouble,
384396
result::Ptr{C_JetsResult{PseudoJet}}) -> Cint
@@ -395,14 +407,16 @@ C-binding for `exclusive_jets` with a cut on the maximum distance parameter.
395407
396408
# Notes
397409
- To avoid memory leaks the memory allocated for members of `result` should be freed with `jetreconstruction_JetsResult_free_members_`.
398-
"""
410+
""" jetreconstruction_exclusive_jets_dcut
411+
399412
Base.@ccallable function jetreconstruction_exclusive_jets_dcut(clustersequence::Ptr{C_ClusterSequence{PseudoJet}},
400413
dcut::Cdouble,
401414
result::Ptr{C_JetsResult{PseudoJet}})::Cint
402415
return jets_selection(exclusive_jets, clustersequence, result; dcut = dcut)
403416
end
404417

405-
"""
418+
# Workaround for Julia 1.10 not accepting docstrings together with `@ccallable`
419+
@doc """
406420
jetreconstruction_exclusive_jets_njets(clustersequence::Ptr{C_ClusterSequence{PseudoJet}},
407421
njets::Csize_t,
408422
result::Ptr{C_JetsResult{PseudoJet}}) -> Cint
@@ -419,14 +433,16 @@ C-binding for `exclusive_jets` with a specific number of jets.
419433
420434
# Notes
421435
- To avoid memory leaks the memory allocated for members of `result` should be freed with `jetreconstruction_JetsResult_free_members_`.
422-
"""
436+
""" jetreconstruction_exclusive_jets_njets
437+
423438
Base.@ccallable function jetreconstruction_exclusive_jets_njets(clustersequence::Ptr{C_ClusterSequence{PseudoJet}},
424439
njets::Csize_t,
425440
result::Ptr{C_JetsResult{PseudoJet}})::Cint
426441
return jets_selection(exclusive_jets, clustersequence, result; njets = njets)
427442
end
428443

429-
"""
444+
# Workaround for Julia 1.10 not accepting docstrings together with `@ccallable`
445+
@doc """
430446
jetreconstruction_inclusive_jets(clustersequence::Ptr{C_ClusterSequence{PseudoJet}},
431447
ptmin::Cdouble,
432448
result::Ptr{C_JetsResult{PseudoJet}}) -> Cint
@@ -443,7 +459,8 @@ C-binding for `inclusive_jets`.
443459
444460
# Notes
445461
- To avoid memory leaks the memory allocated for members of `result` should be freed with `jetreconstruction_JetsResult_free_members_`.
446-
"""
462+
""" jetreconstruction_inclusive_jets
463+
447464
Base.@ccallable function jetreconstruction_inclusive_jets(clustersequence::Ptr{C_ClusterSequence{PseudoJet}},
448465
ptmin::Cdouble,
449466
result::Ptr{C_JetsResult{PseudoJet}})::Cint

0 commit comments

Comments
 (0)