No OneTemporary
Actions

Size

16 KB

Subscribers

None

View Options

	diff --git a/CMakeLists.txt b/CMakeLists.txt
	index ae9420c..2880f25 100644
	--- a/CMakeLists.txt
	+++ b/CMakeLists.txt
	@@ -1,444 +1,422 @@
	cmake_minimum_required(VERSION 3.1 FATAL_ERROR)

	set(CMAKE_LEGACY_CYGWIN_WIN32 0)
	set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

	project("HEJ" VERSION 2.0.6 LANGUAGES C CXX)

	# Set a default build type if none was specified
	set(default_build_type "RelWithDebInfo")

	if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
	message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
	set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
	STRING "Choose the type of build." FORCE)
	# Set the possible values of build type for cmake-gui
	set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
	"Debug" "Release" "MinSizeRel" "RelWithDebInfo")
	endif()

	## Flags for the compiler. No warning allowed.
	if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
	elseif (MSVC)
	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /WX /EHsc")
	endif()
	set(CMAKE_CXX_STANDARD_REQUIRED ON)
	set(CMAKE_CXX_STANDARD 14)

	## Create Version
	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")

	# Get the latest abbreviated commit hash of the working branch
	execute_process(
	COMMAND git rev-parse HEAD
	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
	OUTPUT_VARIABLE PROJECT_GIT_REVISION
	OUTPUT_STRIP_TRAILING_WHITESPACE
	)
	# Get the current working branch
	execute_process(
	COMMAND git rev-parse --abbrev-ref HEAD
	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
	OUTPUT_VARIABLE PROJECT_GIT_BRANCH
	OUTPUT_STRIP_TRAILING_WHITESPACE
	)

	## target directories for install
	set(INSTALL_INCLUDE_DIR_BASE include)
	set(INSTALL_INCLUDE_DIR ${INSTALL_INCLUDE_DIR_BASE}/HEJ)
	set(INSTALL_BIN_DIR bin)
	set(INSTALL_LIB_DIR lib)
	set(INSTALL_CONFIG_DIR lib/cmake/HEJ)

	## Template files
	configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Templates/Version.hh.in
	${PROJECT_BINARY_DIR}/include/HEJ/Version.hh @ONLY )

	configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Templates/HEJ-config.cc.in
	${PROJECT_BINARY_DIR}/src/bin/HEJ-config.cc @ONLY )

	# Generate CMake config file
	include(CMakePackageConfigHelpers)
	configure_package_config_file(
	cmake/Templates/hej-config.cmake.in
	${CMAKE_CURRENT_BINARY_DIR}/${INSTALL_CONFIG_DIR}/hej-config.cmake
	INSTALL_DESTINATION ${INSTALL_CONFIG_DIR}
	PATH_VARS INSTALL_INCLUDE_DIR_BASE INSTALL_LIB_DIR
	)
	write_basic_package_version_file(
	${CMAKE_CURRENT_BINARY_DIR}/${INSTALL_CONFIG_DIR}/hej-config-version.cmake
	COMPATIBILITY SameMajorVersion
	)
	install(
	FILES ${CMAKE_CURRENT_BINARY_DIR}/${INSTALL_CONFIG_DIR}/hej-config.cmake
	${CMAKE_CURRENT_BINARY_DIR}/${INSTALL_CONFIG_DIR}/hej-config-version.cmake
	DESTINATION ${INSTALL_CONFIG_DIR})

	## Add directories and find dependences
	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include)

	find_package(fastjet REQUIRED)
	find_package(CLHEP 2.3 REQUIRED)
	find_package(LHAPDF REQUIRED)
	## Amend unintuitive behaviour of FindBoost.cmake
	## Priority of BOOST_ROOT over BOOSTROOT matches FindBoost.cmake
	## at least for cmake 3.12
	if(DEFINED BOOST_ROOT)
	message("BOOST_ROOT set - only looking for Boost in ${BOOST_ROOT}")
	set(Boost_NO_BOOST_CMAKE ON)
	elseif(DEFINED BOOSTROOT)
	message("BOOSTROOT set - only looking for Boost in ${BOOSTROOT}")
	set(Boost_NO_BOOST_CMAKE ON)
	endif()
	find_package(Boost REQUIRED COMPONENTS iostreams)
	find_package(yaml-cpp) # requiring yaml does not work with fedora
	if(${EXCLUDE_HepMC})
	message(STATUS "Skipping HepMC")
	# avoid "unused variable" warning if EXCLUDE_rivet is set by user
	set(EXCLUDE_rivet TRUE)
	else()
	find_package(HepMC 2 EXACT)
	endif()
	if(${HepMC_FOUND})
	- set(
	- CMAKE_CXX_FLAGS
	- "${CMAKE_CXX_FLAGS} -DHEJ_BUILD_WITH_HepMC2"
	- )
	if(${EXCLUDE_rivet})
	message(STATUS "Skipping rivet")
	else()
	find_package(rivet)
	endif()
	- if(${rivet_FOUND})
	- set(
	- CMAKE_CXX_FLAGS
	- "${CMAKE_CXX_FLAGS} -DHEJ_BUILD_WITH_RIVET"
	- )
	- endif()
	endif()
	if(${EXCLUDE_HepMC3})
	message(STATUS "Skipping HepMC3")
	else()
	## version 3.1: Finding version not possible in 3.1.1, see HepMC3 git 29e7a6c3
	find_package(HepMC3)
	## print standard message
	find_package_handle_standard_args( HepMC3
	FOUND_VAR
	HepMC3_FOUND
	REQUIRED_VARS
	HEPMC3_INCLUDE_DIR
	HEPMC3_LIBRARIES
	# VERSION_VAR
	# HEPMC3_VERSION
	)
	- if(${HepMC3_FOUND})
	- set(
	- CMAKE_CXX_FLAGS
	- "${CMAKE_CXX_FLAGS} -DHEJ_BUILD_WITH_HepMC3"
	- )
	- endif()
	endif()
	if(${EXCLUDE_QCDloop})
	message(STATUS "Skipping QCDloop")
	else()
	find_package(QCDloop 2)
	endif()
	-if(${QCDloop_FOUND})
	- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHEJ_BUILD_WITH_QCDLOOP")
	-endif()
	if(${EXCLUDE_HighFive})
	message(STATUS "Skipping HighFive")
	else()
	find_package(HighFive QUIET)
	find_package_handle_standard_args( HighFive CONFIG_MODE )
	endif()
	-if(${HighFive_FOUND})
	- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHEJ_BUILD_WITH_HDF5")
	-endif()

	# create main HEJ library
	add_subdirectory(src)

	## define executable
	add_executable(HEJ src/bin/HEJ.cc)

	## link libraries
	target_link_libraries(HEJ hejlib)

	add_executable(HEJ-config src/bin/HEJ-config.cc)

	file(GLOB hej_headers
	${CMAKE_CURRENT_SOURCE_DIR}/include/HEJ/*.hh
	${PROJECT_BINARY_DIR}/include/HEJ/*.hh
	)
	file(GLOB hej_detail_headers ${CMAKE_CURRENT_SOURCE_DIR}/include/HEJ/detail/*.hh)
	file(GLOB lhef_headers ${CMAKE_CURRENT_SOURCE_DIR}/include/LHEF/*.h)
	install(FILES ${hej_headers} DESTINATION ${INSTALL_INCLUDE_DIR})
	install(FILES ${hej_detail_headers} DESTINATION ${INSTALL_INCLUDE_DIR}/detail/)
	install(FILES ${lhef_headers} DESTINATION ${INSTALL_INCLUDE_DIR_BASE}/LHEF/)
	install(TARGETS HEJ HEJ-config DESTINATION ${INSTALL_BIN_DIR})

	## tests
	enable_testing()
	set(tst_dir "${CMAKE_CURRENT_SOURCE_DIR}/t")
	set(tst_ME_data_dir "${tst_dir}/ME_data")

	# test event classification
	add_executable(test_classify ${tst_dir}/test_classify.cc)
	target_link_libraries(test_classify hejlib)
	add_test(
	NAME t_classify
	COMMAND test_classify
	)
	add_executable(test_classify_ref ${tst_dir}/test_classify_ref.cc)
	target_link_libraries(test_classify_ref hejlib)
	add_test(
	NAME t_classify_ref
	COMMAND test_classify_ref ${tst_dir}/classify_ref ${tst_dir}/classify.lhe.gz
	)
	add_test(
	NAME t_classify_ref_4j
	COMMAND test_classify_ref ${tst_dir}/classify_ref_4j ${tst_dir}/4j.lhe.gz
	)

	# test phase space point
	add_executable(test_psp ${tst_dir}/test_psp.cc)
	target_link_libraries(test_psp hejlib)
	add_test(
	NAME t_psp
	COMMAND test_psp ${tst_dir}/psp_gen.lhe.gz
	)

	# test importing scales
	add_library(scales SHARED ${tst_dir}/scales.cc)
	target_link_libraries(scales hejlib)
	add_executable(test_scale_import ${tst_dir}/test_scale_import)
	target_link_libraries(test_scale_import hejlib)
	add_test(
	NAME t_scale_import
	COMMAND test_scale_import ${tst_dir}/jet_config_with_import.yml
	)

	# test scale arithmetic (e.g. 2*H_T/4)
	add_executable(test_scale_arithmetics ${tst_dir}/test_scale_arithmetics)
	target_link_libraries(test_scale_arithmetics hejlib)
	add_test(
	NAME t_scale_arithmetics
	COMMAND test_scale_arithmetics ${tst_dir}/jet_config.yml ${tst_dir}/2j.lhe.gz
	)

	# test "ParameterDescription"
	add_executable(test_descriptions ${tst_dir}/test_descriptions)
	target_link_libraries(test_descriptions hejlib)
	add_test(
	NAME t_descriptions
	COMMAND test_descriptions
	)

	# test "EventParameters*Weight"
	add_executable(test_parameters ${tst_dir}/test_parameters)
	target_link_libraries(test_parameters hejlib)
	add_test(
	NAME test_parameters
	COMMAND test_parameters
	)

	# test unweighting
	add_executable(test_unweighter ${tst_dir}/test_unweighter)
	target_link_libraries(test_unweighter hejlib)
	add_test(
	NAME test_unweighter
	COMMAND test_unweighter ${tst_dir}/4j.lhe.gz
	)

	# test colour generation
	add_executable(test_colours ${tst_dir}/test_colours)
	target_link_libraries(test_colours hejlib)
	add_test(
	NAME t_colour_flow
	COMMAND test_colours
	)

	# test matrix elements
	add_executable(test_ME_generic ${tst_dir}/test_ME_generic.cc)
	target_link_libraries(test_ME_generic hejlib)
	add_test(
	NAME t_ME_j
	COMMAND test_ME_generic ${tst_ME_data_dir}/config_mtinf.yml ${tst_ME_data_dir}/ME_jets_tree.dat ${tst_ME_data_dir}/PSP_jets.lhe.gz
	)
	add_test(
	NAME t_ME_h
	COMMAND test_ME_generic ${tst_ME_data_dir}/config_mtinf.yml ${tst_ME_data_dir}/ME_h_mtinf_tree.dat ${tst_ME_data_dir}/PSP_h.lhe.gz
	)
	if(${QCDloop_FOUND})
	add_test(
	NAME t_ME_h_mt
	COMMAND test_ME_generic ${tst_ME_data_dir}/config_mt.yml ${tst_ME_data_dir}/ME_h_mt_tree.dat ${tst_ME_data_dir}/PSP_h.lhe.gz
	)
	add_test(
	NAME t_ME_h_mtmb
	COMMAND test_ME_generic ${tst_ME_data_dir}/config_mtmb.yml ${tst_ME_data_dir}/ME_h_mtmb_tree.dat ${tst_ME_data_dir}/PSP_h.lhe.gz
	)
	endif()
	add_test(
	NAME t_ME_w_FKL
	COMMAND test_ME_generic ${tst_ME_data_dir}/config_w_ME.yml ${tst_ME_data_dir}/ME_w_FKL_tree.dat ${tst_ME_data_dir}/PSP_w_FKL.lhe.gz
	)
	add_test(
	NAME t_ME_w_FKL_virt
	COMMAND test_ME_generic ${tst_ME_data_dir}/config_w_ME.yml ${tst_ME_data_dir}/ME_w_FKL_virt.dat ${tst_ME_data_dir}/PSP_w_FKL.lhe.gz
	)
	add_test(
	NAME t_ME_Wp
	COMMAND test_ME_generic ${tst_ME_data_dir}/config_w_ME.yml ${tst_ME_data_dir}/ME_Wp.dat ${tst_ME_data_dir}/PSP_Wp.lhe.gz
	)
	add_test(
	NAME t_ME_Wm
	COMMAND test_ME_generic ${tst_ME_data_dir}/config_w_ME.yml ${tst_ME_data_dir}/ME_Wm.dat ${tst_ME_data_dir}/PSP_Wm.lhe.gz
	)

	# test main executable
	file(COPY "${tst_dir}/jet_config.yml" DESTINATION "${CMAKE_BINARY_DIR}")
	set(test_config "${CMAKE_BINARY_DIR}/jet_config.yml")
	if(${HepMC3_FOUND})
	file(READ ${test_config} config)
	file(WRITE ${test_config} "${config} - tst.hepmc\n")
	endif()
	if(${HepMC_FOUND})
	file(READ ${test_config} config)
	file(WRITE ${test_config} "${config} - tst.hepmc2\n")
	if(${rivet_FOUND})
	file(READ ${test_config} config)
	file(WRITE ${test_config} "${config}\nanalysis:\n rivet: MC_XS\n output: tst\n")
	endif()
	endif()
	set(test_cmd_main "$<TARGET_FILE:HEJ>\\\;${test_config}\\\;${tst_dir}/2j.lhe.gz")
	# check that HepMC3 output is correct
	if(${HepMC3_FOUND})
	add_executable(check_hepmc ${tst_dir}/check_hepmc.cc)
	target_link_libraries(check_hepmc hejlib ${HEPMC3_LIBRARIES})
	target_include_directories(check_hepmc PRIVATE ${HEPMC3_INCLUDE_DIR})
	set(test_cmd_hepmc "$<TARGET_FILE:check_hepmc>\\\;tst.hepmc")
	else()
	set(test_cmd_hepmc "")
	endif()
	# check that LHEF output is correct
	add_executable(check_lhe ${tst_dir}/check_lhe.cc)
	target_link_libraries(check_lhe hejlib)
	set(test_cmd_lhe "$<TARGET_FILE:check_lhe>\\\;tst.lhe")
	# Run dependent tests in one command to ensure correct execution order
	# Note: The commands are concatenated with "\;" to escape CMake lists.
	# Thus arguments have to be escaped twice "\\\;".
	# e.g. "cmd1\;cmd2\\\;arg1\\\;arg2" is executed like "cmd1 && cmd2 arg1 arg2"
	add_test(
	NAME t_main
	COMMAND ${CMAKE_COMMAND}
	-DCMDS=${test_cmd_main}\;${test_cmd_hepmc}\;${test_cmd_lhe}
	-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run_multiple_tests.cmake
	)
	# check HDF5 reader
	if(${HighFive_FOUND})
	add_executable(test_hdf5 ${tst_dir}/test_hdf5.cc)
	target_link_libraries(test_hdf5 hejlib)
	add_test(
	NAME t_hdf5
	COMMAND test_hdf5 ${tst_dir}/Wm9-g4-repack.hdf5
	)
	endif()
	# check rivet interface
	if(${RIVET_FOUND})
	add_executable(check_rivet ${tst_dir}/check_rivet.cc)
	target_link_libraries(check_rivet hejlib rivet::rivet HepMC::HepMC)
	add_test(
	NAME t_rivet
	COMMAND check_rivet
	)
	endif()

	# test boson reconstruction
	add_executable(cmp_events ${tst_dir}/cmp_events.cc)
	target_link_libraries(cmp_events hejlib)
	add_test(
	NAME t_epnu_2j_noW
	COMMAND cmp_events ${tst_dir}/epnu2jLOFKL_unweight.lhe.tar.gz ${tst_dir}/epnu2jLOFKL_unweight_noW.lhe.gz
	)

	# test resummed result
	add_executable(check_res ${tst_dir}/check_res.cc)
	target_link_libraries(check_res hejlib)

	if(${TEST_ALL}) # deactivate long tests by default
	add_test(
	NAME t_2j
	COMMAND check_res ${tst_dir}/2j.lhe.gz 3.49391e+07 419684
	)
	add_test(
	NAME t_3j
	COMMAND check_res ${tst_dir}/3j.lhe.gz 2.37902e+06 25746.6
	)
	add_test(
	NAME t_3j_unof
	COMMAND check_res ${tst_dir}/3j.lhe.gz 133399 4688.83 unof
	)
	add_test(
	NAME t_3j_unob
	COMMAND check_res ${tst_dir}/3j.lhe.gz 105247 3449.45 unob
	)
	add_test(
	NAME t_4j
	COMMAND check_res ${tst_dir}/4j.lhe.gz 603713 72822.6
	)
	add_test(
	NAME t_h_3j
	COMMAND check_res ${tst_dir}/h_3j.lhe.gz 0.821622 0.0220334
	)
	add_test(
	NAME t_h_3j_unof
	COMMAND check_res ${tst_dir}/h_3j_uno.lhe.gz 0.0127362 0.000271555 unof
	)
	add_test(
	NAME t_h_3j_unob
	COMMAND check_res ${tst_dir}/h_3j_uno.lhe.gz 0.0130615 0.000224793 unob
	)
	add_test(
	NAME t_epnu_2j
	COMMAND check_res ${tst_dir}/epnu2jLOFKL_unweight.lhe.tar.gz 262.7 3
	)
	add_test(
	NAME t_MGepnu_3j
	COMMAND check_res ${tst_dir}/MGepnu3j_unweighted.tar.gz 38.9512 1
	)
	add_test(
	NAME t_MGemnubar_3j
	COMMAND check_res ${tst_dir}/MGemnubar3j_unweighted.tar.gz 24.1575 1
	)
	add_test(
	NAME t_MGepnu_3j_unof
	COMMAND check_res ${tst_dir}/MGepnu3j_unweighted.tar.gz 9.63702 0.128355 unof
	)
	add_test(
	NAME t_MGepnu_3j_unob
	COMMAND check_res ${tst_dir}/MGepnu3j_unweighted.tar.gz 9.70119 0.108436 unob
	)
	add_test(
	NAME t_MGepnu_3j_splitf
	COMMAND check_res ${tst_dir}/MGepnu3j_unweighted.tar.gz 2.91995 0.0463182 splitf
	)
	add_test(
	NAME t_MGepnu_3j_splitb
	COMMAND check_res ${tst_dir}/MGepnu3j_unweighted.tar.gz 3.40708 0.0550975 splitb
	)
	add_test(
	NAME t_MGepnu_4j
	COMMAND check_res ${tst_dir}/MGepnu4j_unweighted.tar.gz 10.2542 0.135106
	)
	add_test(
	NAME t_MGemnubar_4j
	COMMAND check_res ${tst_dir}/MGemnubar4j_unweighted.tar.gz 5.57909 0.0300496
	)
	add_test(
	NAME t_MGepnu_4j_qqxmid
	COMMAND check_res ${tst_dir}/MGepnu4j_unweighted.tar.gz 0.732084 0.005 qqxmid
	)
	endif()
	diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
	index f37b160..b3d2f9e 100644
	--- a/src/CMakeLists.txt
	+++ b/src/CMakeLists.txt
	@@ -1,64 +1,69 @@
	file(GLOB src_files *.cc)

	## hej source
	add_library(hejlib SHARED ${src_files})
	set_target_properties(hejlib PROPERTIES OUTPUT_NAME "HEJ")
	target_include_directories(hejlib
	PUBLIC
	$<INSTALL_INTERFACE:include>
	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
	)
	set(libraries ${CMAKE_DL_LIBS})
	target_link_libraries(hejlib PRIVATE ${libraries})

	## Dependences
	target_link_libraries(hejlib
	PUBLIC
	fastjet::fastjet
	LHAPDF::LHAPDF
	CLHEP::CLHEP
	yaml-cpp
	)

	# Boost target seems to be unreliable and might requires specific versions of
	# cmake to work see e.g. https://stackoverflow.com/a/42124857
	# target_link_libraries(hejlib
	# PUBLIC
	# Boost::boost
	# Boost::iostreams
	# )
	# link explicitly instead
	target_include_directories(hejlib PUBLIC ${Boost_INCLUDE_DIRS})
	target_link_libraries(hejlib PUBLIC ${Boost_LIBRARIES})

	if(${QCDloop_FOUND})
	target_link_libraries(hejlib PRIVATE QCDloop::qcdloop quadmath)
	+ target_compile_options( hejlib PUBLIC "-DHEJ_BUILD_WITH_QCDLOOP" )
	endif()
	if(${HepMC_FOUND})
	target_link_libraries(hejlib PRIVATE HepMC::HepMC)
	+ target_compile_options( hejlib PUBLIC "-DHEJ_BUILD_WITH_HepMC2" )
	if(${rivet_FOUND})
	target_link_libraries(hejlib PRIVATE rivet::rivet)
	+ target_compile_options( hejlib PUBLIC "-DHEJ_BUILD_WITH_RIVET" )
	endif()
	endif()
	if(${HepMC3_FOUND})
	# HepMC 3 doesn't export a target
	target_link_libraries(hejlib PRIVATE ${HEPMC3_LIBRARIES})
	target_include_directories(hejlib PRIVATE ${HEPMC3_INCLUDE_DIR})
	+ target_compile_options( hejlib PUBLIC "-DHEJ_BUILD_WITH_HepMC3" )
	endif()
	if(${HighFive_FOUND})
	target_link_libraries(hejlib PRIVATE HighFive)
	+ target_compile_options( hejlib PUBLIC "-DHEJ_BUILD_WITH_HDF5" )
	endif()

	## install & export target
	install(TARGETS hejlib
	EXPORT hejlib-export
	DESTINATION ${INSTALL_LIB_DIR}
	)
	install(EXPORT hejlib-export
	FILE
	hejTargets.cmake
	NAMESPACE
	HEJ::
	DESTINATION
	${INSTALL_CONFIG_DIR}
	)

File Metadata

Mime Type: text/x-diff
Expires: Sat, Dec 21, 5:53 PM (7 h, 12 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 4023708
Default Alt Text: (16 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions