Merge branch 'WJets' into 'master'
4fb8fdd3fe7a
Actions

Description

Merge branch 'WJets' into 'master'

W jets

See merge request hej/HEJ!24

Details

Provenance

amaier	Authored on May 20 2019, 1:51 PM
hej	Pushed on Jan 14 2021, 6:07 PM

Parents

rHEJd66507ae5e0d: more documentation on subleading channels
rHEJ98c0367a3d87: Cleanup changelog

Branches

Unknown

Tags

Unknown

Event Timeline

amaier committed rHEJ4fb8fdd3fe7a: Merge branch 'WJets' into 'master' (authored by amaier).May 20 2019, 1:51 PM

amaier committed rHEJ4fb8fdd3fe7a: Merge branch 'WJets' into 'master' (authored by amaier).

Merged Changes

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

d66507ae5e0d more documentation on subleading channels
Author
amaier
Browse Repository
No Builds
No Audits
abaae1229cc6 Merge branch 'doc_lambda_vari' into 'WJets'
Author
hej
Browse Repository
No Builds
No Audits
df5de1e78eb4 Merge branch 'WJets' into doc_lambda_vari
Author
hej
Browse Repository
No Builds
No Audits
343d1d63c5f6 Merge branch 'master' into WJets
Author
hej
Browse Repository
No Builds
No Audits
41c94b42404e removed redundant check
Author
amaier
Browse Repository
No Builds
No Audits
af258f1ed1f4 auxiliary function for parametric factors in matrix elements
Author
amaier
Browse Repository
No Builds
No Audits
cc305c3b748d simplified code for changing scale of non-HEJ events
Author
amaier
Browse Repository
No Builds
No Audits
3845aa0fe36a removed superfluous function
Author
amaier
Browse Repository
No Builds
No Audits
d56ae53a8fc3 cosmetic changes in turn_to_uno
Author
amaier
Browse Repository
No Builds
No Audits
f466f1d10873 small clarification in check if particles can couple to W
Author
amaier
Browse Repository
No Builds
No Audits
7e1d25b4d53d Use references instead of pointers
Author
hej
Browse Repository
No Builds
No Audits
f91eaee2645e Visuals
Author
hej
Browse Repository
No Builds
No Audits
907649e07a6e moved comment to right place
Author
hej
Browse Repository
No Builds
No Audits
42975d6fb933 removed redundant headers
Author
hej
Browse Repository
No Builds
No Audits
027894547a82 Fixed unsafe use of find_if().
Author
black
Browse Repository
No Builds
No Audits
db19a48134ab Fixed Bug in label_qqx if W between qqx pair.
Author
black
Browse Repository
No Builds
No Audits
b5ebc4e48c47 use EventData in W classify tests
Author
hej
Browse Repository
No Builds
No Audits
ea305fa63a55 Order include
Author
hej
Browse Repository
No Builds
No Audits
cdae6c1b7420 made configFO.yml similar to master
Author
hej
Browse Repository
No Builds
No Audits
30e3c6f45707 Merge branch 'master' into WJets
Author
amaier
Browse Repository
No Builds
No Audits
8869c861066f Documentation for new "regulator parameter" option
Author
hej
Browse Repository
No Builds
No Audits
cf1959be31c6 Merge branch 'lambdavariation_new' into 'WJets'
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
a53a75e5cefb Don't use identifiers with leading underscore
Author
amaier
Browse Repository
No Builds
No Audits
528ed7331f31 fixed trailing whitespace
Author
amaier
Browse Repository
No Builds
No Audits
ba2227376281 don't use const data members, it makes the class unassignable
Author
amaier
Browse Repository
No Builds
No Audits
bf691b62ccef use user-defined value of regulator in matrix element calculation
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
221798641b1d Reads optional value for regulator lambda
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
c54ea2ce099b Added Wm particle info, changed default values in config.
Author
black
Browse Repository
No Builds
No Audits
0e1768bc6630 Merge branch 'master' of gitlab.dur.scotgrid.ac.uk:hej/HEJ into WJets
Author
black
Browse Repository
No Builds
No Audits
7db8fa75d99c Revert "Added logo"
Author
hej
Browse Repository
No Builds
No Audits
b4e486fa80c7 Merge branch 'master' of gitlab.dur.scotgrid.ac.uk:hej/HEJ into WJets
Author
black
Browse Repository
No Builds
No Audits
ddbe0b34c334 Merge branch 'master' of gitlab.dur.scotgrid.ac.uk:hej/HEJ into WJets
Author
black
Browse Repository
No Builds
No Audits
dab8abac3aa9 Fixed Compiler Warning.
Author
black
Browse Repository
No Builds
No Audits
b51b1231f190 Merge branch 'master' of gitlab.dur.scotgrid.ac.uk:hej/HEJ into WJets
Author
black
Browse Repository
No Builds
No Audits
7c1e13f01efb Merge branch 'master' of gitlab.dur.scotgrid.ac.uk:hej/HEJ into WJets
Author
black
Browse Repository
No Builds
No Audits
27d7628a45b6 Removed mention of file which is no longer supplied with HEJ.
Author
black
Browse Repository
No Builds
No Audits
8ec7c5c7039b added missing data file for aaa631e85e94
Author
amaier
Browse Repository
No Builds
No Audits
aaa631e85e94 test virtual contribution to W+jets matrix elements
Author
amaier
Browse Repository
No Builds
No Audits
86e671eb2b13 renamed matrix element test data
Author
amaier
Browse Repository
No Builds
No Audits
8e98965425fd Altered Assertion in qqxmid case.
Author
black
Browse Repository
No Builds
No Audits
22f11d1416a9 Visuals - clunky if statement broken down.
Author
black
Browse Repository
No Builds
No Audits
8ac15733cca9 Added assertion which will catch erroneous find_if comparison.
Author
black
Browse Repository
No Builds
No Audits
25f319e4cf14 Added Comment for parameter wc.
Author
black
Browse Repository
No Builds
No Audits
f312cbbc3789 new test for W matrix elements - comparison to HEJ 1
Author
amaier
Browse Repository
No Builds
No Audits
cd8a351a4654 relaxed precision requirement in matrix element test
Author
amaier
Browse Repository
No Builds
No Audits
0760a20e29f2 fixed double swap of lepton <-> antilepton momenta
Author
amaier
Browse Repository
No Builds
No Audits
d7ab89ac3815 account for partons inside extremal jets in W+jets matrix element
Author
amaier
Browse Repository
No Builds
No Audits
fff1e8bff8cc Added W- event as second event in W+Jets PSP test
Author
black
Browse Repository
No Builds
No Audits
fef53715f41e Changed Lepton/Anti-Lepton assignment within FKL processes. (Also updated Test…
Author
black
Browse Repository
No Builds
No Audits
d6b97b9e6bca Included Higher Multiplicities in the W+Jet Matrix Element test PSP.
Author
black
Browse Repository
No Builds
No Audits

Changes (55)

Path

Size

FixedOrderGen/

include/

src/

doc/

developer_manual/

developer_manual.tex

sphinx/

HEJ.rst

HEJFOG.rst

include/

HEJ/

src/

ME_data/

	ME_h_mt_tree.dat
	ME_h_mt.dat

ME_h_mtinf.dat

	ME_h_mtinf_tree.dat
	ME_h_mtinf.dat

ME_h_mtmb.dat

	ME_h_mtmb_tree.dat
	ME_h_mtmb.dat

ME_jets.dat

	ME_jets_tree.dat
	ME_jets.dat

	config_w_ME.yml
	config_mtinf.yml

check_res.cc

jet_config.yml

jet_config_with_import.yml

test_ME_generic.cc

rHEJ4fb8fdd3fe7a

View Options

CMakeLists.txt

View Options

Changes.md

View Options

FixedOrderGen/CMakeLists.txt

View Options

FixedOrderGen/configFO.yml

View Options

FixedOrderGen/include/PhaseSpacePoint.hh

View Options

FixedOrderGen/include/Status.hh

View Options

FixedOrderGen/include/Subleading.hh

View Options

FixedOrderGen/src/PhaseSpacePoint.cc

View Options

FixedOrderGen/src/config.cc

View Options

FixedOrderGen/t/W_2j_classify.cc

View Options

FixedOrderGen/t/W_nj_classify.cc

View Options

config.yml

View Options

doc/developer_manual/developer_manual.tex

View Options

doc/sphinx/HEJ.rst

View Options

doc/sphinx/HEJFOG.rst

View Options

include/HEJ/Constants.hh

View Options

include/HEJ/LesHouchesWriter.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/Tensor.hh

View Options

include/HEJ/config.hh

View Options

include/HEJ/currents.hh

View Options

include/HEJ/event_types.hh

View Options

include/HEJ/utility.hh

View Options

src/Event.cc

View Options

src/EventReweighter.cc

View Options

src/MatrixElement.cc

View Options

src/PhaseSpacePoint.cc

View Options

src/Tensor.cc

View Options

src/Wjets.cc

View Options

src/YAMLreader.cc

View Options

src/currents.cc

View Options

t/ME_data/ME_h_mt.dat

View Options

t/ME_data/ME_h_mt_tree.dat

View Options

t/ME_data/ME_h_mtinf.dat

View Options

t/ME_data/ME_h_mtinf_tree.dat

View Options

t/ME_data/ME_h_mtmb.dat

View Options

t/ME_data/ME_h_mtmb_tree.dat

View Options

t/ME_data/ME_jets.dat

View Options

t/ME_data/ME_jets_tree.dat

View Options

t/ME_data/ME_w_FKL_tree.dat

View Options

t/ME_data/ME_w_FKL_virt.dat

View Options

t/ME_data/ME_w_tree.dat

View Options

t/ME_data/PSP_w.lhe.gz

View Options

t/ME_data/PSP_w_FKL.lhe.gz

View Options

t/ME_data/config_mt.yml

View Options

t/ME_data/config_mtinf.yml

View Options

t/ME_data/config_mtmb.yml

View Options

t/ME_data/config_w_ME.yml

View Options

t/check_res.cc

View Options

t/jet_config.yml

View Options

t/jet_config_with_import.yml

View Options

Merge branch 'WJets' into 'master'4fb8fdd3fe7aActions

Description

Details

Event Timeline

Merged Changes

Changes (55)

rHEJ4fb8fdd3fe7a

CMakeLists.txt

Changes.md

FixedOrderGen/CMakeLists.txt

FixedOrderGen/configFO.yml

FixedOrderGen/include/PhaseSpacePoint.hh

FixedOrderGen/include/Status.hh

FixedOrderGen/include/Subleading.hh

FixedOrderGen/src/PhaseSpacePoint.cc

FixedOrderGen/src/config.cc

FixedOrderGen/t/W_2j_classify.cc

FixedOrderGen/t/W_nj_classify.cc

config.yml

doc/developer_manual/developer_manual.tex

doc/sphinx/HEJ.rst

doc/sphinx/HEJFOG.rst

include/HEJ/Constants.hh

include/HEJ/LesHouchesWriter.hh

include/HEJ/MatrixElement.hh

include/HEJ/PDG_codes.hh

include/HEJ/Particle.hh

include/HEJ/PhaseSpacePoint.hh

include/HEJ/Tensor.hh

include/HEJ/config.hh

include/HEJ/currents.hh

include/HEJ/event_types.hh

include/HEJ/utility.hh

src/Event.cc

src/EventReweighter.cc

src/MatrixElement.cc

src/PhaseSpacePoint.cc

src/Tensor.cc

src/Wjets.cc

src/YAMLreader.cc

src/currents.cc

t/ME_data/ME_h_mt.dat

t/ME_data/ME_h_mt_tree.dat

t/ME_data/ME_h_mtinf.dat

t/ME_data/ME_h_mtinf_tree.dat

t/ME_data/ME_h_mtmb.dat

t/ME_data/ME_h_mtmb_tree.dat

t/ME_data/ME_jets.dat

t/ME_data/ME_jets_tree.dat

t/ME_data/ME_w_FKL_tree.dat

t/ME_data/ME_w_FKL_virt.dat

t/ME_data/ME_w_tree.dat

t/ME_data/PSP_w.lhe.gz

t/ME_data/PSP_w_FKL.lhe.gz

t/ME_data/config_mt.yml

t/ME_data/config_mtinf.yml

t/ME_data/config_mtmb.yml

t/ME_data/config_w_ME.yml

t/check_res.cc

t/jet_config.yml

t/jet_config_with_import.yml

t/test_ME_generic.cc

Merge branch 'WJets' into 'master'
4fb8fdd3fe7a
Actions