Merge branch 'ZJets' into 'master'
f7aca07437ef
Actions

Description

Merge branch 'ZJets' into 'master'

Z+Jets

See merge request hej/HEJ!150

Details

Provenance

amaier	Authored on Jul 3 2020, 6:40 AM
hej	Pushed on Jan 14 2021, 6:07 PM

Parents

rHEJ8d292560c728: Fix: PID 0 was counting as parton
rHEJb83b8032b55b: Minor: Comment on dead code

Branches

Unknown

Tags

Unknown

Event Timeline

amaier committed rHEJf7aca07437ef: Merge branch 'ZJets' into 'master' (authored by amaier).Jul 3 2020, 6:40 AM

amaier committed rHEJf7aca07437ef: Merge branch 'ZJets' into 'master' (authored by amaier).

Merged Changes

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

8d292560c728 Fix: PID 0 was counting as parton
Author
hej
Browse Repository
No Builds
No Audits
cdab49f90470 Added minus operator to Parameters
Author
hej
Browse Repository
No Builds
No Audits
6654ac583428 Minor: make latex happy
Author
hej
Browse Repository
No Builds
No Audits
378cd9268797 Reuse Z current function for W
Author
hej
Browse Repository
No Builds
No Audits
669ad5792a6c Move Z currents to `currents` namespace
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
83aae961b995 Merge branch 'master' into 'ZJets'
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
716876249bed Clean up in mirror test for Z events
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
1f7d32af0d2f Check that incoming particles are on-shell in angle product
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
a82e390d82eb Remove trailing whitespace
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
657324744e33 Simplifications in mixed Lipatov vertices
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
b005a21ce222 Use more const in Z MEs
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
e0b967b9b8b5 Small changes in electroweak charge functions
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
48f17f6b879d Remove unnecessary intermediate variables
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
2ae5177ce4fe Add `is_gluon()` function
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
4fa8e77d8ed5 Comment unused variable
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
71b7fb71212d Use ParticleID instead of int
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
543298779e54 Update Z currents documentation
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
82d2c16114ae Add Z uno ME test
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
3a814f45e45c Label quarks properly when emitting a Z
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
a49f7450dd69 Adapt Z virtual corrections for unordered emission
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
c76844e8763a Fix ME_Z_uno_current for incoming antiquarks
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
3b2df4830d6d Implement tree_kin_Z_uno
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
d167d94d7342 Update reference classification for Z+4j
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
f1e1464221db Set Z unordered events as implemented
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
8ef7401ec110 Merge branch 'ZJets' into 'ZJets_uno'
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
89d260d6e571 Clarify colour/averaging factors in Z FKL MEs
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
a1983f7f12de Comment out unused variable
Author
hej
Browse Repository
No Builds
No Audits
2de396efef5d Corrected reference classifcation for W+4j
Author
hej
Browse Repository
No Builds
No Audits
595a26153f48 Rename Z auxiliary functions and move to anonymous namespace
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
c60dec25cf9a Simplify sum over helicities in ME_Z_qQ and ME_Zuno_qQ
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
ed94ceccd29d Use auxiliary function for Z ME prefactor
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
d60570232d86 Use more transparent variable names in Z unordered ME
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
22a2a8de970c Add Z unordered ME
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
87454bfa6aab Minor tweaks in electroweak charge functions
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
fbbd5c3ffb95 Remove unnecessary EW constants in Z+jets
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
07c68c2dbd88 Use norm instead of abs2
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
7e7a4d1a777b Make sum over helicities more explicit
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
ab185ae8fb56 Use Helicity instead of bool in Zq
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
ab65338f2bf0 Simpler treatment of antiquarks in Z FKL amplitudes
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
4aae2533cb4f Make color/helicity factors explicit, introduce variables for 1/t factors in…
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
867055a20512 Rename some functions and variables
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
c1df9cc263ec Cleanup in ME_Z_qQ and ME_Z_qg
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
cc2fff300d1c Implement Z FKL currents using FORM
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
7ac41af03f22 Merge branch 'master' of gitlab.dur.scotgrid.ac.uk:hej/HEJ into ZJets_FORM
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
d4280711f95d Add reference data for Z+jets FKL matrix elements
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
3c60c87c28f4 Add reference data for Z+jets classification
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
f0c2ba42c6f7 Reconstruct intermediate boson in test_classify_ref
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
c3f3325221e5 Check sum of virtual corrections in test_ME_generic
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
fc2a0d70a5cb Merge branch 'master' of gitlab.dur.scotgrid.ac.uk:hej/HEJ into into ZJets
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits
1b1423fc91e1 Adapt mirror test in test_ME_generic for Z events
Author
Bertrand Ducloué <bertrand.ducloue@ed.ac.uk>
Browse Repository
No Builds
No Audits

Changes (35)

Path

Size

current_generator/

include/

currents.frm

	jZ_j.frm
	jW_j.frm

	jZ_juno.frm
	jW_juno.frm

	jZuno_j.frm
	jWuno_j.frm

doc/

developer_manual/

currents.tex

developer_manual.tex

include/

HEJ/

src/

ME_data/

	config_Z_ME.yml
	config_w_ME.yml

Z_4j.lhe.gz

classify_ref_W4j

	classify_ref_Z4j
	classify_ref_W4j

rHEJf7aca07437ef

View Options

current_generator/include/currents.frm

View Options

current_generator/jZ_j.frm

View Options

current_generator/jZ_juno.frm

View Options

current_generator/jZuno_j.frm

View Options

doc/developer_manual/currents.tex

View Options

doc/developer_manual/developer_manual.tex

View Options

include/HEJ/MatrixElement.hh

View Options

include/HEJ/PDG_codes.hh

View Options

include/HEJ/Parameters.hh

View Options

include/HEJ/Zjets.hh

View Options

src/Event.cc

View Options

src/LorentzVector.cc

View Options

src/MatrixElement.cc

View Options

src/PDG_codes.cc

View Options

src/PhaseSpacePoint.cc

View Options

src/Zjets.cc

View Options

t/CMakeLists.txt

View Options

t/ME_data/ME_Z_FKL_tree.dat

View Options

t/ME_data/ME_Z_FKL_virt.dat

View Options

t/ME_data/ME_Z_uno_tree.dat

View Options

t/ME_data/ME_Z_uno_virt.dat

View Options

t/ME_data/PSP_Z_FKL.lhe.gz

View Options

t/ME_data/PSP_Z_uno.lhe.gz

View Options

t/ME_data/config_Z_ME.yml

View Options

t/Z_4j.lhe.gz

View Options

t/classify_ref_W4j

View Options

t/classify_ref_Z4j

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

t/test_decay.cc

View Options

t/test_parameters.cc

View Options

Merge branch 'ZJets' into 'master'f7aca07437efActions

Description

Details

Event Timeline

Merged Changes

Changes (35)

rHEJf7aca07437ef

current_generator/include/currents.frm

current_generator/jZ_j.frm

current_generator/jZ_juno.frm

current_generator/jZuno_j.frm

doc/developer_manual/currents.tex

doc/developer_manual/developer_manual.tex

include/HEJ/MatrixElement.hh

include/HEJ/PDG_codes.hh

include/HEJ/Parameters.hh

include/HEJ/Zjets.hh

src/Event.cc

src/LorentzVector.cc

src/MatrixElement.cc

src/PDG_codes.cc

src/PhaseSpacePoint.cc

src/Zjets.cc

t/CMakeLists.txt

t/ME_data/ME_Z_FKL_tree.dat

t/ME_data/ME_Z_FKL_virt.dat

t/ME_data/ME_Z_uno_tree.dat

t/ME_data/ME_Z_uno_virt.dat

t/ME_data/PSP_Z_FKL.lhe.gz

t/ME_data/PSP_Z_uno.lhe.gz

t/ME_data/config_Z_ME.yml

t/Z_4j.lhe.gz

t/classify_ref_W4j

t/classify_ref_Z4j

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

t/test_parameters.cc

t/test_pid.cc

Merge branch 'ZJets' into 'master'
f7aca07437ef
Actions