Fix tests for parametrised types

Author: graeme-a-stewart

src/ClusterSequence.jl

@@ -266,7 +266,7 @@ function inclusive_jets(clusterseq::ClusterSequence{U}; ptmin = 0.0,
         jet = clusterseq.jets[iparent_jet]
         if pt2(jet) >= pt2min
             @debug "Added inclusive jet index $iparent_jet"
-            if T == U
+            if T <: U
                 push!(jets_local, jet)
             else
                 push!(jets_local,

src/Substructure.jl

@@ -142,7 +142,8 @@ The method stops at the first jet satisfying the mass and distance thresholds.
 # Returns:
 - `PseudoJet`: The jet (or subjet) satisfying the mass drop conditions, if tagging is successful, otherwise a zero-momentum PseudoJet
 """
-function mass_drop(jet::PseudoJet, clusterseq::ClusterSequence, tag::MassDropTagger)
+function mass_drop(jet::PseudoJet{T}, clusterseq::ClusterSequence,
+                   tag::MassDropTagger) where {T <: Real}
     all_jets = clusterseq.jets
     hist = clusterseq.history
 
@@ -188,11 +189,11 @@ This function reclusters the jet and iteratively checks the soft-drop condition
 # Returns:
 - `PseudoJet`: Groomed jet or zero-momentum PseudoJet if grooming fails
 """
-function soft_drop(jet::PseudoJet, clusterseq::ClusterSequence,
-                   tag::SoftDropTagger)
+function soft_drop(jet::PseudoJet{T}, clusterseq::ClusterSequence,
+                   tag::SoftDropTagger) where {T <: Real}
     rad = tag.cluster_rad
     new_clusterseq = recluster(jet, clusterseq; R = rad, algorithm = JetAlgorithm.CA)
-    new_jet = sort!(inclusive_jets(new_clusterseq; T = PseudoJet), by = pt2, rev = true)[1]
+    new_jet = sort!(inclusive_jets(new_clusterseq; T = PseudoJet{T}), by = pt2, rev = true)[1]
 
     all_jets = new_clusterseq.jets
     hist = new_clusterseq.history
@@ -238,10 +239,12 @@ Filters a jet to retain only the hardest subjets based on a specified radius and
 # Returns:
 - `PseudoJet`: Filtered jet composed of the hardest subjets
 """
-function jet_filtering(jet::PseudoJet, clusterseq::ClusterSequence, filter::JetFilter)
+function jet_filtering(jet::PseudoJet{T}, clusterseq::ClusterSequence,
+                       filter::JetFilter) where {T <: Real}
     rad = filter.filter_radius
     new_clusterseq = recluster(jet, clusterseq; R = rad, algorithm = JetAlgorithm.CA)
-    reclustered = sort!(inclusive_jets(new_clusterseq; T = PseudoJet), by = pt2, rev = true)
+    reclustered = sort!(inclusive_jets(new_clusterseq; T = PseudoJet{T}), by = pt2,
+                        rev = true)
 
     n = length(reclustered) <= filter.num_hardest_jets ? length(reclustered) :
         filter.num_hardest_jets
@@ -265,13 +268,15 @@ Trims a jet by removing subjets with transverse momentum below a specified fract
 # Returns:
 - `PseudoJet`: Trimmed jet composed of retained subjets
 """
-function jet_trimming(jet::PseudoJet, clusterseq::ClusterSequence, trim::JetTrim)
+function jet_trimming(jet::PseudoJet{T}, clusterseq::ClusterSequence,
+                      trim::JetTrim) where {T <: Real}
     rad = trim.trim_radius
     alg = trim.recluster_method
     frac2 = trim.trim_fraction^2
 
     new_clusterseq = recluster(jet, clusterseq; R = rad, algorithm = alg)
-    reclustered = sort!(inclusive_jets(new_clusterseq; T = PseudoJet), by = pt2, rev = true)
+    reclustered = sort!(inclusive_jets(new_clusterseq; T = PseudoJet{T}), by = pt2,
+                        rev = true)
 
     hard = Vector{PseudoJet}(undef, 0)
     for item in reclustered

test/runtests.jl

@@ -158,7 +158,7 @@ function do_test_compare_types(strategy::RecoStrategy.Strategy;
 
     # Now run our jet reconstruction...
     # From PseudoJets
-    events::Vector{Vector{PseudoJet}} = read_final_state_particles(events_file_pp)
+    events::Vector{Vector{PseudoJet{Float64}}} = read_final_state_particles(events_file_pp)
     jet_collection = FinalJets[]
     for (ievt, event) in enumerate(events)
         finaljets = final_jets(inclusive_jets(jet_reconstruction(event, R = distance,

test/test-constituents.jl

@@ -21,7 +21,7 @@ event_no = 1
 cluster_seq = jet_reconstruct(events[event_no], p = 1, R = 1.0)
 
 # Retrieve the exclusive pj_jets, but as `PseudoJet` types
-pj_jets = inclusive_jets(cluster_seq; ptmin = 5.0, T = PseudoJet)
+pj_jets = inclusive_jets(cluster_seq; ptmin = 5.0, T = PseudoJet{Float64})
 
 @testset "Jet constituents" begin
     @testset "Constituents of jet number $(event_no)" begin

test/test-substructure.jl

@@ -36,7 +36,7 @@ for m in keys(methods)
     @testset "$testname" begin
         for (ievt, evt) in enumerate(events)
             cluster_seq = jet_reconstruct(evt, p = 0, R = 1.0)
-            jets = inclusive_jets(cluster_seq; ptmin = 5.0, T = PseudoJet)
+            jets = inclusive_jets(cluster_seq; ptmin = 5.0, T = PseudoJet{Float64})
             groomed = sort!([methods[m](jet, cluster_seq, groomer)
                              for jet in jets], by = JetReconstruction.pt2, rev = true)