Skip to content

Commit 5128402

Browse files
committed
fix missing alg argument
1 parent a240bb5 commit 5128402

File tree

2 files changed

+25
-24
lines changed

2 files changed

+25
-24
lines changed

cjetreconstruction/src/cjetreconstruction-finder.cc

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -143,31 +143,31 @@ int main(int argc, char *argv[]) {
143143

144144
auto algorithm =
145145
jetreconstruction_JetAlgorithm::JETRECONSTRUCTION_JETALGORITHM_ANTIKT;
146-
if (alg != "") {
147-
if (alg == "AntiKt") {
148-
algorithm =
149-
jetreconstruction_JetAlgorithm::JETRECONSTRUCTION_JETALGORITHM_ANTIKT;
150-
power = -1.0;
151-
} else if (alg == "CA") {
152-
algorithm =
153-
jetreconstruction_JetAlgorithm::JETRECONSTRUCTION_JETALGORITHM_CA;
154-
power = 0.0;
155-
} else if (alg == "Kt") {
156-
algorithm =
157-
jetreconstruction_JetAlgorithm::JETRECONSTRUCTION_JETALGORITHM_KT;
158-
power = 1.0;
159-
//} else if (alg == "GenKt") {
160-
// algorithm = fastjet::genkt_algorithm;
161-
//} else if (alg == "Durham") {
162-
// algorithm = fastjet::ee_kt_algorithm;
163-
// power = 1.0;
164-
//} else if (alg == "EEKt") {
165-
// algorithm = fastjet::ee_genkt_algorithm;
166-
} else {
167-
std::cout << "Unknown algorithm type: " << alg << std::endl;
168-
exit(1);
169-
}
146+
if (alg == "AntiKt") {
147+
algorithm =
148+
jetreconstruction_JetAlgorithm::JETRECONSTRUCTION_JETALGORITHM_ANTIKT;
149+
power = -1.0;
150+
} else if (alg == "CA") {
151+
algorithm =
152+
jetreconstruction_JetAlgorithm::JETRECONSTRUCTION_JETALGORITHM_CA;
153+
power = 0.0;
154+
} else if (alg == "Kt") {
155+
algorithm =
156+
jetreconstruction_JetAlgorithm::JETRECONSTRUCTION_JETALGORITHM_KT;
157+
power = 1.0;
158+
//} else if (alg == "GenKt") {
159+
// algorithm = fastjet::genkt_algorithm;
160+
//} else if (alg == "Durham") {
161+
// algorithm = fastjet::ee_kt_algorithm;
162+
// power = 1.0;
163+
//} else if (alg == "EEKt") {
164+
// algorithm = fastjet::ee_genkt_algorithm;
165+
} else {
166+
std::cout << "Unknown algorithm type: " << alg << std::endl;
167+
exit(1);
170168
}
169+
std::cerr << "Using algorithm: " << alg << " with power " << power
170+
<< std::endl;
171171

172172
auto recombine_scheme = JETRECONCSTRUCTION_RECOMBINATIONSCHEME_ESCHEME;
173173
std::cout << recombine << std::endl;

src/benchmark.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ function external_benchmark_avg_time(input_file::AbstractString;
172172
bench_bin = joinpath(@__DIR__, "..", bench_dir, "build", bench_name)
173173
bench_args = String[]
174174
push!(bench_args, "-p", string(p))
175+
push!(bench_args, "-A", string(Symbol(algorithm)))
175176
push!(bench_args, "-s", string(strategy))
176177
push!(bench_args, "-R", string(radius))
177178
push!(bench_args, "--ptmin", string(ptmin))

0 commit comments

Comments
 (0)