Optimise e+e- reconstruction (#76)

Optimised SoAs using StructArrays

Using a StructArray approach to more easily
access all of the necessary variables in compact form

Documentation and formatting improved.

Remove nx, ny, nz from EEJet

Author: graeme-a-stewart

Project.toml

@@ -13,6 +13,7 @@ LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890"
 LorentzVectorHEP = "f612022c-142a-473f-8cfd-a09cf3793c6c"
 LorentzVectors = "3f54b04b-17fc-5cd4-9758-90c048d965e3"
 MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221"
+StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
 
 [weakdeps]
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
@@ -30,6 +31,7 @@ LorentzVectorHEP = "0.1.6"
 LorentzVectors = "0.4.3"
 Makie = "0.21"
 MuladdMacro = "0.2.4"
+StructArrays = "0.6.18"
 julia = "1.9"
 
 [extras]

src/ClusterSequence.jl

@@ -176,6 +176,8 @@ add_step_to_history!(clusterseq::ClusterSequence, parent1, parent2, jetp_index,
 
     local_step = length(clusterseq.history)
 
+    # println("Adding step $local_step: parent1=$parent1, parent2=$parent2, jetp_index=$jetp_index, dij=$dij")
+
     # Sanity check: make sure the particles have not already been recombined
     #
     # Note that good practice would make this an assert (since this is
@@ -184,7 +186,10 @@ add_step_to_history!(clusterseq::ClusterSequence, parent1, parent2, jetp_index,
     # retry the clustering with a different strategy.
     @assert parent1 >= 1
     if clusterseq.history[parent1].child != Invalid
-        error("Internal error. Trying to recombine an object that has previsously been recombined.")
+        error("Internal error. Trying to recombine an object that has previsously been recombined. Parent " *
+              string(parent1) * "'s child index " *
+              string(clusterseq.history[parent1].child) * ". Parent jet index: " *
+              string(clusterseq.history[parent1].jetp_index) * ".")
     end
 
     hist_elem = clusterseq.history[parent1]