Merge branch 'master' into better_reshuffling
4cd4e1fc2923Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'master' into better_reshuffling

Details

Provenance

hej	Authored on Oct 30 2018, 1:43 PM
amaier	Pushed on Feb 21 2019, 1:04 PM

Parents

rHEJe0c7ac99da3a: Removed old reshuffling
rHEJ22cf3046771c: don't add generator information in libary part

Branches

Unknown

Tags

Unknown

Event Timeline

mheil committed rHEJ4cd4e1fc2923: Merge branch 'master' into better_reshuffling (authored by mheil).Oct 30 2018, 1:43 PM

Merged Changes

22cf3046771c don't add generator information in libary part
Author
amaier
Browse Repository
No Builds
No Audits
e206b69b887b removed obsolete todo notes
Author
amaier
Browse Repository
No Builds
No Audits
2b58bbe8526b removed TODO
Author
hej
Browse Repository
No Builds
No Audits
3a8ee819962e Added ME test for pure jets
Author
hej
Browse Repository
No Builds
No Audits
5b5cb7f83d6e Updated h+jets ME tests Now includes PSP with up to 4 jets
Author
hej
Browse Repository
No Builds
No Audits
5b6ba3a9afb1 Merge branch 'master' into hejfog_jets
Author
hej
Browse Repository
No Builds
No Audits
6f599c593798 code for pure jet production
Author
amaier
Browse Repository
No Builds
No Audits
a459bd5aacb5 fixed phase space normalisation
Author
amaier
Browse Repository
No Builds
No Audits
229be64e1029 white space
Author
amaier
Browse Repository
No Builds
No Audits

Changes (22)

Path

Size

FixedOrderGen/

include/

src/

	2j.cc
	h_5j.cc

	4j.cc
	h_5j.cc

	config_2j.yml
	config_h_2j.yml

doc/

developer_manual/

src/

bin/

ME_data/

rHEJ4cd4e1fc2923

View Options

CMakeLists.txt

View Options

FixedOrderGen/CMakeLists.txt

View Options

FixedOrderGen/include/PhaseSpacePoint.hh

View Options

FixedOrderGen/src/PhaseSpacePoint.cc

View Options

FixedOrderGen/src/main.cc

View Options

FixedOrderGen/t/2j.cc

View Options

FixedOrderGen/t/4j.cc

View Options

FixedOrderGen/t/config_2j.yml

View Options

doc/developer_manual/developer_manual.tex

View Options

src/HepMCWriter.cc

View Options

src/LesHouchesWriter.cc

View Options

src/bin/rHEJ.cc

View Options

t/ME_data/ME_h_mt.dat

View Options

t/ME_data/ME_h_mtinf.dat

View Options

t/ME_data/ME_h_mtmb.dat

View Options

t/ME_data/ME_jets.dat

View Options

t/ME_data/ME_mt.dat

View Options

t/ME_data/ME_mtinf.dat

View Options

t/ME_data/ME_mtmb.dat

View Options

t/ME_data/PSP.lhe.gz

View Options

t/ME_data/PSP_h.lhe.gz

View Options

Merge branch 'master' into better_reshuffling4cd4e1fc2923UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (22)

rHEJ4cd4e1fc2923

CMakeLists.txt

FixedOrderGen/CMakeLists.txt

FixedOrderGen/include/PhaseSpacePoint.hh

FixedOrderGen/src/PhaseSpacePoint.cc

FixedOrderGen/src/main.cc

FixedOrderGen/t/2j.cc

FixedOrderGen/t/4j.cc

FixedOrderGen/t/config_2j.yml

doc/developer_manual/developer_manual.tex

src/HepMCWriter.cc

src/LesHouchesWriter.cc

src/bin/rHEJ.cc

t/ME_data/ME_h_mt.dat

t/ME_data/ME_h_mtinf.dat

t/ME_data/ME_h_mtmb.dat

t/ME_data/ME_jets.dat

t/ME_data/ME_mt.dat

t/ME_data/ME_mtinf.dat

t/ME_data/ME_mtmb.dat

t/ME_data/PSP.lhe.gz

t/ME_data/PSP_h.lhe.gz

t/ME_data/PSP_jets.lhe.gz

Merge branch 'master' into better_reshuffling
4cd4e1fc2923Unpublished
Actions