diff --git a/src/DIS-Matchbox.in b/src/DIS-Matchbox.in
--- a/src/DIS-Matchbox.in
+++ b/src/DIS-Matchbox.in
@@ -1,147 +1,143 @@
# -*- ThePEG-repository -*-
##################################################
## Herwig/Matchbox example input file
##################################################
##################################################
## Collider type
##################################################
-
-read Matchbox/EPCollider.in
+read snippets/Matchbox.in
+read snippets/PECollider.in
##################################################
## Beam energies
##################################################
cd /Herwig/EventHandlers
-# no pdfs for leptons
-set /Herwig/Shower/ShowerHandler:PDFA /Herwig/Partons/ShowerLOPDF
-set /Herwig/Partons/MPIExtractor:FirstPDF /Herwig/Partons/MPIPDF
-set /Herwig/Partons/Extractor:FirstPDF /Herwig/Partons/HardNLOPDF
##################################################
## Process selection
##################################################
## Note that event generation may fail if no matching matrix element has
## been found. Coupling orders are with respect to the Born process,
## i.e. NLO QCD does not require an additional power of alphas.
## Model assumptions
read Matchbox/StandardModelLike.in
read Matchbox/DiagonalCKM.in
## Set the order of the couplings
cd /Herwig/MatrixElements/Matchbox
set Factory:OrderInAlphaS 0
set Factory:OrderInAlphaEW 2
## Select the process
## You may use identifiers such as p, pbar, j, l, mu+, h0 etc.
-do Factory:Process e+ p -> e+ j
+do Factory:Process p e- -> e- j
## Special settings required for on-shell production of unstable particles
## enable for on-shell top production
# read Matchbox/OnShellTopProduction.in
## enable for on-shell W, Z or h production
# read Matchbox/OnShellWProduction.in
# read Matchbox/OnShellZProduction.in
# read Matchbox/OnShellHProduction.in
##################################################
## Matrix element library selection
##################################################
## Select a generic tree/loop combination or a
## specialized NLO package
# read Matchbox/MadGraph-GoSam.in
# read Matchbox/MadGraph-MadGraph.in
# read Matchbox/MadGraph-NJet.in
# read Matchbox/MadGraph-OpenLoops.in
##################################################
## Cut selection
## See the documentation for more options
##################################################
## cuts on additional jets
# read Matchbox/DefaultEPJets.in
# insert JetCuts:JetRegions 0 FirstJet
# insert JetCuts:JetRegions 1 SecondJet
# insert JetCuts:JetRegions 2 ThirdJet
##################################################
## Scale choice
## See the documentation for more options
##################################################
cd /Herwig/MatrixElements/Matchbox
set Factory:ScaleChoice /Herwig/MatrixElements/Matchbox/Scales/LeptonQ2Scale
##################################################
## Matching and shower selection
## Please also see flavour scheme settings
## towards the end of the input file.
##################################################
read Matchbox/MCatNLO-DefaultShower.in
# read Matchbox/Powheg-DefaultShower.in
## use for strict LO/NLO comparisons
# read Matchbox/MCatLO-DefaultShower.in
## use for improved LO showering
# read Matchbox/LO-DefaultShower.in
# read Matchbox/MCatNLO-DipoleShower.in
# read Matchbox/Powheg-DipoleShower.in
## use for strict LO/NLO comparisons
# read Matchbox/MCatLO-DipoleShower.in
## use for improved LO showering
# read Matchbox/LO-DipoleShower.in
# read Matchbox/NLO-NoShower.in
# read Matchbox/LO-NoShower.in
##################################################
## Scale uncertainties
##################################################
# read Matchbox/MuDown.in
# read Matchbox/MuUp.in
##################################################
## Shower scale uncertainties
##################################################
# read Matchbox/MuQDown.in
# read Matchbox/MuQUp.in
##################################################
## PDF choice
##################################################
read Matchbox/FiveFlavourScheme.in
## required for dipole shower and fixed order in five flavour scheme
# read Matchbox/FiveFlavourNoBMassScheme.in
read Matchbox/MMHT2014.in
##################################################
## Analyses
##################################################
# cd /Herwig/Analysis
# insert Rivet:Analyses 0 XXX_2015_ABC123
# insert /Herwig/Generators/EventGenerator:AnalysisHandlers 0 Rivet
# insert /Herwig/Generators/EventGenerator:AnalysisHandlers 0 HepMC
##################################################
## Save the generator
##################################################
do /Herwig/MatrixElements/Matchbox/Factory:ProductionMode
cd /Herwig/Generators
saverun DIS-Matchbox EventGenerator
diff --git a/src/DIS.in b/src/DIS.in
--- a/src/DIS.in
+++ b/src/DIS.in
@@ -1,67 +1,67 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator based on DIS parameters
# usage: Herwig read DIS.in
##################################################
-read snippets/EPColliderNew.in
+read snippets/PECollider.in
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
# no pdfs for leptons
set /Herwig/Shower/ShowerHandler:PDFA /Herwig/Partons/ShowerLOPDF
set /Herwig/Partons/MPIExtractor:FirstPDF /Herwig/Partons/MPIPDF
set /Herwig/Partons/Extractor:FirstPDF /Herwig/Partons/HardNLOPDF
##################################################
# DIS physics parameters (override defaults here)
##################################################
##################################################
# Matrix Elements for lepton-hadron collisions
# (by default only neutral-current switched on)
##################################################
cd /Herwig/MatrixElements/
# Neutral current DIS
insert SubProcess:MatrixElements[0] MEDISNC
# Charged current matrix element
insert SubProcess:MatrixElements[0] MEDISCC
##################################################
# NLO IN POWHEG SCHEME
##################################################
###################################################
## Need to use an NLO PDF
###################################################
# set /Herwig/Particles/p+:PDF /Herwig/Partons/HardNLOPDF
# set /Herwig/Particles/pbar-:PDF /Herwig/Partons/HardNLOPDF
# set /Herwig/Partons/Extractor:FirstPDF /Herwig/Partons/HardNLOPDF
#
###################################################
## Setup the POWHEG shower
###################################################
#cd /Herwig/Shower
#set ShowerHandler:HardEmission POWHEG
#read Matchbox/Powheg-Default-ShowerAlphaSTune.in
###################################################
## NLO Matrix Elements for lepton-hadron collisions
## in the POWHEG approach
###################################################
#
#cd /Herwig/MatrixElements/
#
## Neutral current DIS
#insert SubProcess:MatrixElements[0] PowhegMEDISNC
## Charged current matrix element
#insert SubProcess:MatrixElements[0] PowhegMEDISCC
##################################################
# Save run for later usage with 'Herwig run'
##################################################
cd /Herwig/Generators
saverun DIS EventGenerator
diff --git a/src/GammaGamma.in b/src/GammaGamma.in
--- a/src/GammaGamma.in
+++ b/src/GammaGamma.in
@@ -1,65 +1,65 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator based on LEP parameters
# usage: Herwig read LEP.in
##################################################
-read snippets/EEColliderNew.in
+read snippets/EECollider.in
##################################################
# Change the electron/position PDFs
##################################################
set /Herwig/Particles/e+:PDF /Herwig/Partons/WWPDF
set /Herwig/Particles/e-:PDF /Herwig/Partons/WWPDF
set /Herwig/Shower/ShowerHandler:PDFA NULL
set /Herwig/Shower/ShowerHandler:PDFB NULL
##################################################
# Selected the hard process
##################################################
cd /Herwig/MatrixElements
# fermion-antifermion
insert SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEgg2ff
# W+W-
#insert SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEgg2WW
##################################################
# Gamma-Gamma physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set EventGenerator:EventHandler:LuminosityFunction:Energy 500.
cd /Herwig/Generators
##################################################
# Useful analysis handlers for HepMC related output
##################################################
# Schematic overview of an event (requires --with-hepmc to be set at configure time
# and the graphviz program 'dot' to produce a plot)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Plot
# A HepMC dump file (requires --with-hepmc to be set at configure time)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
# set /Herwig/Analysis/HepMCFile:PrintEvent 100
# set /Herwig/Analysis/HepMCFile:Format GenEvent
# set /Herwig/Analysis/HepMCFile:Units GeV_mm
###################################################
# Save run for later usage with 'Herwig run'
##################################################
saverun GammaGamma EventGenerator
##################################################
# uncomment this section for an example batch run
# of two repeats with different parameters
#
# Note that a separate call of 'Herwig run'
# is not required
##################################################
# set EventGenerator:NumberOfEvents 100
# run LEP-Zpole EventGenerator
# set EventGenerator:EventHandler:LuminosityFunction:Energy 208.0
# run LEP-maxE EventGenerator
diff --git a/src/ILC-MSSM.in b/src/ILC-MSSM.in
--- a/src/ILC-MSSM.in
+++ b/src/ILC-MSSM.in
@@ -1,57 +1,57 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator for the MSSM in lepton collisions
# The best way to use this is to make your own
# copy of this file and edit that as you require.
#
# The first section loads the model file which
# does not contain anything that users need to touch.
#
# The second section contains the user settings.
###################################################
-read snippets/EEColliderNew.in
+read snippets/EECollider.in
# Set emission to POWHEG for radiation in decays
set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
read MSSM.model
cd /Herwig/NewPhysics
##################################################
#
# This section contains the user defined settings
#
##################################################
# --- Hard Process ----
# The particle name can be found in the relevant model file
# by searching for its PDG code and noting the text
# '/Herwig/Particles/###' where the hashes denote the name
# Switch to decide whether to include EW diagrams in the
# hard process (On by default)
set HPConstructor:IncludeEW Yes
# Example hard process: incoming leptons outgoing gaugions
insert HPConstructor:Incoming 0 /Herwig/Particles/e+
insert HPConstructor:Incoming 1 /Herwig/Particles/e-
insert HPConstructor:Outgoing 0 /Herwig/Particles/~chi_20
insert HPConstructor:Outgoing 1 /Herwig/Particles/~chi_1+
insert HPConstructor:Outgoing 2 /Herwig/Particles/~chi_2+
insert HPConstructor:Outgoing 3 /Herwig/Particles/~chi_30
# --- Perturbative Decays ---
# Read in the spectrum file and optional decay table.
# If a decay table is in a separate file
# then add another 'setup' line with that
# file as the argument. The provided
# spectrum file is an example using SPheno 2.2.3
setup MSSM/Model CMSSM40.1.1.slha
# Other parameters for run
cd /Herwig/Generators
set EventGenerator:EventHandler:LuminosityFunction:Energy 800.0
saverun ILC-MSSM EventGenerator
diff --git a/src/ILC-MUED.in b/src/ILC-MUED.in
--- a/src/ILC-MUED.in
+++ b/src/ILC-MUED.in
@@ -1,58 +1,58 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator based for MUED in lepton collisions
#
# The best way to use this is to make your own
# copy of this file and edit that as you require.
#
# The first section loads the model file which
# does not contain anything that users need to touch.
#
# The second section contains the user settings.
###################################################
-read snippets/EEColliderNew.in
+read snippets/EECollider.in
# Set emission to POWHEG for radiation in decays
set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
read MUED.model
cd /Herwig/NewPhysics
##################################################
#
# This section contains the user defined settings
#
##################################################
# The UED parameters (these are the default)
set MUED/Model:InverseRadius 300.*GeV
set MUED/Model:LambdaR 20
# --- Hard Process ----
# The particle name can be found in the relevant model file
# by searching for its PDG code and noting the text
# '/Herwig/Particles/###' where the hashes denote the name
# Switch to decide whether to include EW diagrams in the
# hard process (On by default)
set HPConstructor:IncludeEW Yes
# Example hard process: Incoming leptons, outgoing kk bosons and leptons
insert HPConstructor:Incoming 0 /Herwig/Particles/e+
insert HPConstructor:Incoming 1 /Herwig/Particles/e-
insert HPConstructor:Outgoing 0 /Herwig/Particles/KK1_Z0
insert HPConstructor:Outgoing 1 /Herwig/Particles/KK1_W+
insert HPConstructor:Outgoing 2 /Herwig/Particles/KK1_e_L-
insert HPConstructor:Outgoing 3 /Herwig/Particles/KK1_e_R-
# Other parameters for run
cd /Herwig/Generators
set EventGenerator:EventHandler:LuminosityFunction:Energy 800.0
##################################################
# Save run for later usage with 'Herwig run'
##################################################
saverun ILC-MUED EventGenerator
diff --git a/src/ILC-RS.in b/src/ILC-RS.in
--- a/src/ILC-RS.in
+++ b/src/ILC-RS.in
@@ -1,52 +1,52 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator for the Randell-Sundrum model
# in lepton collisions
# The best way to use this is to make your own
# copy of this file and edit that as you require.
#
# The first section loads the model file which
# does not contain anything that users need to touch.
#
# The second section contains the user settings.
###################################################
-read snippets/EEColliderNew.in
+read snippets/EECollider.in
# Set emission to POWHEG for radiation in decays
set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
# read model
read RS.model
cd /Herwig/NewPhysics
##################################################
#
# This section contains the user defined settings
#
##################################################
# Example hard process: Incoming leptons,resonant gravition
insert ResConstructor:Incoming 0 /Herwig/Particles/e-
insert ResConstructor:Incoming 1 /Herwig/Particles/e+
insert ResConstructor:Intermediates 0 /Herwig/Particles/Graviton
insert ResConstructor:Outgoing 0 /Herwig/Particles/e+
insert ResConstructor:Outgoing 0 /Herwig/Particles/W+
insert ResConstructor:Outgoing 0 /Herwig/Particles/Z0
insert ResConstructor:Outgoing 0 /Herwig/Particles/u
insert ResConstructor:Outgoing 0 /Herwig/Particles/t
# coupling
# set RS/Model:Lambda_pi 10000*GeV
# Other parameters for run
cd /Herwig/Generators
set EventGenerator:EventHandler:LuminosityFunction:Energy 800.0
##################################################
# Save run for later usage with 'Herwig run'
##################################################
saverun ILC-RS EventGenerator
diff --git a/src/ILC.in b/src/ILC.in
--- a/src/ILC.in
+++ b/src/ILC.in
@@ -1,79 +1,79 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator based on ILC parameters
# usage: Herwig read ILC.in
#
# Since most parameters are identical to LEP,
# we use the default EventGenerator and adapt only
# for the differences
##################################################
-read snippets/EEColliderNew.in
+read snippets/EECollider.in
##################################################
# Change settings for the ee->Z->qq matrix element
# to produce only top quarks
#
# 'set' lines like this can be omitted if the
# default value is already okay.
#
# Any repository setting can be modified here
##################################################
##################################################
# Selected the hard process
##################################################
cd /Herwig/MatrixElements
# default e+e- > t tbar
insert SubProcess:MatrixElements 0 MEee2gZ2qq
set MEee2gZ2qq:MinimumFlavour 6
set MEee2gZ2qq:MaximumFlavour 6
# e+e- > l+l-
# insert SubProcess:MatrixElements[0] MEee2gZ2ll
# e+e- > W+W- ZZ
# insert SubProcess:MatrixElements[0] MEee2VV
# higgs+Z
# insert SubProcess:MatrixElements[0] MEee2ZH
# higgs+e+e-/nu_enu_ebar via VBF
# insert SubProcess:MatrixElements[0] MEee2HiggsVBF
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
##################################################
# ILC physics parameters (override defaults)
##################################################
set EventGenerator:EventHandler:LuminosityFunction:Energy 500.0
##################################################
# Useful analysis handlers for HepMC related output
##################################################
# Schematic overview of an event (requires --with-hepmc to be set at configure time
# and the graphviz program 'dot' to produce a plot)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Plot
# A HepMC dump file (requires --with-hepmc to be set at configure time)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
# set /Herwig/Analysis/HepMCFile:PrintEvent 100
# set /Herwig/Analysis/HepMCFile:Format GenEvent
# set /Herwig/Analysis/HepMCFile:Units GeV_mm
##################################################
# Save run for later usage with 'Herwig run'
##################################################
saverun ILC EventGenerator
##################################################
# uncomment this section for an example batch run
# of two repeats with different parameters
#
# Note that a separate call of 'Herwig run'
# is not required
##################################################
# set EventGenerator:NumberOfEvents 100
# run ILC-tt EventGenerator
# set /Herwig/MatrixElements/MEee2gZ2qq:MinimumFlavour 5
# set /Herwig/MatrixElements/MEee2gZ2qq:MaximumFlavour 5
# run ILC-bb EventGenerator
diff --git a/src/LEP-Matchbox.in b/src/LEP-Matchbox.in
--- a/src/LEP-Matchbox.in
+++ b/src/LEP-Matchbox.in
@@ -1,144 +1,144 @@
# -*- ThePEG-repository -*-
##################################################
## Herwig/Matchbox example input file
##################################################
##################################################
## Collider type
##################################################
-
-read Matchbox/EECollider.in
+read snippets/Matchbox.in
+read snippets/EECollider.in
##################################################
## Beam energy sqrt(s)
##################################################
cd /Herwig/EventHandlers
set EventHandler:LuminosityFunction:Energy 91.2*GeV
##################################################
## Process selection
##################################################
## Note that event generation may fail if no matching matrix element has
## been found. Coupling orders are with respect to the Born process,
## i.e. NLO QCD does not require an additional power of alphas.
## Model assumptions
read Matchbox/StandardModelLike.in
read Matchbox/DiagonalCKM.in
## Set the order of the couplings
cd /Herwig/MatrixElements/Matchbox
set Factory:OrderInAlphaS 0
set Factory:OrderInAlphaEW 2
## Select the process
## You may use identifiers such as p, pbar, j, l, mu+, h0 etc.
do Factory:Process e- e+ -> j j
## Special settings required for on-shell production of unstable particles
## enable for on-shell top production
# read Matchbox/OnShellTopProduction.in
## enable for on-shell W, Z or h production
# read Matchbox/OnShellWProduction.in
# read Matchbox/OnShellZProduction.in
# read Matchbox/OnShellHProduction.in
##################################################
## Matrix element library selection
##################################################
## Select a generic tree/loop combination or a
## specialized NLO package
# read Matchbox/MadGraph-GoSam.in
# read Matchbox/MadGraph-MadGraph.in
# read Matchbox/MadGraph-NJet.in
# read Matchbox/MadGraph-OpenLoops.in
## Uncomment this to use ggh effective couplings
## currently only supported by MadGraph-GoSam
# read Matchbox/HiggsEffective.in
##################################################
## Cut selection
## See the documentation for more options
##################################################
## cuts on additional jets
# read Matchbox/DefaultEEJets.in
# set NJetsCut:NJetsMin 3
##################################################
## Scale choice
## See the documentation for more options
##################################################
cd /Herwig/MatrixElements/Matchbox
set Factory:ScaleChoice /Herwig/MatrixElements/Matchbox/Scales/SHatScale
##################################################
## Matching and shower selection
##################################################
read Matchbox/MCatNLO-DefaultShower.in
# read Matchbox/Powheg-DefaultShower.in
## use for strict LO/NLO comparisons
# read Matchbox/MCatLO-DefaultShower.in
## use for improved LO showering
# read Matchbox/LO-DefaultShower.in
# read Matchbox/MCatNLO-DipoleShower.in
# read Matchbox/Powheg-DipoleShower.in
## use for strict LO/NLO comparisons
# read Matchbox/MCatLO-DipoleShower.in
## use for improved LO showering
# read Matchbox/LO-DipoleShower.in
# read Matchbox/NLO-NoShower.in
# read Matchbox/LO-NoShower.in
##################################################
## Scale uncertainties
##################################################
# read Matchbox/MuDown.in
# read Matchbox/MuUp.in
##################################################
## Shower scale uncertainties
##################################################
# read Matchbox/MuQDown.in
# read Matchbox/MuQUp.in
##################################################
## Analyses
##################################################
# cd /Herwig/Analysis
# insert Rivet:Analyses 0 XXX_2015_ABC123
# insert /Herwig/Generators/EventGenerator:AnalysisHandlers 0 Rivet
# insert /Herwig/Generators/EventGenerator:AnalysisHandlers 0 HepMC
##################################################
## Do not apply profile scales for LEP as hard
## scale coincides with kinematic limit
##################################################
set /Herwig/Shower/ShowerHandler:HardScaleProfile NULL
set /Herwig/DipoleShower/DipoleShowerHandler:HardScaleProfile NULL
##################################################
## Save the generator
##################################################
do /Herwig/MatrixElements/Matchbox/Factory:ProductionMode
cd /Herwig/Generators
saverun LEP-Matchbox EventGenerator
diff --git a/src/LEP.in b/src/LEP.in
--- a/src/LEP.in
+++ b/src/LEP.in
@@ -1,105 +1,105 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator based on LEP parameters
# usage: Herwig read LEP.in
##################################################
-read snippets/EEColliderNew.in
+read snippets/EECollider.in
##################################################
# Change settings for the ee->Z->qq matrix element
# to avoid producing top quarks
#
# 'set' lines like this can be omitted if the
# default value is already okay.
#
# Any repository setting can be modified here
##################################################
##################################################
# Selected the hard process
##################################################
# leading-order processes
##################################################
cd /Herwig/MatrixElements
# default e+e- > q qbar (5 flavours d,u,s,c,b)
insert SubProcess:MatrixElements 0 MEee2gZ2qq
# e+e- > l+l-
# insert SubProcess:MatrixElements[0] MEee2gZ2ll
# e+e- > W+W- ZZ
# insert SubProcess:MatrixElements[0] MEee2VV
# higgs+Z
# insert SubProcess:MatrixElements[0] MEee2ZH
# higgs+e+e-/nu_enu_ebar via VBF
# insert SubProcess:MatrixElements[0] MEee2HiggsVBF
##################################################
# NLO powheg processes
##################################################
#set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
#read Matchbox/Powheg-Default-ShowerAlphaSTune.in
#insert SubProcess:MatrixElements 0 PowhegMEee2gZ2qq
#insert SubProcess:MatrixElements 0 PowhegMEee2gZ2ll
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set EventGenerator:EventHandler:LuminosityFunction:Energy 91.2
cd /Herwig/Generators
##################################################
# Useful analysis handlers for LEP physics
##################################################
# particle multiplicities
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/LEPMultiplicity
# b multiplicities
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/BMultiplicity
# b fragmentation functions
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/BFrag
# event shapes and single particle spectra
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Shapes
# identified particle spectra
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/LEPIdent
# four jet analysis (needs Fastjet installed)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/LEPFourJet
# general jet analysis (needs Fastjet installed)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/LEPJet
##################################################
# Useful analysis handlers for B-factory physics
##################################################
# BELLE data on charm hadron spetra
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/BELLECharm
# CLEO data on charm meson spectra
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/CLEOCharm
##################################################
# Useful analysis handlers for HepMC related output
##################################################
# Schematic overview of an event (requires --with-hepmc to be set at configure time
# and the graphviz program 'dot' to produce a plot)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Plot
# A HepMC dump file (requires --with-hepmc to be set at configure time)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
# set /Herwig/Analysis/HepMCFile:PrintEvent 100
# set /Herwig/Analysis/HepMCFile:Format GenEvent
# set /Herwig/Analysis/HepMCFile:Units GeV_mm
###################################################
# Save run for later usage with 'Herwig run'
##################################################
saverun LEP EventGenerator
##################################################
# uncomment this section for an example batch run
# of two repeats with different parameters
#
# Note that a separate call of 'Herwig run'
# is not required
##################################################
# set EventGenerator:NumberOfEvents 100
# run LEP-Zpole EventGenerator
# set EventGenerator:EventHandler:LuminosityFunction:Energy 208.0
# run LEP-maxE EventGenerator
diff --git a/src/LHC-ADD.in b/src/LHC-ADD.in
--- a/src/LHC-ADD.in
+++ b/src/LHC-ADD.in
@@ -1,52 +1,52 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator for the Randall-Sundrum model
# in hadron collisions
# The best way to use this is to make your own
# copy of this file and edit that as you require.
#
# The first section loads the model file which
# does not contain anything that users need to touch.
#
# The second section contains the user settings.
###################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
# Set emission to POWHEG for radiation in decays
set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
# read model
read ADD.model
cd /Herwig/NewPhysics
##################################################
#
# This section contains the user defined settings
#
##################################################
# Example hard process: Incoming proton, gravition + jet
insert HPConstructor:Incoming 0 /Herwig/Particles/g
insert HPConstructor:Incoming 0 /Herwig/Particles/u
insert HPConstructor:Incoming 0 /Herwig/Particles/ubar
insert HPConstructor:Incoming 0 /Herwig/Particles/d
insert HPConstructor:Incoming 0 /Herwig/Particles/dbar
insert HPConstructor:Incoming 0 /Herwig/Particles/s
insert HPConstructor:Incoming 0 /Herwig/Particles/sbar
insert HPConstructor:Incoming 0 /Herwig/Particles/c
insert HPConstructor:Incoming 0 /Herwig/Particles/cbar
insert HPConstructor:Outgoing 0 /Herwig/Particles/Graviton
# coupling
set ADD/Model:Delta 2
set ADD/Model:DdPlanckMass 1000.*GeV
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
# Other parameters for run
cd /Herwig/Generators
saverun LHC-ADD EventGenerator
diff --git a/src/LHC-GammaGamma.in b/src/LHC-GammaGamma.in
--- a/src/LHC-GammaGamma.in
+++ b/src/LHC-GammaGamma.in
@@ -1,64 +1,64 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator based on LEP parameters
# usage: Herwig read LEP.in
##################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set EventGenerator:EventHandler:Sampler:Ntry 10000
##################################################
# Choice of phase-space generation for PDFs
##################################################
set /Herwig/Partons/Extractor:FlatSHatY 0
##################################################
# Change the proton PDFs to those for photon radiation
##################################################
set /Herwig/Particles/p+:PDF /Herwig/Partons/BudnevPDF
set /Herwig/Particles/pbar-:PDF /Herwig/Partons/BudnevPDF
set /Herwig/Partons/Extractor:FirstPDF /Herwig/Partons/BudnevPDF
set /Herwig/Partons/Extractor:SecondPDF /Herwig/Partons/BudnevPDF
set /Herwig/Shower/ShowerHandler:PDFA NULL
set /Herwig/Shower/ShowerHandler:PDFB NULL
##################################################
# Cuts
##################################################
cd /Herwig/Cuts
set Cuts:ScaleMin 0.0*GeV
set Cuts:X1Min 0
set Cuts:X2Min 0
set Cuts:X1Max 1.
set Cuts:X2Max 1.
set Cuts:MHatMin 1.*GeV
erase Cuts:MultiCuts 0
set LeptonKtCut:MinKT 3*GeV
##################################################
# Selected the hard process
##################################################
cd /Herwig/MatrixElements
# fermion-antifermion
insert SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEgg2ff
set /Herwig/MatrixElements/MEgg2ff:Process Muon
# W+W-
#insert SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEgg2WW
##################################################
# LHC physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set EventGenerator:EventHandler:CascadeHandler:MPIHandler NULL
###################################################
# Save run for later usage with 'Herwig run'
##################################################
saverun LHC-GammaGamma EventGenerator
diff --git a/src/LHC-LH.in b/src/LHC-LH.in
--- a/src/LHC-LH.in
+++ b/src/LHC-LH.in
@@ -1,61 +1,61 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator for the Little Higgs model
# The best way to use this is to make your own
# copy of this file and edit that as you require.
#
# The first section loads the model file which
# does not contain anything that users need to touch.
#
# The second section contains the user settings.
###################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
# Set emission to POWHEG for radiation in decays
set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
# read model
read LH.model
cd /Herwig/NewPhysics
set LH/Model:f 1*TeV
set LH/Model:VEVRatio 0.01
##################################################
#
# This section contains the user defined settings
#
##################################################
# --- Hard Process ----
# The particle name can be found in the relevant model file
# by searching for its PDG code and noting the text
# '/Herwig/Particles/###' where the hashes denote the name
# Example hard process: Incoming proton, outgoing T quark
set HPConstructor:IncludeEW No
insert HPConstructor:Incoming 0 /Herwig/Particles/g
insert HPConstructor:Incoming 0 /Herwig/Particles/u
insert HPConstructor:Incoming 0 /Herwig/Particles/ubar
insert HPConstructor:Incoming 0 /Herwig/Particles/d
insert HPConstructor:Incoming 0 /Herwig/Particles/dbar
insert HPConstructor:Outgoing 0 /Herwig/Particles/T
# Example hard process: Incoming proton, outgoing leptons via Z_H
insert ResConstructor:Incoming 0 /Herwig/Particles/g
insert ResConstructor:Incoming 0 /Herwig/Particles/u
insert ResConstructor:Incoming 0 /Herwig/Particles/ubar
insert ResConstructor:Incoming 0 /Herwig/Particles/d
insert ResConstructor:Incoming 0 /Herwig/Particles/dbar
insert ResConstructor:Intermediates 0 /Herwig/Particles/Z_H
insert ResConstructor:Outgoing 0 /Herwig/Particles/e-
insert ResConstructor:Outgoing 0 /Herwig/Particles/mu-
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
# Other parameters for run
cd /Herwig/Generators
saverun LHC-LH EventGenerator
diff --git a/src/LHC-LHTP.in b/src/LHC-LHTP.in
--- a/src/LHC-LHTP.in
+++ b/src/LHC-LHTP.in
@@ -1,58 +1,58 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator for the Little Higgs model with
# T-parity
# The best way to use this is to make your own
# copy of this file and edit that as you require.
#
# The first section loads the model file which
# does not contain anything that users need to touch.
#
# The second section contains the user settings.
###################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
# Set emission to POWHEG for radiation in decays
set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
# read model
read LHTP.model
cd /Herwig/NewPhysics
##################################################
#
# This section contains the user defined settings
#
##################################################
# --- Hard Process ----
# The particle name can be found in the relevant model file
# by searching for its PDG code and noting the text
# '/Herwig/Particles/###' where the hashes denote the name
# Switch to decide whether to include EW diagrams in the
# hard process (On by default)
set HPConstructor:IncludeEW No
# Example hard process: Incoming proton, outgoing squarks
insert HPConstructor:Incoming 0 /Herwig/Particles/g
insert HPConstructor:Incoming 0 /Herwig/Particles/u
insert HPConstructor:Incoming 0 /Herwig/Particles/ubar
insert HPConstructor:Incoming 0 /Herwig/Particles/d
insert HPConstructor:Incoming 0 /Herwig/Particles/dbar
insert HPConstructor:Incoming 0 /Herwig/Particles/c
insert HPConstructor:Incoming 0 /Herwig/Particles/cbar
insert HPConstructor:Incoming 0 /Herwig/Particles/s
insert HPConstructor:Incoming 0 /Herwig/Particles/sbar
insert HPConstructor:Incoming 0 /Herwig/Particles/b
insert HPConstructor:Incoming 0 /Herwig/Particles/bbar
insert HPConstructor:Outgoing 0 /Herwig/Particles/TpT
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
# Other parameters for run
cd /Herwig/Generators
saverun LHC-LHTP EventGenerator
diff --git a/src/LHC-LQ.in b/src/LHC-LQ.in
--- a/src/LHC-LQ.in
+++ b/src/LHC-LQ.in
@@ -1,62 +1,62 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator for the Leptoquark model
# in hadron collisions
# The best way to use this is to make your own
# copy of this file and edit that as you require.
#
# The first section loads the model file which
# does not contain anything that users need to touch.
#
# The second section contains the user settings.
###################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
# Set emission to POWHEG for radiation in decays
set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
# read model
read Leptoquark.model
cd /Herwig/NewPhysics
##################################################
#
# This section contains the user defined settings
#
##################################################
# Example hard process: Incoming proton, outgoing leptoquarks
insert HPConstructor:Incoming 0 /Herwig/Particles/u
insert HPConstructor:Incoming 1 /Herwig/Particles/ubar
insert HPConstructor:Incoming 2 /Herwig/Particles/d
insert HPConstructor:Incoming 3 /Herwig/Particles/dbar
insert HPConstructor:Incoming 4 /Herwig/Particles/s
insert HPConstructor:Incoming 5 /Herwig/Particles/sbar
insert HPConstructor:Incoming 6 /Herwig/Particles/c
insert HPConstructor:Incoming 7 /Herwig/Particles/cbar
insert HPConstructor:Incoming 8 /Herwig/Particles/g
insert HPConstructor:Outgoing 0 /Herwig/Particles/S0
insert HPConstructor:Outgoing 1 /Herwig/Particles/S0bar
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
# Cuts
cd /Herwig/Cuts
set JetKtCut:MinKT 0.0*GeV
set Cuts:MHatMax 13000.0*GeV
set Cuts:MHatMin 0.0*GeV
set PhotonKtCut:MinKT 0.0*GeV
set PhotonKtCut:MinEta -10.
set PhotonKtCut:MaxEta 10.
set MassCut:MinM 0.*GeV
# Other parameters for run
cd /Herwig/Generators
saverun LHC-LQ EventGenerator
diff --git a/src/LHC-MB-Soft.in b/src/LHC-MB-Soft.in
--- a/src/LHC-MB-Soft.in
+++ b/src/LHC-MB-Soft.in
@@ -1,234 +1,234 @@
# -*- ThePEG-repository -*-
################################################################################
# This file contains our best tune to UE data from ATLAS at 7 TeV. More recent
# tunes and tunes for other centre-of-mass energies as well as more usage
# instructions can be obtained from this Herwig++ wiki page:
# http://projects.hepforge.org/herwig/trac/wiki/MB_UE_tunes
################################################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
##################################################
# LHC physics parameters (override defaults here)
##################################################
set EventGenerator:EventHandler:LuminosityFunction:Energy 7000.0
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
##################################################
# MEMinBias Matrix Element
##################################################
# MPI model settings
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
## Report the correct cross section
cd /Herwig/Generators
create Herwig::MPIXSecReweighter MPIXSecReweighter
insert EventGenerator:EventHandler:PostSubProcessHandlers 0 MPIXSecReweighter
set EventGenerator:EventHandler:CascadeHandler NULL
clear EventGenerator:EventHandler:SubProcessHandlers[0]
##################################################
# Create separate SubProcessHandler for MinBias
##################################################
cd /Herwig/MatrixElements/
cp SubProcess QCDMinBias
set QCDMinBias:CascadeHandler /Herwig/Shower/ShowerHandler
set QCDMinBias:CascadeHandler:MPIHandler /Herwig/UnderlyingEvent/MPIHandler
set QCDMinBias:DecayHandler /Herwig/Decays/DecayHandler
insert QCDMinBias:MatrixElements[0] MEMinBias
cd /Herwig/Generators
# MinBias parameters used for the new kinematics of soft MPI
set /Herwig/Cuts/MinBiasCuts:X1Min 0.11
set /Herwig/Cuts/MinBiasCuts:X2Min 0.11
set EventGenerator:EventHandler:Cuts /Herwig/Cuts/MinBiasCuts
set /Herwig/Partons/RemnantDecayer:colourDisrupt 0.0
set /Herwig/Hadronization/ColourReconnector:ColourReconnection Yes
# Use multiperipheral kinematics
set /Herwig/Partons/RemnantDecayer:MultiPeriph Yes
# Set ladder multiplicity factor
set /Herwig/Partons/RemnantDecayer:ladderbFactor 0.0
# Set gaussian width of longitudinal momentum fraction
# flucutuation
set /Herwig/Partons/RemnantDecayer:gaussWidth 0.03
# Tuned to min-bias data
set /Herwig/Hadronization/ColourReconnector:ReconnectionProbability 0.445557
set /Herwig/UnderlyingEvent/MPIHandler:pTmin0 3.145333
set /Herwig/UnderlyingEvent/MPIHandler:InvRadius 1.101560
set /Herwig/UnderlyingEvent/MPIHandler:Power 0.709107
set /Herwig/Partons/RemnantDecayer:ladderMult 0.700985
cd /Herwig/MatrixElements/
insert /Herwig/Generators/EventGenerator:EventHandler:SubProcessHandlers[0] QCDMinBias
##################################################
# Create separate SubProcessHandler for Diffraction
##################################################
cd /Herwig/MatrixElements
create Herwig::MEDiffraction MEDiffractionLeft
set MEDiffractionLeft:DiffDirection Left
create Herwig::MEDiffraction MEDiffractionRight
set MEDiffractionRight:DiffDirection Right
create Herwig::MEDiffraction MEDiffractionDouble
set MEDiffractionDouble:DiffDirection Both
create Herwig::MEDiffraction MEDiffractionDeltaLeft
set MEDiffractionDouble:DiffDirection Left
create Herwig::MEDiffraction MEDiffractionDeltaRight
set MEDiffractionDouble:DiffDirection Right
create Herwig::MEDiffraction MEDiffractionDeltaDouble
set MEDiffractionDouble:DiffDirection Both
# Make a parton extractor for diffraction
cd /Herwig/Partons
cp Extractor DiffQCDExtractor
set DiffQCDExtractor:FirstPDF /Herwig/Partons/NoPDF
set DiffQCDExtractor:SecondPDF /Herwig/Partons/NoPDF
cd /Herwig/MatrixElements/
# Create Diffraction SubProcessHandler
cp SubProcess QCDDiffraction
# Assign the PartonExtractor to the SubProcessHandler
set QCDDiffraction:PartonExtractor /Herwig/Partons/DiffQCDExtractor
# Use only Delta as final excited state (Yes/No)
set MEDiffractionLeft:DeltaOnly No
set MEDiffractionRight:DeltaOnly No
set MEDiffractionDouble:DeltaOnly No
set MEDiffractionDeltaLeft:DeltaOnly Yes
set MEDiffractionDeltaRight:DeltaOnly Yes
set MEDiffractionDeltaDouble:DeltaOnly Yes
# Set weight for Diffraction
set MEDiffractionLeft:DiffractionAmplitude 12
set MEDiffractionRight:DiffractionAmplitude 12
set MEDiffractionDouble:DiffractionAmplitude 8
set MEDiffractionDeltaLeft:DiffractionAmplitude 4
set MEDiffractionDeltaRight:DiffractionAmplitude 4
set MEDiffractionDeltaDouble:DiffractionAmplitude 2
# Set soft diffraction paramters
set MEDiffractionLeft:ProtonPomeronSlope 10.1
set MEDiffractionLeft:SoftPomeronIntercept 1.08
set MEDiffractionLeft:SoftPomeronSlope 0.25
set MEDiffractionRight:ProtonPomeronSlope 10.1
set MEDiffractionRight:SoftPomeronIntercept 1.08
set MEDiffractionRight:SoftPomeronSlope 0.25
set MEDiffractionDouble:ProtonPomeronSlope 10.1
set MEDiffractionDouble:SoftPomeronIntercept 1.08
set MEDiffractionDouble:SoftPomeronSlope 0.25
set MEDiffractionDeltaLeft:ProtonPomeronSlope 10.1
set MEDiffractionDeltaLeft:SoftPomeronIntercept 1.08
set MEDiffractionDeltaLeft:SoftPomeronSlope 0.25
set MEDiffractionDeltaRight:ProtonPomeronSlope 10.1
set MEDiffractionDeltaRight:SoftPomeronIntercept 1.08
set MEDiffractionDeltaRight:SoftPomeronSlope 0.25
set MEDiffractionDeltaDouble:ProtonPomeronSlope 10.1
set MEDiffractionDeltaDouble:SoftPomeronIntercept 1.08
set MEDiffractionDeltaDouble:SoftPomeronSlope 0.25
# Set number of clusters for dissociation
set MEDiffractionLeft:DissociationDecay One
set MEDiffractionRight:DissociationDecay One
set MEDiffractionDouble:DissociationDecay One
set MEDiffractionDeltaLeft:DissociationDecay One
set MEDiffractionDeltaRight:DissociationDecay One
set MEDiffractionDeltaDouble:DissociationDecay One
# Insert matrix elements
insert QCDDiffraction:MatrixElements[0] MEDiffractionLeft
insert QCDDiffraction:MatrixElements[0] MEDiffractionRight
insert QCDDiffraction:MatrixElements[0] MEDiffractionDouble
insert QCDDiffraction:MatrixElements[0] MEDiffractionDeltaLeft
insert QCDDiffraction:MatrixElements[0] MEDiffractionDeltaRight
insert QCDDiffraction:MatrixElements[0] MEDiffractionDeltaDouble
# No cluster fission
#set /Herwig/Hadronization/ClusterFissioner:ClMaxLight 3500
set QCDDiffraction:CascadeHandler NULL
set /Herwig/Generators/EventGenerator:EventHandler:CascadeHandler NULL
insert /Herwig/Generators/EventGenerator:EventHandler:SubProcessHandlers[0] QCDDiffraction
##########################################################################
##########################################################################
cd /Herwig/Analysis
create ThePEG::RivetAnalysis RivetAnalysis RivetAnalysis.so
cd /Herwig/Generators
insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 RivetATLAS_2012_I1084540
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1084540
# need to comment for -d1
###insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1356998
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2012_I1181770
#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1084540
#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8591806
#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2014_I1281685
#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2010_S8624100
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8894728
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8994773
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8918562
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I894867
##insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1124167
##insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811
###insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2010_S8656010
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8884919
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8978280
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1091481
#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1193338
##insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1218372
#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_QCD_10_024
set /Herwig/Analysis/Plot:EventNumber 54
cd /Herwig/Generators
insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Plot
#insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
#set /Herwig/Analysis/HepMCFile:PrintEvent 1000000
#set /Herwig/Analysis/HepMCFile:Format GenEvent
#set /Herwig/Analysis/HepMCFile:Units GeV_mm
#set /Herwig/Analysis/HepMCFile:Filename events.fifo
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
saverun LHC-MB-Soft EventGenerator
diff --git a/src/LHC-MB.in b/src/LHC-MB.in
--- a/src/LHC-MB.in
+++ b/src/LHC-MB.in
@@ -1,37 +1,37 @@
# -*- ThePEG-repository -*-
################################################################################
# This file contains our best tune to UE data from ATLAS at 7 TeV. More recent
# tunes and tunes for other centre-of-mass energies as well as more usage
# instructions can be obtained from this Herwig wiki page:
# http://projects.hepforge.org/herwig/trac/wiki/MB_UE_tunes
################################################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
##################################################
# LHC physics parameters (override defaults here)
##################################################
set EventGenerator:EventHandler:LuminosityFunction:Energy 13000.0
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
##################################################
# Matrix Elements for hadron-hadron collisions
##################################################
cd /Herwig/MatrixElements/
insert SubProcess:MatrixElements[0] MEMinBias
# MPI model settings
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
cd /Herwig/Generators
# Change to have no pT cuts for MinBias
set EventGenerator:EventHandler:Cuts /Herwig/Cuts/MinBiasCuts
##################################################
# Save run for later usage with 'Herwig run'
##################################################
saverun LHC-MB EventGenerator
diff --git a/src/LHC-MSSM.in b/src/LHC-MSSM.in
--- a/src/LHC-MSSM.in
+++ b/src/LHC-MSSM.in
@@ -1,73 +1,73 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator for the MSSM
# The best way to use this is to make your own
# copy of this file and edit that as you require.
#
# The first section loads the model file which
# does not contain anything that users need to touch.
#
# The second section contains the user settings.
###################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
# Set emission to POWHEG for radiation in decays
set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
read MSSM.model
cd /Herwig/NewPhysics
##################################################
#
# This section contains the user defined settings
#
##################################################
# --- Hard Process ----
# The particle name can be found in the relevant model file
# by searching for its PDG code and noting the text
# '/Herwig/Particles/###' where the hashes denote the name
# Switch to decide whether to include EW diagrams in the
# hard process (On by default)
set HPConstructor:IncludeEW No
# Example hard process: Incoming proton, outgoing squarks
insert HPConstructor:Incoming 0 /Herwig/Particles/g
insert HPConstructor:Incoming 1 /Herwig/Particles/u
insert HPConstructor:Incoming 2 /Herwig/Particles/ubar
insert HPConstructor:Incoming 3 /Herwig/Particles/d
insert HPConstructor:Incoming 4 /Herwig/Particles/dbar
insert HPConstructor:Outgoing 0 /Herwig/Particles/~u_L
insert HPConstructor:Outgoing 1 /Herwig/Particles/~u_Lbar
insert HPConstructor:Outgoing 2 /Herwig/Particles/~d_L
insert HPConstructor:Outgoing 3 /Herwig/Particles/~d_Lbar
# --- Perturbative Decays ---
# Read in the spectrum file and optional decay table.
# If a decay table is in a separate file
# then add another 'setup' line with that
# file as the argument. The provided
# spectrum file is an example using SPheno 2.2.3
setup MSSM/Model CMSSM40.1.1.slha
# To disable a particular decay mode, add it's tag to the DisableModes
# interface of the DecayConstructor object, i.e.
#insert DecayConstructor:DisableModes 0 ~u_L->~chi_20,u;
#insert DecayConstructor:DisableModes 1 ~chi_20->~e_R-,e+;
# etc ...
# To set a minimum allowed branching fraction (the default is shown)
#set NewModel:MinimumBR 1e-6
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
# Other parameters for run
cd /Herwig/Generators
set EventGenerator:EventHandler:LuminosityFunction:Energy 13000.0
saverun LHC-MSSM EventGenerator
diff --git a/src/LHC-Matchbox.in b/src/LHC-Matchbox.in
--- a/src/LHC-Matchbox.in
+++ b/src/LHC-Matchbox.in
@@ -1,157 +1,157 @@
# -*- ThePEG-repository -*-
##################################################
## Herwig/Matchbox example input file
##################################################
##################################################
## Collider type
##################################################
-
-read Matchbox/PPCollider.in
+read snippets/Matchbox.in
+read snippets/PPCollider.in
##################################################
## Beam energy sqrt(s)
##################################################
cd /Herwig/EventHandlers
set EventHandler:LuminosityFunction:Energy 13000*GeV
##################################################
## Process selection
##################################################
## Note that event generation may fail if no matching matrix element has
## been found. Coupling orders are with respect to the Born process,
## i.e. NLO QCD does not require an additional power of alphas.
## Model assumptions
read Matchbox/StandardModelLike.in
read Matchbox/DiagonalCKM.in
## Set the order of the couplings
cd /Herwig/MatrixElements/Matchbox
set Factory:OrderInAlphaS 0
set Factory:OrderInAlphaEW 2
## Select the process
## You may use identifiers such as p, pbar, j, l, mu+, h0 etc.
do Factory:Process p p -> e+ e-
## Special settings required for on-shell production of unstable particles
## enable for on-shell top production
# read Matchbox/OnShellTopProduction.in
## enable for on-shell W, Z or h production
# read Matchbox/OnShellWProduction.in
# read Matchbox/OnShellZProduction.in
# read Matchbox/OnShellHProduction.in
# Special settings for the VBF approximation
# read Matchbox/VBFDiagramsOnly.in
##################################################
## Matrix element library selection
##################################################
## Select a generic tree/loop combination or a
## specialized NLO package
# read Matchbox/MadGraph-GoSam.in
# read Matchbox/MadGraph-MadGraph.in
# read Matchbox/MadGraph-NJet.in
# read Matchbox/MadGraph-OpenLoops.in
# read Matchbox/HJets.in
# read Matchbox/VBFNLO.in
## Uncomment this to use ggh effective couplings
## currently only supported by MadGraph-GoSam
# read Matchbox/HiggsEffective.in
##################################################
## Cut selection
## See the documentation for more options
##################################################
set /Herwig/Cuts/ChargedLeptonPairMassCut:MinMass 60*GeV
set /Herwig/Cuts/ChargedLeptonPairMassCut:MaxMass 120*GeV
## cuts on additional jets
# read Matchbox/DefaultPPJets.in
# insert JetCuts:JetRegions 0 FirstJet
# insert JetCuts:JetRegions 1 SecondJet
# insert JetCuts:JetRegions 2 ThirdJet
# insert JetCuts:JetRegions 3 FourthJet
##################################################
## Scale choice
## See the documentation for more options
##################################################
cd /Herwig/MatrixElements/Matchbox
set Factory:ScaleChoice /Herwig/MatrixElements/Matchbox/Scales/LeptonPairMassScale
##################################################
## Matching and shower selection
## Please also see flavour scheme settings
## towards the end of the input file.
##################################################
read Matchbox/MCatNLO-DefaultShower.in
# read Matchbox/Powheg-DefaultShower.in
## use for strict LO/NLO comparisons
# read Matchbox/MCatLO-DefaultShower.in
## use for improved LO showering
# read Matchbox/LO-DefaultShower.in
# read Matchbox/MCatNLO-DipoleShower.in
# read Matchbox/Powheg-DipoleShower.in
## use for strict LO/NLO comparisons
# read Matchbox/MCatLO-DipoleShower.in
## use for improved LO showering
# read Matchbox/LO-DipoleShower.in
# read Matchbox/NLO-NoShower.in
# read Matchbox/LO-NoShower.in
##################################################
## Scale uncertainties
##################################################
# read Matchbox/MuDown.in
# read Matchbox/MuUp.in
##################################################
## Shower scale uncertainties
##################################################
# read Matchbox/MuQDown.in
# read Matchbox/MuQUp.in
##################################################
## PDF choice
##################################################
read Matchbox/FiveFlavourScheme.in
## required for dipole shower and fixed order in five flavour scheme
# read Matchbox/FiveFlavourNoBMassScheme.in
read Matchbox/MMHT2014.in
##################################################
## Analyses
##################################################
# cd /Herwig/Analysis
# insert Rivet:Analyses 0 XXX_2015_ABC123
# insert /Herwig/Generators/EventGenerator:AnalysisHandlers 0 Rivet
# insert /Herwig/Generators/EventGenerator:AnalysisHandlers 0 HepMC
##################################################
## Save the generator
##################################################
do /Herwig/MatrixElements/Matchbox/Factory:ProductionMode
cd /Herwig/Generators
saverun LHC-Matchbox EventGenerator
diff --git a/src/LHC-NMSSM.in b/src/LHC-NMSSM.in
--- a/src/LHC-NMSSM.in
+++ b/src/LHC-NMSSM.in
@@ -1,63 +1,63 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator for the NMSSM
# The best way to use this is to make your own
# copy of this file and edit that as you require.
#
# The first section loads the model file which
# does not contain anything that users need to touch.
#
# The second section contains the user settings.
###################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
# Set emission to POWHEG for radiation in decays
set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
# read model
read NMSSM.model
cd /Herwig/NewPhysics
##################################################
#
# This section contains the user defined settings
#
##################################################
# --- Hard Process ----
# The particle name can be found in the relevant model file
# by searching for its PDG code and noting the text
# '/Herwig/Particles/###' where the hashes denote the name
# Switch to decide whether to include EW diagrams in the
# hard process (On by default)
set HPConstructor:IncludeEW No
# Example hard process: Incoming proton, outgoing squarks
insert HPConstructor:Incoming 0 /Herwig/Particles/g
insert HPConstructor:Incoming 1 /Herwig/Particles/u
insert HPConstructor:Incoming 2 /Herwig/Particles/ubar
insert HPConstructor:Incoming 3 /Herwig/Particles/d
insert HPConstructor:Incoming 4 /Herwig/Particles/dbar
insert HPConstructor:Outgoing 0 /Herwig/Particles/~u_L
insert HPConstructor:Outgoing 1 /Herwig/Particles/~u_Lbar
insert HPConstructor:Outgoing 2 /Herwig/Particles/~d_L
insert HPConstructor:Outgoing 3 /Herwig/Particles/~d_Lbar
# --- Perturbative Decays ---
# Read in the spectrum file and optional decay table.
# If a decay table is in a separate file
# then add another 'setup' line with that
# file as the argument. The provided
# spectrum file is an example using NMHDecay-1.2.1
setup NMSSM/Model NMSSM.spc
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
# Other parameters for run
cd /Herwig/Generators
saverun LHC-NMSSM EventGenerator
diff --git a/src/LHC-Powheg.in b/src/LHC-Powheg.in
--- a/src/LHC-Powheg.in
+++ b/src/LHC-Powheg.in
@@ -1,99 +1,99 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator based on LHC parameters
# using NLO matrix elements and matching in
# the Powheg formalism
# usage: Herwig read LHC.in
##################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
##################################################
# Need to use an NLO PDF
##################################################
set /Herwig/Particles/p+:PDF /Herwig/Partons/HardNLOPDF
set /Herwig/Particles/pbar-:PDF /Herwig/Partons/HardNLOPDF
set /Herwig/Shower/ShowerHandler:PDFA /Herwig/Partons/ShowerLOPDF
set /Herwig/Shower/ShowerHandler:PDFB /Herwig/Partons/ShowerLOPDF
set /Herwig/Partons/MPIExtractor:FirstPDF /Herwig/Partons/MPIPDF
set /Herwig/Partons/MPIExtractor:SecondPDF /Herwig/Partons/MPIPDF
set /Herwig/Partons/Extractor:FirstPDF /Herwig/Partons/HardNLOPDF
set /Herwig/Partons/Extractor:SecondPDF /Herwig/Partons/HardNLOPDF
##################################################
# Setup the POWHEG shower
##################################################
cd /Herwig/Shower
set ShowerHandler:HardEmission POWHEG
read Matchbox/Powheg-Default-ShowerAlphaSTune.in
##################################################
# LHC physics parameters (override defaults here)
##################################################
cd /Herwig/Generators
set EventGenerator:EventHandler:LuminosityFunction:Energy 13000.0
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
##################################################
# Matrix Elements for hadron-hadron collisions
# (by default only gamma/Z switched on)
##################################################
cd /Herwig/MatrixElements/
# Drell-Yan Z/gamma
insert SubProcess:MatrixElements[0] PowhegMEqq2gZ2ff
#
# Drell-Yan W
# insert SubProcess:MatrixElements[0] PowhegMEqq2W2ff
# higgs + W (N.B. if considering all W decay modes useful to set )
# (jet pT cut to zero so no cut on W decay products )
# insert SubProcess:MatrixElements[0] PowhegMEPP2WH
# set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
#
# higgs + Z (N.B. if considering all Z decay modes useful to set )
# (jet pT cut to zero so no cut on Z decay products )
# insert SubProcess:MatrixElements[0] PowhegMEPP2ZH
# set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
#
# gg/qqbar -> Higgs
# insert SubProcess:MatrixElements[0] PowhegMEHiggs
#
# Weak boson pair production: WW / ZZ / WZ / W+Z [WpZ] / W-Z [WmZ]
# needs the gauge bosons decayed before the shower
# create Herwig::HwDecayHandler /Herwig/NewPhysics/DecayHandler
# set /Herwig/NewPhysics/DecayHandler:NewStep No
# insert /Herwig/NewPhysics/DecayHandler:Excluded 0 /Herwig/Particles/tau-
# insert /Herwig/NewPhysics/DecayHandler:Excluded 1 /Herwig/Particles/tau+
# insert /Herwig/EventHandlers/LHCHandler:PreCascadeHandlers 0 /Herwig/NewPhysics/DecayHandler
# insert SubProcess:MatrixElements[0] PowhegMEPP2VV
# set PowhegMEPP2VV:Process WpZ
#
# Higgs production via VBF
# insert SubProcess:MatrixElements[0] PowhegMEPP2HiggsVBF
cd /Herwig/Generators
##################################################
# Useful analysis handlers for hadron-hadron physics
##################################################
# analysis of W/Z events
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/DrellYan
##################################################
# Useful analysis handlers for HepMC related output
##################################################
# Schematic overview of an event (requires --with-hepmc to be set at configure time
# and the graphviz program 'dot' to produce a plot)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Plot
# A HepMC dump file (requires --with-hepmc to be set at configure time)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
# set /Herwig/Analysis/HepMCFile:PrintEvent 100
# set /Herwig/Analysis/HepMCFile:Format GenEvent
# set /Herwig/Analysis/HepMCFile:Units GeV_mm
##################################################
# Save run for later usage with 'Herwig run'
##################################################
saverun LHC-Powheg EventGenerator
diff --git a/src/LHC-RPV.in b/src/LHC-RPV.in
--- a/src/LHC-RPV.in
+++ b/src/LHC-RPV.in
@@ -1,82 +1,82 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator for the MSSM
# The best way to use this is to make your own
# copy of this file and edit that as you require.
#
# The first section loads the model file which
# does not contain anything that users need to touch.
#
# The second section contains the user settings.
###################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
# Set emission to POWHEG for radiation in decays
set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
# read model
# trilinear RPV
read RPV-Tri.model
cd /Herwig/NewPhysics
# example with LLE and LQD from SOFTSUSY
#set TwoBodyDC:CreateDecayModes Yes
#set ThreeBodyDC:CreateDecayModes Yes
#set WeakDecayConstructor:CreateDecayModes Yes
#setup RPV/Model RPV-TRI.slha
# example with 4-body UDD decays using input from ISASUSY
set FourBodyDC:CreateDecayModes Yes
insert FourBodyDC:Particles 0 /Herwig/Particles/~tau_1-
setup RPV/Model RPV-UDD.slha
# Bilinear RPV
#read RPV-Bi.model
#cd /Herwig/NewPhysics
#setup RPV/Model RPV-BI.slha
##################################################
#
# This section contains the user defined settings
#
##################################################
# --- Hard Process ----
# The particle name can be found in the relevant model file
# by searching for its PDG code and noting the text
# '/Herwig/Particles/###' where the hashes denote the name
# Switch to decide whether to include EW diagrams in the
# hard process (On by default)
set HPConstructor:IncludeEW No
# Example hard process: Incoming proton, outgoing squarks
insert HPConstructor:Incoming 0 /Herwig/Particles/g
insert HPConstructor:Incoming 1 /Herwig/Particles/u
insert HPConstructor:Incoming 2 /Herwig/Particles/ubar
insert HPConstructor:Incoming 3 /Herwig/Particles/d
insert HPConstructor:Incoming 4 /Herwig/Particles/dbar
insert HPConstructor:Outgoing 0 /Herwig/Particles/~u_L
insert HPConstructor:Outgoing 1 /Herwig/Particles/~u_Lbar
insert HPConstructor:Outgoing 2 /Herwig/Particles/~d_L
insert HPConstructor:Outgoing 3 /Herwig/Particles/~d_Lbar
erase DecayConstructor:NBodyDecayConstructors 0
erase DecayConstructor:NBodyDecayConstructors 1
# To disable a particular decay mode, add it's tag to the DisableModes
# interface of the DecayConstructor object, i.e.
#insert DecayConstructor:DisableModes 0 ~u_L->~chi_20,u;
#insert DecayConstructor:DisableModes 1 ~chi_20->~e_R-,e+;
# etc ...
# To set a minimum allowed branching fraction (the default is shown)
#set NewModel:MinimumBR 1e-6
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
# Other parameters for run
cd /Herwig/Generators
saverun LHC-RPV EventGenerator
diff --git a/src/LHC-RS.in b/src/LHC-RS.in
--- a/src/LHC-RS.in
+++ b/src/LHC-RS.in
@@ -1,51 +1,51 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator for the Randall-Sundrum model
# in hadron collisions
# The best way to use this is to make your own
# copy of this file and edit that as you require.
#
# The first section loads the model file which
# does not contain anything that users need to touch.
#
# The second section contains the user settings.
###################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
# Set emission to POWHEG for radiation in decays
set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
read RS.model
cd /Herwig/NewPhysics
##################################################
#
# This section contains the user defined settings
#
##################################################
# Example hard process: Incoming proton,resonant graviton
insert ResConstructor:Incoming 0 /Herwig/Particles/g
insert ResConstructor:Incoming 0 /Herwig/Particles/u
insert ResConstructor:Incoming 0 /Herwig/Particles/ubar
insert ResConstructor:Incoming 0 /Herwig/Particles/d
insert ResConstructor:Incoming 0 /Herwig/Particles/dbar
insert ResConstructor:Intermediates 0 /Herwig/Particles/Graviton
insert ResConstructor:Outgoing 0 /Herwig/Particles/e+
insert ResConstructor:Outgoing 1 /Herwig/Particles/W+
insert ResConstructor:Outgoing 2 /Herwig/Particles/Z0
insert ResConstructor:Outgoing 3 /Herwig/Particles/gamma
# coupling
set RS/Model:Lambda_pi 10000*GeV
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
# Other parameters for run
cd /Herwig/Generators
saverun LHC-RS EventGenerator
diff --git a/src/LHC-Sextet.in b/src/LHC-Sextet.in
--- a/src/LHC-Sextet.in
+++ b/src/LHC-Sextet.in
@@ -1,107 +1,107 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator for the Sextet model
# in hadron collisions.
# The best way to use this is to make your own
# copy of this file and edit that as you require.
#
# The first section loads the model file which
# does not contain anything that users need to touch.
#
# The second section contains the user settings.
###################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
# Set emission to POWHEG for radiation in decays
set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
# read model
read Sextet.model
cd /Herwig/NewPhysics
##################################################
#
# This section contains the user defined settings
#
##################################################
# Example hard process: Incoming proton, gravition + jet
#insert HPConstructor:Incoming 0 /Herwig/Particles/g
#insert HPConstructor:Incoming 0 /Herwig/Particles/u
#insert HPConstructor:Incoming 0 /Herwig/Particles/ubar
#insert HPConstructor:Incoming 0 /Herwig/Particles/d
#insert HPConstructor:Incoming 0 /Herwig/Particles/dbar
#insert HPConstructor:Incoming 0 /Herwig/Particles/s
#insert HPConstructor:Incoming 0 /Herwig/Particles/sbar
#insert HPConstructor:Incoming 0 /Herwig/Particles/c
#insert HPConstructor:Incoming 0 /Herwig/Particles/cbar
#### Scalar DQ Singlet Y=4/3
insert HPConstructor:Outgoing 0 /Herwig/Particles/DQPhi_1''
do /Herwig/NewPhysics/Sextet/Model:EnableParticles Scalar Singlet Y=4/3
#### Scalar DQ Singlet Y=1/3
insert HPConstructor:Outgoing 0 /Herwig/Particles/DQPhi_1
do /Herwig/NewPhysics/Sextet/Model:EnableParticles Scalar Singlet Y=1/3
#### Scalar DQ Singlet Y=-2/3
insert HPConstructor:Outgoing 0 /Herwig/Particles/DQPhi_1'
do /Herwig/NewPhysics/Sextet/Model:EnableParticles Scalar Singlet Y=-2/3
#### Scalar DQ Triplet Y=1/3
insert HPConstructor:Outgoing 0 /Herwig/Particles/DQPhi_3+
insert HPConstructor:Outgoing 0 /Herwig/Particles/DQPhi_30
insert HPConstructor:Outgoing 0 /Herwig/Particles/DQPhi_3-
do /Herwig/NewPhysics/Sextet/Model:EnableParticles Scalar Triplet Y=1/3
#### Vector DQ Doublet Y=-1/6
insert HPConstructor:Outgoing 0 /Herwig/Particles/DQV_1+
insert HPConstructor:Outgoing 0 /Herwig/Particles/DQV_1-
do /Herwig/NewPhysics/Sextet/Model:EnableParticles Vector Doublet Y=-1/6
#### Vector DQ Doublet Y=-5/6
insert HPConstructor:Outgoing 0 /Herwig/Particles/DQV_2+
insert HPConstructor:Outgoing 0 /Herwig/Particles/DQV_2-
do /Herwig/NewPhysics/Sextet/Model:EnableParticles Vector Doublet Y=5/6
#set HPConstructor:DebugME Yes
# Example hard process: Incoming proton,resonant sextet
insert ResConstructor:Incoming 0 /Herwig/Particles/u
insert ResConstructor:Outgoing 0 /Herwig/Particles/d
insert ResConstructor:Intermediates 0 /Herwig/Particles/DQPhi_1''
#insert ResConstructor:Intermediates 0 /Herwig/Particles/DQV_2+
insert ResConstructor:Outgoing 0 /Herwig/Particles/u
insert ResConstructor:Outgoing 0 /Herwig/Particles/d
#couplings
#1st generation
set Sextet/Model:g1L 0 1.0
set Sextet/Model:g1R 0 1.0
set Sextet/Model:g1RDoublePrime 0 1.0
set Sextet/Model:g1RPrime 0 1.0
set Sextet/Model:g2 0 1.0
set Sextet/Model:g2Prime 0 1.0
set Sextet/Model:g3L 0 1.0
#2nd generation
set Sextet/Model:g1L 1 1.0
set Sextet/Model:g1R 1 1.0
set Sextet/Model:g1RDoublePrime 1 1.0
set Sextet/Model:g1RPrime 1 1.0
set Sextet/Model:g2 1 1.0
set Sextet/Model:g2Prime 1 1.0
set Sextet/Model:g3L 1 1.0
#3rd generation
set Sextet/Model:g1L 2 1.0
set Sextet/Model:g1R 2 1.0
set Sextet/Model:g1RDoublePrime 2 1.0
set Sextet/Model:g1RPrime 2 1.0
set Sextet/Model:g2 2 1.0
set Sextet/Model:g2Prime 2 1.0
set Sextet/Model:g3L 2 1.0
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
# example to set mass
#set /Herwig/Particles/DQPhi_1'':NominalMass 1000.*GeV
# Other parameters for run
cd /Herwig/Generators
saverun LHC-Sextet EventGenerator
\ No newline at end of file
diff --git a/src/LHC-TRP.in b/src/LHC-TRP.in
--- a/src/LHC-TRP.in
+++ b/src/LHC-TRP.in
@@ -1,61 +1,61 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator based on LHC parameters
# usage: Herwig read LHC.in
##################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
cd /Herwig/Particles
create ThePEG::ParticleData graviton
setup graviton 39 graviton 0.0 0.0 0.0 0.0 0 0 0 1
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set EventGenerator:MaxErrors 10000
##################################################
# LHC physics parameters (override defaults here)
##################################################
set EventGenerator:EventHandler:LuminosityFunction:Energy 13000.0
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
cd /Herwig/Cuts
#set JetKtCut:MinKT 100.0*GeV
set Cuts:MHatMin 4500*GeV
##################################################
# Matrix Elements for hadron-hadron collisions
##################################################
cd /Herwig/MatrixElements/
create Herwig::METRP2to2 METransplanck HwTransplanck.so
insert SubProcess:MatrixElements[0] METransplanck
#set METransplanck:Process 6
set METransplanck:NumberExtraDimensions 6
set METransplanck:PlanckMass 1500
cd /Herwig/Generators
##################################################
# Useful analysis handlers for HepMC related output
##################################################
# Schematic overview of an event (requires --with-hepmc to be set at configure time
# and the graphviz program 'dot' to produce a plot)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Plot
# A HepMC dump file (requires --with-hepmc to be set at configure time)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
# set /Herwig/Analysis/HepMCFile:PrintEvent 100
# set /Herwig/Analysis/HepMCFile:Format GenEvent
# set /Herwig/Analysis/HepMCFile:Units GeV_mm
##################################################
# Save run for later usage with 'Herwig run'
##################################################
saverun LHC-TRP EventGenerator
diff --git a/src/LHC-TTBA.in b/src/LHC-TTBA.in
--- a/src/LHC-TTBA.in
+++ b/src/LHC-TTBA.in
@@ -1,89 +1,89 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator for the Leptoquark model
# in hadron collisions
# The best way to use this is to make your own
# copy of this file and edit that as you require.
#
# The first section loads the model file which
# does not contain anything that users need to touch.
#
# The second section contains the user settings.
###################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
# Set emission to POWHEG for radiation in decays
set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
# read model
read TTBA.model
#Set up semi-leptonic (e or mu) top/hadronic topbar
set /Herwig/Particles/t:Synchronized Not_synchronized
set /Herwig/Particles/tbar:Synchronized Not_synchronized
set /Herwig/Particles/t/t->b,bbar,c;:OnOff Off
set /Herwig/Particles/t/t->b,c,dbar;:OnOff Off
set /Herwig/Particles/t/t->b,c,sbar;:OnOff Off
set /Herwig/Particles/t/t->b,sbar,u;:OnOff Off
set /Herwig/Particles/t/t->b,u,dbar;:OnOff Off
set /Herwig/Particles/t/t->nu_e,e+,b;:OnOff On
set /Herwig/Particles/t/t->nu_mu,mu+,b;:OnOff On
set /Herwig/Particles/t/t->nu_tau,tau+,b;:OnOff Off
set /Herwig/Particles/tbar/tbar->b,bbar,cbar;:OnOff On
set /Herwig/Particles/tbar/tbar->bbar,cbar,d;:OnOff On
set /Herwig/Particles/tbar/tbar->bbar,cbar,s;:OnOff On
set /Herwig/Particles/tbar/tbar->bbar,s,ubar;:OnOff On
set /Herwig/Particles/tbar/tbar->bbar,ubar,d;:OnOff On
set /Herwig/Particles/tbar/tbar->nu_ebar,e-,bbar;:OnOff Off
set /Herwig/Particles/tbar/tbar->nu_mubar,mu-,bbar;:OnOff Off
set /Herwig/Particles/tbar/tbar->nu_taubar,tau-,bbar;:OnOff Off
cd /Herwig/Generators
##################################################
# LHC physics parameters (override defaults here)
##################################################
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
##################################################
#
# This section contains the user defined settings
#
##################################################
# Example hard process: Incoming proton, outgoing leptoquarks
cd /Herwig/NewPhysics
set HPConstructor:Processes Exclusive
insert HPConstructor:Incoming 0 /Herwig/Particles/u
insert HPConstructor:Incoming 1 /Herwig/Particles/ubar
insert HPConstructor:Incoming 2 /Herwig/Particles/d
insert HPConstructor:Incoming 3 /Herwig/Particles/dbar
insert HPConstructor:Incoming 4 /Herwig/Particles/s
insert HPConstructor:Incoming 5 /Herwig/Particles/sbar
insert HPConstructor:Incoming 6 /Herwig/Particles/c
insert HPConstructor:Incoming 7 /Herwig/Particles/cbar
insert HPConstructor:Incoming 8 /Herwig/Particles/b
insert HPConstructor:Incoming 9 /Herwig/Particles/bbar
insert HPConstructor:Incoming 10 /Herwig/Particles/g
# Comment out the following line if Axigluon model is selected
insert /Herwig/NewPhysics/HPConstructor:Excluded 0 /Herwig/Particles/Ag
insert HPConstructor:Outgoing 0 /Herwig/Particles/t
insert HPConstructor:Outgoing 1 /Herwig/Particles/tbar
#This is available for comparison to the LO Hw++ result
#cd /Herwig/MatrixElements
#insert SubProcess:MatrixElements[0] MEHeavyQuark
# Other parameters for run
cd /Herwig/Generators
saverun LHC-TTBA EventGenerator
diff --git a/src/LHC-ZP.in b/src/LHC-ZP.in
--- a/src/LHC-ZP.in
+++ b/src/LHC-ZP.in
@@ -1,110 +1,110 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator for the Leptoquark model
# in hadron collisions
# The best way to use this is to make your own
# copy of this file and edit that as you require.
#
# The first section loads the model file which
# does not contain anything that users need to touch.
#
# The second section contains the user settings.
###################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
# Set emission to POWHEG for radiation in decays
set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
# read model
read Zprime.model
set /Herwig/Particles/t:Synchronized Not_synchronized
set /Herwig/Particles/tbar:Synchronized Not_synchronized
#set /Herwig/Particles/t/t->b,bbar,c;:OnOff On
#set /Herwig/Particles/t/t->b,c,dbar;:OnOff On
#set /Herwig/Particles/t/t->b,c,sbar;:OnOff On
#set /Herwig/Particles/t/t->b,sbar,u;:OnOff On
#set /Herwig/Particles/t/t->b,u,dbar;:OnOff On
#set /Herwig/Particles/t/t->nu_e,e+,b;:OnOff Off
#set /Herwig/Particles/t/t->nu_mu,mu+,b;:OnOff Off
#set /Herwig/Particles/t/t->nu_tau,tau+,b;:OnOff Off
#set /Herwig/Particles/tbar/tbar->b,bbar,cbar;:OnOff Off
#set /Herwig/Particles/tbar/tbar->bbar,cbar,d;:OnOff Off
#set /Herwig/Particles/tbar/tbar->bbar,cbar,s;:OnOff Off
#set /Herwig/Particles/tbar/tbar->bbar,s,ubar;:OnOff Off
#set /Herwig/Particles/tbar/tbar->bbar,ubar,d;:OnOff Off
#set /Herwig/Particles/tbar/tbar->nu_ebar,e-,bbar;:OnOff On
#set /Herwig/Particles/tbar/tbar->nu_mubar,mu-,bbar;:OnOff On
#set /Herwig/Particles/tbar/tbar->nu_taubar,tau-,bbar;:OnOff Off
set /Herwig/Particles/t/t->b,bbar,c;:OnOff Off
set /Herwig/Particles/t/t->b,c,dbar;:OnOff Off
set /Herwig/Particles/t/t->b,c,sbar;:OnOff Off
set /Herwig/Particles/t/t->b,sbar,u;:OnOff Off
set /Herwig/Particles/t/t->b,u,dbar;:OnOff Off
set /Herwig/Particles/t/t->nu_e,e+,b;:OnOff On
set /Herwig/Particles/t/t->nu_mu,mu+,b;:OnOff On
set /Herwig/Particles/t/t->nu_tau,tau+,b;:OnOff Off
set /Herwig/Particles/tbar/tbar->b,bbar,cbar;:OnOff On
set /Herwig/Particles/tbar/tbar->bbar,cbar,d;:OnOff On
set /Herwig/Particles/tbar/tbar->bbar,cbar,s;:OnOff On
set /Herwig/Particles/tbar/tbar->bbar,s,ubar;:OnOff On
set /Herwig/Particles/tbar/tbar->bbar,ubar,d;:OnOff On
set /Herwig/Particles/tbar/tbar->nu_ebar,e-,bbar;:OnOff Off
set /Herwig/Particles/tbar/tbar->nu_mubar,mu-,bbar;:OnOff Off
set /Herwig/Particles/tbar/tbar->nu_taubar,tau-,bbar;:OnOff Off
##################################################
#
# This section contains the user defined settings
#
##################################################
# Example hard process: Incoming proton, outgoing leptoquarks
cd /Herwig/NewPhysics
set HPConstructor:Processes Exclusive
insert HPConstructor:Incoming 0 /Herwig/Particles/u
insert HPConstructor:Incoming 1 /Herwig/Particles/ubar
insert HPConstructor:Incoming 2 /Herwig/Particles/d
insert HPConstructor:Incoming 3 /Herwig/Particles/dbar
insert HPConstructor:Incoming 4 /Herwig/Particles/s
insert HPConstructor:Incoming 5 /Herwig/Particles/sbar
insert HPConstructor:Incoming 6 /Herwig/Particles/c
insert HPConstructor:Incoming 7 /Herwig/Particles/cbar
insert HPConstructor:Incoming 8 /Herwig/Particles/g
# Comment out the following line if Axigluon model is selected
insert /Herwig/NewPhysics/HPConstructor:Excluded 0 /Herwig/Particles/g
insert /Herwig/NewPhysics/HPConstructor:Excluded 1 /Herwig/Particles/t
insert /Herwig/NewPhysics/HPConstructor:Excluded 2 /Herwig/Particles/tbar
insert HPConstructor:Outgoing 0 /Herwig/Particles/t
insert HPConstructor:Outgoing 1 /Herwig/Particles/tbar
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
cd /Herwig/Analysis
set Basics:CheckQuark false
# Cuts
cd /Herwig/Cuts
set JetKtCut:MinKT 0.0*GeV
set Cuts:MHatMax 13000.0*GeV
set Cuts:MHatMin 0.0*GeV
set PhotonKtCut:MinKT 0.0*GeV
set PhotonKtCut:MinEta -10.
set PhotonKtCut:MaxEta 10.
set MassCut:MinM 0.*GeV
# Other parameters for run
cd /Herwig/Generators
saverun LHC-ZP EventGenerator
diff --git a/src/LHC-diffractive.in b/src/LHC-diffractive.in
--- a/src/LHC-diffractive.in
+++ b/src/LHC-diffractive.in
@@ -1,100 +1,100 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator based on LHC parameters
# usage: Herwig read LHC-diffractive.in
##################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
##################################################
# LHC physics parameters (override defaults here)
##################################################
set EventGenerator:EventHandler:LuminosityFunction:Energy 13000.0
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
cd /Herwig/Partons
# Set the PDFs for the beams
# This is for double diffractive, comment out either the first or second
# for single diffractive
set Extractor:FirstPDF PomeronFlux
set Extractor:SecondPDF PomeronFlux
## Reggeon Structure Function #################################
# MUST HAVE LHAPDF linked with ThePEG
#create ThePEG::LHAPDF PionPDF ThePEGLHAPDF.so
#set PionPDF:PDFNumber 212
#set PionPDF:PType PionOrVMD
#set PionPDF:RangeException Freeze
#
#create ThePEG::SoftRemnantHandler PionRemnants
#set PionRemnants:RemnantDecayer RemnantDecayer
#set PionPDF:RemnantHandler /Herwig/Partons/PionRemnants
#
#create Herwig::ReggeonPDF ReggeonPDF HwReggeonPDF.so
#set ReggeonPDF:PDF PionPDF
#set ReggeonPDF:RemnantHandler PionRemnants
#set /Herwig/Particles/reggeon:PDF ReggeonPDF
# uncomment to switch pomeron off if only reggeon required
#set /Herwig/Particles/pomeron:PDF NULL
#################################################################
##################################################
# Choice of phase-space generation for PDFs
##################################################
set Extractor:FlatSHatY 0
##################################################
# Cuts
##################################################
cd /Herwig/Cuts
set Cuts:MHatMin 1.
set Cuts:MHatMax 20000
set Cuts:X2Min 1.0e-7
set Cuts:X2Max 1.
set Cuts:X1Min 1.0e-7
set Cuts:X1Max 1.
set JetKtCut:MinKT 10.
set LeptonKtCut:MinKT 1.
##################################################
# Matrix Elements for diffractive collisions
# (by default on QCD 2->2 switched on)
##################################################
cd /Herwig/MatrixElements/
insert SubProcess:MatrixElements[0] /Herwig/UnderlyingEvent/MEQCD2to2Fast
cd /Herwig/Generators
# MPI doesn't work
set EventGenerator:EventHandler:CascadeHandler:MPIHandler NULL
##################################################
# Useful analysis handlers for HepMC related output
##################################################
# Schematic overview of an event (requires --with-hepmc to be set at configure time
# and the graphviz program 'dot' to produce a plot)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Plot
# A HepMC dump file (requires --with-hepmc to be set at configure time)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
# set /Herwig/Analysis/HepMCFile:PrintEvent 100
# set /Herwig/Analysis/HepMCFile:Format GenEvent
# set /Herwig/Analysis/HepMCFile:Units GeV_mm
##################################################
# Save run for later usage with 'Herwig run'
##################################################
saverun LHC-diffractive EventGenerator
diff --git a/src/LHC.in b/src/LHC.in
--- a/src/LHC.in
+++ b/src/LHC.in
@@ -1,147 +1,147 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator based on LHC parameters
# usage: Herwig read LHC.in
##################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
##################################################
# LHC physics parameters (override defaults here)
##################################################
# Intrinsic pT tune extrapolated to LHC energy
set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
########################
## sqrt(s) = 13000 GeV ##
########################
set EventGenerator:EventHandler:LuminosityFunction:Energy 13000.0
##################################################
# Matrix Elements for hadron-hadron collisions
# (by default only gamma/Z switched on)
##################################################
cd /Herwig/MatrixElements/
#
# Electroweak boson W/Z processes
#
# Drell-Yan Z/gamma
insert SubProcess:MatrixElements[0] MEqq2gZ2ff
#
# Drell-Yan W
# insert SubProcess:MatrixElements[0] MEqq2W2ff
#
# W+jet
# insert SubProcess:MatrixElements[0] MEWJet
#
# Z+jet
# insert SubProcess:MatrixElements[0] MEZJet
#
# WW/WZ/ZZ
# insert SubProcess:MatrixElements[0] MEPP2VV
#
# Wgamma/Zgamma
# insert SubProcess:MatrixElements[0] MEPP2VGamma
#
# add QED radiation off W/Z decay products using YFS formalism
# cd /Herwig/EventHandlers
# insert LHCHandler:PostSubProcessHandlers[0] /Herwig/QEDRadiation/QEDRadiationHandler
#
# QCD and gamma processes
#
# QCD 2-2 scattering
# insert SubProcess:MatrixElements[0] MEQCD2to2
#
# gamma+jet
# insert SubProcess:MatrixElements[0] MEGammaJet
#
# gamma-gamma
# insert SubProcess:MatrixElements[0] MEGammaGamma
#
# Heavy quark processes
#
#
# top-antitop production
# insert SubProcess:MatrixElements[0] MEHeavyQuark
#
# single-top
# t-channel
# insert SubProcess:MatrixElements[0] MESingleTopTChannel
# s-channel
# insert SubProcess:MatrixElements[0] MESingleTopSChannel
# tW
# insert SubProcess:MatrixElements[0] MESingleTopTW
#
# Higgs Processes
#
#
# gg/qqbar -> Higgs (recommend including q qbar->Hg as not in ME correction)
# insert SubProcess:MatrixElements[0] MEHiggs
# insert SubProcess:MatrixElements[0] MEHiggsJet
# set MEHiggsJet:Process qqbar
# set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
#
# higgs+jet
# insert SubProcess:MatrixElements[0] MEHiggsJet
#
# higgs + W (N.B. if considering all W decay modes useful to set )
# (jet pT cut to zero so no cut on W decay products )
# insert SubProcess:MatrixElements[0] MEPP2WH
# set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
#
# higgs + Z (N.B. if considering all Z decay modes useful to set )
# (jet pT cut to zero so no cut on Z decay products )
# insert SubProcess:MatrixElements[0] MEPP2ZH
# set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
#
# VBF Higgs
# insert SubProcess:MatrixElements[0] MEPP2HiggsVBF
#
# t tbar Higgs
# insert SubProcess:MatrixElements[0] MEPP2ttbarH
#
# b bbar Higgs
# insert SubProcess:MatrixElements[0] MEPP2bbbarH
cd /Herwig/Generators
##################################################
# Useful analysis handlers for hadron-hadron physics
##################################################
# analysis of W/Z events
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/DrellYan
# analysis of top-antitop events
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/TTbar
# analysis of gamma+jet events
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/GammaJet
# analysis of gamma-gamma events
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/GammaGamma
# analysis of higgs-jet events
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HiggsJet
##################################################
# Useful analysis handlers for HepMC related output
##################################################
# Schematic overview of an event (requires --with-hepmc to be set at configure time
# and the graphviz program 'dot' to produce a plot)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Plot
# A HepMC dump file (requires --with-hepmc to be set at configure time)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
# set /Herwig/Analysis/HepMCFile:PrintEvent 100
# set /Herwig/Analysis/HepMCFile:Format GenEvent
# set /Herwig/Analysis/HepMCFile:Units GeV_mm
##################################################
# Save run for later usage with 'Herwig run'
##################################################
saverun LHC EventGenerator
diff --git a/src/Matchbox/EECollider.in b/src/Matchbox/EECollider.in
deleted file mode 100644
--- a/src/Matchbox/EECollider.in
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- ThePEG-repository -*-
-
-read Matchbox/GenericCollider.in
-
-cd /Herwig/EventHandlers
-
-cd /Herwig/MatrixElements/Matchbox
-
-set Factory:FirstPerturbativePDF No
-set Factory:SecondPerturbativePDF No
-set Factory:PartonExtractor /Herwig/Partons/Extractor
-
-set /Herwig/Merging/MergingFactory:FirstPerturbativePDF No
-set /Herwig/Merging/MergingFactory:SecondPerturbativePDF No
-set /Herwig/Merging/MergingFactory:PartonExtractor /Herwig/Partons/Extractor
-
-cd /Herwig/Cuts
-set Cuts:MHatMin 22.36*GeV
-
diff --git a/src/Matchbox/EPCollider.in b/src/Matchbox/EPCollider.in
deleted file mode 100644
--- a/src/Matchbox/EPCollider.in
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- ThePEG-repository -*-
-
-read Matchbox/GenericCollider.in
-
-cd /Herwig/EventHandlers
-cd /Herwig/MatrixElements/Matchbox
-set Factory:FirstPerturbativePDF No
-set Factory:SecondPerturbativePDF Yes
-set Factory:PartonExtractor /Herwig/Partons/Extractor
-
-set /Herwig/Merging/MergingFactory:FirstPerturbativePDF No
-set /Herwig/Merging/MergingFactory:SecondPerturbativePDF Yes
-set /Herwig/Merging/MergingFactory:PartonExtractor /Herwig/Partons/Extractor
diff --git a/src/Matchbox/GenericCollider.in b/src/Matchbox/GenericCollider.in
deleted file mode 100644
--- a/src/Matchbox/GenericCollider.in
+++ /dev/null
@@ -1,83 +0,0 @@
-# -*- ThePEG-repository -*-
-
-cd /Herwig/Cuts
-
-set Cuts:Fuzzy FuzzyTheta
-set MatchboxJetMatcher:Factory /Herwig/MatrixElements/Matchbox/Factory
-
-insert Cuts:OneCuts[0] PhotonCut
-insert Cuts:OneCuts[1] LeptonCut
-insert Cuts:OneCuts[2] TopQuarkCut
-insert Cuts:OneCuts[3] BottomQuarkCut
-insert Cuts:OneCuts[4] WBosonCut
-insert Cuts:OneCuts[5] ZBosonCut
-insert Cuts:OneCuts[6] HiggsBosonCut
-insert Cuts:OneCuts[7] ChargedLeptonCut
-insert Cuts:TwoCuts[0] LeptonPairMassCut
-insert Cuts:TwoCuts[1] ChargedLeptonPairMassCut
-insert Cuts:TwoCuts[2] LeptonDeltaRCut
-insert Cuts:TwoCuts[3] ChargedLeptonDeltaRCut
-insert Cuts:MultiCuts[0] PhotonIsolationCut
-insert Cuts:MultiCuts[1] MissingPtCut
-
-cd /Herwig/MatrixElements/Matchbox
-
-set MECorrectionHandler:Factory Factory
-set Factory:Cuts /Herwig/Cuts/Cuts
-
-
-
-cd /Herwig/EventHandlers
-
-### EVENT HANDLER STUFF WAS HERE
-set EventHandler:Cuts /Herwig/Cuts/Cuts
-set EventHandler:Sampler /Herwig/Samplers/Sampler
-set EventHandler:Weighted Off
-set EventHandler:CollisionCuts Off
-
-insert EventHandler:SubProcessHandlers[0] /Herwig/MatrixElements/Matchbox/Factory
-
-cd /Herwig/Generators
-
-### EVENT GENERATOR STUFF WAS HERE
-
-cd /Herwig/Particles
-
-set d:NominalMass 0*GeV
-set dbar:NominalMass 0*GeV
-set u:NominalMass 0*GeV
-set ubar:NominalMass 0*GeV
-set s:NominalMass 0*GeV
-set sbar:NominalMass 0*GeV
-
-set c:HardProcessMass 0*GeV
-set cbar:HardProcessMass 0*GeV
-set b:HardProcessMass 0*GeV
-set bbar:HardProcessMass 0*GeV
-
-set e+:HardProcessMass 0*GeV
-set e-:HardProcessMass 0*GeV
-set mu+:HardProcessMass 0*GeV
-set mu-:HardProcessMass 0*GeV
-
-set nu_e:HardProcessMass 0*GeV
-set nu_ebar:HardProcessMass 0*GeV
-set nu_mu:HardProcessMass 0*GeV
-set nu_mubar:HardProcessMass 0*GeV
-set nu_tau:HardProcessMass 0*GeV
-set nu_taubar:HardProcessMass 0*GeV
-
-cd /Herwig/Partons
-
-set /Herwig/Particles/p+:PDF HardNLOPDF
-set /Herwig/Particles/pbar-:PDF HardNLOPDF
-set /Herwig/Partons/QCDExtractor:FirstPDF HardNLOPDF
-set /Herwig/Partons/QCDExtractor:SecondPDF HardNLOPDF
-
-set /Herwig/Shower/ShowerHandler:PDFA ShowerNLOPDF
-set /Herwig/Shower/ShowerHandler:PDFB ShowerNLOPDF
-set /Herwig/DipoleShower/DipoleShowerHandler:PDFA ShowerNLOPDF
-set /Herwig/DipoleShower/DipoleShowerHandler:PDFB ShowerNLOPDF
-
-set /Herwig/Generators/EventGenerator:StandardModelParameters:QCD/RunningAlphaS /Herwig/Couplings/NLOAlphaS
-
diff --git a/src/Matchbox/Makefile.am b/src/Matchbox/Makefile.am
--- a/src/Matchbox/Makefile.am
+++ b/src/Matchbox/Makefile.am
@@ -1,72 +1,68 @@
BUILT_SOURCES = done-all-links
Matchboxdir = ${pkgdatadir}/Matchbox
INPUTFILES = \
DefaultEEJets.in \
DefaultEPJets.in \
DefaultPPJets.in \
-EECollider.in \
-EPCollider.in \
FiveFlavourScheme.in \
FiveFlavourNoBMassScheme.in \
FourFlavourScheme.in \
-GenericCollider.in \
HiggsEffective.in \
HJets.in \
IdentifiedBs.in \
InclusiveDurhamJets.in \
IncreaseVerbosity.in \
LO-DefaultShower.in \
LO-DipoleShower.in \
MCatLO-DefaultShower.in \
MCatLO-DipoleShower.in \
LO.in \
LO-NoShower.in \
MadGraph-MadGraph.in \
GoSam-GoSam.in \
OpenLoops-OpenLoops.in \
MadGraph-GoSam.in \
MadGraph-NJet.in \
NJet-NJet.in \
MadGraph-OpenLoops.in \
MCatNLO-DefaultShower.in \
MCatNLO-DipoleShower.in \
MuDown.in \
MuQDown.in \
MuQUp.in \
MuUp.in \
NLO-NoShower.in \
OnShellHProduction.in \
OnShellWProduction.in \
OnShellZProduction.in \
OnShellTopProduction.in \
Powheg-DefaultShower.in \
Powheg-DipoleShower.in \
Powheg.in \
-PPCollider.in \
PQCDLevel.in \
VBFNLO.in \
VBFNLOPhasespace.in \
VBFDiagramsOnly.in \
MMHT2014.in \
MCatNLO-Default-HardAlphaSTune.in \
MCatNLO-Default-ShowerAlphaSTune.in \
Powheg-Default-HardAlphaSTune.in \
Powheg-Default-ShowerAlphaSTune.in \
MCatNLO-Dipole-HardAlphaSTune.in \
MCatNLO-Dipole-ShowerAlphaSTune.in \
StandardModelLike.in \
DiagonalCKM.in \
NonDiagonalCKM.in
dist_Matchbox_DATA = $(INPUTFILES)
CLEANFILES = done-all-links
done-all-links: $(INPUTFILES)
@echo "Linking input files"
@for i in $(INPUTFILES); do \
if test -f $(srcdir)/$$i -a ! -e $$i; then \
$(LN_S) -f $(srcdir)/$$i; fi; done
@touch done-all-links
diff --git a/src/Matchbox/PPCollider.in b/src/Matchbox/PPCollider.in
deleted file mode 100644
--- a/src/Matchbox/PPCollider.in
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- ThePEG-repository -*-
-
-read Matchbox/GenericCollider.in
-
-cd /Herwig/EventHandlers
-
-cd /Herwig/MatrixElements/Matchbox
-set Factory:FirstPerturbativePDF Yes
-set Factory:SecondPerturbativePDF Yes
-set Factory:PartonExtractor /Herwig/Partons/Extractor
-
-cd /Herwig/Merging
-set MergingFactory:FirstPerturbativePDF Yes
-set MergingFactory:SecondPerturbativePDF Yes
-set MergingFactory:PartonExtractor /Herwig/Partons/Extractor
-
-
-cd /Herwig/Cuts
-
-set Cuts:ScaleMin 2.0*GeV
-set Cuts:X1Min 1.0e-5
-set Cuts:X2Min 1.0e-5
-set Cuts:MHatMin 0.0*GeV
-
-
diff --git a/src/TVT-Powheg.in b/src/TVT-Powheg.in
--- a/src/TVT-Powheg.in
+++ b/src/TVT-Powheg.in
@@ -1,89 +1,89 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator based on Tevatron parameters
# using NLO matrix elements and matching in
# the Powheg formalism
# usage: Herwig read TVT.in
#
# Since most parameters are identical to LHC,
# we use the default EventGenerator and adapt only
# for the differences
##################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
##################################################
# Need to use an NLO PDF
##################################################
set /Herwig/Particles/p+:PDF /Herwig/Partons/HardNLOPDF
set /Herwig/Particles/pbar-:PDF /Herwig/Partons/HardNLOPDF
set /Herwig/Shower/ShowerHandler:PDFA /Herwig/Partons/ShowerLOPDF
set /Herwig/Shower/ShowerHandler:PDFB /Herwig/Partons/ShowerLOPDF
set /Herwig/Partons/MPIExtractor:FirstPDF /Herwig/Partons/MPIPDF
set /Herwig/Partons/MPIExtractor:SecondPDF /Herwig/Partons/MPIPDF
set /Herwig/Partons/Extractor:FirstPDF /Herwig/Partons/HardNLOPDF
set /Herwig/Partons/Extractor:SecondPDF /Herwig/Partons/HardNLOPDF
##################################################
# Setup the POWHEG shower
##################################################
cd /Herwig/Shower
set ShowerHandler:HardEmission POWHEG
read Matchbox/Powheg-Default-ShowerAlphaSTune.in
##################################################
# Tevatron physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set EventGenerator:EventHandler:LuminosityFunction:Energy 2000.0
set EventGenerator:EventHandler:BeamB /Herwig/Particles/pbar-
##################################################
# Matrix Elements for hadron-hadron collisions
# (by default only gamma/Z switched on)
##################################################
cd /Herwig/MatrixElements
# Drell-Yan Z/gamma
insert SubProcess:MatrixElements[0] PowhegMEqq2gZ2ff
# Drell-Yan W
# insert SubProcess:MatrixElements[0] PowhegMEqq2W2ff
# higgs + W (N.B. if considering all W decay modes useful to set )
# (jet pT cut to zero so no cut on W decay products )
# insert SubProcess:MatrixElements[0] PowhegMEPP2WH
# set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
# higgs + Z (N.B. if considering all Z decay modes useful to set )
# (jet pT cut to zero so no cut on Z decay products )
# insert SubProcess:MatrixElements[0] PowhegMEPP2ZH
# set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
# gg/qqbar -> Higgs
# insert SubProcess:MatrixElements[0] PowhegMEHiggs
cd /Herwig/Generators
##################################################
# Useful analysis handlers for hadron-hadron physics
##################################################
# analysis of W/Z events
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/DrellYan
##################################################
# Useful analysis handlers for HepMC related output
##################################################
# Schematic overview of an event (requires --with-hepmc to be set at configure time
# and the graphviz program 'dot' to produce a plot)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Plot
# A HepMC dump file (requires --with-hepmc to be set at configure time)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
# set /Herwig/Analysis/HepMCFile:PrintEvent 100
# set /Herwig/Analysis/HepMCFile:Format GenEvent
# set /Herwig/Analysis/HepMCFile:Units GeV_mm
##################################################
# Save run for later usage with 'Herwig run'
##################################################
saverun TVT-Powheg EventGenerator
diff --git a/src/TVT-TTBA.in b/src/TVT-TTBA.in
--- a/src/TVT-TTBA.in
+++ b/src/TVT-TTBA.in
@@ -1,88 +1,88 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator for the Leptoquark model
# in hadron collisions
# The best way to use this is to make your own
# copy of this file and edit that as you require.
#
# The first section loads the model file which
# does not contain anything that users need to touch.
#
# The second section contains the user settings.
###################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
# Set emission to POWHEG for radiation in decays
set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
# read model
read TTBA.model
#Set up semi-leptonic (e or mu) top/hadronic topbar
set /Herwig/Particles/t:Synchronized Not_synchronized
set /Herwig/Particles/tbar:Synchronized Not_synchronized
set /Herwig/Particles/t/t->b,bbar,c;:OnOff Off
set /Herwig/Particles/t/t->b,c,dbar;:OnOff Off
set /Herwig/Particles/t/t->b,c,sbar;:OnOff Off
set /Herwig/Particles/t/t->b,sbar,u;:OnOff Off
set /Herwig/Particles/t/t->b,u,dbar;:OnOff Off
set /Herwig/Particles/t/t->nu_e,e+,b;:OnOff On
set /Herwig/Particles/t/t->nu_mu,mu+,b;:OnOff On
set /Herwig/Particles/t/t->nu_tau,tau+,b;:OnOff Off
set /Herwig/Particles/tbar/tbar->b,bbar,cbar;:OnOff On
set /Herwig/Particles/tbar/tbar->bbar,cbar,d;:OnOff On
set /Herwig/Particles/tbar/tbar->bbar,cbar,s;:OnOff On
set /Herwig/Particles/tbar/tbar->bbar,s,ubar;:OnOff On
set /Herwig/Particles/tbar/tbar->bbar,ubar,d;:OnOff On
set /Herwig/Particles/tbar/tbar->nu_ebar,e-,bbar;:OnOff Off
set /Herwig/Particles/tbar/tbar->nu_mubar,mu-,bbar;:OnOff Off
set /Herwig/Particles/tbar/tbar->nu_taubar,tau-,bbar;:OnOff Off
cd /Herwig/Generators
set EventGenerator:EventHandler:LuminosityFunction:Energy 1960.0
set EventGenerator:EventHandler:BeamB /Herwig/Particles/pbar-
##################################################
#
# This section contains the user defined settings
#
##################################################
# Example hard process: Incoming proton, outgoing leptoquarks
cd /Herwig/NewPhysics
set HPConstructor:Processes Exclusive
insert HPConstructor:Incoming 0 /Herwig/Particles/u
insert HPConstructor:Incoming 1 /Herwig/Particles/ubar
insert HPConstructor:Incoming 2 /Herwig/Particles/d
insert HPConstructor:Incoming 3 /Herwig/Particles/dbar
insert HPConstructor:Incoming 4 /Herwig/Particles/s
insert HPConstructor:Incoming 5 /Herwig/Particles/sbar
insert HPConstructor:Incoming 6 /Herwig/Particles/c
insert HPConstructor:Incoming 7 /Herwig/Particles/cbar
insert HPConstructor:Incoming 8 /Herwig/Particles/b
insert HPConstructor:Incoming 9 /Herwig/Particles/bbar
insert HPConstructor:Incoming 10 /Herwig/Particles/g
# Comment out the following line if Axigluon model is selected
insert /Herwig/NewPhysics/HPConstructor:Excluded 0 /Herwig/Particles/Ag
insert HPConstructor:Outgoing 0 /Herwig/Particles/t
insert HPConstructor:Outgoing 1 /Herwig/Particles/tbar
#This is available for comparison to the LO Hw++ result
#cd /Herwig/MatrixElements
#insert SubProcess:MatrixElements[0] MEHeavyQuark
cd /Herwig/EventHandlers
#set LHCHandler:CascadeHandler NULL
#set LHCHandler:HadronizationHandler NULL
#set LHCHandler:DecayHandler NULL
# Other parameters for run
cd /Herwig/Generators
saverun TVT-TTBA EventGenerator
diff --git a/src/TVT.in b/src/TVT.in
--- a/src/TVT.in
+++ b/src/TVT.in
@@ -1,146 +1,146 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator based on Tevatron parameters
# usage: Herwig read TVT.in
#
# Since most parameters are identical to LHC,
# we use the default EventGenerator and adapt only
# for the differences
##################################################
-read snippets/PPColliderNew.in
+read snippets/PPCollider.in
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
##################################################
# Tevatron physics parameters (override defaults)
##################################################
set EventGenerator:EventHandler:BeamB /Herwig/Particles/pbar-
########################
## sqrt(s) = 1800 GeV ##
########################
#set EventGenerator:EventHandler:LuminosityFunction:Energy 1800.0 - 1960.0
set EventGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Matrix Elements for hadron-hadron collisions
# (by default only gamma/Z switched on)
##################################################
cd /Herwig/MatrixElements
#
# Electroweak boson W/Z processes
#
# Drell-Yan Z/gamma
insert SubProcess:MatrixElements[0] MEqq2gZ2ff
#
# Drell-Yan W
# insert SubProcess:MatrixElements[0] MEqq2W2ff
#
# W+jet
# insert SubProcess:MatrixElements[0] MEWJet
#
# Z+jet
# insert SubProcess:MatrixElements[0] MEZJet
#
# WW/WZ/ZZ
# insert SubProcess:MatrixElements[0] MEPP2VV
#
# Wgamma/Zgamma
# insert SubProcess:MatrixElements[0] MEPP2VGamma
#
# QCD and gamma processes
#
# QCD 2-2 scattering
# insert SubProcess:MatrixElements[0] MEQCD2to2
#
# gamma+jet
# insert SubProcess:MatrixElements[0] MEGammaJet
#
# gamma-gamma
# insert SubProcess:MatrixElements[0] MEGammaGamma
#
# Heavy quark processes
#
#
# top-antitop production
# insert SubProcess:MatrixElements[0] MEHeavyQuark
#
# single-top
# t-channel
# insert SubProcess:MatrixElements[0] MESingleTopTChannel
# s-channel
# insert SubProcess:MatrixElements[0] MESingleTopSChannel
# tW
#insert SubProcess:MatrixElements[0] MESingleTopTW
#
# Higgs Processes
#
#
# gg/qqbar -> Higgs (recommend including q qbar->Hg as not in ME correction)
# insert SubProcess:MatrixElements[0] MEHiggs
# insert SubProcess:MatrixElements[0] MEHiggsJet
# set MEHiggsJet:Process qqbar
# set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
#
# higgs+jet
# insert SubProcess:MatrixElements[0] MEHiggsJet
#
# higgs + W (N.B. if considering all W decay modes useful to set )
# (jet pT cut to zero so no cut on W decay products )
# insert SubProcess:MatrixElements[0] MEPP2WH
# set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
#
# higgs + Z (N.B. if considering all Z decay modes useful to set )
# (jet pT cut to zero so no cut on Z decay products )
# insert SubProcess:MatrixElements[0] MEPP2ZH
# set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
#
# VBF Higgs
# insert SubProcess:MatrixElements[0] MEPP2HiggsVBF
#
# t tbar Higgs
# insert SubProcess:MatrixElements[0] MEPP2ttbarH
#
# b bbar Higgs
# insert SubProcess:MatrixElements[0] MEPP2bbbarH
cd /Herwig/Generators
##################################################
# Useful analysis handlers for hadron-hadron physics
##################################################
# analysis of W/Z events
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/DrellYan
# analysis of top-antitop events
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/TTbar
# analysis of gamma+jet events
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/GammaJet
# analysis of gamma-gamma events
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/GammaGamma
# analysis of higgs-jet events
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HiggsJet
##################################################
# Useful analysis handlers for HepMC related output
##################################################
# Schematic overview of an event (requires --with-hepmc to be set at configure time
# and the graphviz program 'dot' to produce a plot)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Plot
# A HepMC dump file (requires --with-hepmc to be set at configure time)
# insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
# set /Herwig/Analysis/HepMCFile:PrintEvent 100
# set /Herwig/Analysis/HepMCFile:Format GenEvent
# set /Herwig/Analysis/HepMCFile:Units GeV_mm
##################################################
# Save run for later usage with 'Herwig run'
##################################################
saverun TVT EventGenerator
diff --git a/src/defaults/Cuts.in b/src/defaults/Cuts.in
--- a/src/defaults/Cuts.in
+++ b/src/defaults/Cuts.in
@@ -1,101 +1,113 @@
# -*- ThePEG-repository -*-
###########################################################
# Default cuts (applied to the hard subprocess)
#
# Don't change values here, re-set them in your own input
# files using these as examples.
###########################################################
mkdir /Herwig/Matchers
cd /Herwig/Matchers
create ThePEG::Matcher<Lepton> Lepton
create ThePEG::Matcher<Neutrino> Neutrino
create ThePEG::Matcher<ChargedLepton> ChargedLepton
create ThePEG::Matcher<LightQuark> LightQuark
create ThePEG::Matcher<LightAntiQuark> LightAntiQuark
create ThePEG::Matcher<StandardQCDParton> StandardQCDParton
create ThePEG::Matcher<Photon> Photon
create ThePEG::Matcher<Top> Top
create ThePEG::Matcher<Bottom> Bottom
create ThePEG::Matcher<WBoson> WBoson
create ThePEG::Matcher<ZBoson> ZBoson
create ThePEG::Matcher<HiggsBoson> HiggsBoson
mkdir /Herwig/Cuts
cd /Herwig/Cuts
# cut on jet pt
create ThePEG::SimpleKTCut JetKtCut SimpleKTCut.so
newdef JetKtCut:Matcher /Herwig/Matchers/StandardQCDParton
newdef JetKtCut:MinKT 20.0*GeV
# cut on photon
create ThePEG::SimpleKTCut PhotonKtCut SimpleKTCut.so
newdef PhotonKtCut:Matcher /Herwig/Matchers/Photon
newdef PhotonKtCut:MinKT 20.0*GeV
newdef PhotonKtCut:MinEta -3.
newdef PhotonKtCut:MaxEta 3.
# cut on leptons
create ThePEG::SimpleKTCut LeptonKtCut SimpleKTCut.so
newdef LeptonKtCut:Matcher /Herwig/Matchers/Lepton
newdef LeptonKtCut:MinKT 0.0*GeV
# cut on charged leptons
create ThePEG::SimpleKTCut ChargedLeptonKtCut SimpleKTCut.so
newdef ChargedLeptonKtCut:Matcher /Herwig/Matchers/ChargedLepton
newdef ChargedLeptonKtCut:MinKT 0.0*GeV
# cut on top quarks
create ThePEG::KTRapidityCut TopKtCut KTRapidityCut.so
newdef TopKtCut:Matcher /Herwig/Matchers/Top
newdef TopKtCut:MinKT 0.0*GeV
# cut on W bosons
create ThePEG::KTRapidityCut WBosonKtCut KTRapidityCut.so
newdef WBosonKtCut:Matcher /Herwig/Matchers/WBoson
newdef WBosonKtCut:MinKT 0.0*GeV
# cut on Z bosons
create ThePEG::KTRapidityCut ZBosonKtCut KTRapidityCut.so
newdef ZBosonKtCut:Matcher /Herwig/Matchers/ZBoson
newdef ZBosonKtCut:MinKT 0.0*GeV
# cut on Higgs bosons
create ThePEG::KTRapidityCut HiggsBosonKtCut KTRapidityCut.so
newdef HiggsBosonKtCut:Matcher /Herwig/Matchers/HiggsBoson
newdef HiggsBosonKtCut:MinKT 0.0*GeV
# create a cut on the invariant mass of lepton pairs
create ThePEG::V2LeptonsCut MassCut V2LeptonsCut.so
newdef MassCut:Families All
newdef MassCut:CComb All
newdef MassCut:MinM 20.*GeV
newdef MassCut:MaxM 14000.*GeV
# create a cut on Q^2 for neutral current DIS
create ThePEG::SimpleDISCut NeutralCurrentCut SimpleDISCut.so
newdef NeutralCurrentCut:MinQ2 20.
newdef NeutralCurrentCut:Current Neutral
# create a cut on Q^2 for charged current DIS
create ThePEG::SimpleDISCut ChargedCurrentCut SimpleDISCut.so
newdef ChargedCurrentCut:MinQ2 20.
newdef ChargedCurrentCut:Current Charged
# create a cut of Q^2 for charged current DIS
+# Default Cuts object
+create ThePEG::Cuts Cuts
+newdef /Herwig/Generators/EventGenerator:EventHandler:Cuts /Herwig/Cuts/Cuts
+newdef Cuts:MHatMin 20.*GeV
+
+# insert into hadron cuts (by defaults)
+insert Cuts:OneCuts[0] JetKtCut
+insert Cuts:OneCuts[1] PhotonKtCut
+insert Cuts:OneCuts[2] LeptonKtCut
+insert Cuts:OneCuts[3] TopKtCut
+insert Cuts:OneCuts[4] WBosonKtCut
+insert Cuts:OneCuts[5] ZBosonKtCut
+insert Cuts:OneCuts[6] HiggsBosonKtCut
+insert Cuts:OneCuts[7] ChargedLeptonKtCut
+insert Cuts:MultiCuts[0] MassCut
+
# create diffrent cuts object for MinBias to avoid numerical problems
create ThePEG::Cuts MinBiasCuts
newdef MinBiasCuts:ScaleMin 2.0*GeV
newdef MinBiasCuts:X1Min 0.055
newdef MinBiasCuts:X2Min 0.055
-newdef MinBiasCuts:MHatMin 0.0*GeV
-
-# Default Cuts object
-create ThePEG::Cuts Cuts
-newdef /Herwig/Generators/EventGenerator:EventHandler:Cuts /Herwig/Cuts/Cuts
+newdef MinBiasCuts:MHatMin 0.0*GeV
\ No newline at end of file
diff --git a/src/defaults/HerwigDefaults.in b/src/defaults/HerwigDefaults.in
--- a/src/defaults/HerwigDefaults.in
+++ b/src/defaults/HerwigDefaults.in
@@ -1,166 +1,168 @@
# -*- ThePEG-repository -*-
###################################################################
#
# This is the main repository setup file for Herwig.
#
# It is read using the 'Herwig init' command which prepares the
# default repository file 'HerwigDefaults.rpo'.
#
# The 'Herwig read' step allows additional configuration
# instructions to be read from a run-specific file, to modify the
# default values. (We provide LEP.in, ILC.in, LHC.in and TVT.in as
# examples)
#
# You will not need to change any settings here.
# Any modifications can be made in your own input files.
#
###################################################################
globallibrary Herwig.so
###################################################################
# The repository contains its own internal directory structure to
# keep track of created objects. (This is entirely independent of
# the file system)
###################################################################
globallibrary Herwig.so
# Make the root directory in the Repository
rrmdir /Herwig
mkdir /Herwig
#####################################################################
# The 'create' command creates an object in the repository from
# a C++ class. The arguments are (1) the C++ class name, (2) your
# chosen repository name, and optionally, (3) the library name where
# the class can be found.
#
# Created objects are _not_ automatically associated to a run. They
# need to be assigned to it using a chain of 'set' or 'insert'
# commands (see below).
#####################################################################
# the default random number generator
create ThePEG::StandardRandom /Herwig/Random
# the default phase space sampler
create ThePEG::ACDCSampler /Herwig/ACDCSampler ACDCSampler.so
#####################################################################
# Objects in the repository are influenced through 'interfaces'.
# The most important ones can be found in these files, and the
# doxygen documentation provides complete lists.
#
# To set an interface to a new value, use the 'set' command:
# set object:interface value
#
# Note that only repository names can be used here. You must 'create'
# objects before you can use them in a 'set' command
#####################################################################
newdef /Herwig/ACDCSampler:Margin 1.1
###################################################################
# The 'read' command includes external files in place, to reduce
# clutter. You can also use it for blocks of settings you're likely
# to use again and again.
###################################################################
read Particles.in
read QEDRadiation.in
read Model.in
read Partons.in
read UnderlyingEvent.in
read Shower.in
read MatrixElements.in
read Hadronization.in
read Decays.in
read BSM.in
#######################################################################
# The EventHandler is the most important object in a run. It
# (directly or indirectly) owns most of the objects that have been
# created up to now.
#
# Below we create one handler for LEP and one for LHC.
#
# Try to understand the following few lines (also look at the external
# .in files if you can't find the 'create' line for an object).
#
# If you need to make modifications, it's best to make them in your
# own input file (for the 'Herwig read' step) and not here.
#######################################################################
mkdir /Herwig/EventHandlers
cd /Herwig/EventHandlers
# Create the EventHandler
create ThePEG::StandardEventHandler EventHandler
newdef EventHandler:CascadeHandler /Herwig/Shower/ShowerHandler
newdef EventHandler:HadronizationHandler /Herwig/Hadronization/ClusterHadHandler
newdef EventHandler:DecayHandler /Herwig/Decays/DecayHandler
+newdef EventHandler:Sampler /Herwig/ACDCSampler
+insert EventHandler:SubProcessHandlers[0] /Herwig/MatrixElements/SubProcess
mkdir /Herwig/Generators
cd /Herwig/Generators
#################################################################
# Finally, the EventGenerator objects are responsible
# for the run. They tie together an EventHandler on the one side
# with a physics model (Feynman rules, etc) and random number
# generator on the other.
#
# In your own input files, it will be this EventGenerator object
# that will be called with the 'run' command to start the event
# generation (see LEP.in, LHC.in, TVT.in or LHC.in for examples)
#################################################################
# The Strategy objects can be used for default settings
# (see the Doxygen documentation)
# Currently it only provides the LaTeX reference to Herwig
create Herwig::HerwigStrategy DefaultStrategy
# set DefaultStrategy:LocalParticlesDir /Herwig/Particles
insert DefaultStrategy:DefaultParticlesDirs[0] /Herwig/Particles
# The EventGenerator
create ThePEG::EventGenerator EventGenerator
newdef EventGenerator:RandomNumberGenerator /Herwig/Random
newdef EventGenerator:StandardModelParameters /Herwig/Model
newdef EventGenerator:EventHandler /Herwig/EventHandlers/EventHandler
newdef EventGenerator:Strategy DefaultStrategy
newdef EventGenerator:DumpPeriod -1
newdef EventGenerator:RandomNumberGenerator:Seed 31122001
newdef EventGenerator:DebugLevel 1
newdef EventGenerator:PrintEvent 10
newdef EventGenerator:MaxErrors 10000
newdef EventGenerator:NumberOfEvents 100000000
############################################
# The default cuts
############################################
read Cuts.in
cd /Herwig/Generators
##########################################
# include some default analysis handlers
##########################################
read Analysis.in
##########################################
# setup the matchbox framework
##########################################
read MatchboxDefaults.in
##########################################
# setup the merging framework
##########################################
read MatchboxMergingDefaults.in
##########################################
# setup the dipole shower
##########################################
read DipoleShowerDefaults.in
cd /
diff --git a/src/defaults/Partons.in b/src/defaults/Partons.in
--- a/src/defaults/Partons.in
+++ b/src/defaults/Partons.in
@@ -1,25 +1,26 @@
# -*- ThePEG-repository -*-
mkdir /Herwig/Partons
cd /Herwig/Partons
create ThePEG::NoRemnants NoRemnants
create ThePEG::NoPDF NoPDF
newdef NoPDF:RemnantHandler NoRemnants
create ThePEG::UnResolvedRemnant LeptonRemnants UnResolvedRemnant.so
create Herwig::HwRemDecayer RemnantDecayer HwShower.so
newdef RemnantDecayer:PomeronStructure Gluon
newdef RemnantDecayer:colourDisrupt 0.7983
create ThePEG::SoftRemnantHandler HadronRemnants
newdef HadronRemnants:RemnantDecayer RemnantDecayer
read PDF.in
-
# Make particle extractor
create ThePEG::PartonExtractor Extractor
newdef Extractor:NoPDF NoPDF
+newdef Extractor:FirstPDF HardLOPDF
+newdef Extractor:SecondPDF HardLOPDF
diff --git a/src/snippets/EEColliderNew.in b/src/snippets/EECollider.in
rename from src/snippets/EEColliderNew.in
rename to src/snippets/EECollider.in
--- a/src/snippets/EEColliderNew.in
+++ b/src/snippets/EECollider.in
@@ -1,17 +1,38 @@
# -*- ThePEG-repository -*-
cd /Herwig/EventHandlers
create ThePEG::FixedCMSLuminosity Luminosity FixedCMSLuminosity.so
set EventHandler:LuminosityFunction Luminosity
set Luminosity:Energy 91.2
set EventHandler:BeamA /Herwig/Particles/e-
set EventHandler:BeamB /Herwig/Particles/e+
set /Herwig/Shower/ShowerHandler:MPIHandler NULL
set /Herwig/Shower/PowhegShowerHandler:MPIHandler NULL
set /Herwig/DipoleShower/DipoleShowerHandler:MPIHandler NULL
-insert EventHandler:SubProcessHandlers[0] /Herwig/MatrixElements/SubProcess
-set EventHandler:Sampler /Herwig/ACDCSampler
# create the cuts object for e+e-
set EventHandler:Cuts:MHatMin 22.36*GeV
+clear EventHandler:Cuts:OneCuts
+clear EventHandler:Cuts:TwoCuts
+clear EventHandler:Cuts:MultiCuts
# setting for QED partners in qtilde shower
set /Herwig/Shower/PartnerFinder:QEDPartner IIandFF
+# Erase the PDF for the leptons
+set /Herwig/Partons/Extractor:FirstPDF NULL
+set /Herwig/Partons/Extractor:SecondPDF NULL
+set /Herwig/Shower/ShowerHandler:PDFA NULL
+set /Herwig/Shower/ShowerHandler:PDFB NULL
+set /Herwig/DipoleShower/DipoleShowerHandler:PDFA NULL
+set /Herwig/DipoleShower/DipoleShowerHandler:PDFB NULL
+
+# Matchbox settings
+cd /Herwig/MatrixElements/Matchbox
+
+set Factory:FirstPerturbativePDF No
+set Factory:SecondPerturbativePDF No
+set Factory:PartonExtractor /Herwig/Partons/Extractor
+
+set /Herwig/Merging/MergingFactory:FirstPerturbativePDF No
+set /Herwig/Merging/MergingFactory:SecondPerturbativePDF No
+set /Herwig/Merging/MergingFactory:PartonExtractor /Herwig/Partons/Extractor
+
cd /Herwig/Generators/
+
diff --git a/src/snippets/Matchbox.in b/src/snippets/Matchbox.in
new file mode 100644
--- /dev/null
+++ b/src/snippets/Matchbox.in
@@ -0,0 +1,77 @@
+# -*- ThePEG-repository -*-
+
+cd /Herwig/Cuts
+
+set Cuts:Fuzzy FuzzyTheta
+set MatchboxJetMatcher:Factory /Herwig/MatrixElements/Matchbox/Factory
+
+clear Cuts:OneCuts
+insert Cuts:OneCuts[0] PhotonCut
+insert Cuts:OneCuts[1] LeptonCut
+insert Cuts:OneCuts[2] TopQuarkCut
+insert Cuts:OneCuts[3] BottomQuarkCut
+insert Cuts:OneCuts[4] WBosonCut
+insert Cuts:OneCuts[5] ZBosonCut
+insert Cuts:OneCuts[6] HiggsBosonCut
+insert Cuts:OneCuts[7] ChargedLeptonCut
+clear Cuts:TwoCuts
+insert Cuts:TwoCuts[0] LeptonPairMassCut
+insert Cuts:TwoCuts[1] ChargedLeptonPairMassCut
+insert Cuts:TwoCuts[2] LeptonDeltaRCut
+insert Cuts:TwoCuts[3] ChargedLeptonDeltaRCut
+clear Cuts:MultiCuts
+insert Cuts:MultiCuts[0] PhotonIsolationCut
+insert Cuts:MultiCuts[1] MissingPtCut
+set Cuts:MHatMin 0.0*GeV
+
+cd /Herwig/MatrixElements/Matchbox
+
+set MECorrectionHandler:Factory Factory
+set Factory:Cuts /Herwig/Cuts/Cuts
+
+cd /Herwig/EventHandlers
+
+set EventHandler:Sampler /Herwig/Samplers/Sampler
+set EventHandler:Weighted Off
+set EventHandler:CollisionCuts Off
+set EventHandler:SubProcessHandlers[0] /Herwig/MatrixElements/Matchbox/Factory
+
+cd /Herwig/Particles
+
+set d:NominalMass 0*GeV
+set dbar:NominalMass 0*GeV
+set u:NominalMass 0*GeV
+set ubar:NominalMass 0*GeV
+set s:NominalMass 0*GeV
+set sbar:NominalMass 0*GeV
+
+set c:HardProcessMass 0*GeV
+set cbar:HardProcessMass 0*GeV
+set b:HardProcessMass 0*GeV
+set bbar:HardProcessMass 0*GeV
+
+set e+:HardProcessMass 0*GeV
+set e-:HardProcessMass 0*GeV
+set mu+:HardProcessMass 0*GeV
+set mu-:HardProcessMass 0*GeV
+
+set nu_e:HardProcessMass 0*GeV
+set nu_ebar:HardProcessMass 0*GeV
+set nu_mu:HardProcessMass 0*GeV
+set nu_mubar:HardProcessMass 0*GeV
+set nu_tau:HardProcessMass 0*GeV
+set nu_taubar:HardProcessMass 0*GeV
+
+cd /Herwig/Partons
+
+set /Herwig/Particles/p+:PDF HardNLOPDF
+set /Herwig/Particles/pbar-:PDF HardNLOPDF
+set /Herwig/Partons/Extractor:FirstPDF HardNLOPDF
+set /Herwig/Partons/Extractor:SecondPDF HardNLOPDF
+
+set /Herwig/Shower/ShowerHandler:PDFA ShowerNLOPDF
+set /Herwig/Shower/ShowerHandler:PDFB ShowerNLOPDF
+set /Herwig/DipoleShower/DipoleShowerHandler:PDFA ShowerNLOPDF
+set /Herwig/DipoleShower/DipoleShowerHandler:PDFB ShowerNLOPDF
+
+set /Herwig/Generators/EventGenerator:StandardModelParameters:QCD/RunningAlphaS /Herwig/Couplings/NLOAlphaS
\ No newline at end of file
diff --git a/src/snippets/EPColliderNew.in b/src/snippets/PECollider.in
rename from src/snippets/EPColliderNew.in
rename to src/snippets/PECollider.in
--- a/src/snippets/EPColliderNew.in
+++ b/src/snippets/PECollider.in
@@ -1,35 +1,52 @@
# -*- ThePEG-repository -*-
cd /Herwig/EventHandlers
create ThePEG::LuminosityFunction Luminosity
set EventHandler:BeamA /Herwig/Particles/p+
set Luminosity:BeamEMaxA 920.*GeV
set EventHandler:BeamB /Herwig/Particles/e-
set Luminosity:BeamEMaxB 30.*GeV
set EventHandler:LuminosityFunction Luminosity
set /Herwig/Shower/ShowerHandler:MPIHandler NULL
set /Herwig/Shower/PowhegShowerHandler:MPIHandler NULL
set /Herwig/DipoleShower/DipoleShowerHandler:MPIHandler NULL
-insert EventHandler:SubProcessHandlers[0] /Herwig/MatrixElements/SubProcess
-set EventHandler:Sampler /Herwig/ACDCSampler
-
# cuts for DIS
set EventHandler:Cuts:ScaleMin 1.0*GeV
set EventHandler:Cuts:X1Min 1.0e-5
set EventHandler:Cuts:X2Min 1.0e-5
set EventHandler:Cuts:MHatMin 0.0*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/ChargedCurrentCut:MinW2 0
set /Herwig/Cuts/ChargedCurrentCut:MaxW2 1e10
+clear EventHandler:Cuts:OneCuts
+clear EventHandler:Cuts:TwoCuts
+clear EventHandler:Cuts:MultiCuts
insert EventHandler:Cuts:TwoCuts[0] /Herwig/Cuts/NeutralCurrentCut
insert EventHandler:Cuts:TwoCuts[1] /Herwig/Cuts/ChargedCurrentCut
# switch off final-state electron/muon FSR
do /Herwig/Shower/SplittingGenerator:DeleteFinalSplitting e-->e-,gamma; /Herwig/Shower/LtoLGammaSudakov
do /Herwig/Shower/SplittingGenerator:DeleteFinalSplitting mu-->mu-,gamma; /Herwig/Shower/LtoLGammaSudakov
do /Herwig/Shower/SplittingGenerator:DeleteFinalSplitting tau-->tau-,gamma; /Herwig/Shower/LtoLGammaSudakov
set /Herwig/Shower/KinematicsReconstructor:ReconstructionOption Colour
cd /Herwig/Partons
set Extractor:FlatSHatY 1
-cd /Herwig/Generators/
\ No newline at end of file
+
+# Matchbox settings
+cd /Herwig/MatrixElements/Matchbox
+set Factory:FirstPerturbativePDF Yes
+set Factory:SecondPerturbativePDF No
+set Factory:PartonExtractor /Herwig/Partons/Extractor
+
+set /Herwig/Merging/MergingFactory:FirstPerturbativePDF Yes
+set /Herwig/Merging/MergingFactory:SecondPerturbativePDF No
+set /Herwig/Merging/MergingFactory:PartonExtractor /Herwig/Partons/Extractor
+
+# Erase the PDF for the lepton side (the one from Particle Data object is used)
+set /Herwig/Partons/Extractor:SecondPDF NULL
+set /Herwig/Shower/ShowerHandler:PDFB NULL
+set /Herwig/DipoleShower/DipoleShowerHandler:PDFB NULL
+
+cd /Herwig/Generators/
+
diff --git a/src/snippets/PPColliderNew.in b/src/snippets/PPCollider.in
rename from src/snippets/PPColliderNew.in
rename to src/snippets/PPCollider.in
--- a/src/snippets/PPColliderNew.in
+++ b/src/snippets/PPCollider.in
@@ -1,33 +1,28 @@
# -*- ThePEG-repository -*-
cd /Herwig/EventHandlers
create ThePEG::FixedCMSLuminosity Luminosity FixedCMSLuminosity.so
set Luminosity:Energy 13000.0
set EventHandler:LuminosityFunction Luminosity
set EventHandler:BeamA /Herwig/Particles/p+
set EventHandler:BeamB /Herwig/Particles/p+
-insert EventHandler:SubProcessHandlers[0] /Herwig/MatrixElements/SubProcess
-set EventHandler:Sampler /Herwig/ACDCSampler
-
cd /Herwig/Cuts
# create the cuts object for hadron collisions
set Cuts:ScaleMin 2.0*GeV
set Cuts:X1Min 1.0e-5
set Cuts:X2Min 1.0e-5
-set Cuts:MHatMin 20.*GeV
-# insert into hadron cuts
-insert Cuts:OneCuts[0] JetKtCut
-insert Cuts:OneCuts[1] PhotonKtCut
-insert Cuts:OneCuts[2] LeptonKtCut
-insert Cuts:OneCuts[3] TopKtCut
-insert Cuts:OneCuts[4] WBosonKtCut
-insert Cuts:OneCuts[5] ZBosonKtCut
-insert Cuts:OneCuts[6] HiggsBosonKtCut
-insert Cuts:OneCuts[7] ChargedLeptonKtCut
-insert Cuts:MultiCuts[0] MassCut
-
cd /Herwig/Partons
set Extractor:FlatSHatY 1
-set Extractor:FirstPDF HardLOPDF
-set Extractor:SecondPDF HardLOPDF
-cd /Herwig/Generators/
\ No newline at end of file
+
+# Matchbox settings
+cd /Herwig/MatrixElements/Matchbox
+set Factory:FirstPerturbativePDF Yes
+set Factory:SecondPerturbativePDF Yes
+set Factory:PartonExtractor /Herwig/Partons/Extractor
+
+cd /Herwig/Merging
+set MergingFactory:FirstPerturbativePDF Yes
+set MergingFactory:SecondPerturbativePDF Yes
+set MergingFactory:PartonExtractor /Herwig/Partons/Extractor
+
+cd /Herwig/Generators/