Diffusion herwighg ac637ee025e1

merged up to herwig-7.0.4
ac637ee025e1
Actions

Description

merged up to herwig-7.0.4

Details

Provenance

dgrell

Authored on

Parents

rHERWIGHG917b6b854ef9: Added tag herwig-7-0-4 for changeset 65282dedfc2e
rHERWIGHG0f7d977fa726: Fix for ff3a84223e31

Branches

Unknown

Tags

Unknown

Event Timeline

dgrell committed rHERWIGHGac637ee025e1: merged up to herwig-7.0.4.Nov 1 2016, 1:39 PM

Merged Changes

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

0f7d977fa726 Fix for ff3a84223e31
Author
bellm
Browse Repository
No Builds
No Audits
ff3a84223e31 Fixing initial state scales and sudakov sampling for massive FFDipoles. Adding…
Author
bellm
Browse Repository
No Builds
No Audits
050d14cd9131 Fixed author in dipole event record.
Author
webster
Browse Repository
No Builds
No Audits
f1e3d10af2ab Fixed emission count in dipole shower.
Author
webster
Browse Repository
No Builds
No Audits
fa07a62661b4 Corrected author in dipole event record.
Author
webster
Browse Repository
No Builds
No Audits
106149683d08 Reviewed with Simon
Author
bellm
Browse Repository
No Builds
No Audits
2b0b509e8708 Improve different PDFs in shower and ME calculation in LO merging. Allow dipole…
Author
bellm
Browse Repository
No Builds
No Audits
5b8e8e517c50 Qtilde shower created b's from initial state splittings after reading…
Author
bellm
Browse Repository
No Builds
No Audits
82a1db4d3c0b Fix missing initialization in top Powheg decayer
Author
dgrell
Browse Repository
No Builds
No Audits
2d602d2d2e30 Add KrknloEventReweight
Author
graeme
Browse Repository
No Builds
No Audits
9d4ec55ad4a2 Make the directory strings in MadGraph and OpenLoops static to reduce memory.
Author
bellm
Browse Repository
No Builds
No Audits
9027e2105a4e Fix Makefiles to get distcheck working.
Author
dgrell
Browse Repository
No Builds
No Audits
23a8257e2c3c fixes in example input files for merging
Author
bellm
Browse Repository
No Builds
No Audits
73103d2f3205 fix for 5-flavour scheme with massive spectators
Author
bellm
Browse Repository
No Builds
No Audits
3f6e0f7c137c Move shower files that go into global Herwig.so from QTilde/ to Core/. This…
Author
dgrell
Browse Repository
No Builds
No Audits
2e23c92cdec7 Fix for Decay distclean checkin 001bcb1ab
Author
dgrell
Browse Repository
No Builds
No Audits
001bcb1ab010 Fix distclean in Decay/
Author
dgrell
Browse Repository
No Builds
No Audits
4f9e4bbfd5a5 Higgs boson pair production via OpenLoops works with HW7
Author
andreasp
Browse Repository
No Builds
No Audits
ef5ccd4a6372 Add example inputfile for soft MEs. Needs to be consistent with other .in files…
Author
dgrell
Browse Repository
No Builds
No Audits
f4519534f8c2 Merged Frasher's soft physics changes. MEs need review of hardcoded values.
Author
dgrell
Browse Repository
No Builds
No Audits
09ae6a50d973 Changes to MEDiffraction, MEMinBias and HwRemDecayer addressing the issues from…
Author
frasher
Browse Repository
No Builds
No Audits
2c3b63d9921e Reverted to the trunk version Config/ltmain.sh, m4/libtool.m4 and m4/lt*.m4.
Author
frasher
Browse Repository
No Builds
No Audits
8a859d8488b3 Removed initialization of some variables in RemDecayer.
Author
frasher
Browse Repository
No Builds
No Audits
9209eb899656 Merge with trunk.
Author
frasher
Browse Repository
No Builds
No Audits
cc5a5289abd8 Merge with trunk.
Author
frasher
Browse Repository
No Builds
No Audits
6c861a24c70c Merged with trunk.
Author
frasher
Browse Repository
No Builds
No Audits
145e9a2fa716 Changes to MEMinBias and HwRemDecayer.
Author
frasher
Browse Repository
No Builds
No Audits
d8684bc66241 MEDiffraction modified to include proton-antiproton collisions.
Author
frasher
Browse Repository
No Builds
No Audits
171262df82c3 Diffraction to p delta implemented properly, MEMinBias me2() adjusted relative…
Author
frasher
Browse Repository
No Builds
No Audits
29927c816342 Changed HwRemDecayer to have the proper x for the multiperipheral ladder.
Author
frasher
Browse Repository
No Builds
No Audits
355100528fda Merged.
Author
frasher
Browse Repository
No Builds
No Audits
725b4dea4a35 Added quark-antiquark pair to HwRemDecayer to make the colour connection for…
Author
frasher
Browse Repository
No Builds
No Audits
13a8bf0f9234 Added diffraction matrix element and implemented multiperipheral kinematics in…
Author
frasher
Browse Repository
No Builds
No Audits
475c3975aa12 merge
Author
dgrell
Browse Repository
No Builds
No Audits
68d2d99d7469 Major merge of Johannes' and Stephen's branches
Author
dgrell
Browse Repository
No Builds
No Audits
5f24a2761816 revert accidental(?) Contrib changes on mergingtrunk branch
Author
dgrell
Browse Repository
No Builds
No Audits
0e8407d8a2e0 merged with trunk
Author
bellm
Browse Repository
No Builds
No Audits
69f505f43a9a flush caches where they should be flushed.
Author
bellm
Browse Repository
No Builds
No Audits
06f98e667cc6 cosmetics in General Sampler, gross alpha_s and IR cutoff tune
Author
bellm
Browse Repository
No Builds
No Audits
6bf8320c7244 forbid to split hard process in merging
Author
bellm
Browse Repository
No Builds
No Audits
f02faa7e626d Examples of terminal colour usage.
Author
dgrell
Browse Repository
No Builds
No Audits
d073171ba483 Name change Colour:: -> ANSI:: to match ThePEG.
Author
dgrell
Browse Repository
No Builds
No Audits
67a57a6e4519 Centralize use of terminal colours in ThePEG. Needs 21ddbdf4281c
Author
dgrell
Browse Repository
No Builds
No Audits
28efe0dbfc4c cosmetics
Author
bellm
Browse Repository
No Builds
No Audits
8868747f766e merged with trunk
Author
bellm
Browse Repository
No Builds
No Audits
043b3d5f70a9 change constructor of DipoleSplittingInfo
Author
bellm
Browse Repository
No Builds
No Audits
333a60fcb9d7 Merged.
Author
webster
Browse Repository
No Builds
No Audits
8b8ad3cf9384 Updated authors in header files.
Author
webster
Browse Repository
No Builds
No Audits
58d966b2f2a9 clean up four and five flavour scheme
Author
bellm
Browse Repository
No Builds
No Audits
56efd4445761 Photon radiation included for decays in dipole shower.
Author
webster
Browse Repository
No Builds
No Audits

Changes (18)

Path

Size

API/

MatrixElement/

Matchbox/

External/

MadGraph/

VBFNLO/

Scales/

Sampling/

exsample/

Shower/

Dipole/

AlphaS/

Makefile.am

QTilde/

Makefile.am

Tests/

python/

make_input_files.py

configure.ac

lib/

Makefile.am

rHERWIGHGac637ee025e1

View Options

.hgtags

View Options

API/HerwigAPI.cc

View Options

API/Makefile.am

View Options

AUTHORS

View Options

MatrixElement/Matchbox/External/MadGraph/Makefile.am

View Options

MatrixElement/Matchbox/External/Makefile.am

View Options

MatrixElement/Matchbox/External/VBFNLO/Makefile.am

View Options

MatrixElement/Matchbox/Scales/Makefile.am

View Options

NEWS

View Options

README

View Options

Sampling/Makefile.am

View Options

Sampling/exsample/utility.h

View Options

Shower/Dipole/AlphaS/Makefile.am

View Options

Shower/Makefile.am

View Options

Shower/QTilde/Makefile.am

View Options

Tests/python/make_input_files.py

View Options

configure.ac

View Options

merged up to herwig-7.0.4ac637ee025e1Actions

Description

Details

Event Timeline

Merged Changes

Changes (18)

rHERWIGHGac637ee025e1

.hgtags

API/HerwigAPI.cc

API/Makefile.am

AUTHORS

MatrixElement/Matchbox/External/MadGraph/Makefile.am

MatrixElement/Matchbox/External/Makefile.am

MatrixElement/Matchbox/External/VBFNLO/Makefile.am

MatrixElement/Matchbox/Scales/Makefile.am

NEWS

README

Sampling/Makefile.am

Sampling/exsample/utility.h

Shower/Dipole/AlphaS/Makefile.am

Shower/Makefile.am

Shower/QTilde/Makefile.am

Tests/python/make_input_files.py

configure.ac

lib/Makefile.am

merged up to herwig-7.0.4
ac637ee025e1
Actions