diff --git a/Tests/LHE/LHE-WZ-Dipole.in b/Tests/LHE/LHE-WZ-Dipole.in
--- a/Tests/LHE/LHE-WZ-Dipole.in
+++ b/Tests/LHE/LHE-WZ-Dipole.in
@@ -1,67 +1,64 @@
#
mkdir LesHouches
cd LesHouches
library LesHouches.so
cd /Herwig/EventHandlers
create ThePEG::LesHouchesFileReader Reader2 LesHouches.so
set Reader2:FileName PPEE.lhe
set Reader2:BeamA 2212
set Reader2:BeamB -2212
set Reader2:EBeamA 3500.0
set Reader2:EBeamB 3500.0
set Reader2:PDFA /Herwig/Partons/ShowerLOPDF
set Reader2:PDFB /Herwig/Partons/ShowerLOPDF
create ThePEG::Cuts Cuts
set Cuts:ScaleMin 1.0*GeV2
set Cuts:X1Min 0.00001
set Cuts:X2Min 0.00001
set Cuts:MHatMin 20.*GeV
set Cuts:X1Max 0.9
set Cuts:X2Max 0.9
create ThePEG::LesHouchesEventHandler LesHouchesHandler
insert LesHouchesHandler:LesHouchesReaders[0] Reader2
set LesHouchesHandler:PartonExtractor /Herwig/Partons/PPExtractor
set LesHouchesHandler:StatLevel 2
set LesHouchesHandler:CascadeHandler /Herwig/DipoleShower/DipoleShowerHandler
insert LesHouchesHandler:PreCascadeHandlers[0] /Herwig/Decays/DecayHandler
set LesHouchesHandler:HadronizationHandler /Herwig/Hadronization/ClusterHadHandler
set LesHouchesHandler:DecayHandler /Herwig/Decays/DecayHandler
set LesHouchesHandler:WeightOption NegUnitWeight
cd /Herwig/Cuts
set JetKtCut:MinKT 0.0*GeV
cd /Herwig/Generators
create ThePEG::EventGenerator MGGenerator
set MGGenerator:RandomNumberGenerator /Herwig/Random
set MGGenerator:StandardModelParameters /Herwig/Model
set MGGenerator:EventHandler /Herwig/EventHandlers/LesHouchesHandler
cd /Herwig/Generators
set MGGenerator:EventHandler:Cuts /Herwig/Cuts/Cuts
cd /Herwig/Analysis
-create ThePEG::RivetAnalysis RivetAnalysis RivetAnalysis.so
+read snippets/Rivet.in
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZINC
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZJETS
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_WINC
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_WJETS
-
-
-insert /Herwig/Generators/MGGenerator:AnalysisHandlers 0 RivetAnalysis
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_ZINC
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_ZJETS
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_WINC
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_WJETS
cd /Herwig/Generators/
set MGGenerator:NumberOfEvents 1000000
set MGGenerator:RandomNumberGenerator:Seed 31122001
set MGGenerator:PrintEvent 10
set MGGenerator:MaxErrors 100000000
#set MGGenerator:EventHandler:CascadeHandler:MPIHandler NULL
#
saverun LHE MGGenerator
diff --git a/Tests/LHE/LHE-WZ.in b/Tests/LHE/LHE-WZ.in
--- a/Tests/LHE/LHE-WZ.in
+++ b/Tests/LHE/LHE-WZ.in
@@ -1,66 +1,63 @@
#
mkdir LesHouches
cd LesHouches
library LesHouches.so
cd /Herwig/EventHandlers
create ThePEG::LesHouchesFileReader Reader2 LesHouches.so
set Reader2:FileName PPEE.lhe
set Reader2:BeamA 2212
set Reader2:BeamB -2212
set Reader2:EBeamA 3500.0
set Reader2:EBeamB 3500.0
set Reader2:PDFA /Herwig/Partons/ShowerLOPDF
set Reader2:PDFB /Herwig/Partons/ShowerLOPDF
create ThePEG::Cuts Cuts
set Cuts:ScaleMin 1.0*GeV2
set Cuts:X1Min 0.00001
set Cuts:X2Min 0.00001
set Cuts:MHatMin 20.*GeV
set Cuts:X1Max 0.9
set Cuts:X2Max 0.9
create ThePEG::LesHouchesEventHandler LesHouchesHandler
insert LesHouchesHandler:LesHouchesReaders[0] Reader2
set LesHouchesHandler:PartonExtractor /Herwig/Partons/PPExtractor
set LesHouchesHandler:StatLevel 2
set LesHouchesHandler:CascadeHandler /Herwig/Shower/ShowerHandler
set LesHouchesHandler:HadronizationHandler /Herwig/Hadronization/ClusterHadHandler
set LesHouchesHandler:DecayHandler /Herwig/Decays/DecayHandler
set LesHouchesHandler:WeightOption NegUnitWeight
cd /Herwig/Cuts
set JetKtCut:MinKT 0.0*GeV
cd /Herwig/Generators
create ThePEG::EventGenerator MGGenerator
set MGGenerator:RandomNumberGenerator /Herwig/Random
set MGGenerator:StandardModelParameters /Herwig/Model
set MGGenerator:EventHandler /Herwig/EventHandlers/LesHouchesHandler
cd /Herwig/Generators
set MGGenerator:EventHandler:Cuts /Herwig/Cuts/Cuts
cd /Herwig/Analysis
-create ThePEG::RivetAnalysis RivetAnalysis RivetAnalysis.so
+read snippets/Rivet.in
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZINC
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZJETS
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_WINC
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_WJETS
-
-
-insert /Herwig/Generators/MGGenerator:AnalysisHandlers 0 RivetAnalysis
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_ZINC
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_ZJETS
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_WINC
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_WJETS
cd /Herwig/Generators/
set MGGenerator:NumberOfEvents 1000000
set MGGenerator:RandomNumberGenerator:Seed 31122001
set MGGenerator:PrintEvent 10
set MGGenerator:MaxErrors 100000000
#set MGGenerator:EventHandler:CascadeHandler:MPIHandler NULL
#
saverun LHE MGGenerator
diff --git a/Tests/LHE/LHE.in b/Tests/LHE/LHE.in
--- a/Tests/LHE/LHE.in
+++ b/Tests/LHE/LHE.in
@@ -1,88 +1,85 @@
#
mkdir LesHouches
cd LesHouches
library LesHouches.so
cd /Herwig/EventHandlers
create ThePEG::LesHouchesFileReader Reader2 LesHouches.so
set Reader2:FileName PPEE.lhe
set Reader2:BeamA 2212
set Reader2:BeamB -2212
set Reader2:EBeamA 3500.0
set Reader2:EBeamB 3500.0
set Reader2:PDFA /Herwig/Partons/ShowerLOPDF
set Reader2:PDFB /Herwig/Partons/ShowerLOPDF
create ThePEG::Cuts Cuts
set Cuts:ScaleMin 1.0*GeV2
set Cuts:X1Min 0.00001
set Cuts:X2Min 0.00001
set Cuts:MHatMin 20.*GeV
set Cuts:X1Max 0.9
set Cuts:X2Max 0.9
create ThePEG::LesHouchesEventHandler LesHouchesHandler
insert LesHouchesHandler:LesHouchesReaders[0] Reader2
set LesHouchesHandler:PartonExtractor /Herwig/Partons/PPExtractor
set LesHouchesHandler:StatLevel 2
set LesHouchesHandler:CascadeHandler /Herwig/Shower/ShowerHandler
set LesHouchesHandler:HadronizationHandler /Herwig/Hadronization/ClusterHadHandler
set LesHouchesHandler:DecayHandler /Herwig/Decays/DecayHandler
set LesHouchesHandler:WeightOption NegUnitWeight
cd /Herwig/Cuts
set JetKtCut:MinKT 0.0*GeV
cd /Herwig/Generators
create ThePEG::EventGenerator MGGenerator
set MGGenerator:RandomNumberGenerator /Herwig/Random
set MGGenerator:StandardModelParameters /Herwig/Model
set MGGenerator:EventHandler /Herwig/EventHandlers/LesHouchesHandler
cd /Herwig/Generators
set MGGenerator:EventHandler:Cuts /Herwig/Cuts/Cuts
cd /Herwig/Analysis
-create ThePEG::RivetAnalysis RivetAnalysis RivetAnalysis.so
+read snippets/Rivet.in
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZINC
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZJETS
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_ZINC
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_ZJETS
# # ATLAS pT
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I917931
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1300647
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I917931
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1300647
# # ATLAS Z+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I945498
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1230812
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I945498
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1230812
# # ATLAS phi*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1204784
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1204784
# # CMS Z + b-hadron
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1256943
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1256943
# CMS Z pt and y
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I941555
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I941555
# # ATLAS Z + bjets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1306294
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1306294
# ATLAS Z
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I928289:MODE=Z
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I928289:MODE=Z
# CMS Z AFB
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1122847
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1122847
# CMS Z+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1310737
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2015_I1310737
# ATLAS event shapes in Z events
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1424838
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1424838
# ATLAS forwrd backward
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1351916:LMODE=EL
-
-
-insert /Herwig/Generators/MGGenerator:AnalysisHandlers 0 RivetAnalysis
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1351916:LMODE=EL
cd /Herwig/Generators/
set MGGenerator:NumberOfEvents 1000000
set MGGenerator:RandomNumberGenerator:Seed 31122001
set MGGenerator:PrintEvent 10
set MGGenerator:MaxErrors 100000000
#set MGGenerator:EventHandler:CascadeHandler:MPIHandler NULL
#
saverun LHE MGGenerator
diff --git a/Tests/Makefile.am b/Tests/Makefile.am
--- a/Tests/Makefile.am
+++ b/Tests/Makefile.am
@@ -1,422 +1,422 @@
AM_LDFLAGS += -module -avoid-version -rpath /dummy/path/not/used
EXTRA_DIST = Inputs python Rivet
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 --repo $(REPO) -L $(builddir)/.libs -i $(top_builddir)/src
HWBUILD = $(HERWIG) build --repo $(REPO) -L $(builddir)/.libs -i $(top_builddir)/src
HWINTEGRATE = $(HERWIG) integrate
HWRUN = $(HERWIG) run -N $${NUMEVENTS:-10000}
tests : tests-LEP tests-DIS tests-LHC tests-Gamma
LEPDEPS = \
test-LEP-VV \
test-LEP-VH \
test-LEP-VBF \
test-LEP-BB \
test-LEP-Quarks \
test-LEP-Leptons
if WANT_LIBFASTJET
LEPDEPS += test-LEP-TopDecay
endif
tests-LEP : $(LEPDEPS)
tests-DIS : test-DIS-Charged test-DIS-Neutral
LHCDEPS = \
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
if WANT_LIBFASTJET
LHCDEPS += \
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
endif
tests-LHC : $(LHCDEPS)
tests-Gamma : test-Gamma-FF test-Gamma-WW test-Gamma-P
LEPLIBS = LeptonTest.la
HADLIBS = HadronTest.la
if WANT_LIBFASTJET
LEPLIBS += LeptonJetTest.la
HADLIBS += HadronJetTest.la
endif
test-LEP-% : Inputs/LEP-%.in $(LEPLIBS)
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<))
test-Gamma-% : Inputs/Gamma-%.in GammaTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<))
test-DIS-% : Inputs/DIS-%.in DISTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<))
test-LHC-% : Inputs/LHC-%.in GammaTest.la $(HADLIBS)
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<))
tests-Rivet : Rivet-EE Rivet-DIS Rivet-Fixed \
Rivet-TVT-EW Rivet-TVT-Photon Rivet-TVT-Jets \
Rivet-LHC-Jets Rivet-LHC-EW Rivet-LHC-Photon Rivet-LHC-Higgs
Rivet-%-UE-Cent.yoda : Rivet-%-UE-Cent.run Rivet-%-Cent.run
rm -rf $(subst .yoda,,$@)
mkdir $(subst .yoda,,$@)
mv $(subst .yoda,.run,$@) $(subst UE-,,$(subst .yoda,.run,$@)) $(subst .yoda,,$@)
cd $(subst .yoda,,$@); ../$(HWRUN) $(subst UE-,,$(subst .yoda,.run,$@)); mv $(subst UE-,,$@) ALICE_2015_CENT_PP.yoda
cd $(subst .yoda,,$@); export RIVET_ANALYSIS_PATH=`pwd`; ../$(HWRUN) $(subst .yoda,.run,$@)
mv $(subst .yoda,,$@)/$@ .
rm -rf $(subst .yoda,,$@)
Rivet-%.run : Rivet/%.in
export RIVET_ANALYSIS_PATH=`pwd`/Analysis; $(HWBUILD) -c .cache/$(subst .run,,$@) $<
Rivet-Matchbox-%.yoda : Rivet-Matchbox-%.run
export RIVET_ANALYSIS_PATH=`pwd`/Analysis; $(HWINTEGRATE) -c .cache/$(subst .run,,$<) $<
export RIVET_ANALYSIS_PATH=`pwd`/Analysis; $(HWRUN) -c .cache/$(subst .run,,$<) $<
Rivet-%.yoda : Rivet-%.run
export RIVET_ANALYSIS_PATH=`pwd`/Analysis; $(HWRUN) $<
Rivet/%.in :
python/make_input_files.py $(notdir $(subst .in,,$@))
Rivet-inputfiles: $(shell echo Rivet/EE{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{12,12.8,13,14,14.8,17,21.5,22,22.5,25,26.8,27.6,27.7,29,30,30.2,30.3,30.5,30.7,30.8,31.2,31.3,31.6,34,34.5,34.8,35,36.2,41,41.5,42.1,42.6,43.5,43.6,44,45,48.0,50,52,53.3,55,55.3,56,57,58,59.5,60,60.8,61.4,65.4,66,75.7,76,82,85,91,91-nopi,93.0,130,130.1,133,136,136.1,161,161.3,172,172.3,177,182.8,183,188.6,189,192,194.4,196,197,200,200.2,202,205,206,206.2,207}.in) \
$(shell echo Rivet/EE-{183,189}-WW.in) \
$(shell echo Rivet/EE{,-Dipole}-{10.5,11.96,12.8,13.96,16.86,21.84,26.8,28.48,35.44,48.0,97.0}-gg.in) \
$(shell echo Rivet/EE{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg}-{2.0,2.2,2.23,2.396,2.4,2.6,2.644,2.8,2.9,3.0,3.05,3.2,3.4,3.5,3.63,3.67,4.03,4.17,4.18,4.3,4.41,4.5,4.6,4.8,5.0,5.2,5.8,6.2,6.5,6.6,7.0,7.4,7.7,8.8,9.27,9.4,9.46,9.51,10,10.4,10.45,10.47,10.52,10.52-sym,10.54,10.55,10.58,10.58-sym,10.6}.in) \
$(shell echo Rivet/EE-{Bc,Ds,Eta,Etac,JPsi,JPsi-All,Lambdab,Lambdac,LL-10.58,LL-197,LL-29,LL-58,LL-91,Omega-Baryon,Omegac0,Omega-Meson,Phi,Psi2S,Psi2S-All,Psi3770,Tau,Upsilon,Upsilon2,Upsilon3,Upsilon4,Upsilon4-asym,Upsilon5,Xi0,Xic0,Xicp,Xim}.in) \
$(shell echo Rivet/DIS{,-NoME,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{225,251,300,318,318-CMS}-e+-{VeryLow,Low,Med,High}Q2.in) \
$(shell echo Rivet/DIS{,-NoME,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-318-{e+,e-}-CC-{VeryLow,Low,Med,High}Q2.in) \
$(shell echo Rivet/DIS{,-NoME,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{296,300,318}-e--{VeryLow,Low,Med,High}Q2.in) \
$(shell echo Rivet/Photo-{Direct,Resolved}-{300,318}-e+-Jets-{1..3}.in ) \
$(shell echo Rivet/TVT{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{Run-I-Z,Run-I-W,Run-I-WZ,Run-II-Z-e,Run-II-Z-{,LowMass-,HighMass-}mu,Run-II-W}.in) \
$(shell echo Rivet/TVT{,-Dipole}-Run-II-{DiPhoton-GammaGamma,DiPhoton-GammaJet,PromptPhoton}.in) \
$(shell echo Rivet/TVT-Powheg-Run-II-{DiPhoton-GammaGamma,DiPhoton-GammaJet}.in) \
$(shell echo Rivet/TVT{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-Run-{I,II}-{Jets-{1..6},DiJets-{1..4}}.in ) \
$(shell echo Rivet/TVT{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-{630-Jets-{1..3},300-Jets-1,900-Jets-1}.in ) \
$(shell echo Rivet/TVT{,-Dipole}-{Run-I,Run-II,300,630,900}-UE.in) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-7-DiJets-{1..7}-{A,B,C}.in ) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-13-DiJets-{{1..11}-A,{6..11}-B}.in ) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-{7,8,13}-Jets-{0..10}.in ) \
$(shell echo Rivet/LHC{,-Dipole}-{900,2360,2760,7,8,13}-UE.in ) \
$(shell echo Rivet/LHC{,-Dipole}-2760-Jets-{1..3}.in ) \
$(shell echo Rivet/LHC{,-Dipole}-{900,7,13}-UE-Long.in ) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-7-Charm-{0..5}.in) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-{5,13}-Charm-0.in) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-7-Bottom-{0..9}.in) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-13-Bottom-{0..6}.in) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-7-Top-{L,SL}.in) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-{8,13}-Top-{All,L,SL}.in) \
$(shell echo Rivet/Star{,-Dipole}-{UE,Jets-{1..4}}.in ) \
$(shell echo Rivet/SppS{,-Dipole}-{53,63,200,500,546,900}-UE.in ) \
$(shell echo Rivet/LHC{,-Matchbox,-Matchbox-Powheg,-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-{{,8-}W-{e,mu},13-W-mu,{2760-,,8-,13-}Z-{e,mu}-Mass{1..5},13-Z-nu,Z-mu-SOPHTY,WZ,WW-{emu,ll},13-WW-ll,13-ZZ-ll,ZZ-{ll,lv},{8,13}-WZ,8-ZZ-lv,8-WW-ll,Z-mu-Short}.in) \
$(shell echo Rivet/LHC{,-Dipole}-7-{W,Z}Gamma-{e,mu}.in) \
$(shell echo Rivet/LHC{,-Dipole}-8-ZGamma-{e,mu,nu}.in) \
$(shell echo Rivet/LHC{,-Matchbox,-Matchbox-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-{7-W-Jet-{1..3}-e,7-Z-Jet-{0..3}-e,7-Z-Jet-0-mu}.in) \
$(shell echo Rivet/LHC{-Matchbox,-Matchbox-Powheg,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-{Z-b,Z-bb,8-Z-b,8-Z-bb,13-Z-b,13-Z-bb,W-b,8-Z-jj}.in) \
$(shell echo Rivet/LHC{,-Dipole}-{7,8,13}-PromptPhoton-{1..5}.in) Rivet/LHC-GammaGamma-7.in \
$(shell echo Rivet/LHC{,-Powheg,-Dipole}-{7,8,13}-{DiPhoton-GammaGamma,DiPhoton-GammaJet}.in) \
$(shell echo Rivet/LHC{,-Powheg,-Matchbox,-Matchbox-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-{ggH,VBF,WH,ZH}.in) \
$(shell echo Rivet/LHC{,-Powheg,-Matchbox,-Matchbox-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-8-{{ggH,VBF,WH,ZH}{,-GammaGamma},ggH-WW}.in) \
$(shell echo Rivet/LHC{,-Matchbox,-Matchbox-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-ggHJet.in) \
$(shell echo Rivet/ISR{,-Dipole}-{{30,44,53,62}-UE,{44,62}-Z-mu}.in Rivet/EHS{,-Dipole}{,-Pion}-UE.in) \
$(shell echo Rivet/SPS{,-Dipole}-{17.4-UE,200-Z-mu}.in ) \
$(shell echo Rivet/Fermilab{,-Dipole}-{27.4,38.8}-Z-mu.in ) \
$(shell echo Rivet/EE-Gamma-Direct-mumu-{161,172,183,189,196,206}.in ) \
$(shell echo Rivet/EE-Gamma-Direct-tautau-{189,196,206}.in ) \
$(shell echo Rivet/EE-Gamma-{pi0,Eta,EtaPrime,EtaC,ChiC2,ChiC0_2P,ChiC2_2P}-10.58.in ) \
$(shell echo Rivet/EE-Gamma-{Eta-{1,29},EtaPrime-{34.3,91.2}}.in ) \
$(shell echo Rivet/EE-Gamma-{Direct,Single-Resolved,Double-Resolved}-Jets-{198,206}.in )
#$(shell echo Rivet/LHC{,-Dipole}-{7,13}{,-UE}-Cent.in )
Analysis/RivetHerwig.so: Analysis/*.cc
rivet-build Analysis/RivetHerwig.so Analysis/*.cc
Rivet-GammaGamma: Rivet-GammaGamma/done
touch $@
Rivet-GammaGamma/done: $(shell echo Rivet-GammaGamma-mumu-{3.5,4.5,5.5,6.5,7.5,9.0,12.5,17.5,30.0}.yoda )
rm -rf Rivet-GammaGamma
python/merge-GammaGamma GammaGamma
rivet-mkhtml -o Rivet-GammaGamma GammaGamma.yoda:Hw
touch $@
Rivet-EE-Gamma: Rivet-EE-Gamma/done
touch $@
Rivet-EE-Gamma/done: $(shell echo Rivet-EE-Gamma-Direct-mumu-{161,172,183,189,196,206}.yoda ) \
$(shell echo Rivet-EE-Gamma-Direct-tautau-{189,196,206}.yoda ) \
$(shell echo Rivet-EE-Gamma-{pi0,Eta,EtaPrime,EtaC,ChiC2,ChiC0_2P,ChiC2_2P}-10.58.yoda ) \
$(shell echo Rivet-EE-Gamma-{Eta-{1,29},EtaPrime-{34.3,91.2}}.yoda ) \
$(shell echo Rivet-EE-Gamma-{Direct,Single-Resolved,Double-Resolved}-Jets-{196,198,206}.yoda )
rm -rf Rivet-EE-Gamma
python/merge-EE-Gamma EE-Gamma
export RIVET_ANALYSIS_PATH=`pwd`/Analysis; rivet-mkhtml -o Rivet-EE-Gamma EE-Gamma.yoda:Hw
touch $@
Rivet-EE : Rivet-EE/done
touch $@
Rivet-EE/done : $(shell echo Rivet{,-Powheg}-EE-{12,12.8,13,14,14.8,17,21.5,22,22.5,25,26.8,27.6,27.7,29,30,30.2,30.3,30.5,30.7,30.8,31.2,31.3,31.6,34,34.5,34.8,35,36.2,41,41.5,42.1,42.6,43.5,43.6,44,45,48.0,50,52,53.3,55,55.3,56,57,58,59.5,60,60.8,61.4,65.4,66,75.7,76,82,85,91,91-nopi,93.0,130,130.1,133,136,136.1,161,161.3,172,172.3,177,182.8,183,188.6,189,192,194.4,196,197,200,200.2,202,205,206,206.2,207}.yoda) \
$(shell echo Rivet-EE-{183,189}-WW.yoda) \
$(shell echo Rivet-EE-{10.5,11.96,12.8,13.96,16.86,21.84,26.8,28.48,35.44,48.0,97.0}-gg.yoda) \
$(shell echo Rivet-EE-{2.0,2.2,2.23,2.396,2.4,2.6,2.644,2.8,2.9,3.0,3.05,3.2,3.4,3.5,3.63,3.67,4.03,4.17,4.18,4.3,4.41,4.5,4.6,4.8,5.0,5.2,5.8,6.2,6.5,6.6,7.0,7.4,7.7,8.8,9.27,9.4,9.46,9.51,10,10.4,10.45,10.47,10.52,10.52-sym,10.54,10.55,10.58,10.58-sym,10.6}.yoda) \
$(shell echo Rivet-EE-{Bc,Ds,Eta,Etac,JPsi,JPsi-All,Lambdab,Lambdac,LL-10.58,LL-197,LL-29,LL-58,LL-91,Omega-Baryon,Omegac0,Omega-Meson,Phi,Psi2S,Psi2S-All,Psi3770,Tau,Upsilon,Upsilon2,Upsilon3,Upsilon4,Upsilon4-asym,Upsilon5,Xi0,Xic0,Xicp,Xim}.yoda)
rm -rf Rivet-EE
python/merge-EE --with-gg --with-decay --with-WW EE
python/merge-EE Powheg-EE
rivet-mkhtml -o Rivet-EE EE.yoda:Hw Powheg-EE.yoda:Hw-Powheg
python/plot-EE Rivet-EE
touch $@
Onium-%.yoda:
export RIVET_ANALYSIS_PATH=`pwd`/Analysis; $(HWBUILD) -c .cache/$(subst .yoda,,$@) Rivet/$(subst .yoda,.in,$@)
export RIVET_ANALYSIS_PATH=`pwd`/Analysis; $(HWRUN) $(subst .yoda,.run,$@)
Onium-Splitting: Analysis/RivetHerwig.so
OUTPUT=`python/OniumSplitting.py --generate-input-files`; $(MAKE) $$OUTPUT NUMEVENTS=$${NUMEVENTS:-10000};
export RIVET_ANALYSIS_PATH=`pwd`/Analysis; python/OniumSplitting.py --fast --analyse
Onium-Sigma: Analysis/RivetHerwig.so
OUTPUT=`python/OniumSigma.py --generate-input-files | grep -v CT14 | grep -v LHAPDF | grep -v Eur.Phys`; $(MAKE) $$OUTPUT NUMEVENTS=$${NUMEVENTS:-10000};
export RIVET_ANALYSIS_PATH=`pwd`/Analysis; python/OniumSigma.py --fast --analyse
Rivet-LowEnergy-%.yoda:
export RIVET_ANALYSIS_PATH=`pwd`/Analysis; $(HWBUILD) -c .cache/$(subst .yoda,,$@) Rivet/$(subst .yoda,.in,$@)
export RIVET_ANALYSIS_PATH=`pwd`/Analysis; $(HWRUN) $(subst .yoda,.run,$@)
Rivet-LowEnergy-EE-%:
args="--process "$(word 1,$(subst -, ,$(subst Rivet-LowEnergy-EE-,,$@))); if [ -n "$(strip $(word 2,$(subst -, ,$(subst Rivet-LowEnergy-EE-,,$@))))" ]; then args+=" --flavour "$(word 2,$(subst -, ,$(subst Rivet-LowEnergy-EE-,,$@))); fi; OUTPUT=`python/LowEnergy-EE.py $$args --non-perturbative --perturbative`; $(MAKE) $$OUTPUT NUMEVENTS=$${NUMEVENTS:-10000};
args="--process "$(word 1,$(subst -, ,$(subst Rivet-LowEnergy-EE-,,$@))); plots=`python/LowEnergy-EE.py $$args --plots`; plots2=`echo $$plots | sed s"A-eA-mA"g | sed s"A-fA-mA"g`; python/mergeLowEnergy.py $(subst Rivet-LowEnergy-,,$@) $$plots; if [ -e LowEnergy-NonPerturbative-EE-$(subst Rivet-LowEnergy-EE-,,$@).yoda ] && [ -e LowEnergy-Perturbative-EE-$(subst Rivet-LowEnergy-EE-,,$@).yoda ]; then rivet-mkhtml -o Rivet-LowEnergy-EE-$(subst Rivet-LowEnergy-EE-,,$@) LowEnergy-NonPerturbative-EE-$(subst Rivet-LowEnergy-EE-,,$@).yoda:"Non-Pert" LowEnergy-Perturbative-EE-$(subst Rivet-LowEnergy-EE-,,$@).yoda:"Pert" $$plots2; elif [ -e LowEnergy-NonPerturbative-EE-$(subst Rivet-LowEnergy-EE-,,$@).yoda ]; then rivet-mkhtml -o Rivet-LowEnergy-EE-$(subst Rivet-LowEnergy-EE-,,$@) LowEnergy-NonPerturbative-EE-$(subst Rivet-LowEnergy-EE-,,$@).yoda:"Non-Pert" $$plots2; elif [ -e LowEnergy-Perturbative-EE-$(subst Rivet-LowEnergy-EE-,,$@).yoda ]; then rivet-mkhtml -o Rivet-LowEnergy-EE-$(subst Rivet-LowEnergy-EE-,,$@) LowEnergy-Perturbative-EE-$(subst Rivet-LowEnergy-EE-,,$@).yoda:"Pert" $$plots2; fi
Rivet-LowEnergy-Photon-%:
args="--process "$(word 1,$(subst -, ,$(subst Rivet-LowEnergy-Photon-,,$@))); if [ -n "$(strip $(word 2,$(subst -, ,$(subst Rivet-LowEnergy-Photon-,,$@))))" ]; then args+=" --flavour "$(word 2,$(subst -, ,$(subst Rivet-LowEnergy-Photon-,,$@))); fi; OUTPUT=`python/LowEnergy-Photon.py $$args --non-perturbative --perturbative --resonance`; $(MAKE) $$OUTPUT NUMEVENTS=$${NUMEVENTS:-10000};
- args="--process "$(word 1,$(subst -, ,$(subst Rivet-LowEnergy-Photon-,,$@))); plots=`python/LowEnergy-Photon.py $$args --plots`; yodaArgs=`python/mergeLowEnergy.py $(subst Rivet-LowEnergy-Photon-,GammaGamma-,$@) $$plots`; rivet-mkhtml -o Rivet-LowEnergy-Photon-$(subst Rivet-LowEnergy-Photon-,,$@) $$yodaArgs $$plots;
+ args="--process "$(word 1,$(subst -, ,$(subst Rivet-LowEnergy-Photon-,,$@))); plots=`python/LowEnergy-Photon.py $$args --plots`; plots2=`echo $$plots | sed s"A-eA-mA"g | sed s"A-fA-mA"g`; yodaArgs=`python/mergeLowEnergy.py $(subst Rivet-LowEnergy-Photon-,GammaGamma-,$@) $$plots`; rivet-mkhtml -o Rivet-LowEnergy-Photon-$(subst Rivet-LowEnergy-Photon-,,$@) $$yodaArgs $$plots2;
Rivet-R:
OUTPUT=`python/R.py --perturbative --non-perturbative`; $(MAKE) $$OUTPUT NUMEVENTS=$${NUMEVENTS:-10000};
plots=`python/R.py --perturbative --non-perturbative --plots`; python/mergeLowEnergy.py R $$plots; rivet-mkhtml -o Rivet-R LowEnergy-Perturbative-R.yoda:"Pert" LowEnergy-NonPerturbative-R.yoda:"Non-Pert" $$plots
Rivet-DIS : Rivet-DIS/done
touch $@
Rivet-DIS/done: $(shell echo Rivet{-DIS,-NoME-DIS,-Powheg-DIS}-{225,251,300,318,318-CMS}-e+-{VeryLow,Low,Med,High}Q2.yoda) \
$(shell echo Rivet{-DIS,-NoME-DIS,-Powheg-DIS}-{296,300,318}-e--{VeryLow,Low,Med,High}Q2.yoda) \
$(shell echo Rivet{-DIS,-NoME-DIS,-Powheg-DIS}-318-{e+,e-}-CC-{VeryLow,Low,Med,High}Q2.yoda)\
$(shell echo Rivet-Photo-{Direct,Resolved}-{300,318}-e+-Jets-{1..3}.yoda)
rm -rf Rivet-DIS
python/merge-DIS DIS
python/merge-DIS Powheg-DIS
python/merge-DIS NoME-DIS
rivet-mkhtml -o Rivet-DIS DIS.yoda:Hw Powheg-DIS.yoda:Hw-Powheg NoME-DIS.yoda:Hw-NoME
touch $@
Rivet-TVT-EW : Rivet-TVT-EW/done
touch $@
Rivet-TVT-EW/done: $(shell echo Rivet{,-Powheg}-TVT-{Run-I-Z,Run-I-W,Run-I-WZ,Run-II-Z-{e,{,LowMass-,HighMass-}mu},Run-II-W}.yoda)
rm -rf Rivet-TVT-EW
python/merge-TVT-EW TVT
python/merge-TVT-EW Powheg-TVT
rivet-mkhtml -o Rivet-TVT-EW TVT-EW.yoda:Hw Powheg-TVT-EW.yoda:Hw-Powheg
touch $@
Rivet-TVT-Photon : Rivet-TVT-Photon/done
touch $@
Rivet-TVT-Photon/done: $(shell echo Rivet{,-Powheg}-TVT-Run-II-{DiPhoton-GammaGamma,DiPhoton-GammaJet}.yoda Rivet-TVT-Run-II-PromptPhoton.yoda)
rm -rf Rivet-TVT-Photon
python/merge-TVT-Photon TVT
python/merge-TVT-Photon Powheg-TVT
rivet-mkhtml -o Rivet-TVT-Photon TVT-Photon.yoda:Hw Powheg-TVT-Photon.yoda:Hw-Powheg
touch $@
Rivet-TVT-Jets : Rivet-TVT-Jets/done
touch $@
Rivet-TVT-Jets/done: $(shell echo Rivet-TVT-Run-{I,II}-{Jets-{1..6},DiJets-{1..4}}.yoda ) \
$(shell echo Rivet-TVT-{630-Jets-{1..3},300-Jets-1,900-Jets-1}.yoda ) \
$(shell echo Rivet-TVT-{Run-I,Run-II,300,630,900}-UE.yoda)
rm -rf Rivet-TVT-Jets
python/merge-TVT-Jets TVT
rivet-mkhtml -o Rivet-TVT-Jets TVT-Jets.yoda:Hw
touch $@
Rivet-Fixed : Rivet-Fixed/done
touch $@
Rivet-Fixed/done : $(shell echo Rivet-SppS-{53,63,200,500,546,900}-UE.yoda ) \
$(shell echo Rivet-ISR-{{30,44,53,62}-UE,{44,62}-Z-mu}.yoda Rivet-EHS{,-Pion}-UE.yoda ) \
$(shell echo Rivet-Star-{UE,Jets-{1..4}}.yoda ) \
$(shell echo Rivet-SPS-{17.4-UE,200-Z-mu}.yoda ) \
$(shell echo Rivet-Fermilab-{27.4,38.8}-Z-mu.yoda )
rm -rf Rivet-Fixed
python/merge-Fixed Fixed
rivet-mkhtml -o Rivet-Fixed Fixed.yoda:Hw
touch $@
Rivet-LHC-Jets : Rivet-LHC-Jets/done
touch $@
Rivet-LHC-Jets/done : \
$(shell echo Rivet-LHC-7-DiJets-{1..7}-{A,B,C}.yoda ) \
$(shell echo Rivet-LHC-13-DiJets-{{1..11}-A,{6..11}-B}.yoda ) \
$(shell echo Rivet-LHC-{7,8,13}-Jets-{0..10}.yoda ) \
$(shell echo Rivet-LHC-2760-Jets-{1..3}.yoda ) \
$(shell echo Rivet-LHC-{900,2360,2760,7,8,13}-UE.yoda ) \
$(shell echo Rivet-LHC-{900,7,13}-UE-Long.yoda ) \
$(shell echo Rivet-LHC-7-Charm-{0..5}.yoda ) \
$(shell echo Rivet-LHC-{5,13}-Charm-0.yoda ) \
$(shell echo Rivet-LHC-7-Bottom-{0..9}.yoda ) \
$(shell echo Rivet-LHC-13-Bottom-{0..6}.yoda ) \
$(shell echo Rivet-LHC-{7,8,13}-Top-{L,SL}.yoda ) \
$(shell echo Rivet-LHC-{8,13}-Top-All.yoda )
# $(shell echo Rivet-LHC-{7,13}-UE-Cent.yoda )
rm -rf Rivet-LHC-Jets
python/merge-LHC-Jets LHC
rivet-mkhtml -o Rivet-LHC-Jets LHC-Jets.yoda:Hw
touch $@
Rivet-LHC-EW : Rivet-LHC-EW/done
touch $@
Rivet-LHC-EW/done: \
$(shell echo Rivet{,-Powheg}-LHC-{{,8-}W-{e,mu},13-W-mu,{2760-,,8-,13-}Z-{e,mu}-Mass{1..5},13-Z-nu,Z-mu-SOPHTY,WZ,WW-{emu,ll},13-WW-ll,ZZ-{ll,lv},{8,13}-WZ,13-ZZ-ll,8-ZZ-lv,8-WW-ll,Z-mu-Short}.yoda) \
$(shell echo Rivet-LHC-{7-W-Jet-{1..3}-e,7-Z-Jet-{0..3}-e,7-Z-Jet-0-mu}.yoda) \
$(shell echo Rivet-LHC-7-{W,Z}Gamma-{e,mu}.yoda) \
$(shell echo Rivet-LHC-8-ZGamma-{e,mu,nu}.yoda)
rm -rf Rivet-LHC-EW;
python/merge-LHC-EW LHC
python/merge-LHC-EW Powheg-LHC
rivet-mkhtml -o Rivet-LHC-EW LHC-EW.yoda:Hw Powheg-LHC-EW.yoda:Hw-Powheg \
Rivet-LHC-Z-mu-SOPHTY.yoda:Hw Rivet-Powheg-LHC-Z-mu-SOPHTY.yoda:Hw-Powheg
touch $@
Rivet-LHC-Photon : Rivet-LHC-Photon/done
touch $@
Rivet-LHC-Photon/done: \
$(shell echo Rivet-LHC-{7,8,13}-PromptPhoton-{1..5}.yoda) \
Rivet-LHC-GammaGamma-7.yoda \
$(shell echo Rivet{,-Powheg}-LHC-{7,8,13}-{DiPhoton-GammaGamma,DiPhoton-GammaJet}.yoda)
rm -rf Rivet-LHC-Photon
python/merge-LHC-Photon LHC
python/merge-LHC-Photon Powheg-LHC
rivet-mkhtml -o Rivet-LHC-Photon LHC-Photon.yoda:Hw Powheg-LHC-Photon.yoda:Hw-Powheg
touch $@
Rivet-LHC-Higgs : Rivet-LHC-Higgs/done
touch $@
Rivet-LHC-Higgs/done: \
$(shell echo Rivet{,-Powheg}-LHC-{ggH,VBF,WH,ZH}.yoda) \
$(shell echo Rivet{,-Powheg}-LHC-8-{{ggH,VBF,WH,ZH}{,-GammaGamma},ggH-WW}.yoda) \
Rivet-LHC-ggHJet.yoda
rivet-merge Rivet-Powheg-LHC-8-{ggH{-GammaGamma,-WW,},{VBF,ZH,WH}{,-GammaGamma}}.yoda -o Powheg-LHC-Higgs.yoda
rivet-merge Rivet-LHC-8-{ggH{-GammaGamma,-WW,},{VBF,ZH,WH}{,-GammaGamma}}.yoda -o LHC-Higgs.yoda
rm -rf Rivet-LHC-Higgs
rivet-mkhtml -o Rivet-LHC-Higgs Powheg-LHC-Higgs.yoda:Hw-Powheg LHC-Higgs.yoda:Hw\
Rivet-Powheg-LHC-ggH.yoda:gg-Powheg Rivet-LHC-ggH.yoda:gg Rivet-LHC-ggHJet.yoda:HJet \
Rivet-Powheg-LHC-VBF.yoda:VBF-Powheg Rivet-LHC-VBF.yoda:VBF Rivet-LHC-WH.yoda:WH Rivet-LHC-ZH.yoda:ZH \
Rivet-Powheg-LHC-WH.yoda:WH-Powheg Rivet-Powheg-LHC-ZH.yoda:ZH-Powheg
touch $@
clean-local:
rm -f *.out *.log *.tex *.top *.run *.dump *.mult *.Bmult *.yoda Rivet/*.in anatohepmc.txt hepmctoana.txt
rm -rf Rivet-*
rm -rf Onium-Splitting
rm -rf Analysis/*.so
distclean-local:
rm -rf .cache
diff --git a/Tests/Rivet/DIS/DIS-225-e+.in b/Tests/Rivet/DIS/DIS-225-e+.in
--- a/Tests/Rivet/DIS/DIS-225-e+.in
+++ b/Tests/Rivet/DIS/DIS-225-e+.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 460.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
+insert /Herwig/Analysis/Rivet:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-251-e+.in b/Tests/Rivet/DIS/DIS-251-e+.in
--- a/Tests/Rivet/DIS/DIS-251-e+.in
+++ b/Tests/Rivet/DIS/DIS-251-e+.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 575.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
+insert /Herwig/Analysis/Rivet:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-296-e-.in b/Tests/Rivet/DIS/DIS-296-e-.in
--- a/Tests/Rivet/DIS/DIS-296-e-.in
+++ b/Tests/Rivet/DIS/DIS-296-e-.in
@@ -1,18 +1,18 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 820.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e-
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 26.7*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/Cuts:MHatMin 0.
# H1 energy flow analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1994_I372350
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1995_S3167097
+insert /Herwig/Analysis/Rivet:Analyses 0 H1_1994_I372350
+#insert /Herwig/Analysis/Rivet:Analyses 0 H1_1995_S3167097
# H1 fragmentation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1995_I394793
+insert /Herwig/Analysis/Rivet:Analyses 0 H1_1995_I394793
# ZEUS charged particle
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_1995_I392386
+insert /Herwig/Analysis/Rivet:Analyses 0 ZEUS_1995_I392386
# ZEUS strange particle
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_1995_I395196
+insert /Herwig/Analysis/Rivet:Analyses 0 ZEUS_1995_I395196
diff --git a/Tests/Rivet/DIS/DIS-300-e+.in b/Tests/Rivet/DIS/DIS-300-e+.in
--- a/Tests/Rivet/DIS/DIS-300-e+.in
+++ b/Tests/Rivet/DIS/DIS-300-e+.in
@@ -1,31 +1,31 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 820.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/Cuts:MHatMin 0.
# H1 energy flow analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_2000_I503947
+insert /Herwig/Analysis/Rivet:Analyses 0 H1_2000_I503947
# ZEUS jets analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2010_I875006
+insert /Herwig/Analysis/Rivet:Analyses 0 ZEUS_2010_I875006
# ZEUS F2
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_1996_I420332
+insert /Herwig/Analysis/Rivet:Analyses 0 ZEUS_1996_I420332
# HERA F2
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
+insert /Herwig/Analysis/Rivet:Analyses 0 HERA_2015_I1377206
# H1 charged particle
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1996_I422230
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1996_I424463
+insert /Herwig/Analysis/Rivet:Analyses 0 H1_1996_I422230
+insert /Herwig/Analysis/Rivet:Analyses 0 H1_1996_I424463
# H1 D*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1999_I481112
+insert /Herwig/Analysis/Rivet:Analyses 0 H1_1999_I481112
# H1 event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_2006_I699835
+insert /Herwig/Analysis/Rivet:Analyses 0 H1_2006_I699835
# ZEUS forward
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_1999_I470499
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_1999_I508906
+insert /Herwig/Analysis/Rivet:Analyses 0 ZEUS_1999_I470499
+insert /Herwig/Analysis/Rivet:Analyses 0 ZEUS_1999_I508906
# zeus neutral current
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_1999_I500267
+insert /Herwig/Analysis/Rivet:Analyses 0 ZEUS_1999_I500267
# H1 fragmentation and multiplicity distributions in the Breit frame
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1997_I445116
+insert /Herwig/Analysis/Rivet:Analyses 0 H1_1997_I445116
diff --git a/Tests/Rivet/DIS/DIS-300-e-.in b/Tests/Rivet/DIS/DIS-300-e-.in
--- a/Tests/Rivet/DIS/DIS-300-e-.in
+++ b/Tests/Rivet/DIS/DIS-300-e-.in
@@ -1,17 +1,17 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 820.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e-
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/Cuts:MHatMin 0.
# H1 D/D*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1996_I421105
+insert /Herwig/Analysis/Rivet:Analyses 0 H1_1996_I421105
# H1 D production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_2002_I561885
+insert /Herwig/Analysis/Rivet:Analyses 0 H1_2002_I561885
# ZEUS azimuthal
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2000_I524911
+insert /Herwig/Analysis/Rivet:Analyses 0 ZEUS_2000_I524911
# H1 forward pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1999_I504022
+insert /Herwig/Analysis/Rivet:Analyses 0 H1_1999_I504022
diff --git a/Tests/Rivet/DIS/DIS-318-CMS-e+.in b/Tests/Rivet/DIS/DIS-318-CMS-e+.in
--- a/Tests/Rivet/DIS/DIS-318-CMS-e+.in
+++ b/Tests/Rivet/DIS/DIS-318-CMS-e+.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 159.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 159.*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/Cuts:MHatMin 0.
# H1 strangeness
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_2009_I810046
+insert /Herwig/Analysis/Rivet:Analyses 0 H1_2009_I810046
# combined D/D*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1353667
+insert /Herwig/Analysis/Rivet:Analyses 0 HERA_2015_I1353667
diff --git a/Tests/Rivet/DIS/DIS-318-e+-CC.in b/Tests/Rivet/DIS/DIS-318-e+-CC.in
--- a/Tests/Rivet/DIS/DIS-318-e+-CC.in
+++ b/Tests/Rivet/DIS/DIS-318-e+-CC.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/ChargedCurrentCut:MinW2 0.
set /Herwig/Cuts/ChargedCurrentCut:MaxW2 1e10
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
+insert /Herwig/Analysis/Rivet:Analyses 0 HERA_2015_I1377206
# ZEUS multijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2008_I780108
+insert /Herwig/Analysis/Rivet:Analyses 0 ZEUS_2008_I780108
diff --git a/Tests/Rivet/DIS/DIS-318-e+.in b/Tests/Rivet/DIS/DIS-318-e+.in
--- a/Tests/Rivet/DIS/DIS-318-e+.in
+++ b/Tests/Rivet/DIS/DIS-318-e+.in
@@ -1,21 +1,21 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
+insert /Herwig/Analysis/Rivet:Analyses 0 HERA_2015_I1377206
# H1 charged particle
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_2013_I1217865
+insert /Herwig/Analysis/Rivet:Analyses 0 H1_2013_I1217865
# ZEUS D meson
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2008_I810112
+insert /Herwig/Analysis/Rivet:Analyses 0 ZEUS_2008_I810112
# H1 D
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_2007_I736052
+insert /Herwig/Analysis/Rivet:Analyses 0 H1_2007_I736052
# ZEUS strangeness
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2011_I945935
+insert /Herwig/Analysis/Rivet:Analyses 0 ZEUS_2011_I945935
# H1 beauty production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_2005_I676166
+insert /Herwig/Analysis/Rivet:Analyses 0 H1_2005_I676166
diff --git a/Tests/Rivet/DIS/DIS-318-e--CC.in b/Tests/Rivet/DIS/DIS-318-e--CC.in
--- a/Tests/Rivet/DIS/DIS-318-e--CC.in
+++ b/Tests/Rivet/DIS/DIS-318-e--CC.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e-
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/ChargedCurrentCut:MinW2 0.
set /Herwig/Cuts/ChargedCurrentCut:MaxW2 1e10
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
+insert /Herwig/Analysis/Rivet:Analyses 0 HERA_2015_I1377206
# ZEUS multijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2008_I780108
+insert /Herwig/Analysis/Rivet:Analyses 0 ZEUS_2008_I780108
diff --git a/Tests/Rivet/DIS/DIS-318-e-.in b/Tests/Rivet/DIS/DIS-318-e-.in
--- a/Tests/Rivet/DIS/DIS-318-e-.in
+++ b/Tests/Rivet/DIS/DIS-318-e-.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e-
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
+insert /Herwig/Analysis/Rivet:Analyses 0 HERA_2015_I1377206
# ZEUS D production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2008_I810112
+insert /Herwig/Analysis/Rivet:Analyses 0 ZEUS_2008_I810112
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-ChiC0_2P-10.58.in b/Tests/Rivet/EE-Gamma/EE-Gamma-ChiC0_2P-10.58.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-ChiC0_2P-10.58.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-ChiC0_2P-10.58.in
@@ -1,18 +1,18 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 3.5*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 8.*GeV
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 3.6
set /Herwig/Generators/EventGenerator:EventHandler:StatLevel Full
set /Herwig/Partons/EEExtractor:FlatSHatY 1
set /Herwig/ACDCSampler:Ntry 100000
set /Herwig/Generators/EventGenerator:EventHandler:CascadeHandler NULL
##################################################
# select the analyses
##################################################
# BELLE chi_c0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2010_I841003
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2010_I841003
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-ChiC2-10.58.in b/Tests/Rivet/EE-Gamma/EE-Gamma-ChiC2-10.58.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-ChiC2-10.58.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-ChiC2-10.58.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 10.58
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.9
set /Herwig/Generators/EventGenerator:EventHandler:StatLevel Full
set /Herwig/Partons/EEExtractor:FlatSHatY 1
set /Herwig/ACDCSampler:Ntry 100000
set /Herwig/Generators/EventGenerator:EventHandler:CascadeHandler NULL
##################################################
# select the analyses
##################################################
# BABAR chi_c2
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1994_I359316
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1994_I359316
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-ChiC2_2P-10.58.in b/Tests/Rivet/EE-Gamma/EE-Gamma-ChiC2_2P-10.58.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-ChiC2_2P-10.58.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-ChiC2_2P-10.58.in
@@ -1,20 +1,20 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 3.5*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 8.*GeV
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 3.6
set /Herwig/Generators/EventGenerator:EventHandler:StatLevel Full
set /Herwig/Partons/EEExtractor:FlatSHatY 1
set /Herwig/ACDCSampler:Ntry 100000
set /Herwig/Generators/EventGenerator:EventHandler:CascadeHandler NULL
##################################################
# select the analyses
##################################################
# BABAR chi_c2
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2010_I844288
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2010_I844288
# BELLE chi_c2
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2006_I700451
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2006_I700451
\ No newline at end of file
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Eta-1.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Eta-1.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Eta-1.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Eta-1.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 1.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.9
set /Herwig/Generators/EventGenerator:EventHandler:StatLevel Full
set /Herwig/Partons/EEExtractor:FlatSHatY 1
set /Herwig/ACDCSampler:Ntry 100000
set /Herwig/Generators/EventGenerator:EventHandler:CascadeHandler NULL
##################################################
# select the analyses
##################################################
# KLOE eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE_2013_I1199266
+insert /Herwig/Analysis/Rivet:Analyses 0 KLOE_2013_I1199266
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Eta-10.58.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Eta-10.58.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Eta-10.58.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Eta-10.58.in
@@ -1,17 +1,17 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 10.58
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.9
set /Herwig/Generators/EventGenerator:EventHandler:StatLevel Full
set /Herwig/Partons/EEExtractor:FlatSHatY 1
set /Herwig/ACDCSampler:Ntry 100000
set /Herwig/Generators/EventGenerator:EventHandler:CascadeHandler NULL
##################################################
# select the analyses
##################################################
# CLEO pi0, eta, eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1997_I446031
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1997_I446031
# BABAR eta eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2011_I883525
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2011_I883525
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Eta-29.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Eta-29.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Eta-29.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Eta-29.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 29.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.9
set /Herwig/Generators/EventGenerator:EventHandler:StatLevel Full
set /Herwig/Partons/EEExtractor:FlatSHatY 1
set /Herwig/ACDCSampler:Ntry 100000
set /Herwig/Generators/EventGenerator:EventHandler:CascadeHandler NULL
##################################################
# select the analyses
##################################################
# TPC eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1986_I217503
+insert /Herwig/Analysis/Rivet:Analyses 0 TPC_1986_I217503
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-EtaC-10.58.in b/Tests/Rivet/EE-Gamma/EE-Gamma-EtaC-10.58.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-EtaC-10.58.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-EtaC-10.58.in
@@ -1,17 +1,17 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 10.58
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.9
set /Herwig/Generators/EventGenerator:EventHandler:StatLevel Full
set /Herwig/Partons/EEExtractor:FlatSHatY 1
set /Herwig/ACDCSampler:Ntry 100000
set /Herwig/Generators/EventGenerator:EventHandler:CascadeHandler NULL
# set wavefunction to value from eta_c -> gamma gamma
do /Herwig/OniumParameters:SetWaveFunction ccbar 1S 0.363269
##################################################
# select the analyses
##################################################
# BABAR eta_c
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2010_I845914
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2010_I845914
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-EtaPrime-10.58.in b/Tests/Rivet/EE-Gamma/EE-Gamma-EtaPrime-10.58.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-EtaPrime-10.58.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-EtaPrime-10.58.in
@@ -1,19 +1,19 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 10.58
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.9
set /Herwig/Generators/EventGenerator:EventHandler:StatLevel Full
set /Herwig/Partons/EEExtractor:FlatSHatY 1
set /Herwig/ACDCSampler:Ntry 100000
set /Herwig/Generators/EventGenerator:EventHandler:CascadeHandler NULL
##################################################
# select the analyses
##################################################
# CLEO pi0, eta, eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1997_I446031
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1997_I446031
# BABAR eta eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2011_I883525
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2011_I883525
# BABAR eta' double diff
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2018_I1691222
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2018_I1691222
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-EtaPrime-34.3.in b/Tests/Rivet/EE-Gamma/EE-Gamma-EtaPrime-34.3.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-EtaPrime-34.3.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-EtaPrime-34.3.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 34.3
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.9
set /Herwig/Generators/EventGenerator:EventHandler:StatLevel Full
set /Herwig/Partons/EEExtractor:FlatSHatY 1
set /Herwig/ACDCSampler:Ntry 100000
set /Herwig/Generators/EventGenerator:EventHandler:CascadeHandler NULL
##################################################
# select the analyses
##################################################
# JADE eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1982_I177090
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1982_I177090
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-EtaPrime-91.2.in b/Tests/Rivet/EE-Gamma/EE-Gamma-EtaPrime-91.2.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-EtaPrime-91.2.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-EtaPrime-91.2.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 91.2
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.9
set /Herwig/Generators/EventGenerator:EventHandler:StatLevel Full
set /Herwig/Partons/EEExtractor:FlatSHatY 1
set /Herwig/ACDCSampler:Ntry 100000
set /Herwig/Generators/EventGenerator:EventHandler:CascadeHandler NULL
##################################################
# select the analyses
##################################################
# L3 eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1998_I447945
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_1998_I447945
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-196.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-196.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-196.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-196.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 195.8.
##################################################
# select the analyses
##################################################
# OPAL charge particles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2007_I734955
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2007_I734955
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-198.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-198.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-198.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-198.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 198.
##################################################
# select the analyses
##################################################
# L3 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I661114
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I661114
# OPAL jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2003_I611415
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2003_I611415
\ No newline at end of file
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-206.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-206.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-206.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 206.
##################################################
# select the analyses
##################################################
# OPAL jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2008_I754316
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2008_I754316
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Onium-91.2.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Onium-91.2.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Onium-91.2.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Onium-91.2.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 91.2
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.9
set /Herwig/Generators/EventGenerator:EventHandler:StatLevel Full
set /Herwig/Partons/EEExtractor:FlatSHatY 1
set /Herwig/ACDCSampler:Ntry 100000
set /Herwig/Generators/EventGenerator:EventHandler:CascadeHandler NULL
##################################################
# select the analyses
##################################################
# MC ONIUM analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_EEtoEEX
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_EEtoEEX
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-161.in b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-161.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-161.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-161.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 161.
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-172.in b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-172.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-172.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-172.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 172.
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-183.in b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-183.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-183.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-183.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 183.
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-189.in b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-189.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-189.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-189.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 189.
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-196.in b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-196.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-196.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-196.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 196.
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-206.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-206.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-206.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 206.
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-pi0-10.58.in b/Tests/Rivet/EE-Gamma/EE-Gamma-pi0-10.58.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-pi0-10.58.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-pi0-10.58.in
@@ -1,19 +1,19 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 10.58
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.9
set /Herwig/Generators/EventGenerator:EventHandler:StatLevel Full
set /Herwig/Partons/EEExtractor:FlatSHatY 1
set /Herwig/ACDCSampler:Ntry 100000
set /Herwig/Generators/EventGenerator:EventHandler:CascadeHandler NULL
##################################################
# select the analyses
##################################################
# CLEO pi0, eta, eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1997_I446031
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1997_I446031
# BELLE pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2012_I1114749
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2012_I1114749
# BABAR pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2009_I821653
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2009_I821653
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-tautau-189.in b/Tests/Rivet/EE-Gamma/EE-Gamma-tautau-189.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-tautau-189.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-tautau-189.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 189.
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-tautau-196.in b/Tests/Rivet/EE-Gamma/EE-Gamma-tautau-196.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-tautau-196.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-tautau-196.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 196.
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-tautau-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-tautau-206.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-tautau-206.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-tautau-206.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 206.
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127
diff --git a/Tests/Rivet/EE/EE-10.4.in b/Tests/Rivet/EE/EE-10.4.in
--- a/Tests/Rivet/EE/EE-10.4.in
+++ b/Tests/Rivet/EE/EE-10.4.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.225
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.225
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
# D*+ spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1982_I178490
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1985_I204851
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1982_I178490
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1985_I204851
diff --git a/Tests/Rivet/EE/EE-10.45.in b/Tests/Rivet/EE/EE-10.45.in
--- a/Tests/Rivet/EE/EE-10.45.in
+++ b/Tests/Rivet/EE/EE-10.45.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.225
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.225
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
# BELLE charm hadron production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_I356616
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_I342061
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1993_I356616
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1993_I342061
# CLEO kaon
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1982_I180612
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1982_I180612
diff --git a/Tests/Rivet/EE/EE-10.47.in b/Tests/Rivet/EE/EE-10.47.in
--- a/Tests/Rivet/EE/EE-10.47.in
+++ b/Tests/Rivet/EE/EE-10.47.in
@@ -1,16 +1,16 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.235
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.235
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
# ARGUS charged particle multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1992_I319102
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1992_I319102
# ARGUS charm hadron production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1991_I315059
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1992_I319829
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1991_I315059
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1992_I319829
# CLEO Identified particle spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1985_I205668
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1985_I205668
diff --git a/Tests/Rivet/EE/EE-10.5-gg.in b/Tests/Rivet/EE/EE-10.5-gg.in
--- a/Tests/Rivet/EE/EE-10.5-gg.in
+++ b/Tests/Rivet/EE/EE-10.5-gg.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 10.5
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
##################################################
# select the analyses
##################################################
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I631361
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I631361
diff --git a/Tests/Rivet/EE/EE-10.52-sym.in b/Tests/Rivet/EE/EE-10.52-sym.in
--- a/Tests/Rivet/EE/EE-10.52-sym.in
+++ b/Tests/Rivet/EE/EE-10.52-sym.in
@@ -1,28 +1,28 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.26*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.26*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.50
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
# CLEO charm hadron production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2004_I645209
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2000_I526554
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2004_I645209
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2000_I526554
# CLEO baryon assymetry
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2001_I552541
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2001_I552541
# BELLE charm hadron production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2017_I1606201
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2017_I1606201
# CLEO D* polarization
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1998_I467595
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1998_I467595
# CLEO D* polarization
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1991_I314060
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1991_I314060
# CLEO D_1/D_2 decay
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1990_I281039
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1990_I281039
# ARGUS Xi_c+ spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I296522
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1990_I296522
# BELLE Sigma_c(2800) spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2004_I668024
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2004_I668024
# BELLE charm hadron producion
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2005_I686014
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2005_I686014
diff --git a/Tests/Rivet/EE/EE-10.52.in b/Tests/Rivet/EE/EE-10.52.in
--- a/Tests/Rivet/EE/EE-10.52.in
+++ b/Tests/Rivet/EE/EE-10.52.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 3.5*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 7.91*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
# BELLE charm hadron production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2013_I1216515
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2013_I1216515
diff --git a/Tests/Rivet/EE/EE-10.54.in b/Tests/Rivet/EE/EE-10.54.in
--- a/Tests/Rivet/EE/EE-10.54.in
+++ b/Tests/Rivet/EE/EE-10.54.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 3.5*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 7.94*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
# BABAR Xi_c production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2005_I679961
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2005_I679961
# BABAR Lambda_c production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I725377
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2007_I725377
# BABAR pions, kaons and protons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2013_I1238276
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2013_I1238276
diff --git a/Tests/Rivet/EE/EE-10.55.in b/Tests/Rivet/EE/EE-10.55.in
--- a/Tests/Rivet/EE/EE-10.55.in
+++ b/Tests/Rivet/EE/EE-10.55.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.255*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.255*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
# CLEO charm hadrons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1988_I22954
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1988_I22954
\ No newline at end of file
diff --git a/Tests/Rivet/EE/EE-10.58-sym.in b/Tests/Rivet/EE/EE-10.58-sym.in
--- a/Tests/Rivet/EE/EE-10.58-sym.in
+++ b/Tests/Rivet/EE/EE-10.58-sym.in
@@ -1,18 +1,18 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.29*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.29*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.50
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/MatrixElements/MEee2gZ2qq:MaximumFlavour 4
# BELLE charged particle spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2019_I1718551
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2020_I1777678
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2025_I2849895
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2019_I1718551
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2020_I1777678
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2025_I2849895
# BABAR azimuthal
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2014_I1254862
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2015_I1377201
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2014_I1254862
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2015_I1377201
# BELLE azimuthal
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2019_I1752523
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2019_I1752523
diff --git a/Tests/Rivet/EE/EE-10.58.in b/Tests/Rivet/EE/EE-10.58.in
--- a/Tests/Rivet/EE/EE-10.58.in
+++ b/Tests/Rivet/EE/EE-10.58.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 3.5*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 8.*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
# BABAR Xi_c production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2005_I679961
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2005_I679961
diff --git a/Tests/Rivet/EE/EE-10.6.in b/Tests/Rivet/EE/EE-10.6.in
--- a/Tests/Rivet/EE/EE-10.6.in
+++ b/Tests/Rivet/EE/EE-10.6.in
@@ -1,66 +1,66 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.3*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.3*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.50
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
# BELLE Lambda polarization
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2019_I1687566
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2019_I1687566
# BELLE charmonium
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2002_I563840
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2002_I563840
# CLEO Xi'_c production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1999_I478217
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1999_I478217
# CLEO Xi_c production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1995_I404590
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1995_I404590
# CLEO Xi_c1 production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1999_I501417
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1999_I501417
# CLEO D_s1 production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1993_I352823
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1993_I352823
# BABAR D_s1 production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2011_I892421
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2011_I892421
# BELLE D_s1 production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2008_I762013
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2008_I762013
# CLEO Lambda_c* production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I381696
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1994_I381696
# ARGUS Lambda_c* production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1997_I440304
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_I357132
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1997_I440304
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1993_I357132
# CLEO Xi_c*0 production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1995_I397770
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1995_I397770
# CLEO Xi_c*+ production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1996_I416471
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1996_I416471
# CLEO D_1+, D_2+ production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I378319
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1994_I378319
# CLEO D_10, D_20 production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I372349
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1994_I372349
# ARGUS D_s2
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1995_I397794
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1995_I397794
# CLEO Sigma_c*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1997_I424575
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1997_I424575
# CLEO Lambda_c
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1990_I298611
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1990_I298611
# BABAR Omega_c spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I746745
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2007_I746745
# BABAR Xi'_c spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I722622
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2007_I722622
# BABAR J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2001_I558091
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2001_I558091
# BABAR D_s spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2002_I582184
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2002_I582184
# BABAR D_s 2317 and 2460 spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I714447
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2006_I714447
# BABAR anti-deuteron
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2014_I1286317
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2014_I1286317
# BABAR Omega_c
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I724557
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2006_I724557
# BELLE dihadron
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2017_I1607562
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2017_I1607562
# BELLE Xi_c(2790)
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2021_I1809180
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2021_I1809180
# BELLE Lambda_c(2880)
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2007_I723916
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2007_I723916
# BELLE J/psi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2009_I811289
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2009_I811289
diff --git a/Tests/Rivet/EE/EE-10.in b/Tests/Rivet/EE/EE-10.in
--- a/Tests/Rivet/EE/EE-10.in
+++ b/Tests/Rivet/EE/EE-10.in
@@ -1,43 +1,43 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 10.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.
##################################################
# select the analyses
##################################################
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES_RATIOS
+insert /Herwig/Analysis/Rivet:Analyses 0 PDG_HADRON_MULTIPLICITIES
+insert /Herwig/Analysis/Rivet:Analyses 0 PDG_HADRON_MULTIPLICITIES_RATIOS
# ARGUS D2 spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I268577
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1989_I268577
# ARGUS D1/D2 spectrum and decay angles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I280943
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1989_I280943
# ARGUS sigma_c spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I261672
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1988_I261672
# argus phi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I276860
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262415
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1989_I262551
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1989_I276860
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1988_I251097
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1989_I262415
# BABAR D hadron decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2010_I867611
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2010_I867611
# BABAR D_s hadron decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2009_I827985
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2009_I827985
# LHCB D hadron decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2013_I1243156
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2013_I1243156
# LHCB D_s hadron decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2016_I1414195
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2016_I1414195
# LENA thrust and mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LENA_1981_I164397
+insert /Herwig/Analysis/Rivet:Analyses 0 LENA_1981_I164397
# ARGUS thrust
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1986_I227324
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1986_I227324
# ARGUS D_s1 production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I282570
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1989_I282570
# ARGUS Delta++
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I278932
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1989_I278932
# pp and lambda lambda pairs
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I295621
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1990_I295621
# baryon-antibaryon correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I266892
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1988_I266892
diff --git a/Tests/Rivet/EE/EE-11.96-gg.in b/Tests/Rivet/EE/EE-11.96-gg.in
--- a/Tests/Rivet/EE/EE-11.96-gg.in
+++ b/Tests/Rivet/EE/EE-11.96-gg.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 11.96
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
##################################################
# select the analyses
##################################################
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I631361
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I631361
diff --git a/Tests/Rivet/EE/EE-12.8-gg.in b/Tests/Rivet/EE/EE-12.8-gg.in
--- a/Tests/Rivet/EE/EE-12.8-gg.in
+++ b/Tests/Rivet/EE/EE-12.8-gg.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 12.8
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
##################################################
# select the analyses
##################################################
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I648738
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I648738
diff --git a/Tests/Rivet/EE/EE-12.8.in b/Tests/Rivet/EE/EE-12.8.in
--- a/Tests/Rivet/EE/EE-12.8.in
+++ b/Tests/Rivet/EE/EE-12.8.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 12.8
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
##################################################
# select the analyses
##################################################
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I648738
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I648738
diff --git a/Tests/Rivet/EE/EE-12.in b/Tests/Rivet/EE/EE-12.in
--- a/Tests/Rivet/EE/EE-12.in
+++ b/Tests/Rivet/EE/EE-12.in
@@ -1,22 +1,22 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 12.0
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
# tasso event shapes at various energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1984_I195333
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1983_I190818
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153511
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153656
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1984_I195333
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1980_I154270
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1983_I190818
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1981_I165122
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1982_I177174
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1981_I156315
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1980_I153511
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1980_I153656
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1983_I191161
diff --git a/Tests/Rivet/EE/EE-13.96-gg.in b/Tests/Rivet/EE/EE-13.96-gg.in
--- a/Tests/Rivet/EE/EE-13.96-gg.in
+++ b/Tests/Rivet/EE/EE-13.96-gg.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 13.96
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
##################################################
# select the analyses
##################################################
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I631361
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I631361
diff --git a/Tests/Rivet/EE/EE-13.in b/Tests/Rivet/EE/EE-13.in
--- a/Tests/Rivet/EE/EE-13.in
+++ b/Tests/Rivet/EE/EE-13.in
@@ -1,16 +1,16 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 13.0
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1980_I154270
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1981_I156315
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1980_I143691
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1983_I191161
diff --git a/Tests/Rivet/EE/EE-130.1.in b/Tests/Rivet/EE/EE-130.1.in
--- a/Tests/Rivet/EE/EE-130.1.in
+++ b/Tests/Rivet/EE/EE-130.1.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 130.1
##################################################
# select the analyses
##################################################
# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-130.in b/Tests/Rivet/EE/EE-130.in
--- a/Tests/Rivet/EE/EE-130.in
+++ b/Tests/Rivet/EE/EE-130.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 130.
##################################################
# select the analyses
##################################################
# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_I601225
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2002_I601225
diff --git a/Tests/Rivet/EE/EE-133.in b/Tests/Rivet/EE/EE-133.in
--- a/Tests/Rivet/EE/EE-133.in
+++ b/Tests/Rivet/EE/EE-133.in
@@ -1,19 +1,19 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 133.
##################################################
# select the analyses
##################################################
# OPAL event shapes and multiplicities at different energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I669402
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I669402
# ALEPH jet and event shapes at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_I636645
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_2004_I636645
# OPAL/JADE jet rates at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_I513337
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_OPAL_2000_I513337
# DELPHI event shapes at different energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1999_I499183
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1999_I499183
# DELPHI particle spectra in WW
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2001_I526164
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2001_I526164
diff --git a/Tests/Rivet/EE/EE-136.1.in b/Tests/Rivet/EE/EE-136.1.in
--- a/Tests/Rivet/EE/EE-136.1.in
+++ b/Tests/Rivet/EE/EE-136.1.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 136.1
##################################################
# select the analyses
##################################################
# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-136.in b/Tests/Rivet/EE/EE-136.in
--- a/Tests/Rivet/EE/EE-136.in
+++ b/Tests/Rivet/EE/EE-136.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 136.
##################################################
# select the analyses
##################################################
# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_I601225
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2002_I601225
diff --git a/Tests/Rivet/EE/EE-14.8.in b/Tests/Rivet/EE/EE-14.8.in
--- a/Tests/Rivet/EE/EE-14.8.in
+++ b/Tests/Rivet/EE/EE-14.8.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 14.8
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso event shapes at various low energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I284251
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1990_I284251
diff --git a/Tests/Rivet/EE/EE-14.in b/Tests/Rivet/EE/EE-14.in
--- a/Tests/Rivet/EE/EE-14.in
+++ b/Tests/Rivet/EE/EE-14.in
@@ -1,23 +1,23 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 14.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso event shapes at various low energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1984_I195333
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I294755
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I277658
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1983_I181470
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1983_I191415
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I202784
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I168232
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1985_I205119
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I279165
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1984_I195333
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1990_I294755
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1989_I277658
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1983_I181470
+insert /Herwig/Analysis/Rivet:Analyses 0 CELLO_1983_I191415
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1987_I248660
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1984_I202784
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1982_I168232
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1982_I177174
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1985_I205119
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1989_I279165
# JADE gamma,pi and eta spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1985_I213948
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1985_I213948
\ No newline at end of file
diff --git a/Tests/Rivet/EE/EE-16.86-gg.in b/Tests/Rivet/EE/EE-16.86-gg.in
--- a/Tests/Rivet/EE/EE-16.86-gg.in
+++ b/Tests/Rivet/EE/EE-16.86-gg.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 16.86
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
##################################################
# select the analyses
##################################################
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I631361
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I631361
diff --git a/Tests/Rivet/EE/EE-161.3.in b/Tests/Rivet/EE/EE-161.3.in
--- a/Tests/Rivet/EE/EE-161.3.in
+++ b/Tests/Rivet/EE/EE-161.3.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 161.3
##################################################
# select the analyses
##################################################
# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I652683
\ No newline at end of file
diff --git a/Tests/Rivet/EE/EE-161.in b/Tests/Rivet/EE/EE-161.in
--- a/Tests/Rivet/EE/EE-161.in
+++ b/Tests/Rivet/EE/EE-161.in
@@ -1,21 +1,21 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 161.
##################################################
# select the analyses
##################################################
# ALEPH jet and event shapes at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_I636645
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_2004_I636645
# OPAL/JADE jet rates at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_I513337
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_OPAL_2000_I513337
# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_I601225
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2002_I601225
# OPAL event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_I440721
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1997_I440721
# DELPHI event shapes at different energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1999_I499183
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1999_I499183
# DELPHI particle spectra in WW
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2001_I526164
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2001_I526164
diff --git a/Tests/Rivet/EE/EE-17.in b/Tests/Rivet/EE/EE-17.in
--- a/Tests/Rivet/EE/EE-17.in
+++ b/Tests/Rivet/EE/EE-17.in
@@ -1,16 +1,16 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 17.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1980_I154270
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1981_I156315
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1980_I143691
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1983_I191161
diff --git a/Tests/Rivet/EE/EE-172.3.in b/Tests/Rivet/EE/EE-172.3.in
--- a/Tests/Rivet/EE/EE-172.3.in
+++ b/Tests/Rivet/EE/EE-172.3.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 172.3
##################################################
# select the analyses
##################################################
# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-172.in b/Tests/Rivet/EE/EE-172.in
--- a/Tests/Rivet/EE/EE-172.in
+++ b/Tests/Rivet/EE/EE-172.in
@@ -1,21 +1,21 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 172.
##################################################
# select the analyses
##################################################
# ALEPH jet and event shapes at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_I636645
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_2004_I636645
# OPAL/JADE jet rates at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_I513337
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_OPAL_2000_I513337
# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_I601225
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2002_I601225
# OPAL event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2000_I513476
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2000_I513476
# DELPHI event shapes at different energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1999_I499183
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1999_I499183
# DELPHI particle spectra in WW
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2001_I526164
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2001_I526164
diff --git a/Tests/Rivet/EE/EE-177.in b/Tests/Rivet/EE/EE-177.in
--- a/Tests/Rivet/EE/EE-177.in
+++ b/Tests/Rivet/EE/EE-177.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 177.
##################################################
# select the analyses
##################################################
# OPAL event shapes and multiplicities at different energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I669402
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I669402
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES_RATIOS
+insert /Herwig/Analysis/Rivet:Analyses 0 PDG_HADRON_MULTIPLICITIES
+insert /Herwig/Analysis/Rivet:Analyses 0 PDG_HADRON_MULTIPLICITIES_RATIOS
diff --git a/Tests/Rivet/EE/EE-182.8.in b/Tests/Rivet/EE/EE-182.8.in
--- a/Tests/Rivet/EE/EE-182.8.in
+++ b/Tests/Rivet/EE/EE-182.8.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 182.8
##################################################
# select the analyses
##################################################
# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-183-WW.in b/Tests/Rivet/EE/EE-183-WW.in
--- a/Tests/Rivet/EE/EE-183-WW.in
+++ b/Tests/Rivet/EE/EE-183-WW.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 183.
# DELPHI particle spectra in WW
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2001_I526164
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2001_I526164
diff --git a/Tests/Rivet/EE/EE-183.in b/Tests/Rivet/EE/EE-183.in
--- a/Tests/Rivet/EE/EE-183.in
+++ b/Tests/Rivet/EE/EE-183.in
@@ -1,25 +1,25 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 183.
##################################################
# select the analyses
##################################################
# ALEPH jet and event shapes at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_I636645
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_2004_I636645
# OPAL/JADE jet rates at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_I513337
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_OPAL_2000_I513337
# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_I601225
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2002_I601225
# OPAL event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2000_I513476
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2000_I513476
# DELPHI b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_I524693
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2000_I524693
# delphi event shapes for a wide energy range
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2003_I620250
# DELPHI event shapes at different energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1999_I499183
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1999_I499183
# DELPHI particle spectra in WW
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2001_I526164
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2001_I526164
diff --git a/Tests/Rivet/EE/EE-188.6.in b/Tests/Rivet/EE/EE-188.6.in
--- a/Tests/Rivet/EE/EE-188.6.in
+++ b/Tests/Rivet/EE/EE-188.6.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 188.6
# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-189-WW.in b/Tests/Rivet/EE/EE-189-WW.in
--- a/Tests/Rivet/EE/EE-189-WW.in
+++ b/Tests/Rivet/EE/EE-189-WW.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 189.
# DELPHI particle spectra in WW
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2001_I526164
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2001_I526164
diff --git a/Tests/Rivet/EE/EE-189.in b/Tests/Rivet/EE/EE-189.in
--- a/Tests/Rivet/EE/EE-189.in
+++ b/Tests/Rivet/EE/EE-189.in
@@ -1,20 +1,20 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 189.
# ALEPH jet and event shapes at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_I636645
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_2004_I636645
# OPAL/JADE jet rates at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_I513337
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_OPAL_2000_I513337
# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_I601225
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2002_I601225
# OPAL event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2000_I513476
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2000_I513476
# DELPHI b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_I524693
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2000_I524693
# delphi event shapes for a wide energy range
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2003_I620250
# DELPHI particle spectra in WW
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2001_I526164
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2001_I526164
diff --git a/Tests/Rivet/EE/EE-192.in b/Tests/Rivet/EE/EE-192.in
--- a/Tests/Rivet/EE/EE-192.in
+++ b/Tests/Rivet/EE/EE-192.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 192.
##################################################
# select the analyses
##################################################
# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_I601225
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2002_I601225
# DELPHI b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_I524693
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2000_I524693
# delphi event shapes for a wide energy range
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2003_I620250
diff --git a/Tests/Rivet/EE/EE-194.4.in b/Tests/Rivet/EE/EE-194.4.in
--- a/Tests/Rivet/EE/EE-194.4.in
+++ b/Tests/Rivet/EE/EE-194.4.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 194.4
##################################################
# select the analyses
##################################################
# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-196.in b/Tests/Rivet/EE/EE-196.in
--- a/Tests/Rivet/EE/EE-196.in
+++ b/Tests/Rivet/EE/EE-196.in
@@ -1,17 +1,17 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 196.
##################################################
# select the analyses
##################################################
# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_I601225
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2002_I601225
# DELPHI b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_I524693
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2000_I524693
# delphi event shapes for a wide energy range
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2003_I620250
# ALEPH event shapes and multiplicities at different energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_I636645
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_2004_I636645
diff --git a/Tests/Rivet/EE/EE-197.in b/Tests/Rivet/EE/EE-197.in
--- a/Tests/Rivet/EE/EE-197.in
+++ b/Tests/Rivet/EE/EE-197.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 197.
##################################################
# select the analyses
##################################################
# OPAL event shapes and multiplicities at different energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I669402
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I669402
# OPAL from gluon paper
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I648738
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I648738
# L3 event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2008_I825820
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2008_I825820
\ No newline at end of file
diff --git a/Tests/Rivet/EE/EE-2.0.in b/Tests/Rivet/EE/EE-2.0.in
--- a/Tests/Rivet/EE/EE-2.0.in
+++ b/Tests/Rivet/EE/EE-2.0.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 2.0
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 1.9
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2753516
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2753516
diff --git a/Tests/Rivet/EE/EE-2.2.in b/Tests/Rivet/EE/EE-2.2.in
--- a/Tests/Rivet/EE/EE-2.2.in
+++ b/Tests/Rivet/EE/EE-2.2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 2.2
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2004_I622224
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2753516
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2004_I622224
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2753516
diff --git a/Tests/Rivet/EE/EE-2.23.in b/Tests/Rivet/EE/EE-2.23.in
--- a/Tests/Rivet/EE/EE-2.23.in
+++ b/Tests/Rivet/EE/EE-2.23.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 2.2324
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2513076
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2513076
diff --git a/Tests/Rivet/EE/EE-2.396.in b/Tests/Rivet/EE/EE-2.396.in
--- a/Tests/Rivet/EE/EE-2.396.in
+++ b/Tests/Rivet/EE/EE-2.396.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 2.396
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.39
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2753516
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2753516
diff --git a/Tests/Rivet/EE/EE-2.4.in b/Tests/Rivet/EE/EE-2.4.in
--- a/Tests/Rivet/EE/EE-2.4.in
+++ b/Tests/Rivet/EE/EE-2.4.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 2.4
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2513076
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2513076
diff --git a/Tests/Rivet/EE/EE-2.6.in b/Tests/Rivet/EE/EE-2.6.in
--- a/Tests/Rivet/EE/EE-2.6.in
+++ b/Tests/Rivet/EE/EE-2.6.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 2.6
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2004_I622224
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2004_I622224
diff --git a/Tests/Rivet/EE/EE-2.644.in b/Tests/Rivet/EE/EE-2.644.in
--- a/Tests/Rivet/EE/EE-2.644.in
+++ b/Tests/Rivet/EE/EE-2.644.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 2.6444
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.6
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2753516
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2753516
diff --git a/Tests/Rivet/EE/EE-2.8.in b/Tests/Rivet/EE/EE-2.8.in
--- a/Tests/Rivet/EE/EE-2.8.in
+++ b/Tests/Rivet/EE/EE-2.8.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 2.8
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2513076
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2513076
diff --git a/Tests/Rivet/EE/EE-2.9.in b/Tests/Rivet/EE/EE-2.9.in
--- a/Tests/Rivet/EE/EE-2.9.in
+++ b/Tests/Rivet/EE/EE-2.9.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 2.9
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.8
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2753516
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2753516
diff --git a/Tests/Rivet/EE/EE-200.2.in b/Tests/Rivet/EE/EE-200.2.in
--- a/Tests/Rivet/EE/EE-200.2.in
+++ b/Tests/Rivet/EE/EE-200.2.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 200.2
##################################################
# select the analyses
##################################################
# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-200.in b/Tests/Rivet/EE/EE-200.in
--- a/Tests/Rivet/EE/EE-200.in
+++ b/Tests/Rivet/EE/EE-200.in
@@ -1,19 +1,19 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 200.
##################################################
# select the analyses
##################################################
# ALEPH jet and event shapes at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_I636645
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_2004_I636645
# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_I601225
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2002_I601225
# DELPHI b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_I524693
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2000_I524693
# delphi event shapes for a wide energy range
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2003_I620250
# DELPHI particle spectra in WW
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2001_I526164
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2001_I526164
diff --git a/Tests/Rivet/EE/EE-202.in b/Tests/Rivet/EE/EE-202.in
--- a/Tests/Rivet/EE/EE-202.in
+++ b/Tests/Rivet/EE/EE-202.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 202.
##################################################
# select the analyses
##################################################
# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_I601225
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2002_I601225
# OPAL charged particles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2003_I595335
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2003_I595335
# delphi event shapes for a wide energy range
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2003_I620250
diff --git a/Tests/Rivet/EE/EE-205.in b/Tests/Rivet/EE/EE-205.in
--- a/Tests/Rivet/EE/EE-205.in
+++ b/Tests/Rivet/EE/EE-205.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 205.
##################################################
# select the analyses
##################################################
# delphi event shapes for a wide energy range
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2003_I620250
diff --git a/Tests/Rivet/EE/EE-206.2.in b/Tests/Rivet/EE/EE-206.2.in
--- a/Tests/Rivet/EE/EE-206.2.in
+++ b/Tests/Rivet/EE/EE-206.2.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 206.2
##################################################
# select the analyses
##################################################
# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-206.in b/Tests/Rivet/EE/EE-206.in
--- a/Tests/Rivet/EE/EE-206.in
+++ b/Tests/Rivet/EE/EE-206.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 206.
##################################################
# select the analyses
##################################################
# ALEPH jet and event shapes at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_I636645
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_2004_I636645
# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_I601225
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2002_I601225
# DELPHI b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_I524693
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2000_I524693
diff --git a/Tests/Rivet/EE/EE-207.in b/Tests/Rivet/EE/EE-207.in
--- a/Tests/Rivet/EE/EE-207.in
+++ b/Tests/Rivet/EE/EE-207.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 207.
##################################################
# select the analyses
##################################################
# delphi event shapes for a wide energy range
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2003_I620250
diff --git a/Tests/Rivet/EE/EE-21.5.in b/Tests/Rivet/EE/EE-21.5.in
--- a/Tests/Rivet/EE/EE-21.5.in
+++ b/Tests/Rivet/EE/EE-21.5.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 21.5
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso event shapes at various low energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I284251
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1990_I284251
diff --git a/Tests/Rivet/EE/EE-21.84-gg.in b/Tests/Rivet/EE/EE-21.84-gg.in
--- a/Tests/Rivet/EE/EE-21.84-gg.in
+++ b/Tests/Rivet/EE/EE-21.84-gg.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 21.84
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
##################################################
# select the analyses
##################################################
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I631361
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I631361
diff --git a/Tests/Rivet/EE/EE-22.5.in b/Tests/Rivet/EE/EE-22.5.in
--- a/Tests/Rivet/EE/EE-22.5.in
+++ b/Tests/Rivet/EE/EE-22.5.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 22.5
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 21*GeV
##################################################
# select the analyses
##################################################
# JADE gamma,pi and eta spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1985_I213948
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1985_I213948
diff --git a/Tests/Rivet/EE/EE-22.in b/Tests/Rivet/EE/EE-22.in
--- a/Tests/Rivet/EE/EE-22.in
+++ b/Tests/Rivet/EE/EE-22.in
@@ -1,28 +1,28 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 22.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 21*GeV
##################################################
# select the analyses
##################################################
# JADE jet rates at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1998_I447560
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1998_I447560
# tasso event shapes at various low energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1984_I195333
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I294755
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I277658
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1982_I12010
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1983_I181470
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1983_I191415
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I202784
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1985_I205119
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I279165
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1979_I142874
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1984_I195333
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1990_I294755
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1980_I154270
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1989_I277658
+insert /Herwig/Analysis/Rivet:Analyses 0 CELLO_1982_I12010
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1983_I181470
+insert /Herwig/Analysis/Rivet:Analyses 0 CELLO_1983_I191415
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1987_I248660
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1984_I202784
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1982_I177174
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1985_I205119
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1981_I156315
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1980_I143691
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1989_I279165
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1983_I191161
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1979_I142874
diff --git a/Tests/Rivet/EE/EE-25.in b/Tests/Rivet/EE/EE-25.in
--- a/Tests/Rivet/EE/EE-25.in
+++ b/Tests/Rivet/EE/EE-25.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 25.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 21*GeV
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1982_I177174
# tasso event shapes at various energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1984_I195333
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1984_I195333
diff --git a/Tests/Rivet/EE/EE-26.8-gg.in b/Tests/Rivet/EE/EE-26.8-gg.in
--- a/Tests/Rivet/EE/EE-26.8-gg.in
+++ b/Tests/Rivet/EE/EE-26.8-gg.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 26.8
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
##################################################
# select the analyses
##################################################
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I648738
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I648738
diff --git a/Tests/Rivet/EE/EE-26.8.in b/Tests/Rivet/EE/EE-26.8.in
--- a/Tests/Rivet/EE/EE-26.8.in
+++ b/Tests/Rivet/EE/EE-26.8.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 26.8
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
##################################################
# select the analyses
##################################################
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I648738
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I648738
diff --git a/Tests/Rivet/EE/EE-27.6.in b/Tests/Rivet/EE/EE-27.6.in
--- a/Tests/Rivet/EE/EE-27.6.in
+++ b/Tests/Rivet/EE/EE-27.6.in
@@ -1,16 +1,16 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 27.6
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1980_I154270
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1981_I156315
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1980_I143691
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1983_I191161
diff --git a/Tests/Rivet/EE/EE-27.7.in b/Tests/Rivet/EE/EE-27.7.in
--- a/Tests/Rivet/EE/EE-27.7.in
+++ b/Tests/Rivet/EE/EE-27.7.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 27.7
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1979_I142874
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1979_I142874
\ No newline at end of file
diff --git a/Tests/Rivet/EE/EE-28.48-gg.in b/Tests/Rivet/EE/EE-28.48-gg.in
--- a/Tests/Rivet/EE/EE-28.48-gg.in
+++ b/Tests/Rivet/EE/EE-28.48-gg.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 28.48
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
##################################################
# select the analyses
##################################################
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I631361
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I631361
diff --git a/Tests/Rivet/EE/EE-29.in b/Tests/Rivet/EE/EE-29.in
--- a/Tests/Rivet/EE/EE-29.in
+++ b/Tests/Rivet/EE/EE-29.in
@@ -1,63 +1,63 @@
## -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 29.0
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1986_I18502
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1988_I250824
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1987_I235694
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1985_I205868
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MAC_1985_I202924
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1992_I339573
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1984_I205869
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1986_I217416
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1990_I280958
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1988_I262143
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1985_I201482
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1984_I200105
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1988_I23360
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1991_I316132
+insert /Herwig/Analysis/Rivet:Analyses 0 HRS_1986_I18502
+insert /Herwig/Analysis/Rivet:Analyses 0 HRS_1988_I250824
+insert /Herwig/Analysis/Rivet:Analyses 0 TPC_1987_I235694
+insert /Herwig/Analysis/Rivet:Analyses 0 TPC_1985_I205868
+insert /Herwig/Analysis/Rivet:Analyses 0 MAC_1985_I202924
+insert /Herwig/Analysis/Rivet:Analyses 0 HRS_1992_I339573
+insert /Herwig/Analysis/Rivet:Analyses 0 TPC_1984_I205869
+insert /Herwig/Analysis/Rivet:Analyses 0 TPC_1986_I217416
+insert /Herwig/Analysis/Rivet:Analyses 0 HRS_1990_I280958
+insert /Herwig/Analysis/Rivet:Analyses 0 TPC_1988_I262143
+insert /Herwig/Analysis/Rivet:Analyses 0 HRS_1985_I201482
+insert /Herwig/Analysis/Rivet:Analyses 0 TPC_1984_I200105
+insert /Herwig/Analysis/Rivet:Analyses 0 HRS_1988_I23360
+insert /Herwig/Analysis/Rivet:Analyses 0 TPC_1991_I316132
# D spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1984_I202899
+insert /Herwig/Analysis/Rivet:Analyses 0 HRS_1984_I202899
# D* spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELCO_1985_I205132
+insert /Herwig/Analysis/Rivet:Analyses 0 DELCO_1985_I205132
# HRS D* polarization
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1987_I250823
+insert /Herwig/Analysis/Rivet:Analyses 0 HRS_1987_I250823
# MARK II omega spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1987_I247900
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKII_1987_I247900
# MARK II eta spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1988_I261194
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKII_1988_I261194
# MARK II xi- spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1987_I234976
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKII_1987_I234976
# MARK II D*+ spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1982_I177606
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKII_1982_I177606
# MARK II K0 and K+/- spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1985_I207785
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKII_1985_I207785
# MARK II Lambda
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1985_I209198
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKII_1985_I209198
# HRS hadron spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1987_I215848
+insert /Herwig/Analysis/Rivet:Analyses 0 HRS_1987_I215848
# MARK II event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1988_I246184
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKII_1988_I246184
# HRS Lambda spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1986_I17781
+insert /Herwig/Analysis/Rivet:Analyses 0 HRS_1986_I17781
# HRS Sigma*+- Xi- spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1987_I246162
+insert /Herwig/Analysis/Rivet:Analyses 0 HRS_1987_I246162
# HRS phi and D_s spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1985_I213242
+insert /Herwig/Analysis/Rivet:Analyses 0 HRS_1985_I213242
# HRS f_2, f_0 and K_2 spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1986_I18688
+insert /Herwig/Analysis/Rivet:Analyses 0 HRS_1986_I18688
# HRS rho, K*0, K*+ spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1989_I276948
+insert /Herwig/Analysis/Rivet:Analyses 0 HRS_1989_I276948
# MARK II EEC
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1988_I250899
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKII_1988_I250899
# MARK II charged spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1982_I178416
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKII_1982_I178416
# MARK II charged spectrum 3 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1985_I216850
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKII_1985_I216850
diff --git a/Tests/Rivet/EE/EE-3.0.in b/Tests/Rivet/EE/EE-3.0.in
--- a/Tests/Rivet/EE/EE-3.0.in
+++ b/Tests/Rivet/EE/EE-3.0.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 3.0
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2004_I622224
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1976_I109792
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1975_I100733
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2004_I622224
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKI_1976_I109792
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKI_1975_I100733
diff --git a/Tests/Rivet/EE/EE-3.05.in b/Tests/Rivet/EE/EE-3.05.in
--- a/Tests/Rivet/EE/EE-3.05.in
+++ b/Tests/Rivet/EE/EE-3.05.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 3.05
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2513076
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2753516
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2513076
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2753516
diff --git a/Tests/Rivet/EE/EE-3.2.in b/Tests/Rivet/EE/EE-3.2.in
--- a/Tests/Rivet/EE/EE-3.2.in
+++ b/Tests/Rivet/EE/EE-3.2.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 3.2
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2004_I622224
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2004_I622224
diff --git a/Tests/Rivet/EE/EE-3.4.in b/Tests/Rivet/EE/EE-3.4.in
--- a/Tests/Rivet/EE/EE-3.4.in
+++ b/Tests/Rivet/EE/EE-3.4.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 3.4
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2513076
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2513076
diff --git a/Tests/Rivet/EE/EE-3.5.in b/Tests/Rivet/EE/EE-3.5.in
--- a/Tests/Rivet/EE/EE-3.5.in
+++ b/Tests/Rivet/EE/EE-3.5.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 3.5
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 3.45
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2753516
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2753516
diff --git a/Tests/Rivet/EE/EE-3.63.in b/Tests/Rivet/EE/EE-3.63.in
--- a/Tests/Rivet/EE/EE-3.63.in
+++ b/Tests/Rivet/EE/EE-3.63.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 3.63
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 3.6
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1977_I118873
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132045
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1384778
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1977_I118873
+insert /Herwig/Analysis/Rivet:Analyses 0 DASP_1979_I132045
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2016_I1384778
\ No newline at end of file
diff --git a/Tests/Rivet/EE/EE-3.67.in b/Tests/Rivet/EE/EE-3.67.in
--- a/Tests/Rivet/EE/EE-3.67.in
+++ b/Tests/Rivet/EE/EE-3.67.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 3.671
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 3.6
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2513076
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2753516
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2513076
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2753516
diff --git a/Tests/Rivet/EE/EE-30.2.in b/Tests/Rivet/EE/EE-30.2.in
--- a/Tests/Rivet/EE/EE-30.2.in
+++ b/Tests/Rivet/EE/EE-30.2.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.2
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1980_I154270
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1981_I165122
diff --git a/Tests/Rivet/EE/EE-30.3.in b/Tests/Rivet/EE/EE-30.3.in
--- a/Tests/Rivet/EE/EE-30.3.in
+++ b/Tests/Rivet/EE/EE-30.3.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.3
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1980_I143691
diff --git a/Tests/Rivet/EE/EE-30.5.in b/Tests/Rivet/EE/EE-30.5.in
--- a/Tests/Rivet/EE/EE-30.5.in
+++ b/Tests/Rivet/EE/EE-30.5.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.5
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 21*GeV
##################################################
# select the analyses
##################################################
# tasso event shapes at various energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1984_I195333
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1984_I195333
diff --git a/Tests/Rivet/EE/EE-30.7.in b/Tests/Rivet/EE/EE-30.7.in
--- a/Tests/Rivet/EE/EE-30.7.in
+++ b/Tests/Rivet/EE/EE-30.7.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.7
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1980_I154270
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1981_I156315
diff --git a/Tests/Rivet/EE/EE-30.8.in b/Tests/Rivet/EE/EE-30.8.in
--- a/Tests/Rivet/EE/EE-30.8.in
+++ b/Tests/Rivet/EE/EE-30.8.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.8
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1983_I191161
diff --git a/Tests/Rivet/EE/EE-30.in b/Tests/Rivet/EE/EE-30.in
--- a/Tests/Rivet/EE/EE-30.in
+++ b/Tests/Rivet/EE/EE-30.in
@@ -1,17 +1,17 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.0
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1983_I190818
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153341
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153511
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153656
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1979_I142874
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1983_I190818
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1982_I177174
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1980_I153341
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1980_I153511
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1980_I153656
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1979_I142874
diff --git a/Tests/Rivet/EE/EE-31.2.in b/Tests/Rivet/EE/EE-31.2.in
--- a/Tests/Rivet/EE/EE-31.2.in
+++ b/Tests/Rivet/EE/EE-31.2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 31.2
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1980_I143691
diff --git a/Tests/Rivet/EE/EE-31.3.in b/Tests/Rivet/EE/EE-31.3.in
--- a/Tests/Rivet/EE/EE-31.3.in
+++ b/Tests/Rivet/EE/EE-31.3.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 31.3
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1980_I154270
diff --git a/Tests/Rivet/EE/EE-31.6.in b/Tests/Rivet/EE/EE-31.6.in
--- a/Tests/Rivet/EE/EE-31.6.in
+++ b/Tests/Rivet/EE/EE-31.6.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 31.6
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1979_I142874
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1979_I142874
diff --git a/Tests/Rivet/EE/EE-34.5.in b/Tests/Rivet/EE/EE-34.5.in
--- a/Tests/Rivet/EE/EE-34.5.in
+++ b/Tests/Rivet/EE/EE-34.5.in
@@ -1,20 +1,20 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 34.5
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso event shapes at various low energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I284251
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1990_I284251
# JADE gamma,pi and eta spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1985_I213948
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1985_I213948
# JADE D*+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I202785
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1984_I202785
# JADE D*0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I221004
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1984_I221004
# tasso event shapes at various energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1984_I195333
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1984_I195333
diff --git a/Tests/Rivet/EE/EE-34.8.in b/Tests/Rivet/EE/EE-34.8.in
--- a/Tests/Rivet/EE/EE-34.8.in
+++ b/Tests/Rivet/EE/EE-34.8.in
@@ -1,19 +1,19 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 34.8
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso charged mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I277658
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1986_I230950
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1985_I215869
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I279165
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1989_I277658
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1986_I230950
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1985_I215869
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1989_I279165
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1987_I248660
# TASSO strange baryons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I266893
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1989_I266893
# TASSO D_s
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1984_I194774
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1984_I194774
diff --git a/Tests/Rivet/EE/EE-34.in b/Tests/Rivet/EE/EE-34.in
--- a/Tests/Rivet/EE/EE-34.in
+++ b/Tests/Rivet/EE/EE-34.in
@@ -1,24 +1,24 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 34.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso event shapes at various energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1984_I195333
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1984_I195333
# CELLO EEC
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1982_I12010
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1983_I191415
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1983_I181470
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I179022
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I202784
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1981_I166363
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I168232
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1985_I205119
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1983_I192072
+insert /Herwig/Analysis/Rivet:Analyses 0 CELLO_1982_I12010
+insert /Herwig/Analysis/Rivet:Analyses 0 CELLO_1983_I191415
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1983_I181470
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1982_I179022
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1984_I202784
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1981_I166363
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1982_I168232
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1982_I177174
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1985_I205119
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1983_I192072
# tasso pi, K and p spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I267755
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1989_I267755
diff --git a/Tests/Rivet/EE/EE-35.44-gg.in b/Tests/Rivet/EE/EE-35.44-gg.in
--- a/Tests/Rivet/EE/EE-35.44-gg.in
+++ b/Tests/Rivet/EE/EE-35.44-gg.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 35.44
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
##################################################
# select the analyses
##################################################
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I631361
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I631361
diff --git a/Tests/Rivet/EE/EE-35.in b/Tests/Rivet/EE/EE-35.in
--- a/Tests/Rivet/EE/EE-35.in
+++ b/Tests/Rivet/EE/EE-35.in
@@ -1,27 +1,27 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 35.
##################################################
# select the analyses
##################################################
# OPAL/JADE jet rates at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_I513337
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_OPAL_2000_I513337
# JADE jet rates at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1998_I447560
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1998_I447560
# tasso event shapes at various low energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I294755
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1990_I294755
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES_RATIOS
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1983_I190818
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1990_I283026
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1989_I276764
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I203145
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I284251
+insert /Herwig/Analysis/Rivet:Analyses 0 PDG_HADRON_MULTIPLICITIES
+insert /Herwig/Analysis/Rivet:Analyses 0 PDG_HADRON_MULTIPLICITIES_RATIOS
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1983_I190818
+insert /Herwig/Analysis/Rivet:Analyses 0 CELLO_1990_I283026
+insert /Herwig/Analysis/Rivet:Analyses 0 CELLO_1989_I276764
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1984_I203145
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1982_I177174
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1990_I284251
## jade gamma,pi0 and eta spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1990_I282847
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1990_I282847
## TASSO event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1988_I263859
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1988_I263859
diff --git a/Tests/Rivet/EE/EE-36.2.in b/Tests/Rivet/EE/EE-36.2.in
--- a/Tests/Rivet/EE/EE-36.2.in
+++ b/Tests/Rivet/EE/EE-36.2.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 36.2
##################################################
# select the analyses
##################################################
# TASSO D*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I278856
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1989_I278856
diff --git a/Tests/Rivet/EE/EE-4.03.in b/Tests/Rivet/EE/EE-4.03.in
--- a/Tests/Rivet/EE/EE-4.03.in
+++ b/Tests/Rivet/EE/EE-4.03.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.03
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 4.00
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1977_I118873
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132045
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132410
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1977_I118873
+insert /Herwig/Analysis/Rivet:Analyses 0 DASP_1979_I132045
+insert /Herwig/Analysis/Rivet:Analyses 0 DASP_1979_I132410
diff --git a/Tests/Rivet/EE/EE-4.17.in b/Tests/Rivet/EE/EE-4.17.in
--- a/Tests/Rivet/EE/EE-4.17.in
+++ b/Tests/Rivet/EE/EE-4.17.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.17
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132045
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132410
+insert /Herwig/Analysis/Rivet:Analyses 0 DASP_1979_I132045
+insert /Herwig/Analysis/Rivet:Analyses 0 DASP_1979_I132410
# CLEO eta, eta' phi spectra in D decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2006_I728043
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOC_2006_I728043
diff --git a/Tests/Rivet/EE/EE-4.18.in b/Tests/Rivet/EE/EE-4.18.in
--- a/Tests/Rivet/EE/EE-4.18.in
+++ b/Tests/Rivet/EE/EE-4.18.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.178
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
# D_s -> pi+pi+pi- X
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2618227
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2618227
diff --git a/Tests/Rivet/EE/EE-4.3.in b/Tests/Rivet/EE/EE-4.3.in
--- a/Tests/Rivet/EE/EE-4.3.in
+++ b/Tests/Rivet/EE/EE-4.3.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.3
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132045
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132410
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 DASP_1979_I132045
+insert /Herwig/Analysis/Rivet:Analyses 0 DASP_1979_I132410
\ No newline at end of file
diff --git a/Tests/Rivet/EE/EE-4.41.in b/Tests/Rivet/EE/EE-4.41.in
--- a/Tests/Rivet/EE/EE-4.41.in
+++ b/Tests/Rivet/EE/EE-4.41.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.41
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132045
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132410
+insert /Herwig/Analysis/Rivet:Analyses 0 DASP_1979_I132045
+insert /Herwig/Analysis/Rivet:Analyses 0 DASP_1979_I132410
diff --git a/Tests/Rivet/EE/EE-4.5.in b/Tests/Rivet/EE/EE-4.5.in
--- a/Tests/Rivet/EE/EE-4.5.in
+++ b/Tests/Rivet/EE/EE-4.5.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.5
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 4.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1977_I118873
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1977_I118873
diff --git a/Tests/Rivet/EE/EE-4.6.in b/Tests/Rivet/EE/EE-4.6.in
--- a/Tests/Rivet/EE/EE-4.6.in
+++ b/Tests/Rivet/EE/EE-4.6.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.6
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2004_I622224
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132410
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1674528
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2611489
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2004_I622224
+insert /Herwig/Analysis/Rivet:Analyses 0 DASP_1979_I132410
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2018_I1674528
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2611489
diff --git a/Tests/Rivet/EE/EE-4.8.in b/Tests/Rivet/EE/EE-4.8.in
--- a/Tests/Rivet/EE/EE-4.8.in
+++ b/Tests/Rivet/EE/EE-4.8.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.8
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2004_I622224
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132045
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1976_I109792
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1975_I100733
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2004_I622224
+insert /Herwig/Analysis/Rivet:Analyses 0 DASP_1979_I132045
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKI_1976_I109792
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKI_1975_I100733
diff --git a/Tests/Rivet/EE/EE-41.5.in b/Tests/Rivet/EE/EE-41.5.in
--- a/Tests/Rivet/EE/EE-41.5.in
+++ b/Tests/Rivet/EE/EE-41.5.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 41.5
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 21*GeV
##################################################
# select the analyses
##################################################
# tasso event shapes at various energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1984_I195333
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1984_I195333
diff --git a/Tests/Rivet/EE/EE-41.in b/Tests/Rivet/EE/EE-41.in
--- a/Tests/Rivet/EE/EE-41.in
+++ b/Tests/Rivet/EE/EE-41.in
@@ -1,9 +1,9 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 41.4
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-42.1.in b/Tests/Rivet/EE/EE-42.1.in
--- a/Tests/Rivet/EE/EE-42.1.in
+++ b/Tests/Rivet/EE/EE-42.1.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 42.1
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# TASSO strange baryons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I266893
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1989_I266893
diff --git a/Tests/Rivet/EE/EE-42.6.in b/Tests/Rivet/EE/EE-42.6.in
--- a/Tests/Rivet/EE/EE-42.6.in
+++ b/Tests/Rivet/EE/EE-42.6.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 42.6
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I284251
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1990_I284251
diff --git a/Tests/Rivet/EE/EE-43.5.in b/Tests/Rivet/EE/EE-43.5.in
--- a/Tests/Rivet/EE/EE-43.5.in
+++ b/Tests/Rivet/EE/EE-43.5.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 43.5
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso charged mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I279165
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1987_I248660
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1989_I279165
diff --git a/Tests/Rivet/EE/EE-43.6.in b/Tests/Rivet/EE/EE-43.6.in
--- a/Tests/Rivet/EE/EE-43.6.in
+++ b/Tests/Rivet/EE/EE-43.6.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 43.6
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso charged mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I277658
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1989_I277658
diff --git a/Tests/Rivet/EE/EE-44.in b/Tests/Rivet/EE/EE-44.in
--- a/Tests/Rivet/EE/EE-44.in
+++ b/Tests/Rivet/EE/EE-44.in
@@ -1,19 +1,19 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 44.
##################################################
# select the analyses
##################################################
# OPAL/JADE jet rates at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_I513337
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_OPAL_2000_I513337
# JADE jet rates at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1998_I447560
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1998_I447560
# tasso event shapes at various low energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I294755
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1990_I294755
# jade gamma,pi0 and eta spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1990_I282847
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_1990_I282847
# tasso pi, K and p spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I267755
+insert /Herwig/Analysis/Rivet:Analyses 0 TASSO_1989_I267755
diff --git a/Tests/Rivet/EE/EE-45.in b/Tests/Rivet/EE/EE-45.in
--- a/Tests/Rivet/EE/EE-45.in
+++ b/Tests/Rivet/EE/EE-45.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 45.0
##################################################
# select the analyses
##################################################
# DELPHI event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2003_I620250
diff --git a/Tests/Rivet/EE/EE-48.0-gg.in b/Tests/Rivet/EE/EE-48.0-gg.in
--- a/Tests/Rivet/EE/EE-48.0-gg.in
+++ b/Tests/Rivet/EE/EE-48.0-gg.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 48.0
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
##################################################
# select the analyses
##################################################
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I648738
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I648738
diff --git a/Tests/Rivet/EE/EE-48.0.in b/Tests/Rivet/EE/EE-48.0.in
--- a/Tests/Rivet/EE/EE-48.0.in
+++ b/Tests/Rivet/EE/EE-48.0.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 48.0
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
##################################################
# select the analyses
##################################################
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I648738
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I648738
diff --git a/Tests/Rivet/EE/EE-5.0.in b/Tests/Rivet/EE/EE-5.0.in
--- a/Tests/Rivet/EE/EE-5.0.in
+++ b/Tests/Rivet/EE/EE-5.0.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 5.0
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132045
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132410
+insert /Herwig/Analysis/Rivet:Analyses 0 DASP_1979_I132045
+insert /Herwig/Analysis/Rivet:Analyses 0 DASP_1979_I132410
diff --git a/Tests/Rivet/EE/EE-5.2.in b/Tests/Rivet/EE/EE-5.2.in
--- a/Tests/Rivet/EE/EE-5.2.in
+++ b/Tests/Rivet/EE/EE-5.2.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 5.2
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132045
+insert /Herwig/Analysis/Rivet:Analyses 0 DASP_1979_I132045
# MARK II charged spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1982_I178416
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKII_1982_I178416
diff --git a/Tests/Rivet/EE/EE-5.8.in b/Tests/Rivet/EE/EE-5.8.in
--- a/Tests/Rivet/EE/EE-5.8.in
+++ b/Tests/Rivet/EE/EE-5.8.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 5.8
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1976_I109792
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKI_1976_I109792
diff --git a/Tests/Rivet/EE/EE-50.in b/Tests/Rivet/EE/EE-50.in
--- a/Tests/Rivet/EE/EE-50.in
+++ b/Tests/Rivet/EE/EE-50.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 50.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso charged mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I295160
+insert /Herwig/Analysis/Rivet:Analyses 0 AMY_1990_I295160
diff --git a/Tests/Rivet/EE/EE-52.in b/Tests/Rivet/EE/EE-52.in
--- a/Tests/Rivet/EE/EE-52.in
+++ b/Tests/Rivet/EE/EE-52.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 52.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso charged mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I295160
+insert /Herwig/Analysis/Rivet:Analyses 0 AMY_1990_I295160
diff --git a/Tests/Rivet/EE/EE-53.3.in b/Tests/Rivet/EE/EE-53.3.in
--- a/Tests/Rivet/EE/EE-53.3.in
+++ b/Tests/Rivet/EE/EE-53.3.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 53.3
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# EEC
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOPAZ_1989_I279575
+insert /Herwig/Analysis/Rivet:Analyses 0 TOPAZ_1989_I279575
diff --git a/Tests/Rivet/EE/EE-55.3.in b/Tests/Rivet/EE/EE-55.3.in
--- a/Tests/Rivet/EE/EE-55.3.in
+++ b/Tests/Rivet/EE/EE-55.3.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 55.3
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-55.in b/Tests/Rivet/EE/EE-55.in
--- a/Tests/Rivet/EE/EE-55.in
+++ b/Tests/Rivet/EE/EE-55.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 55.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# AMY charged mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I295160
+insert /Herwig/Analysis/Rivet:Analyses 0 AMY_1990_I295160
# AMY event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I283337
+insert /Herwig/Analysis/Rivet:Analyses 0 AMY_1990_I283337
diff --git a/Tests/Rivet/EE/EE-56.in b/Tests/Rivet/EE/EE-56.in
--- a/Tests/Rivet/EE/EE-56.in
+++ b/Tests/Rivet/EE/EE-56.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 56.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso charged mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I295160
+insert /Herwig/Analysis/Rivet:Analyses 0 AMY_1990_I295160
diff --git a/Tests/Rivet/EE/EE-57.in b/Tests/Rivet/EE/EE-57.in
--- a/Tests/Rivet/EE/EE-57.in
+++ b/Tests/Rivet/EE/EE-57.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 57.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# AMY charged mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I295160
+insert /Herwig/Analysis/Rivet:Analyses 0 AMY_1990_I295160
# TOPAZ event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOPAZ_1993_I361661
+insert /Herwig/Analysis/Rivet:Analyses 0 TOPAZ_1993_I361661
diff --git a/Tests/Rivet/EE/EE-58.in b/Tests/Rivet/EE/EE-58.in
--- a/Tests/Rivet/EE/EE-58.in
+++ b/Tests/Rivet/EE/EE-58.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 58.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOPAZ_1995_I381900
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1995_I406129
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOPAZ_1997_I454183
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 VENUS_1998_I453613
+insert /Herwig/Analysis/Rivet:Analyses 0 TOPAZ_1995_I381900
+insert /Herwig/Analysis/Rivet:Analyses 0 AMY_1995_I406129
+insert /Herwig/Analysis/Rivet:Analyses 0 TOPAZ_1997_I454183
+insert /Herwig/Analysis/Rivet:Analyses 0 VENUS_1998_I453613
diff --git a/Tests/Rivet/EE/EE-59.5.in b/Tests/Rivet/EE/EE-59.5.in
--- a/Tests/Rivet/EE/EE-59.5.in
+++ b/Tests/Rivet/EE/EE-59.5.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 59.5
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# EEC
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOPAZ_1989_I279575
+insert /Herwig/Analysis/Rivet:Analyses 0 TOPAZ_1989_I279575
diff --git a/Tests/Rivet/EE/EE-6.2.in b/Tests/Rivet/EE/EE-6.2.in
--- a/Tests/Rivet/EE/EE-6.2.in
+++ b/Tests/Rivet/EE/EE-6.2.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 6.2
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1976_I109792
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKI_1976_I109792
diff --git a/Tests/Rivet/EE/EE-6.5.in b/Tests/Rivet/EE/EE-6.5.in
--- a/Tests/Rivet/EE/EE-6.5.in
+++ b/Tests/Rivet/EE/EE-6.5.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 6.5
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
# MARK II charged spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1982_I178416
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKII_1982_I178416
diff --git a/Tests/Rivet/EE/EE-6.6.in b/Tests/Rivet/EE/EE-6.6.in
--- a/Tests/Rivet/EE/EE-6.6.in
+++ b/Tests/Rivet/EE/EE-6.6.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 6.6
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1976_I109792
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKI_1976_I109792
diff --git a/Tests/Rivet/EE/EE-60.8.in b/Tests/Rivet/EE/EE-60.8.in
--- a/Tests/Rivet/EE/EE-60.8.in
+++ b/Tests/Rivet/EE/EE-60.8.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 60.8
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso charged mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I295160
+insert /Herwig/Analysis/Rivet:Analyses 0 AMY_1990_I295160
diff --git a/Tests/Rivet/EE/EE-60.in b/Tests/Rivet/EE/EE-60.in
--- a/Tests/Rivet/EE/EE-60.in
+++ b/Tests/Rivet/EE/EE-60.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 60.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso charged mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I295160
+insert /Herwig/Analysis/Rivet:Analyses 0 AMY_1990_I295160
diff --git a/Tests/Rivet/EE/EE-61.4.in b/Tests/Rivet/EE/EE-61.4.in
--- a/Tests/Rivet/EE/EE-61.4.in
+++ b/Tests/Rivet/EE/EE-61.4.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 61.4
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso charged mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I295160
+insert /Herwig/Analysis/Rivet:Analyses 0 AMY_1990_I295160
diff --git a/Tests/Rivet/EE/EE-65.4.in b/Tests/Rivet/EE/EE-65.4.in
--- a/Tests/Rivet/EE/EE-65.4.in
+++ b/Tests/Rivet/EE/EE-65.4.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 65.4
##################################################
# select the analyses
##################################################
# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-66.in b/Tests/Rivet/EE/EE-66.in
--- a/Tests/Rivet/EE/EE-66.in
+++ b/Tests/Rivet/EE/EE-66.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 66.0
##################################################
# select the analyses
##################################################
# DELPHI event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2003_I620250
diff --git a/Tests/Rivet/EE/EE-7.0.in b/Tests/Rivet/EE/EE-7.0.in
--- a/Tests/Rivet/EE/EE-7.0.in
+++ b/Tests/Rivet/EE/EE-7.0.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 7.0
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1976_I109792
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKI_1976_I109792
# D spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1979_I133123
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKI_1979_I133123
diff --git a/Tests/Rivet/EE/EE-7.4.in b/Tests/Rivet/EE/EE-7.4.in
--- a/Tests/Rivet/EE/EE-7.4.in
+++ b/Tests/Rivet/EE/EE-7.4.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 7.4
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1976_I109792
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1975_I100733
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKI_1976_I109792
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKI_1975_I100733
# LENA thrust and mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LENA_1981_I164397
+insert /Herwig/Analysis/Rivet:Analyses 0 LENA_1981_I164397
diff --git a/Tests/Rivet/EE/EE-7.7.in b/Tests/Rivet/EE/EE-7.7.in
--- a/Tests/Rivet/EE/EE-7.7.in
+++ b/Tests/Rivet/EE/EE-7.7.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 7.7
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 7.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1981_I156315
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1983_I191161
diff --git a/Tests/Rivet/EE/EE-75.7.in b/Tests/Rivet/EE/EE-75.7.in
--- a/Tests/Rivet/EE/EE-75.7.in
+++ b/Tests/Rivet/EE/EE-75.7.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 75.7
##################################################
# select the analyses
##################################################
# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-76.in b/Tests/Rivet/EE/EE-76.in
--- a/Tests/Rivet/EE/EE-76.in
+++ b/Tests/Rivet/EE/EE-76.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 76.0
##################################################
# select the analyses
##################################################
# DELPHI event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2003_I620250
diff --git a/Tests/Rivet/EE/EE-8.8.in b/Tests/Rivet/EE/EE-8.8.in
--- a/Tests/Rivet/EE/EE-8.8.in
+++ b/Tests/Rivet/EE/EE-8.8.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 8.8
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
# LENA thrust and mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LENA_1981_I164397
+insert /Herwig/Analysis/Rivet:Analyses 0 LENA_1981_I164397
# MD1 Lambda mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MD1_1994_I362599
+insert /Herwig/Analysis/Rivet:Analyses 0 MD1_1994_I362599
diff --git a/Tests/Rivet/EE/EE-82.in b/Tests/Rivet/EE/EE-82.in
--- a/Tests/Rivet/EE/EE-82.in
+++ b/Tests/Rivet/EE/EE-82.in
@@ -1,9 +1,9 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 82.3
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-85.in b/Tests/Rivet/EE/EE-85.in
--- a/Tests/Rivet/EE/EE-85.in
+++ b/Tests/Rivet/EE/EE-85.in
@@ -1,9 +1,9 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 85.1
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-9.27.in b/Tests/Rivet/EE/EE-9.27.in
--- a/Tests/Rivet/EE/EE-9.27.in
+++ b/Tests/Rivet/EE/EE-9.27.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 9.27
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
# LENA thrust and mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LENA_1981_I164397
+insert /Herwig/Analysis/Rivet:Analyses 0 LENA_1981_I164397
diff --git a/Tests/Rivet/EE/EE-9.4.in b/Tests/Rivet/EE/EE-9.4.in
--- a/Tests/Rivet/EE/EE-9.4.in
+++ b/Tests/Rivet/EE/EE-9.4.in
@@ -1,16 +1,16 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 9.4
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1980_I154270
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1981_I165122
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1981_I156315
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1983_I191161
diff --git a/Tests/Rivet/EE/EE-9.46.in b/Tests/Rivet/EE/EE-9.46.in
--- a/Tests/Rivet/EE/EE-9.46.in
+++ b/Tests/Rivet/EE/EE-9.46.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 4.73
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 4.73
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.4
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
# ARGUS pi0 and eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I278933
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1990_I278933
# Crystal Ball pi0 and eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CRYSTAL_BALL_1991_I297905
+insert /Herwig/Analysis/Rivet:Analyses 0 CRYSTAL_BALL_1991_I297905
diff --git a/Tests/Rivet/EE/EE-9.51.in b/Tests/Rivet/EE/EE-9.51.in
--- a/Tests/Rivet/EE/EE-9.51.in
+++ b/Tests/Rivet/EE/EE-9.51.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 9.51
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
# LENA thrust and mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LENA_1981_I164397
+insert /Herwig/Analysis/Rivet:Analyses 0 LENA_1981_I164397
# MD1 Lambda mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MD1_1994_I362599
+insert /Herwig/Analysis/Rivet:Analyses 0 MD1_1994_I362599
diff --git a/Tests/Rivet/EE/EE-91-nopi.in b/Tests/Rivet/EE/EE-91-nopi.in
--- a/Tests/Rivet/EE/EE-91-nopi.in
+++ b/Tests/Rivet/EE/EE-91-nopi.in
@@ -1,16 +1,16 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 91.2
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
set /Herwig/Particles/pi0:Stable Stable
set /Herwig/Particles/eta:Stable Stable
##################################################
# select the analyses
##################################################
# ALEPH photon analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_I398193
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_1996_I398193
# OPAL photon analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1993_I343181
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1993_I343181
diff --git a/Tests/Rivet/EE/EE-91.in b/Tests/Rivet/EE/EE-91.in
--- a/Tests/Rivet/EE/EE-91.in
+++ b/Tests/Rivet/EE/EE-91.in
@@ -1,174 +1,174 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 91.2
##################################################
# select the analyses
##################################################
# Validated
##################################################
# ALEPH charged particle multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1991_I319520
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_1991_I319520
# OPAL charged particle multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1992_I321190
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1992_I321190
# OPAL charged particle multiplicity (light flavour separated)
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2001_I536266
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2001_I536266
# DELPHI charged particle multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1991_I301657
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1991_I301657
# ALEPH main LEP I QCD summary paper
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_I428072
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_1996_I428072
# ALEPH D*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1999_I507422
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_1999_I507422
# OPAL D*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1995_I382219
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1995_I382219
# OPAL charged hadron analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1994_I372772
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1994_I372772
# OPAL Delta++ analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1995_I398320
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1995_I398320
# OPAL J/Psi analysis analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1996_I402487
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1996_I402487
# ALEPH eta/omega analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2002_I569165
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_2002_I569165
# ALEPH pi0,eta,eta',K0,lambda in 2/3 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2000_I507531
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_2000_I507531
# OPAL K*0 analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_I447146
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1997_I447146
# OPAL flavour specific charged multiplicities etc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_I472637
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1998_I472637
# OPAL f_0,f_2 and phi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_I467092
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1998_I467092
# OPAL gamma,pi0,eta,eta',rho+/-,a0+/-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_I470419
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1998_I470419
# OPAL K0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2000_I529898
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2000_I529898
# OPAL K* +/-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1993_I342766
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1993_I342766
# SLD flavour specific charged multiplicities etc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_1996_I422172
+insert /Herwig/Analysis/Rivet:Analyses 0 SLD_1996_I422172
# SLD flavour specific charged multiplicities etc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_1999_I469925
+insert /Herwig/Analysis/Rivet:Analyses 0 SLD_1999_I469925
# SLD flavour specific charged multiplicities etc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_2004_I630327
+insert /Herwig/Analysis/Rivet:Analyses 0 SLD_2004_I630327
# OPAL event shapes and multiplicities at different energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I669402
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I669402
# ALEPH jet and event shapes at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_I636645
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_2004_I636645
# OPAL/JADE jet rates at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_I513337
+insert /Herwig/Analysis/Rivet:Analyses 0 JADE_OPAL_2000_I513337
# DELPHI strange baryon production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I394716
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2006_I719387
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_I524694
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1995_I394716
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2006_I719387
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2000_I524694
# DELPHI f_0, rho_0 and f_2 production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1999_I482816
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1999_I482816
# DELPHI K*0 and phi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_I420528
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1996_I420528
# DELPHI f'_2 production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_I416741
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1996_I416741
# DELPHI pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_I401100
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1996_I401100
# DELPHI K- K*+/-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I377487
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1995_I377487
# DELPHI K+/-, p pbar
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I394052
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1995_I394052
# DELPHI Delta++
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I399737
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1995_I399737
# DELPHI pi, K p, flavour seperated
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1998_I473409
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1998_I473409
# OPAL strange baryon production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_I421978
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_I421977
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1997_I421978
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1997_I421977
# DELPHI tuning paper
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_I424112
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1996_I424112
# DELPHI b quark
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2011_I890503
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2011_I890503
# ALEPH b quark
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2001_I558327
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_2001_I558327
# SLD b quark
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_2002_I582951
+insert /Herwig/Analysis/Rivet:Analyses 0 SLD_2002_I582951
# OPAL b quark
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2003_I599181
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2003_I599181
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES_RATIOS
+insert /Herwig/Analysis/Rivet:Analyses 0 PDG_HADRON_MULTIPLICITIES
+insert /Herwig/Analysis/Rivet:Analyses 0 PDG_HADRON_MULTIPLICITIES_RATIOS
# OPAL from gluon paper
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I648738
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I631361:PROCESS=QQ
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I648738
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I631361:PROCESS=QQ
# L3 eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1992_I336180
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_1992_I336180
# L3 jet rates
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I652683
# ALEPH pi+-, K+- and (p, anti-p)
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1995_I382179
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_1995_I382179
# L3 eta' and omega specta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1997_I427107
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_1997_I427107
# charged mult, different # of jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1992_I334948
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1992_I334948
# charged mult, different rapidity regions
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1991_I324035
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1991_I324035
# lambda, lambdabar correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1993_I360638
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2000_I474010
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1993_I360638
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2000_I474010
# delphi flavour sep charged
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1997_I428178
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1997_I428178
# ALEPH pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1997_I427131
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_1997_I427131
# ALEPH Lambda polarization
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_I415745
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_1996_I415745
# OPAL Lambda polarization
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_I447188
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1997_I447188
# DELPHI Lambda/K asymmetry
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I382285
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1995_I382285
# OPAL b baryon polarization
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_I474012
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1998_I474012
# DELPHI b baryon polarization
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_I513614
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2000_I513614
# ALEPH b baryon polarization
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_I402895
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_1996_I402895
# OPAL rho and comega polarization
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2000_I502750
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2000_I502750
# DELPHI charged particle distributions
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1999_I448370
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1999_I448370
# OPAL K0 spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1995_I393503
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1995_I393503
# OPAL phi, D*, B* spin
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_I440103
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1997_I440103
# DELPHI B*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I395026
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1995_I395026
# ALEPH B*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1995_I398426
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_1995_I398426
# OPAL B*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1996_I428493
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_1996_I428493
# L3 B*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1995_I381046
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_1995_I381046
# DELPHI p pbar correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_I531568
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2000_I531568
# L3 jet rates
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1990_I298078
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_1990_I298078
# L3 pi0 and charged particles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1991_I314407
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_1991_I314407
# L3 pi0 and eta spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1994_I374698
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_1994_I374698
# DELPHI jade jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1990_I297698
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1990_I297698
# OPAL charm hadrons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1993_I356732
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_1993_I356732
# L3 event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1992_I334954
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_1992_I334954
# DELPHI events shapes vs thrust
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_I522656
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2000_I522656
# SLD event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_1995_I378545
+insert /Herwig/Analysis/Rivet:Analyses 0 SLD_1995_I378545
# DELPHI f_1 f'_1 spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I628566
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2003_I628566
##################################################
# unvalidated
##################################################
# OPAL 4 jet angles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2001_I552446
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2001_I552446
##################################################
# MC
##################################################
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Bottom_Hadrons
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Particle_Multiplicities
+#insert /Herwig/Analysis/Rivet:Analyses 0 MC_Bottom_Hadrons
+#insert /Herwig/Analysis/Rivet:Analyses 0 MC_Particle_Multiplicities
diff --git a/Tests/Rivet/EE/EE-93.0.in b/Tests/Rivet/EE/EE-93.0.in
--- a/Tests/Rivet/EE/EE-93.0.in
+++ b/Tests/Rivet/EE/EE-93.0.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 93.0
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
##################################################
# select the analyses
##################################################
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I648738
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I648738
diff --git a/Tests/Rivet/EE/EE-97.0-gg.in b/Tests/Rivet/EE/EE-97.0-gg.in
--- a/Tests/Rivet/EE/EE-97.0-gg.in
+++ b/Tests/Rivet/EE/EE-97.0-gg.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 97.0
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
##################################################
# select the analyses
##################################################
# PDG hadron multiplicities and ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I648738
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2004_I648738
diff --git a/Tests/Rivet/EE/EE-Bc.in b/Tests/Rivet/EE/EE-Bc.in
--- a/Tests/Rivet/EE/EE-Bc.in
+++ b/Tests/Rivet/EE/EE-Bc.in
@@ -1,24 +1,24 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 6.5
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 6.5
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 12.99999
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
decaymode Upsilon(4S)->B_c+,B_c-; 1. 1 /Herwig/Decays/DecayME0
do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->B_c+,B_c-;
# B_c -> Jpsi pi and 3pi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2012_I1097092
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2012_I1097092
# B_c -> Jpsi pi+pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2024_I2756705
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2024_I2756705
# B_c -> Jpsi 3 hadrons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2022_I1960979
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2022_I1960979
# B_c -> Jpsi/psi(2S) + hadrons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2022_I2138845
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2022_I2138845
# B_c -> Jpsi/psi p pbar pi+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2014_I1309880
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2014_I1309880
diff --git a/Tests/Rivet/EE/EE-Ds.in b/Tests/Rivet/EE/EE-Ds.in
--- a/Tests/Rivet/EE/EE-Ds.in
+++ b/Tests/Rivet/EE/EE-Ds.in
@@ -1,75 +1,75 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
decaymode Upsilon(4S)->D_s+,D_s-; 1. 1 /Herwig/Decays/DecayME0
do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->D_s+,D_s-;
# D_s inclusive brs
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_DS
+#insert /Herwig/Analysis/Rivet:Analyses 0 PDG_DS
############## semi-leptonic #################
# D_s+ -> K0, K* e+ nu_e
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1702549
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2802565
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1702549
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2802565
# D_s+ -> eta, eta' semi-leptonic
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1712742
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2667117
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2679776
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1712742
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2667117
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2679776
# D_s -> K+K- l+ nu_l
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2008_I790461
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2674768
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2008_I790461
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2674768
# D_s -> f0 e+ nu_e
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2038523
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2645182
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2038523
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2645182
# 3-body dalitz
# Dalitz plot analysis of D_s+ -> K+K-pi+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2010_I878120
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1830524
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2010_I878120
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2021_I1830524
# Dalitz decay of D_s+ -> K0S K0S pi+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I1945692
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I1945692
# Dalitz decay of D_s+ -> K0S K+ pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2070086
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2070086
# Dalitz decay of D+ and D_s+ -> K+pi+pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 FOCUS_2004_I654030
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2084294
+insert /Herwig/Analysis/Rivet:Analyses 0 FOCUS_2004_I654030
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2084294
# Dalitz decay of D_s+ -> K0S pi+ pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1854317
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2021_I1854317
# Dalitz plot analysis of D_s+ -> pi+pi+pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1909391
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 FOCUS_2003_I635446
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 E791_2001_I530319
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2008_I792597
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2021_I1909391
+insert /Herwig/Analysis/Rivet:Analyses 0 FOCUS_2003_I635446
+insert /Herwig/Analysis/Rivet:Analyses 0 E791_2001_I530319
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2008_I792597
# Dalitz plot analysis of D_s+ -> pi+pi0pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1929365
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2021_I1929365
# D_s+ -> pi+ pi0 eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1724547
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1724547
# Dalitz decay of D_s+ -> pi+ pi0 eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2030993
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1998_I466173
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2030993
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1998_I466173
# D_s+ -> omega pi+ pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2009_I822856
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2009_I822856
# D_s+ -> omega pi+ eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2630813
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2630813
############## 4-body dalitz ##################
# D_s+ -> K+K-pi+pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1849747
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2021_I1849747
# D_s+ -> K+ pi+ pi- pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2088218
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2088218
# D_s+ -> KS0 K- pi+ pi+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1845444
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2021_I1845444
# D_s+ -> pi+ pi+ pi- eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1870322
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2021_I1870322
# 2pi+ pi- pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2801948
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2801948
############## five body ##############
# BESIII D_s+ -> K+ K_ pi+ pi+ pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2051683
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2051683
# 2pi+ 2pi0 pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2025_I2866208
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2025_I2866208
diff --git a/Tests/Rivet/EE/EE-Eta.in b/Tests/Rivet/EE/EE-Eta.in
--- a/Tests/Rivet/EE/EE-Eta.in
+++ b/Tests/Rivet/EE/EE-Eta.in
@@ -1,46 +1,46 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
decaymode Upsilon(4S)->eta,eta'; 1. 1 /Herwig/Decays/DecayME0
do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->eta',eta;
# eta/omega dalitz
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 A2_2017_I1486671
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 NA60_2016_I1452485
+insert /Herwig/Analysis/Rivet:Analyses 0 A2_2017_I1486671
+insert /Herwig/Analysis/Rivet:Analyses 0 NA60_2016_I1452485
# eta decay
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_DECAY_ETA
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_DECAY_ETA
# BES eta' dalitz
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2015_I1364494
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2015_I1364494
# BES eta' -> pi+pi- gamma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1641075
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2018_I1641075
# eta -> pi+pi- gamma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2016_I1487285
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE_2013_I1186739
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2016_I1487285
+insert /Herwig/Analysis/Rivet:Analyses 0 KLOE_2013_I1186739
# BES eta' -> pi0 gamma gamma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1504943
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2016_I1504943
# Crystal Barrel eta' -> pi+pi- gamma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CRYSTAL_BARREL_1997_I456942
+insert /Herwig/Analysis/Rivet:Analyses 0 CRYSTAL_BARREL_1997_I456942
# eta -> pi+pi-pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE2_2016_I1416990
+insert /Herwig/Analysis/Rivet:Analyses 0 KLOE2_2016_I1416990
# eta -> pi0 gamma gamma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 A2_2014_I1297221
+insert /Herwig/Analysis/Rivet:Analyses 0 A2_2014_I1297221
# eta -> pi+pi-pi0 and 3pi0 + eta'->3pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2015_I1376484
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2015_I1376484
# eta' > pi+pi-e+e-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1830421
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2020_I1830421
# eta' -> eta pi0 pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2105430
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2105430
# eta' -> eta pi0 pi0 and eta pi+ pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1623555
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2018_I1623555
# eta -> 3 pi0 or pi+pi-pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1469067
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2017_I1469067
# eta' -> 3 pi0 or pi+pi-pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2633025
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2633025
diff --git a/Tests/Rivet/EE/EE-Etac.in b/Tests/Rivet/EE/EE-Etac.in
--- a/Tests/Rivet/EE/EE-Etac.in
+++ b/Tests/Rivet/EE/EE-Etac.in
@@ -1,30 +1,30 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
decaymode Upsilon(4S)->eta_c,eta_c; 1. 1 /Herwig/Decays/DecayME0
do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->eta_c,eta_c;
# BES multiplicty in eta_c decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1724880
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1724880
# eta_c -> K+K-eta and eta_c -> K+K-pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2014_I1287632
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2014_I1287632
# eta_c -> K0_SK+- pi-+ and eta_c -> K+K-pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2015_I1403544
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2015_I1403544
# eta_c -> K0_SK+- pi-+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1187787
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2012_I1187787
# eta_c -> K+K-eta', pi+pi-eta and pi+pi-eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2021_I1867843
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2021_I1867843
# eta_c -> f_r f_2(')
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2008_I754089
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2008_I754089
# eta_c BRs
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_ETAC
+#insert /Herwig/Analysis/Rivet:Analyses 0 PDG_ETAC
# eta_c MC
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_DALITZ_ETAC
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_DALITZ_ETAC
diff --git a/Tests/Rivet/EE/EE-JPsi-All.in b/Tests/Rivet/EE/EE-JPsi-All.in
--- a/Tests/Rivet/EE/EE-JPsi-All.in
+++ b/Tests/Rivet/EE/EE-JPsi-All.in
@@ -1,94 +1,94 @@
# -*- ThePEG-repository -*-
# e+ e- -> J/Psi
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEJpsi HwMELepton.so
set /Herwig/MatrixElements/MEJpsi:VectorMeson /Herwig/Particles/Jpsi
set /Herwig/MatrixElements/MEJpsi:Coupling 11.43148
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEJpsi
set EventGenerator:EventHandler:LuminosityFunction:Energy 3.096916
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_JPSI
+#insert /Herwig/Analysis/Rivet:Analyses 0 PDG_JPSI
# J/psi -> pi+ pi- pi0, K+K-pi0 and KS0 K+-pi-+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2017_I1512302
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2017_I1512302
# J/psi -> pi+ pi- pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1088606
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KEDR_2022_I2593308
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2012_I1088606
+insert /Herwig/Analysis/Rivet:Analyses 0 KEDR_2022_I2593308
# J/psi -> pi+ pi- eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1621266
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2017_I1621266
# J/psi -> K+K-pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1731057
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1731057
# J/psi -> p pbar eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1709205
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1709205
# J/psi -> p pbar omega
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2013_I1223625
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2013_I1223625
# J/psi -> p pbar pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2009_I819937
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2009_I819937
# J/psi -> p pbar eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BES_2001_I556330
+insert /Herwig/Analysis/Rivet:Analyses 0 BES_2001_I556330
# J/psi -> p pbar phi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1411448
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2016_I1411448
# J/psi -> p nbar pi- +cc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2006_I650381
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2006_I650381
# J/psi -> p Lambda0 K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2004_I650570
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2004_I650570
# J/psi -> e+e- pi+pi-eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I1997940
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I1997940
# J/psi -> e+e- pi0 (need total rate for normalisation)
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2025_I2866232
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2025_I2866232
# J/psi -> phi eta eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1712729
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1712729
# J/psi -> Lambda Lambdabar eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2166759
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2166759
# J/psi -> gamma eta pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1484158
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2016_I1484158
# J/psi -> gamma KS0 KS0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1689296
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2018_I1689296
# J/psi -> gamma pi0 pi0 / pi+ pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2015_I1373915
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2006_I712991
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2015_I1373915
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2006_I712991
# J/psi -> gamma gamma phi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1646687
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2018_I1646687
# J/psi -> gamma phi phi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1419650
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2016_I1419650
# J/psi -> gamma eta' eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2016785
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2016785
# J/psi -> gamma eta eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2135117
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2135117
# J/psi -> gamma eta eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2013_I1209121
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2013_I1209121
# J/psi -> gamma pi+ pi- eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1437949
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2018236
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2016_I1437949
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2018236
# J/psi -> gamma pi+ pi- eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BES_1999_I498114
+insert /Herwig/Analysis/Rivet:Analyses 0 BES_1999_I498114
# J/psi -> gamma eta(1405)
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1084539
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2012_I1084539
# J/psi -> gamma omega phi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2013_I1203841
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2013_I1203841
# J/psi -> gamma omega omega
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2006_I715175
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2006_I715175
# J/psi -> gamma KS0 KS0 pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2155157
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2155157
# J/psi -> gamma KS0 KS0 eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2015_I1376282
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2015_I1376282
# J/psi -> gamma K+K-/ KS0KS0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2003_I623925
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2003_I623925
# J/psi -> gamma p pbar
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1079921
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2012_I1079921
# J/psi -> gamma K+ K- pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BES_1998_I482964
+insert /Herwig/Analysis/Rivet:Analyses 0 BES_1998_I482964
# J/psi -> gamma K*0 Kbar*0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BES_1999_I505287
+insert /Herwig/Analysis/Rivet:Analyses 0 BES_1999_I505287
# J/psi -> gamma 2pi+ 2pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BES_1999_I507639
+insert /Herwig/Analysis/Rivet:Analyses 0 BES_1999_I507639
# J/psi -> 3 gamma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2013_I1126137
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2013_I1126137
# J/psi -. 2pi+2pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2005_I678943
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2005_I678943
# J/psi -> omega K+ K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2004_I658084
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2004_I658084
# J/psi -> omega pi+ pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2004_I652399
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2004_I652399
# J/psi -> phi pi+ pi- or K+K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2005_I663288
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2005_I663288
diff --git a/Tests/Rivet/EE/EE-JPsi.in b/Tests/Rivet/EE/EE-JPsi.in
--- a/Tests/Rivet/EE/EE-JPsi.in
+++ b/Tests/Rivet/EE/EE-JPsi.in
@@ -1,44 +1,44 @@
# -*- ThePEG-repository -*-
# e+ e- -> J/Psi
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEJpsi HwMELepton.so
set /Herwig/MatrixElements/MEJpsi:VectorMeson /Herwig/Particles/Jpsi
set /Herwig/MatrixElements/MEJpsi:Coupling 11.43148
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEJpsi
set EventGenerator:EventHandler:LuminosityFunction:Energy 3.096916
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
# select low BR modes
do /Herwig/Particles/Jpsi:SelectDecayModes /Herwig/Particles/Jpsi/Jpsi->n0,nbar0; /Herwig/Particles/Jpsi/Jpsi->p+,pbar-; /Herwig/Particles/Jpsi/Jpsi->Sigma0,Sigmabar0; /Herwig/Particles/Jpsi/Jpsi->Lambda0,Lambdabar0; /Herwig/Particles/Jpsi/Jpsi->Sigma*-,Sigma*bar+; /Herwig/Particles/Jpsi/Jpsi->Sigma*0,Sigma*bar0; /Herwig/Particles/Jpsi/Jpsi->Sigma*+,Sigma*bar-; /Herwig/Particles/Jpsi/Jpsi->Xi-,Xibar+; /Herwig/Particles/Jpsi/Jpsi->Sigma*0,Sigma*bar0; /Herwig/Particles/Jpsi/Jpsi->Xi0,Xibar0; Jpsi->Xi*bar0,Xi0; Jpsi->Xi*bar+,Xi-; Jpsi->Sigma+,Sigmabar-; Jpsi->Sigma0,Sigmabar0; Jpsi->Sigma-,Sigmabar+; Jpsi->eta,e-,e+; Jpsi->eta',gamma;
# J/psi-> lambda anti-lambda and sigma anti-sigma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1510563
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2017_I1510563
# J/psi -> p pbar and n nbar
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1113599
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2012_I1113599
# J/Psi -> xi- and Sigma*+/-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1422780
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2016_I1422780
# J/Psi -> xi0 and Sigma*0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1506414
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2017_I1506414
# J/Psi -> xi0 correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2660219
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2660219
# J/psi -> xi- xi+bar correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I1864775
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2703033
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I1864775
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2703033
# J/psi-> lambda anti-lambda
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1691850
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2099126
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2071715
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1691850
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2099126
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2071715
# J/psi-> lambda anti-Sigma0 +cc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1121378
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2012_I1121378
# J/Psi -> xi*- xibar+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1765606
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1765606
# J/Psi -> sigma+ sigmabar-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1791570
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2636760
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2655292
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2020_I1791570
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2636760
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2655292
# BES J/psi -> eta e+ e-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1697377
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2018_I1697377
# BES J/psi -> eta' e+ e-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1692688
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1692688
# BES J/psi -> eta', eta, pi0 e+ e-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2014_I1287631
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2014_I1287631
diff --git a/Tests/Rivet/EE/EE-LL-10.58.in b/Tests/Rivet/EE/EE-LL-10.58.in
--- a/Tests/Rivet/EE/EE-LL-10.58.in
+++ b/Tests/Rivet/EE/EE-LL-10.58.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 3.5*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 8.*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
set /Herwig/Particles/e-:PDF /Herwig/Partons/LeptonPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/LeptonPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
# BABAR asymetry
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2015_I1388182
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2015_I1388182
diff --git a/Tests/Rivet/EE/EE-LL-197.in b/Tests/Rivet/EE/EE-LL-197.in
--- a/Tests/Rivet/EE/EE-LL-197.in
+++ b/Tests/Rivet/EE/EE-LL-197.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 197.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tau polarization in e+e- > tau+tau-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2008_I763352
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2008_I763352
diff --git a/Tests/Rivet/EE/EE-LL-29.in b/Tests/Rivet/EE/EE-LL-29.in
--- a/Tests/Rivet/EE/EE-LL-29.in
+++ b/Tests/Rivet/EE/EE-LL-29.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 29.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tau polarization in e+e- > tau+tau-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MAC_1987_I245571
+insert /Herwig/Analysis/Rivet:Analyses 0 MAC_1987_I245571
diff --git a/Tests/Rivet/EE/EE-LL-58.in b/Tests/Rivet/EE/EE-LL-58.in
--- a/Tests/Rivet/EE/EE-LL-58.in
+++ b/Tests/Rivet/EE/EE-LL-58.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 58.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tau polarization
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 VENUS_1997_I440852
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I298238
+insert /Herwig/Analysis/Rivet:Analyses 0 VENUS_1997_I440852
+insert /Herwig/Analysis/Rivet:Analyses 0 AMY_1990_I298238
diff --git a/Tests/Rivet/EE/EE-LL-91.in b/Tests/Rivet/EE/EE-LL-91.in
--- a/Tests/Rivet/EE/EE-LL-91.in
+++ b/Tests/Rivet/EE/EE-LL-91.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 91.2
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tau polarization in e+e- > tau+tau-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_I511443
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2001_I554583
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1998_I467929
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2001_I555653
+insert /Herwig/Analysis/Rivet:Analyses 0 DELPHI_2000_I511443
+insert /Herwig/Analysis/Rivet:Analyses 0 OPAL_2001_I554583
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_1998_I467929
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_2001_I555653
diff --git a/Tests/Rivet/EE/EE-Lambdab.in b/Tests/Rivet/EE/EE-Lambdab.in
--- a/Tests/Rivet/EE/EE-Lambdab.in
+++ b/Tests/Rivet/EE/EE-Lambdab.in
@@ -1,27 +1,27 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 7.*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 7.*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.999
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
do /Herwig/Particles/Upsilon(4S):SelectDecayModes
decaymode Upsilon(4S)->Lambda_b10,Lambda_bbar0; .25 1 /Herwig/Decays/DecayME0
decaymode Upsilon(4S)->Lambda_b0,Lambda_b1bar0; .25 1 /Herwig/Decays/DecayME0
decaymode Upsilon(4S)->Lambda_b1*0,Lambda_bbar0; .25 1 /Herwig/Decays/DecayME0
decaymode Upsilon(4S)->Lambda_b0,Lambda_b1*bar0; .25 1 /Herwig/Decays/DecayME0
# excited lambda_b decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2012_I1114753
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2012_I1114753
# lambda_b -> lambda_c mu- nu_mubar
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2017_I1621811
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2017_I1621811
# lambda_b -> Lambda0 gamma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2022_I1971920
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2022_I1971920
# lambda_b -> Lambda(1520)0 mu+ mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2023_I2633007
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2023_I2633007
# lambda_b -> Lambda_c decay correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2024_I2824757
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2024_I2824757
diff --git a/Tests/Rivet/EE/EE-Lambdac.in b/Tests/Rivet/EE/EE-Lambdac.in
--- a/Tests/Rivet/EE/EE-Lambdac.in
+++ b/Tests/Rivet/EE/EE-Lambdac.in
@@ -1,52 +1,52 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
decaymode Upsilon(4S)->Lambda_c+,Lambdabar_c-; 1. 1 /Herwig/Decays/DecayME0
do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Lambda_c+,Lambdabar_c-;
# Lambda_c decays (Lambda Pi+)
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 FOCUS_2006_I693639
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1992_I319105
+insert /Herwig/Analysis/Rivet:Analyses 0 FOCUS_2006_I693639
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1992_I319105
# Lambda_c decays (Lambda Pi+ and Sigma+ Pi0)
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1995_I392704
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1995_I392704
# lambda_c -> Sigma + pi0,eta, eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2022_I2140379
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2022_I2140379
# Lambda_c decays Lambda,Sigma0 pi+,K+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2022_I2138841
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2022_I2138841
# Lambda_c decays (e+ nu_e)
# correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1994_I371613
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I371611
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_2005_I668268
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1994_I371613
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1994_I371611
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_2005_I668268
# pK- e+ nu_e
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2122399
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2122399
# Lambda0 l+ nu_l
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2127373
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2689064
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2127373
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2689064
# other decays
# Lambda_c -> Xi* K+ -> Xi- pi_ K+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2008_I781294
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2008_I781294
# Lambda_c -> Lambda eta pi+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1711896
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1711896
# Lambda_c -> p KS0 eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1837968
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2021_I1837968
# Lambda_c -> p KS0 eta and p 2KS0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2022_I2160445
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2022_I2160445
# Lambda_c -> eta Lambda pi+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2020_I1813380
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2020_I1813380
# Lambda_c -> Lambda pi+ pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2153556
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2153556
# Lambda_c -> Lambda pi+ eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2808543
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2808543
# Lambda_c -> Lambda K+ K0S
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I722213
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2006_I722213
# Lambda_c -> Sigma+ K+K- and Lambda0 KS0 K+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2002_I566127
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2002_I566127
diff --git a/Tests/Rivet/EE/EE-Omega-Baryon.in b/Tests/Rivet/EE/EE-Omega-Baryon.in
--- a/Tests/Rivet/EE/EE-Omega-Baryon.in
+++ b/Tests/Rivet/EE/EE-Omega-Baryon.in
@@ -1,18 +1,18 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
decaymode Upsilon(4S)->Omega-,Omegabar+; 1. 1 /Herwig/Decays/DecayME0
do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Omega-,Omegabar+;
# Omega decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HYPERCP_2005_I677384
+insert /Herwig/Analysis/Rivet:Analyses 0 HYPERCP_2005_I677384
# Omega decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 WA46_1984_I206647
+insert /Herwig/Analysis/Rivet:Analyses 0 WA46_1984_I206647
diff --git a/Tests/Rivet/EE/EE-Omega-Meson.in b/Tests/Rivet/EE/EE-Omega-Meson.in
--- a/Tests/Rivet/EE/EE-Omega-Meson.in
+++ b/Tests/Rivet/EE/EE-Omega-Meson.in
@@ -1,20 +1,20 @@
# -*- ThePEG-repository -*-
# e+ e- -> omega
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEOmega HwMELepton.so
set /Herwig/MatrixElements/MEOmega:VectorMeson /Herwig/Particles/omega
set /Herwig/MatrixElements/MEOmega:Coupling 17.31158
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEOmega
set EventGenerator:EventHandler:LuminosityFunction:Energy 0.78265
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
# pi0 dalitz
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 A2_2017_I1498079
+insert /Herwig/Analysis/Rivet:Analyses 0 A2_2017_I1498079
# eta/omega dalitz
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 A2_2017_I1486671
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 NA60_2016_I1452485
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMD2_2005_I676548
+insert /Herwig/Analysis/Rivet:Analyses 0 A2_2017_I1486671
+insert /Herwig/Analysis/Rivet:Analyses 0 NA60_2016_I1452485
+insert /Herwig/Analysis/Rivet:Analyses 0 CMD2_2005_I676548
# omega/phi -> 3pi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_DECAY_OMEGAPHIA1_3PION
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_DECAY_OMEGAPHIA1_3PION
# omega -> pi+pi-pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1703033
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2018_I1703033
\ No newline at end of file
diff --git a/Tests/Rivet/EE/EE-Omegac0.in b/Tests/Rivet/EE/EE-Omegac0.in
--- a/Tests/Rivet/EE/EE-Omegac0.in
+++ b/Tests/Rivet/EE/EE-Omegac0.in
@@ -1,18 +1,18 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
decaymode Upsilon(4S)->Omega_c0,Omega_cbar0; 1. 1 /Herwig/Decays/DecayME0
do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Omega_c0,Omega_cbar0;
# Omega decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I719581
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2006_I719581
# mass distributions
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2018_I1641071
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2018_I1641071
diff --git a/Tests/Rivet/EE/EE-Phi.in b/Tests/Rivet/EE/EE-Phi.in
--- a/Tests/Rivet/EE/EE-Phi.in
+++ b/Tests/Rivet/EE/EE-Phi.in
@@ -1,24 +1,24 @@
# -*- ThePEG-repository -*-
# e+ e- -> phi
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEPhi HwMELepton.so
set /Herwig/MatrixElements/MEPhi:VectorMeson /Herwig/Particles/phi
set /Herwig/MatrixElements/MEPhi:Coupling 13.60507
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEPhi
set EventGenerator:EventHandler:LuminosityFunction:Energy 1.019461
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
# phi -> eta pi0 gamma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE_2009_I818106
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SND_2000_I525398
+insert /Herwig/Analysis/Rivet:Analyses 0 KLOE_2009_I818106
+insert /Herwig/Analysis/Rivet:Analyses 0 SND_2000_I525398
# phi -> pi0 pi0 gamma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE_2002_I585183
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SND_2000_I527094
+insert /Herwig/Analysis/Rivet:Analyses 0 KLOE_2002_I585183
+insert /Herwig/Analysis/Rivet:Analyses 0 SND_2000_I527094
# KLOE phi -> pi0 dalitz
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE2_2016_I1416825
+insert /Herwig/Analysis/Rivet:Analyses 0 KLOE2_2016_I1416825
# KLOE phi -> eta dalitz
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE2_2014_I1317236
+insert /Herwig/Analysis/Rivet:Analyses 0 KLOE2_2014_I1317236
# phi -> pi+pi-pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SND_2001_I558279
+insert /Herwig/Analysis/Rivet:Analyses 0 SND_2001_I558279
# omega/phi -> 3pi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_DECAY_OMEGAPHIA1_3PION
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_DECAY_OMEGAPHIA1_3PION
diff --git a/Tests/Rivet/EE/EE-Psi2S-All.in b/Tests/Rivet/EE/EE-Psi2S-All.in
--- a/Tests/Rivet/EE/EE-Psi2S-All.in
+++ b/Tests/Rivet/EE/EE-Psi2S-All.in
@@ -1,112 +1,112 @@
# -*- ThePEG-repository -*-
# e+ e- -> psi(2S)
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEPsi2S HwMELepton.so
set /Herwig/MatrixElements/MEPsi2S:VectorMeson /Herwig/Particles/psi(2S)
set /Herwig/MatrixElements/MEPsi2S:Coupling 19.25684
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEPsi2S
set EventGenerator:EventHandler:LuminosityFunction:Energy 3.6861
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
#do /Herwig/Particles/psi(2S):SelectDecayModes psi(2S)->chi_c1,gamma;
#do /Herwig/Particles/psi(2S):SelectDecayModes psi(2S)->chi_c2,gamma; psi(2S)->chi_c0,gamma; psi(2S)->chi_c1,gamma;
#do /Herwig/Particles/chi_c2:SelectDecayModes chi_c2->pi+,pi-; chi_c2->K+,K-;
#do /Herwig/Particles/chi_c0:SelectDecayModes chi_c0->pi+,pi-; chi_c0->K+,K-;
#do /Herwig/Particles/chi_c1:SelectDecayModes chi_c1->Jpsi,gamma;
#do /Herwig/Particles/chi_c2:SelectDecayModes chi_c2->Jpsi,gamma;
########### general mult stuff #######################
# jpsi, chi_{0,1,2} charged mults
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1800404
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2020_I1800404
########### Decay to three mesons ####################
# psi(2s) -> J/Psi pi+pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1979_I144382
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BES_1999_I507637
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2008_I784516
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2007_I728304
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2005_I651834
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKII_1979_I144382
+insert /Herwig/Analysis/Rivet:Analyses 0 BES_1999_I507637
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOC_2008_I784516
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2007_I728304
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2005_I651834
# psi(2S) -> pi+ pi- pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1088606
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BES_2005_I689969
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2012_I1088606
+insert /Herwig/Analysis/Rivet:Analyses 0 BES_2005_I689969
# psi(2S) -> omega KS0 KS0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1921801
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2021_I1921801
# psi(2S) -> phi KS0 KS0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2693763
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2693763
# psi(2S) -> K+ K- pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1127328
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2012_I1127328
# psi(2S) -> K+ K- eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1771616
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2020_I1771616
# psi(2S) -> pi+ pi- eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1621266
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2017_I1621266
########### Decay to 2 baryons + meson ####################
# psi(2S) -> p pbar eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1709205
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1709205
# psi(2S) -> p pbar eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2013_I1227512
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2013_I1227512
# psi(2S) -> p pbar pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2013_I1120737
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2013_I1120737
# psi(2S) -> p pbar phi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1722111
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1722111
# psi(2S) -> Lambda Lambdabar eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2167804
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2167804
# psi(2S) -> Lambda Lambdabar eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2702517
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2702517
# psi(2S) -> p nbar pi- +cc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2006_I716589
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2006_I716589
# psi(2S) -> pbar Sigma0 K+ and chi_c -> pbar Lambda0 K+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2013_I1203840
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2013_I1203840
# psi(2S) -> Lambda0 Sigmabar+- pi-+ +cc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2013_I1261765
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2013_I1261765
# psi(2S) -> Lambda Lambdabar eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2166759
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2166759
########### Decay to gamma chi_c correlations ###########
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1507887
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2009_I832707
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1624548
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2011_I931195
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2033855
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2017_I1507887
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2009_I832707
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2017_I1624548
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2011_I931195
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2033855
########### chi_c Decays ################################
# branching ratios
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_CHIC0
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_CHIC1
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_CHIC2
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_PSI2S
+#insert /Herwig/Analysis/Rivet:Analyses 0 PDG_CHIC0
+#insert /Herwig/Analysis/Rivet:Analyses 0 PDG_CHIC1
+#insert /Herwig/Analysis/Rivet:Analyses 0 PDG_CHIC2
+#insert /Herwig/Analysis/Rivet:Analyses 0 PDG_PSI2S
# decays to baryon antibaryon meson
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1818254
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1870388
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2020_I1818254
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2021_I1870388
# chi_c1 pi+pi-eta + other modes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2007_I732065
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2007_I732065
# chi_c1 pi+pi-eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1490896
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2017_I1490896
# chi_c1 pi+pi-eta(')
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2011_I929693
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOC_2011_I929693
# chi_c to phi phi eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1763897
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2020_I1763897
# chi_c to 4 KS0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1716627
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1716627
# chi_c(1,2) -> J/psi mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1716256
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1716256
# chi_c(1,2) -> eta' K+ K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2014_I1280710
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2014_I1280710
# chi_c 4 pi 2K 2pi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2008_I787608
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2008_I787608
# chi_c0 pi+pi-K+K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2005_I690784
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2005_I690784
# chi_c -> p nbar pi-(pi0)
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1128258
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2012_I1128258
# chi_c -> 4 pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2010_I878544
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2010_I878544
# chi_c1 -> gamma V
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2011_I894356
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2011_I894356
# chi-c2 -> KK pi and 3 pi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1505590
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2017_I1505590
# chi_c -> Lambda Lambdabar eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2166668
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2166668
# chi-c -> phi KKpi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2015_I1352828
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2015_I1352828
# chi-c -> phi phi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2627838
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2627838
# psi(2S) -> gamma p pbar
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1079921
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2012_I1079921
# psi(2S) -> gamma pi+pi= / K+ K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2007_I763951
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BES_2003_I563492
+insert /Herwig/Analysis/Rivet:Analyses 0 BESII_2007_I763951
+insert /Herwig/Analysis/Rivet:Analyses 0 BES_2003_I563492
diff --git a/Tests/Rivet/EE/EE-Psi2S.in b/Tests/Rivet/EE/EE-Psi2S.in
--- a/Tests/Rivet/EE/EE-Psi2S.in
+++ b/Tests/Rivet/EE/EE-Psi2S.in
@@ -1,41 +1,41 @@
# -*- ThePEG-repository -*-
# e+ e- -> psi(2S)
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEPsi2S HwMELepton.so
set /Herwig/MatrixElements/MEPsi2S:VectorMeson /Herwig/Particles/psi(2S)
set /Herwig/MatrixElements/MEPsi2S:Coupling 19.25684
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEPsi2S
set EventGenerator:EventHandler:LuminosityFunction:Energy 3.6861
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
do /Herwig/Particles/psi(2S):SelectDecayModes psi(2S)->n0,nbar0; psi(2S)->p+,pbar-; psi(2S)->Sigma0,Sigmabar0; psi(2S)->Sigma+,Sigmabar-; psi(2S)->Lambda0,Lambdabar0; psi(2S)->Sigma*-,Sigma*bar+; psi(2S)->Sigma-,Sigmabar+; psi(2S)->Sigma*0,Sigma*bar0; psi(2S)->Sigma*+,Sigma*bar-; psi(2S)->Xi-,Xibar+; psi(2S)->Xi0,Xibar0; psi(2S)->Sigma*0,Sigma*bar0; psi(2S)->Xi*-,Xi*bar+; psi(2S)->Xi*0,Xi*bar0;
########### Decay to two baryons (correlations) ####################
# psi(2S) -> lambda anti-lambda and sigma anti-sigma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1510563
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2017_I1510563
# psi(2S) -> p pbar and n nbar
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1658762
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2018_I1658762
# psi(2S) -> xi- and Sigma+/-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1422780
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2016_I1422780
# psi(2S) -> xi0 and Sigma*0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1506414
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2017_I1506414
# psi(2S) -> xi*-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1747092
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1747092
# psi(2S) -> xi*0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1921775
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2021_I1921775
# BES psi(2s) -> sigma+ sigmabar-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1791570
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2020_I1791570
# psi(2S) -> xi- xi+bar correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2099144
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2099144
# psi(2S) -> xi0 xi0bar correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2634735
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2634735
# psi(2S) -> Sigma- Sigmabar+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2158325
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2158325
# direct psi(2S) -> gamma gamma J/psi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1097066
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2012_I1097066
#################### Dalitz decays ##################################
# psi(2S) -> eta_c e+ e-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2141748
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2141748
# psi(2S) -> eta' e+ e-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1664315
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2018_I1664315
# psi(2S) -> chi_c e+ e-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1509920
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2017_I1509920
diff --git a/Tests/Rivet/EE/EE-Psi3770.in b/Tests/Rivet/EE/EE-Psi3770.in
--- a/Tests/Rivet/EE/EE-Psi3770.in
+++ b/Tests/Rivet/EE/EE-Psi3770.in
@@ -1,160 +1,160 @@
# -*- ThePEG-repository -*-
# e+ e- -> psi(3770)
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEPsi3770 HwMELepton.so
set /Herwig/MatrixElements/MEPsi3770:VectorMeson /Herwig/Particles/psi(3770)
set /Herwig/MatrixElements/MEPsi3770:Coupling 58.12041
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEPsi3770
set EventGenerator:EventHandler:LuminosityFunction:Energy 3.7711
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
########## branching ratios ################
# D0 inclusive
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_D0
+#insert /Herwig/Analysis/Rivet:Analyses 0 PDG_D0
# D+ inclusive
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_DPLUS
+#insert /Herwig/Analysis/Rivet:Analyses 0 PDG_DPLUS
########## semi-leptonic ###################
# CLEO D lepton spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2009_I823313
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2006_I715096
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2008_I769777
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOC_2009_I823313
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOC_2006_I715096
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOC_2008_I769777
# D0 -> K- semi-leptonic
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1697371
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I1091435
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2819140
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2018_I1697371
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2007_I1091435
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2819140
# D+ -> eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2011_I875526
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1662660
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOC_2011_I875526
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2018_I1662660
# D+ -> eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2839350
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2839350
# D0/+ -> pi semi-leptonic
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1655158
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2018_I1655158
# D0 -> Kbar0 pi- e+ nu_e
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1705754
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2018_I1705754
# D -> pi pi e+ nu_e
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1694530
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2825816
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2013_I1081165
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1694530
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2825816
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2013_I1081165
# D0 -> pi- semi-leptonic
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2015_I1334693
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2015_I1334693
# D0 -> pi-, K- semi-leptonic
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2015_I1391138
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2004_I654843
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2006_I715430
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2015_I1391138
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2004_I654843
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2006_I715430
# D+ -> K0 pi0 semi-leptonic
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1519425
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2017_I1519425
# D+ -> K- pi+ semi-leptonic
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1411645
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2010_I879997
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2016_I1411645
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2010_I879997
# D+ -> omega l nu
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2015_I1386254
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2015_I1386254
######### Two body decays ###################
# D0 -> omega phi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I1900094
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I1900094
# D0 -> KS0 phi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1987_I247005
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1987_I247005
########## 3-body decays ####################
# Dalitz plot analysis of D -> Kpipi decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 E691_1992_I342947
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKIII_1987_I247266
+insert /Herwig/Analysis/Rivet:Analyses 0 E691_1992_I342947
+insert /Herwig/Analysis/Rivet:Analyses 0 MARKIII_1987_I247266
# Dalitz plot analysis of D0 -> KS0 pi0 pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2011_I913909
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOC_2011_I913909
# Dalitz plot analysis of D+ -> K0S pi+ pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2014_I1277070
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2014_I1277070
# Dalitz plot analysis of D0 -> K0S pi+ pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2003_I633196
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2014_I1289224
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2018_I1668123
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2615968
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_I352983
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2003_I633196
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2014_I1289224
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2018_I1668123
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2615968
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1993_I352983
# Dalitz plot analysis of D+ -> K- pi+ pi+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 E791_2002_I585322
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 FOCUS_2007_I750701
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2008_I780363
+insert /Herwig/Analysis/Rivet:Analyses 0 E791_2002_I585322
+insert /Herwig/Analysis/Rivet:Analyses 0 FOCUS_2007_I750701
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOC_2008_I780363
# Kinematic distributions in the decay D0 -> K-pi+pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_2001_I537154
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I722905
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_2001_I537154
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2006_I722905
# Dalitz decay of D0 -> K0S pi0 eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2004_I649917
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2004_I649917
# Dalitz decay of D0 -> K-pi+eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2020_I1785816
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2020_I1785816
# Dalitz decay of D+ -> K0S pi+ eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2696635
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2696635
# D -> K pi omega
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1940222
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2021_I1940222
# D -> K pi eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1693610
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2018_I1693610
# D0 -> pi+pi-eta and K+K-eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2021_I1867474
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2021_I1867474
# Dalitz plot analysis of D0 -> K0S K+ K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1799437
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2020_I1799437
# Dalitz plot analysis of D0 -> K0S pi+ pi- and D0 -> K0S K+ K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2010_I853279
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2010_I853279
# Dalitz plot analysis of D+ -> K+K+K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2019_I1720423
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2019_I1720423
# Dalitz plot analysis of D+ -> K+ K- pi+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2008_I791716
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2013_I1206605
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2008_I791716
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2013_I1206605
# Dalitz plot analysis of D+ -> K+ K0S pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1859124
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2021_I1859124
# Dalitz plot analysis of D0 -> K+ K- pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I749390
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2007_I749390
# Dalitz plot analysis of D0 -> K0S K+- pi-+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2012_I1094160
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2016_I1394391
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2012_I1094160
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2016_I1394391
# Dalitz decay of D+ and D+_s -> K+pi+pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 FOCUS_2004_I654030
+insert /Herwig/Analysis/Rivet:Analyses 0 FOCUS_2004_I654030
# Dalitz plot analysis of D+ -> pi+ pi+ pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 E791_2001_I530320
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2007_I749602
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 FOCUS_2003_I635446
+insert /Herwig/Analysis/Rivet:Analyses 0 E791_2001_I530320
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOC_2007_I749602
+insert /Herwig/Analysis/Rivet:Analyses 0 FOCUS_2003_I635446
# Dalitz plot analysis of D0 -> pi+ pi- pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I747154
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2016_I1441203
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2005_I679349
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2007_I747154
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2016_I1441203
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2005_I679349
# D0 -> eta pi+pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2008_I779705
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOC_2008_I779705
# D -> eta pipi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2777242
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2777242
# D0 -> pi0 eta eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1662665
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2018_I1662665
########## Four body decays ####################
# D+ -> KS0 pi+pi+pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1714778
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1714778
# D0 -> K- pi+ pi0 pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1725265
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1725265
# D0 -> K- pi+ pi+ pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1511280
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2017_I1511280
# D+ -> KS0 pi+ pi0 pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2088337
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2662580
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2088337
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2662580
# D0 -> K-K-K+pi+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 FOCUS_2003_I626320
+insert /Herwig/Analysis/Rivet:Analyses 0 FOCUS_2003_I626320
# D0 -> K+ K- pi+ pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2012_I1086166
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 FOCUS_2004_I663820
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2018_I1704426
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2012_I1086166
+insert /Herwig/Analysis/Rivet:Analyses 0 FOCUS_2004_I663820
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2018_I1704426
# D+ -> K+ K- pi+ pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1808166
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2020_I1808166
# D0 -> K+ K- pi+ pi- and 2pi+ 2pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2017_I1519168
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2017_I1519168
# D0 -> 2pi+ 2pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 FOCUS_2007_I741543
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2024_I2730532
+insert /Herwig/Analysis/Rivet:Analyses 0 FOCUS_2007_I741543
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2024_I2730532
# range of D+/D0 -> pion decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2102455
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2022_I2102455
# D0 -> K+ pi- e+e- /mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2019_I1691954
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2015_I1401225
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2019_I1691954
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2015_I1401225
# D0,+ -> pi+ pi+ pi-X
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2621481
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2621481
########## Spectra ##############################
# CLEO eta, eta' phi spectra in D decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2006_I728043
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOC_2006_I728043
# D -> phi X
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1749793
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2019_I1749793
# D -> KS0 X
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2023_I2637232
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2023_I2637232
########## psi(3770) decays ######################################
# Lambda Lambdabar correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1974025
+insert /Herwig/Analysis/Rivet:Analyses 0 BESIII_2021_I1974025
diff --git a/Tests/Rivet/EE/EE-Tau.in b/Tests/Rivet/EE/EE-Tau.in
--- a/Tests/Rivet/EE/EE-Tau.in
+++ b/Tests/Rivet/EE/EE-Tau.in
@@ -1,63 +1,63 @@
# -*- ThePEG-repository -*-
erase /Herwig/EventHandlers/EventHandler:PostSubProcessHandlers 0
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
# Matrix elements
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEee2gZ2ll
set /Herwig/MatrixElements/MEee2gZ2ll:Allowed Tau
set /Herwig/Particles/pi0:Stable Stable
# leptons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1995_I374784
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1995_I374784
# pi- pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2008_I786560
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1994_I375417
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1992_I335698
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1999_I508944
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2008_I786560
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1994_I375417
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1992_I335698
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1999_I508944
# three pion
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I756323
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1992_I339268
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2007_I756323
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1992_I339268
# 4 pion
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1987_I237930
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_I421984
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1995_I400623
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1999_I501487
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_2000_I505170
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1987_I237930
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_1996_I421984
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1995_I400623
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1999_I501487
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_2000_I505170
# ALEPH spectral functions
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2014_I1267648
+insert /Herwig/Analysis/Rivet:Analyses 0 ALEPH_2014_I1267648
# BELLE Kpi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2007_I753243
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2007_I753243
# BELLE 3 charged hadrons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2010_I841618
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2010_I841618
# BABAR KK
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2018_I1679886
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2018_I1679886
# CLEO K eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1996_I415409
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1996_I415409
# CLEO 3pi- 2pi+ pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I373188
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1994_I373188
# CLEO K_S0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1996_I415408
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1996_I415408
# BELLE phi K
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2006_I725750
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2006_I725750
# BELLE KS0 KS0 pi- pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2014_I1282136
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2014_I1282136
# CLEO K- pi+ pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2000_I525698
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2000_I525698
# BABAR KS0 KS0 pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2012_I1125567
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2012_I1125567
# BABAR 5 and 6 pions
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2012_I1185407
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2012_I1185407
# CLEO 6 pions
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2001_I535016
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2001_I535016
# CLEO 4 hadron with K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOIII_2005_I675005
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOIII_2005_I675005
# CLEO hadrons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1995_I396711
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1995_I396711
# pi+pi-pi-eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1997_I444745
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1997_I444745
# MC dists
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_DECAY_TAU
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_DECAY_TAU
diff --git a/Tests/Rivet/EE/EE-Upsilon.in b/Tests/Rivet/EE/EE-Upsilon.in
--- a/Tests/Rivet/EE/EE-Upsilon.in
+++ b/Tests/Rivet/EE/EE-Upsilon.in
@@ -1,62 +1,62 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 4.73015*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 4.73015*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.45
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
# set hard process
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon
set /Herwig/MatrixElements/MEUpsilon:Coupling 41.15810
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
# BELLE charm hadron production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_I356616
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_I342061
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1993_I356616
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1993_I342061
# ARGUS pi0 and eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I278933
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1990_I278933
# Crystal Ball pi0 and eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CRYSTAL_BALL_1991_I297905
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I276860
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262415
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
+insert /Herwig/Analysis/Rivet:Analyses 0 CRYSTAL_BALL_1991_I297905
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1989_I262551
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1989_I276860
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1988_I251097
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1989_I262415
+insert /Herwig/Analysis/Rivet:Analyses 0 PLUTO_1981_I165122
# CLEO eta' spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_2002_I601701
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOIII_2006_I728679
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_2002_I601701
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOIII_2006_I728679
# MD1 Lambda spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MD1_1994_I362599
+insert /Herwig/Analysis/Rivet:Analyses 0 MD1_1994_I362599
# LENA thrust and mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LENA_1981_I164397
+insert /Herwig/Analysis/Rivet:Analyses 0 LENA_1981_I164397
# ARGUS thrust
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1986_I227324
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1986_I227324
# BABAR D*+/- spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2009_I836615
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2009_I836615
# CLEO Identified particle spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1985_I205668
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1985_I205668
# ARGUS Delta++
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I278932
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1989_I278932
# anti-deuteron
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I283027
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2014_I1286317
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2006_I733995
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1990_I283027
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2014_I1286317
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2006_I733995
# photon spectrtum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOIII_2006_I701217
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1987_I248655
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CRYSTAL_BALL_1991_I315873
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1986_I220652
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CUSB_1984_I204307
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOIII_2006_I701217
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1987_I248655
+insert /Herwig/Analysis/Rivet:Analyses 0 CRYSTAL_BALL_1991_I315873
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1986_I220652
+insert /Herwig/Analysis/Rivet:Analyses 0 CUSB_1984_I204307
# J/psi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOIII_2004_I654639
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOIII_2004_I654639
# J/psi, psi(2S)
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2016_I1454405
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2016_I1454405
# BELLE chi_c1
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2017_I1499706
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2017_I1499706
# Upsilon -> gamma pi+pi- K+K- p pbar
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOIII_2006_I694170
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOIII_2006_I694170
# pp and lambda lambda pairs
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I295621
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1990_I295621
# baryon-antibaryon correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I266892
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1988_I266892
diff --git a/Tests/Rivet/EE/EE-Upsilon2.in b/Tests/Rivet/EE/EE-Upsilon2.in
--- a/Tests/Rivet/EE/EE-Upsilon2.in
+++ b/Tests/Rivet/EE/EE-Upsilon2.in
@@ -1,33 +1,33 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.01163*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.01163*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.02
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(2S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 62.72911
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
# BELLE charm hadron production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_I342061
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I278933
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1993_I342061
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1990_I278933
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1989_I262551
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1988_I251097
# LENA thrust and mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LENA_1981_I164397
+insert /Herwig/Analysis/Rivet:Analyses 0 LENA_1981_I164397
# Upsilon 2S -> Upsilon 1S pi+pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CUSB_1984_I199809
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1998_I467642
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2017_I1610301
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1987_I238071
+insert /Herwig/Analysis/Rivet:Analyses 0 CUSB_1984_I199809
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1998_I467642
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2017_I1610301
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1987_I238071
# BABAR anti-deuteron
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2014_I1286317
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2014_I1286317
# BELLE chi_c1
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2017_I1499706
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2017_I1499706
# BABAR Upsilon(1s) -> gamma pi+ pi-, gamma K+ K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2018_I1667191
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2018_I1667191
# photon spectrtum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOIII_2006_I701217
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CUSB_1984_I204307
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOIII_2006_I701217
+insert /Herwig/Analysis/Rivet:Analyses 0 CUSB_1984_I204307
diff --git a/Tests/Rivet/EE/EE-Upsilon3.in b/Tests/Rivet/EE/EE-Upsilon3.in
--- a/Tests/Rivet/EE/EE-Upsilon3.in
+++ b/Tests/Rivet/EE/EE-Upsilon3.in
@@ -1,24 +1,24 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.1776*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.1776*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.02
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(3S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 74.96836
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
# CLEO Upsilon 3S -> Upsilon pipi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I356001
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1994_I356001
# CLEO chi_b(2S) 0,1,2
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1992_I32611
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1992_I32611
# BABAR anti-deuteron
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2014_I1286317
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2014_I1286317
# BELLE Upsilon 3S -> Upsilon 1S pi+pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2017_I1610301
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2017_I1610301
# BABAR psi_2(1D)
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2010_I850492
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2010_I850492
# photon spectrtum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOIII_2006_I701217
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOIII_2006_I701217
diff --git a/Tests/Rivet/EE/EE-Upsilon4-asym.in b/Tests/Rivet/EE/EE-Upsilon4-asym.in
--- a/Tests/Rivet/EE/EE-Upsilon4-asym.in
+++ b/Tests/Rivet/EE/EE-Upsilon4-asym.in
@@ -1,20 +1,20 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 3.5*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 8.*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
# BELLE charm hadron production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2001_I554520
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I725377
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2003_I593379
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2001_I554520
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2007_I725377
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2003_I593379
# BELLE distributions
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2019_I1718551
+#insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2019_I1718551
# BABAR Xi_c production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2005_I679961
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2005_I679961
diff --git a/Tests/Rivet/EE/EE-Upsilon4.in b/Tests/Rivet/EE/EE-Upsilon4.in
--- a/Tests/Rivet/EE/EE-Upsilon4.in
+++ b/Tests/Rivet/EE/EE-Upsilon4.in
@@ -1,330 +1,330 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
# B meson angular dist
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I296188
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1990_I296188
####### semileptonic decays #######################
# B0 -> D* l nu
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2017_I1512299
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2019_I1693396
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2023_I2624324
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_I340585
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I267206
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2017_I1512299
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2019_I1693396
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2023_I2624324
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1993_I340585
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1989_I267206
# B0/B+ -> D l nu
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2015_I1397632
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2022_I2169621
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1997_I443704
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2015_I1397632
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2022_I2169621
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1997_I443704
# B0/B+ -> D** l nu
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2022_I2512112
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2008_I768236
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2022_I2512112
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2008_I768236
# B0 -> rho,pi B+ -> rho,omega
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2013_I1238273
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2013_I1238273
# B -> rho,pi ell nu
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2024_I2810686
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2011_I855306
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_2003_I616827
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2024_I2810686
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2011_I855306
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_2003_I616827
# B+ -> omega l nu
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2013_I1116411
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2013_I1247460
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2013_I1116411
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2013_I1247460
# B to pi, eta, omega
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2012_I1125973
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2012_I1125973
# B0 -> pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2011_I878990
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2022_I2163247
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2011_I878990
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2022_I2163247
# BELLE B+ -> pi+pi- l nu
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2020_I1796822
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2020_I1796822
# BELLE B0 -> D*- tau+ nu_tau D* polarization
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2019_I1724068
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2019_I1724068
# BELLE B -> D* tau+ nu_tau tau polarization
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2018_I1621272
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2018_I1621272
# e- spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2017_I1498564
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2005_I665011
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_I357133
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I298245
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CRYSTAL_BALL_1989_I263581
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2017_I1498564
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2005_I665011
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1993_I357133
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1990_I298245
+insert /Herwig/Analysis/Rivet:Analyses 0 CRYSTAL_BALL_1989_I263581
# B -> Xc l nu (moments)
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2009_I827787
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2007_I732595
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2021_I1917200
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2023_I2649712
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_2004_I647287
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_2004_I647288
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2009_I827787
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2007_I732595
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2021_I1917200
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2023_I2649712
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_2004_I647287
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_2004_I647288
# B -> Xu l nu
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2012_I1079912
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2021_I1895149
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2012_I1079912
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2021_I1895149
############ b -> s gamma #################################
# b->s gamma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2015_I1330289
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2022_I2167323
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2008_I769107
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2012_I1123662
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2012_I1122031
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2016_I1409292
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2015_I1337783
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2009_I825222
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2015_I1330289
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2022_I2167323
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2008_I769107
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2012_I1123662
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2012_I1122031
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2016_I1409292
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2015_I1337783
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2009_I825222
# B -> eta K gamma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2009_I785439
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2018_I1663447
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2009_I785439
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2018_I1663447
# B -> phi K gamma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2011_I897683
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2011_I897683
# b -> s l+l-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2005_I679052
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2010_I899499
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2013_I1272843
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2016_I1283183
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2005_I679052
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2010_I899499
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2013_I1272843
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2016_I1283183
# B -> K l+ l-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2021_I1748231
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2021_I1748231
# B -> K* l+ l-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2009_I817326
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2012_I1111233
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2016_I1391152
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2016_I1504055
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2019_I1728173
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2009_I817326
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2012_I1111233
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2016_I1391152
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2016_I1504055
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2019_I1728173
####### spectra ###################################
# ARGUS pi,K, proton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_I340894
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1993_I340894
# CLEO kaon
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1982_I180612
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1982_I180612
# ARGUS K*, rho, omega
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_I356616
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1993_I356616
# phi spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2007_I728872
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2004_I632399
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1985_I218314
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2007_I728872
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2004_I632399
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1985_I218314
# D_s spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2005_I1649168
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2002_I582184
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1996_I401599
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1992_I319829
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2005_I1649168
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2002_I582184
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1996_I401599
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1992_I319829
# D0/D_s spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2023_I2660525:MODE=DECAY
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2023_I2660525:MODE=DECAY
# ARGUS charm hadron production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1991_I315059
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1991_I315059
# CLEO Xi_c spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1997_I442910
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1997_I442910
# CLEO Sigma_c spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I361356
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1994_I361356
# baryon spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1992_I315181
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1992_I334962
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1992_I315181
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1992_I334962
# BABAR Omega_c spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I746745
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2007_I746745
# BABAR Xi'_c spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I722622
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2007_I722622
# multiplicities
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_UPSILON4S_HADRON_MULTIPLICITIES
+insert /Herwig/Analysis/Rivet:Analyses 0 PDG_UPSILON4S_HADRON_MULTIPLICITIES
# CLEO multiplicty in Upsilon(4S) decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1999_I504672
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1999_I504672
# kaons in b decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1994_I354224
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1994_I354224
# charm hadrons in b decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I719111
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1997_I440969
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2006_I719111
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1997_I440969
# MC analyses based on old internal ones
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_DECAY_MESON_MESON_LEPTONS
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_DALITZ_D
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_DECAY_ONIUM_PIPI
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_DECAY_SEMILEPTONIC
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1992_I319102
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_DECAY_MESON_MESON_LEPTONS
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_DALITZ_D
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_DECAY_ONIUM_PIPI
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_DECAY_SEMILEPTONIC
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1992_I319102
# BELLE Upsilon(4S) -> pi+pi- Upsilon(1S) decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2009_I810744
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2009_I810744
# BABAR Upsilon(4S) -> pi+pi- Upsilon(1,2S) decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I714448
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2006_I714448
# charmonium in b decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1986_I230961
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1995_I382221
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_2002_I606309
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_1986_I230961
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1995_I382221
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_2002_I606309
# BABAR eta' in b decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2004_I642355
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2004_I642355
# BELLE eta in b decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2010_I835104
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1996_I398228
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2010_I835104
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1996_I398228
# BELLE charm hadron producion
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2005_I686014
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2005_I686014
# BELLE Upsilon 4S -> Upsilon 1,2S pi+pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2017_I1610301
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2017_I1610301
# BELLE B+ -> phi phi K+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2021_I1841899
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2021_I1841899
# B0 -> KS0 K-+ pi+-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2019_I1729723
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2019_I1729723
# B+ -> K+ K- pi+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2023_I2099998
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2023_I2099998
# B- -> D0 rho-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2024_I2778312
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2024_I2778312
# BELLE B -> Dbar0 pi+ pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2007_I733011
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2007_I733011
# B -> D* + pions
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2004_I658085
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_2003_I611745
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2004_I658085
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_2003_I611745
# B+ -> D(*)- pi+pi+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2004_I623102
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2004_I623102
# B -> D* + 4 pions
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_2002_I557084
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_2002_I557084
# BABAR B0 -> D*- 3pi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2016_I1487722
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2016_I1487722
# B- -> D*- D0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2005_I677084
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2005_I677084
# BELLE chi_c1,2, spectra and inclusive B decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2016_I1408873
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2016_I1408873
# BABAR B0 -> K+ pi- pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2011_I897848
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2011_I897848
# B+ -> K+ pi+ pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2004_I626730
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2008_I782405
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2004_I626730
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2008_I782405
# BABAR B0 -> D*0 omega
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2011_I920989
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2011_I920989
# B -> D(*) omega pi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2015_I1369998
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I713862
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2001_I554175
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2015_I1369998
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2006_I713862
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2001_I554175
# B- -> D K*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I714147
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2005_I667017
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2006_I714147
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2005_I667017
# B- -> D*0 K*-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2004_I626518
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2004_I626518
# B -> D K K
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2002_I590700
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2023_I2655951
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2002_I590700
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2023_I2655951
# BELLE B0 -> p Lambdabar0 D(*)-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2015_I1392799
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2015_I1392799
# B -> D D K
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2015_I1335269
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2008_I756554
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2008_I758167
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2004_I623994
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I723331
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2015_I1335269
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2008_I756554
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2008_I758167
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2004_I623994
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2006_I723331
# BELLE B0 -> Ds K0 pi and B+ Ds K K
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2015_I1326905
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2015_I1326905
# BABAR B- -> Ds(*) K- pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2008_I755245
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2008_I755245
# BELLE B+ -> D_s(*) K pi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2009_I816632
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2009_I816632
# BELLE B0 -> D*+ D*-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2012_I1123656
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2005_I686355
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2012_I1123656
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2005_I686355
# B0 -> D*s+ D*-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2003_I613283
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2003_I613283
# BABAR B -> Ds1(2460) D
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2004_I656424
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2004_I656424
# BABAR B -> KKK
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2012_I1086537
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2012_I1086537
# BABAR B0-> pi+pi- K*0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2012_I1081760
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2012_I1081760
# BABAR B+ -> pi+ pi0 KS0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2017_I1336340
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2017_I1336340
# BELLE Bbar0 ->J/psi K- pi+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2014_I1312626
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2014_I1312626
# BELLE B ->psi(2s) K pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2013_I1239347
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2009_I820737
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2013_I1239347
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2009_I820737
# BABAR B ->J/psi psi(2s) K pi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2009_I801589
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2009_I801589
# B -> psi(2S) K*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2001_I535113
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2001_I535113
# BABAR B -> K* Jpsi, psi(2s), chi_c1
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I748372
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2007_I748372
# B -> J/psi K*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2005_I680703
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1994_I376001
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2005_I680703
+insert /Herwig/Analysis/Rivet:Analyses 0 ARGUS_1994_I376001
# BELLE B -> chi_c1 K*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2006_I689881
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2006_I689881
# BELLE B+ -> J/psi psi(2S) K+ pi+ pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2010_I871475
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2010_I871475
# B+ -> K+ eta' J/psi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2023_I2643022
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2023_I2643022
# B+ -> K+ pi+pi-, K+K+K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2005_I667959
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2005_I667959
# BELLE B+ -> K+ K- pi+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2017_I1598461
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2017_I1598461
# BELLE B0 -> K+ K- KS0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2010_I862241
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2010_I862241
# BABAR B-> J/psi phi K
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2015_I1308513
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2015_I1308513
# BABAR B-> J/psi omega K
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2008_I767506
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2008_I767506
# B0 -> phi K pi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2013_I1247059
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2008_I792439
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2005_I677873
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2013_I1247059
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2008_I792439
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2005_I677873
# BABAR B -> phi phi K
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2011_I901433
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2011_I901433
# B+ -> phi K_1+/K_2+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2008_I789278
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2008_I789278
# BABAR B- > D+ pi-pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2009_I810694
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2009_I810694
# BABAR B0 > a1+ a1-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2009_I825406
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2009_I825406
# BABAR B+ -> pi+ pi+ pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2009_I813140
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2009_I813140
# B -> omega K/pi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2006_I735859
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I754030
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2006_I735859
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2007_I754030
# B0 -> KS-0 pi+ pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2009_I821188
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2009_I821188
# B -> K X(3872)
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2011_I916712
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2011_I916712
# B -> K* eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I722710
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2007_I722710
# B -> K* eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I722820
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2006_I722820
# B -> K*0 Kbar*0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2008_I758472
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2008_I758472
# B+ -> omega rho+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2005_I664717
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2005_I664717
# B -> rho rho
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2003_I620180
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2004_I632736
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2003_I620180
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2004_I632736
# B -> rho pi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2005_I651511
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2022_I2131772
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2006_I688850
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2002_I589587
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2005_I651511
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2022_I2131772
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2006_I688850
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2002_I589587
######################## B decays involving baryons #########################################
# B- > Lambda_c+ pbar pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2008_I791879
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2008_I791879
# B -> p pbar K/pi K*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2008_I754259
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2004_I630328
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2008_I778726
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2005_I686573
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2019_I1729311
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I755548
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2005_I679165
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2008_I754259
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2004_I630328
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2008_I778726
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2005_I686573
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2019_I1729311
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2007_I755548
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2005_I679165
# B- > Lambda_c+ Lambdabar_c- K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2008_I766290
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2008_I766290
# B -> p Lambdabar + gamma/pi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2007_I748975
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2007_I748975
# Bbar0 -> Lambda_c+ Lambdabar0 K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2011_I924163
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2011_I924163
# Xi(2930) in B -> Lambda_c+ Lambdabar_c- K
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2018_I1642436
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2018_I1679584
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2018_I1642436
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2018_I1679584
# B- -> pbar Lambda0 D0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2011_I924618
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2011_I924618
# p Lambdabar0 pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2017_I1596893
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2009_I819092
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2023_I2663731
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2017_I1596893
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2009_I819092
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2023_I2663731
# B -> Lambda Lambdabar K(*)
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2009_I803343
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2009_I803343
# B- -> Sigmac++ pbar pi- pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2012_I1127599
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2012_I1127599
# B- -> Lambda_c+ pbar pi+ pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2013_I1217425
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2013_I1217425
# B -> D(*) p pbar + pions
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2012_I946659
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2012_I946659
# B- -> Lambda_c+ pbar pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2006_I658082
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2006_I658082
# branching ratios
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_B0
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_BPLUS
+#insert /Herwig/Analysis/Rivet:Analyses 0 PDG_B0
+#insert /Herwig/Analysis/Rivet:Analyses 0 PDG_BPLUS
diff --git a/Tests/Rivet/EE/EE-Upsilon5.in b/Tests/Rivet/EE/EE-Upsilon5.in
--- a/Tests/Rivet/EE/EE-Upsilon5.in
+++ b/Tests/Rivet/EE/EE-Upsilon5.in
@@ -1,37 +1,37 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.4426*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.4426*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.885
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(5S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 91.95576
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
# CLEO phi spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2007_I728872
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2007_I728872
# D_s spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2005_I1649168
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2005_I1649168
# LHCb BS0 -> p Lambdabar0 K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2017_I1596893
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2017_I1596893
# BELLE BS0 -> Lambda_c+ Lambdabar0 pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2013_I1230342
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2013_I1230342
# BELLE BS0 -> Ds* Ds*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2013_I1124584
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2013_I1124584
# BELLE BS0 -> pi+ pi- J/psi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2011_I889524
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2013_I1081268
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2011_I889524
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2013_I1081268
# BS0 -> pi+ pi- psi(2S)/chi_c1(3872)
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2023_I2635083
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2023_I2635083
# BELLE Upsilon(ns) pi0 pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2013_I1247463
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2013_I1247463
# B_s -> D_s* mu- nu_mubar
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2020_I1787090
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2020_I1787090
# BELLE Upsilon(ns) pi+ pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2015_I1283743
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2015_I1283743
# D0/D_s spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2023_I2660525:MODE=DECAY
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2023_I2660525:MODE=DECAY
# branching ratios
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_BS
+#insert /Herwig/Analysis/Rivet:Analyses 0 PDG_BS
diff --git a/Tests/Rivet/EE/EE-Xi0.in b/Tests/Rivet/EE/EE-Xi0.in
--- a/Tests/Rivet/EE/EE-Xi0.in
+++ b/Tests/Rivet/EE/EE-Xi0.in
@@ -1,16 +1,16 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
decaymode Upsilon(4S)->Xi0,Xibar0; 1. 1 /Herwig/Decays/DecayME0
do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Xi0,Xibar0;
# Xi decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 NA48_2010_I868871
+insert /Herwig/Analysis/Rivet:Analyses 0 NA48_2010_I868871
diff --git a/Tests/Rivet/EE/EE-Xic0.in b/Tests/Rivet/EE/EE-Xic0.in
--- a/Tests/Rivet/EE/EE-Xic0.in
+++ b/Tests/Rivet/EE/EE-Xic0.in
@@ -1,28 +1,28 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
decaymode Upsilon(4S)->Xi_c0,Xi_cbar0; 1. 1 /Herwig/Decays/DecayME0
do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Xi_c0,Xi_cbar0;
# Xi_c -> Xi- pi+ decay asymmetry
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2000_I537236
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2021_I1851126
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEO_2000_I537236
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2021_I1851126
# Xi_c -> Xi0 pi0 decay asymmetry
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2024_I2796026
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2024_I2796026
# Xi_c Lambda/Sigma K* asymmetries
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2021_I1859517
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2021_I1859517
# Xi_c0 -> K+ K- Xi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2021_I1835729
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2021_I1835729
# Omega decay asymmetries
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I719581
+insert /Herwig/Analysis/Rivet:Analyses 0 BABAR_2006_I719581
# Xi_c0 -> p K- K- pi+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2005_I660759
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOIII_2004_I627327
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2005_I660759
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOIII_2004_I627327
diff --git a/Tests/Rivet/EE/EE-Xicp.in b/Tests/Rivet/EE/EE-Xicp.in
--- a/Tests/Rivet/EE/EE-Xicp.in
+++ b/Tests/Rivet/EE/EE-Xicp.in
@@ -1,20 +1,20 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
decaymode Upsilon(4S)->Xi_c+,Xi_cbar-; 1. 1 /Herwig/Decays/DecayME0
do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Xi_c+,Xi_cbar-;
# Xi_c decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2018_I1698390
+insert /Herwig/Analysis/Rivet:Analyses 0 BELLE_2018_I1698390
# Xi_c+ -> Sigma+ K- pi+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1996_I397787
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_1996_I397787
# Xi_c+ -> Sigma+ K- pi+, Xi- pi+ pi+
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 FOCUS_2003_I618864
+insert /Herwig/Analysis/Rivet:Analyses 0 FOCUS_2003_I618864
diff --git a/Tests/Rivet/EE/EE-Xim.in b/Tests/Rivet/EE/EE-Xim.in
--- a/Tests/Rivet/EE/EE-Xim.in
+++ b/Tests/Rivet/EE/EE-Xim.in
@@ -1,17 +1,17 @@
# -*- ThePEG-repository -*-
create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
decaymode Upsilon(4S)->Xi-,Xibar+; 1. 1 /Herwig/Decays/DecayME0
do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Xi-,Xibar+;
# asymmetry parameter in Xi decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 E756_2000_I530367
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_2000_I533575
+insert /Herwig/Analysis/Rivet:Analyses 0 E756_2000_I530367
+insert /Herwig/Analysis/Rivet:Analyses 0 CLEOII_2000_I533575
diff --git a/Tests/Rivet/Fermilab/Fermilab-27.4-Z-mu.in b/Tests/Rivet/Fermilab/Fermilab-27.4-Z-mu.in
--- a/Tests/Rivet/Fermilab/Fermilab-27.4-Z-mu.in
+++ b/Tests/Rivet/Fermilab/Fermilab-27.4-Z-mu.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 E288_1981_I153009
+insert /Herwig/Analysis/Rivet:Analyses 0 E288_1981_I153009
diff --git a/Tests/Rivet/Fermilab/Fermilab-38.8-Z-mu.in b/Tests/Rivet/Fermilab/Fermilab-38.8-Z-mu.in
--- a/Tests/Rivet/Fermilab/Fermilab-38.8-Z-mu.in
+++ b/Tests/Rivet/Fermilab/Fermilab-38.8-Z-mu.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 E605_1991_I302822
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 NUSEA_2003_I613362
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 E605_1991_I302822
+insert /Herwig/Analysis/Rivet:Analyses 0 NUSEA_2003_I613362
\ No newline at end of file
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-12.5.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-12.5.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-12.5.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-12.5.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 12.5
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-17.5.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-17.5.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-17.5.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-17.5.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 17.5
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-3.5.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-3.5.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-3.5.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-3.5.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 3.5
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-30.0.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-30.0.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-30.0.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-30.0.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-4.5.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-4.5.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-4.5.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-4.5.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.5
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-5.5.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-5.5.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-5.5.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-5.5.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 5.5
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-6.5.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-6.5.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-6.5.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-6.5.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 6.5
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-7.5.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-7.5.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-7.5.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-7.5.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 7.5
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/GammaGamma/GammaGamma-mumu-9.0.in b/Tests/Rivet/GammaGamma/GammaGamma-mumu-9.0.in
--- a/Tests/Rivet/GammaGamma/GammaGamma-mumu-9.0.in
+++ b/Tests/Rivet/GammaGamma/GammaGamma-mumu-9.0.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 9.0
##################################################
# select the analyses
##################################################
# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I645127:PROCESS=GG
+insert /Herwig/Analysis/Rivet:Analyses 0 L3_2004_I645127:PROCESS=GG
diff --git a/Tests/Rivet/ISR/ISR-30-UE.in b/Tests/Rivet/ISR/ISR-30-UE.in
--- a/Tests/Rivet/ISR/ISR-30-UE.in
+++ b/Tests/Rivet/ISR/ISR-30-UE.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SFM_1984_I196601
+insert /Herwig/Analysis/Rivet:Analyses 0 SFM_1984_I196601
diff --git a/Tests/Rivet/ISR/ISR-44-UE.in b/Tests/Rivet/ISR/ISR-44-UE.in
--- a/Tests/Rivet/ISR/ISR-44-UE.in
+++ b/Tests/Rivet/ISR/ISR-44-UE.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SFM_1984_I196601
+insert /Herwig/Analysis/Rivet:Analyses 0 SFM_1984_I196601
diff --git a/Tests/Rivet/ISR/ISR-44-Z-mu.in b/Tests/Rivet/ISR/ISR-44-Z-mu.in
--- a/Tests/Rivet/ISR/ISR-44-Z-mu.in
+++ b/Tests/Rivet/ISR/ISR-44-Z-mu.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 R209_1982_I168182
+insert /Herwig/Analysis/Rivet:Analyses 0 R209_1982_I168182
diff --git a/Tests/Rivet/ISR/ISR-53-UE.in b/Tests/Rivet/ISR/ISR-53-UE.in
--- a/Tests/Rivet/ISR/ISR-53-UE.in
+++ b/Tests/Rivet/ISR/ISR-53-UE.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1982_I176647
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SFM_1984_I196601
+insert /Herwig/Analysis/Rivet:Analyses 0 UA5_1982_I176647
+insert /Herwig/Analysis/Rivet:Analyses 0 SFM_1984_I196601
diff --git a/Tests/Rivet/ISR/ISR-62-UE.in b/Tests/Rivet/ISR/ISR-62-UE.in
--- a/Tests/Rivet/ISR/ISR-62-UE.in
+++ b/Tests/Rivet/ISR/ISR-62-UE.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SFM_1984_I196601
+insert /Herwig/Analysis/Rivet:Analyses 0 SFM_1984_I196601
diff --git a/Tests/Rivet/ISR/ISR-62-Z-mu.in b/Tests/Rivet/ISR/ISR-62-Z-mu.in
--- a/Tests/Rivet/ISR/ISR-62-Z-mu.in
+++ b/Tests/Rivet/ISR/ISR-62-Z-mu.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 R209_1982_I168182
+insert /Herwig/Analysis/Rivet:Analyses 0 R209_1982_I168182
diff --git a/Tests/Rivet/LHC-GammaGamma/LHC-GammaGamma-13.in b/Tests/Rivet/LHC-GammaGamma/LHC-GammaGamma-13.in
--- a/Tests/Rivet/LHC-GammaGamma/LHC-GammaGamma-13.in
+++ b/Tests/Rivet/LHC-GammaGamma/LHC-GammaGamma-13.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1615866
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1615866
diff --git a/Tests/Rivet/LHC-GammaGamma/LHC-GammaGamma-7.in b/Tests/Rivet/LHC-GammaGamma/LHC-GammaGamma-7.in
--- a/Tests/Rivet/LHC-GammaGamma/LHC-GammaGamma-7.in
+++ b/Tests/Rivet/LHC-GammaGamma/LHC-GammaGamma-7.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1377585
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I954992
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1377585
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I954992
diff --git a/Tests/Rivet/LHC/LHC-13-Bottom-0.in b/Tests/Rivet/LHC/LHC-13-Bottom-0.in
--- a/Tests/Rivet/LHC/LHC-13-Bottom-0.in
+++ b/Tests/Rivet/LHC/LHC-13-Bottom-0.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# b-jet fragmentation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2021_I1913061
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2021_I1913061
diff --git a/Tests/Rivet/LHC/LHC-13-Bottom-1.in b/Tests/Rivet/LHC/LHC-13-Bottom-1.in
--- a/Tests/Rivet/LHC/LHC-13-Bottom-1.in
+++ b/Tests/Rivet/LHC/LHC-13-Bottom-1.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# b-jet fragmentation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2021_I1913061
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2021_I1913061
diff --git a/Tests/Rivet/LHC/LHC-13-Bottom-2.in b/Tests/Rivet/LHC/LHC-13-Bottom-2.in
--- a/Tests/Rivet/LHC/LHC-13-Bottom-2.in
+++ b/Tests/Rivet/LHC/LHC-13-Bottom-2.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# b-jet fragmentation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2021_I1913061
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2021_I1913061
diff --git a/Tests/Rivet/LHC/LHC-13-Bottom-3.in b/Tests/Rivet/LHC/LHC-13-Bottom-3.in
--- a/Tests/Rivet/LHC/LHC-13-Bottom-3.in
+++ b/Tests/Rivet/LHC/LHC-13-Bottom-3.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# b-jet fragmentation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2021_I1913061
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2021_I1913061
diff --git a/Tests/Rivet/LHC/LHC-13-Bottom-4.in b/Tests/Rivet/LHC/LHC-13-Bottom-4.in
--- a/Tests/Rivet/LHC/LHC-13-Bottom-4.in
+++ b/Tests/Rivet/LHC/LHC-13-Bottom-4.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# b-jet fragmentation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2021_I1913061
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2021_I1913061
diff --git a/Tests/Rivet/LHC/LHC-13-Bottom-5.in b/Tests/Rivet/LHC/LHC-13-Bottom-5.in
--- a/Tests/Rivet/LHC/LHC-13-Bottom-5.in
+++ b/Tests/Rivet/LHC/LHC-13-Bottom-5.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# b-jet fragmentation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2021_I1913061
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2021_I1913061
diff --git a/Tests/Rivet/LHC/LHC-13-Bottom-6.in b/Tests/Rivet/LHC/LHC-13-Bottom-6.in
--- a/Tests/Rivet/LHC/LHC-13-Bottom-6.in
+++ b/Tests/Rivet/LHC/LHC-13-Bottom-6.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# b-jet fragmentation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2021_I1913061
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2021_I1913061
diff --git a/Tests/Rivet/LHC/LHC-13-Cent.in b/Tests/Rivet/LHC/LHC-13-Cent.in
--- a/Tests/Rivet/LHC/LHC-13-Cent.in
+++ b/Tests/Rivet/LHC/LHC-13-Cent.in
@@ -1,2 +1,2 @@
# -*- ThePEG-repository -*-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2015_CENT_PP
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2015_CENT_PP
diff --git a/Tests/Rivet/LHC/LHC-13-Charm-0.in b/Tests/Rivet/LHC/LHC-13-Charm-0.in
--- a/Tests/Rivet/LHC/LHC-13-Charm-0.in
+++ b/Tests/Rivet/LHC/LHC-13-Charm-0.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# charm production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2015_I1396331
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2015_I1396331
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-1-A.in b/Tests/Rivet/LHC/LHC-13-DiJets-1-A.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-1-A.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-1-A.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-10-A.in b/Tests/Rivet/LHC/LHC-13-DiJets-10-A.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-10-A.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-10-A.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-10-B.in b/Tests/Rivet/LHC/LHC-13-DiJets-10-B.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-10-B.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-10-B.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-11-A.in b/Tests/Rivet/LHC/LHC-13-DiJets-11-A.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-11-A.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-11-A.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-11-B.in b/Tests/Rivet/LHC/LHC-13-DiJets-11-B.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-11-B.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-11-B.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-2-A.in b/Tests/Rivet/LHC/LHC-13-DiJets-2-A.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-2-A.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-2-A.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-3-A.in b/Tests/Rivet/LHC/LHC-13-DiJets-3-A.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-3-A.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-3-A.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-4-A.in b/Tests/Rivet/LHC/LHC-13-DiJets-4-A.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-4-A.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-4-A.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-5-A.in b/Tests/Rivet/LHC/LHC-13-DiJets-5-A.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-5-A.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-5-A.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-6-A.in b/Tests/Rivet/LHC/LHC-13-DiJets-6-A.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-6-A.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-6-A.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-6-B.in b/Tests/Rivet/LHC/LHC-13-DiJets-6-B.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-6-B.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-6-B.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-7-A.in b/Tests/Rivet/LHC/LHC-13-DiJets-7-A.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-7-A.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-7-A.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-7-B.in b/Tests/Rivet/LHC/LHC-13-DiJets-7-B.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-7-B.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-7-B.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-8-A.in b/Tests/Rivet/LHC/LHC-13-DiJets-8-A.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-8-A.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-8-A.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-8-B.in b/Tests/Rivet/LHC/LHC-13-DiJets-8-B.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-8-B.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-8-B.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-9-A.in b/Tests/Rivet/LHC/LHC-13-DiJets-9-A.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-9-A.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-9-A.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiJets-9-B.in b/Tests/Rivet/LHC/LHC-13-DiJets-9-B.in
--- a/Tests/Rivet/LHC/LHC-13-DiJets-9-B.in
+++ b/Tests/Rivet/LHC/LHC-13-DiJets-9-B.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-DiPhoton.in b/Tests/Rivet/LHC/LHC-13-DiPhoton.in
--- a/Tests/Rivet/LHC/LHC-13-DiPhoton.in
+++ b/Tests/Rivet/LHC/LHC-13-DiPhoton.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS diphoton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2021_I1887997
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2021_I1887997
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-0.in b/Tests/Rivet/LHC/LHC-13-Jets-0.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-0.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-0.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1459051
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_CONF_2016_092
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
# CMS double parton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1932460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1932460
# double differential jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1972986
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1972986
# CMS jet substructure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1920187:MODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1920187:MODE=DIJET
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-1.in b/Tests/Rivet/LHC/LHC-13-Jets-1.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-1.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-1.in
@@ -1,17 +1,17 @@
# -*- ThePEG-repository -*-
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1459051
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_CONF_2016_092
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
# CMS correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1643640
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1719955
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1643640
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2019_I1719955
# CMS double parton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1932460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1932460
# double differential jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1972986
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1972986
# CMS jet substructure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1920187:MODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1920187:MODE=DIJET
# CMS multijets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2022_I2170533
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2022_I2170533
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-10.in b/Tests/Rivet/LHC/LHC-13-Jets-10.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-10.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-10.in
@@ -1,21 +1,21 @@
# -*- ThePEG-repository -*-
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1459051
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_CONF_2016_092
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
# ATLAS Lund plane
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2020_I1790256
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2020_I1790256
# ATLAS charged fragmentation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1740909
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1740909
# CMS correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1643640
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1719955
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1643640
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2019_I1719955
# double differential jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1972986
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1972986
# CMS jet substructure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1920187:MODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1920187:MODE=DIJET
# ATLAS multi jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2023_I2625697
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2023_I2625697
# CMS multijets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2022_I2170533
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2022_I2170533
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-2.in b/Tests/Rivet/LHC/LHC-13-Jets-2.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-2.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-2.in
@@ -1,17 +1,17 @@
# -*- ThePEG-repository -*-
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1459051
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_CONF_2016_092
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
# CMS correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1643640
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1719955
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1643640
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2019_I1719955
# CMS double parton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1932460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1932460
# double differential jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1972986
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1972986
# CMS jet substructure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1920187:MODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1920187:MODE=DIJET
# CMS multijets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2022_I2170533
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2022_I2170533
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-3.in b/Tests/Rivet/LHC/LHC-13-Jets-3.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-3.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-3.in
@@ -1,19 +1,19 @@
# -*- ThePEG-repository -*-
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1459051
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_CONF_2016_092
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
# ATLAS charged fragmentation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1740909
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1740909
# CMS correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1643640
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1719955
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1643640
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2019_I1719955
# CMS double parton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1932460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1932460
# double differential jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1972986
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1972986
# CMS jet substructure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1920187:MODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1920187:MODE=DIJET
# CMS multijets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2022_I2170533
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2022_I2170533
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-4.in b/Tests/Rivet/LHC/LHC-13-Jets-4.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-4.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-4.in
@@ -1,20 +1,20 @@
# -*- ThePEG-repository -*-
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1682495
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1459051
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_CONF_2016_092
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1682495
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
# ATLAS charged fragmentation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1740909
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1740909
# CMS correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1643640
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1719955
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1643640
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2019_I1719955
# CMS double parton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1932460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1932460
# double differential jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1972986
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1972986
# CMS jet substructure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1920187:MODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1920187:MODE=DIJET
# CMS multijets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2022_I2170533
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2022_I2170533
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-5.in b/Tests/Rivet/LHC/LHC-13-Jets-5.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-5.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-5.in
@@ -1,20 +1,20 @@
# -*- ThePEG-repository -*-
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1682495
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1459051
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_CONF_2016_092
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1682495
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
# ATLAS charged fragmentation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1740909
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1740909
# CMS correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1643640
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1719955
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1643640
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2019_I1719955
# CMS double parton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1932460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1932460
# double differential jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1972986
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1972986
# CMS jet substructure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1920187:MODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1920187:MODE=DIJET
# CMS multijets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2022_I2170533
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2022_I2170533
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-6.in b/Tests/Rivet/LHC/LHC-13-Jets-6.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-6.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-6.in
@@ -1,22 +1,22 @@
# -*- ThePEG-repository -*-
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1682495
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1459051
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_CONF_2016_092
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1682495
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
# ATLAS charged fragmentation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1740909
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1740909
# CMS correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1643640
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1719955
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1643640
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2019_I1719955
# ATLAS soft-drop
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1772062
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1772062
# CMS double parton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1932460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1932460
# double differential jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1972986
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1972986
# CMS jet substructure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1920187:MODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1920187:MODE=DIJET
# CMS multijets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2022_I2170533
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2022_I2170533
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-7.in b/Tests/Rivet/LHC/LHC-13-Jets-7.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-7.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-7.in
@@ -1,24 +1,24 @@
# -*- ThePEG-repository -*-
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1682495
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1711114
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1459051
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_CONF_2016_092
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1682495
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1711114
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1724098
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1724098
# ATLAS charged fragmentation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1740909
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1740909
# CMS correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1643640
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1719955
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1643640
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2019_I1719955
# ATLAS event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2020_I1808726
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2020_I1808726
# double differential jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1972986
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1972986
# CMS jet substructure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1920187:MODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1920187:MODE=DIJET
# ATLAS multi jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2023_I2625697
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2023_I2625697
# CMS multijets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2022_I2170533
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2022_I2170533
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-8.in b/Tests/Rivet/LHC/LHC-13-Jets-8.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-8.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-8.in
@@ -1,26 +1,26 @@
# -*- ThePEG-repository -*-
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1682495
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1459051
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_CONF_2016_092
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1682495
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
# ATLAS charged fragmentation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1740909
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1740909
# ATLAS soft-drop
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1637587
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1637587
# ATLAS Lund plane
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2020_I1790256
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2020_I1790256
# CMS correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1643640
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1719955
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1643640
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2019_I1719955
# ATLAS event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2020_I1808726
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2020_I1808726
# double differential jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1972986
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1972986
# CMS jet substructure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1920187:MODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1920187:MODE=DIJET
# ATLAS multi jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2023_I2625697
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2023_I2625697
# CMS multijets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2022_I2170533
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2022_I2170533
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-9.in b/Tests/Rivet/LHC/LHC-13-Jets-9.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-9.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-9.in
@@ -1,24 +1,24 @@
# -*- ThePEG-repository -*-
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1682495
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1459051
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_CONF_2016_092
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1682495
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1634970
# ATLAS Lund plane
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2020_I1790256
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2020_I1790256
# ATLAS charged fragmentation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1740909
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1740909
# CMS correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1643640
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1719955
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1643640
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2019_I1719955
# ATLAS event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2020_I1808726
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2020_I1808726
# double differential jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1972986
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1972986
# CMS jet substructure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1920187:MODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1920187:MODE=DIJET
# ATLAS multi jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2023_I2625697
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2023_I2625697
# CMS multijets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2022_I2170533
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2022_I2170533
diff --git a/Tests/Rivet/LHC/LHC-13-PromptPhoton.in b/Tests/Rivet/LHC/LHC-13-PromptPhoton.in
--- a/Tests/Rivet/LHC/LHC-13-PromptPhoton.in
+++ b/Tests/Rivet/LHC/LHC-13-PromptPhoton.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS prompt photon
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1645627
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1645627
# ATLAS prompt photon + 2 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1772071
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1772071
diff --git a/Tests/Rivet/LHC/LHC-13-Top-All.in b/Tests/Rivet/LHC/LHC-13-Top-All.in
--- a/Tests/Rivet/LHC/LHC-13-Top-All.in
+++ b/Tests/Rivet/LHC/LHC-13-Top-All.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1646686
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2020_I1801434
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2022_I2077575
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1753720
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1646686
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2020_I1801434
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2022_I2077575
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2019_I1753720
diff --git a/Tests/Rivet/LHC/LHC-13-Top-L.in b/Tests/Rivet/LHC/LHC-13-Top-L.in
--- a/Tests/Rivet/LHC/LHC-13-Top-L.in
+++ b/Tests/Rivet/LHC/LHC-13-Top-L.in
@@ -1,20 +1,20 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS top
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1468168
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1495243
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1705857
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1759875
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1707015
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2023_I2648096
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1468168
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1495243
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1705857
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1759875
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1707015
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2023_I2648096
# ATLAS WWbb
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1677498
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1677498
# CMS top
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1620050
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1703993
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1620050
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1703993
# LHCB top
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2018_I1662483
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2018_I1662483
# ATLAS colour connections
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2022_I2152933
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2022_I2152933
diff --git a/Tests/Rivet/LHC/LHC-13-Top-SL.in b/Tests/Rivet/LHC/LHC-13-Top-SL.in
--- a/Tests/Rivet/LHC/LHC-13-Top-SL.in
+++ b/Tests/Rivet/LHC/LHC-13-Top-SL.in
@@ -1,19 +1,19 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1491950
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1614149
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1662081
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1663958
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1656578
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1690148
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1705857
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1724098
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1764472
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1750330
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2021_I1941095
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1707015
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1901295
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2022_I2037744
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2023_I2703254
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1491950
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1614149
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1662081
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1663958
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1656578
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1690148
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1705857
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1724098
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2019_I1764472
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1750330
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2021_I1941095
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1707015
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1901295
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2022_I2037744
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2023_I2703254
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-13-UE-Cent.in b/Tests/Rivet/LHC/LHC-13-UE-Cent.in
--- a/Tests/Rivet/LHC/LHC-13-UE-Cent.in
+++ b/Tests/Rivet/LHC/LHC-13-UE-Cent.in
@@ -1,4 +1,4 @@
# -*- ThePEG-repository -*-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2015_CENT_PP
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2019_I1723697
-insert /Herwig/Analysis/RivetAnalysis:PreLoad 0 Rivet-LHC-13-Cent.yoda
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2015_CENT_PP
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2019_I1723697
+insert /Herwig/Analysis/Rivet:PreLoad 0 Rivet-LHC-13-Cent.yoda
diff --git a/Tests/Rivet/LHC/LHC-13-UE-Long.in b/Tests/Rivet/LHC/LHC-13-UE-Long.in
--- a/Tests/Rivet/LHC/LHC-13-UE-Long.in
+++ b/Tests/Rivet/LHC/LHC-13-UE-Long.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419652
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1419652
# ATLAS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1467230
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1467230
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-13-UE.in b/Tests/Rivet/LHC/LHC-13-UE.in
--- a/Tests/Rivet/LHC/LHC-13-UE.in
+++ b/Tests/Rivet/LHC/LHC-13-UE.in
@@ -1,26 +1,26 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1384119
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_PAS_FSQ_15_007
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2015_I1384119
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2015_PAS_FSQ_15_007
# ATLAS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419652
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1467230
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1509919
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1468167
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1511284
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1653948
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1680318
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1471287
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2018_I1518782
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2018_I1692008
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2020_I1783943
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2018_I1665223
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1708620
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1608166
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1419652
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1467230
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1509919
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1468167
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1511284
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1653948
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1680318
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1471287
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCF_2018_I1518782
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCF_2018_I1692008
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCF_2020_I1783943
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2018_I1665223
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1708620
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1608166
# ALICE light hadrons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2020_I1797443
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2021_I1889335
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2023_I2658888
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2020_I1797443
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2021_I1889335
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCF_2023_I2658888
diff --git a/Tests/Rivet/LHC/LHC-13-VBF-ZZ.in b/Tests/Rivet/LHC/LHC-13-VBF-ZZ.in
--- a/Tests/Rivet/LHC/LHC-13-VBF-ZZ.in
+++ b/Tests/Rivet/LHC/LHC-13-VBF-ZZ.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS gg -> H -> ZZ
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2020_I1790439
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2020_I1790439
do /Herwig/Particles/h0:SelectDecayModes h0->Z0,Z0;
diff --git a/Tests/Rivet/LHC/LHC-13-W-mu.in b/Tests/Rivet/LHC/LHC-13-W-mu.in
--- a/Tests/Rivet/LHC/LHC-13-W-mu.in
+++ b/Tests/Rivet/LHC/LHC-13-W-mu.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS W+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1610623
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1610623
# CMS W+charm
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1705068
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2019_I1705068
# ATLAS W+charm
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2023_I2628732
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2023_I2628732
diff --git a/Tests/Rivet/LHC/LHC-13-WH-ZZ.in b/Tests/Rivet/LHC/LHC-13-WH-ZZ.in
--- a/Tests/Rivet/LHC/LHC-13-WH-ZZ.in
+++ b/Tests/Rivet/LHC/LHC-13-WH-ZZ.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS gg -> H -> ZZ
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2020_I1790439
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2020_I1790439
do /Herwig/Particles/h0:SelectDecayModes h0->Z0,Z0;
diff --git a/Tests/Rivet/LHC/LHC-13-WW-ll.in b/Tests/Rivet/LHC/LHC-13-WW-ll.in
--- a/Tests/Rivet/LHC/LHC-13-WW-ll.in
+++ b/Tests/Rivet/LHC/LHC-13-WW-ll.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS emu
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1734263
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2021_I1852328
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2022_I2103950
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1734263
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2021_I1852328
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2022_I2103950
# CMS
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2020_I1814328
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2020_I1814328
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-13-WZ.in b/Tests/Rivet/LHC/LHC-13-WZ.in
--- a/Tests/Rivet/LHC/LHC-13-WZ.in
+++ b/Tests/Rivet/LHC/LHC-13-WZ.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# general analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1469071
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1720438
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1469071
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1720438
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-13-Z-b.in b/Tests/Rivet/LHC/LHC-13-Z-b.in
--- a/Tests/Rivet/LHC/LHC-13-Z-b.in
+++ b/Tests/Rivet/LHC/LHC-13-Z-b.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2020_I1788444
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2020_I1788444
diff --git a/Tests/Rivet/LHC/LHC-13-Z-bb.in b/Tests/Rivet/LHC/LHC-13-Z-bb.in
--- a/Tests/Rivet/LHC/LHC-13-Z-bb.in
+++ b/Tests/Rivet/LHC/LHC-13-Z-bb.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2020_I1788444
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2020_I1788444
diff --git a/Tests/Rivet/LHC/LHC-13-Z-e.in b/Tests/Rivet/LHC/LHC-13-Z-e.in
--- a/Tests/Rivet/LHC/LHC-13-Z-e.in
+++ b/Tests/Rivet/LHC/LHC-13-Z-e.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS Z
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_CONF_2015_041:LMODE=EL
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1514251:LMODE=EL
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1753680:LMODE=EL
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1667854:LMODE=EL
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_CONF_2015_041:LMODE=EL
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1514251:LMODE=EL
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2019_I1753680:LMODE=EL
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1667854:LMODE=EL
# ATLAS Z+b jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2020_I1788444
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2020_I1788444
# CMS mass spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1711625
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1711625
# ATLAS high pt jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2022_I2077570
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2022_I2077570
diff --git a/Tests/Rivet/LHC/LHC-13-Z-mu.in b/Tests/Rivet/LHC/LHC-13-Z-mu.in
--- a/Tests/Rivet/LHC/LHC-13-Z-mu.in
+++ b/Tests/Rivet/LHC/LHC-13-Z-mu.in
@@ -1,28 +1,28 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS Z
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_CONF_2015_041:LMODE=MU
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1768911:LMODE=MU
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_CONF_2015_041:LMODE=MU
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1768911:LMODE=MU
# ATLAS Z UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1736531
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1736531
# CMS Z UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1635889
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1635889
# CMS Z
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1753680:LMODE=MU
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1667854:LMODE=MU
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2019_I1753680:LMODE=MU
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1667854:LMODE=MU
# CMS mass spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1711625
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2018_I1711625
# ATLAS high pt jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2022_I2077570
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2022_I2077570
# CMS substructure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1920187:MODE=ZJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1920187:MODE=ZJET
# CMS double parton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1866118
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1866118
# CMS mass dependent pT
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2022_I2079374:LMODE=MU
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2022_I2079374:LMODE=MU
# LHCb forward Z production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2021_I1990313
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2021_I1990313
# CMS c/b jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2020_I1776758
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2020_I1776758
diff --git a/Tests/Rivet/LHC/LHC-13-Z-nu.in b/Tests/Rivet/LHC/LHC-13-Z-nu.in
--- a/Tests/Rivet/LHC/LHC-13-Z-nu.in
+++ b/Tests/Rivet/LHC/LHC-13-Z-nu.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS Z
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2020_I1837084
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2020_I1837084
diff --git a/Tests/Rivet/LHC/LHC-13-ZH-ZZ.in b/Tests/Rivet/LHC/LHC-13-ZH-ZZ.in
--- a/Tests/Rivet/LHC/LHC-13-ZH-ZZ.in
+++ b/Tests/Rivet/LHC/LHC-13-ZH-ZZ.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS gg -> H -> ZZ
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2020_I1790439
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2020_I1790439
do /Herwig/Particles/h0:SelectDecayModes h0->Z0,Z0;
diff --git a/Tests/Rivet/LHC/LHC-13-ZZ-ll.in b/Tests/Rivet/LHC/LHC-13-ZZ-ll.in
--- a/Tests/Rivet/LHC/LHC-13-ZZ-ll.in
+++ b/Tests/Rivet/LHC/LHC-13-ZZ-ll.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS 13 TeV ZZ ->ll
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1625109
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1625109
# ATLAS 13 TeV 4 lepton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2021_I1849535
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2021_I1849535
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-13-ggH-ZZ.in b/Tests/Rivet/LHC/LHC-13-ggH-ZZ.in
--- a/Tests/Rivet/LHC/LHC-13-ggH-ZZ.in
+++ b/Tests/Rivet/LHC/LHC-13-ggH-ZZ.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS gg -> H -> ZZ
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2020_I1790439
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2020_I1790439
#do /Herwig/Particles/h0:SelectDecayModes h0->Z0,Z0;
diff --git a/Tests/Rivet/LHC/LHC-2360-UE.in b/Tests/Rivet/LHC/LHC-2360-UE.in
--- a/Tests/Rivet/LHC/LHC-2360-UE.in
+++ b/Tests/Rivet/LHC/LHC-2360-UE.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I882098
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I882098
# ALICE charged particles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2010_I852264
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2010_I852264
# ALICE charged particles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2010_I852450
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2010_I852450
# CMS charged particle multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I879315
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I879315
# CMS charged particle pT and rapidity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2010_I845323
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2010_I845323
diff --git a/Tests/Rivet/LHC/LHC-2760-Jets-1.in b/Tests/Rivet/LHC/LHC-2760-Jets-1.in
--- a/Tests/Rivet/LHC/LHC-2760-Jets-1.in
+++ b/Tests/Rivet/LHC/LHC-2760-Jets-1.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# underlying event
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1385107
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2015_I1385107
diff --git a/Tests/Rivet/LHC/LHC-2760-Jets-2.in b/Tests/Rivet/LHC/LHC-2760-Jets-2.in
--- a/Tests/Rivet/LHC/LHC-2760-Jets-2.in
+++ b/Tests/Rivet/LHC/LHC-2760-Jets-2.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# underlying event
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1385107
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2015_I1385107
# CMS Muller Navellet jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1963239
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2021_I1963239
diff --git a/Tests/Rivet/LHC/LHC-2760-Jets-3.in b/Tests/Rivet/LHC/LHC-2760-Jets-3.in
--- a/Tests/Rivet/LHC/LHC-2760-Jets-3.in
+++ b/Tests/Rivet/LHC/LHC-2760-Jets-3.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# underlying event
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1385107
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2015_I1385107
diff --git a/Tests/Rivet/LHC/LHC-2760-UE.in b/Tests/Rivet/LHC/LHC-2760-UE.in
--- a/Tests/Rivet/LHC/LHC-2760-UE.in
+++ b/Tests/Rivet/LHC/LHC-2760-UE.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# underlying event forward rapidities
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1218372
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1218372
# underlying event
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1385107
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2015_I1385107
# ALICE neutral pion cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2017_I1512110
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2012_I1181770
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2017_I1512110
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2012_I1181770
# ALICE rho production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2019_I1672860
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2019_I1672860
diff --git a/Tests/Rivet/LHC/LHC-2760-Z-e.in b/Tests/Rivet/LHC/LHC-2760-Z-e.in
--- a/Tests/Rivet/LHC/LHC-2760-Z-e.in
+++ b/Tests/Rivet/LHC/LHC-2760-Z-e.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1322726
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1322726
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-2760-Z-mu.in b/Tests/Rivet/LHC/LHC-2760-Z-mu.in
--- a/Tests/Rivet/LHC/LHC-2760-Z-mu.in
+++ b/Tests/Rivet/LHC/LHC-2760-Z-mu.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1322726
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1322726
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-5-Charm-0.in b/Tests/Rivet/LHC/LHC-5-Charm-0.in
--- a/Tests/Rivet/LHC/LHC-5-Charm-0.in
+++ b/Tests/Rivet/LHC/LHC-5-Charm-0.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# charm production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2016_I1490663
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2016_I1490663
diff --git a/Tests/Rivet/LHC/LHC-7-Bottom-0.in b/Tests/Rivet/LHC/LHC-7-Bottom-0.in
--- a/Tests/Rivet/LHC/LHC-7-Bottom-0.in
+++ b/Tests/Rivet/LHC/LHC-7-Bottom-0.in
@@ -1,16 +1,16 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# forward B production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2010_I867355
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2010_I867355
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I896268
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I896268
# b-jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I930220
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I930220
# ATLAS inclusive lepton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I926145
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I926145
# CMS inclusive lepton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I884811
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I884811
# 2b + 2 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1486238
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1486238
diff --git a/Tests/Rivet/LHC/LHC-7-Bottom-1.in b/Tests/Rivet/LHC/LHC-7-Bottom-1.in
--- a/Tests/Rivet/LHC/LHC-7-Bottom-1.in
+++ b/Tests/Rivet/LHC/LHC-7-Bottom-1.in
@@ -1,18 +1,18 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS inclusive lepton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I926145
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I926145
# CMS inclusive lepton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I884811
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I884811
# b-hadron cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1118269
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1118269
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I896268
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I896268
# b-jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I930220
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I930220
# charm production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2013_I1218996
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2013_I1218996
# 2b + 2 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1486238
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1486238
diff --git a/Tests/Rivet/LHC/LHC-7-Bottom-2.in b/Tests/Rivet/LHC/LHC-7-Bottom-2.in
--- a/Tests/Rivet/LHC/LHC-7-Bottom-2.in
+++ b/Tests/Rivet/LHC/LHC-7-Bottom-2.in
@@ -1,16 +1,16 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS inclusive lepton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I926145
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I926145
# CMS inclusive lepton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I884811
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I884811
# b-hadron cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1118269
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1118269
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I896268
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I896268
# b-jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I930220
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I930220
# 2b + 2 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1486238
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1486238
diff --git a/Tests/Rivet/LHC/LHC-7-Bottom-3.in b/Tests/Rivet/LHC/LHC-7-Bottom-3.in
--- a/Tests/Rivet/LHC/LHC-7-Bottom-3.in
+++ b/Tests/Rivet/LHC/LHC-7-Bottom-3.in
@@ -1,16 +1,16 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS inclusive lepton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I926145
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I926145
# CMS inclusive lepton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I884811
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I884811
# b-hadron cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1118269
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1118269
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I896268
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I896268
# b-jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I930220
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I930220
# 2b + 2 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1486238
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1486238
diff --git a/Tests/Rivet/LHC/LHC-7-Bottom-4.in b/Tests/Rivet/LHC/LHC-7-Bottom-4.in
--- a/Tests/Rivet/LHC/LHC-7-Bottom-4.in
+++ b/Tests/Rivet/LHC/LHC-7-Bottom-4.in
@@ -1,18 +1,18 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS inclusive lepton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I926145
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I926145
# CMS inclusive lepton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I884811
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I884811
# CMS displaced vertex
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I889807
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I889807
# b-hadron cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1118269
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1118269
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I896268
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I896268
# b-jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I930220
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I930220
# 2b + 2 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1486238
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1486238
diff --git a/Tests/Rivet/LHC/LHC-7-Bottom-5.in b/Tests/Rivet/LHC/LHC-7-Bottom-5.in
--- a/Tests/Rivet/LHC/LHC-7-Bottom-5.in
+++ b/Tests/Rivet/LHC/LHC-7-Bottom-5.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS displaced vertex
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I889807
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I889807
# b-hadron cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1118269
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1118269
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I896268
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I896268
# b-jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I930220
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I930220
# 2b + 2 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1486238
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1486238
diff --git a/Tests/Rivet/LHC/LHC-7-Bottom-6.in b/Tests/Rivet/LHC/LHC-7-Bottom-6.in
--- a/Tests/Rivet/LHC/LHC-7-Bottom-6.in
+++ b/Tests/Rivet/LHC/LHC-7-Bottom-6.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS displaced vertex
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I889807
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I889807
# b-hadron cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1118269
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1118269
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I896268
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I896268
# b-jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I930220
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I930220
# 2b + 2 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1486238
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1486238
diff --git a/Tests/Rivet/LHC/LHC-7-Bottom-7.in b/Tests/Rivet/LHC/LHC-7-Bottom-7.in
--- a/Tests/Rivet/LHC/LHC-7-Bottom-7.in
+++ b/Tests/Rivet/LHC/LHC-7-Bottom-7.in
@@ -1,9 +1,9 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# b-jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I930220
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I930220
# 2b + 2 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1486238
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1486238
diff --git a/Tests/Rivet/LHC/LHC-7-Bottom-8.in b/Tests/Rivet/LHC/LHC-7-Bottom-8.in
--- a/Tests/Rivet/LHC/LHC-7-Bottom-8.in
+++ b/Tests/Rivet/LHC/LHC-7-Bottom-8.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# b-jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I930220
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I930220
# 2b + 2 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1486238
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1486238
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-7-Bottom-9.in b/Tests/Rivet/LHC/LHC-7-Bottom-9.in
--- a/Tests/Rivet/LHC/LHC-7-Bottom-9.in
+++ b/Tests/Rivet/LHC/LHC-7-Bottom-9.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# b-jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I930220
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I930220
# 2b + 2 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1486238
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1486238
diff --git a/Tests/Rivet/LHC/LHC-7-Cent.in b/Tests/Rivet/LHC/LHC-7-Cent.in
--- a/Tests/Rivet/LHC/LHC-7-Cent.in
+++ b/Tests/Rivet/LHC/LHC-7-Cent.in
@@ -1,2 +1,2 @@
# -*- ThePEG-repository -*-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2015_CENT_PP
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2015_CENT_PP
diff --git a/Tests/Rivet/LHC/LHC-7-Charm-0.in b/Tests/Rivet/LHC/LHC-7-Charm-0.in
--- a/Tests/Rivet/LHC/LHC-7-Charm-0.in
+++ b/Tests/Rivet/LHC/LHC-7-Charm-0.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS inclusive lepton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I926145
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I926145
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I896268
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I896268
# charm production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2013_I1218996
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2013_I1218996
diff --git a/Tests/Rivet/LHC/LHC-7-Charm-1.in b/Tests/Rivet/LHC/LHC-7-Charm-1.in
--- a/Tests/Rivet/LHC/LHC-7-Charm-1.in
+++ b/Tests/Rivet/LHC/LHC-7-Charm-1.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS inclusive lepton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I926145
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I926145
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I896268
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I896268
# charm production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2013_I1218996
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2013_I1218996
diff --git a/Tests/Rivet/LHC/LHC-7-Charm-2.in b/Tests/Rivet/LHC/LHC-7-Charm-2.in
--- a/Tests/Rivet/LHC/LHC-7-Charm-2.in
+++ b/Tests/Rivet/LHC/LHC-7-Charm-2.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS inclusive lepton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I926145
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I926145
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I896268
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I896268
diff --git a/Tests/Rivet/LHC/LHC-7-Charm-3.in b/Tests/Rivet/LHC/LHC-7-Charm-3.in
--- a/Tests/Rivet/LHC/LHC-7-Charm-3.in
+++ b/Tests/Rivet/LHC/LHC-7-Charm-3.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS inclusive lepton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I926145
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I926145
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I896268
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I896268
diff --git a/Tests/Rivet/LHC/LHC-7-Charm-4.in b/Tests/Rivet/LHC/LHC-7-Charm-4.in
--- a/Tests/Rivet/LHC/LHC-7-Charm-4.in
+++ b/Tests/Rivet/LHC/LHC-7-Charm-4.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I896268
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I896268
diff --git a/Tests/Rivet/LHC/LHC-7-Charm-5.in b/Tests/Rivet/LHC/LHC-7-Charm-5.in
--- a/Tests/Rivet/LHC/LHC-7-Charm-5.in
+++ b/Tests/Rivet/LHC/LHC-7-Charm-5.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I896268
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I896268
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-1-A.in b/Tests/Rivet/LHC/LHC-7-DiJets-1-A.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-1-A.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-1-A.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
# CMS High mass jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1268975
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1268975
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-1-B.in b/Tests/Rivet/LHC/LHC-7-DiJets-1-B.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-1-B.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-1-B.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I889175
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I889175
# CMS dijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1090423
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1090423
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-1-C.in b/Tests/Rivet/LHC/LHC-7-DiJets-1-C.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-1-C.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-1-C.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-2-A.in b/Tests/Rivet/LHC/LHC-7-DiJets-2-A.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-2-A.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-2-A.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
# CMS High mass jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1268975
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1268975
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-2-B.in b/Tests/Rivet/LHC/LHC-7-DiJets-2-B.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-2-B.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-2-B.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I889175
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I889175
# CMS dijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1090423
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1090423
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-2-C.in b/Tests/Rivet/LHC/LHC-7-DiJets-2-C.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-2-C.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-2-C.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-3-A.in b/Tests/Rivet/LHC/LHC-7-DiJets-3-A.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-3-A.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-3-A.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
# CMS High mass jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1268975
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1268975
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-3-B.in b/Tests/Rivet/LHC/LHC-7-DiJets-3-B.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-3-B.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-3-B.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I889175
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I889175
# CMS dijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1090423
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1090423
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-3-C.in b/Tests/Rivet/LHC/LHC-7-DiJets-3-C.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-3-C.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-3-C.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-4-A.in b/Tests/Rivet/LHC/LHC-7-DiJets-4-A.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-4-A.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-4-A.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
# CMS High mass jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1268975
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1268975
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-4-B.in b/Tests/Rivet/LHC/LHC-7-DiJets-4-B.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-4-B.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-4-B.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I889175
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I889175
# CMS dijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1090423
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1090423
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-4-C.in b/Tests/Rivet/LHC/LHC-7-DiJets-4-C.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-4-C.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-4-C.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-5-A.in b/Tests/Rivet/LHC/LHC-7-DiJets-5-A.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-5-A.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-5-A.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
# CMS High mass jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1268975
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1268975
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-5-B.in b/Tests/Rivet/LHC/LHC-7-DiJets-5-B.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-5-B.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-5-B.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I889175
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I889175
# CMS dijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1090423
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1090423
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-5-C.in b/Tests/Rivet/LHC/LHC-7-DiJets-5-C.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-5-C.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-5-C.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-6-A.in b/Tests/Rivet/LHC/LHC-7-DiJets-6-A.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-6-A.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-6-A.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
# CMS High mass jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1268975
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1268975
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-6-B.in b/Tests/Rivet/LHC/LHC-7-DiJets-6-B.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-6-B.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-6-B.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I889175
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I889175
# CMS dijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1090423
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1090423
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-6-C.in b/Tests/Rivet/LHC/LHC-7-DiJets-6-C.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-6-C.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-6-C.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-7-A.in b/Tests/Rivet/LHC/LHC-7-DiJets-7-A.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-7-A.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-7-A.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
# CMS High mass jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1268975
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1268975
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-7-B.in b/Tests/Rivet/LHC/LHC-7-DiJets-7-B.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-7-B.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-7-B.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I889175
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I889175
# CMS dijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1090423
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1090423
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-7-C.in b/Tests/Rivet/LHC/LHC-7-DiJets-7-C.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-7-C.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-7-C.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-8-A.in b/Tests/Rivet/LHC/LHC-7-DiJets-8-A.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-8-A.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-8-A.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
# CMS High mass jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1268975
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1268975
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-8-B.in b/Tests/Rivet/LHC/LHC-7-DiJets-8-B.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-8-B.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-8-B.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I889175
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I889175
# CMS dijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1090423
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1090423
diff --git a/Tests/Rivet/LHC/LHC-7-DiJets-8-C.in b/Tests/Rivet/LHC/LHC-7-DiJets-8-C.in
--- a/Tests/Rivet/LHC/LHC-7-DiJets-8-C.in
+++ b/Tests/Rivet/LHC/LHC-7-DiJets-8-C.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
diff --git a/Tests/Rivet/LHC/LHC-7-DiPhoton.in b/Tests/Rivet/LHC/LHC-7-DiPhoton.in
--- a/Tests/Rivet/LHC/LHC-7-DiPhoton.in
+++ b/Tests/Rivet/LHC/LHC-7-DiPhoton.in
@@ -1,9 +1,9 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS diphoton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I916832
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1199269
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I916832
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1199269
# MC diphoton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_DIPHOTON
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_DIPHOTON
diff --git a/Tests/Rivet/LHC/LHC-7-Jets-0.in b/Tests/Rivet/LHC/LHC-7-Jets-0.in
--- a/Tests/Rivet/LHC/LHC-7-Jets-0.in
+++ b/Tests/Rivet/LHC/LHC-7-Jets-0.in
@@ -1,16 +1,16 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I902309
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I902309
# ATLAS track jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I919017
# CMS central and forward jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1087342
# ATLAS charged particle in min bias
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1125575
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1125575
# ATLAS leading jet UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1298811
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-7-Jets-1.in b/Tests/Rivet/LHC/LHC-7-Jets-1.in
--- a/Tests/Rivet/LHC/LHC-7-Jets-1.in
+++ b/Tests/Rivet/LHC/LHC-7-Jets-1.in
@@ -1,39 +1,39 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jet shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I882984
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I882984
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
# ATLAS dijet with veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I917526
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I917526
# CMS jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I902309
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I902309
# CMS 3/2 jet cross section ratio
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I912560
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I912560
# ATLAS track jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I919017
# CMS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I916908
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I916908
# CMS central and forward jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1087342
# strange particles in underlying event
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_PAS_QCD_11_010
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_PAS_QCD_11_010
# ATLAS charged particle in min bias
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1125575
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1125575
# CMS 4-jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1273574
# ATLAS leading jet UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1298811
# ATLAS jet shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082009
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082009
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
# ATLAS Jet frag
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I929691
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I929691
# CMS shapes etc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1111014
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1111014
# CMS dijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1184941
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1184941
diff --git a/Tests/Rivet/LHC/LHC-7-Jets-10.in b/Tests/Rivet/LHC/LHC-7-Jets-10.in
--- a/Tests/Rivet/LHC/LHC-7-Jets-10.in
+++ b/Tests/Rivet/LHC/LHC-7-Jets-10.in
@@ -1,42 +1,42 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I889546
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I889546
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
# ATLAS dijet with veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I917526
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I917526
# CMS jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I902309
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I902309
# CMS 3/2 jet cross section ratio
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I912560
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I912560
# ATLAS track jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I919017
# CMS central and forward jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1087342
# ATLAS subjets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1094564
# CMS jet structure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539:JMODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1224539:JMODE=DIJET
# CMS 4-jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1273574
# ATLAS leading jet UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1298811
# ATLAS jet veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1307243
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1307243
# ATLAS inclusive jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1325553
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1325553
# CMS jet ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1298810
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1298810
# flavour composition of jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1188891
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1188891
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
# ATLAS Jet frag
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I929691
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I929691
# CMS shapes etc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1111014
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1111014
diff --git a/Tests/Rivet/LHC/LHC-7-Jets-2.in b/Tests/Rivet/LHC/LHC-7-Jets-2.in
--- a/Tests/Rivet/LHC/LHC-7-Jets-2.in
+++ b/Tests/Rivet/LHC/LHC-7-Jets-2.in
@@ -1,46 +1,46 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jet shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I882984
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I882984
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
# ATLAS dijet with veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I917526
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I917526
# CMS jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I902309
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I902309
# CMS 3/2 jet cross section ratio
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I912560
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I912560
# ATLAS track jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I919017
# CMS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I916908
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I916908
# CMS central and forward jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1087342
# CMS dijets with large rapidity intervals
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1102908
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1102908
# strange particles in underlying event
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_PAS_QCD_11_010
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_PAS_QCD_11_010
# ATLAS charged particle in min bias
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1125575
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1125575
# CMS 4-jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1273574
# ATLAS leading jet UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1298811
# ATLAS jet veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1307243
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1307243
# CMS jet ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1298810
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1298810
# flavour composition of jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1188891
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1188891
# ATLAS jet shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082009
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082009
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
# ATLAS Jet frag
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I929691
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I929691
# CMS shapes etc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1111014
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1111014
diff --git a/Tests/Rivet/LHC/LHC-7-Jets-3.in b/Tests/Rivet/LHC/LHC-7-Jets-3.in
--- a/Tests/Rivet/LHC/LHC-7-Jets-3.in
+++ b/Tests/Rivet/LHC/LHC-7-Jets-3.in
@@ -1,52 +1,52 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jet shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I882984
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I882984
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
# CMS event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I886332
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I886332
# ATLAS dijet with veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I917526
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I917526
# CMS dijet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I885663
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I885663
# CMS jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I902309
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I902309
# CMS 3/2 jet cross section ratio
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I912560
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I912560
# ATLAS track jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I919017
# CMS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I916908
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I916908
# CMS central and forward jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1087342
# strange particles in underlying event
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_PAS_QCD_11_010
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_PAS_QCD_11_010
# ATLAS charged particle in min bias
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1125575
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1125575
# CMS 4-jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1273574
# ATLAS leading jet UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1298811
# ATLAS jet veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1307243
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1307243
# ATLAS inclusive jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1325553
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1325553
# CMS jet ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1298810
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1298810
# flavour composition of jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1188891
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1188891
# ATLAS jet shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082009
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082009
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
# atlas double parton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1479760
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1479760
# ATLAS Jet frag
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I929691
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I929691
# CMS shapes etc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1111014
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1111014
diff --git a/Tests/Rivet/LHC/LHC-7-Jets-4.in b/Tests/Rivet/LHC/LHC-7-Jets-4.in
--- a/Tests/Rivet/LHC/LHC-7-Jets-4.in
+++ b/Tests/Rivet/LHC/LHC-7-Jets-4.in
@@ -1,53 +1,53 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jet shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I882984
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I882984
# ATLAS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I889546
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I889546
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
# CMS event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I886332
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I886332
# ATLAS multijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I917599
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I917599
# ATLAS dijet with veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I917526
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I917526
# CMS dijet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I885663
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I885663
# CMS jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I902309
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I902309
# CMS 3/2 jet cross section ratio
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I912560
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I912560
# ATLAS track jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I919017
# CMS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I916908
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I916908
# CMS central and forward jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1087342
# ATLAS subjets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1094564
# CMS 4-jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1273574
# CMS colour coherence
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1265659
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1265659
# ATLAS leading jet UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1298811
# ATLAS jet veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1307243
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1307243
# ATLAS inclusive jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1325553
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1325553
# CMS jet ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1298810
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1298810
# flavour composition of jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1188891
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1188891
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
# CMS event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1305624
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1305624
# ATLAS Jet frag
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I929691
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I929691
# CMS shapes etc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1111014
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1111014
diff --git a/Tests/Rivet/LHC/LHC-7-Jets-5.in b/Tests/Rivet/LHC/LHC-7-Jets-5.in
--- a/Tests/Rivet/LHC/LHC-7-Jets-5.in
+++ b/Tests/Rivet/LHC/LHC-7-Jets-5.in
@@ -1,48 +1,48 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jet shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I882984
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I882984
# ATLAS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I889546
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I889546
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
# CMS event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I886332
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I886332
# ATLAS dijet with veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I917526
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I917526
# CMS dijet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I885663
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I885663
# CMS jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I902309
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I902309
# CMS 3/2 jet cross section ratio
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I912560
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I912560
# ATLAS track jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I919017
# ATLAS subjets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1094564
# CMS jet structure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539:JMODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1224539:JMODE=DIJET
# CMS 4-jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1273574
# ATLAS leading jet UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1298811
# ATLAS jet veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1307243
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1307243
# ATLAS inclusive jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1325553
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1325553
# CMS jet ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1298810
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1298810
# flavour composition of jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1188891
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1188891
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
# CMS event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1305624
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1305624
# ATLAS Jet frag
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I929691
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I929691
# CMS shapes etc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1111014
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1111014
diff --git a/Tests/Rivet/LHC/LHC-7-Jets-6.in b/Tests/Rivet/LHC/LHC-7-Jets-6.in
--- a/Tests/Rivet/LHC/LHC-7-Jets-6.in
+++ b/Tests/Rivet/LHC/LHC-7-Jets-6.in
@@ -1,52 +1,52 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jet shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I882984
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I882984
# ATLAS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I889546
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I889546
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
# ATLAS dijet with veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I917526
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I917526
# CMS dijet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I885663
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I885663
# CMS jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I902309
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I902309
# CMS 3/2 jet cross section ratio
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I912560
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I912560
# ATLAS track jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I919017
# CMS central and forward jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1087342
# ATLAS high pT jet shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1119557
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1119557
# ATLAS subjets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1094564
# CMS jet structure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539:JMODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1224539:JMODE=DIJET
# CMS 4-jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1273574
# ATLAS leading jet UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1298811
# ATLAS jet veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1307243
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1307243
# ATLAS inclusive jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1325553
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1325553
# CMS jet ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1298810
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1298810
# flavour composition of jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1188891
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1188891
# ATLAS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1387176
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1387176
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
# CMS event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1305624
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1305624
# ATLAS Jet frag
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I929691
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I929691
# CMS shapes etc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1111014
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1111014
diff --git a/Tests/Rivet/LHC/LHC-7-Jets-7.in b/Tests/Rivet/LHC/LHC-7-Jets-7.in
--- a/Tests/Rivet/LHC/LHC-7-Jets-7.in
+++ b/Tests/Rivet/LHC/LHC-7-Jets-7.in
@@ -1,46 +1,46 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jet shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I882984
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I882984
# ATLAS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I889546
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I889546
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
# ATLAS dijet with veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I917526
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I917526
# CMS jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I902309
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I902309
# CMS 3/2 jet cross section ratio
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I912560
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I912560
# ATLAS track jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I919017
# CMS central and forward jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1087342
# ATLAS subjets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1094564
# CMS jet structure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539:JMODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1224539:JMODE=DIJET
# CMS 4-jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1273574
# ATLAS leading jet UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1298811
# ATLAS jet veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1307243
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1307243
# ATLAS inclusive jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1325553
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1325553
# CMS jet ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1298810
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1298810
# flavour composition of jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1188891
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1188891
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
# CMS event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1305624
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1305624
# ATLAS Jet frag
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I929691
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I929691
# CMS shapes etc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1111014
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1111014
diff --git a/Tests/Rivet/LHC/LHC-7-Jets-8.in b/Tests/Rivet/LHC/LHC-7-Jets-8.in
--- a/Tests/Rivet/LHC/LHC-7-Jets-8.in
+++ b/Tests/Rivet/LHC/LHC-7-Jets-8.in
@@ -1,41 +1,41 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I889546
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I889546
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
# ATLAS dijet with veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I917526
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I917526
# CMS jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I902309
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I902309
# CMS 3/2 jet cross section ratio
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I912560
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I912560
# ATLAS track jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I919017
# CMS central and forward jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1087342
# ATLAS subjets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1094564
# CMS jet structure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539:JMODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1224539:JMODE=DIJET
# CMS 4-jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1273574
# ATLAS leading jet UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1298811
# ATLAS jet veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1307243
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1307243
# ATLAS inclusive jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1325553
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1325553
# CMS jet ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1298810
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1298810
# flavour composition of jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1188891
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1188891
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
# ATLAS Jet frag
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I929691
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I929691
# CMS shapes etc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1111014
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1111014
diff --git a/Tests/Rivet/LHC/LHC-7-Jets-9.in b/Tests/Rivet/LHC/LHC-7-Jets-9.in
--- a/Tests/Rivet/LHC/LHC-7-Jets-9.in
+++ b/Tests/Rivet/LHC/LHC-7-Jets-9.in
@@ -1,45 +1,45 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I889546
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I889546
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
# ATLAS dijet with veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I917526
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I917526
# CMS jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I902309
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I902309
# CMS 3/2 jet cross section ratio
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I912560
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I912560
# ATLAS track jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I919017
# CMS central and forward jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1087342
# ATLAS subjets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1094564
# CMS jet structure
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539:JMODE=DIJET
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1224539:JMODE=DIJET
# CMS 4-jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1273574
# ATLAS leading jet UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1298811
# ATLAS jet veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1307243
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1307243
# ATLAS inclusive jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1325553
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1325553
# CMS jet ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1298810
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1298810
# flavour composition of jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1188891
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1188891
# CMS Jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1208923
# ATLAS Jet frag
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I929691
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I929691
# CMS shapes etc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1111014
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1111014
diff --git a/Tests/Rivet/LHC/LHC-7-PromptPhoton.in b/Tests/Rivet/LHC/LHC-7-PromptPhoton.in
--- a/Tests/Rivet/LHC/LHC-7-PromptPhoton.in
+++ b/Tests/Rivet/LHC/LHC-7-PromptPhoton.in
@@ -1,16 +1,16 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS prompt photon
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I882463
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1093738
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I921594
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1263495
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1244522
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I882463
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1093738
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I921594
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1263495
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1244522
# CMS
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1258128
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1258128
# MC
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_PHOTONJETS
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_PHOTONJETS
# CMS photon + jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1266056
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1266056
diff --git a/Tests/Rivet/LHC/LHC-7-Top-L.in b/Tests/Rivet/LHC/LHC-7-Top-L.in
--- a/Tests/Rivet/LHC/LHC-7-Top-L.in
+++ b/Tests/Rivet/LHC/LHC-7-Top-L.in
@@ -1,11 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS top with jet veto
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094568
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1094568
# ATLAS b-jet shapes in top events
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1243871
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1243871
# ATLAS KS0 and Lambda
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1746286
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1746286
diff --git a/Tests/Rivet/LHC/LHC-7-Top-SL.in b/Tests/Rivet/LHC/LHC-7-Top-SL.in
--- a/Tests/Rivet/LHC/LHC-7-Top-SL.in
+++ b/Tests/Rivet/LHC/LHC-7-Top-SL.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# MC analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_TTBAR
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_TTBAR
# ATLAS b-jet shapes in top events
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1243871
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1243871
##################################################
# select the analyses
##################################################
# ATLAS b-jet shapes in top events
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1304688
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1304688
# ATLAS top cross sections
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1345452
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1345452
diff --git a/Tests/Rivet/LHC/LHC-7-UE-Cent.in b/Tests/Rivet/LHC/LHC-7-UE-Cent.in
--- a/Tests/Rivet/LHC/LHC-7-UE-Cent.in
+++ b/Tests/Rivet/LHC/LHC-7-UE-Cent.in
@@ -1,4 +1,4 @@
# -*- ThePEG-repository -*-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2015_CENT_PP
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2016_I1471838
-insert /Herwig/Analysis/RivetAnalysis:PreLoad 0 Rivet-LHC-7-Cent.yoda
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2015_CENT_PP
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2016_I1471838
+insert /Herwig/Analysis/Rivet:PreLoad 0 Rivet-LHC-7-Cent.yoda
diff --git a/Tests/Rivet/LHC/LHC-7-UE-Long.in b/Tests/Rivet/LHC/LHC-7-UE-Long.in
--- a/Tests/Rivet/LHC/LHC-7-UE-Long.in
+++ b/Tests/Rivet/LHC/LHC-7-UE-Long.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS K0s and Lambda
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I944826
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I944826
diff --git a/Tests/Rivet/LHC/LHC-7-UE.in b/Tests/Rivet/LHC/LHC-7-UE.in
--- a/Tests/Rivet/LHC/LHC-7-UE.in
+++ b/Tests/Rivet/LHC/LHC-7-UE.in
@@ -1,95 +1,95 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jet shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I882984
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I882984
# ATLAS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I871366
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I871366
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1082936
# ATLAS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I891834
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I891834
# ATLAS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I879407
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I879407
# ATLAS fragmentation function
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_CONF_2010_049
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_CONF_2010_049
# ATLAS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I882098
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I882098
# ALICE charged particles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2010_I852264
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2010_I852264
# CMS particle spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I890166
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I890166
# CMS charged particle multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I879315
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I879315
# CMS charged particle pT and rapidity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2010_I855299
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2010_I855299
# CMS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I916908
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I916908
# ATLAS track jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I919017
# LHCB phi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2011_I919315
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2011_I919315
# ATLAS phi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1282441
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1282441
# LHCB promt hadron productiom
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2012_I1119400
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2012_I1119400
# ATLAS rap gap
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1084540
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1084540
# CMS forward energy flow
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I930319
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I930319
# LHC K0s/Lambda
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2011_I917009
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2011_I917009
# TOTEM at large rapidity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOTEM_2012_I1115294
+insert /Herwig/Analysis/Rivet:Analyses 0 TOTEM_2012_I1115294
# ATLAS Azimuthal ordering of charged hadrons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1091481
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1091481
# ALICE single/double diffractive and inelastic sigma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2012_I1181770
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2012_I1181770
# ATLAS inelastic cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I894867
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I894867
# CMS inelastic cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1193338
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1193338
# total transverse energy
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1183818
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1183818
# underlying event forward rapidities
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1218372
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1218372
# strange particles in underlying event
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_PAS_QCD_11_010
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_PAS_QCD_11_010
# CMS central and forward jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1087342
# ATLAS charged particle in min bias
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1125575
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1125575
# ATLAS two particle correlation
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094061
+#insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1094061
# ATLAS correlations
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1093734
+#insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1093734
# LHCB energy flow
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2013_I1208105
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2013_I1208105
# ATLAS charged particle event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1124167
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1124167
# CMS Jet/UE properties
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1261026
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1261026
# ATLAS leading jet UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1298811
# LHCB charged particles in min bias
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2014_I1281685
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2014_I1281685
# ALICE identified particle spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2015_I1357424
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2014_I1300380
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2015_I1357424
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2014_I1300380
# LHCB min bias
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2015_I1333223
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2015_I1333223
# ALICE pion and eta pT
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2012_I1116147
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_PAS_FSQ_12_020
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2012_I1116147
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_PAS_FSQ_12_020
# CMS charged particle rapidity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2010_PAS_QCD_10_024
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2010_PAS_QCD_10_024
# diffractive analyses
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2012_I1115479
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1356998
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOTEM_2012_I1220862
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCF_2012_I1115479
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2015_I1356998
+insert /Herwig/Analysis/Rivet:Analyses 0 TOTEM_2012_I1220862
# atlas hadron ordering
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1624693
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1624693
# LHCF
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2015_I1351909
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2016_I1385877
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2012_I944757
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCF_2015_I1351909
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCF_2016_I1385877
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2012_I944757
diff --git a/Tests/Rivet/LHC/LHC-7-W-Jet-e.in b/Tests/Rivet/LHC/LHC-7-W-Jet-e.in
--- a/Tests/Rivet/LHC/LHC-7-W-Jet-e.in
+++ b/Tests/Rivet/LHC/LHC-7-W-Jet-e.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS jet mass
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539:JMODE=W
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1224539:JMODE=W
diff --git a/Tests/Rivet/LHC/LHC-7-WGamma-e.in b/Tests/Rivet/LHC/LHC-7-WGamma-e.in
--- a/Tests/Rivet/LHC/LHC-7-WGamma-e.in
+++ b/Tests/Rivet/LHC/LHC-7-WGamma-e.in
@@ -1,3 +1,3 @@
# -*- ThePEG-repository -*-
# ATLAS W Gamma analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1217863:LMODE=WEL
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1217863:LMODE=WEL
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-7-WGamma-mu.in b/Tests/Rivet/LHC/LHC-7-WGamma-mu.in
--- a/Tests/Rivet/LHC/LHC-7-WGamma-mu.in
+++ b/Tests/Rivet/LHC/LHC-7-WGamma-mu.in
@@ -1,3 +1,3 @@
# -*- ThePEG-repository -*-
# ATLAS W Gamma analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1217863:LMODE=WMU
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1217863:LMODE=WMU
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-7-Z-Jet-e.in b/Tests/Rivet/LHC/LHC-7-Z-Jet-e.in
--- a/Tests/Rivet/LHC/LHC-7-Z-Jet-e.in
+++ b/Tests/Rivet/LHC/LHC-7-Z-Jet-e.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS jet mass
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539:JMODE=Z
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1224539:JMODE=Z
# CMS Z ang correlations and event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1209721
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1209721
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-7-Z-Jet-mu.in b/Tests/Rivet/LHC/LHC-7-Z-Jet-mu.in
--- a/Tests/Rivet/LHC/LHC-7-Z-Jet-mu.in
+++ b/Tests/Rivet/LHC/LHC-7-Z-Jet-mu.in
@@ -1,3 +1,3 @@
# -*- ThePEG-repository -*-
# CMS Z ang correlations and event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1209721
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1209721
diff --git a/Tests/Rivet/LHC/LHC-7-ZGamma-e.in b/Tests/Rivet/LHC/LHC-7-ZGamma-e.in
--- a/Tests/Rivet/LHC/LHC-7-ZGamma-e.in
+++ b/Tests/Rivet/LHC/LHC-7-ZGamma-e.in
@@ -1,3 +1,3 @@
# -*- ThePEG-repository -*-
# ATLAS Z Gamma analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1217863:LMODE=ZEL
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1217863:LMODE=ZEL
diff --git a/Tests/Rivet/LHC/LHC-7-ZGamma-mu.in b/Tests/Rivet/LHC/LHC-7-ZGamma-mu.in
--- a/Tests/Rivet/LHC/LHC-7-ZGamma-mu.in
+++ b/Tests/Rivet/LHC/LHC-7-ZGamma-mu.in
@@ -1,3 +1,3 @@
# -*- ThePEG-repository -*-
# ATLAS Z Gamma analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1217863:LMODE=ZMU
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1217863:LMODE=ZMU
diff --git a/Tests/Rivet/LHC/LHC-8-DiPhoton.in b/Tests/Rivet/LHC/LHC-8-DiPhoton.in
--- a/Tests/Rivet/LHC/LHC-8-DiPhoton.in
+++ b/Tests/Rivet/LHC/LHC-8-DiPhoton.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS diphoton
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1591327
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1591327
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-0.in b/Tests/Rivet/LHC/LHC-8-Jets-0.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-0.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-0.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
# ATLAS tracks in jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1419070
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1598460
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-1.in b/Tests/Rivet/LHC/LHC-8-Jets-1.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-1.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-1.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
# ATLAS tracks in jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1419070
# ATLAS jet charge
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1393758
# ATLAS transverse energy correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1609253
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1487277
# CMS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1421646
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1598460
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-10.in b/Tests/Rivet/LHC/LHC-8-Jets-10.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-10.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-10.in
@@ -1,17 +1,17 @@
# -*- ThePEG-repository -*-
# ATLAS tracks in jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1419070
# ATLAS multijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1394679
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1394679
# ATLAS jet charge
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1393758
# ATLAS transverse energy correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1609253
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1487277
# CMS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1421646
# CMS jet charge
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1605749
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1605749
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1598460
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-2.in b/Tests/Rivet/LHC/LHC-8-Jets-2.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-2.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-2.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
# ATLAS tracks in jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1419070
# ATLAS jet charge
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1393758
# ATLAS transverse energy correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1609253
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1487277
# CMS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1421646
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1598460
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-3.in b/Tests/Rivet/LHC/LHC-8-Jets-3.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-3.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-3.in
@@ -1,15 +1,15 @@
# -*- ThePEG-repository -*-
# ATLAS tracks in jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1419070
# ATLAS multijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1394679
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1394679
# ATLAS jet charge
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1393758
# ATLAS transverse energy correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1609253
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1487277
# CMS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1421646
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1598460
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-4.in b/Tests/Rivet/LHC/LHC-8-Jets-4.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-4.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-4.in
@@ -1,17 +1,17 @@
# -*- ThePEG-repository -*-
# ATLAS tracks in jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1419070
# ATLAS multijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1394679
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1394679
# ATLAS jet charge
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1393758
# ATLAS transverse energy correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1609253
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1487277
# CMS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1421646
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1598460
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-5.in b/Tests/Rivet/LHC/LHC-8-Jets-5.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-5.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-5.in
@@ -1,17 +1,17 @@
# -*- ThePEG-repository -*-
# ATLAS tracks in jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1419070
# ATLAS multijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1394679
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1394679
# ATLAS jet charge
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1393758
# ATLAS transverse energy correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1609253
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1487277
# CMS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1421646
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1598460
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-6.in b/Tests/Rivet/LHC/LHC-8-Jets-6.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-6.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-6.in
@@ -1,17 +1,17 @@
# -*- ThePEG-repository -*-
# ATLAS tracks in jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1419070
# ATLAS multijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1394679
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1394679
# ATLAS jet charge
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1393758
# ATLAS transverse energy correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1609253
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1487277
# CMS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1421646
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1598460
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-7.in b/Tests/Rivet/LHC/LHC-8-Jets-7.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-7.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-7.in
@@ -1,19 +1,19 @@
# -*- ThePEG-repository -*-
# ATLAS tracks in jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1419070
# ATLAS multijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1394679
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1394679
# ATLAS jet charge
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1393758
# ATLAS transverse energy correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1609253
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1487277
# CMS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1421646
# CMS jet charge
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1605749
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1605749
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1598460
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-8.in b/Tests/Rivet/LHC/LHC-8-Jets-8.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-8.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-8.in
@@ -1,17 +1,17 @@
# -*- ThePEG-repository -*-
# ATLAS tracks in jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1419070
# ATLAS multijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1394679
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1394679
# ATLAS jet charge
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1393758
# ATLAS transverse energy correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1609253
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1487277
# CMS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1421646
# CMS jet charge
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1605749
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1605749
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1598460
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-9.in b/Tests/Rivet/LHC/LHC-8-Jets-9.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-9.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-9.in
@@ -1,19 +1,19 @@
# -*- ThePEG-repository -*-
# ATLAS tracks in jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1419070
# ATLAS multijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1394679
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1394679
# ATLAS jet charge
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1393758
# ATLAS transverse energy correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1609253
# CMS jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1487277
# CMS di-jet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1421646
# CMS jet charge
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1605749
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1605749
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1598460
diff --git a/Tests/Rivet/LHC/LHC-8-PromptPhoton.in b/Tests/Rivet/LHC/LHC-8-PromptPhoton.in
--- a/Tests/Rivet/LHC/LHC-8-PromptPhoton.in
+++ b/Tests/Rivet/LHC/LHC-8-PromptPhoton.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS prompt photon
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1457605
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1457605
# ATLAS prompt photon + heavy flavour
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1632756
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1632756
diff --git a/Tests/Rivet/LHC/LHC-8-Top-All.in b/Tests/Rivet/LHC/LHC-8-Top-All.in
--- a/Tests/Rivet/LHC/LHC-8-Top-All.in
+++ b/Tests/Rivet/LHC/LHC-8-Top-All.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS top
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1370682
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2015_I1370682
# ATLAS top + photon
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604029
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1604029
diff --git a/Tests/Rivet/LHC/LHC-8-Top-L.in b/Tests/Rivet/LHC/LHC-8-Top-L.in
--- a/Tests/Rivet/LHC/LHC-8-Top-L.in
+++ b/Tests/Rivet/LHC/LHC-8-Top-L.in
@@ -1,18 +1,18 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS top + b jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1390114
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1390114
# CMS
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1397174
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2015_I1397174
# ATLAS l +jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1397635
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1397635
# ATLAS charge asymmetry
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1449082
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1449082
# CMS diplepton charge asym
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1430892
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1430892
# CMS spin correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1413748
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1413748
# ATLAS lepton distributions
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1626105
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1626105
diff --git a/Tests/Rivet/LHC/LHC-8-Top-SL.in b/Tests/Rivet/LHC/LHC-8-Top-SL.in
--- a/Tests/Rivet/LHC/LHC-8-Top-SL.in
+++ b/Tests/Rivet/LHC/LHC-8-Top-SL.in
@@ -1,17 +1,17 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS pull in top events
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1376945
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1376945
# ATLAS top + b jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1390114
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1390114
# ATLAS boosted t tbar
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1397637
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1397637
# cms boosted top
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1454211
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1518399
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1454211
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1518399
# this cms ones has iffy lepton code which crashes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_PAS_TOP_15_006
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1404878
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1473674
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_PAS_TOP_15_006
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1404878
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1473674
diff --git a/Tests/Rivet/LHC/LHC-8-UE.in b/Tests/Rivet/LHC/LHC-8-UE.in
--- a/Tests/Rivet/LHC/LHC-8-UE.in
+++ b/Tests/Rivet/LHC/LHC-8-UE.in
@@ -1,16 +1,16 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS jet shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMSTOTEM_2014_I1294140
+insert /Herwig/Analysis/Rivet:Analyses 0 CMSTOTEM_2014_I1294140
# tack bassed min bias
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1426695
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1426695
# diffraction
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOTEM_2014_I1328627
+insert /Herwig/Analysis/Rivet:Analyses 0 TOTEM_2014_I1328627
# charge particle and charged particle jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1380605
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2015_I1380605
# ALICE neutral pions
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2017_I1620477
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2017_I1620477
# ATLAS single-diffractive
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1762584
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1762584
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-8-VBF-GammaGamma.in b/Tests/Rivet/LHC/LHC-8-VBF-GammaGamma.in
--- a/Tests/Rivet/LHC/LHC-8-VBF-GammaGamma.in
+++ b/Tests/Rivet/LHC/LHC-8-VBF-GammaGamma.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1306615
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1306615
do /Herwig/Particles/h0:SelectDecayModes h0->gamma,gamma;
diff --git a/Tests/Rivet/LHC/LHC-8-VBF-WW.in b/Tests/Rivet/LHC/LHC-8-VBF-WW.in
--- a/Tests/Rivet/LHC/LHC-8-VBF-WW.in
+++ b/Tests/Rivet/LHC/LHC-8-VBF-WW.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS gg -> H -> WW
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1444991
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1444991
# CMS H -> WW
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1467451
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1467451
do /Herwig/Particles/h0:SelectDecayModes h0->W+,W-;
diff --git a/Tests/Rivet/LHC/LHC-8-VBF-ZZ.in b/Tests/Rivet/LHC/LHC-8-VBF-ZZ.in
--- a/Tests/Rivet/LHC/LHC-8-VBF-ZZ.in
+++ b/Tests/Rivet/LHC/LHC-8-VBF-ZZ.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS gg -> H -> ZZ
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1310835
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1310835
do /Herwig/Particles/h0:SelectDecayModes h0->Z0,Z0;
diff --git a/Tests/Rivet/LHC/LHC-8-VBF.in b/Tests/Rivet/LHC/LHC-8-VBF.in
--- a/Tests/Rivet/LHC/LHC-8-VBF.in
+++ b/Tests/Rivet/LHC/LHC-8-VBF.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1364361
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1364361
set /Herwig/Particles/h0:Stable Stable
diff --git a/Tests/Rivet/LHC/LHC-8-W-e.in b/Tests/Rivet/LHC/LHC-8-W-e.in
--- a/Tests/Rivet/LHC/LHC-8-W-e.in
+++ b/Tests/Rivet/LHC/LHC-8-W-e.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS W+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1635273
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2018_I1635273
diff --git a/Tests/Rivet/LHC/LHC-8-W-mu.in b/Tests/Rivet/LHC/LHC-8-W-mu.in
--- a/Tests/Rivet/LHC/LHC-8-W-mu.in
+++ b/Tests/Rivet/LHC/LHC-8-W-mu.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS W+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1491953
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1471281
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1491953
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1471281
# LHCb W/Z analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2016_I1454404:MODE=WJET
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2016_I1454404:MODE=WJET
diff --git a/Tests/Rivet/LHC/LHC-8-WH-GammaGamma.in b/Tests/Rivet/LHC/LHC-8-WH-GammaGamma.in
--- a/Tests/Rivet/LHC/LHC-8-WH-GammaGamma.in
+++ b/Tests/Rivet/LHC/LHC-8-WH-GammaGamma.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1306615
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1306615
do /Herwig/Particles/h0:SelectDecayModes h0->gamma,gamma;
diff --git a/Tests/Rivet/LHC/LHC-8-WH-WW.in b/Tests/Rivet/LHC/LHC-8-WH-WW.in
--- a/Tests/Rivet/LHC/LHC-8-WH-WW.in
+++ b/Tests/Rivet/LHC/LHC-8-WH-WW.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS gg -> H -> WW
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1444991
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1444991
# CMS H -> WW
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1467451
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1467451
do /Herwig/Particles/h0:SelectDecayModes h0->W+,W-;
diff --git a/Tests/Rivet/LHC/LHC-8-WH-ZZ.in b/Tests/Rivet/LHC/LHC-8-WH-ZZ.in
--- a/Tests/Rivet/LHC/LHC-8-WH-ZZ.in
+++ b/Tests/Rivet/LHC/LHC-8-WH-ZZ.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS gg -> H -> ZZ
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1310835
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1310835
do /Herwig/Particles/h0:SelectDecayModes h0->Z0,Z0;
diff --git a/Tests/Rivet/LHC/LHC-8-WH.in b/Tests/Rivet/LHC/LHC-8-WH.in
--- a/Tests/Rivet/LHC/LHC-8-WH.in
+++ b/Tests/Rivet/LHC/LHC-8-WH.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1364361
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1364361
set /Herwig/Particles/h0:Stable Stable
diff --git a/Tests/Rivet/LHC/LHC-8-WW-ll.in b/Tests/Rivet/LHC/LHC-8-WW-ll.in
--- a/Tests/Rivet/LHC/LHC-8-WW-ll.in
+++ b/Tests/Rivet/LHC/LHC-8-WW-ll.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# general analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1426515
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1426515
diff --git a/Tests/Rivet/LHC/LHC-8-WZ.in b/Tests/Rivet/LHC/LHC-8-WZ.in
--- a/Tests/Rivet/LHC/LHC-8-WZ.in
+++ b/Tests/Rivet/LHC/LHC-8-WZ.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1426523
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1426523
# CMS
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487288
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1487288
diff --git a/Tests/Rivet/LHC/LHC-8-Z-b.in b/Tests/Rivet/LHC/LHC-8-Z-b.in
--- a/Tests/Rivet/LHC/LHC-8-Z-b.in
+++ b/Tests/Rivet/LHC/LHC-8-Z-b.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1499471
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1499471
diff --git a/Tests/Rivet/LHC/LHC-8-Z-bb.in b/Tests/Rivet/LHC/LHC-8-Z-bb.in
--- a/Tests/Rivet/LHC/LHC-8-Z-bb.in
+++ b/Tests/Rivet/LHC/LHC-8-Z-bb.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1499471
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1499471
diff --git a/Tests/Rivet/LHC/LHC-8-Z-e.in b/Tests/Rivet/LHC/LHC-8-Z-e.in
--- a/Tests/Rivet/LHC/LHC-8-Z-e.in
+++ b/Tests/Rivet/LHC/LHC-8-Z-e.in
@@ -1,19 +1,19 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS Z pT and phi*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516:LMODE=EL
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1631985:LMODE=EL
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1408516:LMODE=EL
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1631985:LMODE=EL
# ATLAS high mass drell-yan
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1467454:LMODE=EL
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1467454:LMODE=EL
# ATLAS splittings
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1589844:LMODE=EL
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1589844:LMODE=EL
# CMS Z+b
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1499471
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1499471
# ATLAS Z+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1744201
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2019_I1744201
# CMS Z + jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1497519
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1497519
# CMS Z+ charm
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1634835
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1634835
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-8-Z-jj.in b/Tests/Rivet/LHC/LHC-8-Z-jj.in
--- a/Tests/Rivet/LHC/LHC-8-Z-jj.in
+++ b/Tests/Rivet/LHC/LHC-8-Z-jj.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS Z + dijets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1279489
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1279489
diff --git a/Tests/Rivet/LHC/LHC-8-Z-mu.in b/Tests/Rivet/LHC/LHC-8-Z-mu.in
--- a/Tests/Rivet/LHC/LHC-8-Z-mu.in
+++ b/Tests/Rivet/LHC/LHC-8-Z-mu.in
@@ -1,21 +1,21 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS Z + dijets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1279489
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1631985:LMODE=MU
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1279489
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1631985:LMODE=MU
# ATLAS Z pT and phi*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516:LMODE=MU
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1408516:LMODE=MU
# ATLAS high mass drell-yan
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1467454:LMODE=MU
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1467454:LMODE=MU
# ATLAS splittings rivet problem with this at the moment)
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1589844:LMODE=MU
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2017_I1589844:LMODE=MU
# LHCb W/Z analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2016_I1454404:MODE=ZJET
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2016_I1454404:MODE=ZJET
# LHC W/Z spectrum
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1471281
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2016_I1471281
# CMS Z + jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1497519
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1497519
# CMS Z+ charm
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1634835
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1634835
diff --git a/Tests/Rivet/LHC/LHC-8-ZGamma-e.in b/Tests/Rivet/LHC/LHC-8-ZGamma-e.in
--- a/Tests/Rivet/LHC/LHC-8-ZGamma-e.in
+++ b/Tests/Rivet/LHC/LHC-8-ZGamma-e.in
@@ -1,3 +1,3 @@
# -*- ThePEG-repository -*-
# ATLAS Z Gamma analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1448301:LMODE=EL
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1448301:LMODE=EL
diff --git a/Tests/Rivet/LHC/LHC-8-ZGamma-mu.in b/Tests/Rivet/LHC/LHC-8-ZGamma-mu.in
--- a/Tests/Rivet/LHC/LHC-8-ZGamma-mu.in
+++ b/Tests/Rivet/LHC/LHC-8-ZGamma-mu.in
@@ -1,3 +1,3 @@
# -*- ThePEG-repository -*-
# ATLAS Z Gamma analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1448301:LMODE=MU
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1448301:LMODE=MU
diff --git a/Tests/Rivet/LHC/LHC-8-ZGamma-nu.in b/Tests/Rivet/LHC/LHC-8-ZGamma-nu.in
--- a/Tests/Rivet/LHC/LHC-8-ZGamma-nu.in
+++ b/Tests/Rivet/LHC/LHC-8-ZGamma-nu.in
@@ -1,3 +1,3 @@
# -*- ThePEG-repository -*-
# ATLAS Z Gamma analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1448301:LMODE=NU
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1448301:LMODE=NU
diff --git a/Tests/Rivet/LHC/LHC-8-ZH-GammaGamma.in b/Tests/Rivet/LHC/LHC-8-ZH-GammaGamma.in
--- a/Tests/Rivet/LHC/LHC-8-ZH-GammaGamma.in
+++ b/Tests/Rivet/LHC/LHC-8-ZH-GammaGamma.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1306615
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1306615
do /Herwig/Particles/h0:SelectDecayModes h0->gamma,gamma;
diff --git a/Tests/Rivet/LHC/LHC-8-ZH-WW.in b/Tests/Rivet/LHC/LHC-8-ZH-WW.in
--- a/Tests/Rivet/LHC/LHC-8-ZH-WW.in
+++ b/Tests/Rivet/LHC/LHC-8-ZH-WW.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS gg -> H -> WW
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1444991
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1444991
# CMS H -> WW
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1467451
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1467451
do /Herwig/Particles/h0:SelectDecayModes h0->W+,W-;
diff --git a/Tests/Rivet/LHC/LHC-8-ZH-ZZ.in b/Tests/Rivet/LHC/LHC-8-ZH-ZZ.in
--- a/Tests/Rivet/LHC/LHC-8-ZH-ZZ.in
+++ b/Tests/Rivet/LHC/LHC-8-ZH-ZZ.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS gg -> H -> ZZ
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1310835
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1310835
do /Herwig/Particles/h0:SelectDecayModes h0->Z0,Z0;
diff --git a/Tests/Rivet/LHC/LHC-8-ZH.in b/Tests/Rivet/LHC/LHC-8-ZH.in
--- a/Tests/Rivet/LHC/LHC-8-ZH.in
+++ b/Tests/Rivet/LHC/LHC-8-ZH.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1364361
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1364361
set /Herwig/Particles/h0:Stable Stable
diff --git a/Tests/Rivet/LHC/LHC-8-ZZ-lv.in b/Tests/Rivet/LHC/LHC-8-ZZ-lv.in
--- a/Tests/Rivet/LHC/LHC-8-ZZ-lv.in
+++ b/Tests/Rivet/LHC/LHC-8-ZZ-lv.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# general analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1298807
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1298807
# ATLAS 4l
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1494075
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1494075
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-8-ggH-GammaGamma.in b/Tests/Rivet/LHC/LHC-8-ggH-GammaGamma.in
--- a/Tests/Rivet/LHC/LHC-8-ggH-GammaGamma.in
+++ b/Tests/Rivet/LHC/LHC-8-ggH-GammaGamma.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1306615
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1306615
diff --git a/Tests/Rivet/LHC/LHC-8-ggH-WW.in b/Tests/Rivet/LHC/LHC-8-ggH-WW.in
--- a/Tests/Rivet/LHC/LHC-8-ggH-WW.in
+++ b/Tests/Rivet/LHC/LHC-8-ggH-WW.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS gg -> H -> WW
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1444991
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1444991
# CMS H -> WW
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1467451
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2017_I1467451
do /Herwig/Particles/h0:SelectDecayModes h0->W+,W-;
diff --git a/Tests/Rivet/LHC/LHC-8-ggH-ZZ.in b/Tests/Rivet/LHC/LHC-8-ggH-ZZ.in
--- a/Tests/Rivet/LHC/LHC-8-ggH-ZZ.in
+++ b/Tests/Rivet/LHC/LHC-8-ggH-ZZ.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS gg -> H -> ZZ
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1310835
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1310835
do /Herwig/Particles/h0:SelectDecayModes h0->Z0,Z0;
diff --git a/Tests/Rivet/LHC/LHC-8-ggH.in b/Tests/Rivet/LHC/LHC-8-ggH.in
--- a/Tests/Rivet/LHC/LHC-8-ggH.in
+++ b/Tests/Rivet/LHC/LHC-8-ggH.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1364361
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1364361
set /Herwig/Particles/h0:Stable Stable
diff --git a/Tests/Rivet/LHC/LHC-900-UE-Long.in b/Tests/Rivet/LHC/LHC-900-UE-Long.in
--- a/Tests/Rivet/LHC/LHC-900-UE-Long.in
+++ b/Tests/Rivet/LHC/LHC-900-UE-Long.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS K0s and Lambda
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I944826
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I944826
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-900-UE.in b/Tests/Rivet/LHC/LHC-900-UE.in
--- a/Tests/Rivet/LHC/LHC-900-UE.in
+++ b/Tests/Rivet/LHC/LHC-900-UE.in
@@ -1,50 +1,50 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I891834
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I891834
# ATLAS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I882098
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I882098
# ATLAS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I879407
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I879407
# ATLAS charged particles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I849050
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I849050
# ALICE charged particles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2010_I860416
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2010_I860416
# ALICE charged particles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2010_I852264
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2010_I852264
# ALICE charged particles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2010_I852450
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2010_I852450
# ALICE particle spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2011_I885104
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2011_I885104
# ALICE strange particle production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2011_I881474
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2011_I881474
# CMS particle spectra
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I890166
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I890166
# CMS charged particle multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I879315
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I879315
# CMS charged particle pT and rapidity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2010_I845323
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2010_I845323
# CMS UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I916908
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I916908
# LHCB k_s0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2010_I865584
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2010_I865584
# LHCB promt hadron production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2012_I1119400
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2012_I1119400
# CMS forward energy flow
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_I930319
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2011_I930319
# LHC K0s/Lambda
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2011_I917009
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2011_I917009
# ATLAS Azimuthal ordering of charged hadrons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1091481
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1091481
# ALICE single/double diffractive and inelastic sigma
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2012_I1181770
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2012_I1181770
# underlying event forward rapidities
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1218372
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1218372
# ATLAS correlations
-# insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1093734
+# insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1093734
# ALICE pion and eta pT
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2012_I1116147
+insert /Herwig/Analysis/Rivet:Analyses 0 ALICE_2012_I1116147
# CMS charged particle rapidity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2010_PAS_QCD_10_024
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2010_PAS_QCD_10_024
diff --git a/Tests/Rivet/LHC/LHC-VBF.in b/Tests/Rivet/LHC/LHC-VBF.in
--- a/Tests/Rivet/LHC/LHC-VBF.in
+++ b/Tests/Rivet/LHC/LHC-VBF.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_HJETS
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_HJETS
diff --git a/Tests/Rivet/LHC/LHC-W-b.in b/Tests/Rivet/LHC/LHC-W-b.in
--- a/Tests/Rivet/LHC/LHC-W-b.in
+++ b/Tests/Rivet/LHC/LHC-W-b.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1219109
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1219109
diff --git a/Tests/Rivet/LHC/LHC-W-e.in b/Tests/Rivet/LHC/LHC-W-e.in
--- a/Tests/Rivet/LHC/LHC-W-e.in
+++ b/Tests/Rivet/LHC/LHC-W-e.in
@@ -1,29 +1,29 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# general analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_WJETS
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_WPOL
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_WJETS
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_WPOL
# ATLAS W+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I882534
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I882534
# ATLAS W pT
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I925932
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I925932
# ATLAS W kT scales
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1217867
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1217867
# W DPI
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1216670
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1216670
# W +b
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1219109
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1219109
# ATLAS W
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I928289:MODE=W
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I928289:MODE=W
# ATLAS W+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1319490
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1319490:LMODE=EL
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1319490
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1319490:LMODE=EL
# ATLAS W+charm
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1282447
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1282447
# ATLAS W inclusive cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620:LMODE=WEL
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1502620:LMODE=WEL
# W/Z+ jets ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627:LMODE=EL
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1312627
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1312627:LMODE=EL
diff --git a/Tests/Rivet/LHC/LHC-W-mu.in b/Tests/Rivet/LHC/LHC-W-mu.in
--- a/Tests/Rivet/LHC/LHC-W-mu.in
+++ b/Tests/Rivet/LHC/LHC-W-mu.in
@@ -1,33 +1,33 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS W asymetry
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I892704
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I892704
# ATLAS W+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_I882534
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2010_I882534
# ATLAS W pT
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I925932
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I925932
# ATLAS W+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1083318
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1083318
# ATLAS W kT scales
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1217867
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1217867
# CMS double parton scattering
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1272853
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1272853
# W DPI
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1216670
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1216670
# CMS W+ jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1303894
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2014_I1303894
# ATLAS W
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I928289:MODE=W
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I928289:MODE=W
# ATLAS W+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1319490
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1319490:LMODE=MU
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1319490
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1319490:LMODE=MU
# W +b
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1219109
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1219109
# ATLAS W+charm
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1282447
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1282447
# ATLAS W inclusive cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620:LMODE=WMU
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1502620:LMODE=WMU
# ATLAS W/Z ratio
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627:LMODE=MU
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1312627:LMODE=MU
diff --git a/Tests/Rivet/LHC/LHC-WH.in b/Tests/Rivet/LHC/LHC-WH.in
--- a/Tests/Rivet/LHC/LHC-WH.in
+++ b/Tests/Rivet/LHC/LHC-WH.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_VH2BB
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_VH2BB
diff --git a/Tests/Rivet/LHC/LHC-WW-emu.in b/Tests/Rivet/LHC/LHC-WW-emu.in
--- a/Tests/Rivet/LHC/LHC-WW-emu.in
+++ b/Tests/Rivet/LHC/LHC-WW-emu.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# general analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_WWJETS
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_WWJETS
diff --git a/Tests/Rivet/LHC/LHC-WW-ll.in b/Tests/Rivet/LHC/LHC-WW-ll.in
--- a/Tests/Rivet/LHC/LHC-WW-ll.in
+++ b/Tests/Rivet/LHC/LHC-WW-ll.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# general analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1190187
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1190187
diff --git a/Tests/Rivet/LHC/LHC-WZ.in b/Tests/Rivet/LHC/LHC-WZ.in
--- a/Tests/Rivet/LHC/LHC-WZ.in
+++ b/Tests/Rivet/LHC/LHC-WZ.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# general analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I954993
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I954993
diff --git a/Tests/Rivet/LHC/LHC-Z-b.in b/Tests/Rivet/LHC/LHC-Z-b.in
--- a/Tests/Rivet/LHC/LHC-Z-b.in
+++ b/Tests/Rivet/LHC/LHC-Z-b.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1306294
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1306294
diff --git a/Tests/Rivet/LHC/LHC-Z-bb.in b/Tests/Rivet/LHC/LHC-Z-bb.in
--- a/Tests/Rivet/LHC/LHC-Z-bb.in
+++ b/Tests/Rivet/LHC/LHC-Z-bb.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1306294
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1306294
diff --git a/Tests/Rivet/LHC/LHC-Z-e.in b/Tests/Rivet/LHC/LHC-Z-e.in
--- a/Tests/Rivet/LHC/LHC-Z-e.in
+++ b/Tests/Rivet/LHC/LHC-Z-e.in
@@ -1,42 +1,42 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZINC
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZJETS
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_ZINC
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_ZJETS
# ATLAS pT
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I917931
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1300647
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I917931
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1300647
# ATLAS Z+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I945498
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1230812
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I945498
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1230812
# ATLAS phi*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1204784
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1204784
# CMS Z + b-hadron
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1256943
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1256943
# CMS Z pt and y
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I941555
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I941555
# ATLAS Z + bjets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1306294
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1306294
# ATLAS Z
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I928289:MODE=Z
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I928289:MODE=Z
# CMS Z AFB
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1122847
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1122847
# CMS Z+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1310737
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2015_I1310737
# ATLAS event shapes in Z events
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1424838
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1424838
# ATLAS forwrd backward
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1351916:LMODE=EL
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1351916:LMODE=EL
# ATLAS forward backward
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1234228
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2013_I1234228
# ATLAS Z inclusive cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620:LMODE=ZEL
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1502620:LMODE=ZEL
# W/Z+ jets ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627:LMODE=EL
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1312627
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1312627:LMODE=EL
# ATLAS Low mass Z
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1288706
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1288706
# LHC B med mass
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2012_I1208102
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2012_I1208102
diff --git a/Tests/Rivet/LHC/LHC-Z-mu-SOPHTY.in b/Tests/Rivet/LHC/LHC-Z-mu-SOPHTY.in
--- a/Tests/Rivet/LHC/LHC-Z-mu-SOPHTY.in
+++ b/Tests/Rivet/LHC/LHC-Z-mu-SOPHTY.in
@@ -1,9 +1,9 @@
# -*- ThePEG-repository -*-
# CMS photon radiation in Z decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1346843
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2015_I1346843
# delete the final-state splittings
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
# insert SOPHTY
insert /Herwig/Generators/EventGenerator:EventHandler:PostSubProcessHandlers 0 /Herwig/QEDRadiation/QEDRadiationHandler
diff --git a/Tests/Rivet/LHC/LHC-Z-mu-Short.in b/Tests/Rivet/LHC/LHC-Z-mu-Short.in
--- a/Tests/Rivet/LHC/LHC-Z-mu-Short.in
+++ b/Tests/Rivet/LHC/LHC-Z-mu-Short.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS underlying event in Z events
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1107658
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I1107658
diff --git a/Tests/Rivet/LHC/LHC-Z-mu.in b/Tests/Rivet/LHC/LHC-Z-mu.in
--- a/Tests/Rivet/LHC/LHC-Z-mu.in
+++ b/Tests/Rivet/LHC/LHC-Z-mu.in
@@ -1,39 +1,39 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS Z pt
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I917931
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1300647
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I917931
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1300647
# ATLAS Z+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I945498
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I945498
# ATLAS phi*
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1204784
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1204784
# Z and real photon + jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1258128
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1258128
# CMS Z + b-hadron
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1256943
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1256943
# CMS Z pt and y
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I941555
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2012_I941555
# ATLAS MPI in Z events
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1315949
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1315949
# ATLAS Z
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I928289:MODE=Z
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2011_I928289:MODE=Z
# CMS Z AFB
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1122847
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2013_I1122847
# CMS Z+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1310737
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2015_I1310737
# ATLAS event shapes in Z events
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1424838
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1424838
# CMS photon radiation in Z decays
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1346843
+insert /Herwig/Analysis/Rivet:Analyses 0 CMS_2015_I1346843
# ATLAS forwrd backward
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1351916:LMODE=MU
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2015_I1351916:LMODE=MU
# LHCB forward Z+jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2014_I1262703
+insert /Herwig/Analysis/Rivet:Analyses 0 LHCB_2014_I1262703
# ATLAS Z inclusive cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620:LMODE=ZMU
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2016_I1502620:LMODE=ZMU
# ATLAS W/Z ratio
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627:LMODE=MU
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1312627:LMODE=MU
# ATLAS Low mass Z
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1288706
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2014_I1288706
diff --git a/Tests/Rivet/LHC/LHC-ZH.in b/Tests/Rivet/LHC/LHC-ZH.in
--- a/Tests/Rivet/LHC/LHC-ZH.in
+++ b/Tests/Rivet/LHC/LHC-ZH.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_VH2BB
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_VH2BB
diff --git a/Tests/Rivet/LHC/LHC-ZZ-ll.in b/Tests/Rivet/LHC/LHC-ZZ-ll.in
--- a/Tests/Rivet/LHC/LHC-ZZ-ll.in
+++ b/Tests/Rivet/LHC/LHC-ZZ-ll.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# general analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZZJETS
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_ZZJETS
diff --git a/Tests/Rivet/LHC/LHC-ZZ-lv.in b/Tests/Rivet/LHC/LHC-ZZ-lv.in
--- a/Tests/Rivet/LHC/LHC-ZZ-lv.in
+++ b/Tests/Rivet/LHC/LHC-ZZ-lv.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# general analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1203852
+insert /Herwig/Analysis/Rivet:Analyses 0 ATLAS_2012_I1203852
diff --git a/Tests/Rivet/LHC/LHC-ggH.in b/Tests/Rivet/LHC/LHC-ggH.in
--- a/Tests/Rivet/LHC/LHC-ggH.in
+++ b/Tests/Rivet/LHC/LHC-ggH.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_HJETS
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_HINC
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_HJETS
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_HINC
diff --git a/Tests/Rivet/LHC/LHC-ggHJet.in b/Tests/Rivet/LHC/LHC-ggHJet.in
--- a/Tests/Rivet/LHC/LHC-ggHJet.in
+++ b/Tests/Rivet/LHC/LHC-ggHJet.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# General analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_HJETS
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_HJETS
diff --git a/Tests/Rivet/SPS/EHS-UE.in b/Tests/Rivet/SPS/EHS-UE.in
--- a/Tests/Rivet/SPS/EHS-UE.in
+++ b/Tests/Rivet/SPS/EHS-UE.in
@@ -1,3 +1,3 @@
# -*- ThePEG-repository -*-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 EHS_1988_I265504
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 NA22_1986_I18431
+insert /Herwig/Analysis/Rivet:Analyses 0 EHS_1988_I265504
+insert /Herwig/Analysis/Rivet:Analyses 0 NA22_1986_I18431
diff --git a/Tests/Rivet/SPS/SPS-17.4-UE.in b/Tests/Rivet/SPS/SPS-17.4-UE.in
--- a/Tests/Rivet/SPS/SPS-17.4-UE.in
+++ b/Tests/Rivet/SPS/SPS-17.4-UE.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 NA49_2006_I694016
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 NA49_2009_I818217
+insert /Herwig/Analysis/Rivet:Analyses 0 NA49_2006_I694016
+insert /Herwig/Analysis/Rivet:Analyses 0 NA49_2009_I818217
diff --git a/Tests/Rivet/SPS/SPS-200-Z-mu.in b/Tests/Rivet/SPS/SPS-200-Z-mu.in
--- a/Tests/Rivet/SPS/SPS-200-Z-mu.in
+++ b/Tests/Rivet/SPS/SPS-200-Z-mu.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PHENIX_2019_I1672015
+insert /Herwig/Analysis/Rivet:Analyses 0 PHENIX_2019_I1672015
diff --git a/Tests/Rivet/SppS/SppS-200-UE.in b/Tests/Rivet/SppS/SppS-200-UE.in
--- a/Tests/Rivet/SppS/SppS-200-UE.in
+++ b/Tests/Rivet/SppS/SppS-200-UE.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1989_I267179
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1988_I263399
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA1_1990_I280412
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1986_I233599
+insert /Herwig/Analysis/Rivet:Analyses 0 UA5_1989_I267179
+insert /Herwig/Analysis/Rivet:Analyses 0 UA5_1988_I263399
+insert /Herwig/Analysis/Rivet:Analyses 0 UA1_1990_I280412
+insert /Herwig/Analysis/Rivet:Analyses 0 UA5_1986_I233599
diff --git a/Tests/Rivet/SppS/SppS-500-UE.in b/Tests/Rivet/SppS/SppS-500-UE.in
--- a/Tests/Rivet/SppS/SppS-500-UE.in
+++ b/Tests/Rivet/SppS/SppS-500-UE.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA1_1990_I280412
+insert /Herwig/Analysis/Rivet:Analyses 0 UA1_1990_I280412
diff --git a/Tests/Rivet/SppS/SppS-53-UE.in b/Tests/Rivet/SppS/SppS-53-UE.in
--- a/Tests/Rivet/SppS/SppS-53-UE.in
+++ b/Tests/Rivet/SppS/SppS-53-UE.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1982_I176647
+insert /Herwig/Analysis/Rivet:Analyses 0 UA5_1982_I176647
diff --git a/Tests/Rivet/SppS/SppS-546-UE.in b/Tests/Rivet/SppS/SppS-546-UE.in
--- a/Tests/Rivet/SppS/SppS-546-UE.in
+++ b/Tests/Rivet/SppS/SppS-546-UE.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1988_I263399
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1987_I244829
+insert /Herwig/Analysis/Rivet:Analyses 0 UA5_1988_I263399
+insert /Herwig/Analysis/Rivet:Analyses 0 UA5_1987_I244829
diff --git a/Tests/Rivet/SppS/SppS-63-UE.in b/Tests/Rivet/SppS/SppS-63-UE.in
--- a/Tests/Rivet/SppS/SppS-63-UE.in
+++ b/Tests/Rivet/SppS/SppS-63-UE.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
######################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA1_1990_I280412
+insert /Herwig/Analysis/Rivet:Analyses 0 UA1_1990_I280412
diff --git a/Tests/Rivet/SppS/SppS-900-UE.in b/Tests/Rivet/SppS/SppS-900-UE.in
--- a/Tests/Rivet/SppS/SppS-900-UE.in
+++ b/Tests/Rivet/SppS/SppS-900-UE.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1989_I267179
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1988_I263399
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA1_1990_I280412
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 UA5_1986_I233599
+insert /Herwig/Analysis/Rivet:Analyses 0 UA5_1989_I267179
+insert /Herwig/Analysis/Rivet:Analyses 0 UA5_1988_I263399
+insert /Herwig/Analysis/Rivet:Analyses 0 UA1_1990_I280412
+insert /Herwig/Analysis/Rivet:Analyses 0 UA5_1986_I233599
diff --git a/Tests/Rivet/Star/Star-Jets-1.in b/Tests/Rivet/Star/Star-Jets-1.in
--- a/Tests/Rivet/Star/Star-Jets-1.in
+++ b/Tests/Rivet/Star/Star-Jets-1.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2006_I723509
+insert /Herwig/Analysis/Rivet:Analyses 0 STAR_2006_I723509
diff --git a/Tests/Rivet/Star/Star-Jets-2.in b/Tests/Rivet/Star/Star-Jets-2.in
--- a/Tests/Rivet/Star/Star-Jets-2.in
+++ b/Tests/Rivet/Star/Star-Jets-2.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2009_UE_HELEN
+insert /Herwig/Analysis/Rivet:Analyses 0 STAR_2009_UE_HELEN
diff --git a/Tests/Rivet/Star/Star-Jets-3.in b/Tests/Rivet/Star/Star-Jets-3.in
--- a/Tests/Rivet/Star/Star-Jets-3.in
+++ b/Tests/Rivet/Star/Star-Jets-3.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2006_I723509
+insert /Herwig/Analysis/Rivet:Analyses 0 STAR_2006_I723509
diff --git a/Tests/Rivet/Star/Star-Jets-4.in b/Tests/Rivet/Star/Star-Jets-4.in
--- a/Tests/Rivet/Star/Star-Jets-4.in
+++ b/Tests/Rivet/Star/Star-Jets-4.in
@@ -1,5 +1,5 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2009_UE_HELEN
+insert /Herwig/Analysis/Rivet:Analyses 0 STAR_2009_UE_HELEN
diff --git a/Tests/Rivet/Star/Star-UE.in b/Tests/Rivet/Star/Star-UE.in
--- a/Tests/Rivet/Star/Star-UE.in
+++ b/Tests/Rivet/Star/Star-UE.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2006_I709170
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2006_I722757
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2006_I723509
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2008_I793126
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2009_UE_HELEN
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2014_I1253360
+insert /Herwig/Analysis/Rivet:Analyses 0 STAR_2006_I709170
+insert /Herwig/Analysis/Rivet:Analyses 0 STAR_2006_I722757
+insert /Herwig/Analysis/Rivet:Analyses 0 STAR_2006_I723509
+insert /Herwig/Analysis/Rivet:Analyses 0 STAR_2008_I793126
+insert /Herwig/Analysis/Rivet:Analyses 0 STAR_2009_UE_HELEN
+insert /Herwig/Analysis/Rivet:Analyses 0 STAR_2014_I1253360
diff --git a/Tests/Rivet/TVT/TVT-300-Jets.in b/Tests/Rivet/TVT/TVT-300-Jets.in
--- a/Tests/Rivet/TVT/TVT-300-Jets.in
+++ b/Tests/Rivet/TVT/TVT-300-Jets.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# run I CDF UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2012_NOTE10874
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2012_NOTE10874
diff --git a/Tests/Rivet/TVT/TVT-300-UE.in b/Tests/Rivet/TVT/TVT-300-UE.in
--- a/Tests/Rivet/TVT/TVT-300-UE.in
+++ b/Tests/Rivet/TVT/TVT-300-UE.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2012_NOTE10874
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2015_I1388868
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2012_NOTE10874
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2015_I1388868
diff --git a/Tests/Rivet/TVT/TVT-630-Jets.in b/Tests/Rivet/TVT/TVT-630-Jets.in
--- a/Tests/Rivet/TVT/TVT-630-Jets.in
+++ b/Tests/Rivet/TVT/TVT-630-Jets.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# run I CDF UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2004_I647490
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2004_I647490
\ No newline at end of file
diff --git a/Tests/Rivet/TVT/TVT-630-UE.in b/Tests/Rivet/TVT/TVT-630-UE.in
--- a/Tests/Rivet/TVT/TVT-630-UE.in
+++ b/Tests/Rivet/TVT/TVT-630-UE.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1988_I263320
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1990_I283352
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2002_I567774
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2004_I647490
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_1988_I263320
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_1990_I283352
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2002_I567774
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2004_I647490
diff --git a/Tests/Rivet/TVT/TVT-900-Jets.in b/Tests/Rivet/TVT/TVT-900-Jets.in
--- a/Tests/Rivet/TVT/TVT-900-Jets.in
+++ b/Tests/Rivet/TVT/TVT-900-Jets.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# run I CDF UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2012_NOTE10874
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2012_NOTE10874
diff --git a/Tests/Rivet/TVT/TVT-900-UE.in b/Tests/Rivet/TVT/TVT-900-UE.in
--- a/Tests/Rivet/TVT/TVT-900-UE.in
+++ b/Tests/Rivet/TVT/TVT-900-UE.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2012_NOTE10874
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2015_I1388868
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2012_NOTE10874
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2015_I1388868
diff --git a/Tests/Rivet/TVT/TVT-Run-I-DiJets.in b/Tests/Rivet/TVT/TVT-Run-I-DiJets.in
--- a/Tests/Rivet/TVT/TVT-Run-I-DiJets.in
+++ b/Tests/Rivet/TVT/TVT-Run-I-DiJets.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# run I CDF di jet angles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1996_I423414
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_1996_I423414
# run I CDF di jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2000_I511377
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2000_I511377
diff --git a/Tests/Rivet/TVT/TVT-Run-I-Jets.in b/Tests/Rivet/TVT/TVT-Run-I-Jets.in
--- a/Tests/Rivet/TVT/TVT-Run-I-Jets.in
+++ b/Tests/Rivet/TVT/TVT-Run-I-Jets.in
@@ -1,28 +1,28 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# run I CDF di jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2001_I538041
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2001_I538041
# run I CDF inclusive jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2001_I552797
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2001_I552797
# run I CDF UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2004_I647490
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2004_I647490
# run I CDF UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2001_I564673
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2001_I564673
# run I D0 dijet decorrelation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_1996_I416886
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_1996_I416886
# run I D0 jet shape
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_1995_I398175
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_1995_I398175
# run I CDF large total ET
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1998_I448075
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_1998_I448075
# run I coherence
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1994_I374155
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_1994_I374155
# run I D0 3 and 4 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_1996_I399364
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_1996_I399364
# run I CDF multijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1996_I393345
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_1996_I393345
# run I CDF multijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1996_I418504
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_1996_I418504
# run I CDF 6 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1997_I442265
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_1997_I442265
diff --git a/Tests/Rivet/TVT/TVT-Run-I-PromptPhoton.in b/Tests/Rivet/TVT/TVT-Run-I-PromptPhoton.in
--- a/Tests/Rivet/TVT/TVT-Run-I-PromptPhoton.in
+++ b/Tests/Rivet/TVT/TVT-Run-I-PromptPhoton.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CDF Run I prompt photon
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1993_I354237
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_1993_I354237
diff --git a/Tests/Rivet/TVT/TVT-Run-I-UE.in b/Tests/Rivet/TVT/TVT-Run-I-UE.in
--- a/Tests/Rivet/TVT/TVT-Run-I-UE.in
+++ b/Tests/Rivet/TVT/TVT-Run-I-UE.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1988_I263320
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1990_I283352
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2001_I564673
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2002_I567774
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2004_I647490
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 E735_1998_I480349
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_1988_I263320
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_1990_I283352
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2001_I564673
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2002_I567774
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2004_I647490
+insert /Herwig/Analysis/Rivet:Analyses 0 E735_1998_I480349
diff --git a/Tests/Rivet/TVT/TVT-Run-I-W.in b/Tests/Rivet/TVT/TVT-Run-I-W.in
--- a/Tests/Rivet/TVT/TVT-Run-I-W.in
+++ b/Tests/Rivet/TVT/TVT-Run-I-W.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CDF Run I W pT corrections and normalization are CRAP
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1991_S2313472
+#insert /Herwig/Analysis/Rivet:Analyses 0 CDF_1991_S2313472
# D0 Run I W pT corrections and normalization are CRAP
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_1998_S3711838
+#insert /Herwig/Analysis/Rivet:Analyses 0 D0_1998_S3711838
# D0 Run I W pT
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2000_I535017
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2000_I535017
diff --git a/Tests/Rivet/TVT/TVT-Run-I-WZ.in b/Tests/Rivet/TVT/TVT-Run-I-WZ.in
--- a/Tests/Rivet/TVT/TVT-Run-I-WZ.in
+++ b/Tests/Rivet/TVT/TVT-Run-I-WZ.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# D0 Run I W/Z pT
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2001_I559624
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2001_I559624
diff --git a/Tests/Rivet/TVT/TVT-Run-I-Z.in b/Tests/Rivet/TVT/TVT-Run-I-Z.in
--- a/Tests/Rivet/TVT/TVT-Run-I-Z.in
+++ b/Tests/Rivet/TVT/TVT-Run-I-Z.in
@@ -1,7 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CDF Run I Z pT
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2000_I505738
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2000_I503361
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2000_I505738
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2000_I503361
diff --git a/Tests/Rivet/TVT/TVT-Run-II-DiJets.in b/Tests/Rivet/TVT/TVT-Run-II-DiJets.in
--- a/Tests/Rivet/TVT/TVT-Run-II-DiJets.in
+++ b/Tests/Rivet/TVT/TVT-Run-II-DiJets.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# D0 dijet invariant mass
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2010_I846483
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2010_I846483
# D0 dijet angles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2009_I824127
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2009_I824127
# CDF dijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_I805902
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2008_I805902
diff --git a/Tests/Rivet/TVT/TVT-Run-II-DiPhoton.in b/Tests/Rivet/TVT/TVT-Run-II-DiPhoton.in
--- a/Tests/Rivet/TVT/TVT-Run-II-DiPhoton.in
+++ b/Tests/Rivet/TVT/TVT-Run-II-DiPhoton.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CDF Run II diphotons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2005_I667384
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2005_I667384
# D0 Run II diphotons
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2010_I846997
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2010_I846997
diff --git a/Tests/Rivet/TVT/TVT-Run-II-Jets.in b/Tests/Rivet/TVT/TVT-Run-II-Jets.in
--- a/Tests/Rivet/TVT/TVT-Run-II-Jets.in
+++ b/Tests/Rivet/TVT/TVT-Run-II-Jets.in
@@ -1,21 +1,21 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CDF jet shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2012_NOTE10874
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2012_NOTE10874
# MPI
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2010_I849042:MODE=QCD
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2010_I849042:MODE=QCD
# CDF jet shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2005_I682179
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2005_I682179
# CDF inclusive jet kt
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2007_I743342
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2007_I743342
# CDF inclusive jet cone
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_I699933
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_I790693
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2006_I699933
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2008_I790693
# dijet decorrelations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2004_I659398
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2004_I659398
# inclusive jet cross section
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_I779574
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2008_I779574
# D0 three-jets analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2011_I895662
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2011_I895662
diff --git a/Tests/Rivet/TVT/TVT-Run-II-PromptPhoton.in b/Tests/Rivet/TVT/TVT-Run-II-PromptPhoton.in
--- a/Tests/Rivet/TVT/TVT-Run-II-PromptPhoton.in
+++ b/Tests/Rivet/TVT/TVT-Run-II-PromptPhoton.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CDF Run II prompt photon
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_I834437
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2009_I834437
# DO Run II prompt photon
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2006_I698784
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2006_I698784
# DO Run II prompt photon
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_I782968
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2008_I782968
diff --git a/Tests/Rivet/TVT/TVT-Run-II-UE.in b/Tests/Rivet/TVT/TVT-Run-II-UE.in
--- a/Tests/Rivet/TVT/TVT-Run-II-UE.in
+++ b/Tests/Rivet/TVT/TVT-Run-II-UE.in
@@ -1,12 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# run II UE analysis
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2010_I849042:MODE=QCD
+#insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2008_LEADINGJETS
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2010_I849042:MODE=QCD
# run II charged multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_NOTE_9936
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_I817466
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2012_NOTE10874
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2015_I1388868
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2009_NOTE_9936
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2009_I817466
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2012_NOTE10874
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2015_I1388868
diff --git a/Tests/Rivet/TVT/TVT-Run-II-W.in b/Tests/Rivet/TVT/TVT-Run-II-W.in
--- a/Tests/Rivet/TVT/TVT-Run-II-W.in
+++ b/Tests/Rivet/TVT/TVT-Run-II-W.in
@@ -1,8 +1,8 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# D0 Run II charge asymmetry
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_I791230
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2008_I791230
# CDF Run II W+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_I768579
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2008_I768579
diff --git a/Tests/Rivet/TVT/TVT-Run-II-Z-HighMass-mu.in b/Tests/Rivet/TVT/TVT-Run-II-Z-HighMass-mu.in
--- a/Tests/Rivet/TVT/TVT-Run-II-Z-HighMass-mu.in
+++ b/Tests/Rivet/TVT/TVT-Run-II-Z-HighMass-mu.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# D0 run II phi star
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2015_I1324946
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2015_I1324946
diff --git a/Tests/Rivet/TVT/TVT-Run-II-Z-LowMass-mu.in b/Tests/Rivet/TVT/TVT-Run-II-Z-LowMass-mu.in
--- a/Tests/Rivet/TVT/TVT-Run-II-Z-LowMass-mu.in
+++ b/Tests/Rivet/TVT/TVT-Run-II-Z-LowMass-mu.in
@@ -1,6 +1,6 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# D0 run II phi star
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2015_I1324946
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2015_I1324946
diff --git a/Tests/Rivet/TVT/TVT-Run-II-Z-e.in b/Tests/Rivet/TVT/TVT-Run-II-Z-e.in
--- a/Tests/Rivet/TVT/TVT-Run-II-Z-e.in
+++ b/Tests/Rivet/TVT/TVT-Run-II-Z-e.in
@@ -1,22 +1,22 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CDF Run II Z+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_I768451
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2008_I768451
# CDF Z+b jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_I806082
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2008_I806082
# CDF Run II Z cross section and rapidity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_I856131
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2009_I856131
# D0 Run II Z cross section and rapidity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2007_I744624
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2007_I744624
# D0 Run II jet ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_I724239
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2008_I724239
# D0 Run II
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_I769689
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2008_I769689
# D0 Run II
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2009_I815094
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2009_I815094
# D0 run II
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2010_I871787
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2010_I871787
# CDF run II Z pT
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2012_I1124333
\ No newline at end of file
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2012_I1124333
\ No newline at end of file
diff --git a/Tests/Rivet/TVT/TVT-Run-II-Z-mu.in b/Tests/Rivet/TVT/TVT-Run-II-Z-mu.in
--- a/Tests/Rivet/TVT/TVT-Run-II-Z-mu.in
+++ b/Tests/Rivet/TVT/TVT-Run-II-Z-mu.in
@@ -1,22 +1,22 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# D0 run II Z pT
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2010_I856972
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2010_I856972
# CDF Z+b jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_I806082
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2008_I806082
# CDF Z+b jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_I717572
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2006_I717572
# CDF underlying event
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_NOTE_9351
+#insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2008_NOTE_9351
# D0 Run II
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2009_I826756
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2009_I826756
# D0 Run II
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_I792812
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2008_I792812
# D0 run II
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2010_I871787
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2010_I871787
# D0 run II UE
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2010_I849042:MODE=DY
+insert /Herwig/Analysis/Rivet:Analyses 0 CDF_2010_I849042:MODE=DY
# D0 run II phi star
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2015_I1324946
+insert /Herwig/Analysis/Rivet:Analyses 0 D0_2015_I1324946
diff --git a/Tests/Rivet/Templates/DIS-Matchbox.in b/Tests/Rivet/Templates/DIS-Matchbox.in
--- a/Tests/Rivet/Templates/DIS-Matchbox.in
+++ b/Tests/Rivet/Templates/DIS-Matchbox.in
@@ -1,55 +1,54 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
## Herwig/Matchbox example input file
##################################################
##################################################
## Collider type
##################################################
read snippets/Matchbox.in
read snippets/EPCollider.in
##################################################
## 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
set Factory:ScaleChoice /Herwig/MatrixElements/Matchbox/Scales/LeptonQ2Scale
${shower}
${bscheme}
read Matchbox/CT14.in
do /Herwig/MatrixElements/Matchbox/Factory:ProductionMode
# switch off initial state QED radiation
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
# create the Rivet analysis
-create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-insert /Herwig/Generators/EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+read snippets/Rivet.in
${parameterFile}
## Select the process
cd /Herwig/MatrixElements/Matchbox
${process}
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/DIS-Merging.in b/Tests/Rivet/Templates/DIS-Merging.in
--- a/Tests/Rivet/Templates/DIS-Merging.in
+++ b/Tests/Rivet/Templates/DIS-Merging.in
@@ -1,65 +1,64 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
## Herwig/Matchbox example input file
##################################################
##################################################
## Collider type
##################################################
read snippets/DipoleMerging.in
read snippets/EPCollider.in
read snippets/MonacoSampler.in
##################################################
## 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
read Matchbox/MadGraph-OpenLoops.in
set /Herwig/Merging/MergingFactory:OrderInAlphaS 0
set /Herwig/Merging/MergingFactory:OrderInAlphaEW 2
set /Herwig/Merging/MergingFactory:ScaleChoice /Herwig/MatrixElements/Matchbox/Scales/LeptonQ2Scale
##################################################
## PDF and AlphaS choice
##################################################
read Matchbox/FiveFlavourNoBMassScheme.in
read Matchbox/CT14.in
set /Herwig/Couplings/NLOAlphaS:input_alpha_s 0.118
read Merging/FactorCMWScheme.in
# switch off initial state QED radiation
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
# create the Rivet analysis
-create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-insert /Herwig/Generators/EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+read snippets/Rivet.in
${parameterFile}
## Select the process
cd /Herwig/Merging/
set Merger:MergingScale 10.*GeV
${process}
do /Herwig/Merging/MergingFactory:ProductionMode
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/DIS-Powheg.in b/Tests/Rivet/Templates/DIS-Powheg.in
--- a/Tests/Rivet/Templates/DIS-Powheg.in
+++ b/Tests/Rivet/Templates/DIS-Powheg.in
@@ -1,47 +1,46 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
# Example generator based on DIS parameters
# usage: Herwig read DIS.in
##################################################
read snippets/EPCollider.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/HardNLOPDF
set /Herwig/Particles/pbar-:PDF /Herwig/Partons/HardNLOPDF
set /Herwig/Shower/ShowerHandler:PDFB /Herwig/Partons/ShowerLOPDF
set /Herwig/Partons/MPIExtractor:SecondPDF /Herwig/Partons/MPIPDF
set /Herwig/Partons/EPExtractor:SecondPDF /Herwig/Partons/HardNLOPDF
##################################################
# Setup the POWHEG shower
##################################################
cd /Herwig/Shower
set ShowerHandler:IntrinsicPtGaussian 1.9*GeV
set ShowerHandler:HardEmission POWHEG
cd /Herwig/MatrixElements/
# Neutral current DIS
${process}
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
set /Herwig/Shower/ShowerHandler:MPIHandler NULL
cd /Herwig/Generators
-create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+read snippets/Rivet.in
${parameterFile}
##################################################
# Save run for later usage with 'Herwig run'
##################################################
cd /Herwig/Generators
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/DIS.in b/Tests/Rivet/Templates/DIS.in
--- a/Tests/Rivet/Templates/DIS.in
+++ b/Tests/Rivet/Templates/DIS.in
@@ -1,43 +1,42 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
# Example generator based on DIS parameters
# usage: Herwig read DIS.in
##################################################
read snippets/EPCollider.in
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
##################################################
## Shower and flavour scheme selection.
## Should be empty unless using the Dipole Shower.
##################################################
${shower}
${bscheme}
cd /Herwig/MatrixElements/
# Neutral current DIS
${process}
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
set /Herwig/Shower/ShowerHandler:MPIHandler NULL
set /Herwig/DipoleShower/DipoleShowerHandler:MPIHandler NULL
cd /Herwig/Generators
-create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+read snippets/Rivet.in
${parameterFile}
##################################################
# Save run for later usage with 'Herwig run'
##################################################
cd /Herwig/Generators
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/EE-Gamma-Direct.in b/Tests/Rivet/Templates/EE-Gamma-Direct.in
--- a/Tests/Rivet/Templates/EE-Gamma-Direct.in
+++ b/Tests/Rivet/Templates/EE-Gamma-Direct.in
@@ -1,46 +1,44 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
# base parameters for LEP analyses
##################################################
read snippets/EECollider.in
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
##################################################
# Switch off ISR
##################################################
set /Herwig/Particles/e+:PDF /Herwig/Partons/WWPDF
set /Herwig/Particles/e-:PDF /Herwig/Partons/WWPDF
##################################################
## Shower and scheme selection.
## Should be empty unless using the Dipole Shower.
##################################################
${shower}
##################################################
# Create the Herwig analysis
##################################################
cd /Herwig/Generators
-create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
-
+read snippets/Rivet.in
##################################################
# Use the q qbar matrix element
##################################################
# default e+e- > q qbar (5 flavours d,u,s,c,b)
${process}
set /Herwig/Shower/PartnerFinder:QEDPartner IIandFF
${parameterFile}
##################################################
# Save run for later usage with 'Herwig run'
##################################################
cd /Herwig/Generators
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/EE-Gamma-Double-Resolved.in b/Tests/Rivet/Templates/EE-Gamma-Double-Resolved.in
--- a/Tests/Rivet/Templates/EE-Gamma-Double-Resolved.in
+++ b/Tests/Rivet/Templates/EE-Gamma-Double-Resolved.in
@@ -1,47 +1,45 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
# base parameters for LEP analyses
##################################################
read snippets/EECollider.in
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
##################################################
# Switch off ISR
##################################################
set /Herwig/Particles/e+:PDF /Herwig/Partons/WWPDF
set /Herwig/Particles/e-:PDF /Herwig/Partons/WWPDF
set /Herwig/Particles/gamma:PDF /Herwig/Partons/SaSPDF
##################################################
## Shower and scheme selection.
## Should be empty unless using the Dipole Shower.
##################################################
${shower}
##################################################
# Create the Herwig analysis
##################################################
cd /Herwig/Generators
-create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
-
+read snippets/Rivet.in
##################################################
# Use the q qbar matrix element
##################################################
# default e+e- > q qbar (5 flavours d,u,s,c,b)
${process}
set /Herwig/Shower/PartnerFinder:QEDPartner All
${parameterFile}
##################################################
# Save run for later usage with 'Herwig run'
##################################################
cd /Herwig/Generators
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/EE-Gamma-Single-Resolved.in b/Tests/Rivet/Templates/EE-Gamma-Single-Resolved.in
--- a/Tests/Rivet/Templates/EE-Gamma-Single-Resolved.in
+++ b/Tests/Rivet/Templates/EE-Gamma-Single-Resolved.in
@@ -1,72 +1,70 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
# base parameters for LEP analyses
##################################################
read snippets/EECollider.in
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
##################################################
# Select the PDFs
##################################################
set /Herwig/Particles/e+:PDF /Herwig/Partons/WWPDF
set /Herwig/Particles/e-:PDF /Herwig/Partons/WWPDF
set /Herwig/Particles/gamma:PDF /Herwig/Partons/SaSPDF
DISABLEREADONLY
create Herwig::MultiPartonExtractor /Herwig/Partons/GGExtractor HwPartonExtractor.so
newdef /Herwig/Partons/GGExtractor:NoPDF /Herwig/Partons/NoPDF
insert /Herwig/Partons/GGExtractor:FirstPDFs 0 /Herwig/Partons/WWPDF
insert /Herwig/Partons/GGExtractor:FirstPDFs 1 /Herwig/Partons/SaSPDF
insert /Herwig/Partons/GGExtractor:SecondPDFs 0 /Herwig/Partons/WWPDF
insert /Herwig/Partons/GGExtractor:SecondPDFs 1 /Herwig/Partons/NoPDF
create Herwig::MultiPartonExtractor /Herwig/Partons/GG2Extractor HwPartonExtractor.so
newdef /Herwig/Partons/GG2Extractor:NoPDF /Herwig/Partons/NoPDF
insert /Herwig/Partons/GG2Extractor:FirstPDFs 0 /Herwig/Partons/WWPDF
insert /Herwig/Partons/GG2Extractor:FirstPDFs 1 /Herwig/Partons/NoPDF
insert /Herwig/Partons/GG2Extractor:SecondPDFs 0 /Herwig/Partons/WWPDF
insert /Herwig/Partons/GG2Extractor:SecondPDFs 1 /Herwig/Partons/SaSPDF
set /Herwig/MatrixElements/SubProcess:PartonExtractor /Herwig/Partons/GGExtractor
cp /Herwig/MatrixElements/SubProcess /Herwig/MatrixElements/SubProcess2
set /Herwig/MatrixElements/SubProcess2:PartonExtractor /Herwig/Partons/GG2Extractor
insert /Herwig/Generators/EventGenerator:EventHandler:SubProcessHandlers 1 /Herwig/MatrixElements/SubProcess2
##################################################
## Shower and scheme selection.
## Should be empty unless using the Dipole Shower.
##################################################
${shower}
##################################################
# Create the Herwig analysis
##################################################
cd /Herwig/Generators
-create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
-
+read snippets/Rivet.in
##################################################
# Use the q qbar matrix element
##################################################
# default e+e- > q qbar (5 flavours d,u,s,c,b)
${process}
set /Herwig/Shower/PartnerFinder:QEDPartner All
${parameterFile}
##################################################
# Save run for later usage with 'Herwig run'
##################################################
cd /Herwig/Generators
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/EE-Matchbox.in b/Tests/Rivet/Templates/EE-Matchbox.in
--- a/Tests/Rivet/Templates/EE-Matchbox.in
+++ b/Tests/Rivet/Templates/EE-Matchbox.in
@@ -1,61 +1,60 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
## Collider type
##################################################
read snippets/Matchbox.in
read snippets/EECollider.in
##################################################
## Process selection
##################################################
## 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
##################################################
## Scale choice
## See the documentation for more options
##################################################
cd /Herwig/MatrixElements/Matchbox
set Factory:ScaleChoice /Herwig/MatrixElements/Matchbox/Scales/SHatScale
##################################################
## Matching and shower selection
##################################################
${shower}
##################################################
# 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 /Herwig/Generators/EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+read snippets/Rivet.in
##################################################
## 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
## Select the process
cd /Herwig/MatrixElements/Matchbox
${process}
${parameterFile}
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/EE-Merging.in b/Tests/Rivet/Templates/EE-Merging.in
--- a/Tests/Rivet/Templates/EE-Merging.in
+++ b/Tests/Rivet/Templates/EE-Merging.in
@@ -1,67 +1,66 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
## Collider type
##################################################
read snippets/DipoleMerging.in
read snippets/EECollider.in
read snippets/MonacoSampler.in
##################################################
## Process selection
##################################################
## Model assumptions
read Matchbox/StandardModelLike.in
read Matchbox/DiagonalCKM.in
## Set the order of the couplings
cd /Herwig/Merging/
set MergingFactory:OrderInAlphaS 0
set MergingFactory:OrderInAlphaEW 2
##################################################
## Matrix element library selection
##################################################
read Matchbox/MadGraph-OpenLoops.in
##################################################
## Scale choice
## See the documentation for more options
##################################################
cd /Herwig/Merging/
set MergingFactory:ScaleChoice /Herwig/MatrixElements/Matchbox/Scales/SHatScale
##################################################
## PDF and AlphaS choice
##################################################
set /Herwig/Couplings/NLOAlphaS:input_alpha_s 0.118
read Merging/FactorCMWScheme.in
##################################################
# 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 /Herwig/Generators/EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+read snippets/Rivet.in
##################################################
## Do not apply profile scales for LEP as hard
## scale coincides with kinematic limit
##################################################
set /Herwig/DipoleShower/DipoleShowerHandler:HardScaleProfile NULL
## Select the process
cd /Herwig/Merging/
set Merger:MergingScale 5.*GeV
${process}
${parameterFile}
##################################################
## Save the generator
##################################################
do /Herwig/Merging/MergingFactory:ProductionMode
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/EE-Powheg.in b/Tests/Rivet/Templates/EE-Powheg.in
--- a/Tests/Rivet/Templates/EE-Powheg.in
+++ b/Tests/Rivet/Templates/EE-Powheg.in
@@ -1,39 +1,37 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
# base parameters for LEP analyses
##################################################
read snippets/EECollider.in
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
##################################################
# 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 EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
-
+read snippets/Rivet.in
##################################################
# Use the NLO q qbar matrix element
##################################################
set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
${process}
${parameterFile}
##################################################
# Save run for later usage with 'Herwig run'
##################################################
cd /Herwig/Generators
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/EE.in b/Tests/Rivet/Templates/EE.in
--- a/Tests/Rivet/Templates/EE.in
+++ b/Tests/Rivet/Templates/EE.in
@@ -1,48 +1,46 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
# base parameters for LEP analyses
##################################################
read snippets/EECollider.in
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
##################################################
# Switch off ISR
##################################################
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
##################################################
## Shower and scheme selection.
## Should be empty unless using the Dipole Shower.
##################################################
${shower}
##################################################
# Create the Herwig analysis
##################################################
cd /Herwig/Generators
-create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
-
+read snippets/Rivet.in
##################################################
# Use the q qbar matrix element
##################################################
# default e+e- > q qbar (5 flavours d,u,s,c,b)
${process}
set /Herwig/Shower/PartnerFinder:QEDPartner IIandFF
${parameterFile}
##################################################
# Save run for later usage with 'Herwig run'
##################################################
cd /Herwig/Generators
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/GammaGamma.in b/Tests/Rivet/Templates/GammaGamma.in
--- a/Tests/Rivet/Templates/GammaGamma.in
+++ b/Tests/Rivet/Templates/GammaGamma.in
@@ -1,44 +1,42 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
# base parameters for LEP analyses
##################################################
read snippets/EECollider.in
set /Herwig/EventHandlers/EventHandler:BeamA /Herwig/Particles/gamma
set /Herwig/EventHandlers/EventHandler:BeamB /Herwig/Particles/gamma
set /Herwig/Particles/gamma:PDF /Herwig/Partons/NoPDF
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
##################################################
## Shower and scheme selection.
## Should be empty unless using the Dipole Shower.
##################################################
${shower}
##################################################
# Create the Herwig analysis
##################################################
cd /Herwig/Generators
-create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
-
+read snippets/Rivet.in
##################################################
# Use the q qbar matrix element
##################################################
# default e+e- > q qbar (5 flavours d,u,s,c,b)
${process}
set /Herwig/Shower/PartnerFinder:QEDPartner IIandFF
${parameterFile}
##################################################
# Save run for later usage with 'Herwig run'
##################################################
cd /Herwig/Generators
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/Hadron-Gamma.in b/Tests/Rivet/Templates/Hadron-Gamma.in
--- a/Tests/Rivet/Templates/Hadron-Gamma.in
+++ b/Tests/Rivet/Templates/Hadron-Gamma.in
@@ -1,59 +1,58 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
# Technical parameters for this run
##################################################
read snippets/PPCollider.in
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
set EventGenerator:EventHandler:StatLevel Full
set EventGenerator:EventHandler:Sampler:Ntry 10000
set /Herwig/Partons/PPExtractor:FlatSHatY 0
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
##################################################
# 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/PPExtractor:FirstPDF /Herwig/Partons/BudnevPDF
set /Herwig/Partons/PPExtractor:SecondPDF /Herwig/Partons/BudnevPDF
set /Herwig/Shower/ShowerHandler:PDFA NULL
set /Herwig/Shower/ShowerHandler:PDFB NULL
set /Herwig/DipoleShower/DipoleShowerHandler:PDFA NULL
set /Herwig/DipoleShower/DipoleShowerHandler:PDFB NULL
# No MPI
set EventGenerator:EventHandler:CascadeHandler:MPIHandler NULL
##################################################
# Create the Herwig analysis
##################################################
-create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
-set /Herwig/Analysis/RivetAnalysis:Debug No
+read snippets/Rivet.in
+set /Herwig/Analysis/Rivet:Debug No
##################################################
# Cuts
##################################################
cd /Herwig/Cuts
set Cuts:ScaleMin 0.0
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
cd /Herwig/MatrixElements
${process}
cd /Herwig/Generators
${parameterFile}
##################################################
# Save run for later usage with 'Herwig run'
##################################################
cd /Herwig/Generators
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/Hadron-Matchbox.in b/Tests/Rivet/Templates/Hadron-Matchbox.in
--- a/Tests/Rivet/Templates/Hadron-Matchbox.in
+++ b/Tests/Rivet/Templates/Hadron-Matchbox.in
@@ -1,50 +1,49 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
## Collider type
##################################################
read snippets/Matchbox.in
read snippets/PPCollider.in
##################################################
## Matrix element library selection
##################################################
## Model assumptions
read Matchbox/StandardModelLike.in
read Matchbox/DiagonalCKM.in
${nlo}
##################################################
## Matching and shower selection
## Please also see flavour scheme settings
## towards the end of the input file.
##################################################
${shower}
##################################################
## PDF choice
##################################################
${bscheme}
read Matchbox/CT14.in
##################################################
# Create the Herwig analysis
##################################################
-create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-insert /Herwig/Generators/EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
-set /Herwig/Analysis/RivetAnalysis:Debug No
+read snippets/Rivet.in
+set /Herwig/Analysis/Rivet:Debug No
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
##################################################
## Save the generator
##################################################
do /Herwig/MatrixElements/Matchbox/Factory:ProductionMode
## Select the process
cd /Herwig/MatrixElements/Matchbox
${process}
${parameterFile}
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/Hadron-Merging-Massive.in b/Tests/Rivet/Templates/Hadron-Merging-Massive.in
--- a/Tests/Rivet/Templates/Hadron-Merging-Massive.in
+++ b/Tests/Rivet/Templates/Hadron-Merging-Massive.in
@@ -1,50 +1,49 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
## Collider type
##################################################
read snippets/DipoleMerging.in
read snippets/PPCollider.in
read snippets/MonacoSampler.in
##################################################
## Matrix element library selection
##################################################
## Model assumptions
read Matchbox/StandardModelLike.in
read Matchbox/DiagonalCKM.in
read Matchbox/MadGraph-OpenLoops.in
##################################################
## PDF and AlphaS choice
##################################################
read Matchbox/FourFlavourScheme.in
read Matchbox/CT14.in
set /Herwig/Couplings/NLOAlphaS:input_alpha_s 0.118
read Merging/FactorCMWScheme.in
##################################################
# Create the Herwig analysis
##################################################
-create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-insert /Herwig/Generators/EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
-set /Herwig/Analysis/RivetAnalysis:Debug No
+read snippets/Rivet.ina
+set /Herwig/Analysis/Rivet:Debug No
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
## Select the process
cd /Herwig/Merging/
set Merger:MergingScale 15.*GeV
${process}
${parameterFile}
##################################################
## Save the generator
##################################################
do /Herwig/Merging/MergingFactory:ProductionMode
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/Hadron-Merging.in b/Tests/Rivet/Templates/Hadron-Merging.in
--- a/Tests/Rivet/Templates/Hadron-Merging.in
+++ b/Tests/Rivet/Templates/Hadron-Merging.in
@@ -1,50 +1,49 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
## Collider type
##################################################
read snippets/DipoleMerging.in
read snippets/PPCollider.in
read snippets/MonacoSampler.in
##################################################
## Matrix element library selection
##################################################
## Model assumptions
read Matchbox/StandardModelLike.in
read Matchbox/DiagonalCKM.in
read Matchbox/MadGraph-OpenLoops.in
##################################################
## PDF and AlphaS choice
##################################################
read Matchbox/FiveFlavourNoBMassScheme.in
read Matchbox/CT14.in
set /Herwig/Couplings/NLOAlphaS:input_alpha_s 0.118
read Merging/FactorCMWScheme.in
##################################################
# Create the Herwig analysis
##################################################
-create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-insert /Herwig/Generators/EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
-set /Herwig/Analysis/RivetAnalysis:Debug No
+read snippets/Rivet.in
+set /Herwig/Analysis/Rivet:Debug No
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
## Select the process
cd /Herwig/Merging/
set Merger:MergingScale 15.*GeV
${process}
${parameterFile}
##################################################
## Save the generator
##################################################
do /Herwig/Merging/MergingFactory:ProductionMode
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/Hadron-Powheg.in b/Tests/Rivet/Templates/Hadron-Powheg.in
--- a/Tests/Rivet/Templates/Hadron-Powheg.in
+++ b/Tests/Rivet/Templates/Hadron-Powheg.in
@@ -1,49 +1,48 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
# Technical parameters for this run
##################################################
read snippets/PPCollider.in
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
##################################################
# 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/PPExtractor:FirstPDF /Herwig/Partons/HardNLOPDF
set /Herwig/Partons/PPExtractor:SecondPDF /Herwig/Partons/HardNLOPDF
##################################################
# Setup the POWHEG shower
##################################################
cd /Herwig/Shower
set ShowerHandler:IntrinsicPtGaussian 1.9*GeV
set ShowerHandler:HardEmission POWHEG
##################################################
# Create the Herwig analysis
##################################################
cd /Herwig/Generators
-create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+read snippets/Rivet.in
cd /Herwig/MatrixElements
${process}
cd /Herwig/Generators
${parameterFile}
##################################################
# Save run for later usage with 'Herwig run'
##################################################
cd /Herwig/Generators
saverun ${runname} EventGenerator
diff --git a/Tests/Rivet/Templates/Hadron.in b/Tests/Rivet/Templates/Hadron.in
--- a/Tests/Rivet/Templates/Hadron.in
+++ b/Tests/Rivet/Templates/Hadron.in
@@ -1,38 +1,37 @@
# -*- ThePEG-repository -*-
#
# DO NOT EDIT - autogenerated by make_input_files.py
#
##################################################
# Technical parameters for this run
##################################################
read snippets/${collider}
cd /Herwig/Generators
set EventGenerator:MaxErrors 1000000
set EventGenerator:EventHandler:StatLevel Full
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
##################################################
## Shower and flavour scheme selection.
## Should be empty unless using the Dipole Shower.
##################################################
${shower}
${bscheme}
##################################################
# Create the Herwig analysis
##################################################
cd /Herwig/Generators
-create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
-set /Herwig/Analysis/RivetAnalysis:Debug No
+read snippets/Rivet.in
+set /Herwig/Analysis/Rivet:Debug No
cd /Herwig/MatrixElements
${process}
cd /Herwig/Generators
${parameterFile}
##################################################
# Save run for later usage with 'Herwig run'
##################################################
cd /Herwig/Generators
saverun ${runname} EventGenerator
diff --git a/Tests/python/LowEnergy-EE-NonPerturbative.in b/Tests/python/LowEnergy-EE-NonPerturbative.in
--- a/Tests/python/LowEnergy-EE-NonPerturbative.in
+++ b/Tests/python/LowEnergy-EE-NonPerturbative.in
@@ -1,40 +1,39 @@
# -*- ThePEG-repository -*-
read snippets/EECollider.in
##################################################
# Selected the hard process
##################################################
# leading-order processes
##################################################
cd /Herwig/MatrixElements
# set the process
${processes}
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set EventGenerator:EventHandler:LuminosityFunction:Energy ${ECMS}
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/pi0:Stable Stable
set /Herwig/Particles/K_S0:Stable Stable
cd /Herwig/Generators
##################################################
## prepare for Rivet analysis or HepMC output
## when running with parton shower
##################################################
-create ThePEG::RivetAnalysis /Herwig/Analysis/Rivet RivetAnalysis.so
-insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Rivet
+read snippets/Rivet.in
${ANALYSES}
###################################################
# Save run for later usage with 'Herwig run'
##################################################
set EventGenerator:MaxErrors 10000
set EventGenerator:EventHandler:StatLevel Full
set EventGenerator:EventHandler:CascadeHandler NULL
saverun Rivet-LowEnergy-${name}-NonPerturbative-${ECMS} EventGenerator
diff --git a/Tests/python/LowEnergy-EE-Perturbative.in b/Tests/python/LowEnergy-EE-Perturbative.in
--- a/Tests/python/LowEnergy-EE-Perturbative.in
+++ b/Tests/python/LowEnergy-EE-Perturbative.in
@@ -1,35 +1,34 @@
# -*- ThePEG-repository -*-
read snippets/EECollider.in
##################################################
# 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
set MEee2gZ2qq:MaximumFlavour ${maxflavour}
${lepton}
set /Herwig/Particles/pi0:Stable Stable
set /Herwig/Particles/K_S0:Stable Stable
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set EventGenerator:EventHandler:LuminosityFunction:Energy ${ECMS}
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
cd /Herwig/Generators
-create ThePEG::RivetAnalysis /Herwig/Analysis/Rivet RivetAnalysis.so
-insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Rivet
+read snippets/Rivet.in
${ANALYSES}
###################################################
# Save run for later usage with 'Herwig run'
##################################################
set EventGenerator:MaxErrors 10000
saverun Rivet-LowEnergy-${name}-Perturbative-${ECMS} EventGenerator
diff --git a/Tests/python/LowEnergy-EE.py.in b/Tests/python/LowEnergy-EE.py.in
--- a/Tests/python/LowEnergy-EE.py.in
+++ b/Tests/python/LowEnergy-EE.py.in
@@ -1,791 +1,799 @@
#! @PYTHON@
# -*- mode: python -*-
from __future__ import print_function
import yoda,os,subprocess,optparse
import numpy as np
from string import Template
# get the path for the rivet data
p = subprocess.Popen(["rivet-config", "--datadir"],stdout=subprocess.PIPE)
path=p.communicate()[0].strip().decode("UTF-8")
#Define the arguments
op = optparse.OptionParser(usage=__doc__)
op.add_option("--process" , dest="processes" , default=[], action="append")
op.add_option("--path" , dest="path" , default=path)
op.add_option("--non-perturbative", dest="nonPerturbative" , default=False, action="store_true")
op.add_option("--perturbative" , dest="perturbative" , default=False, action="store_true")
op.add_option("--dest" , dest="dest" , default="Rivet")
op.add_option("--list" , dest="list" , default=False, action="store_true")
op.add_option("--flavour" , dest="flavour" , default="All" )
op.add_option("--plots" , dest="plot" , default=False, action="store_true")
opts, args = op.parse_args()
path=opts.path
+hepmc=os.getenv('OUTPUT_HEPMC', False)
+if hepmc != False : hepmc=True
thresholds = [0.7,2.*.5,2.*1.87,2.*5.28]
# the list of analyses and processes
analyses = { 'KK' : {}, 'PiPi' : {}, 'PPbar' : {}, "3Pi" : {},
"EtaprimePiPi" : {}, "4Pi" : {}, "EtaPhi" : {}, "EtaOmega" : {},
"2K1Pi" : {}, "2K2Pi" : {}, "4K" : {}, "6m" : {},
"EtaPiPi" : {}, "OmegaPi" : {}, "PiGamma" : {}, "EtaGamma" : {},
"PhiPi" : {}, "OmegaPiPi" : {}, "DD" : {}, "BB" : {},
"5Pi" : {}, "LL" : {}, "Baryon" : {} }
# pi+pi-
analyses["PiPi"]["KLOE_2009_I797438" ] = ["d02-x01-y01"]
analyses["PiPi"]["KLOE_2005_I655225" ] = ["d02-x01-y01"]
analyses["PiPi"]["KLOE2_2017_I1634981" ] = ["d01-x01-y01"]
analyses["PiPi"]["BABAR_2009_I829441" ] = ["d01-x01-y01"]
analyses["PiPi"]["DM1_1978_I134061" ] = ["d01-x01-y01"]
analyses["PiPi"]["DM2_1989_I267118" ] = ["d01-x01-y01"]
analyses["PiPi"]["CMD2_2007_I728302" ] = ["d02-x01-y01"]
analyses["PiPi"]["CMD2_2006_I728191" ] = ["d03-x01-y01"]
analyses["PiPi"]["BESIII_2016_I1385603"] = ["d01-x01-y01"]
analyses["PiPi"]["SND_2005_I686349" ] = ["d01-x01-y01"]
analyses["PiPi"]["CMD_1985_I221309" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["PiPi"]["CMD2_2002_I568807" ] = ["d01-x01-y02"]
analyses["PiPi"]["CMD2_1999_I498859" ] = ["d01-x01-y01"]
analyses['PiPi']["CLEOC_2005_I693873" ] = ["d01-x01-y01"]
analyses['PiPi']["ND_1991_I321108" ] = ["d11-x01-y01"]
analyses['PiPi']["OLYA_1984_I208231" ] = ["d01-x01-y01"]
analyses['PiPi']["SND_2020_I1789269" ] = ["d01-x01-y01"]
analyses['PiPi']["CMD3_2023_I2634277" ] = ["d01-x01-y01","d01-x02-y01","d01-x03-y01"]
# K+K-
analyses['KK']["BABAR_2013_I1238807" ] = ["d01-x01-y01"]
analyses['KK']["BABAR_2015_I1383130" ] = ["d01-x01-y04"]
analyses['KK']["BESIII_2018_I1704558"] = ["d01-x01-y01"]
analyses['KK']["CLEOC_2005_I693873" ] = ["d01-x01-y02"]
analyses['KK']["CMD2_1995_I406880" ] = ["d01-x01-y01","d01-x01-y02"]
analyses['KK']["CMD2_2008_I782516" ] = ["d01-x01-y01","d02-x01-y01"]
analyses['KK']["DM1_1981_I156054" ] = ["d01-x01-y01"]
analyses['KK']["DM2_1988_I262690" ] = ["d01-x01-y01"]
analyses['KK']["ND_1991_I321108" ] = ["d12-x01-y01","d13-x01-y01"]
analyses['KK']["OLYA_1981_I173076" ] = ["d01-x01-y01"]
analyses['KK']["SND_2001_I533574" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03",
"d02-x01-y01","d02-x01-y02","d02-x01-y03"]
analyses['KK']["SND_2007_I755881" ] = ["d01-x01-y01"]
analyses['KK']["SND_2016_I1484677" ] = ["d01-x01-y01","d02-x01-y01"]
# K_S^0 K_L^0
analyses['KK']["BABAR_2014_I1287920" ] = ["d09-x01-y01"]
analyses['KK']["BABAR_2020_I1769654" ] = ["d01-x01-y01"]
analyses['KK']["BESIII_2021_I1866051"] = ["d01-x01-y01"]
analyses['KK']["BESIII_2024_I2738509"] = ["d01-x01-y02"]
analyses['KK']["CMD2_1999_I502164" ] = ["d01-x01-y01","d02-x01-y01",
"d03-x01-y01","d04-x01-y01"]
analyses['KK']["CMD2_2003_I601222" ] = ["d01-x01-y01"]
analyses['KK']["CMD3_2016_I1444990" ] = ["d01-x01-y06"]
analyses['KK']["DM1_1981_I156053" ] = ["d01-x01-y01"]
analyses['KK']["SND_2006_I720035" ] = ["d01-x01-y01"]
analyses['KK']["SND_2024_I2809918" ] = ["d01-x01-y01"]
# proton-antiproton
analyses['PPbar']["BABAR_2006_I700020" ] = ["d01-x01-y01","d02-x01-y01"]
analyses['PPbar']["BABAR_2013_I1217421" ] = ["d01-x01-y01"]
analyses['PPbar']["BABAR_2013_I1247058" ] = ["d01-x01-y01"]
analyses['PPbar']["BESII_2005_I685906" ] = ["d01-x01-y01"]
analyses['PPbar']["BESIII_2014_I1286898"] = ["d01-x01-y06"]
analyses['PPbar']["BESIII_2015_I1358937"] = ["d01-x01-y05"]
analyses['PPbar']["BESIII_2019_I1718337"] = ["d01-x01-y01"]
analyses['PPbar']["BESIII_2019_I1736235"] = ["d01-x01-y01"]
analyses['PPbar']["BESIII_2021_I1847766"] = ["d01-x01-y01"]
analyses['PPbar']["CLEOC_2005_I693873" ] = ["d01-x01-y03"]
analyses['PPbar']["CMD3_2016_I1385598" ] = ["d01-x01-y06"]
analyses["PPbar"]["DM1_1979_I141565" ] = ["d01-x01-y01"]
analyses['PPbar']["DM2_1983_I190558" ] = ["d01-x01-y01"]
analyses["PPbar"]["DM2_1990_I297706" ] = ["d01-x01-y01"]
analyses["PPbar"]["FENICE_1994_I377833" ] = ["d01-x01-y01"]
# neutron-antineutron
analyses['PPbar']["BESIII_2021_I1966612"] = ["d01-x01-y01"]
analyses['PPbar']["BESIII_2023_I2614192"] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03"]
analyses["PPbar"]["FENICE_1998_I471263" ] = ["d01-x01-y01"]
analyses['PPbar']["SND_2014_I1321689" ] = ["d01-x01-y01","d02-x01-y01"]
analyses['PPbar']["SND_2022_I2102082" ] = ["d01-x01-y01"]
analyses['PPbar']["SND_2024_I2696331" ] = ["d01-x01-y01"]
analyses['PPbar']["SND_2024_I2809929" ] = ["d01-x01-y01"]
# pi0 gamma
analyses["PiGamma"]["SND_2018_I1694988"] = ["d01-x01-y01"]
analyses["PiGamma"]["SND_2016_I1418483"] = ["d01-x01-y05"]
analyses["PiGamma"]["SND_2003_I612867" ] = ["d01-x01-y01"]
analyses["PiGamma"]["CMD2_2005_I658856"] = ["d02-x01-y01"]
analyses["PiGamma"]["SND_2000_I524221" ] = ["d01-x01-y02"]
# eta gamma
analyses["EtaGamma"]["CMD2_2005_I658856" ] = ["d01-x01-y01"]
analyses["EtaGamma"]["SND_2023_I2670980" ] = ["d01-x01-y01"]
analyses["EtaGamma"]["SND_2006_I717778" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["EtaGamma"]["SND_2014_I1275333" ] = ["d01-x01-y01"]
analyses["EtaGamma"]["SND_2000_I524221" ] = ["d01-x01-y01"]
analyses["EtaGamma"]["CMD2_1999_I503154" ] = ["d01-x01-y01"]
analyses["EtaGamma"]["CMD2_2001_I554522" ] = ["d01-x01-y01"]
analyses['EtaGamma']["CMD2_1995_I406880" ] = ["d01-x01-y04"]
analyses['EtaGamma']["BABAR_2006_I716277"] = ["d01-x01-y01"]
# 3 pion
analyses["3Pi"]["BABAR_2004_I656680" ] = ["d01-x01-y01"]
analyses["3Pi"]["BABAR_2021_I1937349" ] = ["d01-x01-y01"]
analyses["3Pi"]["BESIII_2019_I1773081" ] = ["d01-x01-y01"]
analyses["3Pi"]["BESIII_2024_I2751832" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03"]
analyses["3Pi"]["SND_2002_I582183" ] = ["d01-x01-y01"]
analyses["3Pi"]["SND_2003_I619011" ] = ["d01-x01-y01"]
analyses["3Pi"]["SND_1999_I508003" ] = ["d01-x01-y01"]
analyses["3Pi"]["SND_2001_I533574" ] = ["d01-x01-y04","d02-x01-y04"]
analyses["3Pi"]["CMD2_2000_I523691" ] = ["d01-x01-y01"]
analyses["3Pi"]["CMD2_1998_I480170" ] = ["d01-x01-y01"]
analyses['3Pi']["CMD2_1995_I406880" ] = ["d01-x01-y03"]
analyses['3Pi']["DM2_1992_I339265" ] = ["d01-x01-y01"]
analyses['3Pi']["DM1_1980_I140174" ] = ["d01-x01-y01"]
analyses['3Pi']["ND_1991_I321108" ] = ["d05-x01-y01","d10-x01-y04"]
analyses['3Pi']["GAMMAGAMMA_1981_I158474"] = ["d01-x01-y01"]
analyses["3Pi"]["CLEO_2006_I691720" ] = ["d01-x01-y01"]
analyses["3Pi"]["SND_2015_I1389908" ] = ["d01-x01-y01"]
analyses["3Pi"]["SND_2020_I1809286" ] = ["d01-x01-y01","d02-x01-y01",
"d03-x01-y01","d03-x01-y02","d03-x01-y03"]
analyses["3Pi"]["CLEOC_2005_I654529" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03","d01-x01-y04"]
# eta pipi
analyses["EtaPiPi"]["BABAR_2007_I758568" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["EtaPiPi"]["BABAR_2018_I1647139" ] = ["d01-x01-y01"]
analyses["EtaPiPi"]["BABAR_2018_I1700745" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["EtaPiPi"]["BESIII_2022_I2039027"] = ["d01-x01-y01","d02-x01-y01"]
analyses["EtaPiPi"]["BESIII_2023_I2711200"] = ["d01-x01-y01","d02-x01-y01","d03-x01-y01"]
analyses["EtaPiPi"]["CMD2_2000_I532970" ] = ["d02-x01-y01"]
analyses['EtaPiPi']["CMD3_2019_I1744510" ] = ["d02-x01-y01"]
analyses["EtaPiPi"]["DM2_1988_I264144" ] = ["d01-x01-y01"]
analyses['EtaPiPi']["ND_1991_I321108" ] = ["d06-x01-y01","d14-x01-y01"]
analyses["EtaPiPi"]["SND_2015_I1332929" ] = ["d01-x01-y01"]
analyses["EtaPiPi"]["SND_2018_I1638368" ] = ["d01-x01-y01"]
analyses["EtaPiPi"]["BESIII_2019_I1685351"] = ["d01-x01-y02"]
analyses["EtaPiPi"]["BESII_2004_I661567" ] = ["d01-x01-y02"]
analyses["EtaPiPi"]["CLEOC_2005_I654529" ] = ["d01-x01-y07"]
# eta' pipi
analyses["EtaprimePiPi"]["BABAR_2007_I758568" ] = ["d05-x01-y01","d06-x01-y01"]
analyses["EtaprimePiPi"]["BESIII_2020_I1836509"] = ["d01-x01-y01"]
analyses["EtaprimePiPi"]["BESII_2004_I661567" ] = ["d01-x01-y03"]
# Eta Phi
analyses["EtaPhi"]["BABAR_2006_I709730" ] = ["d02-x01-y01"]
analyses["EtaPhi"]["BABAR_2006_I731865" ] = ["d01-x01-y02"]
analyses["EtaPhi"]["BABAR_2007_I758568" ] = ["d08-x01-y01","d09-x01-y01"]
analyses["EtaPhi"]["BABAR_2008_I765258" ] = ["d04-x01-y01","d05-x01-y01"]
analyses["EtaPhi"]["BABAR_2017_I1511276" ] = ["d03-x01-y01"]
analyses["EtaPhi"]["BABAR_2022_I2120528" ] = ["d04-x01-y01","d05-x01-y01"]
analyses["EtaPhi"]["BELLE_2009_I823878" ] = ["d01-x01-y01"]
analyses["EtaPhi"]["BELLE_2022_I2146263" ] = ["d01-x01-y01"]
analyses["EtaPhi"]["BESII_2008_I801210" ] = ["d01-x01-y03"]
analyses["EtaPhi"]["BESIII_2021_I1857930"] = ["d01-x01-y01"]
analyses["EtaPhi"]["BESIII_2023_I2688611"] = ["d01-x01-y01"]
analyses["EtaPhi"]["CMD3_2017_I1606078" ] = ["d01-x01-y01"]
analyses["EtaPhi"]["CMD3_2019_I1740541" ] = ["d01-x01-y06","d02-x01-y06","d03-x01-y06"]
analyses["EtaPhi"]["SND_2018_I1693737" ] = ["d01-x01-y01"]
analyses["EtaPhi"]["SND_2019_I1726419" ] = ["d01-x01-y01","d01-x01-y03"]
analyses["EtaPhi"]["SND_2021_I1942539" ] = ["d01-x01-y01"]
analyses["EtaPhi"]["CLEOC_2005_I654529" ] = ["d01-x01-y09"]
# Eta Omega
analyses["EtaOmega"]["BABAR_2006_I709730" ] = ["d02-x01-y01"]
analyses["EtaOmega"]["BABAR_2021_I1938254" ] = ["d01-x01-y01","d02-x01-y01","d03-x01-y01","d04-x01-y01"]
analyses["EtaOmega"]["BESII_2008_I801210" ] = ["d01-x01-y03"]
analyses["EtaOmega"]["BESIII_2020_I1817739"] = ["d01-x01-y01"]
analyses["EtaOmega"]["BESIII_2022_I2047667"] = ["d01-x01-y02"]
analyses["EtaOmega"]["CMD3_2017_I1606078" ] = ["d01-x01-y01","d01-x01-y02"]
analyses["EtaOmega"]["SND_2016_I1473343" ] = ["d01-x01-y01"]
analyses["EtaOmega"]["SND_2019_I1726419" ] = ["d01-x01-y01","d01-x01-y02"]
analyses["EtaOmega"]["SND_2020_I1800477" ] = ["d01-x01-y01","d03-x01-y01"]
analyses["EtaOmega"]["CLEOC_2005_I654529" ] = ["d01-x01-y08"]
# 4 pions
analyses["4Pi"]["BABAR_2017_I1621593" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["4Pi"]["BABAR_2012_I1086164" ] = ["d01-x01-y01"]
analyses["4Pi"]["CMD2_2000_I531667" ] = ["d01-x01-y01"]
analyses["4Pi"]["CMD2_2004_I648023" ] = ["d01-x01-y01"]
analyses["4Pi"]["BABAR_2005_I676691" ] = ["d01-x01-y01"]
analyses["4Pi"]["CMD2_2000_I511375" ] = ["d01-x01-y01"]
analyses["4Pi"]["CMD2_1999_I483994" ] = ["d01-x01-y01","d02-x01-y01","d03-x01-y01"]
analyses["4Pi"]["BESII_2008_I801210" ] = ["d01-x01-y01"]
analyses["4Pi"]["BESIII_2022_I2047667" ] = ["d01-x01-y01"]
analyses["4Pi"]["KLOE_2008_I791841" ] = ["d01-x01-y01"]
analyses['4Pi']["ND_1991_I321108" ] = ["d07-x01-y01","d08-x01-y01","d10-x01-y01","d10-x01-y02",
"d01-x01-y01","d02-x01-y01","d03-x01-y01","d04-x01-y01","d10-x01-y03"]
analyses['4Pi']["BESII_2007_I750713" ] = ["d01-x01-y03"]
analyses['4Pi']["SND_2001_I579319" ] = ["d01-x01-y01","d02-x01-y01"]
analyses['4Pi']["DM1_1982_I168552" ] = ["d01-x01-y01"]
analyses['4Pi']["DM1_1979_I132828" ] = ["d01-x01-y01"]
analyses['4Pi']["GAMMAGAMMA_1980_I153382"] = ["d01-x01-y01"]
analyses['4Pi']["GAMMAGAMMA_1981_I158474"] = ["d01-x01-y02"]
analyses["4Pi"]["BESIII_2020_I1817739" ] = ["d02-x01-y01"]
analyses["4Pi"]["BESIII_2021_I1929314" ] = ["d01-x01-y03"]
analyses["4Pi"]["SND_2023_I2693057" ] = ["d01-x01-y01"]
# (these are Omega(-> pi0 gamma) pi0)
analyses["OmegaPi"]["CMD2_2003_I616446" ] = ["d01-x01-y01"]
analyses["OmegaPi"]["SND_2000_I503946" ] = ["d01-x01-y01"]
analyses["OmegaPi"]["SND_2000_I527752" ] = ["d01-x01-y01"]
analyses["OmegaPi"]["SND_2016_I1489182" ] = ["d01-x01-y01"]
# non Omega
analyses["OmegaPi"]["SND_2002_I587084" ] = ["d01-x01-y01"]
analyses["OmegaPi"]["CMD2_2004_I630009" ] = ["d01-x01-y01"]
analyses["OmegaPi"]["KLOE_2008_I791841" ] = ["d02-x01-y01"]
# from 4 Pion
analyses["OmegaPi"]["CMD2_1999_I483994" ] = ["d03-x01-y01"]
analyses['OmegaPi']["ND_1991_I321108" ] = ["d01-x01-y01","d02-x01-y01","d03-x01-y01",
"d04-x01-y01","d10-x01-y03"]
analyses["OmegaPi"]["BESIII_2020_I1817739"] = ["d02-x01-y01"]
analyses["OmegaPi"]["BELLE_2013_I1252555" ] = ["d01-x01-y01"]
analyses["OmegaPi"]["BESII_2004_I661567" ] = ["d01-x01-y01"]
analyses["OmegaPi"]["CLEOC_2005_I654529" ] = ["d01-x01-y05"]
# omega 2 pi
analyses["OmegaPiPi"]["BABAR_2007_I758568" ] = ["d01-x01-y01","d03-x01-y01","d04-x01-y01"]
analyses["OmegaPiPi"]["BABAR_2018_I1700745" ] = ["d01-x01-y01","d03-x01-y01"]
analyses['OmegaPiPi']["BESIII_2021_I1999208"] = ["d01-x01-y01"]
analyses["OmegaPiPi"]["CMD2_2000_I532970" ] = ["d01-x01-y01"]
analyses["OmegaPiPi"]["DM1_1981_I166964" ] = ["d01-x01-y01"]
analyses["OmegaPiPi"]["DM2_1992_I339265" ] = ["d02-x01-y01"]
analyses['OmegaPiPi']["ND_1991_I321108" ] = ["d14-x01-y01"]
analyses['OmegaPiPi']["BESIII_2022_I2133889"] = ["d01-x01-y01","d02-x01-y01","d02-x01-y02","d02-x01-y03",
"d02-x01-y04","d02-x01-y05","d02-x01-y06"]
analyses['OmegaPiPi']["BESIII_2023_I2643786"] = ["d01-x01-y01","d02-x01-y01","d02-x01-y02","d02-x01-y03",
"d02-x01-y04","d02-x01-y05","d02-x01-y06"]
analyses["OmegaPiPi"]["CLEOC_2005_I654529" ] = ["d01-x01-y12","d01-x01-y13","d01-x01-y14"]
# 5 pion
analyses["5Pi"]["BABAR_2007_I758568" ] = ["d01-x01-y01"]
analyses['5Pi']["ND_1991_I321108" ] = ["d14-x01-y01"]
analyses['5Pi']["GAMMAGAMMA_1981_I158474" ] = ["d01-x01-y03"]
analyses["5Pi"]["BABAR_2018_I1700745" ] = ["d01-x01-y01"]
analyses["5Pi"]["BESIII_2021_I1929314" ] = ["d01-x01-y07"]
analyses["5Pi"]["BESIII_2019_I1685351" ] = ["d01-x01-y03"]
# 2K 1 pi
analyses["2K1Pi"]["BABAR_2008_I765258" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["2K1Pi"]["BABAR_2017_I1511276" ] = ["d01-x01-y01"]
analyses["2K1Pi"]["BESII_2008_I801208" ] = ["d01-x01-y01"]
analyses["2K1Pi"]["BESIII_2018_I1691798"] = ["d01-x01-y01"]
analyses["2K1Pi"]["BESIII_2022_I2033007"] = ["d01-x01-y01","d03-x01-y01","d04-x01-y01"]
analyses["2K1Pi"]["DM1_1982_I176801" ] = ["d01-x01-y01"]
analyses["2K1Pi"]["DM2_1991_I318558" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["2K1Pi"]["SND_2018_I1637194" ] = ["d01-x01-y01"]
analyses["2K1Pi"]["SND_2020_I1806118" ] = ["d01-x01-y01"]
analyses["2K1Pi"]["BELLE_2013_I1252555" ] = ["d02-x01-y01","d03-x01-y01","d04-x01-y01","d05-x01-y01"]
analyses["2K1Pi"]["CLEOC_2005_I654529" ] = ["d01-x01-y10","d01-x01-y11"]
analyses["2K1Pi"]["BESIII_2023_I2702520"] = ["d01-x01-y01","d02-x01-y01","d03-x01-y01"]
# phi pi
analyses["PhiPi"]["BABAR_2008_I765258" ] = ["d02-x01-y01","d03-x01-y01"]
analyses["PhiPi"]["BABAR_2017_I1511276" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["PhiPi"]["BESIII_2022_I2033007"] = ["d01-x01-y01","d02-x01-y01"]
analyses["PhiPi"]["SND_2020_I1806118" ] = ["d02-x01-y01"]
analyses["PhiPi"]["CLEOC_2005_I654529" ] = ["d01-x01-y06"]
# 2K 2 pi
analyses["2K2Pi"]["BABAR_2005_I676691" ] = ["d02-x01-y01"]
analyses["2K2Pi"]["BABAR_2007_I747875" ] = ["d01-x01-y01","d02-x01-y01","d03-x01-y01",
"d04-x01-y01","d05-x01-y01","d07-x01-y01"]
analyses["2K2Pi"]["BABAR_2012_I892684" ] = ["d01-x01-y01","d02-x01-y01","d03-x01-y01",
"d04-x01-y01","d05-x01-y01",
"d06-x01-y01","d07-x01-y01"]
analyses["2K2Pi"]["BABAR_2014_I1287920" ] = ["d09-x01-y01","d10-x01-y01","d11-x01-y01"]
analyses["2K2Pi"]["BABAR_2017_I1511276" ] = ["d03-x01-y01","d04-x01-y01"]
analyses["2K2Pi"]["BABAR_2017_I1591716" ] = ["d01-x01-y01","d02-x01-y01"]
analyses['2K2Pi']["BESII_2007_I750713" ] = ["d01-x01-y04"]
analyses["2K2Pi"]["BESII_2008_I801210" ] = ["d01-x01-y02"]
analyses["2K2Pi"]["BESII_2008_I801208" ] = ["d01-x01-y02"]
analyses['2K2Pi']["BESIII_2018_I1699641"] = ["d01-x01-y01","d02-x01-y01"]
analyses['2K2Pi']["BESIII_2020_I1775344"] = ["d01-x01-y01","d02-x01-y01","d03-x01-y01",
"d04-x01-y01","d05-x01-y01","d06-x01-y01"]
analyses['2K2Pi']["BESIII_2023_I2688408"] = ["d01-x01-y01"]
analyses['2K2Pi']["BESIII_2018_I1651451"] = ["d01-x01-y01","d01-x01-y02"]
analyses["2K2Pi"]["BELLE_2009_I809630" ] = ["d01-x01-y01"]
analyses["2K2Pi"]["CMD3_2016_I1395968" ] = ["d01-x01-y06"]
analyses['2K2Pi']["CMD3_2019_I1770428" ] = ["d01-x01-y06"]
analyses["2K2Pi"]["DM1_1982_I169382" ] = ["d01-x01-y01"]
analyses["2K2Pi"]["BESIII_2021_I1929314"] = ["d01-x01-y01"]
# 4K
analyses["4K"]["BESIII_2019_I1743841"] = ["d01-x01-y01","d02-x01-y01"]
analyses["4K"]["BESIII_2021_I1929314"] = ["d01-x01-y02"]
analyses["4K"]["BABAR_2005_I676691" ] = ["d03-x01-y01"]
analyses["4K"]["BABAR_2014_I1287920" ] = ["d12-x01-y01"]
analyses["4K"]["BABAR_2012_I892684" ] = ["d08-x01-y01"]
analyses["4K"]["BABAR_2007_I747875" ] = ["d07-x01-y01"]
analyses['4K']["BESII_2007_I750713" ] = ["d01-x01-y06","d01-x01-y07"]
analyses["4K"]["BESIII_2023_I2685727"] = ["d01-x01-y01","d01-x01-y02"]
# 6 mesons
analyses["6m"]["BESIII_2023_I2705058"] = ["d01-x01-y01","d01-x01-y02"]
analyses["6m"]["BESIII_2024_I2776394"] = ["d01-x01-y01"]
analyses["6m"]["BESIII_2021_I1929314"] = ["d01-x01-y05","d01-x01-y06"]
analyses["6m"]["CMD3_2013_I1217420" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03"]
analyses["6m"]["SND_2019_I1726419" ] = ["d01-x01-y01","d01-x01-y04"]
analyses["6m"]["CMD3_2017_I1606078" ] = ["d01-x01-y03","d01-x01-y04"]
analyses["6m"]["CMD3_2019_I1720610" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03"]
analyses["6m"]["BABAR_2018_I1700745"] = ["d04-x01-y01","d05-x01-y01"]
analyses["6m"]["SND_2016_I1471515" ] = ["d01-x01-y06"]
analyses["6m"]["DM1_1981_I166353" ] = ["d01-x01-y01"]
analyses["6m"]["BABAR_2006_I709730" ] = ["d01-x01-y01","d02-x01-y01","d03-x01-y01"]
analyses["6m"]["BABAR_2007_I758568" ] = ["d05-x01-y01","d07-x01-y01",
"d08-x01-y01","d09-x01-y01","d10-x01-y01","d11-x01-y01"]
analyses["6m"]["BESII_2007_I763880" ] = ["d01-x01-y04","d01-x01-y05","d01-x01-y06","d01-x01-y07"]
analyses["6m"]["BESII_2007_I762901" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03","d01-x01-y04",
"d01-x01-y05","d01-x01-y07","d01-x01-y08","d01-x01-y09","d01-x01-y10"]
analyses["6m"]["CLEO_2006_I691720" ] = ["d01-x01-y02","d01-x01-y03","d01-x01-y04","d01-x01-y05",
"d01-x01-y07","d01-x01-y08","d01-x01-y09","d01-x01-y10","d01-x01-y11",
"d01-x01-y12","d01-x01-y13","d01-x01-y14","d01-x01-y15","d01-x01-y17"]
analyses["6m"]["BESII_2008_I801210" ] = ["d01-x01-y03","d01-x01-y04","d01-x01-y05"]
analyses["6m"]["BESII_2008_I801208" ] = ["d01-x01-y03","d01-x01-y04","d01-x01-y05","d01-x01-y06"]
analyses["6m"]["MARKI_1982_I169326" ] = ["d06-x01-y01"]
analyses["6m"]["MARKI_1975_I100592" ] = ["d01-x01-y01","d02-x01-y01"]
analyses['6m']["BESII_2007_I750713" ] = ["d01-x01-y08","d01-x01-y09","d01-x01-y11",
"d01-x01-y12","d01-x01-y13","d01-x01-y14",
"d01-x01-y15","d01-x01-y16","d01-x01-y17","d01-x01-y18"]
analyses['6m']["SND_2016_I1473343" ] = ["d01-x01-y01"]
analyses['6m']["BESIII_2020_I1788734"] = ["d01-x01-y01"]
analyses['6m']["BABAR_2021_I1844422" ] = ["d01-x01-y01","d02-x01-y01","d03-x01-y01",
"d04-x01-y01","d05-x01-y01","d06-x01-y01"]
analyses['6m']["BESIII_2020_I1837725" ] = ["d01-x01-y01"]
analyses["6m"]["BABAR_2021_I1938254"] = ["d01-x01-y01","d02-x01-y01","d03-x01-y01","d04-x01-y01","d05-x01-y01"]
analyses["6m"]["CMD3_2022_I2108984"] = ["d01-x01-y01","d02-x01-y01","d02-x01-y02"]
analyses["6m"]["BABAR_2022_I2120528"] = ["d01-x01-y01","d02-x01-y01","d03-x01-y01","d04-x01-y01","d05-x01-y01",
"d06-x01-y01","d07-x01-y01","d08-x01-y01","d09-x01-y01","d10-x01-y01"]
+analyses["6m"]["BESIII_2025_I2872226"] = ["d01-x01-y01"]
analyses["6m"]["BESIII_2019_I1623214"] = ["d01-x01-y01"]
analyses["6m"]["BESIII_2017_I1607253"] = ["d01-x01-y01","d02-x01-y01"]
analyses["6m"]["BESIII_2022_I2165175"] = ["d01-x01-y01"]
analyses["6m"]["BESII_2009_I835937" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y06","d01-x01-y07"]
# other baryon processes
# p pbar pi0
analyses['Baryon']["BESIII_2017_I1509241" ] = ["d01-x01-y01"]
analyses['Baryon']["BESIII_2024_I2785382" ] = ["d01-x01-y01"]
# p pbar omega/eta
analyses['Baryon']["BESIII_2021_I1845443" ] = ["d01-x01-y01","d02-x01-y01"]
analyses['Baryon']["BESIII_2021_I1859248" ] = ["d01-x01-y01"]
analyses["Baryon"]["BESIII_2021_I1929314" ] = ["d01-x01-y04","d01-x01-y08"]
analyses["Baryon"]["BESIII_2018_I1681638" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03"]
analyses["Baryon"]["BESIII_2022_I2512962" ] = ["d01-x01-y01"]
analyses["Baryon"]["BESIII_2022_I2593281" ] = ["d01-x01-y01"]
analyses["Baryon"]["BESIII_2023_I2674370" ] = ["d01-x01-y01"]
analyses["Baryon"]["BESIII_2023_I2661512" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["Baryon"]["BESIII_2024_I2802333" ] = ["d01-x01-y01","d02-x01-y01"]
# DD
# D+D- D0Dbar0
analyses["DD"]["BABAR_2008_I776519" ] = ["d01-x01-y01","d01-x01-y02"]
analyses["DD"]["BELLE_2008_I757220" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["DD"]["BESIII_2017_I1794583" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["DD"]["BESIII_2024_I2755997" ] = ["d01-x01-y01","d02-x01-y01"]
# D* D
analyses["DD"]["BELLE_2017_I1613517" ] = ["d01-x01-y01"]
analyses["DD"]["BESIII_2022_I1989527" ] = ["d02-x01-y03"]
# D* D*
analyses["DD"]["BELLE_2017_I1613517" ].append("d01-x01-y02")
analyses["DD"]["BESIII_2022_I1989527" ].append("d01-x01-y03")
# D D pi
analyses["DD"]["BELLE_2008_I759073" ] = ["d01-x01-y01"]
# D* D pi
analyses["DD"]["BESIII_2018_I1685535" ] = ["d01-x01-y01","d02-x01-y01"]
# D* D* pi
analyses["DD"]["BESIII_2023_I2645388" ] = ["d01-x01-y01","d02-x01-y01"]
# DsDs
analyses["DD"]["BABAR_2010_I864027" ] = ["d01-x01-y01"]
analyses["DD"]["BELLE_2011_I878228" ] = ["d01-x01-y01"]
analyses["DD"]["BESIII_2024_I2771116" ] = ["d01-x01-y01","d02-x01-y01"]
# DsDs*
analyses["DD"]["BABAR_2010_I864027" ].append("d01-x01-y02")
analyses["DD"]["BELLE_2011_I878228" ].append("d01-x01-y02")
# Ds*Ds*
analyses["DD"]["BABAR_2010_I864027" ].append("d01-x01-y03")
analyses["DD"]["BELLE_2011_I878228" ].append("d01-x01-y03")
analyses["DD"]["BESIII_2023_I2660849" ] = ["d01-x01-y01"]
# D_s1(2536) Ds
analyses["DD"]["BELLE_2019_I1762826" ] = ["d01-x01-y01"]
# D_s1(2460) Ds
analyses["DD"]["BESIII_2020_I1795949" ] = ["d01-x01-y01"]
# D_s1(2460) D*s
analyses["DD"]["BESIII_2020_I1795949" ].append("d02-x01-y01")
# D_s2* D_s
analyses["DD"]["BELLE_2020_I1789775" ] = ["d01-x01-y01"]
# Lambda_c+ Lambda_c-
analyses["DD"]["BELLE_2008_I791660" ] = ["d01-x01-y01"]
analyses["DD"]["BESIII_2017_I1628093" ] = ["d01-x01-y01"]
analyses["DD"]["BESIII_2023_I2677290" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03","d01-x01-y04","d01-x01-y05"]
# pi pi J/psi
analyses["DD"]["BABAR_2012_I1107905" ] = ["d01-x01-y01"]
analyses["DD"]["BELLE_2007_I756012" ] = ["d01-x01-y01"]
analyses["DD"]["BELLE_2013_I1225975" ] = ["d01-x01-y01"]
analyses["DD"]["BESIII_2016_I1495838" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["DD"]["BESIII_2020_I1793431" ] = ["d01-x01-y01","d01-x01-y02","d03-x01-y01"]
analyses["DD"]["BESIII_2022_I2163048" ] = ["d01-x01-y01"]
# pi pi psi(2S)
analyses["DD"]["BABAR_2007_I729388" ] = ["d01-x01-y01"]
analyses["DD"]["BABAR_2014_I1204444" ] = ["d01-x01-y01"]
analyses["DD"]["BELLE_2007_I756643" ] = ["d01-x01-y01"]
analyses["DD"]["BELLE_2015_I1324785" ] = ["d01-x01-y01"]
analyses["DD"]["BESIII_2021_I1933191" ] = ["d01-x01-y03"]
# pi pi h_c
analyses["DD"]["BESIII_2017_I1494065" ] = ["d01-x01-y01","d02-x01-y01"]
# K K J/psi
analyses["DD"]["BELLE_2014_I1282602" ] = ["d01-x01-y01"]
analyses["DD"]["BESIII_2022_I2068180" ] = ["d01-x01-y01"]
# 3pi eta_c
analyses["DD"]["BESIII_2021_I1826422" ] = ["d01-x01-y01"]
# eta J/psi
analyses["DD"]["BESIII_2023_I2706428" ] = ["d01-x01-y01"]
# eta psi(2S)
analyses["DD"]["BESIII_2021_I1849633" ] = ["d01-x01-y01"]
# eta h_c
analyses["DD"]["BESIII_2017_I1596897" ] = ["d01-x01-y01"]
analyses["DD"]["BESIII_2024_I2775801" ] = ["d01-x01-y01"]
# gamma eta_c
analyses["DD"]["BESIII_2017_I1600581" ] = ["d01-x01-y01"]
# gamma chi_c
analyses["DD"]["BELLE_2018_I1700174" ] = ["d01-x01-y01"]
# omega chi_c
analyses["DD"]["BESIII_2015_I1406939" ] = ["d02-x01-y06","d03-x01-y06"]
# phi chi_c
analyses["DD"]["BESIII_2022_I2169640" ] = ["d01-x01-y01","d01-x01-y02"]
# needs sorting
analyses["DD"]["BELLE_2007_I723333" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["DD"]["BESIII_2016_I1457597" ] = ["d01-x01-y07"]
analyses["DD"]["BESIII_2015_I1355215" ] = ["d01-x01-y10"]
analyses["DD"]["BESIII_2015_I1377204" ] = ["d01-x01-y12"]
analyses["DD"]["CRYSTAL_BALL_1986_I238081"] = ["d02-x01-y01"]
analyses["DD"]["CLEOC_2008_I777917" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03",
"d02-x01-y01","d02-x01-y02","d02-x01-y03",
"d03-x01-y01","d03-x01-y02","d03-x01-y03",
"d04-x01-y01","d04-x01-y02",
"d05-x01-y01","d05-x01-y02"]
analyses["DD"]["BESIII_2014_I1323621" ] = ["d01-x01-y01"]
analyses["DD"]["BESIII_2019_I1723934" ] = ["d01-x01-y01"]
analyses["DD"]["BESIII_2019_I1756876" ] = ["d01-x01-y01","d01-x01-y02"]
analyses["DD"]["BESIII_2015_I1329785" ] = ["d01-x01-y08","d02-x01-y08","d03-x01-y08"]
analyses["DD"]["BESIII_2018_I1653121" ] = ["d01-x01-y01","d01-x01-y02"]
analyses["DD"]["BESIII_2020_I1762922" ] = ["d01-x01-y01"]
analyses["DD"]["BESIII_2018_I1633425" ] = ["d01-x01-y01"]
analyses["DD"]["BABAR_2009_I815035" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03","d02-x01-y01"]
analyses["DD"]["BES_1999_I508349" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03","d01-x01-y04"]
analyses["DD"]["BESIII_2021_I1867196" ] = ["d01-x01-y01","d02-x01-y01","d03-x01-y01"]
analyses["DD"]["BESIII_2020_I1784442" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["DD"]["BESIII_2021_I1880103" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["DD"]["BESIII_2022_I2129305" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["DD"]["BESIII_2022_I2050468" ] = ["d01-x01-y01"]
analyses["DD"]["BESIII_2023_I2158340" ] = ["d01-x01-y01"]
analyses["DD"]["BESIII_2017_I1644905" ] = ["d01-x01-y01","d01-x01-y02"]
analyses["DD"]["BESIII_2024_I2751879" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["DD"]["BESIII_2019_I1724671" ] = ["d01-x01-y01","d01-x01-y02"]
analyses["DD"]["BESIII_2014_I1258603" ] = ["d01-x01-y01"]
analyses["DD"]["BESIII_2012_I1126960" ] = ["d01-x01-y01"]
analyses["DD"]["BESIII_2019_I1725786" ] = ["d04-x01-y01","d06-x01-y01","d07-x01-y01","d08-x01-y01"]
analyses["DD"]["BESIII_2018_I1711382" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03","d01-x01-y04"]
analyses["DD"]["BESIII_2015_I1393996" ] = ["d01-x01-y01"]
analyses["DD"]["BESIII_2022_I2614215" ] = ["d01-x01-y01"]
analyses["DD"]["MARKIII_1987_I244856" ] = ["d01-x01-y01"]
analyses["DD"]["BESII_2008_I802372" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03"]
analyses["DD"]["CLEOC_2007_I761696" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03","d01-x01-y04"]
# BB
analyses["BB"]["BELLE_2008_I764099" ] = ["d01-x01-y01","d02-x01-y01",
"d03-x01-y01","d04-x01-y01"]
analyses["BB"]["BELLE_2016_I1389855" ] = ["d01-x01-y02","d01-x01-y03"]
analyses["BB"]["BELLE_2021_I1859137" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03"]
analyses["BB"]["BELLE_2024_I2791218" ] = ["d02-x01-y01","d02-x01-y02","d02-x01-y03"]
analyses["BB"]["CLEO_1991_I29927" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["BB"]["CLEO_1999_I474676" ] = ["d01-x01-y01","d01-x01-y02"]
analyses["BB"]["CUSB_1991_I325661" ] = ["d01-x01-y01"]
analyses["BB"]["BELLE_2018_I1678261" ] = ["d01-x01-y01"]
analyses["BB"]["BELLE_2015_I1358399" ] = ["d01-x01-y01"]
analyses["BB"]["BELLE_2014_I1309588" ] = ["d01-x01-y01","d01-x01-y02",
"d02-x01-y01","d02-x01-y02",
"d03-x01-y01","d03-x01-y02",]
analyses["BB"]["BELLE_2022_I2142648" ] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03"]
analyses["BB"]["BELLE_2015_I1411223" ] = ["d01-x01-y01","d01-x01-y02"]
analyses["BB"]["CLEOIII_2006_I694869"] = ["d01-x01-y01"]
analyses["BB"]["BELLE_2023_I2660525:MODE=SIGMA"] = ["d02-x01-y01","d02-x01-y02","d02-x01-y03","d02-x01-y04"]
# hyperons
# Lambda Lambdabar0
analyses["LL"]["BABAR_2007_I760730" ] = ["d01-x01-y01"]
analyses["LL"]["BESIII_2018_I1627871"] = ["d01-x01-y01"]
analyses["LL"]["BESIII_2019_I1726357"] = ["d01-x01-y01"]
analyses["LL"]["BESIII_2021_I1900124"] = ["d01-x01-y01"]
analyses["LL"]["BESIII_2023_I2637702"] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03",
"d02-x01-y01","d02-x01-y02","d02-x01-y03"]
analyses["LL"]["BESIII_2023_I2642062"] = ["d01-x01-y01"]
analyses["LL"]["DM2_1990_I297706" ] = ["d02-x01-y01"]
# Lambda0 SigmaBar0 +cc
analyses["LL"]["BABAR_2007_I760730" ].append("d03-x01-y01")
analyses["LL"]["BESIII_2023_I2686032"] = ["d01-x01-y01","d01-x01-y02"]
# Sigma+ Sigmabar-
analyses["LL"]["BELLE_2022_I2173361" ] = ["d02-x01-y01"]
analyses["LL"]["BESIII_2020_I1814783"] = ["d01-x01-y01","d02-x01-y01"]
analyses["LL"]["BESIII_2024_I2739177"] = ["d01-x01-y01"]
analyses["LL"]["BESIII_2024_I2748736"] = ["d01-x01-y01"]
# Sigma0 Sigmabar0
analyses["LL"]["BELLE_2022_I2173361" ].append("d01-x01-y01")
analyses["LL"]["BABAR_2007_I760730" ].append("d02-x01-y01")
analyses["LL"]["BESIII_2021_I1940960"] = ["d01-x01-y01"]
analyses["LL"]["BESIII_2024_I2863767"] = ["d01-x01-y01"]
# Sigma- Sigmabar+
analyses["LL"]["BESIII_2020_I1814783"].append("d01-x01-y02")
analyses["LL"]["BESIII_2020_I1814783"].append("d02-x01-y02")
# Xi- Xibar+
analyses["LL"]["BESIII_2019_I1758883"] = ["d01-x01-y05"]
analyses["LL"]["BESIII_2020_I1823448"] = ["d01-x01-y04"]
analyses["LL"]["BESIII_2023_I2695411"] = ["d01-x01-y01","d01-x01-y02"]
# Xi0 Xibar0
analyses["LL"]["BESIII_2021_I1866233"] = ["d01-x01-y01"]
analyses["LL"]["BESIII_2024_I2824143"] = ["d01-x01-y01"]
# Omega- Omegabar+
analyses["LL"]["BESIII_2022_I2611486"] = ["d01-x01-y01"]
# list the analysis if required and quit()
allProcesses=False
if "All" in opts.processes :
allProcesses=True
processes = sorted(list(analyses.keys()))
else :
processes = sorted(list(set(opts.processes)))
if(opts.list) :
for process in processes :
print (" ".join(analyses[process]))
quit()
if(opts.plot) :
output=""
for process in processes:
if process=="DD" :
output+= " -f/%s/%s" % ("BESIII_2017_I1604892","d02-x01-y01")
for ix in range(1,3) :
for iy in range(1,3) :
output+= " -f/%s/%s" % ("BESIII_2017_I1604892","d01-x0%s-y0%s"%(ix,iy))
for analysis in analyses[process] :
if(analysis=="CMD3_2019_I1770428") :
for iy in range(1,3) :
output+= " -f/%s/%s" % (analysis,"d02-x01-y0%s"%iy)
elif(analysis=="BES_1999_I508349") :
for ix in range(2,4) :
for iy in range(1,3) :
output+= " -f/%s/%s" % (analysis,"d0%s-x01-y0%s"%(ix,iy))
elif(analysis=="BESIII_2019_I1726357") :
for ix in range(2,4) :
output+= " -f/%s/%s" % (analysis,"d0%s-x01-y01"% ix)
elif(analysis=="BESIII_2020_I1775344") :
for ix in range(1,6) :
output+= " -f/%s/%s" % (analysis,"d07-x01-y0%s"% ix)
output+= " -f/%s/%s" % (analysis,"d08-x01-y0%s"% ix)
elif(analysis=="BESIII_2020_I1814783") :
for ix in range(1,3) :
output+= " -f/%s/%s" % (analysis,"d03-x01-y0%s"% ix)
elif(analysis=="SND_2020_I1809286") :
for ix in range(1,5) :
output+= " -f/%s/%s" % (analysis,"d04-x01-y0%s"% ix)
elif(analysis=="BESIII_2020_I1793431") :
for ix in range(1,5) :
for iy in range(1,3):
output+= " -f/%s/%s" % (analysis,"d02-x0%s-y0%s"% (ix,iy))
elif(analysis=="BESIII_2019_I1725786") :
for ix in range(1,4) :
output+= " -f/%s/%s" % (analysis,"d02-x01-y0%s"% ix)
if ix<3 : output+= " -f/%s/%s" % (analysis,"d01-x01-y0%s"% ix)
for iy in range(1,4):
output+= " -f/%s/%s" % (analysis,"d03-x0%s-y0%s"% (ix,iy))
elif(analysis=="BESIII_2018_I1711382") :
output+= " -f/%s/%s" % (analysis,"d02-x01-y01")
elif analysis == "BESIII_2015_I1393996" :
output+= " -f/%s/%s" % (analysis,"d03-x01-y01")
for ix in range(1,3) :
for iy in range(1,3):
output+= " -f/%s/%s" % (analysis,"d02-x0%s-y0%s"% (ix,iy))
for plot in analyses[process][analysis]:
if ":" in analysis :
analysis2=analysis.split(":")[0]
output+= " -e/%s/%s" % (analysis2,plot)
else :
output+= " -e/%s/%s" % (analysis,plot)
print (output)
quit()
# mapping of process to me to use
me = { "PiPi" : "MEee2Pions",
"KK" : "MEee2Kaons",
"3Pi" : "MEee3Pions",
"4Pi" : "MEee4Pions",
"EtaPiPi" : "MEee2EtaPiPi",
"EtaprimePiPi" : "MEee2EtaPrimePiPi",
"EtaPhi" : "MEee2EtaPhi",
"EtaOmega" : "MEee2EtaOmega",
"OmegaPi" : "MEee2OmegaPi",
"OmegaPiPi" : "MEee2OmegaPiPi",
"PhiPi" : "MEee2PhiPi",
"PiGamma" : "MEee2PiGamma",
"EtaGamma" : "MEee2EtaGamma",
"PPbar" : "MEee2PPbar",
"LL" : "MEee2LL" ,
"2K1Pi" : "MEee2KKPi" }
# get the particle masses from Herwig
particles = { "pi+" : 0., "pi0" : 0. ,"eta" : 0. ,"eta'" : 0. ,"phi" : 0. ,"omega" : 0. ,"p+" : 0. ,"K+" : 0.}
for val in particles :
tempTxt = "get /Herwig/Particles/%s:NominalMass\nget /Herwig/Particles/%s:WidthLoCut\n" % (val,val)
with open("temp.in",'w') as f:
f.write(tempTxt)
p = subprocess.Popen(["../src/Herwig", "read","temp.in"],stdout=subprocess.PIPE)
vals = p.communicate()[0].split()
mass = float(vals[0])-float(vals[1])
particles[val]=mass
os.remove("temp.in")
# minimum CMS energies for specific processes
minMass = { "PiPi" : 2.*particles["pi+"],
"KK" : 2.*particles["K+"],
"3Pi" : 2.*particles["pi+"]+particles["pi0"],
"4Pi" : 2.*particles["pi+"]+2.*particles["pi0"],
"EtaPiPi" : particles["eta"]+2.*particles["pi+"],
"EtaprimePiPi" : particles["eta'"]+2.*particles["pi+"],
"EtaPhi" : particles["phi"]+particles["eta"],
"EtaOmega" : particles["omega"]+particles["eta"],
"OmegaPi" : particles["omega"]+particles["pi0"],
"OmegaPiPi" : particles["omega"]+2.*particles["pi0"],
"PhiPi" : particles["phi"]+particles["pi0"],
"PiGamma" : particles["pi0"],
"EtaGamma" : particles["eta"],
"PPbar" : 2.*particles["p+"],
"LL" : 0.,
"2K1Pi" : 2.*particles["K+"]+particles["pi0"] }
# energies we need
energies={}
def nearestEnergy(en) :
Emin=0
delta=1e30
anals=[]
for val in energies :
if(abs(val-en)<delta) :
delta = abs(val-en)
Emin = val
anals=energies[val]
return (Emin,delta,anals)
for process in processes:
if(process not in analyses) : continue
matrix=""
if( process in me ) :
matrix = me[process]
if process == "DD" :
for energy in [4.23,4.26] :
if(energy in energies) :
if("BESIII_2017_I1604892" not in energies[energy][1]) :
energies[energy][1].append("BESIII_2017_I1604892")
if(matrix!="" and matrix not in energies[energy][0] and
minMass[process]<=energy) :
energies[energy][0].append(matrix)
else :
if(matrix=="") :
energies[energy]=[[],["BESIII_2017_I1604892"]]
elif(minMass[process]<=energy) :
energies[energy]=[[matrix],["BESIII_2017_I1604892"]]
if process == "2K2Pi" :
for energy in [2.125,2.396] :
if(energy in energies) :
if("BESIII_2020_I1775344" not in energies[energy][1]) :
energies[energy][1].append("BESIII_2020_I1775344")
if(matrix!="" and matrix not in energies[energy][0] and
minMass[process]<=energy) :
energies[energy][0].append(matrix)
else :
if(matrix=="") :
energies[energy]=[[],["BESIII_2020_I1775344"]]
elif(minMass[process]<=energy) :
energies[energy]=[[matrix],["BESIII_2020_I1775344"]]
for analysis in analyses[process] :
try :
aos=yoda.read(os.path.join(os.path.join(os.getcwd(),path),analysis+".yoda.gz"))
except :
try :
aos=yoda.read(os.path.join(os.path.join(os.getcwd(),path),analysis+".yoda.gz"))
except:
continue
if(len(aos)==0) : continue
for plot in analyses[process][analysis] :
histo = aos["/REF/%s/%s" %(analysis,plot)]
eTemp=[]
if "BELLE_2016_I1389855" == analysis :
etemp=[]
for b in aos["/REF/BELLE_2016_I1389855/d01-x01-y01"].bins() :
eTemp.append(b.val())
elif "BELLE_2024_I2791218" == analysis :
etemp=[]
for b in aos["/REF/BELLE_2024_I2791218/d01-x01-y01"].bins() :
eTemp.append(b.val())
elif hasattr(histo,'bins') :
for bin in histo.bins() :
if bin.edge(0) :
energy = bin.edge(0)
else :
energy = bin.mid(0)
if isinstance(energy, str) :
if "-" in energy and len(energy)>1:
elim =energy.split("-")
energy=0.5*(float(elim[0])+float(elim[1]))
+ elif "to" in energy and len(energy)>1:
+ elim =energy.split("to")
+ energy=0.5*(float(elim[0])+float(elim[1]))
elif analysis == "DM1_1979_I132828" and plot=="d01-x01-y01" :
if energy == '-' :
energy=985
elif analysis=="CMD3_2016_I1385598" and plot=="d01-x01-y06" :
if energy=="1900 (2012)" : energy=1900
try :
energy=float(energy)
except :
print("problem energy %s in %s %s" %(energy,analysis,plot))
quit()
eTemp.append(energy)
elif hasattr(histo,'points') :
for point in histo.points() :
eTemp.append(point.x())
else :
#print("Can't handle %s " % type(histo))
continue
eTemp=np.array(eTemp)
if(analysis=="KLOE_2009_I797438" or analysis=="KLOE_2005_I655225" or
analysis=="KLOE2_2017_I1634981" or analysis=="FENICE_1994_I377833") :
eTemp = np.sqrt(eTemp)
# plots with beam energy not sqrt(s)
elif (analysis == "SND_2024_I2809929" or
analysis == "SND_2024_I2696331" ) :
eTemp *=2.
if(eTemp[0]>200) :
eTemp *= 0.001
for energy in eTemp :
emin,delta,anals = nearestEnergy(energy)
if(energy in energies) :
if(analysis not in energies[energy][1]) :
energies[energy][1].append(analysis)
if(matrix!="" and matrix not in energies[energy][0] and
minMass[process]<=energy) :
energies[energy][0].append(matrix)
elif(delta<1e-7) :
if(analysis not in anals[1]) :
anals[1].append(analysis)
if(matrix!="" and matrix not in anals[0] and
minMass[process]<=energy) :
anals[0].append(matrix)
else :
if(matrix=="") :
energies[energy]=[[],[analysis]]
elif(minMass[process]<=energy) :
energies[energy]=[[matrix],[analysis]]
with open("python/LowEnergy-EE-Perturbative.in", 'r') as f:
templateText = f.read()
perturbative=Template( templateText )
with open("python/LowEnergy-EE-NonPerturbative.in", 'r') as f:
templateText = f.read()
nonPerturbative=Template( templateText )
targets=""
for energy in sorted(energies) :
anal=""
for analysis in energies[energy][1]:
anal+= "insert /Herwig/Analysis/Rivet:Analyses 0 %s\n" %analysis
proc=""
matrices = energies[energy][0]
if(allProcesses) : matrices = me.values()
for matrix in matrices:
proc+="insert SubProcess:MatrixElements 0 %s\n" % matrix
proc+="set %s:Flavour %s\n" % (matrix,opts.flavour)
maxflavour =5
if(energy<thresholds[1]) :
maxflavour=2
elif(energy<thresholds[2]) :
maxflavour=3
elif(energy<thresholds[3]) :
maxflavour=4
+ if hepmc :
+ anal +="\nread snippets/HepMC.in\n"
# input file for perturbative QCD
if(opts.perturbative and energy> thresholds[0]) :
inputPerturbative = perturbative.substitute({"ECMS" : "%8.6f" % energy, "ANALYSES" : anal,
"lepton" : "", "maxflavour" : maxflavour, 'name' : "EE"})
with open(opts.dest+"/Rivet-LowEnergy-EE-Perturbative-%8.6f.in" % energy ,'w') as f:
f.write(inputPerturbative)
targets += "Rivet-LowEnergy-EE-Perturbative-%8.6f.yoda " % energy
# input file for currents
if(opts.nonPerturbative and proc!="") :
inputNonPerturbative = nonPerturbative.substitute({"ECMS" : "%8.6f" % energy, "ANALYSES" : anal,
"processes" : proc, 'name' : "EE"})
with open(opts.dest+"/Rivet-LowEnergy-EE-NonPerturbative-%8.6f.in" % energy ,'w') as f:
f.write(inputNonPerturbative)
targets += "Rivet-LowEnergy-EE-NonPerturbative-%8.6f.yoda " % energy
print (targets)
diff --git a/Tests/python/LowEnergy-GammaGamma-NonPerturbative.in b/Tests/python/LowEnergy-GammaGamma-NonPerturbative.in
--- a/Tests/python/LowEnergy-GammaGamma-NonPerturbative.in
+++ b/Tests/python/LowEnergy-GammaGamma-NonPerturbative.in
@@ -1,51 +1,50 @@
# -*- ThePEG-repository -*-
read snippets/EECollider.in
##################################################
# Selected the hard process
##################################################
# leading-order processes
##################################################
cd /Herwig/MatrixElements
create Herwig::MEGammaGamma2X MEgg2PiPi HwMEGammaGamma.so
create Herwig::GammaGamma2PiPiAmplitude GG2PiPiAmp
set GG2PiPiAmp:Mode 1
set MEgg2PiPi:Amplitude GG2PiPiAmp
create Herwig::MEGammaGamma2X MEgg2KK HwMEGammaGamma.so
create Herwig::GammaGamma2PiPiAmplitude GG2KKAmp
set GG2KKAmp:Mode 2
set MEgg2KK:Amplitude GG2KKAmp
# set the process
${processes}
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set EventGenerator:EventHandler:LuminosityFunction:Energy ${ECMS}
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
set /Herwig/Particles/gamma:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/pi0:Stable Stable
set /Herwig/Particles/K_S0:Stable Stable
cd /Herwig/Generators
##################################################
## prepare for Rivet analysis or HepMC output
## when running with parton shower
##################################################
-create ThePEG::RivetAnalysis /Herwig/Analysis/Rivet RivetAnalysis.so
-insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Rivet
+read snippets/Rivet.in
${ANALYSES}
cd /Herwig/EventHandlers
set EventHandler:BeamA /Herwig/Particles/gamma
set EventHandler:BeamB /Herwig/Particles/gamma
###################################################
# Save run for later usage with 'Herwig run'
##################################################
cd /Herwig/Generators
set EventGenerator:MaxErrors 10000
set EventGenerator:EventHandler:StatLevel Full
set EventGenerator:EventHandler:CascadeHandler NULL
saverun Rivet-LowEnergy-GammaGamma-NonPerturbative-${ECMS} EventGenerator
diff --git a/Tests/python/LowEnergy-GammaGamma-Perturbative.in b/Tests/python/LowEnergy-GammaGamma-Perturbative.in
--- a/Tests/python/LowEnergy-GammaGamma-Perturbative.in
+++ b/Tests/python/LowEnergy-GammaGamma-Perturbative.in
@@ -1,36 +1,35 @@
# -*- ThePEG-repository -*-
read snippets/EECollider.in
##################################################
# Selected the hard process
##################################################
# leading-order processes
##################################################
cd /Herwig/MatrixElements
# default gamma gamma -> q qbar
${process}
set /Herwig/Particles/pi0:Stable Stable
set /Herwig/Particles/K_S0:Stable Stable
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set EventGenerator:EventHandler:LuminosityFunction:Energy ${ECMS}
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
set /Herwig/Particles/gamma:PDF /Herwig/Partons/NoPDF
cd /Herwig/EventHandlers
set EventHandler:BeamA /Herwig/Particles/gamma
set EventHandler:BeamB /Herwig/Particles/gamma
cd /Herwig/Generators
-create ThePEG::RivetAnalysis /Herwig/Analysis/Rivet RivetAnalysis.so
-insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Rivet
+read snippets/Rivet.in
${ANALYSES}
###################################################
# Save run for later usage with 'Herwig run'
##################################################
set EventGenerator:MaxErrors 10000
saverun Rivet-LowEnergy-GammaGamma-Perturbative-${ECMS} EventGenerator
diff --git a/Tests/python/LowEnergy-GammaGamma-Resonance.in b/Tests/python/LowEnergy-GammaGamma-Resonance.in
--- a/Tests/python/LowEnergy-GammaGamma-Resonance.in
+++ b/Tests/python/LowEnergy-GammaGamma-Resonance.in
@@ -1,104 +1,103 @@
# -*- ThePEG-repository -*-
read snippets/EECollider.in
##################################################
# Selected the hard process
##################################################
# leading-order processes
##################################################
cd /Herwig/MatrixElements
create Herwig::MEGammaGamma2X MEgg2f0_980 HwMEGammaGamma.so
create Herwig::GammaGamma2ScalarAmplitude GG2f0_980Amp
set GG2f0_980Amp:MassOption OffShell
set GG2f0_980Amp:Particle /Herwig/Particles/f_0
set GG2f0_980Amp:FTT 0.0293433
set MEgg2f0_980:Amplitude GG2f0_980Amp
create Herwig::MEGammaGamma2X MEgg2f0_1370 HwMEGammaGamma.so
create Herwig::GammaGamma2ScalarAmplitude GG2f0_1370Amp
set GG2f0_1370Amp:MassOption OffShell
set GG2f0_1370Amp:Particle /Herwig/Particles/f'_0
set GG2f0_1370Amp:FTT 0.134229
set MEgg2f0_1370:Amplitude GG2f0_1370Amp
create Herwig::MEGammaGamma2X MEgg2f0_1710 HwMEGammaGamma.so
create Herwig::GammaGamma2ScalarAmplitude GG2f0_1710Amp
set GG2f0_1710Amp:MassOption OffShell
set GG2f0_1710Amp:Particle /Herwig/Particles/f_0(1710)
set GG2f0_1710Amp:FTT 0.0130292
set MEgg2f0_1710:Amplitude GG2f0_1710Amp
create Herwig::MEGammaGamma2X MEgg2a0_980 HwMEGammaGamma.so
create Herwig::GammaGamma2ScalarAmplitude GG2a0_980Amp
set GG2a0_980Amp:MassOption OffShell
set GG2a0_980Amp:Particle /Herwig/Particles/a_00
set GG2a0_980Amp:FTT 0.0296427
set MEgg2a0_980:Amplitude GG2a0_980Amp
create Herwig::MEGammaGamma2X MEgg2a0_1450 HwMEGammaGamma.so
create Herwig::GammaGamma2ScalarAmplitude GG2a0_1450Amp
set GG2a0_1450Amp:MassOption OffShell
set GG2a0_1450Amp:Particle /Herwig/Particles/a'_00
set GG2a0_1450Amp:FTT 0.045237
set MEgg2a0_1450:Amplitude GG2a0_1450Amp
create Herwig::MEGammaGamma2X MEgg2a2_1320 HwMEGammaGamma.so
create Herwig::GammaGamma2TensorAmplitude GG2a2_1320Amp
set GG2a2_1320Amp:MassOption OffShell
set GG2a2_1320Amp:Particle /Herwig/Particles/a_20
set GG2a2_1320Amp:FTT0 0.
set GG2a2_1320Amp:FTT2 0.0581115
set MEgg2a2_1320:Amplitude GG2a2_1320Amp
create Herwig::MEGammaGamma2X MEgg2f2_1270 HwMEGammaGamma.so
create Herwig::GammaGamma2TensorAmplitude GG2f2_1270Amp
set GG2f2_1270Amp:MassOption OffShell
set GG2f2_1270Amp:Particle /Herwig/Particles/f_2
set GG2f2_1270Amp:FTT0 0.
set GG2f2_1270Amp:FTT2 0.0921718
set MEgg2f2_1270:Amplitude GG2f2_1270Amp
create Herwig::MEGammaGamma2X MEgg2f2_1525 HwMEGammaGamma.so
create Herwig::GammaGamma2TensorAmplitude GG2f2_1525Amp
set GG2f2_1525Amp:MassOption OffShell
set GG2f2_1525Amp:Particle /Herwig/Particles/f'_2
set GG2f2_1525Amp:FTT0 0.
set GG2f2_1525Amp:FTT2 0.0178537
set MEgg2f2_1525:Amplitude GG2f2_1525Amp
# set the process
insert SubProcess:MatrixElements 0 MEgg2f0_980
insert SubProcess:MatrixElements 0 MEgg2f0_1710
insert SubProcess:MatrixElements 0 MEgg2a0_980
insert SubProcess:MatrixElements 0 MEgg2a0_1450
insert SubProcess:MatrixElements 0 MEgg2a2_1320
insert SubProcess:MatrixElements 0 MEgg2f2_1270
insert SubProcess:MatrixElements 0 MEgg2f2_1525
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set EventGenerator:EventHandler:LuminosityFunction:Energy ${ECMS}
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
set /Herwig/Particles/gamma:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/pi0:Stable Stable
set /Herwig/Particles/K_S0:Stable Stable
cd /Herwig/Generators
##################################################
## prepare for Rivet analysis or HepMC output
## when running with parton shower
##################################################
-create ThePEG::RivetAnalysis /Herwig/Analysis/Rivet RivetAnalysis.so
-insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Rivet
+read snippets/Rivet.in
${ANALYSES}
cd /Herwig/EventHandlers
set EventHandler:BeamA /Herwig/Particles/gamma
set EventHandler:BeamB /Herwig/Particles/gamma
###################################################
# Save run for later usage with 'Herwig run'
##################################################
cd /Herwig/Generators
set EventGenerator:MaxErrors 10000
set EventGenerator:EventHandler:StatLevel Full
set EventGenerator:EventHandler:CascadeHandler NULL
saverun Rivet-LowEnergy-GammaGamma-Resonance-${ECMS} EventGenerator
diff --git a/Tests/python/LowEnergy-Photon.py.in b/Tests/python/LowEnergy-Photon.py.in
--- a/Tests/python/LowEnergy-Photon.py.in
+++ b/Tests/python/LowEnergy-Photon.py.in
@@ -1,360 +1,364 @@
#! @PYTHON@
# -*- mode: python -*-
from __future__ import print_function
import yoda,os,math,subprocess,optparse
from string import Template
import numpy as np
# get the path for the rivet data
p = subprocess.Popen(["rivet-config", "--datadir"],stdout=subprocess.PIPE)
path=p.communicate()[0].strip().decode("UTF-8")
#Define the arguments
op = optparse.OptionParser(usage=__doc__)
op.add_option("--process" , dest="processes" , default=[], action="append")
op.add_option("--path" , dest="path" , default=path)
op.add_option("--non-perturbative", dest="nonPerturbative" , default=False, action="store_true")
op.add_option("--perturbative" , dest="perturbative" , default=False, action="store_true")
op.add_option("--resonance" , dest="resonance" , default=False, action="store_true")
op.add_option("--dest" , dest="dest" , default="Rivet")
op.add_option("--list" , dest="list" , default=False, action="store_true")
op.add_option("--plots" , dest="plot" , default=False, action="store_true")
opts, args = op.parse_args()
path=opts.path
+hepmc=os.getenv('OUTPUT_HEPMC', False)
+if hepmc != False : hepmc=True
thresholds = [0.7,2.*.5,2.*1.87,2.*5.28]
# the list of analyses and processes
analyses = { 'KK' : {}, 'PiPi' : {}, 'PPbar' : {}, "3Pi" : {},
"EtaPi" : {}, "4Pi" : {}, "EtaEta" : {}, "EtaOmega" : {},
"2K1Pi" : {}, "2K2Pi" : {}, "4K" : {}, "6m" : {},
"EtaPiPi" : {}, "EtaPrimePiPi" : {}, "OmegaPi" : {}, "PiGamma" : {},
"EtaGamma" : {}, "PhiPi" : {}, "OmegaPiPi" : {}, "DD" : {},
"BB" : {}, "5Pi" : {}, "LL" : {}, "Baryon" : {} }
# pi+pi-
analyses["PiPi"]["ALEPH_2003_I626022" ] = ["d03-x01-y01"]
analyses["PiPi"]["BELLE_2005_I667712" ] = ["d01-x01-y02",
"d03-x01-y01","d03-x01-y02","d03-x01-y03",
"d03-x01-y04","d03-x01-y05","d03-x01-y06",
"d05-x01-y01","d05-x01-y02","d05-x01-y03",
"d05-x01-y04","d05-x01-y05","d05-x01-y06"]
analyses["PiPi"]["BELLE_2007_I749358" ] = ["d01-x01-y01"]
analyses["PiPi"]["CELLO_1992_I345437" ] = ["d01-x01-y01"]
analyses["PiPi"]["CLEO_1994_I372230" ] = ["d01-x01-y01"]
analyses["PiPi"]["MARKII_1984_I195739" ] = ["d01-x01-y01"]
analyses["PiPi"]["MARKII_1986_I220003" ] = ["d01-x01-y01","d01-x01-y02"]
analyses["PiPi"]["MARKII_1990_I304882" ] = ["d01-x01-y01",
"d02-x01-y01","d02-x01-y02","d02-x01-y03",
"d02-x01-y04","d02-x01-y05","d02-x01-y06"]
analyses["PiPi"]["PLUTO_1984_I204487" ] = ["d01-x01-y01"]
analyses["PiPi"]["TPC_1986_I228072" ] = ["d01-x01-y01","d04-x01-y01"]
analyses["PiPi"]["VENUS_1995_I392360" ] = ["d01-x01-y01"]
# pi0pi0
analyses["PiPi"]["BELLE_2009_I815978" ] = ["d31-x01-y01","d31-x01-y02"]
analyses["PiPi"]["CRYSTAL_BALL_1982_I168793"] = ["d01-x01-y01"]
analyses["PiPi"]["CRYSTAL_BALL_1990_I294492"] = ["d01-x01-y01"]
analyses["PiPi"]["JADE_1990_I295180" ] = ["d01-x01-y01"]
# K+K-
analyses["KK" ]["ALEPH_2003_I626022" ] = ["d04-x01-y01"]
analyses["KK" ]["BELLE_2003_I629334" ] = ["d01-x01-y01"]
analyses["KK" ]["BELLE_2005_I667712" ] = ["d01-x01-y01",
"d04-x01-y01","d04-x01-y02","d04-x01-y03",
"d04-x01-y04","d04-x01-y05","d04-x01-y06",
"d06-x01-y01","d06-x01-y02","d06-x01-y03",
"d06-x01-y04","d06-x01-y05","d06-x01-y06"]
analyses["KK" ]["CLEO_1994_I372230" ] = ["d01-x01-y01"]
analyses["KK" ]["MARKII_1984_I195739" ] = ["d01-x01-y01"]
analyses["KK" ]["MARKII_1986_I220003" ] = ["d01-x01-y01","d01-x01-y02"]
analyses["KK" ]["TPC_1986_I228072" ] = ["d05-x01-y01"]
# K0K0
analyses["KK" ]["BELLE_2013_I1245023" ] = ["d01-x01-y01","d01-x01-y02"]
# Eta Eta
analyses["EtaEta"]["BELLE_2010_I862260" ] = ["d01-x01-y01","d01-x01-y02"]
# Eta Pi
analyses["EtaPi"]["BELLE_2009_I822474" ] = ["d01-x01-y01"]
analyses["EtaPi"]["CRYSTAL_BALL_1986_I217547" ] = ["d01-x01-y01"]
# 3 pions
analyses["3Pi"]["ARGUS_1997_I420421" ] = ["d01-x01-y01","d02-x01-y01","d03-x01-y05",
"d04-x01-y03","d05-x01-y01"]
analyses["3Pi"]["TASSO_1986_I228876" ] = ["d01-x01-y01"]
# 4 pions
analyses["4Pi"]["ARGUS_1989_I266416" ] = ["d01-x01-y01","d02-x01-y01",
"d03-x01-y01","d04-x01-y01"]
analyses["4Pi"]["CELLO_1989_I267081" ] = ["d01-x01-y01","d02-x01-y01"]
analyses["4Pi"]["TASSO_1982_I180755" ] = ["d01-x01-y01"]
# proton antiproton
analyses["PPbar" ]["ARGUS_1989_I267759" ] = ["d02-x01-y01"]
analyses["PPbar" ]["BELLE_2005_I677625" ] = ["d01-x01-y01"]
analyses["PPbar" ]["CLEO_1994_I358510" ] = ["d01-x01-y01"]
analyses["PPbar" ]["JADE_1986_I231554" ] = ["d01-x01-y01"]
analyses["PPbar" ]["TASSO_1983_I191417" ] = ["d01-x01-y01"]
analyses["PPbar" ]["TPC_1987_I246557" ] = ["d01-x01-y01"]
# other baryons
analyses["Baryon"]["BELLE_2016_I1444981" ] = ["d01-x01-y01","d02-x01-y01"]
# K_0S K+/- pi -/+
analyses["2K1Pi"]["CELLO_1989_I266414" ] = ["d01-x01-y01"]
# K*K* and various 2K2pi states
analyses["2K2Pi"]["ARGUS_1987_I248680"] = ["d01-x01-y01","d02-x01-y01","d03-x01-y01","d04-x01-y01",
"d05-x01-y01","d05-x01-y02","d05-x01-y03","d05-x01-y04","d05-x01-y05"]
analyses["2K2Pi"]["ARGUS_1988_I262713"] = ["d01-x01-y01","d02-x01-y01","d03-x01-y01","d04-x01-y01"]
analyses["2K2Pi"]["ARGUS_1994_I372451"] = ["d01-x01-y01","d02-x01-y01"]
analyses["2K2Pi"]["ARGUS_2000_I511512" ] = ["d03-x01-y01","d03-x01-y02","d03-x01-y03","d03-x01-y04",
"d04-x01-y01","d04-x01-y02","d04-x01-y03","d04-x01-y04",
"d05-x01-y01","d05-x01-y02","d05-x01-y03","d05-x01-y04",
"d06-x01-y01","d06-x01-y02",
"d07-x01-y01","d07-x01-y02","d07-x01-y03",
"d08-x01-y01","d08-x01-y02","d08-x01-y03",
"d09-x01-y01","d09-x01-y02",
"d10-x01-y01","d10-x01-y02",
"d11-x01-y01"]
# eta' pipi
analyses["EtaPrimePiPi"]["BELLE_2018_I1672149"] = ["d01-x01-y01","d02-x01-y01"]
# 6 meson final-states
analyses["6m"]["ARGUS_1996_I403304"] = [ "d01-x01-y01","d01-x01-y02","d01-x01-y03"]
analyses["6m"]["BELLE_2012_I1090664"] = ["d01-x01-y01","d01-x01-y02",
"d01-x02-y01","d01-x02-y02",
"d01-x03-y01","d01-x03-y02"]
analyses["6m"]["ARGUS_1987_I247567"] = ["d01-x01-y01","d02-x01-y01"]
analyses["6m"]["ARGUS_1988_I260828"] = ["d01-x01-y01"]
analyses["6m"]["ARGUS_1991_I296187"] = ["d02-x01-y01","d03-x01-y01","d05-x01-y01"]
analyses["6m"]["ARGUS_1991_I315058"] = ["d01-x01-y01","d01-x01-y02","d01-x01-y03"]
# hyperons
analyses["LL"]["BELLE_2006_I727063" ] = ["d01-x01-y01","d01-x01-y02"]
analyses["LL"]["CLEOII_1997_I439745"] = ["d01-x01-y01"]
# list the analysis if required and quit()
allProcesses=False
if "All" in opts.processes :
allProcesses=True
processes = sorted(list(analyses.keys()))
else :
processes = sorted(list(set(opts.processes)))
if(opts.list) :
for process in processes :
print (" ".join(analyses[process]))
quit()
if(opts.plot) :
output=""
for process in processes:
for analysis in analyses[process] :
if(analysis=="CELLO_1992_I345437") :
for iy in range(1,22) :
output+= " -f/%s/%s" % (analysis,"d02-x01-y%02d"%iy)
elif(analysis=="VENUS_1995_I392360") :
for iy in range(2,12) :
output+= " -f/%s/%s" % (analysis,"d%02d-x01-y01"%iy)
elif(analysis=="ALEPH_2003_I626022") :
if process =="PiPi" :
output+= " -f/%s/%s" % (analysis,"d01-x01-y01")
elif process =="KK" :
output+= " -f/%s/%s" % (analysis,"d02-x01-y01")
elif(analysis=="BELLE_2003_I629334") :
for ix in range(2,8) :
for iy in range(1,5) :
if(ix==8 and iy>1) : continue
output+= " -f/%s/%s" % (analysis,"d%02d-x01-y%02d"%(ix,iy))
elif(analysis=="BELLE_2007_I749358") :
for iy in range(2,100) :
output+= " -f/%s/%s" % (analysis,"d%02d-x01-y01"%iy)
for iy in range(100,142) :
output+= " -f/%s/%s" % (analysis,"d%03d-x01-y01"%iy)
elif(analysis=="BELLE_2010_I862260") :
for iy in range(2,44) :
output+= " -f/%s/%s" % (analysis,"d%02d-x01-y01"%iy)
elif(analysis=="BELLE_2009_I822474") :
for iy in range(2,76) :
output+= " -f/%s/%s" % (analysis,"d%02d-x01-y01"%iy)
elif(analysis=="BELLE_2013_I1245023") :
for iy in range(2,41) :
for iz in range(1,4) :
output+= " -f/%s/%s" % (analysis,"d%02d-x01-y0%s"%(iy,iz))
elif(analysis=="BELLE_2005_I677625") :
for iy in range(2,7) :
for iz in range(1,4) :
if iy==6 and iz ==3 : break
output+= " -f/%s/%s" % (analysis,"d%02d-x01-y0%s"%(iy,iz))
elif(analysis=="BELLE_2009_I815978") :
for iy in range(1,31) :
for iz in range(1,4) :
if iy==30 and iz ==2 : break
output+= " -f/%s/%s" % (analysis,"d%02d-x01-y0%s"%(iy,iz))
elif(analysis=="CLEO_1994_I358510") :
for iy in range(2,4) :
output+= " -f/%s/%s" % (analysis,"d%02d-x01-y01"%iy)
elif(analysis=="CLEO_1994_I358510" or analysis=="TASSO_1983_I191417" or
analysis=="CRYSTAL_BALL_1986_I217547") :
for iy in range(1,3) :
output+= " -f/%s/%s" % (analysis,"d02-x01-y%02d"%iy)
elif(analysis=="JADE_1986_I231554" or analysis=="CRYSTAL_BALL_1982_I168793") :
output+= " -f/%s/%s" % (analysis,"d02-x01-y01")
elif(analysis=="ARGUS_1989_I267759") :
output+= " -f/%s/%s" % (analysis,"d01-x01-y01")
elif(analysis=="TPC_1987_I246557") :
for iy in range(1,3) :
output+= " -f/%s/%s" % (analysis,"d03-x01-y%02d"%iy)
elif(analysis=="CRYSTAL_BALL_1990_I294492") :
for iy in range(1,8) :
output+= " -f/%s/%s" % (analysis,"d02-x01-y%02d"%iy)
for plot in analyses[process][analysis]:
output+= " -e/%s/%s" % (analysis,plot)
print (output)
quit()
# mapping of process to me to use
me = { "PiPi" : "MEgg2PiPi",
"KK" : "MEgg2KK"}
# get the particle masses from Herwig
particles = { "pi+" : 0., "pi0" : 0. ,"eta" : 0. ,"eta'" : 0. ,"phi" : 0. ,"omega" : 0. ,"p+" : 0. ,"K+" : 0.}
for val in particles :
tempTxt = "get /Herwig/Particles/%s:NominalMass\nget /Herwig/Particles/%s:WidthLoCut\n" % (val,val)
with open("temp.in",'w') as f:
f.write(tempTxt)
p = subprocess.Popen(["../src/Herwig", "read","temp.in"],stdout=subprocess.PIPE)
vals = p.communicate()[0].split()
mass = float(vals[0])-float(vals[1])
particles[val]=mass
os.remove("temp.in")
# minimum CMS energies for specific processes
minMass = { "PiPi" : 2.*particles["pi+"],
"KK" : 2.*particles["K+"],
"3Pi" : 2.*particles["pi+"]+particles["pi0"],
"4Pi" : 2.*particles["pi+"]+2.*particles["pi0"],
"EtaPiPi" : particles["eta"]+2.*particles["pi+"],
"EtaprimePiPi" : particles["eta'"]+2.*particles["pi+"],
"EtaPhi" : particles["phi"]+particles["eta"],
"EtaOmega" : particles["omega"]+particles["eta"],
"OmegaPi" : particles["omega"]+particles["pi0"],
"OmegaPiPi" : particles["omega"]+2.*particles["pi0"],
"PhiPi" : particles["phi"]+particles["pi0"],
"PiGamma" : particles["pi0"],
"EtaGamma" : particles["eta"],
"PPbar" : 2.*particles["p+"],
"LL" : 0.,
"2K1Pi" : 2.*particles["K+"]+particles["pi0"] }
# energies we need
energies={}
def nearestEnergy(en) :
Emin=0
delta=1e30
anals=[]
for val in energies :
if(abs(val-en)<delta) :
delta = abs(val-en)
Emin = val
anals=energies[val]
return (Emin,delta,anals)
for process in processes:
if(process not in analyses) : continue
matrix=""
if( process in me ) :
matrix = me[process]
for analysis in analyses[process] :
try :
aos=yoda.read(os.path.join(os.path.join(os.getcwd(),path),analysis+".yoda.gz"))
except :
try :
aos=yoda.read(os.path.join(os.path.join(os.getcwd(),path),analysis+".yoda.gz"))
except:
continue
if(len(aos)==0) : continue
for plot in analyses[process][analysis] :
histo = aos["/REF/%s/%s" %(analysis,plot)]
eTemp=[]
if hasattr(histo,'bins') :
for bin in histo.bins() :
if bin.edge(0) :
energy = bin.edge(0)
else :
energy = bin.mid(0)
if isinstance(energy, str) :
if "-" in energy :
temp = energy.split("-")
energy = 0.5*(float(temp[0])+float(temp[1]))
energy=float(energy)
eTemp.append(energy)
elif hasattr(histo,'points') :
for point in histo.points() :
eTemp.append(point.x())
else :
#print("Can't handle %s " % type(histo))
continue
eTemp=np.array(eTemp)
if(analysis=="KLOE_2009_I797438" or
analysis=="KLOE_2005_I655225" or
analysis=="KLOE2_2017_I1634981" or
analysis=="FENICE_1994_I377833") :
eTemp = np.sqrt(eTemp)
if(eTemp[0]>200) :
eTemp *= 0.001
for energy in eTemp:
emin,delta,anals = nearestEnergy(energy)
if(energy in energies) :
if(analysis not in energies[energy][1]) :
energies[energy][1].append(analysis)
if(matrix!="" and matrix not in energies[energy][0] and
minMass[process]<=energy) :
energies[energy][0].append(matrix)
elif(delta<1e-7) :
if(analysis not in anals[1]) :
anals[1].append(analysis)
if(matrix!="" and matrix not in anals[0] and
minMass[process]<=energy) :
anals[0].append(matrix)
else :
if(matrix=="") :
energies[energy]=[[],[analysis]]
elif(minMass[process]<=energy) :
energies[energy]=[[matrix],[analysis]]
with open("python/LowEnergy-GammaGamma-Perturbative.in", 'r') as f:
templateText = f.read()
perturbative=Template( templateText )
with open("python/LowEnergy-GammaGamma-NonPerturbative.in", 'r') as f:
templateText = f.read()
nonPerturbative=Template( templateText )
with open("python/LowEnergy-GammaGamma-Resonance.in", 'r') as f:
templateText = f.read()
resonance=Template( templateText )
targets=""
for energy in sorted(energies) :
anal=""
for analysis in energies[energy][1]:
anal+= "insert /Herwig/Analysis/Rivet:Analyses 0 %s\n" %analysis
proc=""
matrices = energies[energy][0]
for matrix in matrices:
proc+="insert SubProcess:MatrixElements 0 %s\n" % matrix
maxflavour =5
if(energy<thresholds[1]) :
maxflavour=2
elif(energy<thresholds[2]) :
maxflavour=3
elif(energy<thresholds[3]) :
maxflavour=4
+ if hepmc :
+ anal +="\nread snippets/HepMC.in\n"
# input file for perturbative QCD
if(opts.perturbative and energy> thresholds[0]) :
process=""
for i in range(1,maxflavour+1) :
process+="cp MEgg2ff MEgg2qq%s\n" %i
process+="cp gg2ffAmp gg2fqq%sAmp\n" %i
process+="set MEgg2qq%s:Amplitude gg2fqq%sAmp\n" % (i,i)
process+="set gg2fqq%sAmp:Process %s\n" %(i,i+10)
process+="insert SubProcess:MatrixElements 0 MEgg2qq%s\n" % i
inputPerturbative = perturbative.substitute({"ECMS" : "%8.6f" % energy, "ANALYSES" : anal,
"process" : process})
with open(opts.dest+"/Rivet-LowEnergy-GammaGamma-Perturbative-%8.6f.in" % energy ,'w') as f:
f.write(inputPerturbative)
targets += "Rivet-LowEnergy-GammaGamma-Perturbative-%8.6f.yoda " % energy
# input file for currents
if(opts.nonPerturbative and proc!="") :
inputNonPerturbative = nonPerturbative.substitute({"ECMS" : "%8.6f" % energy, "ANALYSES" : anal,
"processes" : proc})
with open(opts.dest+"/Rivet-LowEnergy-GammaGamma-NonPerturbative-%8.6f.in" % energy ,'w') as f:
f.write(inputNonPerturbative)
targets += "Rivet-LowEnergy-GammaGamma-NonPerturbative-%8.6f.yoda " % energy
# input file for resonances
if(opts.resonance and energy>0.81) :
inputResonance = resonance.substitute({"ECMS" : "%8.6f" % energy, "ANALYSES" : anal})
with open(opts.dest+"/Rivet-LowEnergy-GammaGamma-Resonance-%8.6f.in" % energy ,'w') as f:
f.write(inputResonance)
targets += "Rivet-LowEnergy-GammaGamma-Resonance-%8.6f.yoda " % energy
print (targets)
diff --git a/Tests/python/OniumSigma.py.in b/Tests/python/OniumSigma.py.in
--- a/Tests/python/OniumSigma.py.in
+++ b/Tests/python/OniumSigma.py.in
@@ -1,238 +1,238 @@
#! @PYTHON@
from __future__ import print_function
import yoda,os,math,subprocess,optparse
from string import Template
import numpy
import matplotlib.pyplot as plt
from scipy.integrate import quad
import datetime
import lhapdf
p = lhapdf.mkPDF("CT14lo",0)
htmlTemplate=Template("""
<html>
<head>
<title>Tests of Onium Cross Sections</title>
<style>
html { font-family: sans-serif; }
img { border: 0; }
a { text-decoration: none; font-weight: bold; }
</style>
<script type="text/x-mathjax-config">
MathJax.Hub.Config({
tex2jax: {inlineMath: [["$$","$$"]]}
});
</script>
<script type="text/javascript" async
src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
</script>
</head>
<body>
<section id="OniumTests">
<h1>Tests of Onium Cross Sections</h1>
${plots}
</section>
<footer style="clear:both; margin-top:3em; padding-top:3em">
${time}
</footer>
</body>
</html>""")
plotTemplate=Template("""
<div class="plot" id="plot_${id}" style="float:left; font-size:smaller; font-weight:bold;">
<a href="#MC_Simple_Onium-${id}">⚓</a> ${id}:<br/>
<a name="MC_Simple_Onium-${id}"><a href="${id}.pdf">
<img src="${id}.png">
</a></a>
</div>""")
# various test functions
s = 13e3**2
GeV2nb=.389379304e6
R02=0.560236
M=2.9804
aS=0.248943
def dSigmady1S0(y) :
A = numpy.pi**2*aS**2*R02/3./M**5*GeV2nb
x1 = M/numpy.sqrt(s)*numpy.exp(y)
x2 = M/numpy.sqrt(s)*numpy.exp(-y)
return p.xfxQ(21,x1,M)*p.xfxQ(21,x2,M)*A
def dSigmady3P0(y) :
A = 12.*numpy.pi**2*aS**2*R02/M**7*GeV2nb
x1 = M/numpy.sqrt(s)*numpy.exp(y)
x2 = M/numpy.sqrt(s)*numpy.exp(-y)
return p.xfxQ(21,x1,M)*p.xfxQ(21,x2,M)*A
def dSigmady3P2(y) :
A = 16.*numpy.pi**2*aS**2*R02/M**7*GeV2nb
x1 = M/numpy.sqrt(s)*numpy.exp(y)
x2 = M/numpy.sqrt(s)*numpy.exp(-y)
return p.xfxQ(21,x1,M)*p.xfxQ(21,x2,M)*A
def dSigmady1D2(y) :
A = 80.*numpy.pi**2*aS**2*R02/3./M**9*GeV2nb
x1 = M/numpy.sqrt(s)*numpy.exp(y)
x2 = M/numpy.sqrt(s)*numpy.exp(-y)
return p.xfxQ(21,x1,M)*p.xfxQ(21,x2,M)*A
# latex for plots
latexName = {441 : "\\eta_c", 443 : "J/\\psi", 100441 : "\\eta_c(2S)", 100443 : "\psi(2S)",
10443 : "h_c", 10441: "\\chi_{c0}", 20443: "\\chi_{c1}", 445: "\\chi_{c2}",
30443 : "\\psi(3770)" , 20445 : "\\psi_2(1D)", 447 : "\\psi_3(1D)", 100445: "\\chi_{c2}(2P)",
551 : "\\eta_b", 553 : "\\Upsilon" , 100551 : "\\eta_b(2S)", 100553 : "\\Upsilon(2S)", 200551 : "\\eta_b(3S)", 200553 : "\\Upsilon(3S)", 300553 : "\\Upsilon(4S)",
10553 : "h_b", 10551: "\\chi_{b0}", 20553: "\\chi_{b1}", 555: "\\chi_{b2}",
110553 : "h_b(2P)", 110551: "\\chi_{b0}(2P)", 120553: "\\chi_{b1}(2P)", 100555: "\\chi_{b2}(2P)",
210553 : "h_b(3P)", 210551: "\\chi_{b0}(3P)", 220553: "\\chi_{b1}(3P)", 200555: "\\chi_{b2}(3P)",
10555 : "\\eta_{b2}", 30553 : "\\Upsilon_1(1D)", 20555 : "\\Upsilon_2(1D)", 557 : "\\Upsilon_3(1D)",
541 : "B_c^+", 543 : "B_c^{*+}", 10541 : "B_{c0}^{*+}", 545 : "B_{c2}^{*+}",
100541 : "B_c(2S)^+", 100543 : "B_c(2S)^{*+}", 10543 : "B_{c1}^+", 20543 : "B_{c1}^{\\prime+}",
30543 : "B_c(1D)^{*+}", 547 : "B_{c3}(1D)^{*+}", 20545 : "B_{c2}(H)^{+}", 10545 : "B_{c2}(L)^+",
4403 : "(cc)_1", 5503 : "(bb)_1", 5401 : "(bc)_0", 5403 : "(bc)_1" }
# cross section tests
testParameters = {"eta_c_1S" : [ 441,"ccbar","1S",0.560236,2.9804 ,0.248943,dSigmady1S0,"MEgg2EtaC1S" ],
"eta_c_2S" : [100441,"ccbar","2S",0.6966 ,3.638 ,0.232538,dSigmady1S0,"MEgg2EtaC2S" ],
"eta_b_1S" : [ 551,"bbbar","1S",1.8**3 ,9.397 ,0.180058,dSigmady1S0,"MEgg2EtaB1S" ],
"eta_b_2S" : [100551,"bbbar","2S",2.8974 ,9.996 ,0.177496,dSigmady1S0,"MEgg2EtaB2S" ],
"eta_b_3S" : [200551,"bbbar","3S",2.2496 ,10.337 ,0.176137,dSigmady1S0,"MEgg2EtaB3S" ],
"eta_b2_1D": [ 10555,"bbbar","1D",0.8394 ,10.158 ,0.176842,dSigmady1D2,"MEgg2EtaB21D"],
"chi_c0_1P": [ 10441,"ccbar","1P",0.1296 ,3.41476,0.237512,dSigmady3P0,"MEgg2ChiC01P"],
"chi_b0_1P": [ 10551,"bbbar","1P",1.6057 ,9.85944,0.17806 ,dSigmady3P0,"MEgg2ChiB01P"],
"chi_b0_2P": [110551,"bbbar","2P",1.8240 ,10.2325,0.176546,dSigmady3P0,"MEgg2ChiB02P"],
"chi_b0_3P": [210551,"bbbar","3P",1.9804 ,10.5007,0.175507,dSigmady3P0,"MEgg2ChiB03P"],
"chi_c2_1P": [ 445,"ccbar","1P",0.1296 ,3.5562 ,0.2343 ,dSigmady3P2,"MEgg2ChiC21P"],
"chi_c2_2P": [100445,"ccbar","2P",0.1767 ,3.929 ,0.226766,dSigmady3P2,"MEgg2ChiC22P"],
"chi_b2_1P": [ 555,"bbbar","1P",1.6057 ,9.91221,0.177841,dSigmady3P2,"MEgg2ChiB21P"],
"chi_b2_2P": [100555,"bbbar","2P",1.8240 ,10.2686,0.176404,dSigmady3P2,"MEgg2ChiB22P"],
"chi_b2_3P": [200555,"bbbar","3P",1.9804 ,10.5264,0.175409,dSigmady3P2,"MEgg2ChiB23P"],
}
# options
op = optparse.OptionParser(usage=__doc__)
op.add_option("--generate-input-files", dest="infiles", default=False, action="store_true")
op.add_option("--analyse", dest="analyse", default=False, action="store_true")
op.add_option("--fast", dest="fast", default=False, action="store_true")
opts, args = op.parse_args()
# get template and write the file
with open(os.path.join("Rivet/Templates/Hadron.in"), 'r') as f:
templateText = f.read()
template = Template( templateText )
# if we are generating the inputfiles
if opts.infiles :
targets=""
# now loop over the examples
for (key,val) in testParameters.items() :
# substs for the input file
- parameters={"parameterFile" : "insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Hadron_Onium",
+ parameters={"parameterFile" : "insert /Herwig/Analysis/Rivet:Analyses 0 MC_Hadron_Onium",
"bscheme" : "",
"shower" : "do /Herwig/OniumParameters:SetWaveFunction %s %s %s" %(val[1],val[2],val[3]),
"process" : """
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 13000.0
set /Herwig/Generators/EventGenerator:EventHandler:HadronizationHandler NULL
set /Herwig/Generators/EventGenerator:EventHandler:CascadeHandler NULL
set /Herwig/Generators/EventGenerator:EventHandler:DecayHandler NULL
set /Herwig/Analysis/Basics:CheckQuark 0
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:X1Min 1e-8
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:X2Min 1e-8
insert SubProcess:MatrixElements[0] %s
""" % val[7],
"collider" : "PPCollider.in",
"runname" : "Onium-%s"%key}
with open(os.path.join("Rivet","Onium-%s.in"%key), 'w') as f:
f.write( template.substitute(parameters) )
targets += "Onium-%s.yoda " % key
print(targets)
# if we are doing the analysis
if opts.analyse :
if not os.path.isdir("Onium-Sigma"):
os.mkdir("Onium-Sigma")
plots=""
# loop over the tests
for (key,val) in testParameters.items() :
R02 = val[3]
M = val[4]
aS = val[5]
# plot title
lName = latexName[val[0]]
plt.title("Differential Cross section w.r.t rapidity for $gg\\to %s$"%lName)
# analytic line
ymax = numpy.log(math.sqrt(s)/M)-0.001
ys = numpy.linspace(-ymax,ymax,1000)
sig=[]
for y in ys :
sig.append(val[6](y))
plt.plot(ys,sig,label="analytic ",color="black")
aos = yoda.read("Onium-%s.yoda" % key)
histo = aos["/MC_Hadron_Onium/h_y_%s" % val[0]]
x = []
dx = []
y1 = []
dy1= []
chisq = 0.
ndof = 0
for hbin in histo.bins() :
x .append(hbin.xMid() )
dx .append(0.5*hbin.xWidth())
y1 .append(hbin.height() /1000.)
dy1.append(hbin.heightErr()/1000.)
if(dy1[-1]>0. and x[-1]>0.01 and x[-1]<0.99) :
if(opts.fast) :
fval = val[6](hbin.xMid())
else :
fval = quad(val[6],hbin.xMin(),hbin.xMax())[0]/hbin.xWidth()
chisq += ((fval-y1[-1])/dy1[-1])**2
ndof+=1.
if(ndof!=0) : chisq/=ndof
plt.errorbar(x,y1,yerr=dy1,xerr=dx,linestyle="none",fmt="none",
label="Hw 7",color="red")
plt.xlabel("$y_{%s}$" % lName)
plt.ylabel("$d\\sigma/dy_{%s}$ [nb]" % lName)
plt.legend(title="$\\chi^2/N=%.2f$"%chisq)
plt.xlim([-ymax,ymax])
plt.ylim(ymin=0)
plots+=plotTemplate.substitute({"id" : key})
# now for the total cross section
sigmaTotal=quad(val[6],-ymax,ymax)
dat = open("Onium-%s.out" % key)
line =dat.readline()
while line :
line=line.strip()
if "Total" in line and "attempted" in line :
line=line.split()[-1].split("e")
power=float(line[1])
line=line[0].strip(")").split("(")
value=float(line[0])
error=float(line[1])
line=line[0].split(".")
if len(line)==2 :
error *= 10**(-float(len(line[1])))
value *= 10**power
error *= 10**power
break
line=dat.readline()
sMax = max(sig)
chisq = (sigmaTotal[0]-value)**2/(sigmaTotal[1]**2+error**2)
frac = (sigmaTotal[0]-value)/(sigmaTotal[0]+value)
plt.text(0.,0.15*sMax,"Total Cross Section = $%.2f\\times10^{%s}$ nb"%(sigmaTotal[0]/10**power,int(power)),horizontalalignment='center')
plt.text(0.,0.10*sMax,"Fractional Difference = %.2f per mille"%(frac*1000),horizontalalignment='center')
plt.text(0.,0.05*sMax,"$\\chi^2 = %.2f$"%(chisq),horizontalalignment='center')
plt.savefig("Onium-Sigma/%s.pdf" %key)
plt.savefig("Onium-Sigma/%s.png" %key)
plt.clf()
with open(os.path.join("Onium-Sigma","index.html"), 'w') as f:
f.write( htmlTemplate.substitute( {"plots" : plots,
"time" :'<p>Generated at %s</p>' % datetime.datetime.now().strftime("%A, %d. %B %Y %I:%M%p") }) )
diff --git a/Tests/python/OniumSplitting.py.in b/Tests/python/OniumSplitting.py.in
--- a/Tests/python/OniumSplitting.py.in
+++ b/Tests/python/OniumSplitting.py.in
@@ -1,546 +1,546 @@
#! @PYTHON@
from __future__ import print_function
import yoda,os,math,subprocess,optparse
from string import Template
import numpy,matplotlib.pyplot as plt
from scipy.integrate import dblquad as dblquad
from scipy.integrate import quad as quad
import datetime
htmlTemplate=Template("""
<html>
<head>
<title>Tests of Onium Splittings in the Parton Shower</title>
<style>
html { font-family: sans-serif; }
img { border: 0; }
a { text-decoration: none; font-weight: bold; }
</style>
<script type="text/x-mathjax-config">
MathJax.Hub.Config({
tex2jax: {inlineMath: [["$$","$$"]]}
});
</script>
<script type="text/javascript" async
src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
</script>
</head>
<body>
<section id="OniumTests">
<h1>Tests of Onium splittings in the Parton Shower</h1>
${plots}
</section>
<footer style="clear:both; margin-top:3em; padding-top:3em">
${time}
</footer>
</body>
</html>""")
plotTemplate=Template("""
<div class="plot" id="plot_${id}" style="float:left; font-size:smaller; font-weight:bold;">
<a href="#MC_Simple_Onium-${id}">⚓</a> ${id}:<br/>
<a name="MC_Simple_Onium-${id}"><a href="${id}.pdf">
<img src="${id}.png">
</a></a>
</div>""")
# various test functions
m1=0.
m2=0.
M=0
a1=0
a2=0
aS=0.
R02=0.
mix1=0.
mix2=0.
pTmin=1.
# q -> q 1S0
def D_q_q_1S0(z) :
return 8./81./math.pi*aS**2*R02*(1.-z)**2*z*(48. + 8.*z**2 - 8.*z**3 + 3.*z**4)/(m1**3*(2. - z)**6)
def D_g_g_1S0(z) :
return aS**2/24./math.pi*R02/m1**3*(3.*z-2.*z**2+2.*(1.-z)*numpy.log(1.-z))
zz=0.
def upp(r) :
return 0.5*(1+r)
def low(r) :
return 0.5*(r+zz**2)/zz
def IPsi(y,r) :
z = zz
f0 = r**2*(1 + r)*(3 + 12*r + 13*r**2) - 16*r**2*(1 + r)*(1 + 3*r)*y \
- 2*r*(3 - 9*r - 21*r**2 + 7*r**3)* y**2 + 8*r*(4 + 3*r + 3*r**2)*y**3 \
- 4*r*(9 - 3*r - 4*r**2)*y**4 - 16*(1 + 3*r + 3*r**2)*y**5 + 8*(6 + 7*r)*y**6 - 32*y**7
f1 = -2*r*(1 + 5*r + 19*r**2 + 7*r**3)*y + 96*r**2*(1 + r)*y**2 \
+ 8*(1 - 5*r - 22*r**2 - 2*r**3)*y**3 + 16*r*(7 + 3*r)*y**4 - 8*(5 + 7*r)*y**5 + 32*y**6
f2 = r*(1 + 5*r + 19*r**2 + 7*r**3) - 48*r**2*(1 + r)*y - 4*(1 - 5*r - 22*r**2 - 2*r**3)*y**2 \
- 8*r*(7 + 3*r)*y**3 + 4*(5 + 7*r)*y**4 - 16*y**5
g0 = (1 - r)*r**3*(3 + 24*r + 13*r**2) - 4*r**3*(7 - 3*r - 12*r**2)*y \
- 2*r**3*(17 + 22*r - 7*r**2)*y**2 + 4*r**2*(13 + 5*r - 6*r**2)*y**3 \
- 8*r*(1 + 2*r + 5*r**2 + 2*r**3)*y**4 - 8*r*(3 - 11*r - 6*r**2)*y**5 + 8*(1 - 2*r - 5*r**2)*y**6
g1 = -2*(1 - r)*r**2*(1 + r)*(1 + 7*r)*y + 8*(1 - 4*r)*r**2*(1 + 3*r)*y**2 \
+ 4*r*(1 + 10*r + 57*r**2 + 4*r**3)* y**3 - 8*r*(1 + 29*r + 6*r**2)*y**4 - 8*(1 - 8*r - 5*r**2)*y**5
g2 = (1 - r)*r**2*(1 + r)*(1 + 7*r) - 4*(1 - 4*r)*r**2*(1 + 3*r)*y \
- 2*r*(1 + 10*r + 57*r**2 + 4*r**3)* y**2 + 4*r*(1 + 29*r + 6*r**2)*y**3 + 4*(1 - 8*r - 5*r**2)*y**4
c1 = f0+z*f1+z**2*f2
c2 = g0+z*g1+z**2*g2
return (c1 + ((1 + r - 2*y)*c2*numpy.log((-r + y + numpy.sqrt(-r + y**2))/(-r + y - numpy.sqrt(-r + y**2))))/(2.*(-r + y)*numpy.sqrt(-r + y**2))) \
/((1 - y)**2*(-r + y)**2*(-r + y**2)**2)
def D_g_g_3S1(z) :
global zz
zz = z
return 3.*R02/2.*5./5184./numpy.pi**2/m1**3*aS**3*dblquad(IPsi,0.,z,low,upp)[0]
def D_g_g_3P0(x) :
smin = pTmin**2/x/(1-x)+4.*m1**2/x
return -aS**2*R02/(6.*m1**3*numpy.pi)*(-9/smin + (16*m1**2*(-2 + x)*(-1 + x))/(-4*m1**2 + smin)**2
+ (128*m1**4*(-1 + x)**2)/(3.*(4*m1**2 - smin)**3)
+ (2*(11 - 10*x + x**2))/(4*m1**2 - smin) - (3*(-5 + 3*x)*numpy.log(smin))/(2.*m1**2)
+ (3*(-5 + 3*x)*numpy.log(-4*m1**2 + smin))/(2.*m1**2))
def D_g_g_3P1(x) :
smin = pTmin**2/x/(1-x)+4.*m1**2/x
return -aS**2*R02/(m1**3*numpy.pi)*((-1 + 2*(1 - x) - 2*(1 - x)**2)/(-4*m1**2 + smin) - (4*m1**2*(1 - x))/(-4*m1**2 + smin)**2 + (32*m1**4*(1 - x)**2)/(3.*(-4*m1**2 + smin)**3))
def D_g_g_3P2(x) :
smin = pTmin**2/x/(1-x)+4.*m1**2/x
return -aS**2*R02/(3.*m1**3*numpy.pi)*(-6/smin + (-7 - 10*(1 - x) - 2*(1 - x)**2)/(-4*m1**2 + smin) + (4*m1**2*(1 + 4*(1 - x))*(1 - x))/(-4*m1**2 + smin)**2 -
(32*m1**4*(1 - x)**2)/(3.*(-4*m1**2 + smin)**3) + (3*(2 - x)*numpy.log(smin))/m1**2 - (3*(2 - x)*numpy.log(-4*m1**2 + smin))/m1**2)
# q -> q 3S1
def D_q_q_3S1(z) :
return 8./math.pi*aS**2*R02*(1.-z)**2*z*(16.-32.*z+72.*z**2-32.*z**3+5.*z**4)/(27.*m1**3*(2.-z)**6)
# q -> q 3P0
def D_q_q_3P0(z):
return 9./2./math.pi*R02*16.*aS**2*(1-z)**2*z*(192+384*z+528*z**2-1376*z**3 +1060*z**4-376*z**5+59*z**6)/(729.*m1**5*(2 - z)**8)
# q -> q 3P1
def D_q_q_3P1(z) :
return 9./2./math.pi*R02*64.*aS**2*(1 - z)**2*z*(96 - 288*z + 496*z**2 - 408*z**3 + 202*z**4 - 54*z**5 + 7*z**6)/(243.*m1**5*(2 - z)**8)
# q -> q 3P2
def D_q_q_3P2(z):
return 9./2./math.pi*R02*128*aS**2*(1 - z)**2*z*(48 - 192*z + 480*z**2 - 668*z**3 + 541*z**4 - 184*z**5 + 23*z**6)/(729.*m1**5*(2 - z)**8)
# q -> q 1P1
def D_q_q_1P1(z) :
return 9./2./math.pi*R02*16*aS**2*(1 - z)**2*z*(64 - 128*z + 176*z**2 - 160*z**3 + 140*z**4 - 56*z**5+9*z**6)/(81.*m1**5*(2-z)**8)
# q -> q 1D2
def D_q_q_1D2(x) :
return 8.*aS**2*R02/math.pi*(1 - x)**2*x*(3840-15360*x+30720*x**2-37120*x**3+35328*x**4-29344*x**5+18344*x**6-5848*x**7+775*x**8)/(81.*m1**7*(2 - x)**10)
# q -> q 3D1
def D_q_q_3D1(x) :
return 8*aS**2*R02/math.pi*(1 - x)**2*x*(17280 - 103680*x + 321120*x**2 - 551840*x**3 + 546744*x**4 - 314752*x**5 + 112402*x**6 - 24594*x**7 + 2915*x**8)/(405.*m1**7*(2 - x)**10)
# q -> q 3D2
def D_q_q_3D2(x) :
return 16*aS**2*R02/math.pi*(1 - x)**2*x*(2880 - 14400*x + 37360*x**2 - 58240*x**3 + 58604*x**4 - 38372*x**5 + 16517*x**6 - 4014*x**7 + 445*x**8)/(81.*m1**7*(2 - x)**10)
# q -> q 3D3
def D_q_q_3D3(x) :
return 8*aS**2*R02/math.pi*(1 - x)**2*x*(11520 - 69120*x + 231680*x**2 - 488960*x**3 + 675136*x**4 - 592288*x**5 + 309688*x**6 - 80736*x**7 + 8285*x**8)/(405.*m1**7*(2 - x)**10)
# q -> q' 1S0
def D_q_qp_1S0(z) :
W0 = 2.*(1.+z*a1)**2*(1.-z)
W1 = -2.*(2.*z**2*a2**2-z**2*a2 -4.*z*a2**2+4.*z*a2 -3.*z+4.*a2-2.)*(1.-z*a2)
W2 = -8.*(1.-z*a2)**2*a1*a2
deltaX = z*(1.-z)/(1.-a2*z)**2
return 2.*aS**2/27./M**3*R02/math.pi/a1**2/(1.-a2*z)**2* \
(W0*deltaX+W1*deltaX**2/2.+W2*deltaX**3/3.)
# q -> q' 3S1
def D_q_qp_3S1(z) :
W0 = 2.*((1.+z*a1)**2+2.*z**2)*(1.-z)
W1 = -2.*(2.*z**2*a2**2 -3.*z**2*a2 +4.*z*a2**2 + 4.*z*a2 -9.*z - 4.*a2+6.)*(1.-z*a2)
W2 = -24.*(1.-z*a2)**2*a1*a2
deltaX = z*(1.-z)/(1.-a2*z)**2
return 2.*aS**2/27./math.pi/M**3*R02/a1**2/(1.-a2*z)**2* \
(W0*deltaX+W1*deltaX**2/2.+W2*deltaX**3/3.)
# q ->q' 3P0
def D_q_qp_3P0(z) :
W0 = ( 4.*a2 - 3. - 8*z*a2**2 + 10*z*a2 - 3*z + 4*z**2*a2**3 - 5*z**2*a2**2 + z**2*a2 )**2*(1.-z)/96./a2**2
W1 = ((-1 + z*a2)**2*(18 + 27*z - 12*a2 + 18*z*a2 + 30*z**2*a2 - 40*a2**2 - 152*z*a2**2 - 206*z**2*a2**2 - 9*z**3*a2**2 + 32*a2**3 + 176*z*a2**3 + 324*z**2*a2**3 + 58*z**3*a2**3 - 64*z*a2**4 - 184*z**2*a2**4 - 80*z**3*a2**4 + 32*z**2*a2**5 + 32*z**3*a2**5))/(96.*a2**2)
W2 = (2*a2*(7.*a2-6.*z) -10.*a2-3. -2.*z*a2**2*(7.*a2-12.) -z**2*a2**2*(2.*a2-3.))*a1*(1.-z*a2)**3/(12.*a2)
W3 = 2.*a1**2*a2*(1.-z*a2)**4/3.
deltaX = z*(1.-z)/(1.-a2*z)**2
return 32.*aS**2/9./math.pi*R02/a1**4/(1.-a2*z)**4/M**5* \
(W0*deltaX+W1*deltaX**2/2.+W2*deltaX**3/3.+W3*deltaX**4/4.)
# q ->q' 3P2
def D_q_qp_3P2(z) :
W0 = (2 + 4*z + 9*z**2 + 10*z**3 + 5*z**4 - 8*z*a2 - 16*z**2*a2 - 28*z**3*a2 - 20*z**4*a2 + 12*z**2*a2**2 + 20*z**3*a2**2 + 24*z**4*a2**2 - 8*z**3*a2**3 - 8*z**4*a2**3 + 2*z**4*a2**4)*(1.-z)/24.
W1 = (-20 - 13*z + 8*z**2 + 30*z**3 + 16*a2 + 52*z*a2 - 30*z**2*a2 - 28*z**3*a2 - 32*z*a2**2 + 4*z**2*a2**2 - 7*z**3*a2**2 + 16*z**2*a2**3 + 4*z**3*a2**3)*(1.-z*a2)**2/24.
W2 = ( -26*a2 + 34 + 26.*z*a2**2 + 18*z*a2 - 45*z + 8*z**2*a2**2 - 15*z**2*a2 )*a1*(1.-z*a2)**3/12.
W3 = 10./3.*a1**2*a2*(1.-z*a2)**4
deltaX = z*(1.-z)/(1.-a2*z)**2
return 32.*aS**2/9./math.pi*R02/a1**4/(1.-a2*z)**4/M**5* \
(W0*deltaX+W1*deltaX**2/2.+W2*deltaX**3/3.+W3*deltaX**4/4.)
# q to q' 1P1
def D_q_qp_1P1(z) :
W0 = (1.-z)*(1 + z*(2 - 4*a2) + z**4*(2 + a1**2)* a2**2 + z**2*(3 - 2*a1*a2) + 2*z**3*a2* (-1 - 3*a2 + 2*a2**2))/32./a2**2
W1 = ((-1 + z*a2)**2* (-6 + 12*a2 - 8*a2**2 + z**3*a2**2* (13 - 38*a2 + 24*a2**2) + 2*z**2*a2* (5 + 17*a2 - 26*a2**2 + 4*a2**3) + z* (9 - 38*a2 + 16*a2**2 + 16*a2**3)))/(32.*a2**2)
W2 = (-1.+(6.-10.*z)*a2-(2.-4.*z+z**2)*a2**2+2.*z*(1.+z)*a2**3)*a1*(1.-z*a2)**3/4./a2
W3 = 2.*a1**2*a2*(1.-z*a2)**4
deltaX = z*(1.-z)/(1.-a2*z)**2
return 32.*aS**2/9.*R02/math.pi/a1**4/(1.-a2*z)**4/M**5* \
(W0*deltaX+W1*deltaX**2/2.+W2*deltaX**3/3.+W3*deltaX**4/4.)
# q to q' 3P1
def D_q_qp_3P1(z) :
W0 = -((-1 + z)*(1 + 2*z + 3*z**2 - 4*z*a2 - 10*z**2*a2 - 2*z**3*a2 + 8*z**2*a2**2 + 6*z**3*a2**2 + z**4*a2**2 - 4*z**3*a2**3 - 2*z**4*a2**3 + z**4*a2**4))/a2**2/16.
W1 = ((-1 + z*a2)**2* (-6 + 9*z + 4*a2 - 10*z*a2 + 10*z**2*a2 + 6*z*a2**2 - 22*z**2*a2**2 + z**3*a2**2 + 8*z**2*a2**3 - 2*z**3*a2**3 + 2*z**3*a2**4))/ (16.*a2**2)
W2 = -(a1*(-1 + z*a2)**3*(-2 + 6*a2 - 11*z*a2 - 2*a2**2 + 6*z*a2**2 + z**2*a2**2 + 2*z*a2**3))/a2/4.
W3 = 2.*a1**2*a2*(-1 + z*a2)**4
deltaX = z*(1.-z)/(1.-a2*z)**2
return 32.*aS**2/9.*R02/math.pi/a1**4/(1.-a2*z)**4/M**5* \
(W0*deltaX+W1*deltaX**2/2.+W2*deltaX**3/3.+W3*deltaX**4/4.)
# q to q' P1
def D_q_qp_P1(z) :
W0 = -0.25*((-1 + z)* (1 + z* (2 + 3*z + a2* (-3 + z* (-4 + a2 + (-1 + a2)**2* z)))))/ (a2**2* (-1 + a2*z)**3)
W1 = (6 - 9*z + a2* (-8 + 4*a2 + 24*z - 4*a2* (3 + 2*a2)*z + 2* (-5 + a2 + 2*a2**2* (2 + a2))* z**2 + a2* (11 + 4*(-4 + a2)* a2)*z**3))/(4.*a2**2* (-1 + a2*z)**2)
W2 = 2.*(-1 + a2)* (-1 + 3*a2 +(-2 + a2)*a2*z)/a2
deltaX = z*(1.-z)/(1.-a2*z)**2
mixed=16.*aS**2/9.*R02/math.pi/a1**4/M**5/math.sqrt(2.)* \
(W0*deltaX+W1*deltaX**2/2.+W2*deltaX**3/3.)
return mix1**2*D_q_qp_1P1(z)+mix2**2*D_q_qp_3P1(z)+mix1*mix2*mixed
# q ->q' 3D1
def D_q_qp_3D1(x) :
return (aS**2*R02/math.pi*(1 - x)**2*x*(60*(1 + 4*a1)**2 - 60*(1 + 4*a1)*(7 + 36*a1 - 28*a1**2)*x + 5*(261 + 2652*a1 + 6128*a1**2 - 12576*a1**3 + 7360*a1**4)*x**2 + 10*(-237 - 2589*a1 - 8754*a1**2 + 27528*a1**3 - 28808*a1**4 + 11360*a1**5)*x**3 + (2775 + 31350*a1 + 156435*a1**2 - 648372*a1**3 + 909816*a1**4 - 613056*a1**5 + 183552*a1**6)*x**4 - 4*(540 + 6585*a1 + 49910*a1**2 - 166879*a1**3 + 201928*a1**4 - 115084*a1**5 + 28400*a1**6)*a2*x**5 + (1095 + 13830*a1 + 142935*a1**2 - 389916*a1**3 + 377696*a1**4 - 164320*a1**5 + 36800*a1**6)*a2**2*x**6 - 2*(165 + 2100*a1 + 27645*a1**2 - 58086*a1**3 + 42360*a1**4 - 15720*a1**5 + 3360*a1**6)*a2**3*x**7 + 5*(9 + 114*a1 + 1817*a1**2 - 2524*a1**3 + 1676*a1**4 - 672*a1**5 + 192*a1**6)*a2**4*x**8))/(3240.*(1 - a2)**6*a2**2*M**7*(1 - a2*x)**10)
# q ->q' 3D3
def D_q_qp_3D3(x) :
return 2.*aS**2*R02/math.pi*(1 - x)**2*x*(90 + 90*(-7 + 2*a1)*x + 5*(399 - 174*a1 + 200*a1**2)*x**2 + 10*(-378 + 193*a1 - 437*a1**2 + 70*a1**3)*x**3 + (4725 - 2900*a1 + 8390*a1**2 - 1918*a1**3 + 2268*a1**4)*x**4 + 2*(-1995 + 1700*a1 - 4930*a1**2 + 1617*a1**3 - 2387*a1**4 + 350*a1**5)*x**5 + (2205 - 2830*a1 + 7940*a1**2 - 5194*a1**3 + 4914*a1**4 - 930*a1**5 + 1000*a1**6)*x**6 - 2*(360 - 325*a1 + 1680*a1**2 - 749*a1**3 + 1540*a1**4 + 295*a1**5 + 90*a1**6)*a2*x**7 + 5*(21 - 14*a1 + 133*a1**2 - 56*a1**3 + 189*a1**4 - 18*a1**5 + 18*a1**6)*a2**2*x**8)/(405.*a1**6*M**7*(1 - a2*x)**10)
def D_q_qp_3D2(x) :
return aS**2*R02/math.pi*(-1 + x)**2*x*(180 + 180*(-7 + 4*a1)* x + 5* (777 - 852*a1 +464*a1**2 -64*a1**3 +128*a1**4)*x**2 - 10* (693 - 1087*a1 +1126*a1**2 -624*a1**3 +112*a1**4 +128*a1**5)*x**3 + (7875 -15650*a1 +23295*a1**2 -22564*a1**3 +9112*a1**4 +128*a1**5 +2304*a1**6)*x**4+ 4* (-1470 +2005*a1 -4740*a1**2 +4613*a1**3 -2296*a1**4 +488*a1**5 +320*a1**6)*a2* x**5 + (2835 - 2050*a1 +12035*a1**2 -8332*a1**3 +5952*a1**4 -960*a1**5 +640*a1**6)* a2**2*x**6 + 2* (-405 + 40*a1 -2565*a1**2 +602*a1**3 -1000*a1**4 +320*a1**5)* a2**3*x**7 + 5* (21 + 10*a1 +205*a1**2 +52*a1**3 +84*a1**4)*a2**4* x**8)/(648.*a1**6*a2**2*M**7*(-1 + a2*x)**10)
def D_q_qp_1D2(x) :
return (aS**2*R02/math.pi*(-1 + x)**2*x*(60 - 60* (7 - 8*a1 +4*a1**2)*x + 5* (267 - 600*a1 +580*a1**2 -160*a1**3 +64*a1**4)*x**2 - 10* (255 - 825*a1 +1130*a1**2 -596*a1**3 +88*a1**4 +64*a1**5)*x**3 + (3225 -13050*a1 +22585*a1**2 -16872*a1**3 +5036*a1**4 -576*a1**5 +1152*a1**6)*x**4+ 4* (-690 + 2535*a1 -4200*a1**2 +2279*a1**3 -968*a1**4 +524*a1**5 +160*a1**6)*a2* x**5 + (1545 - 4890*a1 +8525*a1**2 -2176*a1**3 +3076*a1**4 -320*a1**5 +320*a1**6)* a2**2*x**6 - 2* (255 - 660*a1 +1475*a1**2 +174*a1**3 +740*a1**4 +120*a1**5)* a2**3*x**7 + 5* (15 - 30*a1 +107*a1**2 +56*a1**3 +80*a1**4)*a2**4* x**8))/(324.*a1**6*a2**2*M**7*(-1 + a2*x)**10)
def D_q_qp_D2(x) :
return mix1**2*D_q_qp_1D2(x)+mix2**2*D_q_qp_3D2(x)+mix1*mix2*(aS**2*5.*R02/math.pi*(-1 + x)**2*x*(-12 + 12* (5 - 4*a1 +2*a1**2)*x - (129 - 198*a1 +156*a1**2 +64*a1**3)*x**2 + 4* (39 - 85*a1 +76*a1**2 -8*a1**3 +36*a1**4)*x**3 - 2* (57 - 156*a1 +133*a1**2 -130*a1**3 +198*a1**4 +48*a1**5)*x**4 - 4* (-12 + 27*a1 -4*a1**2 +51*a1**3 +2*a1**4 +14*a1**5)*a2* x**5 + (-9 + 16*a1 +11*a1**2 +62*a1**3 +4*a1**4)*a2**2* x**6))/(54.*math.sqrt(6.)*a1**6*a2**2*M**7*(-1 + a2*x)**8)
def D_cc1(z) :
return 4.*aS**2*R02*(1.-z)**2*z*(16.-32.*z+72.*z**2-32.*z**3+5.*z**4)/(9.*m1**3*math.pi*(2.-z)**6)
def D_bc0(z) :
return aS**2*a1*R02*(1 - z)**2*z*(6 - 18*(1 - 2*a1)*z + (21 - 74*a1 + 68*a1**2)*z**2 - 2*(1 - a1)*(6 - 19*a1 + 18*a1**2)*z**3 + 3*(1 - a1)**2*(1 - 2*a1 + 2*a1**2)*z**4)/(54.*m1**3*math.pi*(1 - (1 - a1)*z)**6)
def D_bc1(z) :
return aS**2*a1*R02*(1 - z)**2*z*(2 - 2*(3 - 2*a1)*z + 3*(3 - 2*a1 + 4*a1**2)*z**2 - 2*(1 - a1)*(4 - a1 + 2*a1**2)*z**3 + (1 - a1)**2*(3 - 2*a1 + 2*a1**2)*z**4)/(18.*m1**3*math.pi*(1 - (1 - a1)*z)**6)
# analytic line
def fragmentation(funct,scale,step) :
x = []
y = []
xe=step
while xe<1. :
x.append(xe)
y.append(funct(x[-1])*scale)
xe+=step
return (x,y)
# latex for plots
latexName = {441 : "\\eta_c", 443 : "J/\\psi", 100441 : "\\eta_c(2S)", 100443 : "\psi(2S)",
10443 : "h_c", 10441: "\\chi_{c0}", 20443: "\\chi_{c1}", 445: "\\chi_{c2}",
30443 : "\\psi(3770)" , 20445 : "\\psi_2(1D)", 447 : "\\psi_3(1D)",
551 : "\\eta_b", 553 : "\\Upsilon" , 100551 : "\\eta_b(2S)", 100553 : "\\Upsilon(2S)", 200551 : "\\eta_b(3S)", 200553 : "\\Upsilon(3S)", 300553 : "\\Upsilon(4S)",
10553 : "h_b", 10551: "\\chi_{b0}", 20553: "\\chi_{b1}", 555: "\\chi_{b2}",
110553 : "h_b(2P)", 110551: "\\chi_{b0}(2P)", 120553: "\\chi_{b1}(2P)", 100555: "\\chi_{b2}(2P)",
210553 : "h_b(3P)", 210551: "\\chi_{b0}(3P)", 220553: "\\chi_{b1}(3P)", 200555: "\\chi_{b2}(3P)",
10555 : "\\eta_{b2}", 30553 : "\\Upsilon_1(1D)", 20555 : "\\Upsilon_2(1D)", 557 : "\\Upsilon_3(1D)",
541 : "B_c^+", 543 : "B_c^{*+}", 10541 : "B_{c0}^{*+}", 545 : "B_{c2}^{*+}",
100541 : "B_c(2S)^+", 100543 : "B_c(2S)^{*+}", 10543 : "B_{c1}^+", 20543 : "B_{c1}^{\\prime+}",
30543 : "B_c(1D)^{*+}", 547 : "B_{c3}(1D)^{*+}", 20545 : "B_{c2}(H)^{+}", 10545 : "B_{c2}(L)^+",
4403 : "(cc)_1", 5503 : "(bb)_1", 5401 : "(bc)_0", 5403 : "(bc)_1" }
herwigName = {441 : "eta_c" , 443 : "Jpsi" , 100441 : "eta_c(2S)" , 100443 : "psi(2S)",
10443 : "h_c", 10441: "chi_c0", 20443: "chi_c1", 445: "chi_c2",
30443 : "psi(3770)" , 20445 : "psi_2(1D)", 447 : "psi_3(1D)",
551 : "eta_b" , 553 : "Upsilon" , 100551 : "eta_b(2S)" , 100553 : "Upsilon(2S)", 200551 : "eta_b(3S)", 200553 : "Upsilon(3S)", 300553 : "Upsilon(4S)",
10553 : "h_b", 10551: "chi_b0", 20553: "chi_b1", 555: "chi_b2",
110553 : "h_b(2P)", 110551: "chi_b0(2P)", 120553: "chi_b1(2P)", 100555: "chi_b2(2P)",
210553 : "h_b(3P)", 210551: "chi_b0(3P)", 220553: "chi_b1(3P)", 200555: "chi_b2(3P)",
10555 : "eta_b2", 30553 : "Upsilon_1(1D)", 20555 : "Upsilon_2(1D)", 557 : "Upsilon_3(1D)",
541 : "B_c+", 543 : "B_c*+", 10541 : "B*_c0+", 545 : "B_c2+", 10543 : "B_c1+", 20543 : "B'_c1+",
100541 : "B_c(2S)+", 100543 : "B_c(2S)*+",
30543 : "B_c(1D)*+", 547 : "B_c3(1D)*+", 20545 : "B_c2(H)+", 10545 : "B_c2(L)+",
4403 : "cc_1", 5503 : "bb_1", 5401 : "bc_0", 5403 : "bc_1" }
# splitting tests
testParameters={ "ctocEta_c" : [441 ,"ctoc11S0SplittingSudakov",4,"ccbar","1S",0.26,1.5,4.9,0.8**3,5e2 ,D_q_q_1S0,10**4],
"ctocJPsi" : [443 ,"ctoc13S1SplittingSudakov",4,"ccbar","1S",0.26,1.5,4.9,0.8**3,5e2 ,D_q_q_3S1,10**4],
"ctocEta_c2S" : [100441 ,"ctoc21S0SplittingSudakov",4,"ccbar","2S",0.26,1.5,4.9,0.6966,5e2 ,D_q_q_1S0,10**4],
"ctocPsi2S" : [100443 ,"ctoc23S1SplittingSudakov",4,"ccbar","2S",0.26,1.5,4.9,0.6966,5e2 ,D_q_q_3S1,10**4],
"gtogEta_c" : [441 ,"gtogcc11S0SplittingSudakov",21,"ccbar","1S",0.26,1.5,4.9,0.8**3,5e2 ,D_g_g_1S0,10**4],
"gtogJPsi" : [443 ,"gtogcc13S1SplittingSudakov",21,"ccbar","1S",0.26,1.5,4.9,0.8**3,5e4 ,D_g_g_3S1,10**6],
"gtogEta_c2S" : [100441 ,"gtogcc21S0SplittingSudakov",21,"ccbar","2S",0.26,1.5,4.9,0.6966,5e2 ,D_g_g_1S0,10**4],
"gtogPsi2S" : [100443 ,"gtogcc23S1SplittingSudakov",21,"ccbar","2S",0.26,1.5,4.9,0.6966,5e4 ,D_g_g_3S1,10**6],
"gtogChi_c0" : [10441 ,"gtogcc13P0SplittingSudakov",21,"ccbar","1P",0.26,1.5,4.9,0.1296,5e2 ,D_g_g_3P0,10**7],
"gtogChi_c1" : [20443 ,"gtogcc13P1SplittingSudakov",21,"ccbar","1P",0.26,1.5,4.9,0.1296,5e2 ,D_g_g_3P1,10**6],
"gtogChi_c2" : [ 445 ,"gtogcc13P2SplittingSudakov",21,"ccbar","1P",0.26,1.5,4.9,0.1296,5e2 ,D_g_g_3P2,10**6],
"ctocH_c" : [10443 ,"ctoc11P1SplittingSudakov",4,"ccbar","1P",0.26,1.5,4.9,0.1296,5e2 ,D_q_q_1P1,10**4],
"ctocChi_c0" : [10441 ,"ctoc13P0SplittingSudakov",4,"ccbar","1P",0.26,1.5,4.9,0.1296,5e2 ,D_q_q_3P0,10**4],
"ctocChi_c1" : [20443 ,"ctoc13P1SplittingSudakov",4,"ccbar","1P",0.26,1.5,4.9,0.1296,5e2 ,D_q_q_3P1,10**4],
"ctocChi_c2" : [ 445 ,"ctoc13P2SplittingSudakov",4,"ccbar","1P",0.26,1.5,4.9,0.1296,5e2 ,D_q_q_3P2,10**4],
"ctocPsi3770" : [30443 ,"ctoc13D1SplittingSudakov",4,"ccbar","1D",0.26,1.5,4.9,0.0329,5e3 ,D_q_q_3D1,10**5],
"ctocPsi_2" : [20445 ,"ctoc13D2SplittingSudakov",4,"ccbar","1D",0.26,1.5,4.9,0.0329,5e3 ,D_q_q_3D2,10**5],
"ctocPsi_3" : [ 447 ,"ctoc13D3SplittingSudakov",4,"ccbar","1D",0.26,1.5,4.9,0.0329,5e3 ,D_q_q_3D3,10**5],
"btobEta_b" : [551 ,"btob11S0SplittingSudakov",5,"bbbar","1S",0.19,1.5,4.9,1.8**3,5e3 ,D_q_q_1S0,10**5],
"btobUpsilon" : [553 ,"btob13S1SplittingSudakov",5,"bbbar","1S",0.19,1.5,4.9,1.8**3,5e3 ,D_q_q_3S1,10**5],
"btobEta_b2S" : [100551 ,"btob21S0SplittingSudakov",5,"bbbar","2S",0.19,1.5,4.9,2.8974,5e3 ,D_q_q_1S0,10**5],
"btobUpsilon2S" : [100553 ,"btob23S1SplittingSudakov",5,"bbbar","2S",0.19,1.5,4.9,2.8974,5e3 ,D_q_q_3S1,10**5],
"btobEta_b3S" : [200551 ,"btob31S0SplittingSudakov",5,"bbbar","3S",0.19,1.5,4.9,2.2496,5e3 ,D_q_q_1S0,10**5],
"btobUpsilon3S" : [200553 ,"btob33S1SplittingSudakov",5,"bbbar","3S",0.19,1.5,4.9,2.2496,5e3 ,D_q_q_3S1,10**5],
"btobUpsilon4S" : [300553 ,"btob43S1SplittingSudakov",5,"bbbar","4S",0.19,1.5,4.9,1.9645,5e3 ,D_q_q_3S1,10**5],
"gtogEta_b" : [551 ,"gtogbb11S0SplittingSudakov",21,"bbbar","1S",0.19,1.5,4.9,1.8**3,5e3 ,D_g_g_1S0,10**5],
"gtogUpsilon" : [553 ,"gtogbb13S1SplittingSudakov",21,"bbbar","1S",0.19,1.5,4.9,1.8**3,5e5 ,D_g_g_3S1,10**7],
"gtogEta_b2S" : [100551 ,"gtogbb21S0SplittingSudakov",21,"bbbar","2S",0.19,1.5,4.9,2.8974,5e3 ,D_g_g_1S0,10**5],
"gtogUpsilon2S" : [100553 ,"gtogbb23S1SplittingSudakov",21,"bbbar","2S",0.19,1.5,4.9,2.8974,5e5 ,D_g_g_3S1,10**7],
"gtogEta_b3S" : [200551 ,"gtogbb31S0SplittingSudakov",21,"bbbar","3S",0.19,1.5,4.9,2.2496,5e3 ,D_g_g_1S0,10**5],
"gtogUpsilon3S" : [200553 ,"gtogbb33S1SplittingSudakov",21,"bbbar","3S",0.19,1.5,4.9,2.2496,5e5 ,D_g_g_3S1,10**7],
"gtogUpsilon4S" : [300553 ,"gtogbb43S1SplittingSudakov",21,"bbbar","4S",0.19,1.5,4.9,1.9645,5e5 ,D_g_g_3S1,10**7],
"btobH_b" : [10553 ,"btob11P1SplittingSudakov",5,"bbbar","1P",0.19,1.5,4.9,1.6057,10000.,D_q_q_1P1,10**6],
"btobChi_b0" : [10551 ,"btob13P0SplittingSudakov",5,"bbbar","1P",0.19,1.5,4.9,1.6057,10000.,D_q_q_3P0,10**6],
"btobChi_b1" : [20553 ,"btob13P1SplittingSudakov",5,"bbbar","1P",0.19,1.5,4.9,1.6057,10000.,D_q_q_3P1,10**6],
"btobChi_b2" : [ 555 ,"btob13P2SplittingSudakov",5,"bbbar","1P",0.19,1.5,4.9,1.6057,10000.,D_q_q_3P2,10**6],
"btobH_b2P" : [110553 ,"btob21P1SplittingSudakov",5,"bbbar","2P",0.19,1.5,4.9,1.8240,5e4 ,D_q_q_1P1,10**6],
"btobChi_b02P" : [110551 ,"btob23P0SplittingSudakov",5,"bbbar","2P",0.19,1.5,4.9,1.8240,5e4 ,D_q_q_3P0,10**6],
"btobChi_b12P" : [120553 ,"btob23P1SplittingSudakov",5,"bbbar","2P",0.19,1.5,4.9,1.8240,5e4 ,D_q_q_3P1,10**6],
"btobChi_b22P" : [100555 ,"btob23P2SplittingSudakov",5,"bbbar","2P",0.19,1.5,4.9,1.8240,5e4 ,D_q_q_3P2,10**6],
"btobChi_b03P" : [210551 ,"btob33P0SplittingSudakov",5,"bbbar","3P",0.19,1.5,4.9,1.9804,5e4 ,D_q_q_3P0,10**6],
"btobChi_b13P" : [220553 ,"btob33P1SplittingSudakov",5,"bbbar","3P",0.19,1.5,4.9,1.9804,5e4 ,D_q_q_3P1,10**6],
"btobChi_b23P" : [200555 ,"btob33P2SplittingSudakov",5,"bbbar","3P",0.19,1.5,4.9,1.9804,5e4 ,D_q_q_3P2,10**6],
"btobEta_b2" : [10555 ,"btob11D2SplittingSudakov",5,"bbbar","1D",0.26,1.5,4.9,0.8394,5.e5 ,D_q_q_1D2,10**7],
"btobUpsilon_1" : [30553 ,"btob13D1SplittingSudakov",5,"bbbar","1D",0.26,1.5,4.9,0.8394,1.e6 ,D_q_q_3D1,10**7],
"btobUpsilon_2" : [20555 ,"btob13D2SplittingSudakov",5,"bbbar","1D",0.26,1.5,4.9,0.8394,1.e6 ,D_q_q_3D2,10**7],
"btobUpsilon_3" : [ 557 ,"btob13D3SplittingSudakov",5,"bbbar","1D",0.26,1.5,4.9,0.8394,1.e6 ,D_q_q_3D3,10**7],
"btocB_c" : [541 ,"btoc11S0SplittingSudakov",5,"bcbar","1S",0.26,1.5,4.9,1.9943,100.,D_q_qp_1S0,10**3],
"btocB_cStar" : [543 ,"btoc13S1SplittingSudakov",5,"bcbar","1S",0.26,1.5,4.9,1.9943,100.,D_q_qp_3S1,10**3],
"btocB_c2S" : [100541 ,"btoc21S0SplittingSudakov",5,"bcbar","2S",0.26,1.5,4.9,2.8974,100.,D_q_qp_1S0,10**3],
"btocB_cStar2S" : [100543 ,"btoc23S1SplittingSudakov",5,"bcbar","2S",0.26,1.5,4.9,2.8974,100.,D_q_qp_3S1,10**3],
"btocB_c0" : [10541 ,"btoc13P0SplittingSudakov",5,"bcbar","1P",0.26,1.5,4.9,0.3083,500.,D_q_qp_3P0,10**4],
"btocB_c2" : [545 ,"btoc13P2SplittingSudakov",5,"bcbar","1P",0.26,1.5,4.9,0.3083,500.,D_q_qp_3P2,10**4],
"btocB_c1P1" : [10543 ,"btoc1P1SplittingSudakov" ,5,"bcbar","1P",0.26,1.5,4.9,0.3083,500.,D_q_qp_1P1,10**4,90.],
"btocB_c3P1" : [20543 ,"btoc1P1SplittingSudakov" ,5,"bcbar","1P",0.26,1.5,4.9,0.3083,500.,D_q_qp_3P1,10**4,90.],
"btocB_c1P1mix" : [10543 ,"btoc1P1SplittingSudakov" ,5,"bcbar","1P",0.26,1.5,4.9,0.3083,500.,D_q_qp_P1 ,10**4,25.],
"btocB_c3P1mix" : [20543 ,"btoc1P1SplittingSudakov" ,5,"bcbar","1P",0.26,1.5,4.9,0.3083,500.,D_q_qp_P1 ,10**4,25.],
"btocB_cStar1D" : [30543 ,"btoc13D1SplittingSudakov",5,"bcbar","1D",0.26,1.5,4.9,0.0986,5000.,D_q_qp_3D1,10**5],
"btocB_c3" : [547 ,"btoc13D3SplittingSudakov",5,"bcbar","1D",0.26,1.5,4.9,0.0986,1000.,D_q_qp_3D3,10**5],
"btocB_c1D2" : [10545 ,"btoc1D2SplittingSudakov" ,5,"bcbar","1D",0.26,1.5,4.9,0.0986,5000.,D_q_qp_1D2,10**5,90.],
"btocB_c3D2" : [20545 ,"btoc1D2SplittingSudakov" ,5,"bcbar","1D",0.26,1.5,4.9,0.0986,5000.,D_q_qp_3D2,10**5,90.],
"btocB_c1D2mix" : [10545 ,"btoc1D2SplittingSudakov" ,5,"bcbar","1D",0.26,1.5,4.9,0.0986,5000.,D_q_qp_D2 ,10**5,34.4],
"btocB_c3D2mix" : [20545 ,"btoc1D2SplittingSudakov" ,5,"bcbar","1D",0.26,1.5,4.9,0.0986,5000.,D_q_qp_D2 ,10**5,34.4],
"ctocbarcc1" : [4403 ,"QtoQcc1SplittingSudakov" ,4,"cc" ,"1S",0.26,1.5,4.9,0.07 ,1e3,D_cc1,1e5],
"btobbarbb1" : [5503 ,"QtoQbb1SplittingSudakov" ,5,"bb" ,"1S",0.26,1.5,4.9,0.633,1e3,D_cc1,1e5],
"btocbarbc0" : [5401 ,"QtoQbc0SplittingSudakov" ,5,"bc" ,"1S",0.26,1.5,4.9,0.25 ,5e2,D_bc0,1e5],
"btocbarbc1" : [5403 ,"QtoQbc1SplittingSudakov" ,5,"bc" ,"1S",0.26,1.5,4.9,0.25 ,5e2,D_bc1,1e5],
}
# options
op = optparse.OptionParser(usage=__doc__)
op.add_option("--generate-input-files", dest="infiles", default=False, action="store_true")
op.add_option("--analyse", dest="analyse", default=False, action="store_true")
op.add_option("--fast", dest="fast", default=False, action="store_true")
opts, args = op.parse_args()
# get template and write the file
with open(os.path.join("Rivet/Templates/EE.in"), 'r') as f:
templateText = f.read()
template = Template( templateText )
# if we are generating the inputfiles
if opts.infiles :
targets=""
# first find all the splittings
opts, args = op.parse_args()
splittings=[]
for fname in ["../src/defaults/Shower.in",
"../src/snippets/OniumShower.in"] :
infile=open(fname)
line=infile.readline()
while line :
if "SplittingGenerator:AddFinalSplitting" in line:
splittings.append(line.replace("Add","Delete"))
line=infile.readline()
infile.close()
# now loop over the examples
for (key,val) in testParameters.items() :
# mass of the state
if val[3]=="ccbar" or val[3]=="cc" :
mO=2.*val[6]
elif val[3]=="bbbar" or val[3]=="bb" :
mO=2.*val[7]
else :
mO=val[6]+val[7]
# process
if val[2] < 6 :
proc = """
insert /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEee2gZ2qq
set /Herwig/MatrixElements/MEee2gZ2qq:MinimumFlavour %s
set /Herwig/MatrixElements/MEee2gZ2qq:MaximumFlavour %s
""" % ( val[2],val[2])
elif val[2]==21 :
proc ="""
create Herwig::MEee2Higgs2SM /Herwig/MatrixElements/MEee2Higgs2SM
insert /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEee2Higgs2SM
set /Herwig/MatrixElements/MEee2Higgs2SM:Allowed Gluon
"""
# substs for the input file
parameters={"parameterFile" : """
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 10000.
set /Herwig/Generators/EventGenerator:EventHandler:HadronizationHandler NULL
set /Herwig/Generators/EventGenerator:EventHandler:DecayHandler NULL
set /Herwig/Analysis/Basics:CheckQuark No
set /Herwig/Particles/d:ConstituentMass 1e-10
set /Herwig/Particles/u:ConstituentMass 1e-10
set /Herwig/Particles/g:ConstituentMass 1e-9
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Simple_Onium""",
+insert /Herwig/Analysis/Rivet:Analyses 0 MC_Simple_Onium""",
"process" : """
%s
set /Herwig/Particles/b:ConstituentMass %s
set /Herwig/Particles/c:ConstituentMass %s
set /Herwig/Particles/b:NominalMass %s
set /Herwig/Particles/c:NominalMass %s
set /Herwig/Particles/%s:NominalMass %s\n""" %(proc,val[7],val[6],val[7],val[6],herwigName[val[0]],mO),
"shower" : """
read snippets/OniumShower.in
set /Herwig/Shower/ShowerHandler:HardEmission 0
do /Herwig/OniumParameters:SetWaveFunction %s %s %s
set /Herwig/Shower/%s:FixedAlphaS %s
set /Herwig/Shower/%s:EnhancementFactor %s
cd /Herwig/Shower
"""%(val[3],val[4],val[8],val[1],val[5],val[1],val[9])}
# mixing if needed
if len(val) == 13 :
parameters["shower"] += "do /Herwig/OniumParameters:SetSingletTripletMixing %s %s\n" % (val[4],val[12])
hName=herwigName[val[0]]
if val[3] == "bcbar" and val[2]==5 : hName=hName.replace("+","-")
# delete other splittings
for sp in splittings :
if not (val[1] in sp and hName in sp):
parameters["shower"] += sp
# write the input file
parameters["runname"]="Onium-%s"%key
with open(os.path.join("Rivet","Onium-%s.in"%key), 'w') as f:
f.write( template.substitute(parameters) )
targets += "Onium-%s.yoda " % key
print(targets)
# if we are doing the analysis
if opts.analyse :
if not os.path.isdir("Onium-Splitting"):
os.mkdir("Onium-Splitting")
plots=""
# loop over the tests
for (key,val) in testParameters.items() :
# mass of the quarks
if val[3]=="ccbar" or val[3]=="cc":
m1=val[6]
m2=val[6]
elif val[3]=="bbbar" or val[3]=="bb":
m1=val[7]
m2=val[7]
elif val[3]=="bcbar" or val[3]=="bc":
m1=val[6]
m2=val[7]
M = m1+m2
a1 = m1/M
a2 = 1-a1
# other parameters
aS = val[5]
R02 = val[8]
# mixing if needed
if len(val) == 13 :
mix1 = math.sin(val[12]/180.*math.pi)
mix2 = math.cos(val[12]/180.*math.pi)
itest = int((val[0]%100000)/10000);
if itest==2 :
(mix1,mix2) = (mix2,-mix1)
else :
mix1=0
mix2=0
if(val[2]==21) :
q1="g"
q2="g"
else :
if val[2] ==4 : q1 = "c"
elif val[2] ==5 : q1 = "b"
if val[3] != "bcbar" and val[3] !="bc" : q2 = q1
elif q1=="c" : q2 = "b"
else : q2 = "c"
lName=latexName[val[0]]
if q1=="b" and q2=="c" : lName=lName.replace("+","-")
if len(val[3])==2 :
title="Comparsion of fragmentation function for $%s\\to \\bar{%s} %s$" % (q1,q2,lName)
else :
title="Comparsion of fragmentation function for $%s\\to %s %s$" % (q1,q2,lName)
if len(val) == 13 :
title+=" ($\\theta=%.1f^0$)" % val[12]
plt.title(title)
aos = yoda.read("Onium-%s.yoda" % key)
histo = aos["/MC_Simple_Onium/h_%s" % val[0]]
x = []
dx = []
y1 = []
yan = []
dy1= []
chisq = 0.
ndof = 0
for bin in histo.bins() :
x .append(bin.xMid() )
dx .append(0.5*bin.xWidth())
y1 .append(bin.height() *val[11])
dy1.append(bin.heightErr()*val[11])
if(opts.fast) :
fval = val[11]*val[10](bin.xMid())
else :
fval = val[11]*quad(val[10],bin.xMin(),bin.xMax())[0]/bin.xWidth()
yan.append(fval)
if(dy1[-1]>0. and x[-1]>0.01 and x[-1]<0.99) :
chisq += ((fval-y1[-1])/dy1[-1])**2
ndof+=1.
if(ndof!=0) : chisq/=ndof
if(not opts.fast) :
(xan,yan) = fragmentation(val[10],val[11],step)
step=0.001
else :
xan=x
plt.plot(xan,yan,label="analytic ",color="black")
plt.errorbar(x,y1,yerr=dy1,xerr=dx,linestyle="none",fmt="none",
label="Hw Fixed $\\alpha_S$",color="red")
plt.xlabel("$z_{%s}$" % lName)
plt.ylabel("$D(z_{%s})\\times10^{%s}$" % (lName,int(math.log10(val[11]))))
if val[10]==D_g_g_3S1 :
loc = 1
else :
loc = 2
plt.legend(loc=loc,title="$\\chi^2/N=%.2f$"%chisq)
plt.xlim([0.,1.])
plt.savefig("Onium-Splitting/%s.pdf" %key)
plt.savefig("Onium-Splitting/%s.png" %key)
plt.clf()
plots+=plotTemplate.substitute({"id" : key})
with open(os.path.join("Onium-Splitting","index.html"), 'w') as f:
f.write( htmlTemplate.substitute( {"plots" : plots,
"time" :'<p>Generated at %s</p>' % datetime.datetime.now().strftime("%A, %d. %B %Y %I:%M%p") }) )
# setup chi_c2(2P) 100445 chi_c2(2P) 3.929 0.029 0.24 0 0 0 5 0
diff --git a/Tests/python/make_input_files.py.in b/Tests/python/make_input_files.py.in
--- a/Tests/python/make_input_files.py.in
+++ b/Tests/python/make_input_files.py.in
@@ -1,1676 +1,1680 @@
#! @PYTHON@
# -*- mode: python -*-
from __future__ import print_function
import logging,sys,os
from string import Template
from HerwigInputs import *
import sys
if sys.version_info[:3] < (2,4,0):
print ("rivet scripts require Python version >= 2.4.0... exiting")
sys.exit(1)
if __name__ == "__main__":
import logging
from optparse import OptionParser, OptionGroup
parser = OptionParser(usage="%prog name [...]")
simulation=""
+hepmc=os.getenv('OUTPUT_HEPMC', False)
+if hepmc != False : hepmc=True
numberOfAddedProcesses=0
def addProcess(thefactory,theProcess,Oas,Oew,scale,mergedlegs,NLOprocesses):
global numberOfAddedProcesses
global simulation
numberOfAddedProcesses+=1
res ="set "+thefactory+":OrderInAlphaS "+Oas+"\n"
res+="set "+thefactory+":OrderInAlphaEW "+Oew+"\n"
res+="do "+thefactory+":Process "+theProcess+" "
if ( mergedlegs != 0 ):
if simulation!="Merging":
print ("simulation is not Merging, trying to add merged legs.")
sys.exit(1)
res+="["
for j in range(mergedlegs):
res+=" j "
res+="]"
res+="\n"
if (NLOprocesses!=0):
if simulation!="Merging":
print ("simulation is not Merging, trying to add NLOProcesses.")
sys.exit(1)
res+="set MergingFactory:NLOProcesses %s \n" % NLOprocesses
if ( scale != "" ):
res+="set "+thefactory+":ScaleChoice /Herwig/MatrixElements/Matchbox/Scales/"+scale+"\n"
return res
addedBRReweighter=False
def addBRReweighter():
global addedBRReweighter
if(addedBRReweighter):
logging.error("Can only add BRReweighter once.")
sys.exit(1)
res="create Herwig::BranchingRatioReweighter /Herwig/Generators/BRReweighter\n"
res+="insert /Herwig/Generators/EventGenerator:EventHandler:PostHadronizationHandlers 0 /Herwig/Generators/BRReweighter\n"
addedBRReweighter=True
return res
selecteddecaymode=False
def selectDecayMode(particle,decaymodes):
global selecteddecaymode
res="do /Herwig/Particles/"+particle+":SelectDecayModes"
for decay in decaymodes:
res+=" /Herwig/Particles/"+particle+"/"+decay
res+="\n"
selecteddecaymode=True
return res
ME_Upsilon = """\
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
""" + insert_ME("MEUpsilon")
(opts, args) = parser.parse_args()
## Check args
if len(args) != 1:
logging.error("Must specify at least input file")
sys.exit(1)
name = args[0]
print (name)
# work out name and type of the collider
(collider,have_hadronic_collider) = identifyCollider(name)
# workout the type of simulation
(simulation,templateName,parameterName,parameters)=identifySimulation(name,collider,have_hadronic_collider)
if simulation=="Merging" :
thefactory="MergingFactory"
else :
thefactory="Factory"
# settings for four flavour scheme
fourFlavour="""
read Matchbox/FourFlavourScheme.in
{bjetgroup}
set /Herwig/Cuts/MatchboxJetMatcher:Group bjet
""".format(bjetgroup=particlegroup(thefactory,'bjet','b','bbar','c', 'cbar',
's','sbar','d','dbar','u','ubar','g'))
# work out the process and parameters
process=StringBuilder()
# DIS
if(collider=="DIS" and "Photo" not in name) :
if(simulation=="") :
if "NoME" in name :
process = StringBuilder("set /Herwig/Shower/ShowerHandler:HardEmission None")
parameterName=parameterName.replace("NoME-","")
parameterName=parameterName.replace("DIS-" ,"")
if "CC" in parameterName :
process += insert_ME("MEDISCC")
else :
process += insert_ME("MEDISNC")
elif(simulation=="Powheg") :
if "CC" in parameterName :
process = StringBuilder(insert_ME("PowhegMEDISCC"))
else :
process = StringBuilder(insert_ME("PowhegMEDISNC"))
elif(simulation=="Matchbox" ) :
if "CC" in name :
if "e-" in parameterName :
process = StringBuilder(addProcess(thefactory,"e- p -> nu_e j","0","2","",0,0))
else :
process = StringBuilder(addProcess(thefactory,"e+ p -> nu_ebar j","0","2","",0,0))
else :
if "e-" in parameterName :
process = StringBuilder(addProcess(thefactory,"e- p -> e- j","0","2","",0,0))
else :
process = StringBuilder(addProcess(thefactory,"e+ p -> e+ j","0","2","",0,0))
elif(simulation=="Merging" ) :
if "CC" in name :
if "e-" in parameterName :
process = StringBuilder(addProcess(thefactory,"e- p -> e- j","0","2","",2,2))
else :
process = StringBuilder(addProcess(thefactory,"e+ p -> e+ j","0","2","",2,2))
else :
if "e-" in parameterName :
process = StringBuilder(addProcess(thefactory,"e- p -> nu_e j","0","2","",2,2))
else :
process = StringBuilder(addProcess(thefactory,"e+ p -> nu_ebar j","0","2","",2,2))
Q2Min=1.
Q2Max=1000000.
if "VeryLow" in name :
Q2Max=20.
parameterName=parameterName.replace("-VeryLowQ2","")
elif "Low" in name :
Q2Min=20.
Q2Max=100.
parameterName=parameterName.replace("-LowQ2","")
elif "Med" in name :
Q2Min=100.
Q2Max=1000.
parameterName=parameterName.replace("-MedQ2","")
elif "High" in name :
Q2Min=1000.
parameterName=parameterName.replace("-HighQ2","")
if "CC" in name :
process+="set /Herwig/Cuts/ChargedCurrentCut:MaxQ2 %s\nset /Herwig/Cuts/ChargedCurrentCut:MinQ2 %s\n" %(Q2Max,Q2Min)
else :
process+="set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 %s\nset /Herwig/Cuts/NeutralCurrentCut:MinQ2 %s\n" %(Q2Max,Q2Min)
# DIS photoproduction
elif(collider=="DIS" and "Photo" in name) :
assert(simulation=="")
ecms=float(parameterName.split("-")[1])
cuts=[3.,6.,10.,ecms]
if "Direct" in parameterName :
parameterName=parameterName.replace("Direct-","")
process = StringBuilder(insert_ME("MEGammaP2Jets",None,"Process","SubProcess"))
elif "Resolved" in parameterName :
process = StringBuilder(insert_ME("MEQCD2to2"))
parameterName=parameterName.replace("Resolved-","")
for i in range(1,len(cuts)) :
tstring = "-Jets-%s"%i
if tstring in parameterName :
process+=jet_kt_cut(cuts[i-1],cuts[i])
parameterName=parameterName.replace(tstring,"")
# EE
elif(collider=="EE") :
if(simulation=="") :
if "gg" in parameterName :
process = StringBuilder("create Herwig::MEee2Higgs2SM /Herwig/MatrixElements/MEee2Higgs2SM\n")
process+=insert_ME("MEee2Higgs2SM","Gluon","Allowed")
elif "LL" in parameterName :
process = StringBuilder(insert_ME("MEee2gZ2ll"))
process += "set /Herwig/MatrixElements/MEee2gZ2ll:Allowed Charged\n"
elif "WW" in parameterName :
process = StringBuilder(insert_ME("MEee2VV"))
process += "set /Herwig/MatrixElements/MEee2VV:Process WW\n"
else :
process = StringBuilder(insert_ME("MEee2gZ2qq"))
try :
ecms = float(parameterName)
if(ecms<=3.75) :
process+= "set /Herwig/MatrixElements/MEee2gZ2qq:MaximumFlavour 3\n"
elif(ecms<=10.6) :
process+= "set /Herwig/MatrixElements/MEee2gZ2qq:MaximumFlavour 4\n"
except :
pass
elif(simulation=="Powheg") :
if "LL" in parameterName :
process = StringBuilder(insert_ME("PowhegMEee2gZ2ll"))
process += "set /Herwig/MatrixElements/PowhegMEee2gZ2ll:Allowed Charged\n"
else :
process = StringBuilder(insert_ME("PowhegMEee2gZ2qq"))
try :
ecms = float(parameterName)
if(ecms<=3.75) :
process+= "set /Herwig/MatrixElements/PowhegMEee2gZ2qq:MaximumFlavour 3\n"
elif(ecms<=10.6) :
process+= "set /Herwig/MatrixElements/PowhegMEee2gZ2qq:MaximumFlavour 4\n"
except :
pass
elif(simulation=="Matchbox" ) :
try :
ecms = float(parameterName)
if(ecms<=3.75) :
process = StringBuilder(addProcess(thefactory,"e- e+ -> u ubar","0","2","",0,0))
process+=addProcess(thefactory,"e- e+ -> d dbar","0","2","",0,0)
process+=addProcess(thefactory,"e- e+ -> s sbar","0","2","",0,0)
elif(ecms<=10.6) :
process = StringBuilder(addProcess(thefactory,"e- e+ -> u ubar","0","2","",0,0))
process+=addProcess(thefactory,"e- e+ -> d dbar","0","2","",0,0)
process+=addProcess(thefactory,"e- e+ -> c cbar","0","2","",0,0)
process+=addProcess(thefactory,"e- e+ -> s sbar","0","2","",0,0)
else :
process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",0,0))
except:
process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",0,0))
elif(simulation=="Merging" ) :
try :
ecms = float(parameterName)
if(ecms<=10.1) :
process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",2,2))
process+="read Matchbox/FourFlavourScheme.in"
else :
process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",2,2))
except:
process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",2,2))
# EE-Gamma
elif(collider=="EE-Gamma") :
if(simulation=="") :
if("mumu" in parameterName) :
process = StringBuilder(insert_ME("MEgg2ff","Muon"))
process +="set /Herwig/Cuts/Cuts:MHatMin 3.\n"
parameterName=parameterName.replace("Direct-","")
elif( "tautau" in parameterName) :
process = StringBuilder(insert_ME("MEgg2ff","Tau"))
process +="set /Herwig/Cuts/Cuts:MHatMin 3.\n"
parameterName=parameterName.replace("Direct-","")
elif( "Jets" in parameterName) :
if("Direct" in parameterName ) :
process = StringBuilder(insert_ME("MEgg2ff","Quarks"))
parameterName=parameterName.replace("Direct-","")
elif("Single-Resolved" in parameterName ) :
process = StringBuilder(insert_ME("MEGammaP2Jets",None,"Process","SubProcess"))
process+= insert_ME("MEGammaP2Jets",None,"Process","SubProcess2")
parameterName=parameterName.replace("Single-Resolved-","")
else :
process = StringBuilder(insert_ME("MEQCD2to2"))
parameterName=parameterName.replace("Double-Resolved-","")
process+="insert /Herwig/Cuts/Cuts:OneCuts[0] /Herwig/Cuts/JetKtCut"
process+="set /Herwig/Cuts/JetKtCut:MinKT 3."
elif ("pi0" in parameterName or "Eta" in parameterName or "EtaPrime" in parameterName or
"EtaC" in parameterName):
if "EtaC" in parameterName :
mename="EtaC1S"
elif "pi0" in parameterName :
mename="pi0"
elif "EtaPrime" in parameterName :
mename="etaPrime"
elif "Eta" in parameterName :
mename="eta"
process = StringBuilder(insert_ME("MEff2ff%s" % mename) )
if "10.58" in parameterName:
process+="cp /Herwig/MatrixElements/MEff2ff%s /Herwig/MatrixElements/MEff2ff%s2" % (mename,mename)
process+= insert_ME("MEff2ff%s2" % mename)
process+="cp /Herwig/MatrixElements/MEff2ff%s /Herwig/MatrixElements/MEff2ff%s3" % (mename,mename)
process+= insert_ME("MEff2ff%s3" % mename)
process+="set /Herwig/MatrixElements/MEff2ff%s:Q2_1Min 0. " % mename
process+="set /Herwig/MatrixElements/MEff2ff%s:Q2_1Max 1. " % mename
process+="set /Herwig/MatrixElements/MEff2ff%s:Q2_2Min 1. " % mename
process+="set /Herwig/MatrixElements/MEff2ff%s:Q2_2Max 1e10" % mename
process+="set /Herwig/MatrixElements/MEff2ff%s2:Q2_2Min 0. " % mename
process+="set /Herwig/MatrixElements/MEff2ff%s2:Q2_2Max 1. " % mename
process+="set /Herwig/MatrixElements/MEff2ff%s2:Q2_1Min 1. " % mename
process+="set /Herwig/MatrixElements/MEff2ff%s2:Q2_1Max 1e10" % mename
process+="set /Herwig/MatrixElements/MEff2ff%s3:Q2_2Min 1. " % mename
process+="set /Herwig/MatrixElements/MEff2ff%s3:Q2_2Max 1e10" % mename
process+="set /Herwig/MatrixElements/MEff2ff%s3:Q2_1Min 1. " % mename
process+="set /Herwig/MatrixElements/MEff2ff%s3:Q2_1Max 1e10" % mename
elif "ChiC0_2P" in parameterName :
process = StringBuilder(insert_ME("MEff2ffChiC02P"))
elif "ChiC2_2P" in parameterName :
process = StringBuilder(insert_ME("MEff2ffChiC22P"))
elif "ChiC2" in parameterName :
process = StringBuilder(insert_ME("MEff2ffChiC21P"))
elif "Onium" in parameterName :
process = StringBuilder(insert_ME("MEff2ffEtaC1S") )
process+= insert_ME("MEff2ffEtaC2S" )
process+= insert_ME("MEff2ffChiC01P")
process+= insert_ME("MEff2ffChiC21P")
process+= insert_ME("MEff2ffChiC22P")
process+= insert_ME("MEff2ffEtaB1S" )
process+= insert_ME("MEff2ffEtaB2S" )
process+= insert_ME("MEff2ffChiB01P")
process+= insert_ME("MEff2ffChiB21P")
process+= insert_ME("MEff2ffChiB02P")
process+= insert_ME("MEff2ffChiB22P")
process+= insert_ME("MEff2ffChiB03P")
process+= insert_ME("MEff2ffChiB23P")
process+= insert_ME("MEff2ffEtaB21D")
else :
print ("process not supported for Gamma Gamma processes at EE")
quit()
else :
print ("Only internal matrix elements currently supported for Gamma Gamma processes at EE")
quit()
elif(collider=="GammaGamma") :
if(simulation=="") :
if("mumu" in parameterName) :
process = StringBuilder(insert_ME("MEgg2ff"))
process +="set /Herwig/MatrixElements/gg2ffAmp:Process Muon\n"
process +="set /Herwig/Cuts/Cuts:MHatMin 3.\n"
else :
print ("process not supported for Gamma Gamma processes at EE")
quit()
else :
print ("Only internal matrix elements currently supported for Gamma Gamma processes at EE")
quit()
# TVT
elif(collider=="TVT") :
process = StringBuilder("set /Herwig/Generators/EventGenerator:EventHandler:BeamB /Herwig/Particles/pbar-\n")
ecms=1960.
if "Run-II" in parameterName : ecms = 1960.0
elif "Run-I" in parameterName : ecms = 1800.0
elif "900" in parameterName : ecms = 900.0
elif "630" in parameterName : ecms = 630.0
elif "300" in parameterName : ecms = 300.0
process+=collider_lumi(ecms)
if(simulation=="") :
if "PromptPhoton" in parameterName :
process+=insert_ME("MEGammaJet")
process+="set /Herwig/Cuts/PhotonKtCut:MinKT 15.\n"
elif "DiPhoton-GammaGamma" in parameterName :
process+=insert_ME("MEGammaGamma")
process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
parameterName=parameterName.replace("-GammaGamma","")
elif "DiPhoton-GammaJet" in parameterName :
process+=insert_ME("MEGammaJet")
process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
parameterName=parameterName.replace("-GammaJet","")
elif "UE" in parameterName :
if "Dipole" in parameters["shower"]:
process+="read snippets/MB-DipoleShower.in\n"
else:
process+="read snippets/MB.in\n"
process+="read snippets/Diffraction.in\n"
process += "set /Herwig/Decays/DecayHandler:LifeTimeOption 0\n"
process += "set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm\n"
elif "Jets" in parameterName :
process+=insert_ME("MEQCD2to2")
process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
if "DiJets" in name :
process +=jet_kt_cut( 30.)
cuts=[100.,300.,600.,900.,ecms]
for i in range(1,len(cuts)) :
tstring = "-DiJets-%s"%i
if tstring in parameterName :
process+=mhat_cut(cuts[i-1],cuts[i])
parameterName=parameterName.replace(tstring,"-DiJets")
else :
if "Run" in parameterName :
cuts=[5.,20.,40.,80.,160.,320.]
elif "300" in parameterName :
cuts=[5.,]
elif "630" in parameterName :
cuts=[5.,20.,40.]
elif "900" in parameterName :
cuts=[5.,]
cuts.append(ecms)
for i in range(1,len(cuts)) :
tstring = "-Jets-%s"%i
if tstring in parameterName :
process+=jet_kt_cut(cuts[i-1],cuts[i])
parameterName=parameterName.replace(tstring,"-Jets")
elif "Run-I-WZ" in parameterName :
process+=insert_ME("MEqq2W2ff","Electron")
process+=insert_ME("MEqq2gZ2ff","Electron")
elif "Run-II-W" in parameterName or "Run-I-W" in parameterName :
process+=insert_ME("MEqq2W2ff","Electron")
elif "Run-II-Z-e" in parameterName or "Run-I-Z" in parameterName :
process +=insert_ME("MEqq2gZ2ff","Electron")
elif "Run-II-Z-LowMass-mu" in parameterName :
process +=insert_ME("MEqq2gZ2ff","Muon")
process+=addLeptonPairCut("25","70")
elif "Run-II-Z-HighMass-mu" in parameterName :
process +=insert_ME("MEqq2gZ2ff","Muon")
process+=addLeptonPairCut("150","600")
elif "Run-II-Z-mu" in parameterName :
process +=insert_ME("MEqq2gZ2ff","Muon")
elif(simulation=="Powheg") :
if "Run-I-WZ" in parameterName :
process+=insert_ME("PowhegMEqq2W2ff","Electron")
process+=insert_ME("PowhegMEqq2gZ2ff","Electron")
elif "Run-II-W" in parameterName or "Run-I-W" in parameterName :
process+=insert_ME("PowhegMEqq2W2ff","Electron")
elif "Run-II-Z-e" in parameterName or "Run-I-Z" in parameterName :
process+=insert_ME("PowhegMEqq2gZ2ff","Electron")
elif "Run-II-Z-LowMass-mu" in parameterName :
process+=insert_ME("PowhegMEqq2gZ2ff","Muon")
process+=addLeptonPairCut("25","70")
elif "Run-II-Z-HighMass-mu" in parameterName :
process+=insert_ME("PowhegMEqq2gZ2ff","Muon")
process+=addLeptonPairCut("150","600")
elif "Run-II-Z-mu" in parameterName :
process+=insert_ME("PowhegMEqq2gZ2ff","Muon")
elif "DiPhoton-GammaGamma" in parameterName :
process+=insert_ME("MEGammaGammaPowheg","GammaGamma")
process+=insert_ME("MEGammaGamma","gg")
process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
process+=jet_kt_cut(5.)
parameterName=parameterName.replace("-GammaGamma","")
elif "DiPhoton-GammaJet" in parameterName :
process+=insert_ME("MEGammaGammaPowheg","VJet")
process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
process+=jet_kt_cut(5.)
parameterName=parameterName.replace("-GammaJet","")
elif(simulation=="Matchbox" or simulation=="Merging" ) :
if "Jets" in parameterName :
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p p -> j j","2","0","MaxJetPtScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p p -> j j","2","0","MaxJetPtScale",1,0)
if "DiJets" in parameterName :
process+=addFirstJet("30")+addSecondJet("25")
cuts=[100.,300.,600.,900.,ecms]
for i in range(1,len(cuts)) :
tstring = "-DiJets-%s"%i
if tstring in parameterName :
process+=addJetPairCut(cuts[i-1],cuts[i])
parameterName=parameterName.replace(tstring,"-DiJets")
else :
if "Run" in parameterName :
cuts=[5.,20.,40.,80.,160.,320.]
elif "300" in parameterName :
cuts=[5.,]
elif "630" in parameterName :
cuts=[5.,20.,40.]
elif "900" in parameterName :
cuts=[5.,]
cuts.append(ecms)
for i in range(1,len(cuts)) :
tstring = "-Jets-%s"%i
if tstring in parameterName :
process+=addFirstJet(cuts[i-1],cuts[i])
parameterName=parameterName.replace(tstring,"-Jets")
elif "Run-I-WZ" in parameterName :
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p pbar e+ e-","0","2","LeptonPairMassScale",0,0)
process+=addProcess(thefactory,"p pbar e+ nu","0","2","LeptonPairMassScale",0,0)
process+=addProcess(thefactory,"p pbar e- nu","0","2","LeptonPairMassScale",0,0)
elif(simulation=="Merging"):
process+=particlegroup(thefactory,'epm','e+','e-')
process+=particlegroup(thefactory,'epmnu','e+','e-','nu_e','nu_ebar')
process+=addProcess(thefactory,"p pbar epm epmnu","0","2","LeptonPairMassScale",2,2)
process+=addLeptonPairCut("60","120")
elif "Run-II-W" in parameterName or "Run-I-W" in parameterName :
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p pbar e+ nu","0","2","LeptonPairMassScale",0,0)
process+=addProcess(thefactory,"p pbar e- nu","0","2","LeptonPairMassScale",0,0)
elif(simulation=="Merging"):
process+=particlegroup(thefactory,'epm','e+','e-')
process+=addProcess(thefactory,"p pbar epm nu","0","2","LeptonPairMassScale",2,2)
process+=addLeptonPairCut("60","120")
elif "Run-II-Z-e" in parameterName or "Run-I-Z" in parameterName :
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p pbar e+ e-","0","2","LeptonPairMassScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p pbar e+ e-","0","2","LeptonPairMassScale",2,2)
process+=addLeptonPairCut("60","120")
elif "Run-II-Z-LowMass-mu" in parameterName :
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",2,2)
process+=addLeptonPairCut("25","70")
elif "Run-II-Z-HighMass-mu" in parameterName :
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",2,2)
process+=addLeptonPairCut("150","600")
elif "Run-II-Z-mu" in parameterName :
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",2,2)
process+=addLeptonPairCut("60","120")
# Star
elif(collider=="Star" ) :
process = StringBuilder("set /Herwig/Decays/DecayHandler:LifeTimeOption 0\n")
process+= "set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm\n"
process+= "set /Herwig/Generators/EventGenerator:EventHandler:BeamB /Herwig/Particles/p+\n"
process+= collider_lumi(200.0)
process+= "set /Herwig/Cuts/Cuts:X2Min 0.01\n"
if(simulation=="") :
if "UE" in parameterName :
if "Dipole" in parameters["shower"]:
process+="read snippets/MB-DipoleShower.in\n"
else:
process+="read snippets/MB.in\n"
process+="read snippets/Diffraction.in\n"
else :
process+=insert_ME("MEQCD2to2")
process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
if "Jets-1" in parameterName : process+=jet_kt_cut(2.)
elif "Jets-2" in parameterName : process+=jet_kt_cut(5.)
elif "Jets-3" in parameterName : process+=jet_kt_cut(20.)
elif "Jets-4" in parameterName : process+=jet_kt_cut(25.)
else :
logging.error("Star not supported for %s " % simulation)
sys.exit(1)
# ISR and SppS
elif ( collider=="ISR" or collider =="SppS" or collider == "SPS" or collider == "Fermilab" ) :
process = StringBuilder("set /Herwig/Decays/DecayHandler:LifeTimeOption 0\n")
process+="set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm\n"
if(collider=="SppS") :
process = StringBuilder("set /Herwig/Generators/EventGenerator:EventHandler:BeamB /Herwig/Particles/pbar-\n")
if "17.4" in parameterName : process+=collider_lumi( 17.4)
elif "27.4" in parameterName : process+=collider_lumi( 27.4)
elif "30" in parameterName : process+=collider_lumi( 30.4)
elif "38.8" in parameterName : process+=collider_lumi( 38.8)
elif "44" in parameterName : process+=collider_lumi( 44.4)
elif "53" in parameterName : process+=collider_lumi( 53.0)
elif "62" in parameterName : process+=collider_lumi( 62.2)
elif "63" in parameterName : process+=collider_lumi( 63.0)
elif "200" in parameterName : process+=collider_lumi(200.0)
elif "500" in parameterName : process+=collider_lumi(500.0)
elif "546" in parameterName : process+=collider_lumi(546.0)
elif "900" in parameterName : process+=collider_lumi(900.0)
if "UE" in parameterName :
if(simulation=="") :
if "Dipole" in parameters["shower"]:
process+="read snippets/MB-DipoleShower.in\n"
else:
process+="read snippets/MB.in\n"
if "EHS" not in name :
process+="read snippets/Diffraction.in\n"
else :
logging.error(" SppS and ISR not supported for %s " % simulation)
sys.exit(1)
elif "Z-mu" in parameterName :
if simulation == "" :
process+=insert_ME("MEqq2gZ2ff","Muon")
process+=mhat_minm_maxm(2,2,20)
elif simulation == "Powheg" :
process+=insert_ME("PowhegMEqq2gZ2ff","Muon")
process+=mhat_minm_maxm(2,2,20)
elif(simulation=="Matchbox"):
process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",0,0)
process+=addLeptonPairCut("2","20")
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",2,2)
process+=addLeptonPairCut("2","20")
else :
logging.error(" SppS and ISR not supported for %s " % simulation)
sys.exit(1)
else :
logging.error(" Process not supported for SppS and ISR %s " % parameterName )
sys.exit(1)
# LHC
elif(collider=="LHC") :
ecms=7000.0
if parameterName.startswith("7-") : ecms = 7000.0
elif parameterName.startswith("8-") : ecms = 8000.0
elif parameterName.startswith("13-") : ecms = 13000.0
elif parameterName.startswith("900") : ecms = 900.0
elif parameterName.startswith("2360") : ecms = 2360.0
elif parameterName.startswith("2760") : ecms = 2760.0
elif parameterName.startswith("5-") : ecms = 5020.0
else : ecms = 7000.0
process = StringBuilder(collider_lumi(ecms))
if(simulation=="") :
if "VBF" in parameterName :
process+=insert_ME("MEPP2HiggsVBF")
if "GammaGamma" in parameterName :
process+=selectDecayMode("h0",["h0->gamma,gamma;"])
addedBRReweighter = True
elif "WW" in parameterName :
process+=selectDecayMode("h0",["h0->W+,W-;"])
addedBRReweighter = True
elif "ZZ" in parameterName :
process+=selectDecayMode("h0",["h0->Z0,Z0;"])
addedBRReweighter = True
elif "8-" not in parameterName :
process+=selectDecayMode("h0",["h0->tau-,tau+;"])
addedBRReweighter = True
process+="set /Herwig/Particles/tau-:Stable Stable\n"
elif "ggHJet" in parameterName :
process+=selectDecayMode("h0",["h0->tau-,tau+;"])
addedBRReweighter = True
process+="set /Herwig/Particles/tau-:Stable Stable\n"
process+=insert_ME("MEHiggsJet")
process+=jet_kt_cut(20.)
elif "ggH" in parameterName :
process+=insert_ME("MEHiggs")
process+=insert_ME("MEHiggsJet","qqbar")
process+=jet_kt_cut(0.0)
if "GammaGamma" in parameterName :
process+=selectDecayMode("h0",["h0->gamma,gamma;"])
addedBRReweighter = True
elif "WW" in parameterName :
process+=selectDecayMode("h0",["h0->W+,W-;"])
addedBRReweighter = True
elif "ZZ" in parameterName :
process+=selectDecayMode("h0",["h0->Z0,Z0;"])
addedBRReweighter = True
elif "8-" not in parameterName :
process+=selectDecayMode("h0",["h0->tau-,tau+;"])
addedBRReweighter = True
process+="set /Herwig/Particles/tau-:Stable Stable\n"
elif "PromptPhoton" in parameterName :
process+=insert_ME("MEGammaJet")
if "PromptPhoton-1" in parameterName :
process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
process+="set /Herwig/Cuts/PhotonKtCut:MaxKT 25.\n"
parameterName=parameterName.replace("-1","")
elif "PromptPhoton-2" in parameterName :
process+="set /Herwig/Cuts/PhotonKtCut:MinKT 25.\n"
process+="set /Herwig/Cuts/PhotonKtCut:MaxKT 80.\n"
parameterName=parameterName.replace("-2","")
elif "PromptPhoton-3" in parameterName :
process+="set /Herwig/Cuts/PhotonKtCut:MinKT 80.\n"
process+="set /Herwig/Cuts/PhotonKtCut:MaxKT 150.\n"
parameterName=parameterName.replace("-3","")
elif "PromptPhoton-4" in parameterName :
process+="set /Herwig/Cuts/PhotonKtCut:MinKT 150.\n"
process+="set /Herwig/Cuts/PhotonKtCut:MaxKT 500.\n"
parameterName=parameterName.replace("-4","")
elif "PromptPhoton-5" in parameterName :
process+="set /Herwig/Cuts/PhotonKtCut:MinKT 500.\n"
parameterName=parameterName.replace("-5","")
elif "DiPhoton-GammaGamma" in parameterName :
process+=insert_ME("MEGammaGamma")
process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
parameterName=parameterName.replace("-GammaGamma","")
elif "DiPhoton-GammaJet" in parameterName :
process+=insert_ME("MEGammaJet")
process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
parameterName=parameterName.replace("-GammaJet","")
elif "8-WH" in parameterName :
process+=insert_ME("MEPP2WH")
process+=jet_kt_cut(0.0)
if "GammaGamma" in parameterName :
process+=selectDecayMode("h0",["h0->gamma,gamma;"])
addedBRReweighter = True
elif "WW" in parameterName :
process+=selectDecayMode("h0",["h0->W+,W-;"])
addedBRReweighter = True
elif "ZZ" in parameterName :
process+=selectDecayMode("h0",["h0->Z0,Z0;"])
addedBRReweighter = True
elif "8-ZH" in parameterName :
process+=insert_ME("MEPP2ZH")
process+=jet_kt_cut(0.0)
if "GammaGamma" in parameterName :
process+=selectDecayMode("h0",["h0->gamma,gamma;"])
addedBRReweighter = True
elif "WW" in parameterName :
process+=selectDecayMode("h0",["h0->W+,W-;"])
addedBRReweighter = True
elif "ZZ" in parameterName :
process+=selectDecayMode("h0",["h0->Z0,Z0;"])
addedBRReweighter = True
elif "WH" in parameterName :
process+=selectDecayMode("h0",["h0->b,bbar;"])
process+=selectDecayMode("W+",["W+->nu_e,e+;",
"W+->nu_mu,mu+;"])
addedBRReweighter = True
process+=insert_ME("MEPP2WH")
process+=jet_kt_cut(0.0)
elif "ZH" in parameterName :
process+=selectDecayMode("h0",["h0->b,bbar;"])
process+=selectDecayMode("Z0",["Z0->e-,e+;",
"Z0->mu-,mu+;"])
addedBRReweighter = True
process+=insert_ME("MEPP2ZH")
process+=jet_kt_cut(0.0)
elif "UE" in parameterName or "Cent" in parameterName :
if "Dipole" in parameters["shower"]:
process+="read snippets/MB-DipoleShower.in\n"
else:
process+="set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV\n"
process+="read snippets/MB.in\n"
process+="read snippets/Diffraction.in\n"
if "Long" in parameterName :
process += "set /Herwig/Decays/DecayHandler:MaxLifeTime 100*mm\n"
elif "8-DiJets" in parameterName or "7-DiJets" in parameterName or "13-DiJets" in parameterName :
process+=insert_ME("MEQCD2to2")
process+="set MEQCD2to2:MaximumFlavour 5\n"
process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
if "13-DiJets" not in parameterName :
if "-A" in parameterName :
process+=jet_kt_cut(45.)
process+="set /Herwig/Cuts/JetKtCut:MinEta -3.\n"
process+="set /Herwig/Cuts/JetKtCut:MaxEta 3.\n"
elif "-B" in parameterName :
process+=jet_kt_cut(20.)
process+="set /Herwig/Cuts/JetKtCut:MinEta -2.7\n"
process+="set /Herwig/Cuts/JetKtCut:MaxEta 2.7\n"
elif "-C" in parameterName :
process+=jet_kt_cut(20.)
process+="set /Herwig/Cuts/JetKtCut:MinEta -4.8\n"
process+="set /Herwig/Cuts/JetKtCut:MaxEta 4.8\n"
else :
if "-A" in parameterName :
process+=jet_kt_cut(60.)
process+="set /Herwig/Cuts/JetKtCut:MinEta -3.\n"
process+="set /Herwig/Cuts/JetKtCut:MaxEta 3.\n"
elif "-B" in parameterName :
process+=jet_kt_cut(180.)
process+="set /Herwig/Cuts/JetKtCut:MinEta -3.\n"
process+="set /Herwig/Cuts/JetKtCut:MaxEta 3.\n"
if "DiJets-1" in parameterName : process+=mhat_cut(90.)
elif "DiJets-2" in parameterName : process+=mhat_cut(200.)
elif "DiJets-3" in parameterName : process+=mhat_cut(450.)
elif "DiJets-4" in parameterName : process+=mhat_cut(750.)
elif "DiJets-5" in parameterName : process+=mhat_cut(950.)
elif "DiJets-6" in parameterName : process+=mhat_cut(1550.)
elif "DiJets-7" in parameterName : process+=mhat_cut(2150.)
elif "DiJets-8" in parameterName : process+=mhat_cut(2750.)
elif "DiJets-9" in parameterName : process+=mhat_cut(3750.)
elif "DiJets-10" in parameterName : process+=mhat_cut(4750.)
elif "DiJets-11" in parameterName : process+=mhat_cut(5750.)
elif( "7-Jets" in parameterName
or "8-Jets" in parameterName
or "13-Jets" in parameterName
or "2760-Jets" in parameterName
) :
process+=insert_ME("MEQCD2to2")
process+="set MEQCD2to2:MaximumFlavour 5\n"
process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
if "Jets-10" in parameterName : process+=jet_kt_cut(1800.)
elif "Jets-0" in parameterName : process+=jet_kt_cut(5.)
elif "Jets-1" in parameterName : process+=jet_kt_cut(10.)
elif "Jets-2" in parameterName : process+=jet_kt_cut(20.)
elif "Jets-3" in parameterName : process+=jet_kt_cut(40.)
elif "Jets-4" in parameterName : process+=jet_kt_cut(70.)
elif "Jets-5" in parameterName : process+=jet_kt_cut(150.)
elif "Jets-6" in parameterName : process+=jet_kt_cut(200.)
elif "Jets-7" in parameterName : process+=jet_kt_cut(300.)
elif "Jets-8" in parameterName : process+=jet_kt_cut(500.)
elif "Jets-9" in parameterName : process+=jet_kt_cut(800.)
elif( "-Charm" in parameterName or "-Bottom" in parameterName ) :
if("8-Bottom" in parameterName) :
addBRReweighter()
process+=selectDecayMode("Jpsi",["Jpsi->mu-,mu+;"])
if "Bottom" in parameterName :
process+="cp MEHeavyQuark MEBottom\n"
process+="set MEBottom:QuarkType Bottom\n"
process+=insert_ME("MEBottom")
else :
process+="cp MEHeavyQuark MECharm\n"
process+="set MECharm:QuarkType Charm\n"
process+=insert_ME("MECharm")
process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
if "-0" in parameterName :
if "Bottom" in parameterName :
process+="set MEBottom:Process Pair\n"
process+=jet_kt_cut(0.)
else :
process+=jet_kt_cut(1.)
elif "-1" in parameterName : process+=jet_kt_cut(5.)
elif "-2" in parameterName : process+=jet_kt_cut(15.)
elif "-3" in parameterName : process+=jet_kt_cut(20.)
elif "-4" in parameterName : process+=jet_kt_cut(50.)
elif "-5" in parameterName : process+=jet_kt_cut(80.)
elif "-6" in parameterName : process+=jet_kt_cut(110.)
elif "-7" in parameterName : process+=jet_kt_cut(30.)+mhat_cut(90.)
elif "-8" in parameterName : process+=jet_kt_cut(30.)+mhat_cut(340.)
elif "-9" in parameterName : process+=jet_kt_cut(30.)+mhat_cut(500.)
elif "Top-L" in parameterName :
process+="set MEHeavyQuark:QuarkType Top\n"
process+=insert_ME("MEHeavyQuark")
process+=selectDecayMode("t",["t->nu_e,e+,b;",
"t->nu_mu,mu+,b;"])
process+=addBRReweighter()
elif "Top-SL" in parameterName :
process+="set MEHeavyQuark:QuarkType Top\n"
process+=insert_ME("MEHeavyQuark")
process+="set /Herwig/Particles/t:Synchronized Not_synchronized\n"
process+="set /Herwig/Particles/tbar:Synchronized Not_synchronized\n"
process+=selectDecayMode("t",["t->nu_e,e+,b;","t->nu_mu,mu+,b;"])
process+=selectDecayMode("tbar",["tbar->b,bbar,cbar;",
"tbar->bbar,cbar,d;",
"tbar->bbar,cbar,s;",
"tbar->bbar,s,ubar;",
"tbar->bbar,ubar,d;"])
process+=addBRReweighter()
elif "Top-All" in parameterName :
process+="set MEHeavyQuark:QuarkType Top\n"
process+=insert_ME("MEHeavyQuark")
elif "WZ" in parameterName :
process+=insert_ME("MEPP2VV","WZ")
process+=selectDecayMode("W+",["W+->nu_e,e+;",
"W+->nu_mu,mu+;"])
process+=selectDecayMode("W-",["W-->nu_ebar,e-;",
"W-->nu_mubar,mu-;"])
process+=selectDecayMode("Z0",["Z0->e-,e+;",
"Z0->mu-,mu+;"])
addedBRReweighter = True
elif "WW-emu" in parameterName :
process+=insert_ME("MEPP2VV","WW")
process+="set /Herwig/Particles/W+:Synchronized 0\n"
process+="set /Herwig/Particles/W-:Synchronized 0\n"
process+=selectDecayMode("W+",["W+->nu_e,e+;"])
process+=selectDecayMode("W-",["W-->nu_mubar,mu-;"])
addedBRReweighter = True
elif "WW-ll" in parameterName :
process+=insert_ME("MEPP2VV","WW")
process+=selectDecayMode("W+",["W+->nu_e,e+;","W+->nu_mu,mu+;","W+->nu_tau,tau+;"])
addedBRReweighter = True
elif "ZZ-ll" in parameterName :
process+=insert_ME("MEPP2VV","ZZ")
process+=selectDecayMode("Z0",["Z0->e-,e+;",
"Z0->mu-,mu+;",
"Z0->tau-,tau+;"])
addedBRReweighter = True
elif "ZZ-lv" in parameterName :
process+=insert_ME("MEPP2VV","ZZ")
process+=selectDecayMode("Z0",["Z0->e-,e+;",
"Z0->mu-,mu+;",
"Z0->tau-,tau+;",
"Z0->nu_e,nu_ebar;",
"Z0->nu_mu,nu_mubar;",
"Z0->nu_tau,nu_taubar;"])
addedBRReweighter = True
elif "W-e" in parameterName :
process+=insert_ME("MEqq2W2ff","Electron")
elif "W-mu" in parameterName :
process+=insert_ME("MEqq2W2ff","Muon")
elif "Z-e" in parameterName or "Z-mu" in parameterName :
if "Z-e" in parameterName:
process+=insert_ME("MEqq2gZ2ff","Electron")
else :
process+=insert_ME("MEqq2gZ2ff","Muon")
mcuts=[10,35,75,110,400,ecms]
for i in range(1,6) :
tstring = "-Mass%s"%i
if tstring in parameterName :
process+=mhat_minm_maxm(mcuts[i-1],mcuts[i-1],mcuts[i])
parameterName=parameterName.replace(tstring,"")
elif "Z-nu" in parameterName :
process+=insert_ME("MEqq2gZ2ff","Neutrinos")
elif "W-Jet" in parameterName :
process+=insert_ME("MEWJet","Electron","WDecay")
if "W-Jet-1-e" in parameterName :
process+="set /Herwig/Cuts/WBosonKtCut:MinKT 100.0*GeV\n"
parameterName=parameterName.replace("W-Jet-1-e","W-Jet-e")
elif "W-Jet-2-e" in parameterName :
process+="set /Herwig/Cuts/WBosonKtCut:MinKT 190.0*GeV\n"
parameterName=parameterName.replace("W-Jet-2-e","W-Jet-e")
elif "W-Jet-3-e" in parameterName :
process+="set /Herwig/Cuts/WBosonKtCut:MinKT 270.0*GeV\n"
parameterName=parameterName.replace("W-Jet-3-e","W-Jet-e")
elif "Z-Jet" in parameterName :
if "-e" in parameterName :
process+=insert_ME("MEZJet","Electron","ZDecay")
if "Z-Jet-0-e" in parameterName :
process+="set /Herwig/Cuts/ZBosonKtCut:MinKT 35.0*GeV\n"
parameterName=parameterName.replace("Z-Jet-0-e","Z-Jet-e")
elif "Z-Jet-1-e" in parameterName :
process+="set /Herwig/Cuts/ZBosonKtCut:MinKT 100.0*GeV\n"
parameterName=parameterName.replace("Z-Jet-1-e","Z-Jet-e")
elif "Z-Jet-2-e" in parameterName :
process+="set /Herwig/Cuts/ZBosonKtCut:MinKT 190.0*GeV\n"
parameterName=parameterName.replace("Z-Jet-2-e","Z-Jet-e")
elif "Z-Jet-3-e" in parameterName :
process+="set /Herwig/Cuts/ZBosonKtCut:MinKT 270.0*GeV\n"
parameterName=parameterName.replace("Z-Jet-3-e","Z-Jet-e")
else :
process+=insert_ME("MEZJet","Muon","ZDecay")
process+="set /Herwig/Cuts/ZBosonKtCut:MinKT 35.0*GeV\n"
parameterName=parameterName.replace("Z-Jet-0-mu","Z-Jet-mu")
elif "WGamma" in parameterName :
process+=insert_ME("MEPP2VGamma","1")
process+="set MEPP2VGamma:MassOption 1"
process+="set /Herwig/Cuts/PhotonKtCut:MinKT 10.\n"
if "-e" in parameterName :
process+=selectDecayMode("W+",["W+->nu_e,e+;"])
addedBRReweighter=True
else :
process+=selectDecayMode("W+",["W+->nu_mu,mu+;"])
addedBRReweighter=True
elif "ZGamma" in parameterName :
process+=insert_ME("MEPP2VGamma","2")
process+="set /Herwig/Cuts/PhotonKtCut:MinKT 10.\n"
if "-e" in parameterName :
process+=selectDecayMode("Z0",["Z0->e-,e+;"])
addedBRReweighter=True
elif "-mu" in parameterName :
process+=selectDecayMode("Z0",["Z0->mu-,mu+;"])
addedBRReweighter=True
elif "-nu" in parameterName :
process+=selectDecayMode("Z0",["Z0->nu_e,nu_ebar;","Z0->nu_mu,nu_mubar;","Z0->nu_tau,nu_taubar;"])
addedBRReweighter=True
else :
logging.error(" Process %s not supported for internal matrix elements" % name)
sys.exit(1)
elif(simulation=="Powheg") :
if "VBF" in parameterName :
process+=insert_ME("PowhegMEPP2HiggsVBF")
if "GammaGamma" in parameterName :
process+=selectDecayMode("h0",["h0->gamma,gamma;"])
addedBRReweighter = True
elif "WW" in parameterName :
process+=selectDecayMode("h0",["h0->W+,W-;"])
addedBRReweighter = True
elif "ZZ" in parameterName :
process+=selectDecayMode("h0",["h0->Z0,Z0;"])
addedBRReweighter = True
elif "8-" not in parameterName :
process+=selectDecayMode("h0",["h0->tau-,tau+;"])
addedBRReweighter = True
process+="set /Herwig/Particles/tau-:Stable Stable\n"
elif "ggHJet" in parameterName :
logging.error(" Process %s not supported for POWHEG matrix elements" % name)
sys.exit(1)
elif "ggH" in parameterName :
process+=insert_ME("PowhegMEHiggs")
if "GammaGamma" in parameterName :
process+=selectDecayMode("h0",["h0->gamma,gamma;"])
addedBRReweighter = True
elif "WW" in parameterName :
process+=selectDecayMode("h0",["h0->W+,W-;"])
addedBRReweighter = True
elif "ZZ" in parameterName :
process+=selectDecayMode("h0",["h0->Z0,Z0;"])
addedBRReweighter = True
elif "8-" not in parameterName :
process+=selectDecayMode("h0",["h0->tau-,tau+;"])
addedBRReweighter = True
process+="set /Herwig/Particles/tau-:Stable Stable\n"
elif "8-WH" in parameterName :
process+=insert_ME("PowhegMEPP2WH")
process+=jet_kt_cut(0.0)
if "GammaGamma" in parameterName :
process+=selectDecayMode("h0",["h0->gamma,gamma;"])
addedBRReweighter = True
elif "WW" in parameterName :
process+=selectDecayMode("h0",["h0->W+,W-;"])
addedBRReweighter = True
elif "ZZ" in parameterName :
process+=selectDecayMode("h0",["h0->Z0,Z0;"])
addedBRReweighter = True
elif "8-ZH" in parameterName :
process+=insert_ME("PowhegMEPP2ZH")
process+=jet_kt_cut(0.0)
if "GammaGamma" in parameterName :
process+=selectDecayMode("h0",["h0->gamma,gamma;"])
addedBRReweighter = True
elif "WW" in parameterName :
process+=selectDecayMode("h0",["h0->W+,W-;"])
addedBRReweighter = True
elif "ZZ" in parameterName :
process+=selectDecayMode("h0",["h0->Z0,Z0;"])
addedBRReweighter = True
elif "WH" in parameterName :
process+=selectDecayMode("h0",["h0->b,bbar;"])
process+=selectDecayMode("W+",["W+->nu_e,e+;",
"W+->nu_mu,mu+;"])
addedBRReweighter = True
process+=insert_ME("PowhegMEPP2WH")
process+=jet_kt_cut(0.0)
elif "ZH" in parameterName :
process+=selectDecayMode("h0",["h0->b,bbar;"])
process+=selectDecayMode("Z0",["Z0->e-,e+;",
"Z0->mu-,mu+;"])
addedBRReweighter = True
process+=insert_ME("PowhegMEPP2ZH")
process+=jet_kt_cut(0.0)
elif "UE" in parameterName :
logging.error(" Process %s not supported for powheg matrix elements" % name)
sys.exit(1)
elif "WZ" in parameterName :
process+="create Herwig::HwDecayHandler /Herwig/NewPhysics/DecayHandler\n"
process+="set /Herwig/NewPhysics/DecayHandler:NewStep No\n"
process+="set /Herwig/Shower/ShowerHandler:SplitHardProcess No\n";
process+="set /Herwig/Decays/ZDecayer:PhotonGenerator NULL\n";
process+="set /Herwig/Decays/WDecayer:PhotonGenerator NULL\n";
process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 0 /Herwig/Particles/tau-\n"
process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 1 /Herwig/Particles/tau+\n"
process+="insert /Herwig/Generators/EventGenerator:EventHandler:PreCascadeHandlers 0 /Herwig/NewPhysics/DecayHandler\n"
process+=insert_ME("PowhegMEPP2VV","WZ")
process+=selectDecayMode("W+",["W+->nu_e,e+;",
"W+->nu_mu,mu+;"])
process+=selectDecayMode("W-",["W-->nu_ebar,e-;",
"W-->nu_mubar,mu-;"])
process+=selectDecayMode("Z0",["Z0->e-,e+;",
"Z0->mu-,mu+;"])
addedBRReweighter = True
elif "WW-emu" in parameterName :
process+="create Herwig::HwDecayHandler /Herwig/NewPhysics/DecayHandler\n"
process+="set /Herwig/NewPhysics/DecayHandler:NewStep No\n"
process+="set /Herwig/Shower/ShowerHandler:SplitHardProcess No\n";
process+="set /Herwig/Decays/ZDecayer:PhotonGenerator NULL\n";
process+="set /Herwig/Decays/WDecayer:PhotonGenerator NULL\n";
process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 0 /Herwig/Particles/tau-\n"
process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 1 /Herwig/Particles/tau+\n"
process+="insert /Herwig/Generators/EventGenerator:EventHandler:PreCascadeHandlers 0 /Herwig/NewPhysics/DecayHandler\n"
process+=insert_ME("PowhegMEPP2VV","WW")
process+="set /Herwig/Particles/W+:Synchronized 0\n"
process+="set /Herwig/Particles/W-:Synchronized 0\n"
process+=selectDecayMode("W+",["W+->nu_e,e+;"])
process+=selectDecayMode("W-",["W-->nu_mubar,mu-;"])
addedBRReweighter = True
elif "WW-ll" in parameterName :
process+="create Herwig::HwDecayHandler /Herwig/NewPhysics/DecayHandler\n"
process+="set /Herwig/NewPhysics/DecayHandler:NewStep No\n"
process+="set /Herwig/Shower/ShowerHandler:SplitHardProcess No\n";
process+="set /Herwig/Decays/ZDecayer:PhotonGenerator NULL\n";
process+="set /Herwig/Decays/WDecayer:PhotonGenerator NULL\n";
process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 0 /Herwig/Particles/tau-\n"
process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 1 /Herwig/Particles/tau+\n"
process+="insert /Herwig/Generators/EventGenerator:EventHandler:PreCascadeHandlers 0 /Herwig/NewPhysics/DecayHandler\n"
process+=insert_ME("PowhegMEPP2VV","WW")
process+=selectDecayMode("W+",["W+->nu_e,e+;",
"W+->nu_mu,mu+;",
"W+->nu_tau,tau+;"])
addedBRReweighter = True
elif "ZZ-ll" in parameterName :
process+="create Herwig::HwDecayHandler /Herwig/NewPhysics/DecayHandler\n"
process+="set /Herwig/NewPhysics/DecayHandler:NewStep No\n"
process+="set /Herwig/Shower/ShowerHandler:SplitHardProcess No\n";
process+="set /Herwig/Decays/ZDecayer:PhotonGenerator NULL\n";
process+="set /Herwig/Decays/WDecayer:PhotonGenerator NULL\n";
process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 0 /Herwig/Particles/tau-\n"
process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 1 /Herwig/Particles/tau+\n"
process+="insert /Herwig/Generators/EventGenerator:EventHandler:PreCascadeHandlers 0 /Herwig/NewPhysics/DecayHandler\n"
process+=insert_ME("PowhegMEPP2VV","ZZ")
process+=selectDecayMode("Z0",["Z0->e-,e+;",
"Z0->mu-,mu+;",
"Z0->tau-,tau+;"])
addedBRReweighter = True
elif "ZZ-lv" in parameterName :
process+="create Herwig::HwDecayHandler /Herwig/NewPhysics/DecayHandler\n"
process+="set /Herwig/NewPhysics/DecayHandler:NewStep No\n"
process+="set /Herwig/Shower/ShowerHandler:SplitHardProcess No\n";
process+="set /Herwig/Decays/ZDecayer:PhotonGenerator NULL\n";
process+="set /Herwig/Decays/WDecayer:PhotonGenerator NULL\n";
process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 0 /Herwig/Particles/tau-\n"
process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 1 /Herwig/Particles/tau+\n"
process+="insert /Herwig/Generators/EventGenerator:EventHandler:PreCascadeHandlers 0 /Herwig/NewPhysics/DecayHandler\n"
process+=insert_ME("PowhegMEPP2VV","ZZ")
process+=selectDecayMode("Z0",["Z0->e-,e+;",
"Z0->mu-,mu+;",
"Z0->tau-,tau+;",
"Z0->nu_e,nu_ebar;",
"Z0->nu_mu,nu_mubar;",
"Z0->nu_tau,nu_taubar;"])
addedBRReweighter = True
elif "W-e" in parameterName :
process+=insert_ME("PowhegMEqq2W2ff","Electron")
elif "W-mu" in parameterName :
process+=insert_ME("PowhegMEqq2W2ff","Muon")
elif "Z-e" in parameterName or "Z-mu" in parameterName :
if "Z-e" in parameterName:
process+=insert_ME("PowhegMEqq2gZ2ff","Electron")
else :
process+=insert_ME("PowhegMEqq2gZ2ff","Muon")
mcuts=[10,35,75,110,400,ecms]
for i in range(1,6) :
tstring = "-Mass%s"%i
if tstring in parameterName :
process+=mhat_minm_maxm(mcuts[i-1],mcuts[i-1],mcuts[i])
parameterName=parameterName.replace(tstring,"")
elif "Z-nu" in parameterName :
process+=insert_ME("PowhegMEqq2gZ2ff","Neutrinos")
elif "DiPhoton-GammaGamma" in parameterName :
process+=insert_ME("MEGammaGammaPowheg","GammaGamma")
process+=insert_ME("MEGammaGamma","gg")
process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
process+=jet_kt_cut(5.)
parameterName=parameterName.replace("-GammaGamma","")
elif "DiPhoton-GammaJet" in parameterName :
process+=insert_ME("MEGammaGammaPowheg","VJet")
process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
process+=jet_kt_cut(5.)
parameterName=parameterName.replace("-GammaJet","")
else :
logging.error(" Process %s not supported for internal POWHEG matrix elements" % name)
sys.exit(1)
elif( simulation=="Matchbox" or simulation=="Merging" ) :
if "VBF" in parameterName :
parameters["nlo"] = "read Matchbox/VBFNLO.in\n"
if(simulation=="Merging"):
process+="cd /Herwig/Merging/\n"
process+="insert "+thefactory+":DiagramGenerator:RestrictLines 0 /Herwig/Particles/Z0\n"
process+="insert "+thefactory+":DiagramGenerator:RestrictLines 0 /Herwig/Particles/W+\n"
process+="insert "+thefactory+":DiagramGenerator:RestrictLines 0 /Herwig/Particles/W-\n"
process+="insert "+thefactory+":DiagramGenerator:RestrictLines 0 /Herwig/Particles/gamma\n"
process+="do "+thefactory+":DiagramGenerator:TimeLikeRange 0 0\n"
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p p h0 j j","0","3","FixedScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p p h0 j j","0","3","FixedScale",1,1)
process+=setHardProcessWidthToZero(["h0"])
process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 125.7\n"
if "GammaGamma" in parameterName :
process+=selectDecayMode("h0",["h0->gamma,gamma;"])
process+=addBRReweighter()
elif "WW" in parameterName :
process+=selectDecayMode("h0",["h0->W+,W-;"])
process+=addBRReweighter()
elif "ZZ" in parameterName :
process+=selectDecayMode("h0",["h0->Z0,Z0;"])
process+=addBRReweighter()
elif "8-" not in parameterName :
process+=selectDecayMode("h0",["h0->tau-,tau+;"])
process+=addBRReweighter()
process+="set /Herwig/Particles/tau-:Stable Stable\n"
elif "ggHJet" in parameterName :
if(simulation=="Merging"):
logging.warning("ggHJet not explicitly tested for %s " % simulation)
sys.exit(0)
parameters["nlo"] = "read Matchbox/MadGraph-GoSam.in\nread Matchbox/HiggsEffective.in\n"
process+=selectDecayMode("h0",["h0->tau-,tau+;"])
process+=addBRReweighter()
process+="set /Herwig/Particles/tau-:Stable Stable\n"
process+=setHardProcessWidthToZero(["h0"])
process+=addProcess(thefactory,"p p h0 j","3","1","FixedScale",0,0)
process+=addFirstJet("20")
process+="set "+thefactory+":ScaleChoice /Herwig/MatrixElements/Matchbox/Scales/FixedScale\n"
process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 125.7\n"
elif "ggH" in parameterName :
parameters["nlo"] = "read Matchbox/MadGraph-GoSam.in\nread Matchbox/HiggsEffective.in\n"
if(simulation=="Merging"):
process+= "cd /Herwig/MatrixElements/Matchbox/Amplitudes\nset OpenLoops:HiggsEff Yes\nset MadGraph:Model heft\n"
process+="cd /Herwig/Merging/\n"
process+=setHardProcessWidthToZero(["h0"])
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p p h0","2","1","FixedScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p p h0","2","1","FixedScale",2,2)
process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 125.7\n"
if "GammaGamma" in parameterName :
process+=selectDecayMode("h0",["h0->gamma,gamma;"])
process+=addBRReweighter()
elif "WW" in parameterName :
process+=selectDecayMode("h0",["h0->W+,W-;"])
process+=addBRReweighter()
elif "ZZ" in parameterName :
process+=selectDecayMode("h0",["h0->Z0,Z0;"])
process+=addBRReweighter()
elif "8-" not in parameterName :
process+=selectDecayMode("h0",["h0->tau-,tau+;"])
process+=addBRReweighter()
process+="set /Herwig/Particles/tau-:Stable Stable\n"
elif "8-WH" in parameterName :
if(simulation=="Merging"):
logging.warning("8-WH not explicitly tested for %s " % simulation)
sys.exit(0)
process+=setHardProcessWidthToZero(["h0","W+","W-"])
process+=addProcess(thefactory,"p p W+ h0","0","2","FixedScale",0,0)
process+=addProcess(thefactory,"p p W- h0","0","2","FixedScale",0,0)
process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 125.7\n"
if "GammaGamma" in parameterName :
process+=selectDecayMode("h0",["h0->gamma,gamma;"])
process+=addBRReweighter()
elif "WW" in parameterName :
process+=selectDecayMode("h0",["h0->W+,W-;"])
process+=addBRReweighter()
elif "ZZ" in parameterName :
process+=selectDecayMode("h0",["h0->Z0,Z0;"])
process+=addBRReweighter()
elif "8-ZH" in parameterName :
if(simulation=="Merging"):
logging.warning("8-ZH not explicitly tested for %s " % simulation)
sys.exit(0)
process+=setHardProcessWidthToZero(["h0","Z0"])
process+=addProcess(thefactory,"p p Z0 h0","0","2","FixedScale",0,0)
process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 125.7\n"
if "GammaGamma" in parameterName :
process+=selectDecayMode("h0",["h0->gamma,gamma;"])
process+=addBRReweighter()
elif "WW" in parameterName :
process+=selectDecayMode("h0",["h0->W+,W-;"])
process+=addBRReweighter()
elif "ZZ" in parameterName :
process+=selectDecayMode("h0",["h0->Z0,Z0;"])
process+=addBRReweighter()
elif "WH" in parameterName :
if(simulation=="Merging"):
logging.warning("WH not explicitly tested for %s " % simulation)
sys.exit(0)
process+=selectDecayMode("h0",["h0->b,bbar;"])
process+=addBRReweighter()
process+=setHardProcessWidthToZero(["h0"])
process+=addProcess(thefactory,"p p e+ nu h0","0","3","LeptonPairMassScale",0,0)
process+=addProcess(thefactory,"p p e- nu h0","0","3","LeptonPairMassScale",0,0)
process+=addProcess(thefactory,"p p mu+ nu h0","0","3","LeptonPairMassScale",0,0)
process+=addProcess(thefactory,"p p mu- nu h0","0","3","LeptonPairMassScale",0,0)
process+=addLeptonPairCut("60","120")
elif "ZH" in parameterName :
if(simulation=="Merging"):
logging.warning("ZH not explicitly tested for %s " % simulation)
sys.exit(0)
process+=selectDecayMode("h0",["h0->b,bbar;"])
process+=addBRReweighter()
process+=setHardProcessWidthToZero(["h0"])
process+=addProcess(thefactory,"p p e+ e- h0","0","3","LeptonPairMassScale",0,0)
process+=addProcess(thefactory,"p p mu+ mu- h0","0","3","LeptonPairMassScale",0,0)
process+=addLeptonPairCut("60","120")
elif "UE" in parameterName :
logging.error(" Process %s not supported for Matchbox matrix elements" % name)
sys.exit(1)
elif "8-DiJets" in parameterName or "7-DiJets" in parameterName or "13-DiJets" in parameterName :
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p p j j","2","0","MaxJetPtScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p p j j","2","0","MaxJetPtScale",1,1)
process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
if "13-DiJets" not in parameterName :
if "-A" in parameterName :
process+=addFirstJet("45")
process+=addSecondJet("25")
process+="set /Herwig/Cuts/FirstJet:YRange -3. 3.\n"
process+="set /Herwig/Cuts/SecondJet:YRange -3. 3.\n"
elif "-B" in parameterName :
process+=addFirstJet("20")
process+=addSecondJet("15")
process+="set /Herwig/Cuts/FirstJet:YRange -2.7 2.7\n"
process+="set /Herwig/Cuts/SecondJet:YRange -2.7 2.7\n"
elif "-C" in parameterName :
process+=addFirstJet("20")
process+=addSecondJet("15")
process+="set /Herwig/Cuts/FirstJet:YRange -4.8 4.8\n"
process+="set /Herwig/Cuts/SecondJet:YRange -4.8 4.8\n"
else :
logging.error("Exit 00001")
sys.exit(1)
else :
if "-A" in parameterName :
process+= addFirstJet("75.")
process+=addSecondJet("60.")
process+="set /Herwig/Cuts/JetKtCut:MinEta -3.\n"
process+="set /Herwig/Cuts/JetKtCut:MaxEta 3.\n"
elif "-B" in parameterName :
process+= addFirstJet("220.")
process+=addSecondJet("180.")
process+="set /Herwig/Cuts/JetKtCut:MinEta -3.\n"
process+="set /Herwig/Cuts/JetKtCut:MaxEta 3.\n"
else :
logging.error("Exit 00001")
sys.exit(1)
if "DiJets-1" in parameterName : process+=addJetPairCut("90")
elif "DiJets-2" in parameterName : process+=addJetPairCut("200")
elif "DiJets-3" in parameterName : process+=addJetPairCut("450")
elif "DiJets-4" in parameterName : process+=addJetPairCut("750")
elif "DiJets-5" in parameterName : process+=addJetPairCut("950")
elif "DiJets-6" in parameterName : process+=addJetPairCut("1550")
elif "DiJets-7" in parameterName : process+=addJetPairCut("2150")
elif "DiJets-8" in parameterName : process+=addJetPairCut("2750")
elif "DiJets-9" in parameterName : process+=mhat_cut(3750.)
elif "DiJets-10" in parameterName : process+=mhat_cut(4750.)
elif "DiJets-11" in parameterName : process+=mhat_cut(5750.)
else :
logging.error("Exit 00002")
sys.exit(1)
elif( "7-Jets" in parameterName
or "8-Jets" in parameterName
or "13-Jets" in parameterName
or "2760-Jets" in parameterName
) :
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p p j j","2","0","MaxJetPtScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p p j j","2","0","MaxJetPtScale",1,1)
process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
if "Jets-10" in parameterName : process+=addFirstJet("1800")
elif "Jets-0" in parameterName : process+=addFirstJet("5")
elif "Jets-1" in parameterName : process+=addFirstJet("10")
elif "Jets-2" in parameterName : process+=addFirstJet("20")
elif "Jets-3" in parameterName : process+=addFirstJet("40")
elif "Jets-4" in parameterName : process+=addFirstJet("70")
elif "Jets-5" in parameterName : process+=addFirstJet("150")
elif "Jets-6" in parameterName : process+=addFirstJet("200")
elif "Jets-7" in parameterName : process+=addFirstJet("300")
elif "Jets-8" in parameterName : process+=addFirstJet("500")
elif "Jets-9" in parameterName : process+=addFirstJet("800")
else :
logging.error("Exit 00003")
sys.exit(1)
elif( "-Charm" in parameterName or "-Bottom" in parameterName) :
parameters["bscheme"]=fourFlavour
process+="set /Herwig/Particles/b:HardProcessMass 4.2*GeV\n"
process+="set /Herwig/Particles/bbar:HardProcessMass 4.2*GeV\n"
if("8-Bottom" in parameterName) :
addBRReweighter()
process+=selectDecayMode("Jpsi",["Jpsi->mu-,mu+;"])
if "Bottom" in parameterName :
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p p b bbar","2","0","MaxJetPtScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p p b bbar","2","0","MaxJetPtScale",1,0)
else:
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p p c cbar","2","0","MaxJetPtScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p p c cbar","2","0","MaxJetPtScale",1,0)
process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
if "-0" in parameterName : process+=addFirstJet("0")
elif "-1" in parameterName : process+=addFirstJet("5")
elif "-2" in parameterName : process+=addFirstJet("15")
elif "-3" in parameterName : process+=addFirstJet("20")
elif "-4" in parameterName : process+=addFirstJet("50")
elif "-5" in parameterName : process+=addFirstJet("80")
elif "-6" in parameterName : process+=addFirstJet("110")
elif "-7" in parameterName :
process+=addFirstJet("30")
process+=addSecondJet("25")
process+=addJetPairCut("90")
elif "-8" in parameterName :
process+=addFirstJet("30")
process+=addSecondJet("25")
process+=addJetPairCut("340")
elif "-9" in parameterName :
process+=addFirstJet("30")
process+=addSecondJet("25")
process+=addJetPairCut("500")
else :
logging.error("Exit 00004")
sys.exit(1)
elif "Top-L" in parameterName :
process+=setHardProcessWidthToZero(["t","tbar"])
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p p t tbar","2","0","TopPairMTScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p p t tbar","2","0","TopPairMTScale",2,2)
process+=selectDecayMode("t",["t->nu_e,e+,b;",
"t->nu_mu,mu+,b;"])
process+=addBRReweighter()
elif "Top-SL" in parameterName :
process+=setHardProcessWidthToZero(["t","tbar"])
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p p t tbar","2","0","TopPairMTScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p p t tbar","2","0","TopPairMTScale",2,2)
process+="set /Herwig/Particles/t:Synchronized Not_synchronized\n"
process+="set /Herwig/Particles/tbar:Synchronized Not_synchronized\n"
process+=selectDecayMode("t",["t->nu_e,e+,b;",
"t->nu_mu,mu+,b;"])
process+=selectDecayMode("tbar",["tbar->b,bbar,cbar;",
"tbar->bbar,cbar,d;",
"tbar->bbar,cbar,s;",
"tbar->bbar,s,ubar;",
"tbar->bbar,ubar,d;"])
process+=addBRReweighter()
elif "Top-All" in parameterName :
process+=setHardProcessWidthToZero(["t","tbar"])
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p p t tbar","2","0","TopPairMTScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p p t tbar","2","0","TopPairMTScale",2,2)
elif "WZ" in parameterName :
if(simulation=="Merging"):
logging.warning("WZ not explicitly tested for %s " % simulation)
sys.exit(0)
process+=setHardProcessWidthToZero(["W+","W-","Z0"])
process+=addProcess(thefactory,"p p W+ Z0","0","2","FixedScale",0,0)
process+=addProcess(thefactory,"p p W- Z0","0","2","FixedScale",0,0)
process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 171.6*GeV\n\n"
process+=selectDecayMode("W+",["W+->nu_e,e+;",
"W+->nu_mu,mu+;"])
process+=selectDecayMode("W-",["W-->nu_ebar,e-;",
"W-->nu_mubar,mu-;"])
process+=selectDecayMode("Z0",["Z0->e-,e+;",
"Z0->mu-,mu+;"])
process+=addBRReweighter()
process+=addLeptonPairCut("60","120")
elif "WW-emu" in parameterName :
if(simulation=="Merging"):
logging.warning("WW-emu not explicitly tested for %s " % simulation)
sys.exit(0)
process+=setHardProcessWidthToZero(["W+","W-","Z0"])
process+=addProcess(thefactory,"p p W+ W-","0","2","FixedScale",0,0)
process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 160.8*GeV\n"
process+="set /Herwig/Particles/W+:Synchronized 0\n"
process+="set /Herwig/Particles/W-:Synchronized 0\n"
process+=selectDecayMode("W+",["W+->nu_e,e+;"])
process+=selectDecayMode("W-",["W-->nu_mubar,mu-;"])
process+=addBRReweighter()
parameters["bscheme"] = "read Matchbox/FourFlavourScheme.in\n"
process+=addLeptonPairCut("60","120")
elif "WW-ll" in parameterName :
if(simulation=="Merging"):
logging.warning("WW-ll not explicitly tested for %s " % simulation)
sys.exit(0)
process+=setHardProcessWidthToZero(["W+","W-","Z0"])
process+=addProcess(thefactory,"p p W+ W-","0","2","FixedScale",0,0)
process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 160.8*GeV\n"
process+=selectDecayMode("W+",["W+->nu_e,e+;",
"W+->nu_mu,mu+;",
"W+->nu_tau,tau+;"])
process+=addBRReweighter()
process+=addLeptonPairCut("60","120")
parameters["bscheme"] = "read Matchbox/FourFlavourScheme.in\n"
elif "ZZ-ll" in parameterName :
if(simulation=="Merging"):
logging.warning("ZZ-ll not explicitly tested for %s " % simulation)
sys.exit(0)
process+=setHardProcessWidthToZero(["W+","W-","Z0"])
process+=addProcess(thefactory,"p p Z0 Z0","0","2","FixedScale",0,0)
process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 182.2*GeV\n"
process+=selectDecayMode("Z0",["Z0->e-,e+;",
"Z0->mu-,mu+;",
"Z0->tau-,tau+;"])
process+=addBRReweighter()
process+=addLeptonPairCut("60","120")
elif "ZZ-lv" in parameterName :
if(simulation=="Merging"):
logging.warning("ZZ-lv not explicitly tested for %s " % simulation)
sys.exit(0)
process+=setHardProcessWidthToZero(["W+","W-","Z0"])
process+=addProcess(thefactory,"p p Z0 Z0","0","2","FixedScale",0,0)
process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 182.2*GeV\n"
process+=selectDecayMode("Z0",["Z0->e-,e+;",
"Z0->mu-,mu+;",
"Z0->tau-,tau+;",
"Z0->nu_e,nu_ebar;",
"Z0->nu_mu,nu_mubar;",
"Z0->nu_tau,nu_taubar;"])
process+=addBRReweighter()
process+=addLeptonPairCut("60","120")
elif "W-e" in parameterName :
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p p e+ nu","0","2","LeptonPairMassScale",0,0)
process+=addProcess(thefactory,"p p e- nu","0","2","LeptonPairMassScale",0,0)
elif(simulation=="Merging"):
process+=particlegroup(thefactory,'epm','e+','e-')
process+=addProcess(thefactory,"p p epm nu","0","2","LeptonPairMassScale",2,2)
process+=addLeptonPairCut("60","120")
elif "W-mu" in parameterName :
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p p mu+ nu","0","2","LeptonPairMassScale",0,0)
process+=addProcess(thefactory,"p p mu- nu","0","2","LeptonPairMassScale",0,0)
elif(simulation=="Merging"):
process+=particlegroup(thefactory,'mupm','mu+','mu-')
process+=addProcess(thefactory,"p p mupm nu","0","2","LeptonPairMassScale",2,2)
process+=addLeptonPairCut("60","120")
elif "Z-e" in parameterName or "Z-mu" in parameterName :
if "Z-e" in parameterName :
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",2,2)
elif "Z-mu" in parameterName :
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",2,2)
mcuts=[10,35,75,110,400,ecms]
for i in range(1,6) :
tstring = "-Mass%s"%i
if tstring in parameterName :
process+=addLeptonPairCut(mcuts[i-1],mcuts[i])
parameterName=parameterName.replace(tstring,"")
elif "Z-nu" in parameterName :
if(simulation=="Matchbox"):
process+=addProcess(thefactory,"p p nu nu","0","2","LeptonPairMassScale",0,0)
elif(simulation=="Merging"):
process+=addProcess(thefactory,"p p nu nu","0","2","LeptonPairMassScale",2,2)
elif "Z-jj" in parameterName :
if(simulation=="Merging"):
logging.warning("Z-jj not explicitly tested for %s " % simulation)
sys.exit(0)
process+=addProcess(thefactory,"p p e+ e- j j","2","2","LeptonPairMassScale",0,0)
process+=addFirstJet("40")
process+=addSecondJet("30")
process+=addLeptonPairCut("60","120")
elif "W-Jet" in parameterName :
if(simulation=="Merging"):
logging.warning("W-Jet not explicitly tested for %s " % simulation)
sys.exit(0)
process+=addProcess(thefactory,"p p e+ nu j","1","2","HTScale",0,0)
process+=addProcess(thefactory,"p p e- nu j","1","2","HTScale",0,0)
process+=addLeptonPairCut("60","120")
if "W-Jet-1-e" in parameterName :
process+=addFirstJet("100")
parameterName=parameterName.replace("W-Jet-1-e","W-Jet-e")
elif "W-Jet-2-e" in parameterName :
process+=addFirstJet("190")
parameterName=parameterName.replace("W-Jet-2-e","W-Jet-e")
elif "W-Jet-3-e" in parameterName :
process+=addFirstJet("270")
parameterName=parameterName.replace("W-Jet-3-e","W-Jet-e")
else :
logging.error("Exit 00005")
sys.exit(1)
elif "Z-Jet" in parameterName :
if(simulation=="Merging"):
logging.warning("Z-Jet not explicitly tested for %s " % simulation)
sys.exit(0)
if "-e" in parameterName :
process+=addProcess(thefactory,"p p e+ e- j","1","2","HTScale",0,0)
if "Z-Jet-0-e" in parameterName :
process+=addFirstJet("35")
parameterName=parameterName.replace("Z-Jet-0-e","Z-Jet-e")
elif "Z-Jet-1-e" in parameterName :
process+=addFirstJet("100")
parameterName=parameterName.replace("Z-Jet-1-e","Z-Jet-e")
elif "Z-Jet-2-e" in parameterName :
process+=addFirstJet("190")
parameterName=parameterName.replace("Z-Jet-2-e","Z-Jet-e")
elif "Z-Jet-3-e" in parameterName :
process+=addFirstJet("270")
parameterName=parameterName.replace("Z-Jet-3-e","Z-Jet-e")
else :
logging.error("Exit 00006")
sys.exit(1)
else :
process+=addProcess(thefactory,"p p mu+ mu- j","1","2","HTScale",0,0)
process+=addFirstJet("35")
parameterName=parameterName.replace("Z-Jet-0-mu","Z-Jet-mu")
process+=addLeptonPairCut("60","120")
elif "Z-bb" in parameterName :
if(simulation=="Merging"):
logging.warning("Z-bb not explicitly tested for %s " % simulation)
sys.exit(0)
parameters["bscheme"]=fourFlavour
process+="set /Herwig/Particles/b:HardProcessMass 4.2*GeV\nset /Herwig/Particles/bbar:HardProcessMass 4.2*GeV\n"
process+=addProcess(thefactory,"p p e+ e- b bbar","2","2","FixedScale",0,0)
process+=addLeptonPairCut("66","116")
process+=addFirstJet("18")
process+=addSecondJet("15")
process+=addLeptonPairCut("60","120")
elif "Z-b" in parameterName :
if(simulation=="Merging"):
logging.warning("Z-b not explicitly tested for %s " % simulation)
sys.exit(0)
process+=particlegroup(thefactory,'bjet','b','bbar')
process+=addProcess(thefactory,"p p e+ e- bjet","1","2","FixedScale",0,0)
process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 91.2*GeV\n"
process+=addLeptonPairCut("60","120")
process+=addFirstJet("15")
elif "W-b" in parameterName :
if(simulation=="Merging"):
logging.warning("W-b not explicitly tested for %s " % simulation)
sys.exit(0)
parameters["bscheme"]=fourFlavour
process += "set /Herwig/Particles/b:HardProcessMass 4.2*GeV\nset /Herwig/Particles/bbar:HardProcessMass 4.2*GeV\n"
process+=addProcess(thefactory,"p p e- nu b bbar","2","2","FixedScale",0,0)
process+=addProcess(thefactory,"p p mu+ nu b bbar","2","2","FixedScale",0,0)
process += "set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 80.4*GeV\n"
process+=addFirstJet("30")
process+=addLeptonPairCut("60","120")
else :
logging.error(" Process %s not supported for Matchbox matrix elements" % name)
sys.exit(1)
# LHC-GammaGamma
elif(collider=="LHC-GammaGamma" ) :
if "7" in parameterName : process = StringBuilder(collider_lumi( 7000.0))
elif "8" in parameterName : process = StringBuilder(collider_lumi( 8000.0))
elif "13" in parameterName : process = StringBuilder(collider_lumi(13000.0))
else : process = StringBuilder(collider_lumi( 7000.0))
if(simulation=="") :
process += "cp MEgg2ff MEgg2ee\n"
process += "cp gg2ffAmp gg2eeAmp\nset MEgg2ee:Amplitude gg2eeAmp\n"
process += insert_ME("MEgg2ee","Electron")
process += "cp MEgg2ff MEgg2mm\n"
process += "cp gg2ffAmp gg2mmAmp\nset MEgg2mm:Amplitude gg2mmAmp\n"
process += insert_ME("MEgg2mm","Muon")
else :
logging.error("LHC-GammaGamma not supported for %s " % simulation)
sys.exit(1)
pion=False
if "Pion-" in parameterName and have_hadronic_collider:
parameterName = parameterName.replace("Pion-","")
pion = True
if "EHS" in name :
pFile = os.path.join(collider,"{c}-{pn}.in".format(c="EHS", pn=parameterName))
elif "Photo" == name[0:5] :
pFile = os.path.join(collider,"{c}-{pn}.in".format(c="Photo", pn=parameterName))
else :
pFile = os.path.join(collider,"{c}-{pn}.in".format(c=collider, pn=parameterName))
with open(os.path.join("Rivet",pFile), 'r') as f:
parameters['parameterFile'] = f.read()
+if hepmc :
+ parameters['parameterFile'] +="\nread snippets/HepMC.in\n"
parameters['runname'] = 'Rivet-%s' % name
parameters['process'] = str(process)
if have_hadronic_collider :
if "EHS" in name :
parameters['collider'] = "PPCollider.in\nread snippets/FixedTarget-PP.in"
else :
parameters['collider'] = "PPCollider.in"
if pion :
parameters['collider'] +="\nread snippets/PionPDF.in\nset /Herwig/Generators/EventGenerator:EventHandler:BeamA /Herwig/Particles/pi+\n"
parameters['collider'] +="set /Herwig/Shower/ShowerHandler:PDFA /Herwig/Partons/PionPDF\nset /Herwig/Shower/ShowerHandler:PDFARemnant /Herwig/Partons/PionPDF\n"
parameters['collider'] +="set /Herwig/Partons/PPExtractor:FirstPDF /Herwig/Partons/PionPDF\nset /Herwig/Partons/MPIExtractor:FirstPDF /Herwig/Partons/PionPDF\n"
parameters['collider'] +="set /Herwig/EventHandlers/FixedTargetLuminosity:BeamParticle /Herwig/Particles/pi+\n"
#check if selecteddecaymode and addedBRReweighter is consistent
if selecteddecaymode and not addedBRReweighter:
logging.error("Decaymode was selected but no BRReweighter was added.")
sys.exit(1)
if addedBRReweighter and not selecteddecaymode:
logging.error("BRReweighter was added but no Decaymode was selected.")
sys.exit(1)
# check that we only add one process if in merging mode:
if numberOfAddedProcesses > 1 and simulation =="Merging":
logging.error("In Merging only one process is allowed at the moment. See ticket #403.")
sys.exit(1)
# Check if a process was added for Merging or Matchbox:
if numberOfAddedProcesses == 0 and (simulation =="Merging" or simulation =="Matchbox"):
logging.error("No process was selected.")
sys.exit(1)
# get template and write the file
with open(os.path.join("Rivet/Templates",templateName), 'r') as f:
templateText = f.read()
template = Template( templateText )
with open(os.path.join("Rivet",name+".in"), 'w') as f:
f.write( template.substitute(parameters) )
diff --git a/Tests/python/mergeLowEnergy.py.in b/Tests/python/mergeLowEnergy.py.in
--- a/Tests/python/mergeLowEnergy.py.in
+++ b/Tests/python/mergeLowEnergy.py.in
@@ -1,148 +1,151 @@
#! @PYTHON@
# -*- mode: python -*-
from __future__ import print_function
import yoda,glob,optparse
import numpy as np
import subprocess,os
op = optparse.OptionParser(usage=__doc__)
op.add_option("-e" , dest="plots_energy" , default=[], action="append")
op.add_option("-f" , dest="plots_fixed" , default=[], action="append")
opts, args = op.parse_args()
if(len(args)!=1) :
print ('Must be one and only 1 name')
quit()
name=args[0].split("-")
cmd3_weights = { 2007. : [0.5 ,4259], 1980 : [1 , 2368], 1951 : [11,5230],
1907.5: [17.5,5497], 1877 : [7 ,16803], 1830 : [30,8287],
1740. : [40 ,8728], 1640 : [40, 7299] }
specialEnergies = { "BELLE_2016_I1389855" : [11.02200, 11.01750, 11.01640, 11.00680,
10.99190, 10.97750, 10.95750, 10.92750,
10.90770, 10.90110, 10.89850, 10.88890,
10.88360, 10.87850, 10.86950, 10.86860,
10.86670, 10.86330, 10.85890, 10.84970,
10.82050, 10.77110],
"BELLE_2024_I2791218" : [10.8045,10.7463,10.7009,10.6533] }
wSum=0.
for key in cmd3_weights.keys() :
wSum+= cmd3_weights[key][1]
for key in cmd3_weights.keys() :
cmd3_weights[key][1] /= wSum
output=""
labels={ "NonPerturbative" : "Non-Pert" ,
"Perturbative" : "Pert" ,
"Resonance" : "Res" }
for runType in ["NonPerturbative","Perturbative","Resonance"]:
outhistos={}
inhistos={}
for fileName in glob.glob("Rivet-LowEnergy-%s-%s-*.yoda" % (name[0],runType) ):
energy = float(fileName.split("-")[-1].strip(".yoda"))
energyMeV = energy*1000.
aos = yoda.read(fileName)
for hpath,histo in aos.items():
if("/_" in hpath or "TMP" in hpath or "RAW" in hpath) : continue
if(len(opts.plots_fixed)>0 and hpath in opts.plots_fixed) :
if hpath in inhistos :
inhistos[hpath][energy] = histo
else :
inhistos[hpath] = { energy : histo}
if(len(opts.plots_energy)>0 and hpath not in opts.plots_energy) : continue
if(type(histo)==yoda.core.Histo1D or
(type(histo)==yoda.core.Scatter2D and hpath=="/BESIII_2019_I1726357/d03-x01-y01") ) :
if( "CMD3_2019_I1770428" in hpath ) :
val=0.
for key in cmd3_weights.keys() :
if(abs(energyMeV-val)>abs(energyMeV-key)) :
val=key
histo.scaleW(cmd3_weights[val][1])
if(hpath in outhistos) :
outhistos[hpath] += histo
else :
outhistos[hpath] = histo
else :
outhistos[hpath] = histo
continue
# create histo if it doesn't exist
elif(hpath not in outhistos) :
title=""
path=""
if hasattr(histo, 'title'):
title=histo.title()
if hasattr(histo, 'path'):
path=histo.path()
if hasattr(aos[hpath],'points') :
outhistos[hpath] = yoda.core.Scatter2D(path,title)
else :
try :
outhistos[hpath] = yoda.core.BinnedEstimate1D(aos[hpath].xEdges(),path,title)
except :
print(hpath,aos[hpath])
quit()
matched = False
for i,bin in enumerate(aos[hpath].bins()) :
if bin.edge(0) :
x = bin.edge(0)
else :
x = bin.mid(0)
if isinstance(x, str) :
x = x.split("_")[0]
if "-" in x and len(x)>1:
elim =x.split("-")
x=0.5*(float(elim[0])+float(elim[1]))
+ elif "to" in x and len(x)>1:
+ elim =x.split("to")
+ x=0.5*(float(elim[0])+float(elim[1]))
elif hpath=="/DM1_1979_I132828/d01-x01-y01" :
if x == '-' : x = 985
elif hpath=="/CMD3_2016_I1385598/d01-x01-y06" :
if x=="1900 (2012)" : x = 1900
try :
x = float(x)
except :
print("Cannot convert %s to float in %s" % (x,hpath) )
quit()
delta=1e-5
if("KLOE_2009_I797438" in hpath or "KLOE_2005_I655225" in hpath or
"KLOE2_2017_I1634981" in hpath or "FENICE_1994_I377833" in hpath or
"FENICE_1996_I426675" in hpath):
x=np.sqrt(x)
delta=1e-3
elif "SND_2024_I2809929" in hpath or "SND_2024_I2696331" in hpath:
x=2.*x
for key,val in specialEnergies.items() :
if key in hpath :
x = val[int(x)-1]
if(abs(x-energy)<1e-3*delta or abs(x-energyMeV)<delta) :
duplicate = False
outhistos[hpath].bin(bin.index()).setVal(bin.val())
for key in bin.sources() :
outhistos[hpath].bin(bin.index()).setErr(bin.err(key),key)
matched = True
break
if(matched) : continue
for key,histos in inhistos.items() :
if(len(histos)==1) :
for (key2,val2) in histos.items():
outhistos[key] = val2
else :
for (key2,val2) in histos.items():
outhistos[key] = yoda.BinnedEstimate1D(val2.xEdges(),key)
break
fact = 1./len(histos)
for i in range(0,outhistos[key].numBins()) :
val=0.
errs={}
for (key2,val2) in histos.items() :
val += val2.bin(i+1).val()
for src in val2.bin(i+1).sources() :
if src not in errs : errs[src] = val2.bin(i+1).errAvg(src)**2
else : errs[src] + val2.bin(i+1).errAvg(src)**2
val *=fact
outhistos[key].bin(i+1).setVal(val)
for src in errs :
outhistos[key].bin(i+1).setErr(np.sqrt(errs[src])*fact,src)
yoda.writeYODA(outhistos,"LowEnergy-%s-%s.yoda" % (runType,args[0]))
output+="LowEnergy-%s-%s.yoda:%s " % (runType,args[0],labels[runType])
print(output)
diff --git a/Tests/python/rivet_check.in b/Tests/python/rivet_check.in
--- a/Tests/python/rivet_check.in
+++ b/Tests/python/rivet_check.in
@@ -1,144 +1,144 @@
#! @PYTHON@
# -*- mode: python -*-
from __future__ import print_function
import glob,subprocess,os,optparse
op = optparse.OptionParser(usage=__doc__)
op.add_option("--obsolete", dest="obsolete" , default=False, action="store_true" , help="Warn if obsolete analyses not included")
op.add_option("--search", dest="search" , default=False, action="store_true" , help="Warn if search analyses not included")
op.add_option("--heavy-ion", dest="heavy_ion" , default=False, action="store_true" , help="Warn if heavy ion analyses not included")
op.add_option("--MC", dest="MC" , default=False, action="store_true" , help="Warn if MC analyses not included")
op.add_option("--print-descriptions", dest="output" , default=False, action="store_true" , help="Print analysis descriptions")
opts, args = op.parse_args()
# analyses to skip
skip = [ "ATLAS_2010_I849050", # alias
"TOTEM_2012_002" , # alias
"TEST" , # test analysis
"ATLAS_2015_CONF_2015_041", # superseeded
"ALICE_2012_I1127497", # lead-lead
"ALICE_2012_I930312", # lead-lead
"ALICE_2015_PBPBCentrality", # lead-lead
"ATLAS_PBPB_CENTRALITY", # lead-lead
"ALICE_2015_PPBCentrality", # lead-p
"ATLAS_pPb_Calib", # lead-p
"BRAHMS_2004_AUAUCentrality",# heavy ion
"STAR_2008_S7993412", # heavy ion
"STAR_BES_CALIB", # heavy ion
"DELPHI_2002_069_CONF_603", # superseeded
]
searches=["ALEPH_2016_I1492968","ATLAS_2019_I1725190"]
p=subprocess.Popen(["rivet","--list"],stdout=subprocess.PIPE)
analyses={}
for line in p.communicate()[0].decode("UTF-8").split("\n") :
line=line.strip()
if(line=="") : continue
temp = line.split(None,1)
if(len(temp)==2) :
analyses[temp[0].strip()] = temp[1].strip()
elif(len(temp)==1) :
analyses[temp[0].strip()] = ""
else :
print (line)
quit()
# main line hw analyses at high energy
hw_analyses={}
files=[]
for idir in glob.glob("Rivet/*") :
if( "Powheg" in idir or "MCatNLO" in idir) : continue
if ( not os.path.isdir(idir) ) : continue
if ( "Templates" in idir ) : continue
for ifile in glob.glob("%s/*.in" % idir) :
fshort=ifile.split("/")[-1].replace(".in","")
files.append(fshort)
file=open(ifile)
line=file.readline()
while line:
- if("RivetAnalysis:Analyses" in line and line[0]!="#") :
+ if("Rivet:Analyses" in line and line[0]!="#") :
line=line.strip().split()
anal = line[-1].strip().split(":")[0]
if(anal not in hw_analyses) :
hw_analyses[anal] = [fshort]
else :
hw_analyses[anal].append(fshort)
line=file.readline()
# low energy herwig analysis
hw_low_energy_analyses=[]
for executable in ["LowEnergy-EE","LowEnergy-Photon"] :
p = subprocess.Popen(["./python/%s.py"%executable,"--list","--process","All"],stdout=subprocess.PIPE)
lowEnergy = p.communicate()[0]
if not isinstance(lowEnergy, bytes) :
lowEnergy = lowEnergy.encode("UTF-8")
else :
lowEnergy = lowEnergy.decode("utf-8")
hw_low_energy_analyses+=lowEnergy.strip().split()
# R analyses
p = subprocess.Popen(["./python/R.py","--list"],stdout=subprocess.PIPE)
Rlist = p.communicate()[0]
if not isinstance(Rlist, bytes) :
Rlist = Rlist.encode("UTF-8")
else :
Rlist = Rlist.decode("utf-8")
hw_low_energy_analyses += Rlist.strip().split()
anatohepmc = open("anatohepmc.txt",'w')
hepmctoana = open("hepmctoana.txt",'w')
not_in_rivet=[]
for val in hw_analyses.keys() : not_in_rivet.append(val)
# check the analyses
for analysis in sorted(analyses.keys()) :
# we have it high energy
if(analysis in hw_analyses) :
anatohepmc.write("%s %s\n" % (analysis,' '.join(sorted(hw_analyses[analysis]))) )
if("[OBSOLETE]" in analyses[analysis]) :
print ("WARNING Obsolete analysis %s included : %s" % (analysis,analyses[analysis]))
if(analysis in not_in_rivet) :
not_in_rivet.remove(analysis)
# we have it low energy or R or skipping
elif (analysis in hw_low_energy_analyses or analysis in skip) :
if(analysis in not_in_rivet) :
not_in_rivet.remove(analysis)
continue
# obsolete
elif("[OBSOLETE]" in analyses[analysis]) :
if(opts.obsolete) : print ("Obsolete analysis %s not included : %s" % (analysis,analyses[analysis]))
# searches
elif("Search" in analyses[analysis] or "search" in analyses[analysis] or analysis in searches) :
if(opts.search) : print ("Search analysis %s not included : %s" % (analysis,analyses[analysis]))
# mc only
elif(analysis[0:3]=="MC_") :
if(opts.MC) : print ("MC analysis %s not included : %s" % (analysis,analyses[analysis]))
# examples
elif("EXAMPLE" in analyses[analysis]) or "EXAMPLE" in analysis:
continue
# we don't have it
else :
p=subprocess.Popen(["rivet","--show-analysis",analysis],stdout=subprocess.PIPE)
desc=p.communicate()[0].decode("UTF-8")
beams=[]
for line in desc.split("\n") :
if("Beams:" in line) :
beams=line.replace("Beams:","").split()
nHeavy = sum((part=="Pb" or part=="Au") for part in beams)
if(nHeavy == len(beams) or nHeavy+1 == len(beams)) :
if(opts.heavy_ion) : print ("Heavy Ion analysis %s not included : %s" % (analysis,analyses[analysis]))
else :
print ("MISSING ANALYSIS",analysis,analyses[analysis])
if(opts.output) : print (desc)
# output analyses missing from rivet
for val in not_in_rivet:
print ("NOT IN RIVET ",val)
# output second file for rivet
anatohepmc.close()
for fname in sorted(files) :
anals=[]
for anal in hw_analyses :
if(fname in hw_analyses[anal]) :
anals.append(anal)
hepmctoana.write("%s %s\n" % (fname,' '.join(sorted(anals))) )
hepmctoana.close()