merge from release
e01c77a731ef
Actions

Description

merge from release

Details

Provenance

Simon Plätzer <simon.plaetzer@gmail.com>	Authored on
simon	Pushed on Jun 26 2023, 12:03 PM

Parents

rHERWIGHGbba786885903: re-instantiate implementation of decay reshuffling which dropped while…
rHERWIGHGf28339e7293f: changeset: 9385:db6a8f9ec74b

Branches

Unknown

Tags

Unknown

Event Timeline

Simon Plätzer <simon.plaetzer@gmail.com> committed rHERWIGHGe01c77a731ef: merge from release.Jun 26 2023, 12:03 PM

Merged Changes

f28339e7293f changeset: 9385:db6a8f9ec74b
Author
aidin
Browse Repository
No Builds
No Audits
a0c19f00999e Hw-7.3 general tune added
Author
aidin
Browse Repository
No Builds
No Audits
ec51a0e25569 unify handling of scripts
Author
simon
Browse Repository
No Builds
No Audits
e847f1f653c3 more warning fixes to cluster fissioner, one potentially undetermined behaviour
Author
simon
Browse Repository
No Builds
No Audits
6d50a4d8a252 merged from release
Author
simon
Browse Repository
No Builds
No Audits
6ba6669236ed Fixed T204!
Author
stefan.kiebacher
Browse Repository
No Builds
No Audits
8f9456d0102b debug in MEDiffraction - add singleDiffractionOnly switch to persistentIO
Author
aidin
Browse Repository
No Builds
No Audits
6506c48c7daf patch mg2herwig to work with py2+MG3.x.x
Author
aidin
Browse Repository
No Builds
No Audits
7fd6823a450a merge from release
Author
richardn
Browse Repository
No Builds
No Audits
482c87830d10 merge from release-7-3
Author
richardn
Browse Repository
No Builds
No Audits
1e5f738d2b4a Merged: Minor Bugfix for new CR model (NOT enabled by default i.e. no change to…
Author
stefan.kiebacher
Browse Repository
No Builds
No Audits
6f9299d5c991 Minor Bugfix for new CR model (NOT enabled by default). abs(deltaPhi) was at…
Author
stefan.kiebacher
Browse Repository
No Builds
No Audits
f43eb5090b40 merge release changes back to trunk
Author
richardn
Browse Repository
No Builds
No Audits
41d26acc717d set the correct Factory for merging in tests - reinstated
Author
aidin
Browse Repository
No Builds
No Audits
96232416c556 set the correct Factory for merging in tests
Author
aidin
Browse Repository
No Builds
No Audits

Changes (11)

Path

Size

Hadronization/

ClusterFissioner.cc

MatrixElement/

Matchbox/

External/

MadGraph/

mg2herwig.in

Shower/

Dipole/

Utility/

ConstituentReshuffler.h

QTilde/

Matching/

PowhegShowerHandler.cc

Tests

Rivet

Templates

Hadron-Merging-Massive.in

python/

HerwigInputs.py

make_input_files.py.in

src/

defaults/

MatchboxMergingDefaults.in.in

rHERWIGHGe01c77a731ef

View Options

Hadronization/ClusterFissioner.cc

View Options

MatrixElement/Matchbox/External/MadGraph/mg2herwig.in

View Options

Shower/Dipole/Utility/ConstituentReshuffler.h

View Options

Shower/QTilde/Matching/PowhegShowerHandler.cc

View Options

Tests/Rivet/Templates/Hadron-Merging-Massive.in

View Options

Tests/python/HerwigInputs.py

View Options

Tests/python/make_input_files.py.in

View Options

src/defaults/MatchboxMergingDefaults.in.in

merge from releasee01c77a731efActions

Description

Details

Event Timeline

Merged Changes

Changes (11)

rHERWIGHGe01c77a731ef

Hadronization/ClusterFissioner.cc

MatrixElement/Matchbox/External/MadGraph/mg2herwig.in

Shower/Dipole/Utility/ConstituentReshuffler.h

Shower/QTilde/Matching/PowhegShowerHandler.cc

Tests/Rivet/Templates/Hadron-Merging-Massive.in

Tests/python/HerwigInputs.py

Tests/python/make_input_files.py.in

src/defaults/MatchboxMergingDefaults.in.in

merge from release
e01c77a731ef
Actions