Skip to content

Commit f90dfe3

Browse files
mattleblancmattleblanc
committed
Running julia formatter
1 parent 7cb4dbb commit f90dfe3

File tree

2 files changed

+63
-51
lines changed

2 files changed

+63
-51
lines changed

‎test/_common.jl‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,18 @@ struct ComparisonTest
5858
end
5959

6060
"""Constructor where there is no selector_name given"""
61-
function ComparisonTest(events_file, fastjet_outputs, algorithm, strategy, power, R, selector)
61+
function ComparisonTest(events_file, fastjet_outputs, algorithm, strategy, power, R,
62+
selector)
6263
selector_name = ""
63-
ComparisonTest(events_file, fastjet_outputs, algorithm, strategy, power, R, selector, selector_name, addjets, nothing)
64+
ComparisonTest(events_file, fastjet_outputs, algorithm, strategy, power, R, selector,
65+
selector_name, addjets, nothing)
6466
end
6567

6668
"""Constructor with no recombine or preprocess specified"""
67-
function ComparisonTest(events_file, fastjet_outputs, algorithm, strategy, power, R, selector, selector_name)
68-
ComparisonTest(events_file, fastjet_outputs, algorithm, strategy, power, R, selector, selector_name, addjets, nothing)
69+
function ComparisonTest(events_file, fastjet_outputs, algorithm, strategy, power, R,
70+
selector, selector_name)
71+
ComparisonTest(events_file, fastjet_outputs, algorithm, strategy, power, R, selector,
72+
selector_name, addjets, nothing)
6973
end
7074

7175
"""
@@ -87,11 +91,12 @@ struct ComparisonTestValencia
8791
preprocess::Any
8892
end
8993

90-
function ComparisonTestValencia(events_file, fastjet_outputs, algorithm, strategy, power, R, γ, selector, selector_name)
91-
ComparisonTestValencia(events_file, fastjet_outputs, algorithm, strategy, power, R, γ, selector, selector_name, addjets, nothing)
94+
function ComparisonTestValencia(events_file, fastjet_outputs, algorithm, strategy, power, R,
95+
γ, selector, selector_name)
96+
ComparisonTestValencia(events_file, fastjet_outputs, algorithm, strategy, power, R, γ,
97+
selector, selector_name, addjets, nothing)
9298
end
9399

94-
95100
"""Read JSON file with fastjet jets in it"""
96101
function read_fastjet_outputs(fname)
97102
f = JetReconstruction.open_with_stream(fname)
@@ -128,15 +133,17 @@ function run_reco_test(test::ComparisonTest; testname = nothing)
128133
for (ievent, event) in enumerate(events)
129134
if test.algorithm == JetAlgorithm.Valencia
130135
# For VLC: pass both beta (power) and γ
131-
cluster_seq = JetReconstruction.jet_reconstruct(event; R = test.R, p = test.power,
136+
cluster_seq = JetReconstruction.jet_reconstruct(event; R = test.R,
137+
p = test.power,
132138
γ = getfield(test, :γ),
133139
algorithm = test.algorithm,
134140
strategy = test.strategy,
135141
recombine = test.recombine,
136142
preprocess = test.preprocess)
137143
else
138144
# All other algorithms
139-
cluster_seq = JetReconstruction.jet_reconstruct(event; R = test.R, p = test.power,
145+
cluster_seq = JetReconstruction.jet_reconstruct(event; R = test.R,
146+
p = test.power,
140147
algorithm = test.algorithm,
141148
strategy = test.strategy,
142149
recombine = test.recombine,
@@ -243,9 +250,9 @@ function run_reco_test(test::ComparisonTestValencia; testname = nothing)
243250
phi_ref = rjet["phi"]
244251
pt_ref = rjet["pt"]
245252
normalised_phi_ref = phi_ref < 0.0 ? phi_ref + 2π : phi_ref
246-
rap_test = isapprox(jet.rap, rap_ref; atol=2e-1)
247-
phi_test = isapprox(norm_phi, normalised_phi_ref; atol=2e-1)
248-
pt_test = isapprox(jet.pt, pt_ref; rtol=2e0)
253+
rap_test = isapprox(jet.rap, rap_ref; atol = 2e-1)
254+
phi_test = isapprox(norm_phi, normalised_phi_ref; atol = 2e-1)
255+
pt_test = isapprox(jet.pt, pt_ref; rtol = 2e0)
249256
if !rap_test || !phi_test || !pt_test
250257
println("Jet mismatch in Event $(ievt), Jet $(ijet):")
251258
println(" Failing Jet: pt=$(jet.pt), rap=$(jet.rap), phi=$(norm_phi)")
@@ -268,4 +275,4 @@ function run_reco_test(test::ComparisonTestValencia; testname = nothing)
268275
end
269276
end
270277
end
271-
end
278+
end

‎test/test-valencia.jl‎

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -15,52 +15,57 @@ using Test
1515
using JetReconstruction
1616

1717
# Reference outputs for R=0.8, beta=1.2, gamma=1.2
18-
valencia_inclusive = ComparisonTestValencia(
19-
events_file_ee,
20-
joinpath(@__DIR__, "data", "jet-collections-fastjet-valencia-inclusive20-beta1.2-gamma1.2-R0.8-eeH.json.zst"),
21-
JetAlgorithm.Valencia, RecoStrategy.N2Plain, 1.2, 0.8, 1.2,
22-
cs -> inclusive_jets(cs; ptmin = 20.0), "inclusive beta=1.2 gamma=1.2 R=0.8"
23-
)
18+
valencia_inclusive = ComparisonTestValencia(events_file_ee,
19+
joinpath(@__DIR__, "data",
20+
"jet-collections-fastjet-valencia-inclusive20-beta1.2-gamma1.2-R0.8-eeH.json.zst"),
21+
JetAlgorithm.Valencia, RecoStrategy.N2Plain,
22+
1.2, 0.8, 1.2,
23+
cs -> inclusive_jets(cs; ptmin = 20.0),
24+
"inclusive beta=1.2 gamma=1.2 R=0.8")
2425
run_reco_test(valencia_inclusive)
2526

26-
valencia_exclusive4 = ComparisonTestValencia(
27-
events_file_ee,
28-
joinpath(@__DIR__, "data", "jet-collections-fastjet-valencia-exclusive4-beta1.2-gamma1.2-R0.8-eeH.json.zst"),
29-
JetAlgorithm.Valencia, RecoStrategy.N2Plain, 1.2, 0.8, 1.2,
30-
cs -> exclusive_jets(cs; njets = 4), "exclusive njets beta=1.2 gamma=1.2 R=0.8"
31-
)
27+
valencia_exclusive4 = ComparisonTestValencia(events_file_ee,
28+
joinpath(@__DIR__, "data",
29+
"jet-collections-fastjet-valencia-exclusive4-beta1.2-gamma1.2-R0.8-eeH.json.zst"),
30+
JetAlgorithm.Valencia, RecoStrategy.N2Plain,
31+
1.2, 0.8, 1.2,
32+
cs -> exclusive_jets(cs; njets = 4),
33+
"exclusive njets beta=1.2 gamma=1.2 R=0.8")
3234
run_reco_test(valencia_exclusive4)
3335

34-
valencia_exclusive_d500 = ComparisonTestValencia(
35-
events_file_ee,
36-
joinpath(@__DIR__, "data", "jet-collections-fastjet-valencia-exclusive-d500-beta1.2-gamma1.2-R0.8-eeH.json.zst"),
37-
JetAlgorithm.Valencia, RecoStrategy.N2Plain, 1.2, 0.8, 1.2,
38-
cs -> exclusive_jets(cs; dcut = 500.0), "exclusive dcut=500 beta=1.2 gamma=1.2 R=0.8"
39-
)
36+
valencia_exclusive_d500 = ComparisonTestValencia(events_file_ee,
37+
joinpath(@__DIR__, "data",
38+
"jet-collections-fastjet-valencia-exclusive-d500-beta1.2-gamma1.2-R0.8-eeH.json.zst"),
39+
JetAlgorithm.Valencia,
40+
RecoStrategy.N2Plain, 1.2, 0.8, 1.2,
41+
cs -> exclusive_jets(cs; dcut = 500.0),
42+
"exclusive dcut=500 beta=1.2 gamma=1.2 R=0.8")
4043
run_reco_test(valencia_exclusive_d500)
4144

42-
Reference outputs for R=1.0, beta=1.0, gamma=1.0
43-
valencia_inclusive_b1g1 = ComparisonTestValencia(
44-
events_file_ee,
45-
joinpath(@__DIR__, "data", "jet-collections-fastjet-valencia-inclusive20-beta1.0-gamma1.0-R1.0-eeH.json.zst"),
46-
JetAlgorithm.Valencia, RecoStrategy.N2Plain, 1.0, 1.0, 1.0,
47-
cs -> inclusive_jets(cs; ptmin = 20.0), "inclusive beta=1.0 gamma=1.0 R=1.0"
48-
)
45+
#Reference outputs for R=1.0, beta=1.0, gamma=1.0
46+
valencia_inclusive_b1g1 = ComparisonTestValencia(events_file_ee,
47+
joinpath(@__DIR__, "data",
48+
"jet-collections-fastjet-valencia-inclusive20-beta1.0-gamma1.0-R1.0-eeH.json.zst"),
49+
JetAlgorithm.Valencia,
50+
RecoStrategy.N2Plain, 1.0, 1.0, 1.0,
51+
cs -> inclusive_jets(cs; ptmin = 20.0),
52+
"inclusive beta=1.0 gamma=1.0 R=1.0")
4953
run_reco_test(valencia_inclusive_b1g1)
5054

51-
valencia_exclusive4_b1g1 = ComparisonTestValencia(
52-
events_file_ee,
53-
joinpath(@__DIR__, "data", "jet-collections-fastjet-valencia-exclusive4-beta1.0-gamma1.0-R1.0-eeH.json.zst"),
54-
JetAlgorithm.Valencia, RecoStrategy.N2Plain, 1.0, 1.0, 1.0,
55-
cs -> exclusive_jets(cs; njets = 4), "exclusive njets beta=1.0 gamma=1.0 R=1.0"
56-
)
55+
valencia_exclusive4_b1g1 = ComparisonTestValencia(events_file_ee,
56+
joinpath(@__DIR__, "data",
57+
"jet-collections-fastjet-valencia-exclusive4-beta1.0-gamma1.0-R1.0-eeH.json.zst"),
58+
JetAlgorithm.Valencia,
59+
RecoStrategy.N2Plain, 1.0, 1.0, 1.0,
60+
cs -> exclusive_jets(cs; njets = 4),
61+
"exclusive njets beta=1.0 gamma=1.0 R=1.0")
5762
run_reco_test(valencia_exclusive4_b1g1)
5863

59-
valencia_exclusive_d500_b1g1 = ComparisonTestValencia(
60-
events_file_ee,
61-
joinpath(@__DIR__, "data", "jet-collections-fastjet-valencia-exclusive-d500-beta1.0-gamma1.0-R1.0-eeH.json.zst"),
62-
JetAlgorithm.Valencia, RecoStrategy.N2Plain, 1.0, 1.0, 1.0,
63-
cs -> exclusive_jets(cs; dcut = 500.0), "exclusive dcut=500 beta=1.0 gamma=1.0 R=1.0"
64-
)
64+
valencia_exclusive_d500_b1g1 = ComparisonTestValencia(events_file_ee,
65+
joinpath(@__DIR__, "data",
66+
"jet-collections-fastjet-valencia-exclusive-d500-beta1.0-gamma1.0-R1.0-eeH.json.zst"),
67+
JetAlgorithm.Valencia,
68+
RecoStrategy.N2Plain, 1.0, 1.0, 1.0,
69+
cs -> exclusive_jets(cs; dcut = 500.0),
70+
"exclusive dcut=500 beta=1.0 gamma=1.0 R=1.0")
6571
run_reco_test(valencia_exclusive_d500_b1g1)
66-

0 commit comments

Comments
 (0)