Diffusion herwighg 41f8917fab07

mergd current release
41f8917fab07
Actions

Tags

None

Subscribers

None

Description

mergd current release

Details

Provenance

Authored on

Parents

rHERWIGHGf385a2abb178: disable virtuality scales for massive IF/FI splittings for the time being; fix…
rHERWIGHG2a3f680aa9d2: merged from release branch

Branches

Unknown

Tags

Unknown

Event Timeline

dgrell committed rHERWIGHG41f8917fab07: mergd current release.Feb 10 2016, 11:25 AM

Merged Changes

2a3f680aa9d2 merged from release branch
Author
dgrell
Browse Repository
No Builds
No Audits
8a9317b08cc3 merged version printing
Author
dgrell
Browse Repository
No Builds
No Audits
5f5dff21ea3c merged from 7.0.0
Author
dgrell
Browse Repository
No Builds
No Audits
4f592ea67001 update to .hgignore
Author
richardn
Browse Repository
No Builds
No Audits
863f84df0172 intermediate merge from release-7
Author
dgrell
Browse Repository
No Builds
No Audits
e05bf4088d2b Contrib/FxFx Makefile.in fix
Author
andreasp
Browse Repository
No Builds
No Audits
1e37e0782169 undo path changes on trunk which is still installing to Herwig++
Author
Simon Plätzer <simon.plaetzer@gmail.com>
Browse Repository
No Builds
No Audits

Changes (41)

Path

Size

Analysis/

LEPFourJetsAnalysis.h

LEPJetAnalysis.h

Contrib/

make_makefiles.sh.in

DipoleShower/

AlphaS/

Base/

DipoleSplittingGenerator.cc

DipoleShowerHandler.cc

DipoleShowerHandler.h

MatrixElement/

Matchbox/

Builtin/

Amplitudes/

MatchboxAmplitudellbarqqbar.cc

MatchboxAmplitudellbarqqbar.h

MatchboxAmplitudellbarqqbarg.cc

MatchboxAmplitudellbarqqbarg.h

MatchboxCurrents.cc

MatchboxCurrents.h

External/

MadGraph/

MadGraphAmplitude.cc

mg2herwig.py.in

Scales/

MatchboxScale.cc.in

Model.cc.template

Model.h.template

Model2.cc.template

write_paramcard.py

Shower/

Base/

Couplings/

ShowerAlphaQCD.cc

ShowerAlphaQCD.h

ShowerHandler.cc

ShowerHandler.h

src/

Matchbox/

MCatNLO-Dipole-HardAlphaSTune.in

MCatNLO-Dipole-ShowerAlphaSTune.in

rHERWIGHG41f8917fab07

.hgignore

Loading...

Analysis/LEPFourJetsAnalysis.h

Loading...

Analysis/LEPJetAnalysis.h

Loading...

Contrib/Makefile.am

Loading...

Contrib/make_makefiles.sh.in

Loading...

DipoleShower/AlphaS/nlo_alpha_s.cc

Loading...

DipoleShower/AlphaS/nlo_alpha_s.h

Loading...

DipoleShower/Base/DipoleSplittingGenerator.cc

Loading...

DipoleShower/DipoleShowerHandler.cc

Loading...

DipoleShower/DipoleShowerHandler.h

Loading...

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxAmplitudellbarqqbar.cc

Loading...

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxAmplitudellbarqqbar.h

Loading...

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxAmplitudellbarqqbarg.cc

Loading...

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxAmplitudellbarqqbarg.h

Loading...

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxCurrents.cc

Loading...

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxCurrents.h

Loading...

MatrixElement/Matchbox/External/MadGraph/MadGraphAmplitude.cc

Loading...

MatrixElement/Matchbox/External/MadGraph/mg2herwig.py.in

Loading...

MatrixElement/Matchbox/Scales/MatchboxScale.cc.in

Loading...

Models/Feynrules/python/ufo2herwig

Loading...

Models/Feynrules/python/ufo2peg/Model.cc.template

Loading...

Models/Feynrules/python/ufo2peg/Model.h.template

Loading...

Models/Feynrules/python/ufo2peg/Model2.cc.template

Loading...

Models/Feynrules/python/ufo2peg/init.py

Loading...

Models/Feynrules/python/ufo2peg/particles.py

Loading...

Models/Feynrules/python/ufo2peg/write_paramcard.py

Loading...

NEWS

Loading...

Shower/Base/Evolver.cc

Loading...

Shower/Base/Evolver.h

Loading...

Shower/Base/ShowerTree.cc

Loading...

Shower/Couplings/ShowerAlphaQCD.cc

Loading...

Shower/Couplings/ShowerAlphaQCD.h

Loading...

Shower/ShowerHandler.cc

Loading...

Shower/ShowerHandler.h

Loading...

src/Herwig.cc

Loading...

src/Matchbox/MCatNLO-Dipole-HardAlphaSTune.in

Loading...

src/Matchbox/MCatNLO-Dipole-ShowerAlphaSTune.in

Loading...