merge fix from default, manually merged iostream for kinThresholdChoice
fb609ca41548
Actions

Description

merge fix from default, manually merged iostream for kinThresholdChoice

Details

Provenance

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

Parents

rHERWIGHGb9fa282b1333: merged from default
rHERWIGHG2449a1c000de: merge from release

Branches

Unknown

Tags

Unknown

Event Timeline

Simon Plätzer <simon.plaetzer@gmail.com> committed rHERWIGHGfb609ca41548: merge fix from default, manually merged iostream for kinThresholdChoice.Oct 5 2023, 3:24 PM

Merged Changes

b9fa282b1333 merged from default
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
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
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 (1)

Path

Size

Hadronization/

ClusterFissioner.cc

rHERWIGHGfb609ca41548

View Options

Hadronization/ClusterFissioner.cc

merge fix from default, manually merged iostream for kinThresholdChoicefb609ca41548Actions

Description

Details

Event Timeline

Merged Changes

Changes (1)

rHERWIGHGfb609ca41548

Hadronization/ClusterFissioner.cc

merge fix from default, manually merged iostream for kinThresholdChoice
fb609ca41548
Actions