Page MenuHomeHEPForge
Files F7879191

No OneTemporary
Actions

View Options

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -1,57 +1,57 @@
\.svn/.*
.*/Makefile
.*/Makefile\.in
.*/\.deps
.*/\.libs
.*/.*\.l[ao]
.*/.*\.so\.*
.*/.*\.o
.*~
.*\.tar\.(gz|bz2)
autom4te.cache
config.herwig
config.log
config.status
configure
include/Herwig\+\+
Config/config.guess
Config/config.h
Config/config.h.in
Config/config.sub
Config/depcomp
Config/install-sh
Config/missing
Config/stamp-h1
Config/ar-lib
Contrib/make_makefiles.sh
Doc/HerwigDefaults.in
Doc/fixinterfaces.pl
Doc/refman.conf
Doc/refman.h
(src|Utilities)/version.tmp
(src|Utilities)/version.tmp.new
INSTALL
Makefile
Makefile.in
Utilities/versionstring.h
aclocal.m4
confdefs.h
conftest.c
conftest.err
include/done-all-links
libtool
src/herwigopts.h
src/herwigopts.c
src/defaults/Analysis.in
src/herwig-config
src/.*\.(run|tex|out|log|rpo|spc|top|dump|dot|aux|pdf|ps|png|svg|hepmc)
lib/done-all-links
src/Herwig\+\+
src/defaults/PDF.in
src/defaults/done-all-links
src/versionstring.h
src/tune
src/tests/.*\.(time|mult|Bmult|chisq)
Tests/.*/.*\.(top|ps|pyc|info|dat|pdf|png)
-Tests/.*\.(top|run|tex|mult|Bmult|aida)
+Tests/.*\.(top|run|tex|mult|Bmult|aida|yoda)
Tests/.*index.html
diff --git a/Tests/Makefile.am b/Tests/Makefile.am
--- a/Tests/Makefile.am
+++ b/Tests/Makefile.am
@@ -1,294 +1,297 @@
AUTOMAKE_OPTIONS = -Wno-portability
AM_LDFLAGS += -module -avoid-version -rpath /dummy/path/not/used
EXTRA_DIST = Inputs python Rivet
dist-hook:
rm -rf $(distdir)/Inputs/.svn
rm -rf $(distdir)/python/.svn
rm -rf $(distdir)/Rivet/.svn
EXTRA_LTLIBRARIES = LeptonTest.la GammaTest.la HadronTest.la DISTest.la
if WANT_LIBFASTJET
EXTRA_LTLIBRARIES += HadronJetTest.la LeptonJetTest.la
HadronJetTest_la_SOURCES = \
Hadron/VHTest.h Hadron/VHTest.cc\
Hadron/VTest.h Hadron/VTest.cc\
Hadron/HTest.h Hadron/HTest.cc
HadronJetTest_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
-I$(FASTJETPATH)
HadronJetTest_la_LIBADD = $(FASTJETLIBS)
LeptonJetTest_la_SOURCES = \
Lepton/TopDecay.h Lepton/TopDecay.cc
LeptonJetTest_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
-I$(FASTJETPATH)
LeptonJetTest_la_LIBADD = $(FASTJETLIBS)
endif
LeptonTest_la_SOURCES = \
Lepton/VVTest.h Lepton/VVTest.cc \
Lepton/VBFTest.h Lepton/VBFTest.cc \
Lepton/VHTest.h Lepton/VHTest.cc \
Lepton/FermionTest.h Lepton/FermionTest.cc
GammaTest_la_SOURCES = \
Gamma/GammaMETest.h Gamma/GammaMETest.cc \
Gamma/GammaPMETest.h Gamma/GammaPMETest.cc
DISTest_la_SOURCES = \
DIS/DISTest.h DIS/DISTest.cc
HadronTest_la_SOURCES = \
Hadron/HadronVVTest.h Hadron/HadronVVTest.cc\
Hadron/HadronVBFTest.h Hadron/HadronVBFTest.cc\
Hadron/WHTest.h Hadron/WHTest.cc\
Hadron/ZHTest.h Hadron/ZHTest.cc\
Hadron/VGammaTest.h Hadron/VGammaTest.cc\
Hadron/ZJetTest.h Hadron/ZJetTest.cc\
Hadron/WJetTest.h Hadron/WJetTest.cc\
Hadron/QQHTest.h Hadron/QQHTest.cc
REPO = $(top_builddir)/src/HerwigDefaults.rpo
HERWIG = $(top_builddir)/src/Herwig++
HWREAD = $(HERWIG) read -r $(REPO) -L $(builddir)/.libs
HWRUN = $(HERWIG) run
tests : tests-LEP tests-DIS tests-LHC tests-Gamma
if WANT_LIBFASTJET
tests-LEP : test-LEP-VV test-LEP-VH test-LEP-VBF test-LEP-BB test-LEP-Quarks test-LEP-Leptons \
test-LEP-default test-LEP-Powheg test-LEP-TopDecay
else
tests-LEP : test-LEP-VV test-LEP-VH test-LEP-VBF test-LEP-BB test-LEP-Quarks test-LEP-Leptons
endif
tests-DIS : test-DIS-Charged test-DIS-Neutral
if WANT_LIBFASTJET
tests-LHC : test-LHC-WW test-LHC-WZ test-LHC-ZZ test-LHC-ZGamma test-LHC-WGamma \
test-LHC-ZH test-LHC-WH test-LHC-ZJet test-LHC-WJet test-LHC-Z test-LHC-W test-LHC-ZZVBF test-LHC-VBF \
test-LHC-WWVBF test-LHC-bbH test-LHC-ttH test-LHC-GammaGamma test-LHC-GammaJet test-LHC-Higgs \
test-LHC-HiggsJet test-LHC-QCDFast test-LHC-QCD test-LHC-Top test-LHC-Bottom \
test-LHC-WHJet test-LHC-ZHJet test-LHC-HJet test-LHC-ZShower test-LHC-WShower\
test-LHC-WHJet-Powheg test-LHC-ZHJet-Powheg test-LHC-HJet-Powheg \
test-LHC-ZShower-Powheg test-LHC-WShower-Powheg
else
tests-LHC : test-LHC-WW test-LHC-WZ test-LHC-ZZ test-LHC-ZGamma test-LHC-WGamma \
test-LHC-ZH test-LHC-WH test-LHC-ZJet test-LHC-WJet test-LHC-Z test-LHC-W test-LHC-ZZVBF test-LHC-VBF \
test-LHC-WWVBF test-LHC-bbH test-LHC-ttH test-LHC-GammaGamma test-LHC-GammaJet test-LHC-Higgs \
test-LHC-HiggsJet test-LHC-QCDFast test-LHC-QCD test-LHC-Top
endif
tests-Gamma : test-Gamma-FF test-Gamma-WW test-Gamma-P
if WANT_LIBFASTJET
test-LEP-% : Inputs/LEP-%.in LeptonTest.la LeptonJetTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
else
test-LEP-% : Inputs/LEP-%.in LeptonTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
endif
Rivet-LEP-% : Rivet/LEP-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-BFactory-% : Rivet/BFactory-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-TVT-% : Rivet/TVT-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-DIS-% : Rivet/DIS-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-LHC-% : Rivet/LHC-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-Star-% : Rivet/Star-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-SppS-% : Rivet/SppS-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-ISR-% : Rivet/ISR-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-LEP: Rivet-LEP-22 Rivet-LEP-35 Rivet-LEP-44 Rivet-LEP-91 \
Rivet-LEP-130 Rivet-LEP-133 Rivet-LEP-136 Rivet-LEP-161 \
Rivet-LEP-172 Rivet-LEP-177 Rivet-LEP-183 Rivet-LEP-189 \
Rivet-LEP-192 Rivet-LEP-196 Rivet-LEP-197 Rivet-LEP-200 \
Rivet-LEP-202 Rivet-LEP-206 Rivet-LEP-14 Rivet-LEP-10\
Rivet-LEP-Powheg-14 Rivet-LEP-Powheg-22 \
Rivet-LEP-Powheg-35 Rivet-LEP-Powheg-44 \
Rivet-LEP-Powheg-91 Rivet-LEP-Powheg-130 \
Rivet-LEP-Powheg-133 Rivet-LEP-Powheg-136 \
Rivet-LEP-Powheg-161 Rivet-LEP-Powheg-172 \
Rivet-LEP-Powheg-177 Rivet-LEP-Powheg-183 \
Rivet-LEP-Powheg-189 Rivet-LEP-Powheg-192 \
Rivet-LEP-Powheg-196 Rivet-LEP-Powheg-197 \
Rivet-LEP-Powheg-200 Rivet-LEP-Powheg-202 \
Rivet-LEP-Powheg-206 Rivet-LEP-Powheg-10
for i in LEP-*.aida; do rivet-rmgaps $$i; done;
rm -rf Rivet-LEP
python/merge-LEP LEP
python/merge-LEP LEP-Powheg
rivet-mkhtml -o Rivet-LEP LEP.aida:Hw++ LEP-Powheg.aida:Hw++-Powheg
Rivet-BFactory: Rivet-BFactory-10.52 Rivet-BFactory-Powheg-10.52 \
Rivet-BFactory-10.52-sym Rivet-BFactory-Powheg-10.52-sym \
Rivet-BFactory-10.54 Rivet-BFactory-Powheg-10.54 \
Rivet-BFactory-10.45 Rivet-BFactory-Powheg-10.45 \
Rivet-BFactory-10.58 Rivet-BFactory-Powheg-10.58 \
Rivet-BFactory-Upsilon Rivet-BFactory-Upsilon2 Rivet-BFactory-Upsilon4 \
Rivet-BFactory-Tau
for i in BFactory-*.aida; do rivet-rmgaps $$i; done;
rm -rf Rivet-BFactory
python/merge-BFactory BFactory
python/merge-BFactory BFactory-Powheg
rivet-mkhtml -o Rivet-BFactory BFactory.aida:Hw++ BFactory-Powheg.aida:Hw++-Powheg
Rivet-DIS: Rivet-DIS-e--LowQ2 \
Rivet-DIS-e+-LowQ2 Rivet-DIS-e+-HighQ2\
Rivet-DIS-Powheg-e--LowQ2 \
Rivet-DIS-Powheg-e+-LowQ2 Rivet-DIS-Powheg-e+-HighQ2\
Rivet-DIS-NoME-e--LowQ2 \
Rivet-DIS-NoME-e+-LowQ2 Rivet-DIS-NoME-e+-HighQ2
rivet-rmgaps DIS-e+-LowQ2.aida
rivet-rmgaps DIS-e--LowQ2.aida
rivet-rmgaps DIS-e+-HighQ2.aida
rivet-rmgaps DIS-Powheg-e+-LowQ2.aida
rivet-rmgaps DIS-Powheg-e--LowQ2.aida
rivet-rmgaps DIS-Powheg-e+-HighQ2.aida
rivet-rmgaps DIS-NoME-e+-LowQ2.aida
rivet-rmgaps DIS-NoME-e--LowQ2.aida
rivet-rmgaps DIS-NoME-e+-HighQ2.aida
python/merge-DIS DIS
python/merge-DIS DIS-Powheg
python/merge-DIS DIS-NoME
rivet-mkhtml -o Rivet-DIS DIS.aida:Hw++ DIS-Powheg.aida:Hw++-Powheg DIS-NoME.aida:Hw++-NoME
Rivet-TVT-WZ: Rivet-TVT-Run-I-Z Rivet-TVT-Powheg-Run-I-Z \
Rivet-TVT-Run-I-W Rivet-TVT-Powheg-Run-I-W \
Rivet-TVT-Run-I-WZ Rivet-TVT-Powheg-Run-I-WZ\
Rivet-TVT-Run-II-Z-e Rivet-TVT-Powheg-Run-II-Z-e \
Rivet-TVT-Run-II-Z-mu Rivet-TVT-Powheg-Run-II-Z-mu \
Rivet-TVT-Run-II-W Rivet-TVT-Powheg-Run-II-W
rivet-rmgaps TVT-Run-II-Z-e.aida;
rivet-rmgaps TVT-Powheg-Run-II-Z-e.aida;
rm -rf Rivet-TVT-WZ
python/merge-TVT-EW TVT-Run-II-W.aida TVT-Run-II-Z-{e,mu}.aida\
TVT-Run-I-{W,Z,WZ}.aida -o TVT-WZ.aida
python/merge-TVT-EW TVT-Powheg-Run-II-W.aida TVT-Powheg-Run-II-Z-{e,mu}.aida\
TVT-Powheg-Run-I-{W,Z,WZ}.aida -o TVT-Powheg-WZ.aida
rivet-mkhtml -o Rivet-TVT-WZ TVT-WZ.aida:Hw++ TVT-Powheg-WZ.aida:Hw++-Powheg
Rivet-TVT-Photon: Rivet-TVT-Run-II-DiPhoton Rivet-TVT-Run-II-PromptPhoton
# Rivet-TVT-Run-I-PromptPhoton
rm -rf Rivet-TVT-Photon
python/merge-aida TVT-Run-II-DiPhoton.aida TVT-Run-II-PromptPhoton.aida\
-o TVT-Photon.aida
rivet-mkhtml -o Rivet-TVT-Photon TVT-Photon.aida:Hw++
Rivet-TVT-Jets: Rivet-TVT-Run-II-Jets-1 Rivet-TVT-Run-II-Jets-2 \
Rivet-TVT-Run-II-Jets-3 Rivet-TVT-Run-II-Jets-4 \
Rivet-TVT-Run-II-Jets-5 Rivet-TVT-Run-II-Jets-6 \
Rivet-TVT-Run-II-Jets-7 Rivet-TVT-Run-II-Jets-8 \
Rivet-TVT-Run-II-Jets-9 Rivet-TVT-Run-II-Jets-10\
Rivet-TVT-Run-II-Jets-11 Rivet-TVT-Run-II-UE \
Rivet-TVT-Run-I-Jets-1 Rivet-TVT-Run-I-Jets-2 \
Rivet-TVT-Run-I-Jets-3 Rivet-TVT-Run-I-Jets-4 \
Rivet-TVT-Run-I-Jets-5 Rivet-TVT-Run-I-Jets-6 \
Rivet-TVT-Run-I-Jets-7 Rivet-TVT-Run-I-Jets-8\
Rivet-TVT-Run-I-UE\
Rivet-TVT-630-UE Rivet-TVT-630-Jets-1 \
Rivet-TVT-630-Jets-2 Rivet-TVT-630-Jets-3
rivet-rmgaps TVT-Run-I-Jets-4.aida
rm -rf Rivet-TVT-Jets
python/merge-TVT-Jets TVT
rivet-mkhtml -o Rivet-TVT-Jets TVT-Jets.aida:Hw++
Rivet-LHC-Jets: Rivet-LHC-7-Jets-0 Rivet-LHC-7-Jets-1 Rivet-LHC-7-Jets-2 \
Rivet-LHC-7-Jets-3 Rivet-LHC-7-Jets-4 \
Rivet-LHC-7-Jets-5 Rivet-LHC-7-Jets-6 \
Rivet-LHC-7-Jets-7 Rivet-LHC-7-Jets-8 \
Rivet-LHC-7-Jets-9 Rivet-LHC-7-Jets-10 \
Rivet-LHC-7-Jets-11 Rivet-LHC-7-Jets-12 \
Rivet-LHC-7-Jets-13 Rivet-LHC-7-UE \
Rivet-LHC-2360-UE Rivet-LHC-900-UE \
Rivet-LHC-7-Heavy-1 Rivet-LHC-7-Heavy-2 \
Rivet-LHC-7-Heavy-3 Rivet-LHC-7-Heavy-4 \
Rivet-LHC-7-Heavy-5 Rivet-LHC-7-Top \
Rivet-LHC-7-UE-Long Rivet-LHC-900-UE-Long \
Rivet-LHC-7-Jets-All-1 Rivet-LHC-7-Jets-All-2
rm -rf Rivet-LHC-Jets
python/merge-LHC-Jets
rivet-mkhtml -o Rivet-LHC-Jets LHC-Jets.aida:Hw++
Rivet-Star: Rivet-Star-UE Rivet-Star-Jets-1 \
Rivet-Star-Jets-2 Rivet-Star-Jets-3 \
Rivet-Star-Jets-4
rm -rf Rivet-Star
rivet-rmgaps Star-UE.aida
python/merge-Star Star
rivet-mkhtml -o Rivet-Star Star.aida
Rivet-SppS: Rivet-ISR-44-UE Rivet-ISR-63-UE \
Rivet-SppS-63-UE Rivet-ISR-30-UE \
Rivet-ISR-53-UE Rivet-SppS-200-UE \
Rivet-SppS-500-UE Rivet-SppS-900-UE \
Rivet-SppS-546-UE Rivet-SppS-53-UE
rm -rf Rivet-SppS
python/merge-aida ISR-44-UE.aida ISR-63-UE.aida SppS-63-UE.aida ISR-30-UE.aida \
ISR-53-UE.aida SppS-200-UE.aida SppS-500-UE.aida SppS-900-UE.aida \
SppS-546-UE.aida SppS-53-UE.aida -o SppS.aida
rivet-mkhtml -o Rivet-SppS SppS.aida
Rivet-LHC-EW: Rivet-LHC-W-e Rivet-LHC-Powheg-W-e \
Rivet-LHC-W-mu Rivet-LHC-Powheg-W-mu \
Rivet-LHC-Z-e Rivet-LHC-Powheg-Z-e \
Rivet-LHC-Z-mu Rivet-LHC-Powheg-Z-mu \
Rivet-LHC-WW Rivet-LHC-Powheg-WW\
Rivet-LHC-ZZ Rivet-LHC-Powheg-ZZ
rm -rf Rivet-LHC-EW;
python/merge-LHC-EW LHC-{W-e,W-mu,Z-e,Z-mu,WW,ZZ}.aida -o LHC-EW.aida;
python/merge-LHC-EW LHC-Powheg-{W-e,W-mu,Z-e,Z-mu,WW,ZZ}.aida -o LHC-Powheg-EW.aida;
rivet-mkhtml -o Rivet-LHC-EW LHC-EW.aida:Hw++ LHC-Powheg-EW.aida:Hw++-Powheg;
Rivet-LHC-Photon: Rivet-LHC-7-PromptPhoton Rivet-LHC-7-DiPhoton
rm -rf Rivet-LHC-Photon
python/merge-aida LHC-7-PromptPhoton.aida LHC-7-DiPhoton.aida -o LHC-Photon.aida
rivet-mkhtml -o Rivet-LHC-Photon LHC-Photon.aida:Hw++
+tests-Rivet : Rivet-LEP Rivet-BFactory Rivet-DIS Rivet-TVT-WZ Rivet-TVT-Photon Rivet-TVT-Jets Rivet-LHC-Jets Rivet-Star Rivet-SppS Rivet-LHC-EW Rivet-LHC-Photon
+
+
test-Gamma-% : Inputs/Gamma-%.in GammaTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
test-DIS-% : Inputs/DIS-%.in DISTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
if WANT_LIBFASTJET
test-LHC-% : Inputs/LHC-%.in HadronTest.la GammaTest.la HadronJetTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
else
test-LHC-% : Inputs/LHC-%.in HadronTest.la GammaTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
endif
clean-local:
rm -f *.out *.log *.tex *.top *.run *.dump *.mult *.Bmult *.aida
diff --git a/Tests/Rivet/DISBase-NoME.in b/Tests/Rivet/DISBase-NoME.in
--- a/Tests/Rivet/DISBase-NoME.in
+++ b/Tests/Rivet/DISBase-NoME.in
@@ -1,24 +1,26 @@
##################################################
# Example generator based on DIS parameters
# usage: Herwig++ read DIS.in
##################################################
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
cd /Herwig/MatrixElements/
# Neutral current DIS
insert SimpleDIS:MatrixElements[0] MEDISNC
cd /Herwig/Generators
set DISGenerator:NumberOfEvents 10000000
set DISGenerator:RandomNumberGenerator:Seed 31122001
set DISGenerator:DebugLevel 0
set DISGenerator:PrintEvent 10
set DISGenerator:MaxErrors 1000000
set /Herwig/Shower/ShowerHandler:MPIHandler NULL
set /Herwig/Shower/Evolver:MECorrMode 0
cd /Herwig/Generators
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert DISGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert DISGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
diff --git a/Tests/Rivet/DISBase-Powheg.in b/Tests/Rivet/DISBase-Powheg.in
--- a/Tests/Rivet/DISBase-Powheg.in
+++ b/Tests/Rivet/DISBase-Powheg.in
@@ -1,43 +1,45 @@
##################################################
# Example generator based on DIS parameters
# usage: Herwig++ read DIS.in
##################################################
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
##################################################
# Need to use an NLO PDF
##################################################
set /Herwig/Particles/p+:PDF /Herwig/Partons/MRST-NLO
set /Herwig/Particles/pbar-:PDF /Herwig/Partons/MRST-NLO
##################################################
# Setup the POWHEG shower
##################################################
cd /Herwig/Shower
set Evolver:IntrinsicPtGaussian 1.9*GeV
set Evolver:HardEmissionMode POWHEG
##################################################
# and strong coupling
##################################################
create Herwig::O2AlphaS O2AlphaS
set /Herwig/Model:QCD/RunningAlphaS O2AlphaS
cd /Herwig/MatrixElements/
# Neutral current DIS
insert SimpleDIS:MatrixElements[0] /Herwig/MatrixElements/PowhegMEDISNC
cd /Herwig/Generators
set DISGenerator:NumberOfEvents 10000000
set DISGenerator:RandomNumberGenerator:Seed 31122001
set DISGenerator:DebugLevel 0
set DISGenerator:PrintEvent 10
set DISGenerator:MaxErrors 1000000
set /Herwig/Shower/ShowerHandler:MPIHandler NULL
cd /Herwig/Generators
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert DISGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert DISGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
diff --git a/Tests/Rivet/DISBase.in b/Tests/Rivet/DISBase.in
--- a/Tests/Rivet/DISBase.in
+++ b/Tests/Rivet/DISBase.in
@@ -1,23 +1,25 @@
##################################################
# Example generator based on DIS parameters
# usage: Herwig++ read DIS.in
##################################################
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
cd /Herwig/MatrixElements/
# Neutral current DIS
insert SimpleDIS:MatrixElements[0] MEDISNC
cd /Herwig/Generators
set DISGenerator:NumberOfEvents 10000000
set DISGenerator:RandomNumberGenerator:Seed 31122001
set DISGenerator:DebugLevel 0
set DISGenerator:PrintEvent 10
set DISGenerator:MaxErrors 1000000
set /Herwig/Shower/ShowerHandler:MPIHandler NULL
cd /Herwig/Generators
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert DISGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert DISGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
diff --git a/Tests/Rivet/ISR-30-UE.in b/Tests/Rivet/ISR-30-UE.in
--- a/Tests/Rivet/ISR-30-UE.in
+++ b/Tests/Rivet/ISR-30-UE.in
@@ -1,54 +1,56 @@
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LHCGenerator:NumberOfEvents 10000000
set LHCGenerator:RandomNumberGenerator:Seed 31122001
set LHCGenerator:PrintEvent 10
set LHCGenerator:MaxErrors 100000
set LHCGenerator:EventHandler:StatLevel Full
# override the beam energy
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 30.4
##################################################
# Create the Herwig analysis
##################################################
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
set /Herwig/Analysis/RivetAnalysis:Debug No
set /Herwig/Decays/DecayHandler:LifeTimeOption 0
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# min bias
insert SimpleQCD:MatrixElements[0] MEMinBias
# same as ue process
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
# min ibas cuts
set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
set /Herwig/Cuts/QCDCuts:MHatMin 0.0*GeV
set /Herwig/Cuts/QCDCuts:X1Min 0.01
set /Herwig/Cuts/QCDCuts:X2Min 0.01
##################################################
# select the analyses
##################################################
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SFM_1984_S1178091
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
# get the cross section right
create Herwig::MPIXSecReweighter MPIXSecReweighter
insert LHCGenerator:EventHandler:PostSubProcessHandlers 0 MPIXSecReweighter
saverun ISR-30-UE LHCGenerator
diff --git a/Tests/Rivet/ISR-44-UE.in b/Tests/Rivet/ISR-44-UE.in
--- a/Tests/Rivet/ISR-44-UE.in
+++ b/Tests/Rivet/ISR-44-UE.in
@@ -1,54 +1,56 @@
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LHCGenerator:NumberOfEvents 10000000
set LHCGenerator:RandomNumberGenerator:Seed 31122001
set LHCGenerator:PrintEvent 10
set LHCGenerator:MaxErrors 100000
set LHCGenerator:EventHandler:StatLevel Full
# override the beam energy
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 44.4
##################################################
# Create the Herwig analysis
##################################################
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
set /Herwig/Analysis/RivetAnalysis:Debug No
set /Herwig/Decays/DecayHandler:LifeTimeOption 0
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# min bias
insert SimpleQCD:MatrixElements[0] MEMinBias
# same as ue process
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
# min ibas cuts
set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
set /Herwig/Cuts/QCDCuts:MHatMin 0.0*GeV
set /Herwig/Cuts/QCDCuts:X1Min 0.01
set /Herwig/Cuts/QCDCuts:X2Min 0.01
##################################################
# select the analyses
##################################################
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SFM_1984_S1178091
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
# get the cross section right
create Herwig::MPIXSecReweighter MPIXSecReweighter
insert LHCGenerator:EventHandler:PostSubProcessHandlers 0 MPIXSecReweighter
saverun ISR-44-UE LHCGenerator
diff --git a/Tests/Rivet/ISR-53-UE.in b/Tests/Rivet/ISR-53-UE.in
--- a/Tests/Rivet/ISR-53-UE.in
+++ b/Tests/Rivet/ISR-53-UE.in
@@ -1,55 +1,57 @@
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LHCGenerator:NumberOfEvents 10000000
set LHCGenerator:RandomNumberGenerator:Seed 31122001
set LHCGenerator:PrintEvent 10
set LHCGenerator:MaxErrors 100000
set LHCGenerator:EventHandler:StatLevel Full
# override the beam energy
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 53.0
##################################################
# Create the Herwig analysis
##################################################
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
set /Herwig/Analysis/RivetAnalysis:Debug No
set /Herwig/Decays/DecayHandler:LifeTimeOption 0
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# min bias
insert SimpleQCD:MatrixElements[0] MEMinBias
# same as ue process
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
# min ibas cuts
set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
set /Herwig/Cuts/QCDCuts:MHatMin 0.0*GeV
set /Herwig/Cuts/QCDCuts:X1Min 0.01
set /Herwig/Cuts/QCDCuts:X2Min 0.01
##################################################
# select the analyses
##################################################
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1982_S875503
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SFM_1984_S1178091
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
# get the cross section right
create Herwig::MPIXSecReweighter MPIXSecReweighter
insert LHCGenerator:EventHandler:PostSubProcessHandlers 0 MPIXSecReweighter
saverun ISR-53-UE LHCGenerator
diff --git a/Tests/Rivet/ISR-63-UE.in b/Tests/Rivet/ISR-63-UE.in
--- a/Tests/Rivet/ISR-63-UE.in
+++ b/Tests/Rivet/ISR-63-UE.in
@@ -1,54 +1,56 @@
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LHCGenerator:NumberOfEvents 10000000
set LHCGenerator:RandomNumberGenerator:Seed 31122001
set LHCGenerator:PrintEvent 10
set LHCGenerator:MaxErrors 100000
set LHCGenerator:EventHandler:StatLevel Full
# override the beam energy
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 62.2
##################################################
# Create the Herwig analysis
##################################################
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
set /Herwig/Analysis/RivetAnalysis:Debug No
set /Herwig/Decays/DecayHandler:LifeTimeOption 0
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# min bias
insert SimpleQCD:MatrixElements[0] MEMinBias
# same as ue process
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
# min ibas cuts
set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
set /Herwig/Cuts/QCDCuts:MHatMin 0.0*GeV
set /Herwig/Cuts/QCDCuts:X1Min 0.01
set /Herwig/Cuts/QCDCuts:X2Min 0.01
##################################################
# select the analyses
##################################################
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SFM_1984_S1178091
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
# get the cross section right
create Herwig::MPIXSecReweighter MPIXSecReweighter
insert LHCGenerator:EventHandler:PostSubProcessHandlers 0 MPIXSecReweighter
saverun ISR-63-UE LHCGenerator
diff --git a/Tests/Rivet/LEPBase-Powheg.in b/Tests/Rivet/LEPBase-Powheg.in
--- a/Tests/Rivet/LEPBase-Powheg.in
+++ b/Tests/Rivet/LEPBase-Powheg.in
@@ -1,36 +1,38 @@
##################################################
# base parameters for LEP analyses
##################################################
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LEPGenerator:NumberOfEvents 100000000
set LEPGenerator:RandomNumberGenerator:Seed 31122001
set LEPGenerator:DebugLevel 0
set LEPGenerator:PrintEvent 10
set LEPGenerator:MaxErrors 10000
# no MPI
set LEPGenerator:EventHandler:CascadeHandler:MPIHandler NULL
##################################################
# Switch off ISR
##################################################
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
##################################################
# Create the Herwig analysis
##################################################
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LEPGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LEPGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
##################################################
# Use the NLO q qbar matrix element
##################################################
create Herwig::O2AlphaS /Herwig/O2AlphaS
set /Herwig/Generators/LHCGenerator:StandardModelParameters:QCD/RunningAlphaS /Herwig/O2AlphaS
set /Herwig/Shower/Evolver:HardEmissionMode POWHEG
set /Herwig/Shower/AlphaQCD:AlphaMZ 0.118
insert /Herwig/MatrixElements/SimpleEE:MatrixElements 0 /Herwig/MatrixElements/PowhegMEee2gZ2qq
diff --git a/Tests/Rivet/LEPBase.in b/Tests/Rivet/LEPBase.in
--- a/Tests/Rivet/LEPBase.in
+++ b/Tests/Rivet/LEPBase.in
@@ -1,32 +1,34 @@
##################################################
# base parameters for LEP analyses
##################################################
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LEPGenerator:NumberOfEvents 100000000
set LEPGenerator:RandomNumberGenerator:Seed 31122001
set LEPGenerator:PrintEvent 10
set LEPGenerator:MaxErrors 10000
# no MPI
set LEPGenerator:EventHandler:CascadeHandler:MPIHandler NULL
##################################################
# Switch off ISR
##################################################
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
##################################################
# Create the Herwig analysis
##################################################
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LEPGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LEPGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
##################################################
# Use the q qbar matrix element
##################################################
# default e+e- > q qbar (5 flavours d,u,s,c,b)
insert /Herwig/MatrixElements/SimpleEE:MatrixElements 0 /Herwig/MatrixElements/MEee2gZ2qq
\ No newline at end of file
diff --git a/Tests/Rivet/LHCBase-Powheg.in b/Tests/Rivet/LHCBase-Powheg.in
--- a/Tests/Rivet/LHCBase-Powheg.in
+++ b/Tests/Rivet/LHCBase-Powheg.in
@@ -1,45 +1,47 @@
##################################################
# Example generator based on Tevatron parameters
# usage: Herwig++ read TVT.in
#
# Since most parameters are identical to LHC,
# we use the default LHCGenerator and adapt only
# for the differences
##################################################
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LHCGenerator:NumberOfEvents 10000000
set LHCGenerator:RandomNumberGenerator:Seed 31122001
set LHCGenerator:PrintEvent 10
set LHCGenerator:MaxErrors 100000
set LHCGenerator:EventHandler:LuminosityFunction:Energy 7000.0
##################################################
# Need to use an NLO PDF
##################################################
set /Herwig/Particles/p+:PDF /Herwig/Partons/MRST-NLO
set /Herwig/Particles/pbar-:PDF /Herwig/Partons/MRST-NLO
##################################################
# and strong coupling
##################################################
create Herwig::O2AlphaS O2AlphaS
set /Herwig/Model:QCD/RunningAlphaS O2AlphaS
##################################################
# Setup the POWHEG shower
##################################################
cd /Herwig/Shower
set Evolver:HardEmissionMode POWHEG
set Evolver:IntrinsicPtGaussian 2.2*GeV
##################################################
# Create the Herwig analysis
##################################################
cd /Herwig/Generators
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
diff --git a/Tests/Rivet/LHCBase.in b/Tests/Rivet/LHCBase.in
--- a/Tests/Rivet/LHCBase.in
+++ b/Tests/Rivet/LHCBase.in
@@ -1,21 +1,23 @@
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LHCGenerator:NumberOfEvents 10000000
set LHCGenerator:RandomNumberGenerator:Seed 31122001
set LHCGenerator:PrintEvent 10
set LHCGenerator:MaxErrors 100000
set LHCGenerator:EventHandler:StatLevel Full
set LHCGenerator:EventHandler:LuminosityFunction:Energy 7000.0
##################################################
# Create the Herwig analysis
##################################################
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
set /Herwig/Analysis/RivetAnalysis:Debug No
set /Herwig/Decays/DecayHandler:LifeTimeOption 0
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
diff --git a/Tests/Rivet/SppS-200-UE.in b/Tests/Rivet/SppS-200-UE.in
--- a/Tests/Rivet/SppS-200-UE.in
+++ b/Tests/Rivet/SppS-200-UE.in
@@ -1,58 +1,60 @@
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LHCGenerator:NumberOfEvents 10000000
set LHCGenerator:RandomNumberGenerator:Seed 31122001
set LHCGenerator:PrintEvent 10
set LHCGenerator:MaxErrors 100000
set LHCGenerator:EventHandler:StatLevel Full
# override the beam energy
cd /Herwig/Generators
set LHCGenerator:EventHandler:BeamB /Herwig/Particles/pbar-
set LHCGenerator:EventHandler:LuminosityFunction:Energy 200.0
##################################################
# Create the Herwig analysis
##################################################
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
set /Herwig/Analysis/RivetAnalysis:Debug No
set /Herwig/Decays/DecayHandler:LifeTimeOption 0
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# min bias
insert SimpleQCD:MatrixElements[0] MEMinBias
# same as ue process
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
# min ibas cuts
set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
set /Herwig/Cuts/QCDCuts:MHatMin 0.0*GeV
set /Herwig/Cuts/QCDCuts:X1Min 0.01
set /Herwig/Cuts/QCDCuts:X2Min 0.01
##################################################
# select the analyses
##################################################
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1989_S1926373
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1988_S1867512
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA1_1990_S2044935
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1986_S1583476
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
# get the cross section right
create Herwig::MPIXSecReweighter MPIXSecReweighter
insert LHCGenerator:EventHandler:PostSubProcessHandlers 0 MPIXSecReweighter
saverun SppS-200-UE LHCGenerator
diff --git a/Tests/Rivet/SppS-500-UE.in b/Tests/Rivet/SppS-500-UE.in
--- a/Tests/Rivet/SppS-500-UE.in
+++ b/Tests/Rivet/SppS-500-UE.in
@@ -1,55 +1,57 @@
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LHCGenerator:NumberOfEvents 10000000
set LHCGenerator:RandomNumberGenerator:Seed 31122001
set LHCGenerator:PrintEvent 10
set LHCGenerator:MaxErrors 100000
set LHCGenerator:EventHandler:StatLevel Full
# override the beam energy
cd /Herwig/Generators
set LHCGenerator:EventHandler:BeamB /Herwig/Particles/pbar-
set LHCGenerator:EventHandler:LuminosityFunction:Energy 500.0
##################################################
# Create the Herwig analysis
##################################################
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
set /Herwig/Analysis/RivetAnalysis:Debug No
set /Herwig/Decays/DecayHandler:LifeTimeOption 0
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# min bias
insert SimpleQCD:MatrixElements[0] MEMinBias
# same as ue process
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
# min ibas cuts
set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
set /Herwig/Cuts/QCDCuts:MHatMin 0.0*GeV
set /Herwig/Cuts/QCDCuts:X1Min 0.01
set /Herwig/Cuts/QCDCuts:X2Min 0.01
##################################################
# select the analyses
##################################################
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA1_1990_S2044935
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
# get the cross section right
create Herwig::MPIXSecReweighter MPIXSecReweighter
insert LHCGenerator:EventHandler:PostSubProcessHandlers 0 MPIXSecReweighter
saverun SppS-500-UE LHCGenerator
diff --git a/Tests/Rivet/SppS-53-UE.in b/Tests/Rivet/SppS-53-UE.in
--- a/Tests/Rivet/SppS-53-UE.in
+++ b/Tests/Rivet/SppS-53-UE.in
@@ -1,55 +1,57 @@
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LHCGenerator:NumberOfEvents 10000000
set LHCGenerator:RandomNumberGenerator:Seed 31122001
set LHCGenerator:PrintEvent 10
set LHCGenerator:MaxErrors 100000
set LHCGenerator:EventHandler:StatLevel Full
# override the beam energy
cd /Herwig/Generators
set LHCGenerator:EventHandler:BeamB /Herwig/Particles/pbar-
set LHCGenerator:EventHandler:LuminosityFunction:Energy 53.0
##################################################
# Create the Herwig analysis
##################################################
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
set /Herwig/Analysis/RivetAnalysis:Debug No
set /Herwig/Decays/DecayHandler:LifeTimeOption 0
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# min bias
insert SimpleQCD:MatrixElements[0] MEMinBias
# same as ue process
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
# min ibas cuts
set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
set /Herwig/Cuts/QCDCuts:MHatMin 0.0*GeV
set /Herwig/Cuts/QCDCuts:X1Min 0.01
set /Herwig/Cuts/QCDCuts:X2Min 0.01
##################################################
# select the analyses
##################################################
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1982_S875503
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
# get the cross section right
create Herwig::MPIXSecReweighter MPIXSecReweighter
insert LHCGenerator:EventHandler:PostSubProcessHandlers 0 MPIXSecReweighter
saverun SppS-53-UE LHCGenerator
diff --git a/Tests/Rivet/SppS-546-UE.in b/Tests/Rivet/SppS-546-UE.in
--- a/Tests/Rivet/SppS-546-UE.in
+++ b/Tests/Rivet/SppS-546-UE.in
@@ -1,56 +1,58 @@
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LHCGenerator:NumberOfEvents 10000000
set LHCGenerator:RandomNumberGenerator:Seed 31122001
set LHCGenerator:PrintEvent 10
set LHCGenerator:MaxErrors 100000
set LHCGenerator:EventHandler:StatLevel Full
# override the beam energy
cd /Herwig/Generators
set LHCGenerator:EventHandler:BeamB /Herwig/Particles/pbar-
set LHCGenerator:EventHandler:LuminosityFunction:Energy 546.0
##################################################
# Create the Herwig analysis
##################################################
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
set /Herwig/Analysis/RivetAnalysis:Debug No
set /Herwig/Decays/DecayHandler:LifeTimeOption 0
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# min bias
insert SimpleQCD:MatrixElements[0] MEMinBias
# same as ue process
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
# min ibas cuts
set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
set /Herwig/Cuts/QCDCuts:MHatMin 0.0*GeV
set /Herwig/Cuts/QCDCuts:X1Min 0.01
set /Herwig/Cuts/QCDCuts:X2Min 0.01
##################################################
# select the analyses
##################################################
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1988_S1867512
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1987_S1640666
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
# get the cross section right
create Herwig::MPIXSecReweighter MPIXSecReweighter
insert LHCGenerator:EventHandler:PostSubProcessHandlers 0 MPIXSecReweighter
saverun SppS-546-UE LHCGenerator
diff --git a/Tests/Rivet/SppS-63-UE.in b/Tests/Rivet/SppS-63-UE.in
--- a/Tests/Rivet/SppS-63-UE.in
+++ b/Tests/Rivet/SppS-63-UE.in
@@ -1,55 +1,57 @@
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LHCGenerator:NumberOfEvents 10000000
set LHCGenerator:RandomNumberGenerator:Seed 31122001
set LHCGenerator:PrintEvent 10
set LHCGenerator:MaxErrors 100000
set LHCGenerator:EventHandler:StatLevel Full
# override the beam energy
cd /Herwig/Generators
set LHCGenerator:EventHandler:BeamB /Herwig/Particles/pbar-
set LHCGenerator:EventHandler:LuminosityFunction:Energy 63.0
##################################################
# Create the Herwig analysis
##################################################
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
set /Herwig/Analysis/RivetAnalysis:Debug No
set /Herwig/Decays/DecayHandler:LifeTimeOption 0
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# min bias
insert SimpleQCD:MatrixElements[0] MEMinBias
# same as ue process
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
# min ibas cuts
set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
set /Herwig/Cuts/QCDCuts:MHatMin 0.0*GeV
set /Herwig/Cuts/QCDCuts:X1Min 0.01
set /Herwig/Cuts/QCDCuts:X2Min 0.01
##################################################
# select the analyses
##################################################
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA1_1990_S2044935
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
# get the cross section right
create Herwig::MPIXSecReweighter MPIXSecReweighter
insert LHCGenerator:EventHandler:PostSubProcessHandlers 0 MPIXSecReweighter
saverun SppS-63-UE LHCGenerator
diff --git a/Tests/Rivet/SppS-900-UE.in b/Tests/Rivet/SppS-900-UE.in
--- a/Tests/Rivet/SppS-900-UE.in
+++ b/Tests/Rivet/SppS-900-UE.in
@@ -1,58 +1,60 @@
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LHCGenerator:NumberOfEvents 10000000
set LHCGenerator:RandomNumberGenerator:Seed 31122001
set LHCGenerator:PrintEvent 10
set LHCGenerator:MaxErrors 100000
set LHCGenerator:EventHandler:StatLevel Full
# override the beam energy
cd /Herwig/Generators
set LHCGenerator:EventHandler:BeamB /Herwig/Particles/pbar-
set LHCGenerator:EventHandler:LuminosityFunction:Energy 900.0
##################################################
# Create the Herwig analysis
##################################################
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
set /Herwig/Analysis/RivetAnalysis:Debug No
set /Herwig/Decays/DecayHandler:LifeTimeOption 0
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# min bias
insert SimpleQCD:MatrixElements[0] MEMinBias
# same as ue process
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
# min ibas cuts
set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
set /Herwig/Cuts/QCDCuts:MHatMin 0.0*GeV
set /Herwig/Cuts/QCDCuts:X1Min 0.01
set /Herwig/Cuts/QCDCuts:X2Min 0.01
##################################################
# select the analyses
##################################################
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1989_S1926373
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1988_S1867512
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA1_1990_S2044935
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1986_S1583476
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
# get the cross section right
create Herwig::MPIXSecReweighter MPIXSecReweighter
insert LHCGenerator:EventHandler:PostSubProcessHandlers 0 MPIXSecReweighter
saverun SppS-900-UE LHCGenerator
diff --git a/Tests/Rivet/StarBase.in b/Tests/Rivet/StarBase.in
--- a/Tests/Rivet/StarBase.in
+++ b/Tests/Rivet/StarBase.in
@@ -1,42 +1,42 @@
##################################################
# Example generator based on Tevatron parameters
# usage: Herwig++ read TVT.in
#
# Since most parameters are identical to LHC,
# we use the default LHCGenerator and adapt only
# for the differences
##################################################
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LHCGenerator:NumberOfEvents 10000000
set LHCGenerator:RandomNumberGenerator:Seed 31122001
set LHCGenerator:PrintEvent 10
set LHCGenerator:MaxErrors 100000
set LHCGenerator:EventHandler:StatLevel Full
##################################################
# Tevatron physics parameters (override defaults)
##################################################
set LHCGenerator:EventHandler:BeamB /Herwig/Particles/p+
set LHCGenerator:EventHandler:LuminosityFunction:Energy 200.0
##################################################
# Create the Herwig analysis
##################################################
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
set /Herwig/Analysis/RivetAnalysis:Debug No
cd /Herwig/Generators
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
-create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
set /Herwig/Decays/DecayHandler:LifeTimeOption 0
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
set /Herwig/Cuts/QCDCuts:X2Min 0.01
diff --git a/Tests/Rivet/TVT-UEBase.in b/Tests/Rivet/TVT-UEBase.in
--- a/Tests/Rivet/TVT-UEBase.in
+++ b/Tests/Rivet/TVT-UEBase.in
@@ -1,11 +1,13 @@
read TVTBase.in
cd /Herwig/Generators
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
set /Herwig/Decays/DecayHandler:LifeTimeOption 0
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
diff --git a/Tests/Rivet/TVTBase-Powheg.in b/Tests/Rivet/TVTBase-Powheg.in
--- a/Tests/Rivet/TVTBase-Powheg.in
+++ b/Tests/Rivet/TVTBase-Powheg.in
@@ -1,48 +1,50 @@
##################################################
# Example generator based on Tevatron parameters
# usage: Herwig++ read TVT.in
#
# Since most parameters are identical to LHC,
# we use the default LHCGenerator and adapt only
# for the differences
##################################################
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LHCGenerator:NumberOfEvents 10000000
set LHCGenerator:RandomNumberGenerator:Seed 31122001
set LHCGenerator:PrintEvent 10
set LHCGenerator:MaxErrors 100000
##################################################
# Tevatron physics parameters (override defaults)
##################################################
set LHCGenerator:EventHandler:BeamB /Herwig/Particles/pbar-
##################################################
# Need to use an NLO PDF
##################################################
set /Herwig/Particles/p+:PDF /Herwig/Partons/MRST-NLO
set /Herwig/Particles/pbar-:PDF /Herwig/Partons/MRST-NLO
##################################################
# and strong coupling
##################################################
create Herwig::O2AlphaS O2AlphaS
set /Herwig/Model:QCD/RunningAlphaS O2AlphaS
##################################################
# Setup the POWHEG shower
##################################################
cd /Herwig/Shower
set Evolver:IntrinsicPtGaussian 1.9*GeV
set Evolver:HardEmissionMode POWHEG
##################################################
# Create the Herwig analysis
##################################################
cd /Herwig/Generators
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
diff --git a/Tests/Rivet/TVTBase.in b/Tests/Rivet/TVTBase.in
--- a/Tests/Rivet/TVTBase.in
+++ b/Tests/Rivet/TVTBase.in
@@ -1,30 +1,32 @@
##################################################
# Example generator based on Tevatron parameters
# usage: Herwig++ read TVT.in
#
# Since most parameters are identical to LHC,
# we use the default LHCGenerator and adapt only
# for the differences
##################################################
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LHCGenerator:NumberOfEvents 10000000
set LHCGenerator:RandomNumberGenerator:Seed 31122001
set LHCGenerator:PrintEvent 10
set LHCGenerator:MaxErrors 100000
set LHCGenerator:EventHandler:StatLevel Full
##################################################
# Tevatron physics parameters (override defaults)
##################################################
set LHCGenerator:EventHandler:BeamB /Herwig/Particles/pbar-
##################################################
# Create the Herwig analysis
##################################################
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+insert LHCGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
+set /Herwig/Analysis/HepMCFile:PrintEvent 10000
set /Herwig/Analysis/RivetAnalysis:Debug No

File Metadata

Mime Type
text/x-diff
Expires
Tue, Nov 19, 7:42 PM (1 d, 9 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3805892
Default Alt Text
(53 KB)

Event Timeline