diff --git a/FixedOrderGen/include/Process.hh b/FixedOrderGen/include/Process.hh index 9163176..d76c446 100644 --- a/FixedOrderGen/include/Process.hh +++ b/FixedOrderGen/include/Process.hh @@ -1,22 +1,23 @@ /** * \authors The HEJ collaboration (see AUTHORS for details) * \date 2019 * \copyright GPLv2 or later */ #pragma once #include #include #include "HEJ/PDG_codes.hh" #include "HEJ/optional.hh" namespace HEJFOG { struct Process{ - std::array incoming; //! @TODO why is this not a pair? + //! @internal pair to match Event::incoming + std::array incoming; int njets; HEJ::optional boson; std::vector boson_decay; }; } diff --git a/FixedOrderGen/t/CMakeLists.txt b/FixedOrderGen/t/CMakeLists.txt index aea83cd..eb00af1 100644 --- a/FixedOrderGen/t/CMakeLists.txt +++ b/FixedOrderGen/t/CMakeLists.txt @@ -1,93 +1,108 @@ set(tst_dir "${CMAKE_CURRENT_SOURCE_DIR}") foreach(tst W_reconstruct_enu W_2j_classify W_nj_classify) add_executable(test_${tst} ${tst_dir}/${tst}.cc) target_link_libraries(test_${tst} hejfog_lib) add_test(NAME ${tst} COMMAND test_${tst} WORKING_DIRECTORY ${tst_dir}) endforeach() # this only tests if the runcard actually works, not if the result is correct add_test( NAME main_2j COMMAND HEJFOG ${tst_dir}/config_2j.yml ) add_test( NAME main_h2j COMMAND HEJFOG ${tst_dir}/config_h2j.yml ) add_test( NAME main_h2j_decay COMMAND HEJFOG ${tst_dir}/config_h2j_decay.yml ) add_test( NAME peakpt COMMAND HEJFOG ${tst_dir}/config_2j_peak.yml ) # check that uno emission doesn't change FKL xs add_executable(FKL_uno FKL_uno.cc) target_link_libraries(FKL_uno hejfog_lib) add_test( NAME FKL_uno # calculated with HEJ revision 9570e3809613272ac4b8bf3236279ba23cf64d20 COMMAND FKL_uno ${tst_dir}/config_h3j_uno.yml 0.0243548 0.000119862 ) # xs tests add_executable(xs_gen xs_gen.cc) target_link_libraries(xs_gen hejfog_lib) ## Higgs add_test( NAME xs_h2j # calculated with HEJ revision 9570e3809613272ac4b8bf3236279ba23cf64d20 COMMAND xs_gen ${tst_dir}/config_h2j.yml 2.04928 0.00956022 ) add_test( NAME xs_h3j # calculated with HEJ revision bd4388fe55cbc3f5a7b6139096456c551294aa31 COMMAND xs_gen ${tst_dir}/config_h3j.yml 1.07807 0.0132409 ) add_test( NAME xs_h5j # calculated with HEJ revision dbde2ffbb3b383ae6709b2424d8f0f9d5658270b COMMAND xs_gen ${tst_dir}/config_h5j.yml 0.0112504 0.000199633 ) add_test( NAME xs_h3j_uno # calculated with HEJ revision 9570e3809613272ac4b8bf3236279ba23cf64d20 COMMAND xs_gen ${tst_dir}/config_h3j_uno.yml 0.00347538 3.85875e-05 ) add_test( NAME xs_h2j_decay # calculated with HEJ revision 9570e3809613272ac4b8bf3236279ba23cf64d20 COMMAND xs_gen ${tst_dir}/config_h2j_decay.yml 0.00466994 2.20995e-05 ) ## pure jets add_test( NAME xs_2j # calculated with "combined" HEJ svn r3480 COMMAND xs_gen ${tst_dir}/config_2j.yml 86.42031848e06 590570 ) add_test( + NAME xs_3j_uno + # calculated with HEJ revision b40e0212b144cdd267df19333b574cc7b91847f1 + COMMAND xs_gen ${tst_dir}/config_3j_uno.yml 520697 8948.18 +) +add_test( + NAME xs_3j_qqx + # calculated with HEJ revision b40e0212b144cdd267df19333b574cc7b91847f1 + COMMAND xs_gen ${tst_dir}/config_3j_qqx.yml 122233 1613.04 +) +add_test( + NAME xs_4j_qqx + # calculated with HEJ revision b40e0212b144cdd267df19333b574cc7b91847f1 + COMMAND xs_gen ${tst_dir}/config_4j_qqx.yml 29805.4 581.473 +) +add_test( NAME xs_4j # calculated with HEJ revision 13207b5f67a5f40a2141aa7ee515b022bd4efb65 COMMAND xs_gen ${tst_dir}/config_4j.yml 915072 15402.4 ) ## W add_test( NAME xs_W2j # calculated with HEJ revision 987bb30a7985a24a7961f98cfbbc74d3a7992970 COMMAND xs_gen ${tst_dir}/config_Wm2j.yml 231.404 3.43798 ) add_test( NAME xs_W3j_uno # calculated with HEJ revision 987bb30a7985a24a7961f98cfbbc74d3a7992970 COMMAND xs_gen ${tst_dir}/config_Wp3j_uno.yml 0.139372 0.00248345 ) add_test( NAME xs_W3j_eqqx # calculated with HEJ revision 987bb30a7985a24a7961f98cfbbc74d3a7992970 COMMAND xs_gen ${tst_dir}/config_Wp3j_qqx.yml 8.45323 0.103449 ) add_test( NAME xs_W5j_qqx # calculated with HEJ revision 987bb30a7985a24a7961f98cfbbc74d3a7992970 COMMAND xs_gen ${tst_dir}/config_Wp4j_qqx.yml 0.0851908 0.00300447 ) diff --git a/FixedOrderGen/t/config_3j_qqx.yml b/FixedOrderGen/t/config_3j_qqx.yml new file mode 100644 index 0000000..610a4a8 --- /dev/null +++ b/FixedOrderGen/t/config_3j_qqx.yml @@ -0,0 +1,41 @@ +events: 200000 + +jets: + min pt: 50 + R: 0.4 + algorithm: antikt + max rapidity: 4 + +beam: + energy: 6500 + particles: [p, p] + +pdf: 11000 + +process: p p => 3j + +subleading fraction: 1 +subleading channels: + - qqx + +scales: 91 + +random generator: + name: mixmax + +particle properties: + Higgs: + mass: 125 + width: 0 + W: + mass: 80.385 + width: 2.085 + Z: + mass: 91.187 + width: 2.495 + +vev: 246.2196508 + +unweight: + sample size: 100 + max deviation: -10 diff --git a/FixedOrderGen/t/config_3j_uno.yml b/FixedOrderGen/t/config_3j_uno.yml new file mode 100644 index 0000000..5f4e0db --- /dev/null +++ b/FixedOrderGen/t/config_3j_uno.yml @@ -0,0 +1,41 @@ +events: 200000 + +jets: + min pt: 40 + R: 0.5 + algorithm: antikt + max rapidity: 6 + +beam: + energy: 6500 + particles: [p, p] + +pdf: 11000 + +process: p p => 3j + +subleading fraction: 1 +subleading channels: + - uno + +scales: 123 + +random generator: + name: mixmax + +particle properties: + Higgs: + mass: 125 + width: 0 + W: + mass: 80.385 + width: 2.085 + Z: + mass: 91.187 + width: 2.495 + +vev: 246.2196508 + +unweight: + sample size: 100 + max deviation: -10 diff --git a/FixedOrderGen/t/config_4j_qqx.yml b/FixedOrderGen/t/config_4j_qqx.yml new file mode 100644 index 0000000..1c10656 --- /dev/null +++ b/FixedOrderGen/t/config_4j_qqx.yml @@ -0,0 +1,41 @@ +events: 1100000 + +jets: + min pt: 30 + R: 0.4 + algorithm: antikt + max rapidity: 5 + +beam: + energy: 3500 + particles: [p, p] + +pdf: 11000 + +process: p p => 4j + +subleading fraction: 1 +subleading channels: + - qqx + +scales: 125 + +random generator: + name: mixmax + +particle properties: + Higgs: + mass: 125 + width: 0 + W: + mass: 80.385 + width: 2.085 + Z: + mass: 91.187 + width: 2.495 + +vev: 246.2196508 + +unweight: + sample size: 100 + max deviation: -10