Merge branch 'HEJ@NLO' into 'master'
66c971a4a674
Actions

Description

Merge branch 'HEJ@NLO' into 'master'

HEJ@NLO Truncation

See merge request hej/HEJ!209

Details

Provenance

amaier	Authored on Jun 2 2022, 2:24 PM
amaier	Pushed on Mar 22 2023, 7:11 AM

Parents

rHEJ6903630f24db: small cleanup
rHEJ68deca8f54a7: Merge branch '160-allow-require-c-17' into 'master'

Branches

Unknown

Tags

Unknown

Event Timeline

amaier committed rHEJ66c971a4a674: Merge branch 'HEJ@NLO' into 'master' (authored by amaier).Jun 2 2022, 2:24 PM

Merged Changes

6903630f24db small cleanup
Author
amaier
Browse Repository
No Builds
No Audits
482df1a6e39e Added logic in MatrixElement.cc to throw logic error if number of jets
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
d06a6d272be6 Changed types of nlo options to no longer be optional. Updated if
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
b1d29efbac6e Fixed missing change in parameters naming in dev manual.
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
378a322148e9 Revert "Changes for point 4 in review regarding removing '==true'"
Author
Conor Elrick <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
5bd49b24e9b0 Changes for point 4 in review regarding removing '==true'
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
01f5f185d40d Changes for point 1 of review regarding hejnlo -> nlo.
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
2d8913a5f686 Fix point 3 in review related to 'magic numbers'
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
e211f74a3fdf Merge branch '178-hej-rng-is-not-compatible-with-uniformrandombitgenerator'…
Author
amaier
Browse Repository
No Builds
No Audits
9c036c75d712 fix incompatibility between RNG and standard library requirements
Author
amaier
Browse Repository
No Builds
No Audits
d5345cdaf180 Merge branch 'master' into HEJ@NLO
Author
amaier
Browse Repository
No Builds
No Audits
3dc0dd0f3f8f Fix to HEJFOG to include missing function argument.
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
288d1d0f0b36 Typecasting changes and reordering to fix compiler warnings
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
af2d6890a0cb Fix config to use hejnlo paramters in PhaseSpaceConfig
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
306a349eefe0 Update dev manual with nj HEJNLO changes
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
2f5588ec6409 Removed trailing whitespace
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
cb183997bd1e Added HEJ@NLO option to change the base number of jets for NLO
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
5fb2f8e917db Added virtual ME tests for HEJ@NLO processes
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
a53897f33e02 Merge branch 'master' into HEJ@NLO for CI tests.
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
f7f75bb3e458 Removed trailing whitespace in docs
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
b5d76211efe1 Added new subsection to dev manual on HEJ@NLO truncation.
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
9bf66a482334 Updated changes to include HEJ@NLO
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
2d0fe52ae033 Added HEJ@NLO option to sphinx documentation
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
06ba3e46d9fc Removed whitespace and tabs->spaces
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
6e2dbebc1520 Fixed issue with const expressions in sample_ng for HEJNLO
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
27c4e0f23b8a Changed all HEJ@NLO commenting to use HEJ::HEJNLO bool. Removed all
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
7d0dabc78b4c hejnlo declaration in config
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
f98c79f388a3 Added code to deal with hej@nlo flag to yaml reader.
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
2ad57c915701 Updated config file to include flag for hej@nlo truncation
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
a3024500edae Added truncation to pure jets. Zqq and Zqg virtual corrections are only ones…
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
15680b87bf10 Added Emmet's W+jets HEJ@NLO truncation
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
d7b674fe2902 Initial commit of HEJ@NLO for Pure Jets with all changes hard coded
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits

Changes (29)

Path

Size

Changes.md

FixedOrderGen/

include/

src/

doc/

developer_manual/

developer_manual.tex

sphinx/

HEJ.rst

include/

HEJ/

src/

bin/

ME_data/

ME_WmWm_virt_hejnlo.dat

ME_Wm_virt_hejnlo.dat

ME_WpWp_virt_hejnlo.dat

ME_Wp_virt_hejnlo.dat

ME_Z_virt_hejnlo.dat

ME_h_virt_hejnlo.dat

ME_jets_virt_hejnlo.dat

	config_ww_ME_hejnlo.yml
	config_ww_ME.yml

	config_wzhpure_ME_hejnlo.yml
	config_w_ME.yml

test_ME_generic.cc

test_colours.cc

rHEJ66c971a4a674

View Options

Changes.md

View Options

FixedOrderGen/include/EventGenerator.hh

View Options

FixedOrderGen/include/config.hh

View Options

FixedOrderGen/src/EventGenerator.cc

View Options

config.yml

View Options

doc/developer_manual/developer_manual.tex

View Options

doc/sphinx/HEJ.rst

View Options

include/HEJ/Config.hh

View Options

include/HEJ/Mixmax.hh

View Options

include/HEJ/PhaseSpacePoint.hh

View Options

include/HEJ/RNG.hh

View Options

include/HEJ/Ranlux64.hh

View Options

include/HEJ/YAMLreader.hh

View Options

src/MatrixElement.cc

View Options

src/PhaseSpacePoint.cc

View Options

src/YAMLreader.cc

View Options

src/bin/HEJ.cc

View Options

t/CMakeLists.txt

View Options

t/ME_data/ME_WmWm_virt_hejnlo.dat

View Options

t/ME_data/ME_Wm_virt_hejnlo.dat

View Options

t/ME_data/ME_WpWp_virt_hejnlo.dat

View Options

t/ME_data/ME_Wp_virt_hejnlo.dat

View Options

t/ME_data/ME_Z_virt_hejnlo.dat

View Options

t/ME_data/ME_h_virt_hejnlo.dat

View Options

t/ME_data/ME_jets_virt_hejnlo.dat

View Options

t/ME_data/config_ww_ME_hejnlo.yml

View Options

t/ME_data/config_wzhpure_ME_hejnlo.yml

View Options

t/test_ME_generic.cc

View Options

Merge branch 'HEJ@NLO' into 'master'66c971a4a674Actions

Description

Details

Event Timeline

Merged Changes

Changes (29)

rHEJ66c971a4a674

Changes.md

FixedOrderGen/include/EventGenerator.hh

FixedOrderGen/include/config.hh

FixedOrderGen/src/EventGenerator.cc

config.yml

doc/developer_manual/developer_manual.tex

doc/sphinx/HEJ.rst

include/HEJ/Config.hh

include/HEJ/Mixmax.hh

include/HEJ/PhaseSpacePoint.hh

include/HEJ/RNG.hh

include/HEJ/Ranlux64.hh

include/HEJ/YAMLreader.hh

src/MatrixElement.cc

src/PhaseSpacePoint.cc

src/YAMLreader.cc

src/bin/HEJ.cc

t/CMakeLists.txt

t/ME_data/ME_WmWm_virt_hejnlo.dat

t/ME_data/ME_Wm_virt_hejnlo.dat

t/ME_data/ME_WpWp_virt_hejnlo.dat

t/ME_data/ME_Wp_virt_hejnlo.dat

t/ME_data/ME_Z_virt_hejnlo.dat

t/ME_data/ME_h_virt_hejnlo.dat

t/ME_data/ME_jets_virt_hejnlo.dat

t/ME_data/config_ww_ME_hejnlo.yml

t/ME_data/config_wzhpure_ME_hejnlo.yml

t/test_ME_generic.cc

t/test_colours.cc

Merge branch 'HEJ@NLO' into 'master'
66c971a4a674
Actions