merge from trunk
be6fceead285
Actions

Description

merge from trunk

Details

Provenance

Simon Plätzer <simon.plaetzer@gmail.com>	Authored on
richardn	Pushed on Jul 8 2024, 10:39 AM

Parents

rHERWIGHGc40dd5dd946b: take out debut message
rHERWIGHG78f0fcd2f162: add PEExtractor to support opposite beam order for ep

Branches

Unknown

Tags

Unknown

Event Timeline

Simon Plätzer <simon.plaetzer@gmail.com> committed rHERWIGHGbe6fceead285: merge from trunk.Jun 19 2024, 1:08 PM

Merged Changes

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

c40dd5dd946b take out debut message
Author
danielsamitz
Browse Repository
No Builds
No Audits
477942b1465b merge
Author
danielsamitz
Browse Repository
No Builds
No Audits
cfe82ffc5f39 running version of dynamic cluster fissioner
Author
danielsamitz
Browse Repository
No Builds
No Audits
4b2f83abbbb2 merged from trunk
Author
Simon Plätzer <simon.plaetzer@gmail.com>
Browse Repository
No Builds
No Audits
bdb49ffecbc9 add non-perturbative alphas -- step 1
Author
Simon Plätzer <simon.plaetzer@gmail.com>
Browse Repository
No Builds
No Audits
c8c645c60c16 fix warnings
Author
simon
Browse Repository
No Builds
No Audits
2db13af47b0f merge from DynamicModel
Author
simon
Browse Repository
No Builds
No Audits
04f2c9cd6816 merged from default
Author
simon
Browse Repository
No Builds
No Audits
454b337b6db6 merged from hadromerge
Author
simon
Browse Repository
No Builds
No Audits
9d79601a254c merge from default
Author
simon
Browse Repository
No Builds
No Audits
4b440c0296f9 disable deprecated warnings to not hide other warnings
Author
simon
Browse Repository
No Builds
No Audits
bdef3dbdbed5 merge hiddenvalley onto hadronspectrum
Author
simon
Browse Repository
No Builds
No Audits
fdf4e25cde20 merged from hadromerge and fixed dark particle ids
Author
simon
Browse Repository
No Builds
No Audits
61745cfb352f merged from default
Author
simon
Browse Repository
No Builds
No Audits
963f77ac87d8 Added tag validated_with_herwighg-default for changeset efb456a0668e
Author
stefan.kiebacher
Browse Repository
No Builds
No Audits
efb456a0668e hg forget the autogenerated files
Author
stefan.kiebacher
Browse Repository
No Builds
No Audits
80a7c0832b6f autoreconf: added automatically generated files to .hgignore
Author
stefan.kiebacher
Browse Repository
No Builds
No Audits
fb609ca41548 merge fix from default, manually merged iostream for kinThresholdChoice
Author
Simon Plätzer <simon.plaetzer@gmail.com>
Browse Repository
No Builds
No Audits
b9fa282b1333 merged from default
Author
Simon Plätzer <simon.plaetzer@gmail.com>
Browse Repository
No Builds
No Audits
68a6450c0358 Bug fixes for dark hadron production and alpha dark; add new…
Author
Dominic Stafford <dominic.william.stafford@cern.ch>
Browse Repository
No Builds
No Audits
41d374cc0e59 fix to DynamicGluonMassGenerator
Author
Simon Plätzer <simon.plaetzer@gmail.com>
Browse Repository
No Builds
No Audits
c5dae4c491b4 Move makeDiquark from SMHadSpec to HadSpec and use CurrentGenerator in this…
Author
Dominic Stafford <dominic.william.stafford@cern.ch>
Browse Repository
No Builds
No Audits
2d86d6ec267d fixed DynamicModel virtual splitTimeLike Gluon for DynPS
Author
stefan.kiebacher
Browse Repository
No Builds
No Audits
e4fb02dffa50 Merge changes from old hidden valley repository
Author
Dominic Stafford <dominic.william.stafford@cern.ch>
Browse Repository
No Builds
No Audits
b10079736e54 Start new branch for hidden valley changes
Author
Dominic Stafford <dominic.william.stafford@cern.ch>
Browse Repository
No Builds
No Audits
ed20f90317df fix some issues with ioverloading and missing implementations
Author
Simon Plätzer <simon.plaetzer@gmail.com>
Browse Repository
No Builds
No Audits
e05bc17c919b DynamicModel branch (ClusterFissioner not yet working)
Author
danielsamitz
Browse Repository
No Builds
No Audits
725d07c1633b implement Jans phase space vetoes
Author
Simon Plätzer <simon.plaetzer@gmail.com>
Browse Repository
No Builds
No Audits
da8511af7d1a Add mixing state weight for pdgId 30333 back in (lost in merge)
Author
Dominic Stafford <dominic.william.stafford@cern.ch>
Browse Repository
No Builds
No Audits
43af943d9145 Merge from remote
Author
Dominic Stafford <dominic.william.stafford@cern.ch>
Browse Repository
No Builds
No Audits
a4ad61febf59 Fixes for Hadron Table
Author
Dominic Stafford <dominic.william.stafford@cern.ch>
Browse Repository
No Builds
No Audits
b5415376a6e6 replaced debug compiler flags with -O2
Author
stefan.kiebacher
Browse Repository
No Builds
No Audits
a18b7003a074 fixed wrong name in StandardModelHadronSpectrum.cc for makeDiquark
Author
stefan.kiebacher
Browse Repository
No Builds
No Audits
889fbc2e7b0b merge from remote
Author
Dominic Stafford <dominic.william.stafford@cern.ch>
Browse Repository
No Builds
No Audits
700b6fdec8ce Short term fix for HadronSpectrum losing link to the generator and make sure…
Author
Dominic Stafford <dominic.william.stafford@cern.ch>
Browse Repository
No Builds
No Audits
caa2c214a062 Important: Fixed typo in automake file Makefile.am
Author
stefan.kiebacher
Browse Repository
No Builds
No Audits
3dc1291e01b8 Fix quark check and remove remaining iColour==3 check
Author
Dominic Stafford <dominic.william.stafford@cern.ch>
Browse Repository
No Builds
No Audits
fe7283913816 fiux leftover referecnes to HadronSelector in input files
Author
Simon Plätzer <simon.plaetzer@gmail.com>
Browse Repository
No Builds
No Audits
e32cc35e2f09 fix missing constructors in GluonMassGenerator
Author
Simon Plätzer <simon.plaetzer@gmail.com>
Browse Repository
No Builds
No Audits
414c45f89b1e Add missing virtual methods, remove non-SM or SUSY particles from hadronTable…
Author
Dominic Stafford <dominic.william.stafford@cern.ch>
Browse Repository
No Builds
No Audits
f0c7cb29692a merged from trunk
Author
simon
Browse Repository
No Builds
No Audits
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

Changes (6)

Path

Size

m4/

defaults/

	PECollider.in
	EPCollider.in

rHERWIGHGbe6fceead285

View Options

m4/ltversion.m4

View Options

src/defaults/Partons.in

View Options

src/snippets/Makefile.am

View Options

src/snippets/PECollider.in

merge from trunkbe6fceead285Actions

Description

Details

Event Timeline

Merged Changes

Changes (6)

rHERWIGHGbe6fceead285

m4/ltversion.m4

src/defaults/Partons.in

src/snippets/Makefile.am

src/snippets/PECollider.in

merge from trunk
be6fceead285
Actions