Reformat with JuliaFormatter

JuliaFormatter in SciML style (see .JuliaFormatter.toml)

Author: graeme-a-stewart

.JuliaFormatter.toml

@@ -0,0 +1,2 @@
+style = "sciml"
+yas_style_nesting = true

ext/JetVisualisation.jl

@@ -44,7 +44,9 @@ using WGLMakie
 jetsplot(my_objects, cs, Module=Main) #default
 ```
 """
-function JetReconstruction.jetsplot(objects, cs::ClusterSequence; barsize_phi = 0.1, barsize_eta = 0.1, colormap = :glasbey_hv_n256, Module = CairoMakie)
+function JetReconstruction.jetsplot(objects, cs::ClusterSequence; barsize_phi = 0.1,
+                                    barsize_eta = 0.1, colormap = :glasbey_hv_n256,
+                                    Module = CairoMakie)
     idx_arrays = Vector{Int}[]
     for elt in cs.history
         elt.parent2 == JetReconstruction.BeamJet || continue
@@ -84,28 +86,29 @@ using WGLMakie
 jetsplot(my_objects, my_colour_arrays, Module=Main) #default
 ```
 """
-function JetReconstruction.jetsplot(objects, idx_arrays; barsize_phi = 0.1, barsize_eta = 0.1, colormap = :glasbey_hv_n256, Module = Main)
+function JetReconstruction.jetsplot(objects, idx_arrays; barsize_phi = 0.1,
+                                    barsize_eta = 0.1, colormap = :glasbey_hv_n256,
+                                    Module = Main)
     cs = fill(0, length(objects)) # colours
     for i in 1:length(idx_arrays), j in idx_arrays[i]
         cs[j] = i
     end
 
     pts = sqrt.(JetReconstruction.pt2.(objects))
 
-    Module.meshscatter(
-        Module.Point3f.(JetReconstruction.phi.(objects), JetReconstruction.rapidity.(objects), 0pts);
-        color = cs,
-        markersize = Module.Vec3f.(barsize_phi, barsize_eta, pts),
-        colormap = colormap,
-        marker = Module.Rect3f(Module.Vec3f(0), Module.Vec3f(1)),
-        figure = (size = (700, 600),),
-        axis = (
-            type = Module.Axis3, perspectiveness = 0.5, azimuth = 2.6, elevation = 0.5,
-            xlabel = "ϕ", ylabel = "η", zlabel = "kt",
-            limits = (nothing, nothing, nothing, nothing, 0, findmax(pts)[1] + 10),
-        ),
-        shading = NoShading,
-    )
+    Module.meshscatter(Module.Point3f.(JetReconstruction.phi.(objects),
+                                       JetReconstruction.rapidity.(objects), 0pts);
+                       color = cs,
+                       markersize = Module.Vec3f.(barsize_phi, barsize_eta, pts),
+                       colormap = colormap,
+                       marker = Module.Rect3f(Module.Vec3f(0), Module.Vec3f(1)),
+                       figure = (size = (700, 600),),
+                       axis = (type = Module.Axis3, perspectiveness = 0.5, azimuth = 2.6,
+                               elevation = 0.5,
+                               xlabel = "ϕ", ylabel = "η", zlabel = "kt",
+                               limits = (nothing, nothing, nothing, nothing, 0,
+                                         findmax(pts)[1] + 10)),
+                       shading = NoShading,)
 end
 
 end

src/AlgorithmStrategyEnums.jl

@@ -2,25 +2,26 @@
 using EnumX
 
 # Valid strategy enum
-@enumx T = Strategy RecoStrategy Best N2Plain N2Tiled
+@enumx T=Strategy RecoStrategy Best N2Plain N2Tiled
 const AllJetRecoStrategies = [String(Symbol(x)) for x in instances(RecoStrategy.Strategy)]
 
 # Algorithm emun
-@enumx T = Algorithm JetAlgorithm AntiKt CA Kt EEKt Durham
+@enumx T=Algorithm JetAlgorithm AntiKt CA Kt EEKt Durham
 const AllJetRecoAlgorithms = [String(Symbol(x)) for x in instances(JetAlgorithm.Algorithm)]
 
 # Map from algorithms to power values used 
 power2algorithm = Dict(-1 => JetAlgorithm.AntiKt,
-    0 => JetAlgorithm.CA,
-    1 => JetAlgorithm.Kt)
+                       0 => JetAlgorithm.CA,
+                       1 => JetAlgorithm.Kt)
 algorithm2power = Dict(JetAlgorithm.AntiKt => -1,
-    JetAlgorithm.CA => 0,
-    JetAlgorithm.Kt => 1)
+                       JetAlgorithm.CA => 0,
+                       JetAlgorithm.Kt => 1)
 
 # Map from string to an enum value (used for CLI parsing)
-Base.tryparse(E::Type{<:Enum}, str::String) =
+function Base.tryparse(E::Type{<:Enum}, str::String)
     let insts = instances(E),
         p = findfirst(==(Symbol(str)) ∘ Symbol, insts)
 
         p !== nothing ? insts[p] : nothing
     end
+end

src/ClusterSequence.jl

@@ -52,8 +52,8 @@ struct HistoryElement
 end
 
 """Used for initial particles"""
-HistoryElement(jetp_index) = HistoryElement(NonexistentParent, NonexistentParent, Invalid, jetp_index, 0.0, 0.0)
-
+HistoryElement(jetp_index) = HistoryElement(NonexistentParent, NonexistentParent, Invalid,
+                                            jetp_index, 0.0, 0.0)
 
 """
 Convienence structure holding all of the relevant parameters for
@@ -63,7 +63,7 @@ struct ClusterSequence
     """Algorithm and strategy used"""
     algorithm::JetAlgorithm.Algorithm
     strategy::RecoStrategy.Strategy
-    
+
     """
     This contains the physical PseudoJets; for each PseudoJet one can find
     the corresponding position in the history by looking at
@@ -96,14 +96,19 @@ ClusterSequence(p::Int, strategy::RecoStrategy.Strategy, jets, history, Qtot) =
 end
 
 """ClusterSequence constructor, with direct algorithm specified"""
-ClusterSequence(alg::JetAlgorithm.Algorithm, strategy::RecoStrategy.Strategy, jets, history, Qtot) =
-    ClusterSequence(alg, strategy, jets, length(jets), history, Qtot)
+ClusterSequence(alg::JetAlgorithm.Algorithm, strategy::RecoStrategy.Strategy, jets, history, Qtot) = ClusterSequence(alg,
+                                                                                                                     strategy,
+                                                                                                                     jets,
+                                                                                                                     length(jets),
+                                                                                                                     history,
+                                                                                                                     Qtot)
 
 """Add a new jet's history into the recombination sequence"""
 add_step_to_history!(clusterseq::ClusterSequence, parent1, parent2, jetp_index, dij) = begin
     max_dij_so_far = max(dij, clusterseq.history[end].max_dij_so_far)
-    push!(clusterseq.history, HistoryElement(parent1, parent2, Invalid,
-        jetp_index, dij, max_dij_so_far))
+    push!(clusterseq.history,
+          HistoryElement(parent1, parent2, Invalid,
+                         jetp_index, dij, max_dij_so_far))
 
     local_step = length(clusterseq.history)
 
@@ -122,10 +127,11 @@ add_step_to_history!(clusterseq::ClusterSequence, parent1, parent2, jetp_index,
     clusterseq.history[parent1] = @set hist_elem.child = local_step
 
     if parent2 >= 1
-        clusterseq.history[parent2].child == Invalid || error(
-            "Internal error. Trying to recombine an object that has previsously been recombined.  Parent " * string(parent2) * "'s child index " * string(clusterseq.history[parent1].child) * ". Parent jet index: " *
-            string(clusterseq.history[parent2].jetp_index) * ".",
-        )
+        clusterseq.history[parent2].child == Invalid ||
+            error("Internal error. Trying to recombine an object that has previsously been recombined.  Parent " *
+                  string(parent2) * "'s child index " *
+                  string(clusterseq.history[parent1].child) * ". Parent jet index: " *
+                  string(clusterseq.history[parent2].jetp_index) * ".")
         hist_elem = clusterseq.history[parent2]
         clusterseq.history[parent2] = @set hist_elem.child = local_step
     end
@@ -158,24 +164,24 @@ function inclusive_jets(clusterseq::ClusterSequence, ptmin = 0.0)
     jets_local
 end
 
-
 """Return all exclusive jets of a ClusterSequence"""
 function exclusive_jets(clusterseq::ClusterSequence; dcut = nothing, njets = nothing)
     if isnothing(dcut) && isnothing(njets)
         throw(ArgumentError("Must pass either a dcut or an njets value"))
     end
 
     if !isnothing(dcut)
-        njets = n_exclusive_jets(clusterseq, dcut=dcut)
+        njets = n_exclusive_jets(clusterseq, dcut = dcut)
     end
 
     # Check that an algorithm was used that makes sense for exclusive jets
-    if !(clusterseq.algorithm ∈ (JetAlgorithm.CA, JetAlgorithm.Kt, JetAlgorithm.EEKt, JetAlgorithm.Durham))
+    if !(clusterseq.algorithm ∈
+         (JetAlgorithm.CA, JetAlgorithm.Kt, JetAlgorithm.EEKt, JetAlgorithm.Durham))
         throw(ArgumentError("Algorithm used is not suitable for exclusive jets ($(clusterseq.algorithm))"))
     end
 
     # njets search
-    stop_point = 2*clusterseq.n_initial_jets - njets + 1
+    stop_point = 2 * clusterseq.n_initial_jets - njets + 1
 
     # Sanity check - never return more jets than initial particles
     if stop_point < clusterseq.n_initial_jets
@@ -194,26 +200,27 @@ function exclusive_jets(clusterseq::ClusterSequence; dcut = nothing, njets = not
             if (parent < stop_point && parent > 0)
                 @debug "Added exclusive jet index $(clusterseq.history[parent].jetp_index)"
                 jet = clusterseq.jets[clusterseq.history[parent].jetp_index]
-                push!(excl_jets, LorentzVectorCyl(pt(jet), rapidity(jet), phi(jet), mass(jet)))
+                push!(excl_jets,
+                      LorentzVectorCyl(pt(jet), rapidity(jet), phi(jet), mass(jet)))
             end
         end
     end
 
     excl_jets
 end
 
-
 """Return all number of exclusive jets of a ClusterSequence that are above a certain dcut value"""
 function n_exclusive_jets(clusterseq::ClusterSequence; dcut::AbstractFloat)
     # Check that an algorithm was used that makes sense for exclusive jets
-    if !(clusterseq.algorithm ∈ (JetAlgorithm.CA, JetAlgorithm.Kt, JetAlgorithm.EEKt, JetAlgorithm.Durham))
+    if !(clusterseq.algorithm ∈
+         (JetAlgorithm.CA, JetAlgorithm.Kt, JetAlgorithm.EEKt, JetAlgorithm.Durham))
         throw(ArgumentError("Algorithm used is not suitable for exclusive jets ($(clusterseq.algorithm))"))
     end
 
     # Locate the point where clustering would have stopped (i.e. the
     # first time max_dij_so_far > dcut)
     i_dcut = length(clusterseq.history)
-    for i_history ∈ length(clusterseq.history):-1:1
+    for i_history in length(clusterseq.history):-1:1
         @debug "Examining $i_history, max_dij=$(clusterseq.history[i_history].max_dij_so_far)"
         if clusterseq.history[i_history].max_dij_so_far <= dcut
             i_dcut = i_history
@@ -223,5 +230,4 @@ function n_exclusive_jets(clusterseq::ClusterSequence; dcut::AbstractFloat)
 
     # The number of jets is then given by this formula
     length(clusterseq.history) - i_dcut
-
-end
+end

src/GenericAlgo.jl

@@ -2,7 +2,8 @@
 # switch based on the strategy, or based on the event density
 # if the "Best" strategy is to be employed
 
-function jet_reconstruct(particles; p = -1, R = 1.0, recombine = +, strategy = RecoStrategy.Best)
+function jet_reconstruct(particles; p = -1, R = 1.0, recombine = +,
+                         strategy = RecoStrategy.Best)
     # Either map to the fixed algorithm corresponding to the strategy
     # or to an optimal choice based on the density of initial particles
 

src/HepMC3.jl

@@ -38,21 +38,21 @@ struct Particle{T}
     vertex::Integer
 end
 
-Particle{T}() where T = Particle(LorentzVector{T}(0., 0., 0., 0.), 0, 0, 0, 0)
+Particle{T}() where {T} = Particle(LorentzVector{T}(0.0, 0.0, 0.0, 0.0), 0, 0, 0, 0)
 
 """ Read a [HepMC3](https://doi.org/10.1016/j.cpc.2020.107310) ascii file.
 
     Each event is passed to the provided function f as a vector of Particles. A
     maximum number of events to read (value -1 to read all availble events) and
     a number of events to skip at the beginning of the file can be provided.
 """
-function read_events(f, fin; maxevents=-1, skipevents=0)
+function read_events(f, fin; maxevents = -1, skipevents = 0)
     T = Float64
     particles = Particle{T}[]
     ievent = 0
     ipart = 0
     toskip = skipevents
-    
+
     for (il, l) in enumerate(eachline(fin))
         if occursin(r"HepMC::.*-END_EVENT_LISTING", l)
             break
@@ -82,13 +82,14 @@ function read_events(f, fin; maxevents=-1, skipevents=0)
             px = parse(T, tok[5])
             py = parse(T, tok[6])
             pz = parse(T, tok[7])
-            e =  parse(T, tok[8])
+            e = parse(T, tok[8])
             status = parse(Int, tok[10])
-            push!(particles, Particle{T}(LorentzVector(e,px,py,pz), status, pdgid, barcode, vertex))
+            push!(particles,
+                  Particle{T}(LorentzVector(e, px, py, pz), status, pdgid, barcode, vertex))
         end
     end
     #processing the last event:
     ievent > 0 && f(particles)
 end
 
-end
+end

src/JetReconstruction.jl

@@ -59,7 +59,8 @@ export savejets, loadjets!, loadjets
 
 # utility functions, useful for different primary scripts
 include("Utils.jl")
-export read_final_state_particles, read_final_state_particles_lv, pseudojets2vectors, final_jets
+export read_final_state_particles, read_final_state_particles_lv, pseudojets2vectors,
+       final_jets
 
 # Jet visualisation is an extension, see ext/JetVisualisation.jl
 function jetsplot() end