Page Menu
Home
HEPForge
Search
Configure Global Search
Log In
Files
F10664394
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
153 KB
Subscribers
None
View Options
diff --git a/Tests/Makefile.am b/Tests/Makefile.am
--- a/Tests/Makefile.am
+++ b/Tests/Makefile.am
@@ -1,186 +1,211 @@
AUTOMAKE_OPTIONS = -Wno-portability
AM_LDFLAGS += -module -avoid-version -rpath /dummy/path/not/used
EXTRA_DIST = Inputs
dist-hook:
rm -rf $(distdir)/Inputs/.svn
EXTRA_LTLIBRARIES = LeptonTest.la GammaTest.la HadronTest.la DISTest.la
if WANT_LIBFASTJET
EXTRA_LTLIBRARIES += HadronJetTest.la LeptonJetTest.la
HadronJetTest_la_SOURCES = \
Hadron/VHTest.h Hadron/VHTest.cc\
Hadron/VTest.h Hadron/VTest.cc\
Hadron/HTest.h Hadron/HTest.cc
HadronJetTest_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
-I$(FASTJETPATH)
HadronJetTest_la_LIBADD = $(FASTJETLIBS)
LeptonJetTest_la_SOURCES = \
Lepton/TopDecay.h Lepton/TopDecay.cc
LeptonJetTest_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
-I$(FASTJETPATH)
LeptonJetTest_la_LIBADD = $(FASTJETLIBS)
endif
LeptonTest_la_SOURCES = \
Lepton/VVTest.h Lepton/VVTest.cc \
Lepton/VBFTest.h Lepton/VBFTest.cc \
Lepton/VHTest.h Lepton/VHTest.cc \
Lepton/FermionTest.h Lepton/FermionTest.cc
GammaTest_la_SOURCES = \
Gamma/GammaMETest.h Gamma/GammaMETest.cc \
Gamma/GammaPMETest.h Gamma/GammaPMETest.cc
DISTest_la_SOURCES = \
DIS/DISTest.h DIS/DISTest.cc
HadronTest_la_SOURCES = \
Hadron/HadronVVTest.h Hadron/HadronVVTest.cc\
Hadron/HadronVBFTest.h Hadron/HadronVBFTest.cc\
Hadron/WHTest.h Hadron/WHTest.cc\
Hadron/ZHTest.h Hadron/ZHTest.cc\
Hadron/VGammaTest.h Hadron/VGammaTest.cc\
Hadron/ZJetTest.h Hadron/ZJetTest.cc\
Hadron/WJetTest.h Hadron/WJetTest.cc\
Hadron/QQHTest.h Hadron/QQHTest.cc
REPO = $(top_builddir)/src/HerwigDefaults.rpo
HERWIG = $(top_builddir)/src/Herwig++
HWREAD = $(HERWIG) read -r $(REPO) -L $(builddir)/.libs
HWRUN = $(HERWIG) run
tests : tests-LEP tests-DIS tests-LHC tests-Gamma
if WANT_LIBFASTJET
tests-LEP : test-LEP-VV test-LEP-VH test-LEP-VBF test-LEP-BB test-LEP-Quarks test-LEP-Leptons test-LEP-default test-LEP-TopDecay
else
tests-LEP : test-LEP-VV test-LEP-VH test-LEP-VBF test-LEP-BB test-LEP-Quarks test-LEP-Leptons
endif
tests-DIS : test-DIS-Charged test-DIS-Neutral
if WANT_LIBFASTJET
tests-LHC : test-LHC-WW test-LHC-WZ test-LHC-ZZ test-LHC-ZGamma test-LHC-WGamma test-LHC-ZGamma \
test-LHC-ZH test-LHC-WH test-LHC-ZJet test-LHC-WJet test-LHC-Z test-LHC-W test-LHC-ZZVBF test-LHC-VBF \
test-LHC-WWVBF test-LHC-bbH test-LHC-ttH test-LHC-GammaGamma test-LHC-GammaJet test-LHC-Higgs \
test-LHC-HiggsJet test-LHC-QCDFast test-LHC-QCD test-LHC-Top \
test-LHC-WHJet test-LHC-ZHJet test-LHC-HJet test-LHC-ZShower test-LHC-WShower\
test-LHC-WHJet-Powheg test-LHC-ZHJet-Powheg test-LHC-HJet-Powheg \
test-LHC-ZShower-Powheg test-LHC-WShower-Powheg
else
tests-LHC : test-LHC-WW test-LHC-WZ test-LHC-ZZ test-LHC-ZGamma test-LHC-WGamma test-LHC-ZGamma \
test-LHC-ZH test-LHC-WH test-LHC-ZJet test-LHC-WJet test-LHC-Z test-LHC-W test-LHC-ZZVBF test-LHC-VBF \
test-LHC-WWVBF test-LHC-bbH test-LHC-ttH test-LHC-GammaGamma test-LHC-GammaJet test-LHC-Higgs \
test-LHC-HiggsJet test-LHC-QCDFast test-LHC-QCD test-LHC-Top
endif
tests-Gamma : test-Gamma-FF test-Gamma-WW test-Gamma-P
if WANT_LIBFASTJET
test-LEP-% : Inputs/LEP-%.in LeptonTest.la LeptonJetTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
else
test-LEP-% : Inputs/LEP-%.in LeptonTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
endif
Rivet-LEP-% : Rivet/LEP-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-TVT-% : Rivet/TVT-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
+Rivet-TVT-% : Rivet/TVT-%.in
+ $(HWREAD) $<
+ $(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-LHC-% : Rivet/LHC-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-Star-% : Rivet/Star-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
-Rivet-LEP: Rivet-LEP-35 Rivet-LEP-44 Rivet-LEP-91 Rivet-LEP-133 \
+Rivet-LEP: Rivet-LEP-35 Rivet-LEP-44 Rivet-LEP-91 Rivet-LEP-133 \
Rivet-LEP-161 Rivet-LEP-172 Rivet-LEP-177 Rivet-LEP-183 \
Rivet-LEP-189 Rivet-LEP-196 Rivet-LEP-197 Rivet-LEP-200 \
- Rivet-LEP-206
+ Rivet-LEP-206 \
+ Rivet-LEP-Powheg-35 Rivet-LEP-Powheg-44 \
+ Rivet-LEP-Powheg-91 Rivet-LEP-Powheg-133 \
+ Rivet-LEP-Powheg-161 Rivet-LEP-Powheg-172 \
+ Rivet-LEP-Powheg-177 Rivet-LEP-Powheg-183 \
+ Rivet-LEP-Powheg-189 Rivet-LEP-Powheg-196 \
+ Rivet-LEP-Powheg-197 Rivet-LEP-Powheg-200 \
+ Rivet-LEP-Powheg-206
export DPATH=`rivet-config --datadir`; \
for i in LEP-*.aida; do echo $$i; \
rivet-rmgaps $$DPATH/ALEPH_2004_S5765862.aida $$i; done; \
- rivet-rmgaps $$DPATH/ALEPH_1996_S3486095 LEP-91.aida
+ rivet-rmgaps $$DPATH/ALEPH_1996_S3486095 LEP-91.aida; \
+ rivet-rmgaps $$DPATH/ALEPH_1996_S3486095 LEP-Powheg-91.aida
rm -rf Rivet-LEP
- rivet-mkhtml --no-mc-errs -o Rivet-LEP LEP-*.aida
+ python/merge-LEP LEP
+ python/merge-LEP LEP-Powheg
+ rivet-mkhtml --no-mc-errs -o Rivet-LEP LEP.aida:Hw++ LEP-Powheg.aida:Hw++-Powheg
-Rivet-TVT-WZ: Rivet-TVT-Run-I-Z Rivet-TVT-Run-I-Powheg-Z \
- Rivet-TVT-Run-I-W Rivet-TVT-Run-I-Powheg-W \
- Rivet-TVT-Run-I-WZ Rivet-TVT-Run-I-Powheg-WZ\
- Rivet-TVT-Run-II-Z-e Rivet-TVT-Run-II-Powheg-Z-e \
- Rivet-TVT-Run-II-Z-mu Rivet-TVT-Run-II-Powheg-Z-mu \
- Rivet-TVT-Run-II-W Rivet-TVT-Run-II-Powheg-W
+Rivet-TVT-WZ: Rivet-TVT-Run-I-Z Rivet-TVT-Powheg-Run-I-Z \
+ Rivet-TVT-Run-I-W Rivet-TVT-Powheg-Run-I-W \
+ Rivet-TVT-Run-I-WZ Rivet-TVT-Powheg-Run-I-WZ\
+ Rivet-TVT-Run-II-Z-e Rivet-TVT-Powheg-Run-II-Z-e \
+ Rivet-TVT-Run-II-Z-mu Rivet-TVT-Powheg-Run-II-Z-mu \
+ Rivet-TVT-Run-II-W Rivet-TVT-Powheg-Run-II-W
export DPATH=`rivet-config --datadir`; \
rivet-rmgaps $$DPATH/CDF_2008_S8095620 TVT-Run-II-Z-e.aida; \
rivet-rmgaps $$DPATH/CDF_2008_S8095620 TVT-Run-II-Powheg-Z-e.aida;
rm -rf Rivet-TVT-WZ
- rivet-mkhtml --no-mc-errs -o Rivet-TVT-WZ TVT-*-{W,Z,WZ}.aida \
- TVT-Run-II-Z{-e,-mu}.aida TVT-Run-II-Powheg-Z{-e,-mu}.aida
+ python/merge-aida TVT-Run-II-W.aida TVT-Run-II-Z-{e,mu}.aida\
+ TVT-Run-I-{W,Z,WZ}.aida -o TVT-WZ.aida
+ python/merge-aida TVT-Powheg-Run-II-W.aida TVT-Powheg-Run-II-Z-{e,mu}.aida\
+ TVT-Powheg-Run-I-{W,Z,WZ}.aida -o TVT-Powheg-WZ.aida
+ rivet-mkhtml --no-mc-errs -o Rivet-TVT-WZ TVT-WZ.aida:Hw++ TVT-Powheg-WZ.aida:Hw++-Powheg
Rivet-TVT-Photon: Rivet-TVT-Run-II-DiPhoton Rivet-TVT-Run-II-PromptPhoton
# Rivet-TVT-Run-I-PromptPhoton
- rm -rf Rivet-TVT-Photon
- rivet-mkhtml --no-mc-errs -o Rivet-Photon TVT-*Photon.aida
+ rm -rf Rivet-TVT-Photon
+ python/merge-aida TVT-Run-II-DiPhoton.aida TVT-Run-II-PromptPhoton.aida -o TVT-Photon.aida
+ rivet-mkhtml --no-mc-errs -o Rivet-TVT-Photon TVT-Photon.aida:Hw++
+
Rivet-TVT-Jets: Rivet-TVT-Run-II-Jets-1 Rivet-TVT-Run-II-Jets-2 \
Rivet-TVT-Run-II-Jets-3 Rivet-TVT-Run-II-Jets-4 \
Rivet-TVT-Run-II-Jets-5 Rivet-TVT-Run-II-Jets-6 \
Rivet-TVT-Run-II-Jets-7 Rivet-TVT-Run-II-Jets-8 \
+ Rivet-TVT-Run-II-Jets-9 Rivet-TVT-Run-II-Jets-10\
Rivet-TVT-Run-II-UE \
Rivet-TVT-Run-I-Jets-1 Rivet-TVT-Run-I-Jets-2 \
Rivet-TVT-Run-I-Jets-3 Rivet-TVT-Run-I-Jets-4 \
- Rivet-TVT-Run-I-Jets-5 \
- Rivet-TVT-630-UE Rivet-TVT-Run-I-UE
+ Rivet-TVT-Run-I-Jets-5 Rivet-TVT-Run-I-Jets-6 \
+ Rivet-TVT-Run-I-Jets-7 Rivet-TVT-Run-I-Jets-8\
+ Rivet-TVT-Run-I-UE\
+ Rivet-TVT-630-UE Rivet-TVT-630-Jets-1 \
+ Rivet-TVT-630-Jets-2 Rivet-TVT-630-Jets-3
export DPATH=`rivet-config --datadir`; \
rivet-rmgaps $$DPATH/CDF_1994_S2952106 TVT-Run-I-Jets-4.aida
rm -rf Rivet-TVT-Jets
- rivet-mkhtml --no-mc-errs -o Rivet-TVT-Jets TVT-*-Jets-?.aida TVT-*-UE*.aida
+ python/merge-TVT-Jets TVT
+ rivet-mkhtml --no-mc-errs -o Rivet-TVT-Jets TVT--Jets.aida:Hw++
Rivet-Star: Rivet-Star-UE Rivet-Star-Jets-1 \
Rivet-Star-Jets-2 Rivet-Star-Jets-3 \
Rivet-Star-Jets-4 Rivet-Star-Jets-5
rm -rf Rivet-Star
export DPATH=`rivet-config --datadir`; \
rivet-rmgaps $$DPATH/STAR_2006_S6860818 Star-UE.aida
rivet-mkhtml --no-mc-errs -o Rivet-Star Star-Jets-?.aida Star-UE.aida
Rivet-LHC-EW: Rivet-LHC-W Rivet-LHC-Powheg-W \
Rivet-LHC-Z Rivet-LHC-Powheg-Z \
Rivet-LHC-WW Rivet-LHC-Powheg-WW\
Rivet-LHC-ZZ Rivet-LHC-Powheg-ZZ
rm -rf Rivet-LHC-EW
- rivet-mkhtml --no-mc-errs -o Rivet-LHC-EW LHC{,-Powheg}-{W,Z,WW,ZZ}.aida
-
+ python/merge-aida LHC-{W,Z,WW,ZZ}.aida -o LHC-EW.aida
+ python/merge-aida LHC-Powheg-{W,Z,WW,ZZ}.aida -o LHC-Powheg-EW.aida
+ rivet-mkhtml --no-mc-errs -o Rivet-LHC-EW LHC-EW.aida:Hw++ LHC-Powheg-EW.aida:Hw++-Powheg
+
test-Gamma-% : Inputs/Gamma-%.in GammaTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
test-DIS-% : Inputs/DIS-%.in DISTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
if WANT_LIBFASTJET
test-LHC-% : Inputs/LHC-%.in HadronTest.la GammaTest.la HadronJetTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
else
test-LHC-% : Inputs/LHC-%.in HadronTest.la GammaTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
endif
clean-local:
- rm -f *.out *.log *.tex *.top *.run *.dump *.mult *.Bmult
+ rm -f *.out *.log *.tex *.top *.run *.dump *.mult *.Bmult *.aida
diff --git a/Tests/Rivet/LEP-133.in b/Tests/Rivet/LEP-133.in
--- a/Tests/Rivet/LEP-133.in
+++ b/Tests/Rivet/LEP-133.in
@@ -1,34 +1,27 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LEPGenerator:EventHandler:LuminosityFunction:Energy 133.
##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# default e+e- > q qbar (5 flavours d,u,s,c,b)
-insert SimpleEE:MatrixElements 0 MEee2gZ2qq
-
-##################################################
# select the analyses
##################################################
# OPAL event shapes and multiplicities at different energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_S6132243
# ALEPH jet and event shapes at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
# OPAL/JADE jet rates at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LEP-133 LEPGenerator
\ No newline at end of file
+saverun LEP-133 LEPGenerator
diff --git a/Tests/Rivet/LEP-161.in b/Tests/Rivet/LEP-161.in
--- a/Tests/Rivet/LEP-161.in
+++ b/Tests/Rivet/LEP-161.in
@@ -1,32 +1,25 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LEPGenerator:EventHandler:LuminosityFunction:Energy 161.
##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# default e+e- > q qbar (5 flavours d,u,s,c,b)
-insert SimpleEE:MatrixElements 0 MEee2gZ2qq
-
-##################################################
# select the analyses
##################################################
# ALEPH jet and event shapes at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
# OPAL/JADE jet rates at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LEP-161 LEPGenerator
\ No newline at end of file
+saverun LEP-161 LEPGenerator
diff --git a/Tests/Rivet/LEP-172.in b/Tests/Rivet/LEP-172.in
--- a/Tests/Rivet/LEP-172.in
+++ b/Tests/Rivet/LEP-172.in
@@ -1,32 +1,25 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LEPGenerator:EventHandler:LuminosityFunction:Energy 172.
##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# default e+e- > q qbar (5 flavours d,u,s,c,b)
-insert SimpleEE:MatrixElements 0 MEee2gZ2qq
-
-##################################################
# select the analyses
##################################################
# ALEPH jet and event shapes at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
# OPAL/JADE jet rates at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LEP-172 LEPGenerator
\ No newline at end of file
+saverun LEP-172 LEPGenerator
diff --git a/Tests/Rivet/LEP-177.in b/Tests/Rivet/LEP-177.in
--- a/Tests/Rivet/LEP-177.in
+++ b/Tests/Rivet/LEP-177.in
@@ -1,30 +1,23 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LEPGenerator:EventHandler:LuminosityFunction:Energy 177.
##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# default e+e- > q qbar (5 flavours d,u,s,c,b)
-insert SimpleEE:MatrixElements 0 MEee2gZ2qq
-
-##################################################
# select the analyses
##################################################
# OPAL event shapes and multiplicities at different energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_S6132243
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LEP-177 LEPGenerator
\ No newline at end of file
+saverun LEP-177 LEPGenerator
diff --git a/Tests/Rivet/LEP-183.in b/Tests/Rivet/LEP-183.in
--- a/Tests/Rivet/LEP-183.in
+++ b/Tests/Rivet/LEP-183.in
@@ -1,32 +1,25 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LEPGenerator:EventHandler:LuminosityFunction:Energy 183.
##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# default e+e- > q qbar (5 flavours d,u,s,c,b)
-insert SimpleEE:MatrixElements 0 MEee2gZ2qq
-
-##################################################
# select the analyses
##################################################
# ALEPH jet and event shapes at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
# OPAL/JADE jet rates at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LEP-183 LEPGenerator
\ No newline at end of file
+saverun LEP-183 LEPGenerator
diff --git a/Tests/Rivet/LEP-189.in b/Tests/Rivet/LEP-189.in
--- a/Tests/Rivet/LEP-189.in
+++ b/Tests/Rivet/LEP-189.in
@@ -1,32 +1,25 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LEPGenerator:EventHandler:LuminosityFunction:Energy 189.
##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# default e+e- > q qbar (5 flavours d,u,s,c,b)
-insert SimpleEE:MatrixElements 0 MEee2gZ2qq
-
-##################################################
# select the analyses
##################################################
# ALEPH jet and event shapes at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
# OPAL/JADE jet rates at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LEP-189 LEPGenerator
\ No newline at end of file
+saverun LEP-189 LEPGenerator
diff --git a/Tests/Rivet/LEP-196.in b/Tests/Rivet/LEP-196.in
--- a/Tests/Rivet/LEP-196.in
+++ b/Tests/Rivet/LEP-196.in
@@ -1,30 +1,23 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LEPGenerator:EventHandler:LuminosityFunction:Energy 196.
##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# default e+e- > q qbar (5 flavours d,u,s,c,b)
-insert SimpleEE:MatrixElements 0 MEee2gZ2qq
-
-##################################################
# select the analyses
##################################################
# OPAL event shapes and multiplicities at different energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
###################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LEP-196 LEPGenerator
\ No newline at end of file
+saverun LEP-196 LEPGenerator
diff --git a/Tests/Rivet/LEP-197.in b/Tests/Rivet/LEP-197.in
--- a/Tests/Rivet/LEP-197.in
+++ b/Tests/Rivet/LEP-197.in
@@ -1,30 +1,23 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LEPGenerator:EventHandler:LuminosityFunction:Energy 197.
##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# default e+e- > q qbar (5 flavours d,u,s,c,b)
-insert SimpleEE:MatrixElements 0 MEee2gZ2qq
-
-##################################################
# select the analyses
##################################################
# OPAL event shapes and multiplicities at different energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_S6132243
###################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LEP-197 LEPGenerator
\ No newline at end of file
+saverun LEP-197 LEPGenerator
diff --git a/Tests/Rivet/LEP-200.in b/Tests/Rivet/LEP-200.in
--- a/Tests/Rivet/LEP-200.in
+++ b/Tests/Rivet/LEP-200.in
@@ -1,30 +1,23 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LEPGenerator:EventHandler:LuminosityFunction:Energy 200.
##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# default e+e- > q qbar (5 flavours d,u,s,c,b)
-insert SimpleEE:MatrixElements 0 MEee2gZ2qq
-
-##################################################
# select the analyses
##################################################
# ALEPH jet and event shapes at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LEP-200 LEPGenerator
\ No newline at end of file
+saverun LEP-200 LEPGenerator
diff --git a/Tests/Rivet/LEP-206.in b/Tests/Rivet/LEP-206.in
--- a/Tests/Rivet/LEP-206.in
+++ b/Tests/Rivet/LEP-206.in
@@ -1,30 +1,23 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LEPGenerator:EventHandler:LuminosityFunction:Energy 206.
##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# default e+e- > q qbar (5 flavours d,u,s,c,b)
-insert SimpleEE:MatrixElements 0 MEee2gZ2qq
-
-##################################################
# select the analyses
##################################################
# ALEPH jet and event shapes at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LEP-206 LEPGenerator
\ No newline at end of file
+saverun LEP-206 LEPGenerator
diff --git a/Tests/Rivet/LEP-35.in b/Tests/Rivet/LEP-35.in
--- a/Tests/Rivet/LEP-35.in
+++ b/Tests/Rivet/LEP-35.in
@@ -1,30 +1,23 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LEPGenerator:EventHandler:LuminosityFunction:Energy 35.
##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# default e+e- > q qbar (5 flavours d,u,s,c,b)
-insert SimpleEE:MatrixElements 0 MEee2gZ2qq
-
-##################################################
# select the analyses
##################################################
# OPAL/JADE jet rates at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LEP-35 LEPGenerator
\ No newline at end of file
+saverun LEP-35 LEPGenerator
diff --git a/Tests/Rivet/LEP-44.in b/Tests/Rivet/LEP-44.in
--- a/Tests/Rivet/LEP-44.in
+++ b/Tests/Rivet/LEP-44.in
@@ -1,30 +1,23 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LEPGenerator:EventHandler:LuminosityFunction:Energy 44.
##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# default e+e- > q qbar (5 flavours d,u,s,c,b)
-insert SimpleEE:MatrixElements 0 MEee2gZ2qq
-
-##################################################
# select the analyses
##################################################
# OPAL/JADE jet rates at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LEP-44 LEPGenerator
\ No newline at end of file
+saverun LEP-44 LEPGenerator
diff --git a/Tests/Rivet/LEP-91.in b/Tests/Rivet/LEP-91.in
--- a/Tests/Rivet/LEP-91.in
+++ b/Tests/Rivet/LEP-91.in
@@ -1,61 +1,54 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LEPGenerator:EventHandler:LuminosityFunction:Energy 91.2
##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# default e+e- > q qbar (5 flavours d,u,s,c,b)
-insert SimpleEE:MatrixElements 0 MEee2gZ2qq
-
-##################################################
# select the analyses
##################################################
# Validated
##################################################
# ALEPH charged particle multiplicity
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1991_S2435284
# ALEPH main LEP I QCD summary paper
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_S3486095
# ALEPH photon analysis
#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_S3196992
# OPAL photon analysis
#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1993_S2692198
# OPAL flavour specific charged multiplicities etc
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_S3780481
# OPAL event shapes and multiplicities at different energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_S6132243
# ALEPH jet and event shapes at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
# OPAL/JADE jet rates at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
# DELPHI strange baryon production
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_S3137023
# DELPHI tuning paper
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_S3430090
# DELPHI b quark
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2002_069_CONF_603
# PDG hadron multiplicities and ratios
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES_RATIOS
##################################################
# unvalidated
##################################################
# OPAL 4 jet angles
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2001_S4553896
# DELPHI 4 jet angles
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_WUD_03_11
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LEP-91 LEPGenerator
\ No newline at end of file
+saverun LEP-91 LEPGenerator
diff --git a/Tests/Rivet/LEP-Powheg-133.in b/Tests/Rivet/LEP-Powheg-133.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/LEP-Powheg-133.in
@@ -0,0 +1,27 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read LEPBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LEPGenerator:EventHandler:LuminosityFunction:Energy 133.
+
+##################################################
+# select the analyses
+##################################################
+
+# OPAL event shapes and multiplicities at different energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_S6132243
+# ALEPH jet and event shapes at many energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
+# OPAL/JADE jet rates at many energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun LEP-Powheg-133 LEPGenerator
diff --git a/Tests/Rivet/LEP-Powheg-161.in b/Tests/Rivet/LEP-Powheg-161.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/LEP-Powheg-161.in
@@ -0,0 +1,25 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read LEPBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LEPGenerator:EventHandler:LuminosityFunction:Energy 161.
+
+##################################################
+# select the analyses
+##################################################
+
+# ALEPH jet and event shapes at many energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
+# OPAL/JADE jet rates at many energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun LEP-Powheg-161 LEPGenerator
diff --git a/Tests/Rivet/LEP-Powheg-172.in b/Tests/Rivet/LEP-Powheg-172.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/LEP-Powheg-172.in
@@ -0,0 +1,25 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read LEPBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LEPGenerator:EventHandler:LuminosityFunction:Energy 172.
+
+##################################################
+# select the analyses
+##################################################
+
+# ALEPH jet and event shapes at many energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
+# OPAL/JADE jet rates at many energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun LEP-Powheg-172 LEPGenerator
diff --git a/Tests/Rivet/LEP-Powheg-177.in b/Tests/Rivet/LEP-Powheg-177.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/LEP-Powheg-177.in
@@ -0,0 +1,23 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read LEPBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LEPGenerator:EventHandler:LuminosityFunction:Energy 177.
+
+##################################################
+# select the analyses
+##################################################
+
+# OPAL event shapes and multiplicities at different energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_S6132243
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun LEP-Powheg-177 LEPGenerator
diff --git a/Tests/Rivet/LEP-Powheg-183.in b/Tests/Rivet/LEP-Powheg-183.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/LEP-Powheg-183.in
@@ -0,0 +1,25 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read LEPBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LEPGenerator:EventHandler:LuminosityFunction:Energy 183.
+
+##################################################
+# select the analyses
+##################################################
+
+# ALEPH jet and event shapes at many energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
+# OPAL/JADE jet rates at many energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun LEP-Powheg-183 LEPGenerator
diff --git a/Tests/Rivet/LEP-Powheg-189.in b/Tests/Rivet/LEP-Powheg-189.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/LEP-Powheg-189.in
@@ -0,0 +1,25 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read LEPBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LEPGenerator:EventHandler:LuminosityFunction:Energy 189.
+
+##################################################
+# select the analyses
+##################################################
+
+# ALEPH jet and event shapes at many energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
+# OPAL/JADE jet rates at many energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun LEP-Powheg-189 LEPGenerator
diff --git a/Tests/Rivet/LEP-Powheg-196.in b/Tests/Rivet/LEP-Powheg-196.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/LEP-Powheg-196.in
@@ -0,0 +1,23 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read LEPBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LEPGenerator:EventHandler:LuminosityFunction:Energy 196.
+
+##################################################
+# select the analyses
+##################################################
+
+# OPAL event shapes and multiplicities at different energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
+
+###################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun LEP-Powheg-196 LEPGenerator
diff --git a/Tests/Rivet/LEP-Powheg-197.in b/Tests/Rivet/LEP-Powheg-197.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/LEP-Powheg-197.in
@@ -0,0 +1,23 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read LEPBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LEPGenerator:EventHandler:LuminosityFunction:Energy 197.
+
+##################################################
+# select the analyses
+##################################################
+
+# OPAL event shapes and multiplicities at different energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_S6132243
+
+###################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun LEP-Powheg-197 LEPGenerator
diff --git a/Tests/Rivet/LEP-Powheg-200.in b/Tests/Rivet/LEP-Powheg-200.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/LEP-Powheg-200.in
@@ -0,0 +1,23 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read LEPBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LEPGenerator:EventHandler:LuminosityFunction:Energy 200.
+
+##################################################
+# select the analyses
+##################################################
+
+# ALEPH jet and event shapes at many energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun LEP-Powheg-200 LEPGenerator
diff --git a/Tests/Rivet/LEP-Powheg-206.in b/Tests/Rivet/LEP-Powheg-206.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/LEP-Powheg-206.in
@@ -0,0 +1,23 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read LEPBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LEPGenerator:EventHandler:LuminosityFunction:Energy 206.
+
+##################################################
+# select the analyses
+##################################################
+
+# ALEPH jet and event shapes at many energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun LEP-Powheg-206 LEPGenerator
diff --git a/Tests/Rivet/LEP-Powheg-35.in b/Tests/Rivet/LEP-Powheg-35.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/LEP-Powheg-35.in
@@ -0,0 +1,23 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read LEPBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LEPGenerator:EventHandler:LuminosityFunction:Energy 35.
+
+##################################################
+# select the analyses
+##################################################
+
+# OPAL/JADE jet rates at many energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun LEP-Powheg-35 LEPGenerator
diff --git a/Tests/Rivet/LEP-Powheg-44.in b/Tests/Rivet/LEP-Powheg-44.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/LEP-Powheg-44.in
@@ -0,0 +1,23 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read LEPBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LEPGenerator:EventHandler:LuminosityFunction:Energy 44.
+
+##################################################
+# select the analyses
+##################################################
+
+# OPAL/JADE jet rates at many energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun LEP-Powheg-44 LEPGenerator
diff --git a/Tests/Rivet/LEP-Powheg-91.in b/Tests/Rivet/LEP-Powheg-91.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/LEP-Powheg-91.in
@@ -0,0 +1,54 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read LEPBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LEPGenerator:EventHandler:LuminosityFunction:Energy 91.2
+
+##################################################
+# select the analyses
+##################################################
+# Validated
+##################################################
+# ALEPH charged particle multiplicity
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1991_S2435284
+# ALEPH main LEP I QCD summary paper
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_S3486095
+# ALEPH photon analysis
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_S3196992
+# OPAL photon analysis
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1993_S2692198
+# OPAL flavour specific charged multiplicities etc
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_S3780481
+# OPAL event shapes and multiplicities at different energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_S6132243
+# ALEPH jet and event shapes at many energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
+# OPAL/JADE jet rates at many energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
+# DELPHI strange baryon production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_S3137023
+# DELPHI tuning paper
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_S3430090
+# DELPHI b quark
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2002_069_CONF_603
+# PDG hadron multiplicities and ratios
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES_RATIOS
+##################################################
+# unvalidated
+##################################################
+# OPAL 4 jet angles
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2001_S4553896
+# DELPHI 4 jet angles
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_WUD_03_11
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun LEP-Powheg-91 LEPGenerator
diff --git a/Tests/Rivet/LEPBase-Powheg.in b/Tests/Rivet/LEPBase-Powheg.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/LEPBase-Powheg.in
@@ -0,0 +1,36 @@
+##################################################
+# base parameters for LEP analyses
+##################################################
+
+##################################################
+# Technical parameters for this run
+##################################################
+cd /Herwig/Generators
+set LEPGenerator:NumberOfEvents 100000000
+set LEPGenerator:RandomNumberGenerator:Seed 31122001
+set LEPGenerator:DebugLevel 1
+set LEPGenerator:PrintEvent 10
+set LEPGenerator:MaxErrors 10000
+# no MPI
+set LEPGenerator:EventHandler:CascadeHandler:MPIHandler NULL
+
+##################################################
+# Switch off ISR
+##################################################
+set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
+set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
+
+##################################################
+# Create the Herwig analysis
+##################################################
+create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
+insert LEPGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+
+##################################################
+# Use the NLO q qbar matrix element
+##################################################
+create Herwig::O2AlphaS /Herwig/O2AlphaS
+set /Herwig/Generators/LHCGenerator:StandardModelParameters:QCD/RunningAlphaS /Herwig/O2AlphaS
+set /Herwig/Shower/Evolver:HardEmissionMode POWHEG
+set /Herwig/Shower/AlphaQCD:AlphaMZ 0.118
+insert /Herwig/MatrixElements/SimpleEE:MatrixElements 0 /Herwig/MatrixElements/PowhegMEee2gZ2qq
diff --git a/Tests/Rivet/LEPBase.in b/Tests/Rivet/LEPBase.in
--- a/Tests/Rivet/LEPBase.in
+++ b/Tests/Rivet/LEPBase.in
@@ -1,26 +1,32 @@
##################################################
# base parameters for LEP analyses
##################################################
##################################################
# Technical parameters for this run
##################################################
cd /Herwig/Generators
set LEPGenerator:NumberOfEvents 100000000
set LEPGenerator:RandomNumberGenerator:Seed 31122001
set LEPGenerator:PrintEvent 10
set LEPGenerator:MaxErrors 10000
# no MPI
set LEPGenerator:EventHandler:CascadeHandler:MPIHandler NULL
##################################################
# Switch off ISR
##################################################
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
##################################################
# Create the Herwig analysis
##################################################
create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
insert LEPGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
+
+##################################################
+# Use the q qbar matrix element
+##################################################
+# default e+e- > q qbar (5 flavours d,u,s,c,b)
+insert /Herwig/MatrixElements/SimpleEE:MatrixElements 0 /Herwig/MatrixElements/MEee2gZ2qq
\ No newline at end of file
diff --git a/Tests/Rivet/TVT-630-Jets-1.in b/Tests/Rivet/TVT-630-Jets-1.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/TVT-630-Jets-1.in
@@ -0,0 +1,34 @@
+###################################################
+# Rivet analyses at the Z pole
+##################################################
+read TVTBase.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 630.0
+
+##################################################
+# Use the q qbar matrix element
+##################################################
+cd /Herwig/MatrixElements
+insert SimpleQCD:MatrixElements[0] MEQCD2to2
+set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
+set /Herwig/Cuts/JetKtCut:MinKT 20.
+
+# No QED radiation
+erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+
+##################################################
+# select the analyses
+##################################################
+
+# run I CDF UE
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2004_S5839831
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun TVT-630-Jets-1 LHCGenerator
diff --git a/Tests/Rivet/TVT-630-Jets-2.in b/Tests/Rivet/TVT-630-Jets-2.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/TVT-630-Jets-2.in
@@ -0,0 +1,34 @@
+###################################################
+# Rivet analyses at the Z pole
+##################################################
+read TVTBase.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1800.0
+
+##################################################
+# Use the q qbar matrix element
+##################################################
+cd /Herwig/MatrixElements
+insert SimpleQCD:MatrixElements[0] MEQCD2to2
+set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
+set /Herwig/Cuts/JetKtCut:MinKT 40.
+
+# No QED radiation
+erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+
+##################################################
+# select the analyses
+##################################################
+
+# run I CDF UE
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2004_S5839831
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun TVT-630-Jets-2 LHCGenerator
diff --git a/Tests/Rivet/TVT-630-Jets-3.in b/Tests/Rivet/TVT-630-Jets-3.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/TVT-630-Jets-3.in
@@ -0,0 +1,34 @@
+###################################################
+# Rivet analyses at the Z pole
+##################################################
+read TVTBase.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1800.0
+
+##################################################
+# Use the q qbar matrix element
+##################################################
+cd /Herwig/MatrixElements
+insert SimpleQCD:MatrixElements[0] MEQCD2to2
+set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
+set /Herwig/Cuts/JetKtCut:MinKT 75.
+
+# No QED radiation
+erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+
+##################################################
+# select the analyses
+##################################################
+
+# run I CDF UE
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2004_S5839831
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun TVT-630-Jets-3 LHCGenerator
diff --git a/Tests/Rivet/TVT-630-UE.in b/Tests/Rivet/TVT-630-UE.in
--- a/Tests/Rivet/TVT-630-UE.in
+++ b/Tests/Rivet/TVT-630-UE.in
@@ -1,38 +1,39 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVT-UEBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 630.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# min bias
insert SimpleQCD:MatrixElements[0] MEMinBias
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
# min ibas cuts
set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
set /Herwig/Cuts/QCDCuts:MHatMin 0.0*GeV
set /Herwig/Cuts/QCDCuts:X1Min 0.01
set /Herwig/Cuts/QCDCuts:X2Min 0.01
##################################################
# select the analyses
##################################################
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1988_S1865951
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1990_S2089246
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2002_S4796047
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2004_S5839831
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-630-UE LHCGenerator
diff --git a/Tests/Rivet/TVT-Powheg-Run-I-W.in b/Tests/Rivet/TVT-Powheg-Run-I-W.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/TVT-Powheg-Run-I-W.in
@@ -0,0 +1,37 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read TVTBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1800.0
+
+##################################################
+# Use the q qbar matrix element
+##################################################
+cd /Herwig/MatrixElements
+# Drell-Yan W
+insert SimpleQCD:MatrixElements[0] PowhegMEqq2W2ff
+set PowhegMEqq2W2ff:Process Electron
+
+# No QED radiation
+erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+
+##################################################
+# select the analyses
+##################################################
+# CDF Run I W pT corrections and normalization are CRAP
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1991_S2313472
+# D0 Run I W pT corrections and normalization are CRAP
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_1998_S3711838
+# D0 Run I W pT
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2000_S4480767
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun TVT-Powheg-Run-I-W LHCGenerator
diff --git a/Tests/Rivet/TVT-Powheg-Run-I-WZ.in b/Tests/Rivet/TVT-Powheg-Run-I-WZ.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/TVT-Powheg-Run-I-WZ.in
@@ -0,0 +1,36 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read TVTBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1800.0
+
+##################################################
+# Use the q qbar matrix element
+##################################################
+cd /Herwig/MatrixElements
+# Drell-Yan W
+insert SimpleQCD:MatrixElements[0] PowhegMEqq2W2ff
+set PowhegMEqq2W2ff:Process Electron
+# Drell-Yan Z/gamma
+insert SimpleQCD:MatrixElements[0] PowhegMEqq2gZ2ff
+set PowhegMEqq2gZ2ff:Process Electron
+
+# No QED radiation
+erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+
+##################################################
+# select the analyses
+##################################################
+# D0 Run I W/Z pT corrections
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2001_S4674421
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun TVT-Powheg-Run-I-WZ LHCGenerator
diff --git a/Tests/Rivet/TVT-Powheg-Run-I-Z.in b/Tests/Rivet/TVT-Powheg-Run-I-Z.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/TVT-Powheg-Run-I-Z.in
@@ -0,0 +1,34 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read TVTBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1800.0
+
+##################################################
+# Use the q qbar matrix element
+##################################################
+cd /Herwig/MatrixElements
+# Drell-Yan Z/gamma
+insert SimpleQCD:MatrixElements[0] PowhegMEqq2gZ2ff
+set PowhegMEqq2gZ2ff:Process Electron
+
+# No QED radiation
+erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+
+##################################################
+# select the analyses
+##################################################
+
+# CDF Run I Z pT
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2000_S4155203
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun TVT-Powheg-Run-I-Z LHCGenerator
diff --git a/Tests/Rivet/TVT-Powheg-Run-II-W.in b/Tests/Rivet/TVT-Powheg-Run-II-W.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/TVT-Powheg-Run-II-W.in
@@ -0,0 +1,36 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read TVTBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
+
+##################################################
+# Use the q qbar matrix element
+##################################################
+cd /Herwig/MatrixElements
+# Drell-Yan Z/gamma
+insert SimpleQCD:MatrixElements[0] PowhegMEqq2W2ff
+set PowhegMEqq2W2ff:Process Electron
+
+# No QED radiation
+erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+
+##################################################
+# select the analyses
+##################################################
+
+# D0 Run II charge asymmetry
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7837160
+# CDF Run II W+jets
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S7541902
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun TVT-Powheg-Run-II-W LHCGenerator
diff --git a/Tests/Rivet/TVT-Powheg-Run-II-Z-e.in b/Tests/Rivet/TVT-Powheg-Run-II-Z-e.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/TVT-Powheg-Run-II-Z-e.in
@@ -0,0 +1,45 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read TVTBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
+
+##################################################
+# Use the q qbar matrix element
+##################################################
+cd /Herwig/MatrixElements
+# Drell-Yan Z/gamma
+insert SimpleQCD:MatrixElements[0] PowhegMEqq2gZ2ff
+set PowhegMEqq2gZ2ff:Process Electron
+
+# No QED radiation
+erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+
+##################################################
+# select the analyses
+##################################################
+
+# CDF Run II Z+jets
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S7540469
+# CDF Z+b jets
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S8095620
+# CDF Run II Z cross section and rapidity
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_S8383952
+# D0 Run II Z cross section and rapidity
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2007_S7075677
+# D0 Run II jet ratios
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S6879055
+# D0 Run II
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7554427
+# D0 Run II
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2009_S8202443
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun TVT-Powheg-Run-II-Z-e LHCGenerator
diff --git a/Tests/Rivet/TVT-Powheg-Run-II-Z-mu.in b/Tests/Rivet/TVT-Powheg-Run-II-Z-mu.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/TVT-Powheg-Run-II-Z-mu.in
@@ -0,0 +1,41 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read TVTBase-Powheg.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
+
+##################################################
+# Use the q qbar matrix element
+##################################################
+cd /Herwig/MatrixElements
+# Drell-Yan Z/gamma
+insert SimpleQCD:MatrixElements[0] PowhegMEqq2gZ2ff
+set PowhegMEqq2gZ2ff:Process Muon
+
+# No QED radiation
+erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+
+##################################################
+# select the analyses
+##################################################
+
+# D0 run II Z pT
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2010_S8671338
+# CDF Z+b jets
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_S6653332
+# CDF underlying event
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_NOTE_9351
+# D0 Run II
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2009_S8349509
+# D0 Run II
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7863608
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun TVT-Powheg-Run-II-Z-mu LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-I-Jets-1.in b/Tests/Rivet/TVT-Run-I-Jets-1.in
--- a/Tests/Rivet/TVT-Run-I-Jets-1.in
+++ b/Tests/Rivet/TVT-Run-I-Jets-1.in
@@ -1,38 +1,40 @@
-##################################################
+###################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
-set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1800.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
-set /Herwig/Cuts/JetKtCut:MinKT 30.
+set /Herwig/Cuts/JetKtCut:MinKT 20.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# run I CDF di jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2001_S4517016
# run I CDF inclusive jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2001_S4563131
# run I CDF UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2004_S5839831
+# run I CDF UE
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2001_S4751469
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-I-Jets-1 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-I-Jets-2.in b/Tests/Rivet/TVT-Run-I-Jets-2.in
--- a/Tests/Rivet/TVT-Run-I-Jets-2.in
+++ b/Tests/Rivet/TVT-Run-I-Jets-2.in
@@ -1,42 +1,40 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
-set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1800.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 40.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# run I CDF di jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2000_S4266730
-# run I CDF di jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2001_S4517016
# run I CDF inclusive jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2001_S4563131
# run I CDF UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2004_S5839831
# run I D0 dijet decorrelation
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_1996_S3324664
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-I-Jets-2 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-I-Jets-3.in b/Tests/Rivet/TVT-Run-I-Jets-3.in
--- a/Tests/Rivet/TVT-Run-I-Jets-3.in
+++ b/Tests/Rivet/TVT-Run-I-Jets-3.in
@@ -1,40 +1,38 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
-set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1800.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 65.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# run I CDF di jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2000_S4266730
-# run I CDF di jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2001_S4517016
# run I CDF inclusive jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2001_S4563131
# run I CDF UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2004_S5839831
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-I-Jets-3 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-I-Jets-4.in b/Tests/Rivet/TVT-Run-I-Jets-4.in
--- a/Tests/Rivet/TVT-Run-I-Jets-4.in
+++ b/Tests/Rivet/TVT-Run-I-Jets-4.in
@@ -1,48 +1,44 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
-set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1800.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 90.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
-# run I coherence
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1994_S2952106
# run I CDF large total ET
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1998_S3618439
# run I CDF di jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2000_S4266730
-# run I CDF di jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2001_S4517016
-# run I CDF di jet angles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1996_S3418421
# run I CDF inclusive jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2001_S4563131
# run I CDF UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2004_S5839831
+# run I coherence
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1994_S2952106
# run I D0 3 and 4 jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_1996_S3214044
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-I-Jets-4 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-I-Jets-5.in b/Tests/Rivet/TVT-Run-I-Jets-5.in
--- a/Tests/Rivet/TVT-Run-I-Jets-5.in
+++ b/Tests/Rivet/TVT-Run-I-Jets-5.in
@@ -1,49 +1,45 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
-set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1800.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 160.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# run I CDF multijet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1996_S3108457
# run I CDF multijet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1996_S3349578
# run I CDF 6 jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1997_S3541940
# run I CDF large total ET
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1998_S3618439
# run I CDF di jet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2000_S4266730
-# run I CDF di jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2001_S4517016
-# run I CDF di jet angles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1996_S3418421
# run I CDF inclusive jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2001_S4563131
# run I CDF UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2004_S5839831
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-I-Jets-5 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-I-Jets-6.in b/Tests/Rivet/TVT-Run-I-Jets-6.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/TVT-Run-I-Jets-6.in
@@ -0,0 +1,38 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read TVTBase.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1800.0
+
+##################################################
+# Use the q qbar matrix element
+##################################################
+cd /Herwig/MatrixElements
+insert SimpleQCD:MatrixElements[0] MEQCD2to2
+set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
+set /Herwig/Cuts/JetKtCut:MinKT 30.
+set /Herwig/Cuts/QCDCuts:MHatMin 100.*GeV
+
+# No QED radiation
+erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+
+##################################################
+# select the analyses
+##################################################
+
+# run I CDF di jet angles
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1996_S3418421
+# run I CDF di jet
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2000_S4266730
+
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun TVT-Run-I-Jets-6 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-I-Jets-7.in b/Tests/Rivet/TVT-Run-I-Jets-7.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/TVT-Run-I-Jets-7.in
@@ -0,0 +1,38 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read TVTBase.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1800.0
+
+##################################################
+# Use the q qbar matrix element
+##################################################
+cd /Herwig/MatrixElements
+insert SimpleQCD:MatrixElements[0] MEQCD2to2
+set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
+set /Herwig/Cuts/JetKtCut:MinKT 30.
+set /Herwig/Cuts/QCDCuts:MHatMin 400.*GeV
+
+# No QED radiation
+erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+
+##################################################
+# select the analyses
+##################################################
+
+# run I CDF di jet angles
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1996_S3418421
+# run I CDF di jet
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2000_S4266730
+
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun TVT-Run-I-Jets-7 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-I-Jets-8.in b/Tests/Rivet/TVT-Run-I-Jets-8.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/TVT-Run-I-Jets-8.in
@@ -0,0 +1,38 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read TVTBase.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1800.0
+
+##################################################
+# Use the q qbar matrix element
+##################################################
+cd /Herwig/MatrixElements
+insert SimpleQCD:MatrixElements[0] MEQCD2to2
+set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
+set /Herwig/Cuts/JetKtCut:MinKT 30.
+set /Herwig/Cuts/QCDCuts:MHatMin 700.*GeV
+
+# No QED radiation
+erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+
+##################################################
+# select the analyses
+##################################################
+
+# run I CDF di jet angles
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1996_S3418421
+# run I CDF di jet
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2000_S4266730
+
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun TVT-Run-I-Jets-8 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-I-Powheg-W.in b/Tests/Rivet/TVT-Run-I-Powheg-W.in
deleted file mode 100644
--- a/Tests/Rivet/TVT-Run-I-Powheg-W.in
+++ /dev/null
@@ -1,37 +0,0 @@
-##################################################
-# Rivet analyses at the Z pole
-##################################################
-read TVTBase-Powheg.in
-
-##################################################
-# LEP physics parameters (override defaults)
-##################################################
-cd /Herwig/Generators
-set LHCGenerator:EventHandler:LuminosityFunction:Energy 1800.0
-
-##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# Drell-Yan W
-insert SimpleQCD:MatrixElements[0] PowhegMEqq2W2ff
-set PowhegMEqq2W2ff:Process Electron
-
-# No QED radiation
-erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
-
-##################################################
-# select the analyses
-##################################################
-# CDF Run I W pT corrections and normalization are CRAP
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_1991_S2313472
-# D0 Run I W pT corrections and normalization are CRAP
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_1998_S3711838
-# D0 Run I W pT
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2000_S4480767
-
-##################################################
-# Save run for later usage with 'Herwig++ run'
-##################################################
-cd /Herwig/Generators
-saverun TVT-Run-I-Powheg-W LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-I-Powheg-WZ.in b/Tests/Rivet/TVT-Run-I-Powheg-WZ.in
deleted file mode 100644
--- a/Tests/Rivet/TVT-Run-I-Powheg-WZ.in
+++ /dev/null
@@ -1,36 +0,0 @@
-##################################################
-# Rivet analyses at the Z pole
-##################################################
-read TVTBase-Powheg.in
-
-##################################################
-# LEP physics parameters (override defaults)
-##################################################
-cd /Herwig/Generators
-set LHCGenerator:EventHandler:LuminosityFunction:Energy 1800.0
-
-##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# Drell-Yan W
-insert SimpleQCD:MatrixElements[0] PowhegMEqq2W2ff
-set PowhegMEqq2W2ff:Process Electron
-# Drell-Yan Z/gamma
-insert SimpleQCD:MatrixElements[0] PowhegMEqq2gZ2ff
-set PowhegMEqq2gZ2ff:Process Electron
-
-# No QED radiation
-erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
-
-##################################################
-# select the analyses
-##################################################
-# D0 Run I W/Z pT corrections
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2001_S4674421
-
-##################################################
-# Save run for later usage with 'Herwig++ run'
-##################################################
-cd /Herwig/Generators
-saverun TVT-Run-I-Powheg-WZ LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-I-Powheg-Z.in b/Tests/Rivet/TVT-Run-I-Powheg-Z.in
deleted file mode 100644
--- a/Tests/Rivet/TVT-Run-I-Powheg-Z.in
+++ /dev/null
@@ -1,34 +0,0 @@
-##################################################
-# Rivet analyses at the Z pole
-##################################################
-read TVTBase-Powheg.in
-
-##################################################
-# LEP physics parameters (override defaults)
-##################################################
-cd /Herwig/Generators
-set LHCGenerator:EventHandler:LuminosityFunction:Energy 1800.0
-
-##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# Drell-Yan Z/gamma
-insert SimpleQCD:MatrixElements[0] PowhegMEqq2gZ2ff
-set PowhegMEqq2gZ2ff:Process Electron
-
-# No QED radiation
-erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
-
-##################################################
-# select the analyses
-##################################################
-
-# CDF Run I Z pT
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2000_S4155203
-
-##################################################
-# Save run for later usage with 'Herwig++ run'
-##################################################
-cd /Herwig/Generators
-saverun TVT-Run-I-Powheg-Z LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Jets-1.in b/Tests/Rivet/TVT-Run-II-Jets-1.in
--- a/Tests/Rivet/TVT-Run-II-Jets-1.in
+++ b/Tests/Rivet/TVT-Run-II-Jets-1.in
@@ -1,41 +1,41 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
-set /Herwig/Cuts/JetKtCut:MinKT 30.
+set /Herwig/Cuts/JetKtCut:MinKT 25.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# CDF jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2005_S6217184
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_S8057893
# CDF inclusive jet kt
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2007_S7057202
# run II UE analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
# inclusive jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7662670
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-II-Jets-1 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Jets-10.in b/Tests/Rivet/TVT-Run-II-Jets-10.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/TVT-Run-II-Jets-10.in
@@ -0,0 +1,39 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read TVTBase.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
+
+##################################################
+# Use the q qbar matrix element
+##################################################
+cd /Herwig/MatrixElements
+insert SimpleQCD:MatrixElements[0] MEQCD2to2
+set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
+set /Herwig/Cuts/JetKtCut:MinKT 30.
+set /Herwig/Cuts/QCDCuts:MHatMin 900.*GeV
+
+# No QED radiation
+erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+
+##################################################
+# select the analyses
+##################################################
+
+# D0 dijet invariant mass
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2010_S8566488
+# D0 dijet angles
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2009_S8320160
+# CDF dijet
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S8093652
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun TVT-Run-II-Jets-10 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Jets-3.in b/Tests/Rivet/TVT-Run-II-Jets-3.in
--- a/Tests/Rivet/TVT-Run-II-Jets-3.in
+++ b/Tests/Rivet/TVT-Run-II-Jets-3.in
@@ -1,48 +1,46 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
-set /Herwig/Cuts/JetKtCut:MinKT 65.
+set /Herwig/Cuts/JetKtCut:MinKT 60.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# CDF jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2005_S6217184
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_S8057893
# CDF inclusive jet kt
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2007_S7057202
-# CDF dijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S8093652
# CDF inclusive jet cone
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_S6450792
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S7828950
# run II UE analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
# dijet decorrelations
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2004_S5992206
# inclusive jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7662670
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-II-Jets-3 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Jets-4.in b/Tests/Rivet/TVT-Run-II-Jets-4.in
--- a/Tests/Rivet/TVT-Run-II-Jets-4.in
+++ b/Tests/Rivet/TVT-Run-II-Jets-4.in
@@ -1,50 +1,46 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
-set /Herwig/Cuts/JetKtCut:MinKT 110.
+set /Herwig/Cuts/JetKtCut:MinKT 85.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# CDF jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2005_S6217184
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_S8057893
# CDF inclusive jet kt
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2007_S7057202
-# CDF dijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S8093652
# CDF inclusive jet cone
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_S6450792
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S7828950
# run II UE analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
# dijet decorrelations
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2004_S5992206
# inclusive jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7662670
-# D0 dijet angles
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2009_S8320160
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-II-Jets-4 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Jets-5.in b/Tests/Rivet/TVT-Run-II-Jets-5.in
--- a/Tests/Rivet/TVT-Run-II-Jets-5.in
+++ b/Tests/Rivet/TVT-Run-II-Jets-5.in
@@ -1,48 +1,46 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
-set /Herwig/Cuts/JetKtCut:MinKT 160.
+set /Herwig/Cuts/JetKtCut:MinKT 110.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# CDF jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2005_S6217184
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_S8057893
# CDF inclusive jet kt
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2007_S7057202
-# CDF dijet
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S8093652
# CDF inclusive jet cone
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_S6450792
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S7828950
# run II UE analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
# dijet decorrelations
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2004_S5992206
# inclusive jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7662670
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-II-Jets-5 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Jets-6.in b/Tests/Rivet/TVT-Run-II-Jets-6.in
--- a/Tests/Rivet/TVT-Run-II-Jets-6.in
+++ b/Tests/Rivet/TVT-Run-II-Jets-6.in
@@ -1,37 +1,46 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
-set /Herwig/Cuts/JetKtCut:MinKT 30.
-set /Herwig/Cuts/QCDCuts:MHatMin 100.*GeV
+set /Herwig/Cuts/JetKtCut:MinKT 160.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
-# D0 dijet invariant mass
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2010_S8566488
-# D0 dijet angles
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2009_S8320160
+# CDF jet shapes
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2005_S6217184
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_S8057893
+# CDF inclusive jet kt
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2007_S7057202
+# CDF inclusive jet cone
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_S6450792
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S7828950
+# run II UE analysis
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
+# dijet decorrelations
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2004_S5992206
+# inclusive jet cross section
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7662670
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun TVT-Run-II-Jets-1 LHCGenerator
+saverun TVT-Run-II-Jets-6 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Jets-7.in b/Tests/Rivet/TVT-Run-II-Jets-7.in
--- a/Tests/Rivet/TVT-Run-II-Jets-7.in
+++ b/Tests/Rivet/TVT-Run-II-Jets-7.in
@@ -1,37 +1,44 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
-set /Herwig/Cuts/JetKtCut:MinKT 30.
-set /Herwig/Cuts/QCDCuts:MHatMin 500.*GeV
+set /Herwig/Cuts/JetKtCut:MinKT 250.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
-# D0 dijet invariant mass
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2010_S8566488
-# D0 dijet angles
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2009_S8320160
+# CDF jet shapes
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2005_S6217184
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_S8057893
+# CDF inclusive jet kt
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2007_S7057202
+# CDF inclusive jet cone
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_S6450792
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S7828950
+# run II UE analysis
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
+# inclusive jet cross section
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7662670
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun TVT-Run-II-Jets-1 LHCGenerator
+saverun TVT-Run-II-Jets-7 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Jets-8.in b/Tests/Rivet/TVT-Run-II-Jets-8.in
--- a/Tests/Rivet/TVT-Run-II-Jets-8.in
+++ b/Tests/Rivet/TVT-Run-II-Jets-8.in
@@ -1,37 +1,39 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 30.
-set /Herwig/Cuts/QCDCuts:MHatMin 900.*GeV
+set /Herwig/Cuts/QCDCuts:MHatMin 100.*GeV
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# D0 dijet invariant mass
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2010_S8566488
# D0 dijet angles
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2009_S8320160
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2009_S8320160
+# CDF dijet
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S8093652
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun TVT-Run-II-Jets-1 LHCGenerator
+saverun TVT-Run-II-Jets-8 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Jets-9.in b/Tests/Rivet/TVT-Run-II-Jets-9.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/TVT-Run-II-Jets-9.in
@@ -0,0 +1,39 @@
+##################################################
+# Rivet analyses at the Z pole
+##################################################
+read TVTBase.in
+
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+cd /Herwig/Generators
+set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
+
+##################################################
+# Use the q qbar matrix element
+##################################################
+cd /Herwig/MatrixElements
+insert SimpleQCD:MatrixElements[0] MEQCD2to2
+set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
+set /Herwig/Cuts/JetKtCut:MinKT 30.
+set /Herwig/Cuts/QCDCuts:MHatMin 500.*GeV
+
+# No QED radiation
+erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+
+##################################################
+# select the analyses
+##################################################
+
+# D0 dijet invariant mass
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2010_S8566488
+# D0 dijet angles
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2009_S8320160
+# CDF dijet
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S8093652
+
+##################################################
+# Save run for later usage with 'Herwig++ run'
+##################################################
+cd /Herwig/Generators
+saverun TVT-Run-II-Jets-9 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Powheg-W.in b/Tests/Rivet/TVT-Run-II-Powheg-W.in
deleted file mode 100644
--- a/Tests/Rivet/TVT-Run-II-Powheg-W.in
+++ /dev/null
@@ -1,36 +0,0 @@
-##################################################
-# Rivet analyses at the Z pole
-##################################################
-read TVTBase-Powheg.in
-
-##################################################
-# LEP physics parameters (override defaults)
-##################################################
-cd /Herwig/Generators
-set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
-
-##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# Drell-Yan Z/gamma
-insert SimpleQCD:MatrixElements[0] PowhegMEqq2W2ff
-set PowhegMEqq2W2ff:Process Electron
-
-# No QED radiation
-erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
-
-##################################################
-# select the analyses
-##################################################
-
-# D0 Run II charge asymmetry
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7837160
-# CDF Run II W+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S7541902
-
-##################################################
-# Save run for later usage with 'Herwig++ run'
-##################################################
-cd /Herwig/Generators
-saverun TVT-Run-II-Powheg-W LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Powheg-Z-e.in b/Tests/Rivet/TVT-Run-II-Powheg-Z-e.in
deleted file mode 100644
--- a/Tests/Rivet/TVT-Run-II-Powheg-Z-e.in
+++ /dev/null
@@ -1,45 +0,0 @@
-##################################################
-# Rivet analyses at the Z pole
-##################################################
-read TVTBase-Powheg.in
-
-##################################################
-# LEP physics parameters (override defaults)
-##################################################
-cd /Herwig/Generators
-set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
-
-##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# Drell-Yan Z/gamma
-insert SimpleQCD:MatrixElements[0] PowhegMEqq2gZ2ff
-set PowhegMEqq2gZ2ff:Process Electron
-
-# No QED radiation
-erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
-
-##################################################
-# select the analyses
-##################################################
-
-# CDF Run II Z+jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S7540469
-# CDF Z+b jets
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S8095620
-# CDF Run II Z cross section and rapidity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_S8383952
-# D0 Run II Z cross section and rapidity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2007_S7075677
-# D0 Run II jet ratios
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S6879055
-# D0 Run II
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7554427
-# D0 Run II
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2009_S8202443
-##################################################
-# Save run for later usage with 'Herwig++ run'
-##################################################
-cd /Herwig/Generators
-saverun TVT-Run-II-Powheg-Z-e LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Powheg-Z-mu.in b/Tests/Rivet/TVT-Run-II-Powheg-Z-mu.in
deleted file mode 100644
--- a/Tests/Rivet/TVT-Run-II-Powheg-Z-mu.in
+++ /dev/null
@@ -1,41 +0,0 @@
-##################################################
-# Rivet analyses at the Z pole
-##################################################
-read TVTBase-Powheg.in
-
-##################################################
-# LEP physics parameters (override defaults)
-##################################################
-cd /Herwig/Generators
-set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
-
-##################################################
-# Use the q qbar matrix element
-##################################################
-cd /Herwig/MatrixElements
-# Drell-Yan Z/gamma
-insert SimpleQCD:MatrixElements[0] PowhegMEqq2gZ2ff
-set PowhegMEqq2gZ2ff:Process Muon
-
-# No QED radiation
-erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
-
-##################################################
-# select the analyses
-##################################################
-
-# D0 run II Z pT
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2010_S8671338
-# CDF Z+b jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_S6653332
-# CDF underlying event
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_NOTE_9351
-# D0 Run II
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2009_S8349509
-# D0 Run II
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7863608
-##################################################
-# Save run for later usage with 'Herwig++ run'
-##################################################
-cd /Herwig/Generators
-saverun TVT-Run-II-Powheg-Z-mu LHCGenerator
diff --git a/Tests/python/merge-LEP b/Tests/python/merge-LEP
new file mode 100755
--- /dev/null
+++ b/Tests/python/merge-LEP
@@ -0,0 +1,623 @@
+#! /usr/bin/env python
+import lighthisto
+import logging
+import sys
+
+if sys.version_info[:3] < (2,4,0):
+ print "rivet scripts require Python version >= 2.4.0... exiting"
+ sys.exit(1)
+
+import os, copy, re
+from math import sqrt
+
+## Try to load faster but non-standard cElementTree module
+try:
+ import xml.etree.cElementTree as ET
+except ImportError:
+ try:
+ import cElementTree as ET
+ except ImportError:
+ try:
+ import xml.etree.ElementTree as ET
+ except:
+ sys.stderr.write("Can't load the ElementTree XML parser: please install it!\n")
+ sys.exit(1)
+
+
+
+# #############################################
+
+def fillAbove(desthisto, sourcehistosbyptmin):
+ for i,b in enumerate(desthisto.getBins()):
+ ## Fill bins with pT-ordered histos (so that 'highest always wins')
+ for ptmin, h in sorted(sourcehistosbyptmin.iteritems()):
+ newb = h.getBin(i)
+ if newb.xlow <= float(ptmin) and newb.xhigh >=float(ptmin):
+ b.yval = newb.yval
+ b.yerrplus = newb.yerrplus
+ b.yerrminus = newb.yerrminus
+ b.focus= newb.focus
+
+def merge(hpath):
+ global inhistos
+ global outhistos
+ try:
+ fillAbove(outhistos[hpath], inhistos[hpath])
+ except:
+ pass
+
+def useOne(hpath, sqrts):
+ global inhistos
+ global outhistos
+ try:
+ outhistos[hpath] = inhistos[hpath][float(sqrts)]
+ except:
+ pass
+if __name__ == "__main__":
+ import logging
+ from optparse import OptionParser, OptionGroup
+ parser = OptionParser(usage="%prog name")
+ verbgroup = OptionGroup(parser, "Verbosity control")
+ verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
+ default=logging.INFO, help="print debug (very verbose) messages")
+ verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
+ default=logging.INFO, help="be very quiet")
+ parser.add_option_group(verbgroup)
+ (opts, args) = parser.parse_args()
+ logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
+
+
+ ## Prefix used in dat file headers
+ headerprefix = "# "
+
+
+ ## Check args
+ if len(args) < 1:
+ logging.error("Must specify at least the name of the files")
+ sys.exit(1)
+
+# #######################################
+
+aidafiles=["-133.aida","-177.aida","-196.aida","-206.aida","-91.aida" ,\
+ "-161.aida","-183.aida","-197.aida","-35.aida" ,"-172.aida",\
+ "-189.aida","-200.aida","-44.aida" ]
+
+## Get histos
+inhistos = {}
+outhistos={}
+weights = {}
+for f in aidafiles:
+ file = args[0]+f
+ if(file.find("35")>0) :
+ sqrts=35
+ elif(file.find("44")>0) :
+ sqrts=44
+ elif(file.find("91")>0) :
+ sqrts=91
+ elif(file.find("133")>0) :
+ sqrts=133
+ elif(file.find("161")>0) :
+ sqrts=161
+ elif(file.find("172")>0) :
+ sqrts=172
+ elif(file.find("177")>0) :
+ sqrts=177
+ elif(file.find("183")>0) :
+ sqrts=183
+ elif(file.find("189")>0) :
+ sqrts=189
+ elif(file.find("196")>0) :
+ sqrts=196
+ elif(file.find("197")>0) :
+ sqrts=197
+ elif(file.find("200")>0) :
+ sqrts=200
+ elif(file.find("206")>0) :
+ sqrts=206
+
+ if not os.access(file, os.R_OK):
+ logging.error("%s can not be read" % file)
+ break
+ try:
+ tree = ET.parse(file)
+ except:
+ logging.error("%s can not be parsed as XML" % file)
+ break
+ tree = ET.parse(file)
+ ## Get histos from this AIDA file
+ for dps in tree.findall("dataPointSet"):
+ h = lighthisto.Histo.fromDPS(dps)
+ # di-jet decorrelations
+ # jet shapes
+ if(h.fullPath().find("4300807")>0 or h.fullPath().find("6132243")>0 or h.fullPath().find("5765862")>0) :
+ if not inhistos.has_key(h.fullPath()):
+ inhistos[h.fullPath()] = {}
+ tmpE = inhistos[h.fullPath()]
+ if not tmpE.has_key(sqrts):
+ tmpE[sqrts] = h
+ else:
+ raise Exception("A set with sqrts = %s already exists" % ( sqrts))
+ elif(h.fullPath().find("4553896")>0 or h.fullPath().find("MULTIPLICITIES")>0 or
+ h.fullPath().find("2435284")>0 or h.fullPath().find("3486095")>0 or
+ h.fullPath().find("3430090")>0 or h.fullPath().find("3137023")>0 or
+ h.fullPath().find("3780481")>0 or h.fullPath().find("WUD_03_11")>0 or
+ h.fullPath().find("CONF-603")>0) :
+ outhistos[h.fullPath()] = h
+
+## Make empty output histos if needed
+for hpath,hsets in inhistos.iteritems():
+ if( h.fullPath().find("4300807")>0 or h.fullPath().find("6132243")>0 or h.fullPath().find("5765862")>0) :
+ workhisto = copy.deepcopy(hsets.values()[0])
+ outhistos[hpath] = workhisto
+ ## Empty the bin set for histos which we're going to merge
+ for b in outhistos[hpath]:
+ b.yval = 0
+ b.yerrplus = 0
+ b.yerrminus = 0
+ b.focus= None
+
+useOne("/JADE_OPAL_2000_S4300807/d07-x01-y01","35")
+useOne("/JADE_OPAL_2000_S4300807/d07-x01-y02","35")
+useOne("/JADE_OPAL_2000_S4300807/d07-x01-y03","35")
+useOne("/JADE_OPAL_2000_S4300807/d07-x01-y04","35")
+useOne("/JADE_OPAL_2000_S4300807/d07-x01-y05","35")
+useOne("/JADE_OPAL_2000_S4300807/d08-x01-y01","44")
+useOne("/JADE_OPAL_2000_S4300807/d08-x01-y02","44")
+useOne("/JADE_OPAL_2000_S4300807/d08-x01-y03","44")
+useOne("/JADE_OPAL_2000_S4300807/d08-x01-y04","44")
+useOne("/JADE_OPAL_2000_S4300807/d08-x01-y05","44")
+useOne("/JADE_OPAL_2000_S4300807/d09-x01-y01","91")
+useOne("/JADE_OPAL_2000_S4300807/d09-x01-y02","91")
+useOne("/JADE_OPAL_2000_S4300807/d09-x01-y03","91")
+useOne("/JADE_OPAL_2000_S4300807/d09-x01-y04","91")
+useOne("/JADE_OPAL_2000_S4300807/d09-x01-y05","91")
+useOne("/JADE_OPAL_2000_S4300807/d10-x01-y01","133")
+useOne("/JADE_OPAL_2000_S4300807/d10-x01-y02","133")
+useOne("/JADE_OPAL_2000_S4300807/d10-x01-y03","133")
+useOne("/JADE_OPAL_2000_S4300807/d10-x01-y04","133")
+useOne("/JADE_OPAL_2000_S4300807/d10-x01-y05","133")
+useOne("/JADE_OPAL_2000_S4300807/d11-x01-y01","161")
+useOne("/JADE_OPAL_2000_S4300807/d11-x01-y02","161")
+useOne("/JADE_OPAL_2000_S4300807/d11-x01-y03","161")
+useOne("/JADE_OPAL_2000_S4300807/d11-x01-y04","161")
+useOne("/JADE_OPAL_2000_S4300807/d11-x01-y05","161")
+useOne("/JADE_OPAL_2000_S4300807/d12-x01-y01","172")
+useOne("/JADE_OPAL_2000_S4300807/d12-x01-y02","172")
+useOne("/JADE_OPAL_2000_S4300807/d12-x01-y03","172")
+useOne("/JADE_OPAL_2000_S4300807/d12-x01-y04","172")
+useOne("/JADE_OPAL_2000_S4300807/d12-x01-y05","172")
+useOne("/JADE_OPAL_2000_S4300807/d13-x01-y01","183")
+useOne("/JADE_OPAL_2000_S4300807/d13-x01-y02","183")
+useOne("/JADE_OPAL_2000_S4300807/d13-x01-y03","183")
+useOne("/JADE_OPAL_2000_S4300807/d13-x01-y04","183")
+useOne("/JADE_OPAL_2000_S4300807/d13-x01-y05","183")
+useOne("/JADE_OPAL_2000_S4300807/d14-x01-y01","189")
+useOne("/JADE_OPAL_2000_S4300807/d14-x01-y02","189")
+useOne("/JADE_OPAL_2000_S4300807/d14-x01-y03","189")
+useOne("/JADE_OPAL_2000_S4300807/d14-x01-y04","189")
+useOne("/JADE_OPAL_2000_S4300807/d14-x01-y05","189")
+useOne("/JADE_OPAL_2000_S4300807/d16-x01-y01","35")
+useOne("/JADE_OPAL_2000_S4300807/d16-x01-y02","35")
+useOne("/JADE_OPAL_2000_S4300807/d16-x01-y03","35")
+useOne("/JADE_OPAL_2000_S4300807/d16-x01-y04","35")
+useOne("/JADE_OPAL_2000_S4300807/d16-x01-y05","35")
+useOne("/JADE_OPAL_2000_S4300807/d17-x01-y01","44")
+useOne("/JADE_OPAL_2000_S4300807/d17-x01-y02","44")
+useOne("/JADE_OPAL_2000_S4300807/d17-x01-y03","44")
+useOne("/JADE_OPAL_2000_S4300807/d17-x01-y04","44")
+useOne("/JADE_OPAL_2000_S4300807/d17-x01-y05","44")
+useOne("/JADE_OPAL_2000_S4300807/d18-x01-y01","91")
+useOne("/JADE_OPAL_2000_S4300807/d18-x01-y02","91")
+useOne("/JADE_OPAL_2000_S4300807/d18-x01-y03","91")
+useOne("/JADE_OPAL_2000_S4300807/d18-x01-y04","91")
+useOne("/JADE_OPAL_2000_S4300807/d18-x01-y05","91")
+useOne("/JADE_OPAL_2000_S4300807/d19-x01-y01","133")
+useOne("/JADE_OPAL_2000_S4300807/d19-x01-y02","133")
+useOne("/JADE_OPAL_2000_S4300807/d19-x01-y03","133")
+useOne("/JADE_OPAL_2000_S4300807/d19-x01-y04","133")
+useOne("/JADE_OPAL_2000_S4300807/d19-x01-y05","133")
+useOne("/JADE_OPAL_2000_S4300807/d20-x01-y01","161")
+useOne("/JADE_OPAL_2000_S4300807/d20-x01-y02","161")
+useOne("/JADE_OPAL_2000_S4300807/d20-x01-y03","161")
+useOne("/JADE_OPAL_2000_S4300807/d20-x01-y04","161")
+useOne("/JADE_OPAL_2000_S4300807/d20-x01-y05","161")
+useOne("/JADE_OPAL_2000_S4300807/d21-x01-y01","172")
+useOne("/JADE_OPAL_2000_S4300807/d21-x01-y02","172")
+useOne("/JADE_OPAL_2000_S4300807/d21-x01-y03","172")
+useOne("/JADE_OPAL_2000_S4300807/d21-x01-y04","172")
+useOne("/JADE_OPAL_2000_S4300807/d21-x01-y05","172")
+useOne("/JADE_OPAL_2000_S4300807/d22-x01-y01","183")
+useOne("/JADE_OPAL_2000_S4300807/d22-x01-y02","183")
+useOne("/JADE_OPAL_2000_S4300807/d22-x01-y03","183")
+useOne("/JADE_OPAL_2000_S4300807/d22-x01-y04","183")
+useOne("/JADE_OPAL_2000_S4300807/d22-x01-y05","183")
+useOne("/JADE_OPAL_2000_S4300807/d23-x01-y01","189")
+useOne("/JADE_OPAL_2000_S4300807/d23-x01-y02","189")
+useOne("/JADE_OPAL_2000_S4300807/d23-x01-y03","189")
+useOne("/JADE_OPAL_2000_S4300807/d23-x01-y04","189")
+useOne("/JADE_OPAL_2000_S4300807/d23-x01-y05","189")
+useOne("/JADE_OPAL_2000_S4300807/d24-x01-y01","35")
+useOne("/JADE_OPAL_2000_S4300807/d24-x01-y02","35")
+useOne("/JADE_OPAL_2000_S4300807/d24-x01-y03","35")
+useOne("/JADE_OPAL_2000_S4300807/d24-x01-y04","35")
+useOne("/JADE_OPAL_2000_S4300807/d25-x01-y01","44")
+useOne("/JADE_OPAL_2000_S4300807/d25-x01-y02","44")
+useOne("/JADE_OPAL_2000_S4300807/d25-x01-y03","44")
+useOne("/JADE_OPAL_2000_S4300807/d25-x01-y04","44")
+useOne("/JADE_OPAL_2000_S4300807/d26-x01-y01","91")
+useOne("/JADE_OPAL_2000_S4300807/d26-x01-y02","91")
+useOne("/JADE_OPAL_2000_S4300807/d26-x01-y03","91")
+useOne("/JADE_OPAL_2000_S4300807/d26-x01-y04","91")
+useOne("/JADE_OPAL_2000_S4300807/d27-x01-y01","133")
+useOne("/JADE_OPAL_2000_S4300807/d27-x01-y02","133")
+useOne("/JADE_OPAL_2000_S4300807/d27-x01-y03","133")
+useOne("/JADE_OPAL_2000_S4300807/d27-x01-y04","133")
+useOne("/JADE_OPAL_2000_S4300807/d28-x01-y01","161")
+useOne("/JADE_OPAL_2000_S4300807/d28-x01-y02","161")
+useOne("/JADE_OPAL_2000_S4300807/d28-x01-y03","161")
+useOne("/JADE_OPAL_2000_S4300807/d28-x01-y04","161")
+useOne("/JADE_OPAL_2000_S4300807/d29-x01-y01","172")
+useOne("/JADE_OPAL_2000_S4300807/d29-x01-y02","172")
+useOne("/JADE_OPAL_2000_S4300807/d29-x01-y03","172")
+useOne("/JADE_OPAL_2000_S4300807/d29-x01-y04","172")
+useOne("/JADE_OPAL_2000_S4300807/d30-x01-y01","183")
+useOne("/JADE_OPAL_2000_S4300807/d30-x01-y02","183")
+useOne("/JADE_OPAL_2000_S4300807/d30-x01-y03","183")
+useOne("/JADE_OPAL_2000_S4300807/d30-x01-y04","183")
+useOne("/JADE_OPAL_2000_S4300807/d31-x01-y01","189")
+useOne("/JADE_OPAL_2000_S4300807/d31-x01-y02","189")
+useOne("/JADE_OPAL_2000_S4300807/d31-x01-y03","189")
+useOne("/JADE_OPAL_2000_S4300807/d31-x01-y04","189")
+
+useOne("/OPAL_2004_S6132243/d01-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d01-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d01-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d01-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d02-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d02-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d02-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d02-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d03-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d03-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d03-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d03-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d04-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d04-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d04-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d04-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d05-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d05-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d05-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d05-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d06-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d06-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d06-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d06-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d07-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d07-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d07-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d07-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d08-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d08-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d08-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d08-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d09-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d09-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d09-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d09-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d10-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d10-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d10-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d10-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d11-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d11-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d11-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d11-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d12-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d12-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d12-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d12-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d13-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d13-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d13-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d13-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d14-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d14-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d14-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d14-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d15-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d15-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d15-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d15-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d16-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d16-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d16-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d16-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d17-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d17-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d17-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d17-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d18-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d18-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d18-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d18-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d19-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d19-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d19-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d19-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d20-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d20-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d20-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d20-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d21-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d21-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d21-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d21-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d22-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d22-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d22-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d22-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d23-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d23-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d23-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d23-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d24-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d24-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d24-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d24-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d25-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d25-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d25-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d25-x01-y04","197")
+useOne("/OPAL_2004_S6132243/d26-x01-y01","91")
+useOne("/OPAL_2004_S6132243/d26-x01-y02","133")
+useOne("/OPAL_2004_S6132243/d26-x01-y03","177")
+useOne("/OPAL_2004_S6132243/d26-x01-y04","197")
+
+merge("/ALEPH_2004_S5765862/d01-x01-y01")
+useOne("/ALEPH_2004_S5765862/d02-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d03-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d04-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d05-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d06-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d07-x01-y01","196")
+useOne("/ALEPH_2004_S5765862/d08-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d09-x01-y01","206")
+
+useOne("/ALEPH_2004_S5765862/d11-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d12-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d13-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d14-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d15-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d16-x01-y01","196")
+useOne("/ALEPH_2004_S5765862/d17-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d18-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d19-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d20-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d21-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d22-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d23-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d24-x01-y01","196")
+useOne("/ALEPH_2004_S5765862/d25-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d26-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d27-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d28-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d29-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d30-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d31-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d32-x01-y01","196")
+useOne("/ALEPH_2004_S5765862/d33-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d34-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d35-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d36-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d37-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d38-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d39-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d40-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d41-x01-y01","196")
+useOne("/ALEPH_2004_S5765862/d42-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d43-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d44-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d45-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d46-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d47-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d48-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d49-x01-y01","196")
+useOne("/ALEPH_2004_S5765862/d50-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d51-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d54-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d55-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d56-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d57-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d58-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d59-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d60-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d61-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d62-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d63-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d64-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d65-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d66-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d67-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d68-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d69-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d70-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d71-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d72-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d73-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d74-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d75-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d76-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d77-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d78-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d79-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d80-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d81-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d82-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d83-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d84-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d85-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d86-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d87-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d88-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d89-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d90-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d91-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d92-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d93-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d94-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d95-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d96-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d97-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d98-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d99-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d100-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d101-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d102-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d103-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d104-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d105-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d106-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d107-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d108-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d109-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d110-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d111-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d112-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d113-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d114-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d115-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d116-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d117-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d118-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d119-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d120-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d121-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d122-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d123-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d124-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d125-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d126-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d127-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d128-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d129-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d130-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d131-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d132-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d133-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d134-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d135-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d136-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d137-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d138-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d139-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d140-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d141-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d142-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d143-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d144-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d145-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d146-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d147-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d148-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d149-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d150-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d151-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d152-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d153-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d154-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d155-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d156-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d157-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d158-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d159-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d160-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d161-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d162-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d163-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d164-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d165-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d166-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d167-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d168-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d169-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d170-x01-y01","189")
+
+useOne("/ALEPH_2004_S5765862/d172-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d173-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d174-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d175-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d176-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d177-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d178-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d179-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d180-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d181-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d182-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d183-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d184-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d185-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d186-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d187-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d188-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d189-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d190-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d191-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d192-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d193-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d194-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d195-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d196-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d197-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d198-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d199-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d200-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d201-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d202-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d203-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d204-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d205-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d206-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d207-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d208-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d209-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d210-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d211-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d212-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d213-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d214-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d215-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d216-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d217-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d218-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d219-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d220-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d221-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d222-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d223-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d224-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d225-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d226-x01-y01","206")
+useOne("/ALEPH_2004_S5765862/d227-x01-y01","91")
+useOne("/ALEPH_2004_S5765862/d228-x01-y01","133")
+useOne("/ALEPH_2004_S5765862/d229-x01-y01","161")
+useOne("/ALEPH_2004_S5765862/d230-x01-y01","172")
+useOne("/ALEPH_2004_S5765862/d231-x01-y01","183")
+useOne("/ALEPH_2004_S5765862/d232-x01-y01","189")
+useOne("/ALEPH_2004_S5765862/d233-x01-y01","200")
+useOne("/ALEPH_2004_S5765862/d234-x01-y01","206")
+
+# Choose output file
+name = args[0]+".aida"
+out = open(name, "w")
+## Write out merged histos
+out.write('<?xml version="1.0" encoding="ISO-8859-1" ?>\n')
+out.write('<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">\n')
+out.write('<aida version="3.3">\n')
+out.write(' <implementation version="1.1" package="FreeHEP"/>\n')
+for hpath, h in sorted(outhistos.iteritems()):
+ logging.debug("hpath = %s" % hpath)
+ out.write(h.asAIDA() + "\n\n")
+out.write('</aida>\n')
+
+sys.exit(0)
diff --git a/Tests/python/merge-TVT-Jets b/Tests/python/merge-TVT-Jets
new file mode 100644
--- /dev/null
+++ b/Tests/python/merge-TVT-Jets
@@ -0,0 +1,484 @@
+#! /usr/bin/env python
+import lighthisto
+import logging
+import sys
+
+if sys.version_info[:3] < (2,4,0):
+ print "rivet scripts require Python version >= 2.4.0... exiting"
+ sys.exit(1)
+
+import os, copy, re
+from math import sqrt
+
+## Try to load faster but non-standard cElementTree module
+try:
+ import xml.etree.cElementTree as ET
+except ImportError:
+ try:
+ import cElementTree as ET
+ except ImportError:
+ try:
+ import xml.etree.ElementTree as ET
+ except:
+ sys.stderr.write("Can't load the ElementTree XML parser: please install it!\n")
+ sys.exit(1)
+
+# #############################################
+
+def fillAbove(desthisto, sourcehistosbyptmin):
+ for i,b in enumerate(desthisto.getBins()):
+ ## Fill bins with pT-ordered histos (so that 'highest always wins')
+ for ptmin, h in sorted(sourcehistosbyptmin.iteritems()):
+ newb = h.getBin(i)
+ if newb.xlow >= ptmin:
+ b.yval = newb.yval
+ b.yerrplus = newb.yerrplus
+ b.yerrminus = newb.yerrminus
+ b.focus= newb.focus
+
+def mergeByPt(hpath, sqrts):
+ global inhistos
+ global outhistos
+ try:
+ fillAbove(outhistos[hpath], inhistos[hpath][float(sqrts)])
+ except:
+ pass
+
+def useOnePt(hpath, sqrts, ptmin):
+ global inhistos
+ global outhistos
+ try:
+ ## Find best pT_min match
+ ptmins = inhistos[hpath][float(sqrts)].keys()
+ closest_ptmin = None
+ for ptm in ptmins:
+ if closest_ptmin is None or \
+ abs(ptm-float(ptmin)) < abs(closest_ptmin-float(ptmin)):
+ closest_ptmin = ptm
+ if closest_ptmin != float(ptmin):
+ logging.warning("Inexact match for requested pTmin=%s: " % ptmin + \
+ "using pTmin=%e instead" % closest_ptmin)
+ outhistos[hpath] = inhistos[hpath][float(sqrts)][closest_ptmin]
+ except:
+ pass
+
+# #######################################
+
+if __name__ == "__main__":
+ import logging
+ from optparse import OptionParser, OptionGroup
+ parser = OptionParser(usage="%prog name")
+ verbgroup = OptionGroup(parser, "Verbosity control")
+ verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
+ default=logging.INFO, help="print debug (very verbose) messages")
+ verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
+ default=logging.INFO, help="be very quiet")
+ parser.add_option_group(verbgroup)
+ (opts, args) = parser.parse_args()
+ logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
+
+
+ ## Prefix used in dat file headers
+ headerprefix = "# "
+
+
+ ## Check args
+ if len(args) < 1:
+ logging.error("Must specify at least the name of the files")
+ sys.exit(1)
+
+aidafiles=["-Run-II-UE.aida" ,"-Run-II-Jets-1.aida","-Run-II-Jets-2.aida",\
+ "-Run-II-Jets-3.aida","-Run-II-Jets-4.aida","-Run-II-Jets-5.aida",\
+ "-Run-II-Jets-6.aida","-Run-II-Jets-7.aida",\
+ "-Run-I-UE.aida" ,"-Run-I-Jets-1.aida","-Run-I-Jets-2.aida",\
+ "-Run-I-Jets-3.aida","-Run-I-Jets-4.aida","-Run-I-Jets-5.aida",\
+ "-630-UE.aida" ,"-630-Jets-1.aida" ,"-630-Jets-2.aida" ,\
+ "-630-Jets-3.aida"]
+
+## Get histos
+inhistos = {}
+outhistos={}
+weights = {}
+for f in aidafiles:
+ file=args[0]+f
+ if(file.find("Run-II-UE")>0) :
+ sqrts=1960
+ ptmin=0.
+ elif(file.find("Run-II-Jets-1")>0) :
+ sqrts=1960
+ ptmin=37.
+ elif(file.find("Run-II-Jets-2")>0) :
+ sqrts=1960
+ ptmin=55.
+ elif(file.find("Run-II-Jets-3")>0) :
+ sqrts=1960
+ ptmin=75.
+ elif(file.find("Run-II-Jets-4")>0) :
+ sqrts=1960
+ ptmin=100.
+ elif(file.find("Run-II-Jets-5")>0) :
+ sqrts=1960
+ ptmin=125.
+ elif(file.find("Run-II-Jets-6")>0) :
+ ptmin=175.
+ sqrts=1960
+ elif(file.find("Run-II-Jets-7")>0) :
+ sqrts=1960
+ ptmin=265.
+ elif(file.find("630-UE")>0) :
+ sqrts=630
+ ptmin=0.
+ elif(file.find("630-Jets-1")>0) :
+ sqrts=630
+ ptmin=30.
+ elif(file.find("630-Jets-2")>0) :
+ sqrts=630
+ ptmin=55.
+ elif(file.find("630-Jets-3")>0) :
+ sqrts=630
+ ptmin=90.
+ elif(file.find("Run-I-UE")>0) :
+ sqrts=1800
+ ptmin=0.
+ elif(file.find("Run-I-Jets-1")>0) :
+ sqrts=1800
+ ptmin=30.
+ elif(file.find("Run-I-Jets-2")>0) :
+ sqrts=1800
+ ptmin=55.
+ elif(file.find("Run-I-Jets-3")>0) :
+ sqrts=1800
+ ptmin=80.
+ elif(file.find("Run-I-Jets-4")>0) :
+ sqrts=1800
+ ptmin=105.
+ elif(file.find("Run-I-Jets-5")>0) :
+ sqrts=1800
+ ptmin=175.
+
+ if not os.access(file, os.R_OK):
+ logging.error("%s can not be read" % file)
+ break
+ try:
+ tree = ET.parse(file)
+ except:
+ logging.error("%s can not be parsed as XML" % file)
+ break
+ tree = ET.parse(file)
+ ## Get histos from this AIDA file
+ for dps in tree.findall("dataPointSet"):
+ h = lighthisto.Histo.fromDPS(dps)
+ # di-jet decorrelations
+ # jet shapes
+ if(h.fullPath().find("5992206")>0 or h.fullPath().find("6217184")>0 or
+ h.fullPath().find("LEADINGJETS")>0 or h.fullPath().find("7662670")>0 or
+ h.fullPath().find("7057202")>0 or h.fullPath().find("6450792")>0 or
+ h.fullPath().find("7828950")>0 or h.fullPath().find("4751469")>0 or
+ h.fullPath().find("5839831")>0 or h.fullPath().find("4563131")>0 or
+ h.fullPath().find("4517016")>0 or h.fullPath().find("3618439")>0) :
+ if not inhistos.has_key(h.fullPath()):
+ inhistos[h.fullPath()] = {}
+ tmpE = inhistos[h.fullPath()]
+ if not tmpE.has_key(sqrts):
+ tmpE[sqrts] = {}
+ tmpP = tmpE[sqrts]
+ if not tmpP.has_key(ptmin):
+ tmpP[ptmin] = h
+ else:
+ raise Exception("A set with ptmin = %s already exists" % ( ptmin))
+ elif(h.fullPath().find("8233977")>0 or h.fullPath().find("NOTE_9936")>0 or
+ h.fullPath().find("3905616")>0 or h.fullPath().find("3324664")>0 or
+ h.fullPath().find("4796047")>0 or h.fullPath().find("1865951")>0 or
+ h.fullPath().find("2089246")>0 or h.fullPath().find("3108457")>0 or
+ h.fullPath().find("3349578")>0 or h.fullPath().find("3541940")>0 or
+ h.fullPath().find("3214044")>0 or h.fullPath().find("2952106")>0 ) :
+ outhistos[h.fullPath()] = h
+
+aidafiles=["-Run-II-Jets-8.aida","-Run-II-Jets-9.aida","-Run-II-Jets-10.aida",\
+ "-Run-I-Jets-6.aida","-Run-I-Jets-7.aida","-Run-I-Jets-8.aida"]
+
+for f in aidafiles:
+ file=args[0]+f
+ if(file.find("Run-II-Jets-8")>0) :
+ sqrts=1960
+ ptmin=0.150
+ elif(file.find("Run-II-Jets-9")>0) :
+ sqrts=1960
+ ptmin=0.600
+ elif(file.find("Run-II-Jets-10")>0) :
+ sqrts=1960
+ ptmin=1.000
+ elif(file.find("Run-I-Jets-6")>0) :
+ sqrts=1800
+ ptmin=0.150
+ elif(file.find("Run-I-Jets-7")>0) :
+ sqrts=1800
+ ptmin=0.5
+ elif(file.find("Run-I-Jets-8")>0) :
+ sqrts=1800
+ ptmin=0.8
+ if not os.access(file, os.R_OK):
+ logging.error("%s can not be read" % file)
+ break
+ try:
+ tree = ET.parse(file)
+ except:
+ logging.error("%s can not be parsed as XML" % file)
+ break
+ tree = ET.parse(file)
+ ## Get histos from this AIDA file
+ for dps in tree.findall("dataPointSet"):
+ h = lighthisto.Histo.fromDPS(dps)
+ if(h.fullPath().find("8566488")>0 or h.fullPath().find("8320160")>0) :
+ if not inhistos.has_key(h.fullPath()):
+ inhistos[h.fullPath()] = {}
+ tmpE = inhistos[h.fullPath()]
+ if not tmpE.has_key(sqrts):
+ tmpE[sqrts] = {}
+ tmpP = tmpE[sqrts]
+ if not tmpP.has_key(ptmin):
+ tmpP[ptmin] = h
+ else:
+ raise Exception("A set with ptmin = %s already exists" % ( ptmin))
+ elif(h.fullPath().find("8093652")>0 or h.fullPath().find("3418421")>0 or
+ h.fullPath().find("4266730")>0) :
+ if not inhistos.has_key(h.fullPath()):
+ inhistos[h.fullPath()] = {}
+ tmpE = inhistos[h.fullPath()]
+ if not tmpE.has_key(sqrts):
+ tmpE[sqrts] = {}
+ tmpP = tmpE[sqrts]
+ if not tmpP.has_key(1000.*ptmin):
+ tmpP[1000.*ptmin] = h
+ else:
+ raise Exception("A set with ptmin = %s already exists" % ( 1000.*ptmin))
+
+## Make empty output histos if needed
+for hpath,hsets in inhistos.iteritems():
+ if( (hpath.find("6217184")>0 and hpath.find("d13-x01-y01")>0 ) or
+ hpath.find("LEADINGJETS")>0 or hpath.find("7662670")>0 or
+ hpath.find("7057202")>0 or hpath.find("6450792")>0 or
+ hpath.find("7828950")>0 or hpath.find("8566488")>0 or
+ hpath.find("8320160")>0 or hpath.find("8093652")>0 or
+ hpath.find("4751469")>0 or hpath.find("5839831")>0 or
+ hpath.find("4563131")>0 or hpath.find("4517016")>0 or
+ hpath.find("3618439")>0 or hpath.find("4266730")>0 or
+ hpath.find("3418421")>0 ) :
+ workhisto = copy.deepcopy(hsets.values()[0].values()[0])
+ outhistos[hpath] = workhisto
+ ## Empty the bin set for histos which we're going to merge
+ for b in outhistos[hpath]:
+ b.yval = 0
+ b.yerrplus = 0
+ b.yerrminus = 0
+ b.focus= None
+
+
+## Field analysis
+logging.info("Processing CDF_2001_S4751469")
+## Angular distributions in different pT bins
+useOnePt("/CDF_2001_S4751469/d01-x01-y01", "1800", "0")
+useOnePt("/CDF_2001_S4751469/d01-x01-y02", "1800", "0")
+useOnePt("/CDF_2001_S4751469/d01-x01-y03", "1800", "30")
+useOnePt("/CDF_2001_S4751469/d02-x01-y01", "1800", "0")
+useOnePt("/CDF_2001_S4751469/d02-x01-y02", "1800", "0")
+useOnePt("/CDF_2001_S4751469/d02-x01-y03", "1800", "30")
+## Number, profile in pT_lead (True?)
+useOnePt("/CDF_2001_S4751469/d03-x01-y01", "1800", "0")
+useOnePt("/CDF_2001_S4751469/d03-x01-y02", "1800", "0")
+useOnePt("/CDF_2001_S4751469/d03-x01-y03", "1800", "0")
+mergeByPt("/CDF_2001_S4751469/d04-x01-y01", "1800")
+mergeByPt("/CDF_2001_S4751469/d04-x01-y02", "1800")
+mergeByPt("/CDF_2001_S4751469/d04-x01-y03", "1800")
+## pT sums, profile in pT_lead (True?)
+useOnePt("/CDF_2001_S4751469/d05-x01-y01", "1800", "0")
+useOnePt("/CDF_2001_S4751469/d05-x01-y02", "1800", "0")
+useOnePt("/CDF_2001_S4751469/d05-x01-y03", "1800", "0")
+mergeByPt("/CDF_2001_S4751469/d06-x01-y01", "1800")
+mergeByPt("/CDF_2001_S4751469/d06-x01-y02", "1800")
+mergeByPt("/CDF_2001_S4751469/d06-x01-y03", "1800")
+## pT distributions (use a specific pT cut run?)
+useOnePt("/CDF_2001_S4751469/d07-x01-y01", "1800", "0")
+useOnePt("/CDF_2001_S4751469/d07-x01-y02", "1800", "0")
+useOnePt("/CDF_2001_S4751469/d07-x01-y03", "1800", "30")
+
+## Acosta analysis
+logging.info("Processing CDF_2004_S5839831")
+## Mean pT, profile in ET_lead
+mergeByPt("/CDF_2004_S5839831/d01-x01-y01", "1800")
+mergeByPt("/CDF_2004_S5839831/d01-x01-y02", "1800")
+## pT_max,min, profiles in ET_lead
+mergeByPt("/CDF_2004_S5839831/d02-x01-y01", "1800")
+mergeByPt("/CDF_2004_S5839831/d02-x01-y02", "1800")
+mergeByPt("/CDF_2004_S5839831/d02-x01-y03", "1800")
+## pT distributions (want to use a specific pT cut run)
+useOnePt("/CDF_2004_S5839831/d03-x01-y01", "1800", "30")
+useOnePt("/CDF_2004_S5839831/d03-x01-y02", "1800", "80")
+useOnePt("/CDF_2004_S5839831/d03-x01-y03", "1800", "105")
+useOnePt("/CDF_2004_S5839831/d03-x01-y04", "1800", "105")
+useOnePt("/CDF_2004_S5839831/d03-x01-y05", "1800", "175")
+## N_max,min, profiles in ET_lead
+mergeByPt("/CDF_2004_S5839831/d04-x01-y01", "1800")
+mergeByPt("/CDF_2004_S5839831/d04-x01-y02", "1800")
+## Min bias dbs (want to use min bias pT cut)
+useOnePt("/CDF_2004_S5839831/d05-x01-y01", "1800", "0")
+useOnePt("/CDF_2004_S5839831/d06-x01-y01", "1800", "0")
+## Swiss Cheese, profile in ET_lead
+mergeByPt("/CDF_2004_S5839831/d07-x01-y01", "1800")
+mergeByPt("/CDF_2004_S5839831/d07-x01-y02", "1800")
+## pT_max,min, profiles in ET_lead
+mergeByPt("/CDF_2004_S5839831/d08-x01-y01", "630")
+mergeByPt("/CDF_2004_S5839831/d08-x01-y02", "630")
+mergeByPt("/CDF_2004_S5839831/d08-x01-y03", "630")
+## Swiss Cheese, profile in ET_lead
+mergeByPt("/CDF_2004_S5839831/d09-x01-y01", "630")
+mergeByPt("/CDF_2004_S5839831/d09-x01-y02", "630")
+## Min bias dbs (want to use min bias pT cut)
+useOnePt("/CDF_2004_S5839831/d10-x01-y01", "630", "0")
+useOnePt("/CDF_2004_S5839831/d11-x01-y01", "630", "0")
+
+## CDF jet shape analysis
+logging.info("Processing CDF_2005_S6217184")
+useOnePt("/CDF_2005_S6217184/d01-x01-y01", "1960", "37" )
+useOnePt("/CDF_2005_S6217184/d01-x01-y02", "1960", "37" )
+useOnePt("/CDF_2005_S6217184/d01-x01-y03", "1960", "55" )
+useOnePt("/CDF_2005_S6217184/d02-x01-y01", "1960", "55" )
+useOnePt("/CDF_2005_S6217184/d02-x01-y02", "1960", "55" )
+useOnePt("/CDF_2005_S6217184/d02-x01-y03", "1960", "75" )
+useOnePt("/CDF_2005_S6217184/d03-x01-y01", "1960", "75" )
+useOnePt("/CDF_2005_S6217184/d03-x01-y02", "1960", "100")
+useOnePt("/CDF_2005_S6217184/d03-x01-y03", "1960", "100")
+useOnePt("/CDF_2005_S6217184/d04-x01-y01", "1960", "125")
+useOnePt("/CDF_2005_S6217184/d04-x01-y02", "1960", "125")
+useOnePt("/CDF_2005_S6217184/d04-x01-y03", "1960", "175")
+useOnePt("/CDF_2005_S6217184/d05-x01-y01", "1960", "175")
+useOnePt("/CDF_2005_S6217184/d05-x01-y02", "1960", "175")
+useOnePt("/CDF_2005_S6217184/d05-x01-y03", "1960", "175")
+useOnePt("/CDF_2005_S6217184/d06-x01-y01", "1960", "265")
+useOnePt("/CDF_2005_S6217184/d06-x01-y02", "1960", "265")
+useOnePt("/CDF_2005_S6217184/d06-x01-y03", "1960", "265")
+useOnePt("/CDF_2005_S6217184/d07-x01-y01", "1960", "37" )
+useOnePt("/CDF_2005_S6217184/d07-x01-y02", "1960", "37" )
+useOnePt("/CDF_2005_S6217184/d07-x01-y03", "1960", "55" )
+useOnePt("/CDF_2005_S6217184/d08-x01-y01", "1960", "55" )
+useOnePt("/CDF_2005_S6217184/d08-x01-y02", "1960", "55" )
+useOnePt("/CDF_2005_S6217184/d08-x01-y03", "1960", "75" )
+useOnePt("/CDF_2005_S6217184/d09-x01-y01", "1960", "75" )
+useOnePt("/CDF_2005_S6217184/d09-x01-y02", "1960", "100")
+useOnePt("/CDF_2005_S6217184/d09-x01-y03", "1960", "100")
+useOnePt("/CDF_2005_S6217184/d10-x01-y01", "1960", "125")
+useOnePt("/CDF_2005_S6217184/d10-x01-y02", "1960", "125")
+useOnePt("/CDF_2005_S6217184/d10-x01-y03", "1960", "175")
+useOnePt("/CDF_2005_S6217184/d11-x01-y01", "1960", "175")
+useOnePt("/CDF_2005_S6217184/d11-x01-y02", "1960", "175")
+useOnePt("/CDF_2005_S6217184/d11-x01-y03", "1960", "175")
+useOnePt("/CDF_2005_S6217184/d12-x01-y01", "1960", "265")
+useOnePt("/CDF_2005_S6217184/d12-x01-y02", "1960", "265")
+useOnePt("/CDF_2005_S6217184/d12-x01-y03", "1960", "265")
+mergeByPt("/CDF_2005_S6217184/d13-x01-y01", "1960")
+
+# ## CDF dijet mass spectrum
+mergeByPt("/CDF_2008_S8093652/d01-x01-y01", "1960")
+
+## Rick Field Run-II Leading Jets analysis
+logging.info("Processing CDF_2008_LEADINGJETS")
+## charged particle density
+mergeByPt("/CDF_2008_LEADINGJETS/d01-x01-y01", "1960")
+mergeByPt("/CDF_2008_LEADINGJETS/d02-x01-y01", "1960")
+mergeByPt("/CDF_2008_LEADINGJETS/d03-x01-y01", "1960")
+mergeByPt("/CDF_2008_LEADINGJETS/d04-x01-y01", "1960")
+## pT sum density
+mergeByPt("/CDF_2008_LEADINGJETS/d05-x01-y01", "1960")
+mergeByPt("/CDF_2008_LEADINGJETS/d06-x01-y01", "1960")
+mergeByPt("/CDF_2008_LEADINGJETS/d07-x01-y01", "1960")
+mergeByPt("/CDF_2008_LEADINGJETS/d08-x01-y01", "1960")
+## mean pT
+mergeByPt("/CDF_2008_LEADINGJETS/d09-x01-y01", "1960")
+
+## D0 dijet correlation analysis
+logging.info("Processing D0_2004_S5992206")
+useOnePt("/D0_2004_S5992206/d01-x02-y01", "1960", "75")
+useOnePt("/D0_2004_S5992206/d02-x02-y01", "1960", "100")
+useOnePt("/D0_2004_S5992206/d03-x02-y01", "1960", "125")
+useOnePt("/D0_2004_S5992206/d04-x02-y01", "1960", "175")
+
+## D0 incl jet cross-section analysis
+logging.info("Processing D0_2008_S7662670")
+mergeByPt("/D0_2008_S7662670/d01-x01-y01", "1960")
+mergeByPt("/D0_2008_S7662670/d02-x01-y01", "1960")
+mergeByPt("/D0_2008_S7662670/d03-x01-y01", "1960")
+mergeByPt("/D0_2008_S7662670/d04-x01-y01", "1960")
+mergeByPt("/D0_2008_S7662670/d05-x01-y01", "1960")
+mergeByPt("/D0_2008_S7662670/d06-x01-y01", "1960")
+
+mergeByPt("/D0_2010_S8566488/d01-x01-y01", "1960")
+mergeByPt("/D0_2010_S8566488/d02-x01-y01", "1960")
+mergeByPt("/D0_2010_S8566488/d03-x01-y01", "1960")
+mergeByPt("/D0_2010_S8566488/d04-x01-y01", "1960")
+mergeByPt("/D0_2010_S8566488/d05-x01-y01", "1960")
+mergeByPt("/D0_2010_S8566488/d06-x01-y01", "1960")
+
+# CDF jet cross section
+
+mergeByPt("/CDF_2001_S4563131/d01-x01-y01", "1800")
+
+mergeByPt("/CDF_2001_S4517016/d01-x01-y01", "1800")
+mergeByPt("/CDF_2001_S4517016/d02-x01-y01", "1800")
+mergeByPt("/CDF_2001_S4517016/d03-x01-y01", "1800")
+mergeByPt("/CDF_2001_S4517016/d04-x01-y01", "1800")
+
+
+useOnePt("/CDF_1998_S3618439/d01-x01-y01", "1800","105")
+useOnePt("/CDF_1998_S3618439/d01-x01-y02", "1800","105")
+
+mergeByPt("/CDF_2008_S7828950/d01-x01-y01", "1960")
+mergeByPt("/CDF_2008_S7828950/d02-x01-y01", "1960")
+mergeByPt("/CDF_2008_S7828950/d03-x01-y01", "1960")
+mergeByPt("/CDF_2008_S7828950/d04-x01-y01", "1960")
+mergeByPt("/CDF_2008_S7828950/d05-x01-y01", "1960")
+
+mergeByPt("/CDF_2007_S7057202/d01-x01-y01", "1960")
+mergeByPt("/CDF_2007_S7057202/d02-x01-y01", "1960")
+mergeByPt("/CDF_2007_S7057202/d03-x01-y01", "1960")
+mergeByPt("/CDF_2007_S7057202/d04-x01-y01", "1960")
+mergeByPt("/CDF_2007_S7057202/d05-x01-y01", "1960")
+mergeByPt("/CDF_2007_S7057202/d06-x01-y01", "1960")
+mergeByPt("/CDF_2007_S7057202/d07-x01-y01", "1960")
+
+mergeByPt("/CDF_2006_S6450792/d01-x01-y01", "1960")
+
+mergeByPt("/CDF_2000_S4266730/d01-x01-y01", "1800")
+
+
+useOnePt("/CDF_1996_S3418421/d01-x01-y01","1800","150")
+useOnePt("/CDF_1996_S3418421/d01-x01-y02","1800","150")
+useOnePt("/CDF_1996_S3418421/d01-x01-y03","1800","150")
+useOnePt("/CDF_1996_S3418421/d01-x01-y04","1800","500")
+useOnePt("/CDF_1996_S3418421/d01-x01-y05","1800","500")
+mergeByPt("/CDF_1996_S3418421/d02-x01-y01","1800")
+
+useOnePt("/D0_2009_S8320160/d01-x01-y01", "1960", "0.15" )
+useOnePt("/D0_2009_S8320160/d02-x01-y01", "1960", "0.15" )
+useOnePt("/D0_2009_S8320160/d03-x01-y01", "1960", "0.15" )
+useOnePt("/D0_2009_S8320160/d04-x01-y01", "1960", "0.15" )
+useOnePt("/D0_2009_S8320160/d05-x01-y01", "1960", "0.6" )
+useOnePt("/D0_2009_S8320160/d06-x01-y01", "1960", "0.6" )
+useOnePt("/D0_2009_S8320160/d07-x01-y01", "1960", "0.6" )
+useOnePt("/D0_2009_S8320160/d08-x01-y01", "1960", "0.6" )
+useOnePt("/D0_2009_S8320160/d09-x01-y01", "1960", "1.0" )
+useOnePt("/D0_2009_S8320160/d10-x01-y01", "1960", "1.0" )
+
+# Choose output file
+name = args[0]+"-Jets.aida"
+out = open(name, "w")
+## Write out merged histos
+out.write('<?xml version="1.0" encoding="ISO-8859-1" ?>\n')
+out.write('<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">\n')
+out.write('<aida version="3.3">\n')
+out.write(' <implementation version="1.1" package="FreeHEP"/>\n')
+for hpath, h in sorted(outhistos.iteritems()):
+ logging.debug("hpath = %s" % hpath)
+ out.write(h.asAIDA() + "\n\n")
+out.write('</aida>\n')
+
+sys.exit(0)
diff --git a/Tests/python/merge-aida b/Tests/python/merge-aida
new file mode 100755
--- /dev/null
+++ b/Tests/python/merge-aida
@@ -0,0 +1,101 @@
+#! /usr/bin/env python
+import lighthisto
+import logging
+import sys
+import os, copy, re
+
+"""%prog
+
+Script for merging aida files
+
+"""
+
+import sys
+if sys.version_info[:3] < (2,4,0):
+ print "rivet scripts require Python version >= 2.4.0... exiting"
+ sys.exit(1)
+
+## Try to load faster but non-standard cElementTree module
+try:
+ import xml.etree.cElementTree as ET
+except ImportError:
+ try:
+ import cElementTree as ET
+ except ImportError:
+ try:
+ import xml.etree.ElementTree as ET
+ except:
+ sys.stderr.write("Can't load the ElementTree XML parser: please install it!\n")
+ sys.exit(1)
+
+if __name__ == "__main__":
+ import logging
+ from optparse import OptionParser, OptionGroup
+ parser = OptionParser(usage="%prog aidafile aidafile2 [...]")
+ parser.add_option("-o", "--out", dest="OUTFILE", default="-")
+ parser.add_option("--append", dest="APPEND_OUTPUT", action="store_true", default=False)
+ verbgroup = OptionGroup(parser, "Verbosity control")
+ verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
+ default=logging.INFO, help="print debug (very verbose) messages")
+ verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
+ default=logging.INFO, help="be very quiet")
+ parser.add_option_group(verbgroup)
+ (opts, args) = parser.parse_args()
+ logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
+
+ ## Prefix used in dat file headers
+ headerprefix = "# "
+
+ ## Check args
+ if len(args) < 1:
+ logging.error("Must specify at least one AIDA histogram file")
+ sys.exit(1)
+
+ ## Get histos
+ outhistos={}
+ for file in args:
+ if not os.access(file, os.R_OK):
+ logging.error("%s can not be read" % file)
+ break
+ try:
+ tree = ET.parse(file)
+ except:
+ logging.error("%s can not be parsed as XML" % file)
+ break
+ tree = ET.parse(file)
+ ## Get histos from this AIDA file
+ for dps in tree.findall("dataPointSet"):
+ h = lighthisto.Histo.fromDPS(dps)
+ outhistos[h.fullPath()] = h
+
+ ## Choose output file
+ out = None
+ if opts.OUTFILE == "-":
+ out = sys.stdout
+ else:
+ if opts.APPEND_OUTPUT:
+ out = open(opts.OUTFILE, "a")
+ else:
+ out = open(opts.OUTFILE, "w")
+
+
+ # Choose output file
+ out = None
+ if opts.OUTFILE == "-":
+ out = sys.stdout
+ else:
+ if opts.APPEND_OUTPUT:
+ out = open(opts.OUTFILE, "a")
+ else:
+ out = open(opts.OUTFILE, "w")
+ ## Write out merged histos
+ out.write('<?xml version="1.0" encoding="ISO-8859-1" ?>\n')
+ out.write('<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">\n')
+ out.write('<aida version="3.3">\n')
+ out.write(' <implementation version="1.1" package="FreeHEP"/>\n')
+ for hpath, h in sorted(outhistos.iteritems()):
+ logging.debug("hpath = %s" % hpath)
+ out.write(h.asAIDA() + "\n\n")
+ out.write('</aida>\n')
+
+ sys.exit(0)
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Thu, Apr 24, 6:38 AM (1 d, 21 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4887795
Default Alt Text
(153 KB)
Attached To
rHERWIGHG herwighg
Event Timeline
Log In to Comment