Merge branch 'WW' into 'master'
0b8f45a33f91
Actions

Description

Merge branch 'WW' into 'master'

See merge request hej/HEJ!172

Details

Provenance

amaier	Authored on May 7 2021, 12:46 PM
amaier	Pushed on Mar 22 2023, 7:11 AM

Parents

rHEJc5e14db066f0: Add Conor to list of authors
rHEJ43bee7bf0f65: Merge branch '164-extra-colour-factor-in-w-jets-central-qqbar' into 'master'

Branches

Unknown

Tags

Unknown

Event Timeline

amaier committed rHEJ0b8f45a33f91: Merge branch 'WW' into 'master' (authored by amaier).May 7 2021, 12:46 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

c5e14db066f0 Add Conor to list of authors
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
8cabcc5a2c69 Use iterators in virtual_corrections_interference
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
2b90332e5f9c Move virtual corrections with interference to separate function
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
a3c79af1cbe0 Use using instead of typedef
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
625dd5f8bd04 Cosmetic changes in group_progeny
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
61972d8bcde2 Simplify logic in group_progeny
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
1344c094e884 Remove unnecessary sort
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
9c9c360283cd Fix logic in leptons and neutrinos size check
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
059fc43bacec Added same-sign W to sphinx documention
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
1d64579135ce Updated test of WmWm to use different LHE event file.
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
591f7c625fa9 Merge branch 'master' into WW
Author
amaier
Browse Repository
No Builds
No Audits
07ee52f242b4 Minor changes to comments in Event.cc
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
ed31eca307a3 Fix position of assert
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
319611dc8146 Reserve space for up to 2 bosons
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
858d98054b5f Change boson to bosons in comments
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
5ff92c32ef98 Remove empty lines
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
73e4cdbcbffc Rename boost_AWZH_boson_from
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
8d3a61d44df4 Small changes in boost_AWZH_boson_from
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
4cbd4a4666d1 Don't compute virtual corrections for non-HEJ states
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
4bf7be77f9e2 Split line in Changes to meet 81 character line limit
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
cce085386b0e Fixes to merge conflict with reshuffled AWZH bosons.
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
6ee97b6a542f Merge branch 'master' into WW
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
7e823e795015 Re-enabled reversal test for WW.
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
fdcdf9427a3c Updated documentation to include WmWm. Removed some out of date
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
1e2dce8f3681 Updated classification test for W-W-
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
0cbc95b7f4e7 Added ME tests for W-W-.
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
658af8d74db4 Started to modify code to allow for W-W-
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
fa8ea6bb2a8d Change nearby check in momentum conservation to check relative tolerance
Author
graeme
Browse Repository
No Builds
No Audits
97a2008b692b Use accumulate for momentum sum
Author
graeme
Browse Repository
No Builds
No Audits
61c103fa0231 Use const &
Author
hej
Browse Repository
No Builds
No Audits
ae28b634428a Move WW changes to 2.2
Author
graeme
Browse Repository
No Builds
No Audits
f9615bbd3b03 Check for momentum violation in decays
Author
graeme
Browse Repository
No Builds
No Audits
28b15e064a82 Merge branch 'master' into WW
Author
graeme
Browse Repository
No Builds
No Audits
043e0cd382f1 Merge branch 'master' into WW
Author
graeme
Browse Repository
No Builds
No Audits
3c75553cf37f Add test for behaviour of reconstruction of intermediate states
Author
graeme
Browse Repository
No Builds
No Audits
a3808cbab0c8 Allow rapidity_order_ps to return non-shuffled outgoing particles
Author
graeme
Browse Repository
No Builds
No Audits
6738a7a48acb Better error message in 2 boson test decay. Swap to cerr from cout
Author
graeme
Browse Repository
No Builds
No Audits
e2c77d7f546f Increase number of events for WpWp ME check from 100 to 5000
Author
graeme
Browse Repository
No Builds
No Audits
ebed4c2b2291 Add ME_WpWp_virt to tests
Author
graeme
Browse Repository
No Builds
No Audits
33e4ab3f6445 Remove outdated TODO
Author
graeme
Browse Repository
No Builds
No Audits
536e8369ce76 Make clang tidier
Author
hej
Browse Repository
No Builds
No Audits
daa77d55756e Include ordering
Author
graeme
Browse Repository
No Builds
No Audits
c3368be830ad Show argument in declaration
Author
graeme
Browse Repository
No Builds
No Audits
ddf54df0b66d Prefer const reference in decay_measure
Author
graeme
Browse Repository
No Builds
No Audits
68314a8a299c Prefer using over typedef
Author
graeme
Browse Repository
No Builds
No Audits
78a9d8dc0676 Make leptons const in WpWp matrix elements
Author
graeme
Browse Repository
No Builds
No Audits
493647b89c99 Rewording in Changes-API
Author
graeme
Browse Repository
No Builds
No Audits
0abc0819e4bd WpWp in Changes/Changes-API
Author
graeme
Browse Repository
No Builds
No Audits
af5930bb7440 Update developer manual with WpWp
Author
graeme
Browse Repository
No Builds
No Audits
366e6f652d98 Added Graeme as Author
Author
hej
Browse Repository
No Builds
No Audits

Changes (34)

Path

Size

current_generator/

doc/

developer_manual/

currents.tex

sphinx/

HEJ.rst

include/

HEJ/

src/

bin/

ME_data/

	config_ww_ME.yml
	config_pure.yml

rHEJ0b8f45a33f91

View Options

AUTHORS

View Options

Changes-API.md

View Options

Changes.md

View Options

current_generator/jV_jV.frm

View Options

doc/developer_manual/currents.tex

View Options

doc/sphinx/HEJ.rst

View Options

include/HEJ/Event.hh

View Options

include/HEJ/MatrixElement.hh

View Options

include/HEJ/PDG_codes.hh

View Options

include/HEJ/Particle.hh

View Options

include/HEJ/PhaseSpacePoint.hh

View Options

include/HEJ/WWjets.hh

View Options

src/Event.cc

View Options

src/EventReweighter.cc

View Options

src/MatrixElement.cc

View Options

src/PhaseSpacePoint.cc

View Options

src/WWjets.cc

View Options

src/bin/HEJ.cc

View Options

t/CMakeLists.txt

View Options

t/ME_data/ME_WmWm.dat

View Options

t/ME_data/ME_WmWm_virt.dat

View Options

t/ME_data/ME_WpWp.dat

View Options

t/ME_data/ME_WpWp_virt.dat

View Options

t/ME_data/PSP_WmWm.lhe.gz

View Options

t/ME_data/PSP_WpWp.lhe.gz

View Options

t/ME_data/config_ww_ME.yml

View Options

t/check_res.cc

View Options

t/cmp_events.cc

View Options

t/hej_test.cc

View Options

t/hej_test.hh

View Options

t/test_ME_generic.cc

View Options

t/test_classify.cc

View Options

t/test_classify_ref.cc

View Options

Merge branch 'WW' into 'master'0b8f45a33f91Actions

Description

Details

Event Timeline

Merged Changes

Changes (34)

rHEJ0b8f45a33f91

AUTHORS

Changes-API.md

Changes.md

current_generator/jV_jV.frm

doc/developer_manual/currents.tex

doc/sphinx/HEJ.rst

include/HEJ/Event.hh

include/HEJ/MatrixElement.hh

include/HEJ/PDG_codes.hh

include/HEJ/Particle.hh

include/HEJ/PhaseSpacePoint.hh

include/HEJ/WWjets.hh

src/Event.cc

src/EventReweighter.cc

src/MatrixElement.cc

src/PhaseSpacePoint.cc

src/WWjets.cc

src/bin/HEJ.cc

t/CMakeLists.txt

t/ME_data/ME_WmWm.dat

t/ME_data/ME_WmWm_virt.dat

t/ME_data/ME_WpWp.dat

t/ME_data/ME_WpWp_virt.dat

t/ME_data/PSP_WmWm.lhe.gz

t/ME_data/PSP_WpWp.lhe.gz

t/ME_data/config_ww_ME.yml

t/check_res.cc

t/cmp_events.cc

t/hej_test.cc

t/hej_test.hh

t/test_ME_generic.cc

t/test_classify.cc

t/test_classify_ref.cc

t/test_decay.cc

Merge branch 'WW' into 'master'
0b8f45a33f91
Actions