Diffusion herwighg cd7fc57f711d

merge Frasher's changes
cd7fc57f711d
Actions

Tags

None

Subscribers

None

Description

merge Frasher's changes

Details

Provenance

Authored on

Parents

rHERWIGHGa9117261f003: Implemented the proper weighting of diagrams in MEDiffraction, added parameter…
rHERWIGHGedbc39391e62: Switch back to CellGridSampler

Branches

Unknown

Tags

Unknown

Event Timeline

dgrell committed rHERWIGHGcd7fc57f711d: merge Frasher's changes.Nov 4 2016, 10:01 AM

Merged Changes

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

edbc39391e62 Switch back to CellGridSampler
Author
bellm
Browse Repository
No Builds
No Audits
ac637ee025e1 merged up to herwig-7.0.4
Author
dgrell
Browse Repository
No Builds
No Audits
917b6b854ef9 Added tag herwig-7-0-4 for changeset 65282dedfc2e
Author
dgrell
Browse Repository
No Builds
No Audits
65282dedfc2e ready for 7.0.4
Author
dgrell
Browse Repository
No Builds
No Audits
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
bcca05a50e9e fix for change of analysis name in rivet
Author
richardn
Browse Repository
No Builds
No Audits
71442ddcc066 fix for rivet matchbox tests involving b quarks which didn't work anymore due…
Author
richardn
Browse Repository
No Builds
No Audits
c7ff83e17158 Make sure prepareOnly in the API initializes the EventGenerator properly.
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
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
d92c937a6a90 buildfix for older compilers
Author
bellm
Browse Repository
No Builds
No Audits
4a676c05aea4 Merged.
Author
webster
Browse Repository
No Builds
No Audits
0054ab70e9d7 Tidied.
Author
webster
Browse Repository
No Builds
No Audits
fe49c2a8bcf9 Some fixes to event record loops.
Author
webster
Browse Repository
No Builds
No Audits
c565439ac21a Merged.
Author
webster
Browse Repository
No Builds
No Audits
287bad130370 Fixed = to ==.
Author
webster
Browse Repository
No Builds
No Audits

Changes (5)

Path

Size

MatrixElement/

Hadron/

MEDiffraction.cc

MEDiffraction.h

PDF/

HwRemDecayer.cc

rHERWIGHGcd7fc57f711d

MatrixElement/Hadron/MEDiffraction.cc

Loading...

MatrixElement/Hadron/MEDiffraction.h

Loading...

MatrixElement/Hadron/MEMinBias.cc

Loading...

MatrixElement/Hadron/MEMinBias.h

Loading...

PDF/HwRemDecayer.cc

Loading...