merged
6f8368af5aa7
Actions

Description

merged

Details

Provenance

Authored on

Parents

rHERWIGHGa18b7870606b: changes to hadronization to improve handling of light clusters
rHERWIGHGe3ddca234088: merged from 7.0.1 release

Branches

Unknown

Tags

Unknown

Event Timeline

richardn committed rHERWIGHG6f8368af5aa7: merged.Feb 25 2016, 9:21 AM

Merged Changes

a18b7870606b changes to hadronization to improve handling of light clusters
Author
richardn
Browse Repository
No Builds
No Audits

Changes (82)

Path

Size

Analysis/

LEPFourJetsAnalysis.h

Contrib/

DipoleShower/

AlphaS/

Makefile.am

nlo_alpha_s.cc

nlo_alpha_s.h

Base/

DipoleEventReweight.h

DipoleSplittingGenerator.cc

DipoleShowerHandler.cc

DipoleShowerHandler.h

Makefile.am

MatrixElement/

Matchbox/

Builtin/

Amplitudes/

Makefile.am

MatchboxAmplitudellbarqqbar.cc

MatchboxAmplitudellbarqqbar.h

MatchboxAmplitudellbarqqbarg.cc

MatchboxAmplitudellbarqqbarg.h

MatchboxCurrents.cc

MatchboxCurrents.h

External/

MadGraph/

Scales/

StandardModel/

Shower/

Base/

Couplings/

Tests/

Rivet/

LHC/

python/

Makefile.am.versionstring

lib/

m4/

MCatNLO-Dipole-HardAlphaSTune.in

MCatNLO-Dipole-ShowerAlphaSTune.in

Makefile.am

OnShellEWProduction.in

	OnShellHProduction.in
	OnShellEWProduction.in

	OnShellWProduction.in
	OnShellEWProduction.in

	OnShellZProduction.in
	OnShellEWProduction.in

herwigopts.ggo

rHERWIGHG6f8368af5aa7

View Options

.hgignore

View Options

.hgsub

View Options

.hgsubstate

View Options

.hgtags

View Options

Analysis/LEPFourJetsAnalysis.h

View Options

Analysis/LEPJetAnalysis.h

View Options

Analysis/Makefile.am

View Options

Contrib/Makefile.am

View Options

Contrib/make_makefiles.sh.in

View Options

DipoleShower/AlphaS/Makefile.am

View Options

DipoleShower/AlphaS/nlo_alpha_s.cc

View Options

DipoleShower/AlphaS/nlo_alpha_s.h

View Options

DipoleShower/Base/DipoleEventReweight.h

View Options

DipoleShower/Base/DipoleSplittingGenerator.cc

View Options

DipoleShower/DipoleShowerHandler.cc

View Options

DipoleShower/DipoleShowerHandler.h

View Options

DipoleShower/Makefile.am

View Options

MatrixElement/Matchbox/Builtin/Amplitudes/Makefile.am

View Options

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxAmplitudellbarqqbar.cc

View Options

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxAmplitudellbarqqbar.h

View Options

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxAmplitudellbarqqbarg.cc

View Options

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxAmplitudellbarqqbarg.h

View Options

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxCurrents.cc

View Options

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxCurrents.h

View Options

MatrixElement/Matchbox/External/MadGraph/MadGraphAmplitude.cc

View Options

MatrixElement/Matchbox/External/MadGraph/Makefile.am

View Options

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

View Options

MatrixElement/Matchbox/Scales/Makefile.am

View Options

MatrixElement/Matchbox/Scales/MatchboxScale.cc.in

View Options

Models/Feynrules/python/ufo2herwig

View Options

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

View Options

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

View Options

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

View Options

Models/Feynrules/python/ufo2peg/init.py

View Options

Models/Feynrules/python/ufo2peg/particles.py

View Options

Models/Feynrules/python/ufo2peg/write_paramcard.py

View Options

Models/StandardModel/O2AlphaS.cc

View Options

NEWS

View Options

README

View Options

Shower/Base/Evolver.cc

View Options

Shower/Base/Evolver.h

View Options

Shower/Base/ShowerProgenitor.h

View Options

Shower/Base/ShowerTree.cc

View Options

Shower/Couplings/ShowerAlphaQCD.cc

View Options

Shower/Couplings/ShowerAlphaQCD.h

View Options

Shower/Makefile.am

View Options

Shower/ShowerHandler.cc

View Options

Shower/ShowerHandler.h

View Options

Tests/Rivet/LHC/LHC-W-mu.in

View Options

Tests/python/make_input_files.py

View Options

Utilities/HerwigStrategy.cc

View Options

Utilities/HerwigStrategy.h

View Options

Utilities/Makefile.am

View Options

Utilities/Makefile.am.versionstring

View Options

Utilities/versionstring.h.in

View Options

configure.ac

View Options

lib/Makefile.am

View Options

m4/herwig.m4

View Options

src/DIS-Matchbox.in

View Options

src/Herwig++

View Options

src/Herwig.cc

View Options

src/HerwigCLI.cc

View Options

src/LEP-Matchbox.in

View Options

src/LHC-Matchbox.in

View Options

src/Makefile.am

View Options

src/Matchbox/FourFlavourScheme.in

View Options

src/Matchbox/GoSam-GoSam.in

View Options

src/Matchbox/MCatNLO-Dipole-HardAlphaSTune.in

View Options

src/Matchbox/MCatNLO-Dipole-ShowerAlphaSTune.in

View Options

src/Matchbox/Makefile.am

View Options

src/Matchbox/OnShellEWProduction.in

View Options

src/Matchbox/OnShellHProduction.in

View Options

src/Matchbox/OnShellWProduction.in

View Options

src/Matchbox/OnShellZProduction.in

View Options

merged6f8368af5aa7Actions

Description

Details

Event Timeline

Merged Changes

Changes (82)

rHERWIGHG6f8368af5aa7

.hgignore

.hgsub

.hgsubstate

.hgtags

Analysis/LEPFourJetsAnalysis.h

Analysis/LEPJetAnalysis.h

Analysis/Makefile.am

Contrib/Makefile.am

Contrib/make_makefiles.sh.in

DipoleShower/AlphaS/Makefile.am

DipoleShower/AlphaS/nlo_alpha_s.cc

DipoleShower/AlphaS/nlo_alpha_s.h

DipoleShower/Base/DipoleEventReweight.h

DipoleShower/Base/DipoleSplittingGenerator.cc

DipoleShower/DipoleShowerHandler.cc

DipoleShower/DipoleShowerHandler.h

DipoleShower/Makefile.am

MatrixElement/Matchbox/Builtin/Amplitudes/Makefile.am

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxAmplitudellbarqqbar.cc

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxAmplitudellbarqqbar.h

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxAmplitudellbarqqbarg.cc

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxAmplitudellbarqqbarg.h

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxCurrents.cc

MatrixElement/Matchbox/Builtin/Amplitudes/MatchboxCurrents.h

MatrixElement/Matchbox/External/MadGraph/MadGraphAmplitude.cc

MatrixElement/Matchbox/External/MadGraph/Makefile.am

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

MatrixElement/Matchbox/Scales/Makefile.am

MatrixElement/Matchbox/Scales/MatchboxScale.cc.in

Models/Feynrules/python/ufo2herwig

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

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

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

Models/Feynrules/python/ufo2peg/__init__.py

Models/Feynrules/python/ufo2peg/particles.py

Models/Feynrules/python/ufo2peg/write_paramcard.py

Models/StandardModel/O2AlphaS.cc

NEWS

README

Shower/Base/Evolver.cc

Shower/Base/Evolver.h

Shower/Base/ShowerProgenitor.h

Shower/Base/ShowerTree.cc

Shower/Couplings/ShowerAlphaQCD.cc

Shower/Couplings/ShowerAlphaQCD.h

Shower/Makefile.am

Shower/ShowerHandler.cc

Shower/ShowerHandler.h

Tests/Rivet/LHC/LHC-W-mu.in

Tests/python/make_input_files.py

Utilities/HerwigStrategy.cc

Utilities/HerwigStrategy.h

Utilities/Makefile.am

Utilities/Makefile.am.versionstring

Utilities/versionstring.h.in

configure.ac

lib/Makefile.am

m4/herwig.m4

src/DIS-Matchbox.in

src/Herwig++

src/Herwig.cc

src/HerwigCLI.cc

src/LEP-Matchbox.in

src/LHC-Matchbox.in

src/Makefile.am

src/Matchbox/FourFlavourScheme.in

src/Matchbox/GoSam-GoSam.in

src/Matchbox/MCatNLO-Dipole-HardAlphaSTune.in

src/Matchbox/MCatNLO-Dipole-ShowerAlphaSTune.in

src/Matchbox/Makefile.am

src/Matchbox/OnShellEWProduction.in

src/Matchbox/OnShellHProduction.in

src/Matchbox/OnShellWProduction.in

merged
6f8368af5aa7
Actions

Models/Feynrules/python/ufo2peg/init.py