merged from trunk
f0c7cb29692a
Actions

Description

merged from trunk

Details

Provenance

simon	Authored on
richardn	Pushed on Jul 8 2024, 10:39 AM

Parents

rHERWIGHGb40e77f7a751: more build/warning fixes
rHERWIGHGec51a0e25569: unify handling of scripts

Branches

Unknown

Tags

Unknown

Event Timeline

simon committed rHERWIGHGf0c7cb29692a: merged from trunk.Feb 27 2023, 8:31 AM

Merged Changes

b40e77f7a751 more build/warning fixes
Author
simon
Browse Repository
No Builds
No Audits
1d8b6654aa0c warning/build fixes
Author
simon
Browse Repository
No Builds
No Audits
56dfdf2f3231 hadronization merge, stage 1, including changes from Dominic Stafford on hadron…
Author
simon
Browse Repository
No Builds
No Audits
d7449f08a46b build fix
Author
simon
Browse Repository
No Builds
No Audits
d3e3fce6503f make gluon mass generators interaction specific, as well
Author
simon
Browse Repository
No Builds
No Audits
080b76fbf97b fixes to merges from Daniel
Author
Simon Plätzer <simon.plaetzer@gmail.com>
Browse Repository
No Builds
No Audits
fc539a5964a9 changes from Daniel's branch such that dynamic model is functional
Author
simon
Browse Repository
No Builds
No Audits
e15023b2892c merge changes from dark hadron development
Author
simon
Browse Repository
No Builds
No Audits
657a3cd2bd47 include explicit setting of interactions as example for different interactions
Author
Simon Plätzer <simon.plaetzer@gmail.com>
Browse Repository
No Builds
No Audits
1e9cf7b3535e Migrate CheckId functions to StandardModelHadronSpectrum
Author
Dominic Stafford <dominic.william.stafford@cern.ch>
Browse Repository
No Builds
No Audits
7fbc417bcce0 migrate fix from trunk on repeated ommentum conservation
Author
simon
Browse Repository
No Builds
No Audits
1c44cf9d2373 migration to HadronSpectrum now is functional
Author
simon
Browse Repository
No Builds
No Audits
17cf6f20e5c5 fix crash with new hadron spectrum
Author
simon
Browse Repository
No Builds
No Audits
aef6fa30907b some fixes for ThePEG hooks
Author
simon
Browse Repository
No Builds
No Audits
80484b7c0665 remove last references to HadronSelector
Author
Simon Plätzer <simon.plaetzer@gmail.com>
Browse Repository
No Builds
No Audits
5d9261a5f048 Replace HadronSelector with HadronSpectrum (Not yet passing tests)
Author
Dominic Stafford <dominic.william.stafford@cern.ch>
Browse Repository
No Builds
No Audits
2e2556c82d89 Fix seemingly incorrect iterator
Author
Dominic Stafford <dominic.william.stafford@cern.ch>
Browse Repository
No Builds
No Audits
d5542ca29a01 all parton s are coloured
Author
simon
Browse Repository
No Builds
No Audits
98d36ea20785 first version of flexible hadron spectrum, results at LEP agree within…
Author
Simon Plätzer <simon.plaetzer@gmail.com>
Browse Repository
No Builds
No Audits

Changes (13)

Path

Size

Hadronization/

	gosam2herwig.in
	gosam2herwig.py.in

gosam2herwig.py.in

Sampling

Makefile.am

	herwig-mergegrids.in
	herwig-mergegrids.py.in

herwig-mergegrids.py.in

configure.ac

rHERWIGHGf0c7cb29692a

View Options

Hadronization/ClusterFissioner.cc

View Options

MatrixElement/Matchbox/External/GoSam/Makefile.am

View Options

MatrixElement/Matchbox/External/GoSam/gosam2herwig.in

View Options

MatrixElement/Matchbox/External/GoSam/gosam2herwig.py.in

View Options

Sampling/Makefile.am

View Options

Sampling/herwig-mergegrids.in

View Options

Sampling/herwig-mergegrids.py.in

View Options

merged from trunkf0c7cb29692aActions

Description

Details

Event Timeline

Merged Changes

Changes (13)

rHERWIGHGf0c7cb29692a

Hadronization/ClusterFissioner.cc

MatrixElement/Matchbox/External/GoSam/Makefile.am

MatrixElement/Matchbox/External/GoSam/gosam2herwig.in

MatrixElement/Matchbox/External/GoSam/gosam2herwig.py.in

Sampling/Makefile.am

Sampling/herwig-mergegrids.in

Sampling/herwig-mergegrids.py.in

configure.ac

merged from trunk
f0c7cb29692a
Actions