Fastjet cmake and benchmark fixes (#13)

* Update fastjet-finder CMake

CMakeLists file now is adapted for modern Fastjet versions that are
built with CMake (>=3.5.0). Old FindFastJet.cmake is removed.

* Fix argument name in README

* Consistency update for fastjet-finder

Align the arguments for fastjet-finder to be the same as those for the
Julia test scripts, e.g., -m or --nsamples for the number of trial
repeats.

Ensure that algorithm and power values from benchmark.jl are correctly
passed to fastjet-finder. It seems the algorithm setting was actually
being _ignored_, meaning only pp-type algorithms actually got run.

* Set fastjet output to "debug"

* Update antikt-python to new tag

Author: graeme-a-stewart

README.md

@@ -133,7 +133,7 @@ The `benchmark.jl` script has quite a few options used for detailed control of
 the jobs it runs. The most important ones are:
 
 ```sh
-julia --project benchmark.jl --code CODE --algorithm ALG --strategy STRAT --trials TRIALS INPUT_FILE(S)
+julia --project benchmark.jl --code CODE --algorithm ALG --strategy STRAT --nsamples TRIALS INPUT_FILE(S)
 ```
 
 The `CODE` option selects the code implementation:

antikt-python

@@ -1,16 +1,14 @@
 # CMake file for fastjet codes used for benchmarks and validation
 #
-# (C) CERN, 2024
+# (C) CERN, 2024-2025
 # MIT License
 
 cmake_minimum_required(VERSION 3.12)
 project(FastJetBenchmarks)
 
-# Add package utilities to CMake path
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}")
-
 find_package(HepMC3 REQUIRED)
-find_package(FastJet REQUIRED)
+find_package(fastjet REQUIRED)
+find_package(siscone REQUIRED)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -21,11 +19,6 @@ add_executable(fastjet-finder
     src/fastjet-utils.cc
 )
 
-target_include_directories(fastjet-finder PRIVATE
-    ${FASTJET_INCLUDE_DIRS}
-)
-
 target_link_libraries(fastjet-finder 
-    HepMC3::HepMC3
-    ${FASTJET_LIBRARIES}
+    HepMC3::HepMC3 fastjet::fastjet
 )

fastjet/CMakeLists.txt

@@ -7,8 +7,9 @@ algorithms.
 The code requires the fastjet libraries (<https://fastjet.fr/>) as well as those
 from HepMC3 (<https://gitlab.cern.ch/hepmc/HepMC3>).
 
-Depending on your system setup you make need to add the path to the HepMC3 CMake
-setup files to `CMAKE_PREFIX_PATH`.
+Depending on your system setup you make need to add the path to the HepMC3 and
+Fastjet CMake setup files to `CMAKE_PREFIX_PATH`. It may also be necessary to
+set `siscone_DIR`.
 
 ## Compilation
 
@@ -32,10 +33,11 @@ jets. This is the standard executable used to benchmark fastjet.
 
 Allowed options:
   -h, --help                  produce help message
-  -m, --maxevents arg (=-1)   Maximum events in file to process (-1 = all events)
-  -n, --trials arg (=1)       Number of repeated trials
+  -n, --maxevents arg (=-1)   Maximum events in file to process (-1 = all events)
+  -m, --nsamples arg (=1)     Number of repeated trials
   -s, --strategy arg (=Best)  Valid values are 'Best' (default), 'N2Plain', 'N2Tiled'
-  -p, --power arg (=-1)       Algorithm p value: -1=antikt, 0=cambridge_aachen, 1=inclusive kt
+  -A, --algorithm arg         Valid values are 'AntiKt' 'CA' 'Kt' 'GenKt' 'EEKt' 'Durham'
+  -p, --power arg             Algorithm p value, only needed for 'GenKt' and 'EEKt'
   -R, --radius arg (=0.4)     Algorithm R parameter
   --ptmin arg                 pt cut for inclusive jets
   --dijmax arg                dijmax value for exclusive jets

fastjet/README.md

@@ -87,12 +87,12 @@ int main(int argc, char* argv[]) {
 
   OptionParser opts("Allowed options");
   auto help_option = opts.add<Switch>("h", "help", "produce help message");
-  auto max_events_option = opts.add<Value<int>>("m", "maxevents", "Maximum events in file to process (-1 = all events)", maxevents, &maxevents);
+  auto max_events_option = opts.add<Value<int>>("n", "maxevents", "Maximum events in file to process (-1 = all events)", maxevents, &maxevents);
   auto skip_events_option = opts.add<Value<int>>("", "skipevents", "Number of events to skip over (0 = none)", skip_events, &skip_events);
-  auto trials_option = opts.add<Value<int>>("n", "trials", "Number of repeated trials", trials, &trials);
+  auto trials_option = opts.add<Value<int>>("m", "nsamples", "Number of repeated trials", trials, &trials);
   auto strategy_option = opts.add<Value<string>>("s", "strategy", "Valid values are 'Best' (default), 'N2Plain', 'N2Tiled'", mystrategy, &mystrategy);
-  auto power_option = opts.add<Value<double>>("p", "power", "Algorithm p value: -1=antikt, 0=cambridge_aachen, 1=inclusive kt; otherwise generalised Kt", power, &power);
   auto alg_option = opts.add<Value<string>>("A", "algorithm", "Algorithm: AntiKt CA Kt GenKt EEKt Durham (overrides power)", alg, &alg);
+  auto power_option = opts.add<Value<double>>("p", "power", "Algorithm p value, only used/needed for GenKt and EEKt", power, &power);
   auto radius_option = opts.add<Value<double>>("R", "radius", "Algorithm R parameter", R, &R);
   auto recombine_option = opts.add<Value<string>>("", "recombine", "Recombination scheme for jet merging", recombine, &recombine);
   auto ptmin_option = opts.add<Value<double>>("", "ptmin", "pt cut for inclusive jets");
@@ -163,16 +163,6 @@ int main(int argc, char* argv[]) {
       std::cout << "Unknown algorithm type: " << alg << std::endl;
       exit(1);
     }
-  } else {
-    if (power == -1.0) {
-      algorithm = fastjet::antikt_algorithm;
-    } else if (power == 0.0) {
-      algorithm = fastjet::cambridge_aachen_algorithm;
-    } else if (power == 1.0) {
-      algorithm = fastjet::kt_algorithm;
-    } else {
-      algorithm = fastjet::genkt_algorithm;
-    }
   }
 
   auto recombine_scheme = fastjet::RecombinationScheme::E_scheme;

fastjet/cmake/FindFastJet.cmake

@@ -157,17 +157,20 @@ function fastjet_jet_process_avg_time(input_file::AbstractString;
     # Get consistent algorithm power
     p = JetReconstruction.get_algorithm_power(p = p, algorithm = algorithm)
 
-    # @warn "FastJet timing not implemented yet"
     fj_bin = joinpath(@__DIR__, "..", "fastjet", "build", "fastjet-finder")
     fj_args = String[]
-    push!(fj_args, "-p", string(p))
+    push!(fj_args, "-A", string(algorithm))
+    if !isnothing(p)
+        push!(fj_args, "-p", string(p))
+    end
     push!(fj_args, "-s", string(strategy))
     push!(fj_args, "-R", string(radius))
     push!(fj_args, "--ptmin", string(ptmin))
 
-    push!(fj_args, "-n", string(nsamples))
+    push!(fj_args, "-m", string(nsamples))
     @info "Fastjet command: $fj_bin $fj_args $input_file"
     fj_output = read(`$fj_bin $fj_args $input_file`, String)
+    @debug "Fastjet output:\n$fj_output"
     min = tryparse(Float64, match(r"Lowest time per event ([\d\.]+) us", fj_output)[1])
     if isnothing(min)
         @error "Failed to parse output from FastJet script"