add cluster history index argument to pseudojet init

Author: m-fila

compile/downstream/jetreconstruction_test.c

@@ -60,9 +60,9 @@ int main(int argc, char *argv[]) {
 #endif
   size_t len = 2;
   jetreconstruction_PseudoJet particles[2];
-  sc = jetreconstruction_PseudoJet_init(&particles[0], 0.0, 1.0, 2.0, 3.0);
+  sc = jetreconstruction_PseudoJet_init(&particles[0], 0.0, 1.0, 2.0, 3.0, 1);
   assert(sc == JETRECONSTRUCTION_STATUSCODE_OK);
-  sc = jetreconstruction_PseudoJet_init(&particles[1], 1.0, 2.0, 3.0, 4.0);
+  sc = jetreconstruction_PseudoJet_init(&particles[1], 1.0, 2.0, 3.0, 4.0, 2);
   assert(sc == JETRECONSTRUCTION_STATUSCODE_OK);
 
   jetreconstruction_JetAlgorithm algorithm = JETRECONSTRUCTION_JETALGORITHM_CA;

compile/include/JetReconstruction.h.in

@@ -132,12 +132,13 @@ typedef struct {
  * @param[in] py The y-component of the momentum.
  * @param[in] pz The z-component of the momentum.
  * @param[in] E The energy component of the momentum.
+ * @param[in] cluter_hist_index The index of the cluster history.
  * @return An integer status code indicating the success or failure. See common
  * status codes jetreconstruction_StatusCode.
  */
 jetreconstruction_StatusCode
 jetreconstruction_PseudoJet_init(jetreconstruction_PseudoJet *ptr, double px,
-                                 double py, double pz, double E);
+                                 double py, double pz, double E, long cluter_hist_index);
 
 /**
  * @struct jetreconstruction_HistoryElement

compile/precompile_execution.jl

@@ -29,9 +29,9 @@ clustersequence_ptr = Ptr{C_ClusterSequence{PseudoJet}}(Libc.malloc(sizeof(C_Clu
 results_ptr = Ptr{C_JetsResult{PseudoJet}}(Libc.malloc(sizeof(C_JetsResult{PseudoJet})))
 @assert results_ptr != C_NULL
 
-assert_ok(jetreconstruction_PseudoJet_init(jets_ptr, 0.0, 1.0, 2.0, 3.0))
+assert_ok(jetreconstruction_PseudoJet_init(jets_ptr, 0.0, 1.0, 2.0, 3.0, 1))
 assert_ok(jetreconstruction_PseudoJet_init(jets_ptr + sizeof(PseudoJet), 1.0, 2.0, 3.0,
-                                           4.0))
+                                           4.0, 2))
 
 for algorithm in [JetAlgorithm.AntiKt, JetAlgorithm.CA, JetAlgorithm.Kt]
     for strategy in [RecoStrategy.N2Plain, RecoStrategy.N2Tiled, RecoStrategy.Best]

src/C_JetReconstruction/C_JetReconstruction.jl

@@ -119,8 +119,9 @@ function make_c_array(v::Vector{T}) where {T}
 end
 
 """
-    jetreconstruction_PseudoJet_init(ptr::Ptr{PseudoJet}, px::Cdouble, py::Cdouble, pz::Cdouble, E::Cdouble) -> Cint
-
+    jetreconstruction_PseudoJet_init(ptr::Ptr{PseudoJet}, px::Cdouble,
+                                     py::Cdouble, pz::Cdouble,
+                                     E::Cdouble, cluster_hist_index::Clong) -> Cint
 C-binding for `PseudoJet` initialization.
 
 # Arguments
@@ -129,16 +130,18 @@ C-binding for `PseudoJet` initialization.
 - `py::Cdouble`: The y-component of the momentum.
 - `pz::Cdouble`: The z-component of the momentum.
 - `E::Cdouble`: The energy of the jet.
+- `cluster_hist_index::Clong`: The index of the cluster history.
 
 # Returns
 - `Cint`: An integer status code indicating the success or failure.
 
 """
 Base.@ccallable function jetreconstruction_PseudoJet_init(ptr::Ptr{PseudoJet}, px::Cdouble,
                                                           py::Cdouble, pz::Cdouble,
-                                                          E::Cdouble)::Cint
+                                                          E::Cdouble,
+                                                          cluster_hist_index::Clong)::Cint
     try
-        pseudojet = PseudoJet(px, py, pz, E)
+        pseudojet = PseudoJet(px, py, pz, E; cluster_hist_index = cluster_hist_index)
         unsafe_store!(ptr, pseudojet)
     catch e
         return handle_exception(e)

test/test-c-interface.jl

@@ -41,10 +41,10 @@ end
 function test_pseudojet()
     ptr = Ptr{PseudoJet}(Libc.malloc(sizeof(PseudoJet)))
     @test ptr != C_NULL
-    ret = C_JetReconstruction.jetreconstruction_PseudoJet_init(ptr, 0.1, 0.2, 0.3, 1.0)
+    ret = C_JetReconstruction.jetreconstruction_PseudoJet_init(ptr, 0.1, 0.2, 0.3, 1.0, 1)
     @test C_JetReconstruction.StatusCode.T(ret) == C_JetReconstruction.StatusCode.OK
     c_jet = unsafe_load(ptr)
-    jet = PseudoJet(0.1, 0.2, 0.3, 1.0)
+    jet = PseudoJet(0.1, 0.2, 0.3, 1.0; cluster_hist_index = 1)
     struct_approx_equal(jet, c_jet)
 end