diff --git a/Tests/Makefile.am b/Tests/Makefile.am
--- a/Tests/Makefile.am
+++ b/Tests/Makefile.am
@@ -1,397 +1,398 @@
 AM_LDFLAGS += -module -avoid-version -rpath /dummy/path/not/used
 
 EXTRA_DIST = Inputs python Rivet 
 
 EXTRA_LTLIBRARIES = LeptonTest.la GammaTest.la HadronTest.la DISTest.la
 
 if WANT_LIBFASTJET
 EXTRA_LTLIBRARIES += HadronJetTest.la LeptonJetTest.la
 HadronJetTest_la_SOURCES = \
 Hadron/VHTest.h Hadron/VHTest.cc\
 Hadron/VTest.h Hadron/VTest.cc\
 Hadron/HTest.h Hadron/HTest.cc
 HadronJetTest_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
 -I$(FASTJETPATH)
 HadronJetTest_la_LIBADD = $(FASTJETLIBS) 
 LeptonJetTest_la_SOURCES = \
 Lepton/TopDecay.h Lepton/TopDecay.cc
 LeptonJetTest_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
 -I$(FASTJETPATH)
 LeptonJetTest_la_LIBADD = $(FASTJETLIBS) 
 endif
 
 LeptonTest_la_SOURCES = \
 Lepton/VVTest.h Lepton/VVTest.cc \
 Lepton/VBFTest.h Lepton/VBFTest.cc \
 Lepton/VHTest.h Lepton/VHTest.cc \
 Lepton/FermionTest.h Lepton/FermionTest.cc
 
 GammaTest_la_SOURCES = \
 Gamma/GammaMETest.h  Gamma/GammaMETest.cc \
 Gamma/GammaPMETest.h Gamma/GammaPMETest.cc
 
 DISTest_la_SOURCES = \
 DIS/DISTest.h  DIS/DISTest.cc
 
 HadronTest_la_SOURCES = \
 Hadron/HadronVVTest.h  Hadron/HadronVVTest.cc\
 Hadron/HadronVBFTest.h  Hadron/HadronVBFTest.cc\
 Hadron/WHTest.h  Hadron/WHTest.cc\
 Hadron/ZHTest.h  Hadron/ZHTest.cc\
 Hadron/VGammaTest.h  Hadron/VGammaTest.cc\
 Hadron/ZJetTest.h  Hadron/ZJetTest.cc\
 Hadron/WJetTest.h  Hadron/WJetTest.cc\
 Hadron/QQHTest.h  Hadron/QQHTest.cc
 
 
 REPO = $(top_builddir)/src/HerwigDefaults.rpo
 HERWIG = $(top_builddir)/src/Herwig
 HWREAD = $(HERWIG) read --repo $(REPO) -L $(builddir)/.libs -i $(top_builddir)/src
 HWBUILD = $(HERWIG) build --repo $(REPO) -L $(builddir)/.libs -i $(top_builddir)/src
 HWINTEGRATE = $(HERWIG) integrate
 HWRUN = $(HERWIG) run -N $${NUMEVENTS:-10000}
 
 
 tests : tests-LEP tests-DIS tests-LHC tests-Gamma
 
 
 LEPDEPS = \
 test-LEP-VV \
 test-LEP-VH \
 test-LEP-VBF \
 test-LEP-BB \
 test-LEP-Quarks \
 test-LEP-Leptons
 
 if WANT_LIBFASTJET
 LEPDEPS += test-LEP-TopDecay
 endif
 
 tests-LEP : $(LEPDEPS)
 
 tests-DIS : test-DIS-Charged test-DIS-Neutral
 
 
 LHCDEPS = \
 test-LHC-WW test-LHC-WZ test-LHC-ZZ \
 test-LHC-ZGamma test-LHC-WGamma \
 test-LHC-ZH test-LHC-WH \
 test-LHC-ZJet test-LHC-WJet \
 test-LHC-Z test-LHC-W \
 test-LHC-ZZVBF test-LHC-VBF \
 test-LHC-WWVBF \
 test-LHC-bbH test-LHC-ttH \
 test-LHC-GammaGamma test-LHC-GammaJet \
 test-LHC-Higgs test-LHC-HiggsJet \
 test-LHC-QCDFast test-LHC-QCD \
 test-LHC-Top
 
 
 if WANT_LIBFASTJET
 LHCDEPS += \
 test-LHC-Bottom \
 test-LHC-WHJet test-LHC-ZHJet test-LHC-HJet \
 test-LHC-ZShower test-LHC-WShower \
 test-LHC-WHJet-Powheg test-LHC-ZHJet-Powheg test-LHC-HJet-Powheg \
 test-LHC-ZShower-Powheg test-LHC-WShower-Powheg
 endif
 
 tests-LHC : $(LHCDEPS) 
 
 tests-Gamma : test-Gamma-FF test-Gamma-WW test-Gamma-P
 
 
 
 LEPLIBS = LeptonTest.la
 HADLIBS = HadronTest.la
 
 if WANT_LIBFASTJET 
 LEPLIBS += LeptonJetTest.la
 HADLIBS += HadronJetTest.la
 endif
 
 
 test-LEP-% : Inputs/LEP-%.in $(LEPLIBS)
 	$(HWREAD) $<
 	$(HWRUN) $(notdir $(subst .in,.run,$<))
 
 test-Gamma-% : Inputs/Gamma-%.in GammaTest.la
 	$(HWREAD) $<
 	$(HWRUN) $(notdir $(subst .in,.run,$<))
 
 test-DIS-% : Inputs/DIS-%.in DISTest.la
 	$(HWREAD) $<
 	$(HWRUN) $(notdir $(subst .in,.run,$<))
 
 test-LHC-% : Inputs/LHC-%.in GammaTest.la $(HADLIBS)
 	$(HWREAD) $<
 	$(HWRUN) $(notdir $(subst .in,.run,$<))
 
 
 
-tests-Rivet : Rivet-LEP Rivet-BFactory Rivet-DIS Rivet-Star Rivet-SppS \
+tests-Rivet : Rivet-EE Rivet-DIS Rivet-Star Rivet-SppS \
 	      Rivet-TVT-WZ Rivet-TVT-Photon Rivet-TVT-Jets \
 	      Rivet-LHC-Jets Rivet-LHC-EW Rivet-LHC-Photon Rivet-LHC-Higgs
 
 Rivet-%.run : Rivet/%.in
 	$(HWBUILD) -c .cache/$(subst .run,,$@) $<
 
 Rivet-Matchbox-%.yoda : Rivet-Matchbox-%.run
 	$(HWINTEGRATE) -c .cache/$(subst .run,,$<) $<
 	$(HWRUN)       -c .cache/$(subst .run,,$<) $<
 
 Rivet-%.yoda : Rivet-%.run
 	$(HWRUN) $<
 
 Rivet/%.in :
 	python/make_input_files.py $(notdir $(subst .in,,$@))
 
 
 
-Rivet-inputfiles: $(shell echo Rivet/LEP{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{9.4,12,13,17,27.6,29,30.2,30.7,30,31.3,34,34.8,41,43.6,45,50,52,53.3,55,56,57,58,59.5,60.8,60,61.4,66,76,82,8510,12.8,22,26.8,35,44,48.0,91,93.0,130,133,136,161,172,177,183,189,192,196,197,200,202,205,206,207,91-nopi}.in) \
-                  $(shell echo Rivet/LEP{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Powheg,-Matchbox-Powheg}-14.in) \
-	          $(shell echo Rivet/LEP{,-Dipole}-{10.5,11.96,12.8,13.96,16.86,21.84,26.8,28.48,35.44,48.0,97.0}-gg.in) \
-                  $(shell echo Rivet/BFactory{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg}-{9.46,10.00,10.52,10.52-sym,10.54,10.45,10.47}.in) \
-                  $(shell echo Rivet/BFactory{,-Dipole}-{Upsilon,Upsilon2,Upsilon4,Tau,Phi,10.58-res}.in) \
+Rivet-inputfiles: $(shell echo Rivet/EE{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{9.4,12,13,17,27.6,29,30.2,30.7,30,31.3,34,34.8,41,43.6,45,50,52,53.3,55,56,57,58,59.5,60.8,60,61.4,66,76,82,8510,12.8,22,26.8,35,44,48.0,91,93.0,130,133,136,161,172,177,183,189,192,196,197,200,202,205,206,207,91-nopi}.in) \
+                  $(shell echo Rivet/EE{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Powheg,-Matchbox-Powheg}-14.in) \
+	          $(shell echo Rivet/EE{,-Dipole}-{10.5,11.96,12.8,13.96,16.86,21.84,26.8,28.48,35.44,48.0,97.0}-gg.in) \
+                  $(shell echo Rivet/EE{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg}-{9.46,10.00,10.52,10.52-sym,10.54,10.45,10.47}.in) \
+                  $(shell echo Rivet/EE{,-Dipole}-{Upsilon,Upsilon2,Upsilon4,Tau,Phi,10.58-res}.in) \
                   $(shell echo Rivet/DIS{,-NoME,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{e--LowQ2,e+-LowQ2,e+-HighQ2}.in) \
                   $(shell echo Rivet/TVT{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{Run-I-Z,Run-I-W,Run-I-WZ,Run-II-Z-e,Run-II-Z-{,LowMass-,HighMass-}mu,Run-II-W}.in) \
 	          $(shell echo Rivet/TVT{,-Dipole}-Run-II-{DiPhoton-GammaGamma,DiPhoton-GammaJet,PromptPhoton}.in) \
 	          $(shell echo Rivet/TVT-Powheg-Run-II-{DiPhoton-GammaGamma,DiPhoton-GammaJet}.in) \
                   $(shell echo Rivet/TVT{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-{Run-II-Jets-{0..11},Run-I-Jets-{1..8}}.in ) \
 	          $(shell echo Rivet/TVT{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-{630-Jets-{1..3},300-Jets-1,900-Jets-1}.in ) \
                   $(shell echo Rivet/TVT{,-Dipole}-{Run-I,Run-II,300,630,900}-UE.in) \
                   $(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-7-DiJets-{1..7}-{A,B,C}.in ) \
                   $(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-13-DiJets-{{1..11}-A,{6..11}-B}.in ) \
                   $(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-{7,8,13}-Jets-{0..10}.in ) \
 	          $(shell echo Rivet/LHC{,-Dipole}-{900,2360,2760,7,8,13}-UE.in ) \
 	          $(shell echo Rivet/LHC{,-Dipole}-{900,7,13}-UE-Long.in ) \
 		  $(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-7-Charm-{1..5}.in) \
 		  $(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-7-Bottom-{0..9}.in) \
 		  $(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-7-Top-{L,SL}.in) \
 		  $(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-{8,13}-Top-{All,L,SL}.in) \
                   $(shell echo Rivet/Star{,-Dipole}-{UE,Jets-{1..4}}.in ) \
 	          $(shell echo Rivet/SppS{,-Dipole}-{200,500,900,546}-UE.in ) \
                   $(shell echo Rivet/LHC{,-Matchbox,-Matchbox-Powheg,-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-{W-{e,mu},13-Z-{e,mu},Z-HighMass{1,2}-e,{8,13}-W-mu,8-Z-Mass{1..4}-{e,mu},Z-{e,mu,mu-SOPHTY},Z-LowMass-{e,mu},Z-MedMass-e,WZ,WW-{emu,ll},ZZ-{ll,lv},{8,13}-WZ,8-ZZ-lv,8-WW-ll,Z-mu-Short}.in) \
                   $(shell echo Rivet/LHC{,-Dipole}-7-{W,Z}Gamma-{e,mu}.in) \
                   $(shell echo Rivet/LHC{,-Dipole}-8-ZGamma-{e,mu}.in) \
 	          $(shell echo Rivet/LHC{,-Matchbox,-Matchbox-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-{7-W-Jet-{1..3}-e,7-Z-Jet-{0..3}-e,7-Z-Jet-0-mu}.in) \
 	          $(shell echo Rivet/LHC{-Matchbox,-Matchbox-Powheg,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-{Z-b,Z-bb,8-Z-b,8-Z-bb,W-b,8-Z-jj}.in) \
 		  $(shell echo Rivet/LHC{,-Dipole}-{7,8,13}-PromptPhoton-{1..4}.in) Rivet/LHC-GammaGamma-7.in \
 	          $(shell echo Rivet/LHC{,-Powheg}-{7,8}-{DiPhoton-GammaGamma,DiPhoton-GammaJet}.in) \
 	          $(shell echo Rivet/LHC{,-Powheg,-Matchbox,-Matchbox-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-{ggH,VBF,WH,ZH}.in) \
                   $(shell echo Rivet/LHC{,-Powheg,-Matchbox,-Matchbox-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-8-{{ggH,VBF,WH,ZH}{,-GammaGamma},ggH-WW}.in) \
                   $(shell echo Rivet/LHC{,-Matchbox,-Matchbox-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-ggHJet.in)
 #                  $(shell echo Rivet/ISR-{30,44,53,62}-UE.in ) $(shell echo Rivet/SppS-{53,63}-UE.in )
 
 Rivet-GammaGamma: Rivet-GammaGamma/done
 	touch $@
 
 Rivet-GammaGamma/done: $(shell echo Rivet-GammaGamma-mumu-{3.5,4.5,5.5,6.5,7.5,9.0,12.5,17.5,30.0}.yoda )
 	rm -rf Rivet-GammaGamma
 	python/merge-GammaGamma GammaGamma
 	rivet-mkhtml -o Rivet-GammaGamma GammaGamma.yoda:Hw
 	touch $@
 
-Rivet-LEP-Gamma: Rivet-LEP-Gamma/done
+Rivet-EE-Gamma: Rivet-EE-Gamma/done
 	touch $@
 
-Rivet-LEP-Gamma/done: $(shell echo Rivet-LEP-Gamma-Direct-mumu-{161,172,183,189,196,206}.yoda ) \
-                      $(shell echo Rivet-LEP-Gamma-Direct-tautau-{189,196,206}.yoda ) \
-	              $(shell echo Rivet-LEP-Gamma-{Direct,Single-Resolved,Double-Resolved}-Jets-{198,206}.yoda )
-	rm -rf Rivet-LEP-Gamma
-	python/merge-LEP-Gamma LEP-Gamma
-	rivet-mkhtml -o Rivet-LEP-Gamma LEP-Gamma.yoda:Hw
+Rivet-EE-Gamma/done: $(shell echo Rivet-EE-Gamma-Direct-mumu-{161,172,183,189,196,206}.yoda ) \
+                      $(shell echo Rivet-EE-Gamma-Direct-tautau-{189,196,206}.yoda ) \
+	              $(shell echo Rivet-EE-Gamma-{Direct,Single-Resolved,Double-Resolved}-Jets-{198,206}.yoda )
+	rm -rf Rivet-EE-Gamma
+	python/merge-EE-Gamma EE-Gamma
+	rivet-mkhtml -o Rivet-EE-Gamma EE-Gamma.yoda:Hw
 	touch $@
 
-Rivet-LEP : Rivet-LEP/done
+Rivet-EE : Rivet-EE/done
 	touch $@
 
-Rivet-LEP/done : $(shell echo Rivet{,-Powheg}-LEP-{9.4,12,13,14,17,27.6,29,30.2,30.7,30,31.3,34,34.8,43.6,45,50,52,53.3,55,56,57,58,59.5,60.8,60,61.4,66,76,10,12.8,22,26.8,35,41,44,48.0,82,85,91,93.0,130,133,136,161,172,177,183,189,192,196,197,200,202,205,206,207,91-nopi}.yoda) \
-	   $(shell echo Rivet-LEP-{10.5,11.96,12.8,13.96,16.86,21.84,26.8,28.48,35.44,48.0,97.0}-gg.yoda)
-	rm -rf Rivet-LEP
-	python/merge-LEP --with-gg LEP
-	python/merge-LEP Powheg-LEP
-	rivet-mkhtml -o Rivet-LEP LEP.yoda:Hw Powheg-LEP.yoda:Hw-Powheg
+Rivet-EE/done : $(shell echo Rivet{,-Powheg}-EE-{9.4,12,13,14,17,27.6,29,30.2,30.7,30,31.3,34,34.8,43.6,45,50,52,53.3,55,56,57,58,59.5,60.8,60,61.4,66,76,10,12.8,22,26.8,35,41,44,48.0,82,85,91,93.0,130,133,136,161,172,177,183,189,192,196,197,200,202,205,206,207,91-nopi}.yoda) \
+	   $(shell echo Rivet-EE-{10.5,11.96,12.8,13.96,16.86,21.84,26.8,28.48,35.44,48.0,97.0}-gg.yoda) \
+	   $(shell echo Rivet-EE-{10.52,10.52-sym,9.46,10.00,10.54,10.45,10.47,Upsilon,Upsilon2,Upsilon4,Tau,Phi,10.58-res,10.58}.yoda)
+	rm -rf Rivet-EE
+	python/merge-EE --with-gg EE
+	python/merge-EE Powheg-EE
+	rivet-mkhtml -o Rivet-EE EE.yoda:Hw Powheg-EE.yoda:Hw-Powheg
 	touch $@
 
+
+# Rivet-BFactory/done: 
+# 	rm -rf Rivet-BFactory
+# 	python/merge-BFactory BFactory
+# 	rivet-mkhtml -o Rivet-BFactory BFactory.yoda:Hw
+# 	touch $@
+
+
 Rivet-LowEnergy-%.yoda:
 	$(HWBUILD) -c .cache/$(subst .yoda,,$@) Rivet/$(subst .yoda,.in,$@)
 	$(HWRUN)  $(subst .yoda,.run,$@) 
 
 Rivet-LowEnergy-%:
 	OUTPUT=`python/LowEnergy.py --process $(subst Rivet-LowEnergy-,,$@) --non-perturbative --perturbative`; make -j12 $$OUTPUT NUMEVENTS=$${NUMEVENTS:-10000};
 	python/mergeLowEnergy.py $(subst Rivet-LowEnergy-,,$@)
 	rivet-mkhtml -o Rivet-LowEnergy-$(subst Rivet-LowEnergy-,,$@) LowEnergy-EE-NonPerturbative-$(subst Rivet-LowEnergy-,,$@).yoda:"Non-Pert" LowEnergy-EE-Perturbative-$(subst Rivet-LowEnergy-,,$@).yoda:"Pert"
 
 Rivet-R:
 	OUTPUT=`python/R.py --perturbative`; make -j12 $$OUTPUT NUMEVENTS=$${NUMEVENTS:-10000};
 	python/mergeLowEnergy.py R
 	rivet-mkhtml -o Rivet-R LowEnergy-EE-Perturbative-R.yoda:"Pert"
 #LowEnergy-EE-NonPerturbative-R.yoda:"Non-Pert" 
 
-Rivet-BFactory : Rivet-BFactory/done
-	touch $@
-
-Rivet-BFactory/done: $(shell echo Rivet-BFactory-{10.52,10.52-sym,9.46,10.00,10.54,10.45,10.47,Upsilon,Upsilon2,Upsilon4,Tau,Phi,10.58-res,10.58}.yoda)
-	rm -rf Rivet-BFactory
-	python/merge-BFactory BFactory
-	rivet-mkhtml -o Rivet-BFactory BFactory.yoda:Hw
-	touch $@
 
 
 
 Rivet-DIS : Rivet-DIS/done
 	touch $@
 
 Rivet-DIS/done: $(shell echo Rivet{-DIS,-DIS-NoME,-Powheg-DIS}-{e--LowQ2,e+-LowQ2,e+-HighQ2}.yoda)
 	rm -rf Rivet-DIS
 	python/merge-DIS DIS 
 	python/merge-DIS Powheg-DIS
 	python/merge-DIS DIS-NoME
 	rivet-mkhtml -o Rivet-DIS DIS.yoda:Hw Powheg-DIS.yoda:Hw-Powheg DIS-NoME.yoda:Hw-NoME
 	touch $@
 
 
 
 Rivet-TVT-EW : Rivet-TVT-EW/done
 	touch $@
 
 Rivet-TVT-EW/done:  $(shell echo Rivet{,-Powheg}-TVT-{Run-I-Z,Run-I-W,Run-I-WZ,Run-II-Z-{e,{,LowMass-,HighMass-}mu},Run-II-W}.yoda)
 	rm -rf Rivet-TVT-EW
 	python/merge-TVT-EW TVT
 	python/merge-TVT-EW Powheg-TVT
 	rivet-mkhtml -o Rivet-TVT-EW TVT-EW.yoda:Hw Powheg-TVT-EW.yoda:Hw-Powheg
 	touch $@
 
 Rivet-TVT-Photon : Rivet-TVT-Photon/done
 	touch $@
 
 Rivet-TVT-Photon/done: $(shell echo Rivet{,-Powheg}-TVT-Run-II-{DiPhoton-GammaGamma,DiPhoton-GammaJet}.yoda Rivet-TVT-Run-II-PromptPhoton.yoda)
 	rm -rf Rivet-TVT-Photon
 	python/merge-TVT-Photon TVT
 	python/merge-TVT-Photon Powheg-TVT
 	rivet-mkhtml -o Rivet-TVT-Photon TVT-Photon.yoda:Hw Powheg-TVT-Photon.yoda:Hw-Powheg
 	touch $@
 
 
 
 Rivet-TVT-Jets : Rivet-TVT-Jets/done
 	touch $@
 
 Rivet-TVT-Jets/done:  $(shell echo Rivet-TVT-{Run-II-Jets-{0..11},Run-I-Jets-{1..8}}.yoda ) \
 	         $(shell echo Rivet-TVT-{630-Jets-{1..3},300-Jets-1,900-Jets-1}.yoda ) \
                  $(shell echo Rivet-TVT-{Run-I,Run-II,300,630,900}-UE.yoda)
 	rm -rf Rivet-TVT-Jets
 	python/merge-TVT-Jets TVT
 	rivet-mkhtml -o Rivet-TVT-Jets TVT-Jets.yoda:Hw
 	touch $@
 
 Rivet-Star : Rivet-Star/done
 	touch $@
 
 Rivet-Star/done : $(shell echo Rivet-Star-{UE,Jets-{1..4}}.yoda ) 
 	rm -rf Rivet-Star
 	python/merge-Star Star
 	rivet-mkhtml -o Rivet-Star Star.yoda:Hw
 	touch $@
 
 
 
 Rivet-SppS : Rivet-SppS/done
 	touch $@
 
 ## $(shell echo Rivet-ISR-{30,44,53,62}-UE.yoda ) \
 ## {53,63,200,500,900,546} EHS-UE
 
 Rivet-SppS/done : $(shell echo Rivet-SppS-{200,500,900,546}-UE.yoda )
 	rm -rf Rivet-SppS
 	python/merge-SppS SppS
 	rivet-mkhtml -o Rivet-SppS SppS.yoda:Hw
 	touch $@
 
 
 
 
 
 
 Rivet-LHC-Jets : Rivet-LHC-Jets/done
 	touch $@
 
 Rivet-LHC-Jets/done : \
 	        $(shell echo Rivet-LHC-7-DiJets-{1..7}-{A,B,C}.yoda   ) \
 	        $(shell echo Rivet-LHC-13-DiJets-{{1..11}-A,{6..11}-B}.yoda   ) \
 	        $(shell echo Rivet-LHC-{7,8,13}-Jets-{0..10}.yoda     ) \
 	        $(shell echo Rivet-LHC-2760-Jets-{1..3}.yoda     ) \
 	        $(shell echo Rivet-LHC-{900,2360,2760,7,8,13}-UE.yoda ) \
 	        $(shell echo Rivet-LHC-{900,7,13}-UE-Long.yoda        ) \
 		$(shell echo Rivet-LHC-7-Charm-{1..5}.yoda            ) \
 		$(shell echo Rivet-LHC-7-Bottom-{0..9}.yoda           ) \
 		$(shell echo Rivet-LHC-{7,8,13}-Top-{L,SL}.yoda ) \
 		$(shell echo Rivet-LHC-{8,13}-Top-All.yoda )
 	rm -rf Rivet-LHC-Jets
 	python/merge-LHC-Jets LHC
 	rivet-mkhtml -o Rivet-LHC-Jets LHC-Jets.yoda:Hw
 	touch $@
 
 
 
 Rivet-LHC-EW : Rivet-LHC-EW/done
 	touch $@
 
 Rivet-LHC-EW/done: \
 		$(shell echo Rivet{,-Powheg}-LHC-{13-Z-{e,mu},{8,13}-W-mu,Z-HighMass{1,2}-e,8-Z-Mass{1..4}-{e,mu},W-{e,mu},Z-{e,mu,mu-SOPHTY},Z-LowMass-{e,mu},Z-MedMass-e,WZ,WW-{emu,ll},ZZ-{ll,lv},{8,13}-WZ,8-ZZ-lv,8-WW-ll,Z-mu-Short}.yoda) \
 		$(shell echo Rivet-LHC-{7-W-Jet-{1..3}-e,7-Z-Jet-{0..3}-e,7-Z-Jet-0-mu}.yoda) \
 		$(shell echo Rivet-LHC-7-{W,Z}Gamma-{e,mu}.yoda) \
 		$(shell echo Rivet-LHC-8-ZGamma-{e,mu}.yoda) 
 	rm -rf Rivet-LHC-EW;
 	python/merge-LHC-EW LHC
 	python/merge-LHC-EW Powheg-LHC
 	rivet-mkhtml -o Rivet-LHC-EW LHC-EW.yoda:Hw Powheg-LHC-EW.yoda:Hw-Powheg \
                                      Rivet-LHC-Z-mu-SOPHTY.yoda:Hw Rivet-Powheg-LHC-Z-mu-SOPHTY.yoda:Hw-Powheg
 	touch $@
 
 
 
 
 Rivet-LHC-Photon : Rivet-LHC-Photon/done
 	touch $@
 
 Rivet-LHC-Photon/done: \
 		$(shell echo Rivet-LHC-{7,8,13}-PromptPhoton-{1..4}.yoda) \
 		Rivet-LHC-GammaGamma-7.yoda \
 	    $(shell echo Rivet{,-Powheg}-LHC-{7,8}-{DiPhoton-GammaGamma,DiPhoton-GammaJet}.yoda)
 	rm -rf Rivet-LHC-Photon
 	python/merge-LHC-Photon LHC
 	python/merge-LHC-Photon Powheg-LHC
 	rivet-mkhtml -o Rivet-LHC-Photon LHC-Photon.yoda:Hw Powheg-LHC-Photon.yoda:Hw-Powheg
 	touch $@
 
 
 
 
 Rivet-LHC-Higgs : Rivet-LHC-Higgs/done
 	touch $@
 
 Rivet-LHC-Higgs/done:  \
 		$(shell echo Rivet{,-Powheg}-LHC-{ggH,VBF,WH,ZH}.yoda) \
         $(shell echo Rivet{,-Powheg}-LHC-8-{{ggH,VBF,WH,ZH}{,-GammaGamma},ggH-WW}.yoda) \
         Rivet-LHC-ggHJet.yoda
 	yodamerge --add Rivet-Powheg-LHC-8-{ggH{-GammaGamma,-WW,},{VBF,ZH,WH}{,-GammaGamma}}.yoda -o Powheg-LHC-Higgs.yoda
 	yodamerge --add Rivet-LHC-8-{ggH{-GammaGamma,-WW,},{VBF,ZH,WH}{,-GammaGamma}}.yoda -o LHC-Higgs.yoda
 	rm -rf Rivet-LHC-Higgs
 	rivet-mkhtml -o Rivet-LHC-Higgs Powheg-LHC-Higgs.yoda:Hw-Powheg LHC-Higgs.yoda:Hw\
 	                Rivet-Powheg-LHC-ggH.yoda:gg-Powheg Rivet-LHC-ggH.yoda:gg Rivet-LHC-ggHJet.yoda:HJet \
                         Rivet-Powheg-LHC-VBF.yoda:VBF-Powheg Rivet-LHC-VBF.yoda:VBF Rivet-LHC-WH.yoda:WH Rivet-LHC-ZH.yoda:ZH \
                         Rivet-Powheg-LHC-WH.yoda:WH-Powheg Rivet-Powheg-LHC-ZH.yoda:ZH-Powheg
 	touch $@
 
 
 
 
 
 clean-local:
 	rm -f *.out *.log *.tex *.top *.run *.dump *.mult *.Bmult *.yoda Rivet/*.in 
 	rm -rf Rivet-*
 
 distclean-local:
 	rm -rf .cache
diff --git a/Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-Jets-198.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-198.in
rename from Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-Jets-198.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-198.in
diff --git a/Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-Jets-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-206.in
rename from Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-Jets-206.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-206.in
diff --git a/Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-mumu-161.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-161.in
rename from Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-mumu-161.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-161.in
diff --git a/Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-mumu-172.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-172.in
rename from Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-mumu-172.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-172.in
diff --git a/Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-mumu-183.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-183.in
rename from Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-mumu-183.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-183.in
diff --git a/Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-mumu-189.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-189.in
rename from Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-mumu-189.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-189.in
diff --git a/Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-mumu-196.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-196.in
rename from Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-mumu-196.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-196.in
diff --git a/Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-mumu-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-206.in
rename from Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-mumu-206.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-206.in
diff --git a/Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-tautau-189.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-189.in
rename from Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-tautau-189.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-189.in
diff --git a/Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-tautau-196.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-196.in
rename from Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-tautau-196.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-196.in
diff --git a/Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-tautau-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-206.in
rename from Tests/Rivet/LEP-Gamma/LEP-Gamma-Direct-tautau-206.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-206.in
diff --git a/Tests/Rivet/LEP-Gamma/LEP-Gamma-Double-Resolved-Jets-198.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-198.in
rename from Tests/Rivet/LEP-Gamma/LEP-Gamma-Double-Resolved-Jets-198.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-198.in
diff --git a/Tests/Rivet/LEP-Gamma/LEP-Gamma-Double-Resolved-Jets-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-206.in
rename from Tests/Rivet/LEP-Gamma/LEP-Gamma-Double-Resolved-Jets-206.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-206.in
diff --git a/Tests/Rivet/LEP-Gamma/LEP-Gamma-Single-Resolved-Jets-198.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-198.in
rename from Tests/Rivet/LEP-Gamma/LEP-Gamma-Single-Resolved-Jets-198.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-198.in
diff --git a/Tests/Rivet/LEP-Gamma/LEP-Gamma-Single-Resolved-Jets-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-206.in
rename from Tests/Rivet/LEP-Gamma/LEP-Gamma-Single-Resolved-Jets-206.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-206.in
diff --git a/Tests/Rivet/BFactory/BFactory-10.00.in b/Tests/Rivet/EE/EE-10.00.in
rename from Tests/Rivet/BFactory/BFactory-10.00.in
rename to Tests/Rivet/EE/EE-10.00.in
diff --git a/Tests/Rivet/BFactory/BFactory-10.45.in b/Tests/Rivet/EE/EE-10.45.in
rename from Tests/Rivet/BFactory/BFactory-10.45.in
rename to Tests/Rivet/EE/EE-10.45.in
diff --git a/Tests/Rivet/BFactory/BFactory-10.47.in b/Tests/Rivet/EE/EE-10.47.in
rename from Tests/Rivet/BFactory/BFactory-10.47.in
rename to Tests/Rivet/EE/EE-10.47.in
diff --git a/Tests/Rivet/LEP/LEP-10.5-gg.in b/Tests/Rivet/EE/EE-10.5-gg.in
rename from Tests/Rivet/LEP/LEP-10.5-gg.in
rename to Tests/Rivet/EE/EE-10.5-gg.in
diff --git a/Tests/Rivet/BFactory/BFactory-10.52-sym.in b/Tests/Rivet/EE/EE-10.52-sym.in
rename from Tests/Rivet/BFactory/BFactory-10.52-sym.in
rename to Tests/Rivet/EE/EE-10.52-sym.in
diff --git a/Tests/Rivet/BFactory/BFactory-10.52.in b/Tests/Rivet/EE/EE-10.52.in
rename from Tests/Rivet/BFactory/BFactory-10.52.in
rename to Tests/Rivet/EE/EE-10.52.in
diff --git a/Tests/Rivet/BFactory/BFactory-10.54.in b/Tests/Rivet/EE/EE-10.54.in
rename from Tests/Rivet/BFactory/BFactory-10.54.in
rename to Tests/Rivet/EE/EE-10.54.in
diff --git a/Tests/Rivet/BFactory/BFactory-10.58-res.in b/Tests/Rivet/EE/EE-10.58-res.in
rename from Tests/Rivet/BFactory/BFactory-10.58-res.in
rename to Tests/Rivet/EE/EE-10.58-res.in
diff --git a/Tests/Rivet/BFactory/BFactory-10.58.in b/Tests/Rivet/EE/EE-10.58.in
rename from Tests/Rivet/BFactory/BFactory-10.58.in
rename to Tests/Rivet/EE/EE-10.58.in
diff --git a/Tests/Rivet/LEP/LEP-10.in b/Tests/Rivet/EE/EE-10.in
rename from Tests/Rivet/LEP/LEP-10.in
rename to Tests/Rivet/EE/EE-10.in
diff --git a/Tests/Rivet/LEP/LEP-11.96-gg.in b/Tests/Rivet/EE/EE-11.96-gg.in
rename from Tests/Rivet/LEP/LEP-11.96-gg.in
rename to Tests/Rivet/EE/EE-11.96-gg.in
diff --git a/Tests/Rivet/LEP/LEP-12.8-gg.in b/Tests/Rivet/EE/EE-12.8-gg.in
rename from Tests/Rivet/LEP/LEP-12.8-gg.in
rename to Tests/Rivet/EE/EE-12.8-gg.in
diff --git a/Tests/Rivet/LEP/LEP-12.8.in b/Tests/Rivet/EE/EE-12.8.in
rename from Tests/Rivet/LEP/LEP-12.8.in
rename to Tests/Rivet/EE/EE-12.8.in
diff --git a/Tests/Rivet/LEP/LEP-12.in b/Tests/Rivet/EE/EE-12.in
rename from Tests/Rivet/LEP/LEP-12.in
rename to Tests/Rivet/EE/EE-12.in
--- a/Tests/Rivet/LEP/LEP-12.in
+++ b/Tests/Rivet/EE/EE-12.in
@@ -1,12 +1,13 @@
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 12.0
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1983_I190818
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
diff --git a/Tests/Rivet/LEP/LEP-13.96-gg.in b/Tests/Rivet/EE/EE-13.96-gg.in
rename from Tests/Rivet/LEP/LEP-13.96-gg.in
rename to Tests/Rivet/EE/EE-13.96-gg.in
diff --git a/Tests/Rivet/LEP/LEP-13.in b/Tests/Rivet/EE/EE-13.in
rename from Tests/Rivet/LEP/LEP-13.in
rename to Tests/Rivet/EE/EE-13.in
diff --git a/Tests/Rivet/LEP/LEP-130.in b/Tests/Rivet/EE/EE-130.in
rename from Tests/Rivet/LEP/LEP-130.in
rename to Tests/Rivet/EE/EE-130.in
diff --git a/Tests/Rivet/LEP/LEP-133.in b/Tests/Rivet/EE/EE-133.in
rename from Tests/Rivet/LEP/LEP-133.in
rename to Tests/Rivet/EE/EE-133.in
diff --git a/Tests/Rivet/LEP/LEP-136.in b/Tests/Rivet/EE/EE-136.in
rename from Tests/Rivet/LEP/LEP-136.in
rename to Tests/Rivet/EE/EE-136.in
diff --git a/Tests/Rivet/LEP/LEP-14.in b/Tests/Rivet/EE/EE-14.in
rename from Tests/Rivet/LEP/LEP-14.in
rename to Tests/Rivet/EE/EE-14.in
diff --git a/Tests/Rivet/LEP/LEP-16.86-gg.in b/Tests/Rivet/EE/EE-16.86-gg.in
rename from Tests/Rivet/LEP/LEP-16.86-gg.in
rename to Tests/Rivet/EE/EE-16.86-gg.in
diff --git a/Tests/Rivet/LEP/LEP-161.in b/Tests/Rivet/EE/EE-161.in
rename from Tests/Rivet/LEP/LEP-161.in
rename to Tests/Rivet/EE/EE-161.in
diff --git a/Tests/Rivet/LEP/LEP-17.in b/Tests/Rivet/EE/EE-17.in
rename from Tests/Rivet/LEP/LEP-17.in
rename to Tests/Rivet/EE/EE-17.in
diff --git a/Tests/Rivet/LEP/LEP-172.in b/Tests/Rivet/EE/EE-172.in
rename from Tests/Rivet/LEP/LEP-172.in
rename to Tests/Rivet/EE/EE-172.in
diff --git a/Tests/Rivet/LEP/LEP-177.in b/Tests/Rivet/EE/EE-177.in
rename from Tests/Rivet/LEP/LEP-177.in
rename to Tests/Rivet/EE/EE-177.in
diff --git a/Tests/Rivet/LEP/LEP-183.in b/Tests/Rivet/EE/EE-183.in
rename from Tests/Rivet/LEP/LEP-183.in
rename to Tests/Rivet/EE/EE-183.in
diff --git a/Tests/Rivet/LEP/LEP-189.in b/Tests/Rivet/EE/EE-189.in
rename from Tests/Rivet/LEP/LEP-189.in
rename to Tests/Rivet/EE/EE-189.in
diff --git a/Tests/Rivet/LEP/LEP-192.in b/Tests/Rivet/EE/EE-192.in
rename from Tests/Rivet/LEP/LEP-192.in
rename to Tests/Rivet/EE/EE-192.in
diff --git a/Tests/Rivet/LEP/LEP-196.in b/Tests/Rivet/EE/EE-196.in
rename from Tests/Rivet/LEP/LEP-196.in
rename to Tests/Rivet/EE/EE-196.in
diff --git a/Tests/Rivet/LEP/LEP-197.in b/Tests/Rivet/EE/EE-197.in
rename from Tests/Rivet/LEP/LEP-197.in
rename to Tests/Rivet/EE/EE-197.in
diff --git a/Tests/Rivet/LEP/LEP-200.in b/Tests/Rivet/EE/EE-200.in
rename from Tests/Rivet/LEP/LEP-200.in
rename to Tests/Rivet/EE/EE-200.in
diff --git a/Tests/Rivet/LEP/LEP-202.in b/Tests/Rivet/EE/EE-202.in
rename from Tests/Rivet/LEP/LEP-202.in
rename to Tests/Rivet/EE/EE-202.in
diff --git a/Tests/Rivet/LEP/LEP-205.in b/Tests/Rivet/EE/EE-205.in
rename from Tests/Rivet/LEP/LEP-205.in
rename to Tests/Rivet/EE/EE-205.in
diff --git a/Tests/Rivet/LEP/LEP-206.in b/Tests/Rivet/EE/EE-206.in
rename from Tests/Rivet/LEP/LEP-206.in
rename to Tests/Rivet/EE/EE-206.in
diff --git a/Tests/Rivet/LEP/LEP-207.in b/Tests/Rivet/EE/EE-207.in
rename from Tests/Rivet/LEP/LEP-207.in
rename to Tests/Rivet/EE/EE-207.in
diff --git a/Tests/Rivet/LEP/LEP-21.84-gg.in b/Tests/Rivet/EE/EE-21.84-gg.in
rename from Tests/Rivet/LEP/LEP-21.84-gg.in
rename to Tests/Rivet/EE/EE-21.84-gg.in
diff --git a/Tests/Rivet/LEP/LEP-22.in b/Tests/Rivet/EE/EE-22.in
rename from Tests/Rivet/LEP/LEP-22.in
rename to Tests/Rivet/EE/EE-22.in
diff --git a/Tests/Rivet/LEP/LEP-26.8-gg.in b/Tests/Rivet/EE/EE-26.8-gg.in
rename from Tests/Rivet/LEP/LEP-26.8-gg.in
rename to Tests/Rivet/EE/EE-26.8-gg.in
diff --git a/Tests/Rivet/LEP/LEP-26.8.in b/Tests/Rivet/EE/EE-26.8.in
rename from Tests/Rivet/LEP/LEP-26.8.in
rename to Tests/Rivet/EE/EE-26.8.in
diff --git a/Tests/Rivet/LEP/LEP-27.6.in b/Tests/Rivet/EE/EE-27.6.in
rename from Tests/Rivet/LEP/LEP-27.6.in
rename to Tests/Rivet/EE/EE-27.6.in
diff --git a/Tests/Rivet/LEP/LEP-28.48-gg.in b/Tests/Rivet/EE/EE-28.48-gg.in
rename from Tests/Rivet/LEP/LEP-28.48-gg.in
rename to Tests/Rivet/EE/EE-28.48-gg.in
diff --git a/Tests/Rivet/LEP/LEP-29.in b/Tests/Rivet/EE/EE-29.in
rename from Tests/Rivet/LEP/LEP-29.in
rename to Tests/Rivet/EE/EE-29.in
diff --git a/Tests/Rivet/LEP/LEP-30.2.in b/Tests/Rivet/EE/EE-30.2.in
rename from Tests/Rivet/LEP/LEP-30.2.in
rename to Tests/Rivet/EE/EE-30.2.in
--- a/Tests/Rivet/LEP/LEP-30.2.in
+++ b/Tests/Rivet/EE/EE-30.2.in
@@ -1,11 +1,12 @@
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.2
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
diff --git a/Tests/Rivet/LEP/LEP-30.7.in b/Tests/Rivet/EE/EE-30.7.in
rename from Tests/Rivet/LEP/LEP-30.7.in
rename to Tests/Rivet/EE/EE-30.7.in
diff --git a/Tests/Rivet/LEP/LEP-30.in b/Tests/Rivet/EE/EE-30.in
rename from Tests/Rivet/LEP/LEP-30.in
rename to Tests/Rivet/EE/EE-30.in
diff --git a/Tests/Rivet/LEP/LEP-31.3.in b/Tests/Rivet/EE/EE-31.3.in
rename from Tests/Rivet/LEP/LEP-31.3.in
rename to Tests/Rivet/EE/EE-31.3.in
diff --git a/Tests/Rivet/LEP/LEP-34.8.in b/Tests/Rivet/EE/EE-34.8.in
rename from Tests/Rivet/LEP/LEP-34.8.in
rename to Tests/Rivet/EE/EE-34.8.in
diff --git a/Tests/Rivet/LEP/LEP-34.in b/Tests/Rivet/EE/EE-34.in
rename from Tests/Rivet/LEP/LEP-34.in
rename to Tests/Rivet/EE/EE-34.in
diff --git a/Tests/Rivet/LEP/LEP-35.44-gg.in b/Tests/Rivet/EE/EE-35.44-gg.in
rename from Tests/Rivet/LEP/LEP-35.44-gg.in
rename to Tests/Rivet/EE/EE-35.44-gg.in
diff --git a/Tests/Rivet/LEP/LEP-35.in b/Tests/Rivet/EE/EE-35.in
rename from Tests/Rivet/LEP/LEP-35.in
rename to Tests/Rivet/EE/EE-35.in
diff --git a/Tests/Rivet/LEP/LEP-41.in b/Tests/Rivet/EE/EE-41.in
rename from Tests/Rivet/LEP/LEP-41.in
rename to Tests/Rivet/EE/EE-41.in
diff --git a/Tests/Rivet/LEP/LEP-43.6.in b/Tests/Rivet/EE/EE-43.6.in
rename from Tests/Rivet/LEP/LEP-43.6.in
rename to Tests/Rivet/EE/EE-43.6.in
diff --git a/Tests/Rivet/LEP/LEP-44.in b/Tests/Rivet/EE/EE-44.in
rename from Tests/Rivet/LEP/LEP-44.in
rename to Tests/Rivet/EE/EE-44.in
diff --git a/Tests/Rivet/LEP/LEP-45.in b/Tests/Rivet/EE/EE-45.in
rename from Tests/Rivet/LEP/LEP-45.in
rename to Tests/Rivet/EE/EE-45.in
diff --git a/Tests/Rivet/LEP/LEP-48.0-gg.in b/Tests/Rivet/EE/EE-48.0-gg.in
rename from Tests/Rivet/LEP/LEP-48.0-gg.in
rename to Tests/Rivet/EE/EE-48.0-gg.in
diff --git a/Tests/Rivet/LEP/LEP-48.0.in b/Tests/Rivet/EE/EE-48.0.in
rename from Tests/Rivet/LEP/LEP-48.0.in
rename to Tests/Rivet/EE/EE-48.0.in
diff --git a/Tests/Rivet/LEP/LEP-50.in b/Tests/Rivet/EE/EE-50.in
rename from Tests/Rivet/LEP/LEP-50.in
rename to Tests/Rivet/EE/EE-50.in
diff --git a/Tests/Rivet/LEP/LEP-52.in b/Tests/Rivet/EE/EE-52.in
rename from Tests/Rivet/LEP/LEP-52.in
rename to Tests/Rivet/EE/EE-52.in
diff --git a/Tests/Rivet/LEP/LEP-53.3.in b/Tests/Rivet/EE/EE-53.3.in
rename from Tests/Rivet/LEP/LEP-53.3.in
rename to Tests/Rivet/EE/EE-53.3.in
diff --git a/Tests/Rivet/LEP/LEP-55.in b/Tests/Rivet/EE/EE-55.in
rename from Tests/Rivet/LEP/LEP-55.in
rename to Tests/Rivet/EE/EE-55.in
diff --git a/Tests/Rivet/LEP/LEP-56.in b/Tests/Rivet/EE/EE-56.in
rename from Tests/Rivet/LEP/LEP-56.in
rename to Tests/Rivet/EE/EE-56.in
diff --git a/Tests/Rivet/LEP/LEP-57.in b/Tests/Rivet/EE/EE-57.in
rename from Tests/Rivet/LEP/LEP-57.in
rename to Tests/Rivet/EE/EE-57.in
diff --git a/Tests/Rivet/EE/EE-58.in b/Tests/Rivet/EE/EE-58.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-58.in
@@ -0,0 +1,10 @@
+##################################################
+# LEP physics parameters (override defaults) 
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 58.
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
+##################################################
+# select the analyses 
+##################################################
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOPAZ_1995_I381900
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1995_I406129
diff --git a/Tests/Rivet/LEP/LEP-59.5.in b/Tests/Rivet/EE/EE-59.5.in
rename from Tests/Rivet/LEP/LEP-59.5.in
rename to Tests/Rivet/EE/EE-59.5.in
diff --git a/Tests/Rivet/LEP/LEP-60.8.in b/Tests/Rivet/EE/EE-60.8.in
rename from Tests/Rivet/LEP/LEP-60.8.in
rename to Tests/Rivet/EE/EE-60.8.in
diff --git a/Tests/Rivet/LEP/LEP-60.in b/Tests/Rivet/EE/EE-60.in
rename from Tests/Rivet/LEP/LEP-60.in
rename to Tests/Rivet/EE/EE-60.in
diff --git a/Tests/Rivet/LEP/LEP-61.4.in b/Tests/Rivet/EE/EE-61.4.in
rename from Tests/Rivet/LEP/LEP-61.4.in
rename to Tests/Rivet/EE/EE-61.4.in
diff --git a/Tests/Rivet/LEP/LEP-66.in b/Tests/Rivet/EE/EE-66.in
rename from Tests/Rivet/LEP/LEP-66.in
rename to Tests/Rivet/EE/EE-66.in
diff --git a/Tests/Rivet/LEP/LEP-76.in b/Tests/Rivet/EE/EE-76.in
rename from Tests/Rivet/LEP/LEP-76.in
rename to Tests/Rivet/EE/EE-76.in
diff --git a/Tests/Rivet/LEP/LEP-82.in b/Tests/Rivet/EE/EE-82.in
rename from Tests/Rivet/LEP/LEP-82.in
rename to Tests/Rivet/EE/EE-82.in
diff --git a/Tests/Rivet/LEP/LEP-85.in b/Tests/Rivet/EE/EE-85.in
rename from Tests/Rivet/LEP/LEP-85.in
rename to Tests/Rivet/EE/EE-85.in
diff --git a/Tests/Rivet/LEP/LEP-9.4.in b/Tests/Rivet/EE/EE-9.4.in
rename from Tests/Rivet/LEP/LEP-9.4.in
rename to Tests/Rivet/EE/EE-9.4.in
--- a/Tests/Rivet/LEP/LEP-9.4.in
+++ b/Tests/Rivet/EE/EE-9.4.in
@@ -1,11 +1,12 @@
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 9.4
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
diff --git a/Tests/Rivet/BFactory/BFactory-9.46.in b/Tests/Rivet/EE/EE-9.46.in
rename from Tests/Rivet/BFactory/BFactory-9.46.in
rename to Tests/Rivet/EE/EE-9.46.in
diff --git a/Tests/Rivet/LEP/LEP-91-nopi.in b/Tests/Rivet/EE/EE-91-nopi.in
rename from Tests/Rivet/LEP/LEP-91-nopi.in
rename to Tests/Rivet/EE/EE-91-nopi.in
diff --git a/Tests/Rivet/LEP/LEP-91.in b/Tests/Rivet/EE/EE-91.in
rename from Tests/Rivet/LEP/LEP-91.in
rename to Tests/Rivet/EE/EE-91.in
diff --git a/Tests/Rivet/LEP/LEP-93.0.in b/Tests/Rivet/EE/EE-93.0.in
rename from Tests/Rivet/LEP/LEP-93.0.in
rename to Tests/Rivet/EE/EE-93.0.in
diff --git a/Tests/Rivet/LEP/LEP-97.0-gg.in b/Tests/Rivet/EE/EE-97.0-gg.in
rename from Tests/Rivet/LEP/LEP-97.0-gg.in
rename to Tests/Rivet/EE/EE-97.0-gg.in
diff --git a/Tests/Rivet/BFactory/BFactory-Phi.in b/Tests/Rivet/EE/EE-Phi.in
rename from Tests/Rivet/BFactory/BFactory-Phi.in
rename to Tests/Rivet/EE/EE-Phi.in
diff --git a/Tests/Rivet/BFactory/BFactory-Tau.in b/Tests/Rivet/EE/EE-Tau.in
rename from Tests/Rivet/BFactory/BFactory-Tau.in
rename to Tests/Rivet/EE/EE-Tau.in
diff --git a/Tests/Rivet/BFactory/BFactory-Upsilon.in b/Tests/Rivet/EE/EE-Upsilon.in
rename from Tests/Rivet/BFactory/BFactory-Upsilon.in
rename to Tests/Rivet/EE/EE-Upsilon.in
--- a/Tests/Rivet/BFactory/BFactory-Upsilon.in
+++ b/Tests/Rivet/EE/EE-Upsilon.in
@@ -1,21 +1,22 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 4.73015*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 4.73015*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.45
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 # set hard process
 create Herwig::MEee2VectorMeson  /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon
 set /Herwig/MatrixElements/MEUpsilon:Coupling 41.15810
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 # BELLE charm hadron production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2789213
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2669951
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I278933
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I276860
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262415
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
diff --git a/Tests/Rivet/BFactory/BFactory-Upsilon2.in b/Tests/Rivet/EE/EE-Upsilon2.in
rename from Tests/Rivet/BFactory/BFactory-Upsilon2.in
rename to Tests/Rivet/EE/EE-Upsilon2.in
diff --git a/Tests/Rivet/BFactory/BFactory-Upsilon4.in b/Tests/Rivet/EE/EE-Upsilon4.in
rename from Tests/Rivet/BFactory/BFactory-Upsilon4.in
rename to Tests/Rivet/EE/EE-Upsilon4.in
diff --git a/Tests/Rivet/Templates/LEP-Gamma-Direct.in b/Tests/Rivet/Templates/EE-Gamma-Direct.in
rename from Tests/Rivet/Templates/LEP-Gamma-Direct.in
rename to Tests/Rivet/Templates/EE-Gamma-Direct.in
diff --git a/Tests/Rivet/Templates/LEP-Gamma-Double-Resolved.in b/Tests/Rivet/Templates/EE-Gamma-Double-Resolved.in
rename from Tests/Rivet/Templates/LEP-Gamma-Double-Resolved.in
rename to Tests/Rivet/Templates/EE-Gamma-Double-Resolved.in
diff --git a/Tests/Rivet/Templates/LEP-Gamma-Single-Resolved.in b/Tests/Rivet/Templates/EE-Gamma-Single-Resolved.in
rename from Tests/Rivet/Templates/LEP-Gamma-Single-Resolved.in
rename to Tests/Rivet/Templates/EE-Gamma-Single-Resolved.in
diff --git a/Tests/Rivet/Templates/LEP-Matchbox.in b/Tests/Rivet/Templates/EE-Matchbox.in
rename from Tests/Rivet/Templates/LEP-Matchbox.in
rename to Tests/Rivet/Templates/EE-Matchbox.in
diff --git a/Tests/Rivet/Templates/LEP-Merging.in b/Tests/Rivet/Templates/EE-Merging.in
rename from Tests/Rivet/Templates/LEP-Merging.in
rename to Tests/Rivet/Templates/EE-Merging.in
diff --git a/Tests/Rivet/Templates/LEP-Powheg.in b/Tests/Rivet/Templates/EE-Powheg.in
rename from Tests/Rivet/Templates/LEP-Powheg.in
rename to Tests/Rivet/Templates/EE-Powheg.in
diff --git a/Tests/Rivet/Templates/LEP.in b/Tests/Rivet/Templates/EE.in
rename from Tests/Rivet/Templates/LEP.in
rename to Tests/Rivet/Templates/EE.in
diff --git a/Tests/python/make_input_files.py b/Tests/python/make_input_files.py
--- a/Tests/python/make_input_files.py
+++ b/Tests/python/make_input_files.py
@@ -1,1936 +1,1938 @@
 #! /usr/bin/env python
 import logging,sys,os
 from string import strip, Template
 
 import sys
 if sys.version_info[:3] < (2,4,0):
     print "rivet scripts require Python version >= 2.4.0... exiting"
     sys.exit(1)
 
 if __name__ == "__main__":
     import logging
     from optparse import OptionParser, OptionGroup
     parser = OptionParser(usage="%prog name [...]")
 
 
 simulation=""
 
 numberOfAddedProcesses=0
 def addProcess(thefactory,theProcess,Oas,Oew,scale,mergedlegs,NLOprocesses):
     global numberOfAddedProcesses
     global simulation
     numberOfAddedProcesses+=1
     res ="set "+thefactory+":OrderInAlphaS "+Oas+"\n"
     res+="set "+thefactory+":OrderInAlphaEW "+Oew+"\n"
     res+="do "+thefactory+":Process "+theProcess+" "
     if ( mergedlegs != 0 ):
       if simulation!="Merging":
           print "simulation is not Merging, trying to add merged legs."
           sys.exit(1)
       res+="["
       for j in range(mergedlegs):
         res+=" j "
       res+="]"
     res+="\n"
     if (NLOprocesses!=0):
        if simulation!="Merging":
           print "simulation is not Merging, trying to add NLOProcesses."
           sys.exit(1)
        res+="set MergingFactory:NLOProcesses %s \n" % NLOprocesses
     if ( scale != "" ):
       res+="set "+thefactory+":ScaleChoice /Herwig/MatrixElements/Matchbox/Scales/"+scale+"\n"
     return res
 
 
 def addLeptonPairCut(minmass,maxmass):
     return "set /Herwig/Cuts/LeptonPairMassCut:MinMass "+minmass+"*GeV\nset /Herwig/Cuts/LeptonPairMassCut:MaxMass "+maxmass+"*GeV\n"
 
 didaddfirstjet=False
 def addFirstJet(ptcut):
     global didaddfirstjet
     if(didaddfirstjet):
       logging.error("Can only add jetcut once.")
       sys.exit(1)
   
     res="set  /Herwig/Cuts/Cuts:JetFinder  /Herwig/Cuts/JetFinder\n"
     res+="insert  /Herwig/Cuts/Cuts:MultiCuts 0  /Herwig/Cuts/JetCuts\n"
     res+="insert  /Herwig/Cuts/JetCuts:JetRegions 0  /Herwig/Cuts/FirstJet\n"
     if(ptcut!=""):
         res+="set /Herwig/Cuts/FirstJet:PtMin "+ptcut+".*GeV\n"
     didaddfirstjet=True
     return res
 
 
 
 didaddsecondjet=False
 def addSecondJet(ptcut):
     global didaddsecondjet
     if(didaddsecondjet):
       logging.error("Can only add second jetcut once.")
       sys.exit(1)
     res="insert /Herwig/Cuts/JetCuts:JetRegions 0  /Herwig/Cuts/SecondJet\n"
     res+="set /Herwig/Cuts/SecondJet:PtMin "+ptcut+".*GeV\n"
     didaddsecondjet=True
     return res
 
 
 didaddjetpair=False
 def addJetPairCut(minmass):
   global didaddjetpair
   if(didaddjetpair):
       logging.error("Can only add second jetcut once.")
       sys.exit(1)
   res="""\
 create ThePEG::JetPairRegion /Herwig/Cuts/JetPairMass JetCuts.so
 set /Herwig/Cuts/JetPairMass:FirstRegion /Herwig/Cuts/FirstJet
 set /Herwig/Cuts/JetPairMass:SecondRegion /Herwig/Cuts/SecondJet
 insert /Herwig/Cuts/JetCuts:JetPairRegions 0  /Herwig/Cuts/JetPairMass
 set /Herwig/Cuts/JetPairMass:MassMin {mm}.*GeV
 """.format(mm=minmass)
   didaddjetpair=True
   return res
 
 addedBRReweighter=False
 def addBRReweighter():
   global addedBRReweighter
   if(addedBRReweighter):
     logging.error("Can only add BRReweighter once.")
     sys.exit(1)
   res="create Herwig::BranchingRatioReweighter /Herwig/Generators/BRReweighter\n"
   res+="insert /Herwig/Generators/EventGenerator:EventHandler:PostHadronizationHandlers 0 /Herwig/Generators/BRReweighter\n"
   addedBRReweighter=True
   return res
 
 def setHardProcessWidthToZero(list1):
   res=""
   for i in list1:
     res+="set /Herwig/Particles/"+i+":HardProcessWidth 0.\n"
   return res
 
 selecteddecaymode=False
 def selectDecayMode(particle,decaymodes):
   global selecteddecaymode
   res="do /Herwig/Particles/"+particle+":SelectDecayModes"
   for decay in decaymodes:
     res+=" /Herwig/Particles/"+particle+"/"+decay
   res+="\n"
   selecteddecaymode=True
   return res
 
 def jet_kt_cut(energy):
     return "set /Herwig/Cuts/JetKtCut:MinKT {E}*GeV\n".format(E=energy)
 
 def mhatmin_cut(energy):
     return "set /Herwig/Cuts/Cuts:MHatMin {E}*GeV\n".format(E=energy)
 
 def mhat_minm_maxm(e1,e2,e3):
     return """\
 set /Herwig/Cuts/Cuts:MHatMin {e1}*GeV
 set /Herwig/Cuts/MassCut:MinM {e2}*GeV
 set /Herwig/Cuts/MassCut:MaxM {e3}*GeV
 """.format(**locals())
 
 def collider_lumi(energy):
     return "set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy {E}*GeV\n".format(E=energy)
 
 def insert_ME(me,process=None,ifname='Process',subprocess="SubProcess"):
     result = "insert /Herwig/MatrixElements/{subprocess}:MatrixElements 0 /Herwig/MatrixElements/{me}\n".format(**locals())
     if process is not None:
         result += "set /Herwig/MatrixElements/{me}:{ifname} {process}".format(**locals())
     return result
 
 def particlegroup(name,*particles):
     result = ["do /Herwig/MatrixElements/Matchbox/Factory:StartParticleGroup {n}".format(n=name)]
     for p in particles:
         result.append(
             "insert /Herwig/MatrixElements/Matchbox/Factory:ParticleGroup 0 /Herwig/Particles/{p}".format(p=p)
         )
     result.append("do /Herwig/MatrixElements/Matchbox/Factory:EndParticleGroup")
     return '\n'.join(result)
 
 # settings for four flavour scheme
 fourFlavour="""
 read Matchbox/FourFlavourScheme.in
 {bjetgroup}
 set /Herwig/Cuts/MatchboxJetMatcher:Group bjet
 """.format(bjetgroup=particlegroup('bjet','b','bbar','c', 'cbar',
                                    's','sbar','d','dbar','u','ubar','g'))
 
 ME_Upsilon = """\
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
 """ + insert_ME("MEUpsilon")
 
 
 (opts, args) = parser.parse_args()
 ## Check args
 if len(args) != 1:
     logging.error("Must specify at least input file")
     sys.exit(1)
 
 name = args[0]
 print name
 
 
 # select the template to load
 # collider
 KNOWN_COLLIDERS = [
     "GammaGamma",
-    "LEP-Gamma",
+    "EE-Gamma",
     "BFactory",
-    "LEP",
+    "EE",
     "DIS",
     "TVT",
     "LHC-GammaGamma",
     "LHC",
     "ISR",
     "SppS",
     "Star",
     "EHS",
 ]
 collider = ""
 for cand_collider in KNOWN_COLLIDERS:
     if cand_collider in name:
         collider = cand_collider
         break
 del cand_collider
 assert collider
 have_hadronic_collider = collider in ["TVT","LHC","ISR","SppS","Star","EHS"]
 
 thefactory="Factory"
 
 parameters = { 
     'shower'  : '',
     'bscheme' : '',
 }
 # istart determines how many name parts need to be skipped
 istart = 1
 # Dipole shower with Matchbox Powheg
 if "Dipole-Matchbox-Powheg" in name :
     istart = 4
     simulation="Matchbox"
     parameters["shower"]  = "read Matchbox/Powheg-DipoleShower.in\n"
 
     # Dipole shower with internal Powheg - Todo: Finish modifying template files.
     '''
     elif "Dipole-Powheg" in name :
     istart = 3
     simulation="Powheg"
     parameters["shower"]  = "set /Herwig/EventHandlers/EventHandler:CascadeHandler /Herwig/DipoleShower/DipoleShowerHandler\nread snippets/Dipole_AutoTune_prel.in\n"
     '''
 
 # Dipole shower with MCatNLO
 elif "Dipole-MCatNLO" in name :
     istart = 3
     simulation="Matchbox"
     parameters["shower"]  = "read Matchbox/MCatNLO-DipoleShower.in\n" 
 
 # Dipole shower with Matchbox LO
 elif "Dipole-Matchbox-LO" in name :
     istart = 4
     simulation="Matchbox"
     parameters["shower"]  = "read Matchbox/LO-DipoleShower.in\n" 
 
 # Dipole shower with internal LO
 elif "Dipole" in name :
     istart = 2
     simulation=""
     parameters["shower"]  = "set /Herwig/EventHandlers/EventHandler:CascadeHandler /Herwig/DipoleShower/DipoleShowerHandler\nread snippets/Dipole_AutoTune_prel.in\n"
     
 # AO shower with Matchbox Powheg
 elif "Matchbox-Powheg" in name :
     istart = 3
     simulation="Matchbox"
     parameters["shower"] = "read Matchbox/Powheg-DefaultShower.in\n"
 
 # AO shower with MCatNLO
 elif "Matchbox" in name :
     istart = 2
     simulation="Matchbox"
     parameters["shower"] = "read Matchbox/MCatNLO-DefaultShower.in\n"
 
 # AO shower with inernal Powheg    
 elif "Powheg" in name :
     istart = 2
     simulation="Powheg"
 
 # Dipole shower with merging    
 elif "Merging" in name :
     istart = 2
     simulation="Merging"
     thefactory="MergingFactory"
     
 # Flavour settings for Matchbox    
 if simulation=="Matchbox" :
     parameters["bscheme"] = "read Matchbox/FiveFlavourScheme.in\n"
     
     if "Dipole" in parameters["shower"] :
         parameters["bscheme"] += "read Matchbox/FiveFlavourNoBMassScheme.in\n"
         
-    if collider not in ['DIS','LEP'] :
+    if collider not in ['DIS','EE'] :
         parameters["nlo"] = "read Matchbox/MadGraph-OpenLoops.in\n"
 
 # Flavour settings for dipole shower with internal ME
 if simulation=="" and "Dipole" in parameters["shower"] :
     parameters["bscheme"] = "read snippets/DipoleShowerFiveFlavours.in"
     
 
 
 # find the template
 if simulation=="" :
     if collider=="LHC-GammaGamma" :
         istart += 1
         templateName="Hadron-Gamma.in"
     elif have_hadronic_collider :
         templateName="Hadron.in"
-    elif collider=="LEP-Gamma" :
+    elif collider=="EE-Gamma" :
         istart+=1
         if("Direct" in name) :
-            templateName="LEP-Gamma-Direct.in"
+            templateName="EE-Gamma-Direct.in"
         elif("Single-Resolved" in name) :
-            templateName="LEP-Gamma-Single-Resolved.in"
+            templateName="EE-Gamma-Single-Resolved.in"
         elif("Double-Resolved" in name) :
-            templateName="LEP-Gamma-Double-Resolved.in"
+            templateName="EE-Gamma-Double-Resolved.in"
         else :
-            print "Unknown type of LEP-Gamma event ",name
+            print "Unknown type of EE-Gamma event ",name
             quit()
     elif collider=="GammaGamma" :
         templateName="GammaGamma.in"
     elif collider != "BFactory" :
         templateName= "%s.in" % collider
     else :
-        templateName= "LEP.in"
+        templateName= "EE.in"
 else :
     if have_hadronic_collider :
         templateName= "Hadron-%s.in" % simulation 
     elif collider != "BFactory" :
         templateName= "%s-%s.in" % (collider,simulation) 
     else :
-        templateName= "LEP-%s.in" % simulation 
+        templateName= "EE-%s.in" % simulation 
 
 # work out the name of the parameter file
 parameterName="-".join(name.split("-")[istart:])
 del istart
 
 class StringBuilder(object):
     """
     Avoid expensive string additions until the end
     by building up a list first.
 
     This helper class avoids rewriting all the += lower down
     to list operations.
     """
     def __init__(self, init = None):
         self.lines = [] if init is None else [init]
 
     def __iadd__(self, line):
         self.lines.append(line)
         return self
 
     def __str__(self):
         return '\n'.join(self.lines)
 
 # work out the process and parameters
 process=StringBuilder()
-# Bfactory
-if(collider=="BFactory") :
-    if(simulation=="") :
-        if(parameterName=="10.58-res") :
-            process += ME_Upsilon
-        elif(parameterName=="10.58") :
-            process += ME_Upsilon
-            process += "set /Herwig/MatrixElements/MEee2gZ2qq:MaximumFlavour 4\n"
-        else :
-            process+=insert_ME("MEee2gZ2qq")
-            process+= "set /Herwig/MatrixElements/MEee2gZ2qq:MaximumFlavour 4\n"
-    elif(simulation=="Powheg") :
-        process = StringBuilder("set /Herwig/MatrixElements/PowhegMEee2gZ2qq:MaximumFlavour 4\n")
-    elif(simulation=="Matchbox" ) :
-        process = StringBuilder(addProcess(thefactory,"e- e+ -> u ubar","0","2","",0,0))
-        process+=addProcess(thefactory,"e- e+ -> d dbar","0","2","",0,0)
-        process+=addProcess(thefactory,"e- e+ -> c cbar","0","2","",0,0)
-        process+=addProcess(thefactory,"e- e+ -> s sbar","0","2","",0,0)
-    elif(simulation=="Merging" ) :
-        logging.warning("BFactory not explicitly tested for %s " % simulation)
-        sys.exit(0)
 
 # DIS
-elif(collider=="DIS") :
+if(collider=="DIS") :
     if(simulation=="") :
         if "NoME" in parameterName :
             process = StringBuilder("set /Herwig/Shower/ShowerHandler:HardEmission None")
             parameterName=parameterName.replace("NoME-","")
         else :
             process = StringBuilder("")
     elif(simulation=="Powheg") :
         process = StringBuilder("")
     elif(simulation=="Matchbox" ) :
       if "e-" in parameterName :
             process = StringBuilder(addProcess(thefactory,"e- p -> e- j","0","2","",0,0))
       else :
             process = StringBuilder(addProcess(thefactory,"e+ p -> e+ j","0","2","",0,0))
     elif(simulation=="Merging" ) :
         if "e-" in parameterName :
             process = StringBuilder(addProcess(thefactory,"e- p -> e- j","0","2","",2,2))
         else :
             process = StringBuilder(addProcess(thefactory,"e+ p -> e+ j","0","2","",2,2))
 
-# LEP
-elif(collider=="LEP") :
+# EE
+elif(collider=="EE") :
     if(simulation=="") :
         if "gg" in parameterName :
             process = StringBuilder("create Herwig::MEee2Higgs2SM /Herwig/MatrixElements/MEee2Higgs2SM\n")
             process+=insert_ME("MEee2Higgs2SM","Gluon","Allowed")
         else :
-            process = StringBuilder(insert_ME("MEee2gZ2qq"))
-            if(parameterName=="10") :
-                process+="set /Herwig/MatrixElements/MEee2gZ2qq:MaximumFlavour 4"
+            if(parameterName=="10.58-res") :
+                process += ME_Upsilon
+            elif(parameterName=="10.58") :
+                process += ME_Upsilon
+                process += "set /Herwig/MatrixElements/MEee2gZ2qq:MaximumFlavour 4\n"
+            else :
+                process = StringBuilder(insert_ME("MEee2gZ2qq"))
+                try :
+                    ecms = float(parameterName)
+                    if(ecms<=10.1) :
+                        process+= "set /Herwig/MatrixElements/MEee2gZ2qq:MaximumFlavour 4\n"
+                except :
+                    pass
     elif(simulation=="Powheg") :
         process = StringBuilder()
         if(parameterName=="10") :
-            process = StringBuilder("set /Herwig/MatrixElements/PowhegMEee2gZ2qq:MaximumFlavour 4")
+            process = StringBuilder()
+            try :
+                ecms = float(parameterName)
+                if(ecms<=10.1) :
+                    process+= "set /Herwig/MatrixElements/PowhegMEee2gZ2qq:MaximumFlavour 4\n"
+            except :
+                pass
     elif(simulation=="Matchbox" ) :
-        if(parameterName=="10") :
-            process = StringBuilder(addProcess(thefactory,"e- e+ -> u ubar","0","2","",0,0))
-            process+=addProcess(thefactory,"e- e+ -> d dbar","0","2","",0,0)
-            process+=addProcess(thefactory,"e- e+ -> c cbar","0","2","",0,0)
-            process+=addProcess(thefactory,"e- e+ -> s sbar","0","2","",0,0)
-        else :
+        try :
+            ecms = float(parameterName)
+            if(ecms<=10.1) :
+                process = StringBuilder(addProcess(thefactory,"e- e+ -> u ubar","0","2","",0,0))
+                process+=addProcess(thefactory,"e- e+ -> d dbar","0","2","",0,0)
+                process+=addProcess(thefactory,"e- e+ -> c cbar","0","2","",0,0)
+                process+=addProcess(thefactory,"e- e+ -> s sbar","0","2","",0,0)
+            else :
+                process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",0,0))
+        except:
             process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",0,0))
-
     elif(simulation=="Merging" ) :
-        if(parameterName=="10") :
-          process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",2,2))
-          process+="read Matchbox/FourFlavourScheme.in"
-        else :
-          process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",2,2))
-# LEP-Gamma
-elif(collider=="LEP-Gamma") :
+        try :
+            ecms = float(parameterName)
+            if(ecms<=10.1) :
+                process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",2,2))
+                process+="read Matchbox/FourFlavourScheme.in"
+            else :
+                process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",2,2))
+        except:
+            process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",2,2))
+# EE-Gamma
+elif(collider=="EE-Gamma") :
     if(simulation=="") :
         if("mumu" in parameterName) :
             process = StringBuilder(insert_ME("MEgg2ff","Muon"))
             process +="set /Herwig/Cuts/Cuts:MHatMin 3.\n"
         elif( "tautau" in parameterName) :
             process = StringBuilder(insert_ME("MEgg2ff","Tau"))
             process +="set /Herwig/Cuts/Cuts:MHatMin 3.\n"
         elif( "Jets" in parameterName) :
             if("Direct" in parameterName ) :
                 process = StringBuilder(insert_ME("MEgg2ff","Quarks"))
             elif("Single-Resolved" in parameterName ) :
                 process = StringBuilder(insert_ME("MEGammaP2Jets",None,"Process","SubProcess"))
                 process+= insert_ME("MEGammaP2Jets",None,"Process","SubProcess2")
             else :
                 process = StringBuilder(insert_ME("MEQCD2to2"))
             process+="insert /Herwig/Cuts/Cuts:OneCuts[0] /Herwig/Cuts/JetKtCut"
             process+="set  /Herwig/Cuts/JetKtCut:MinKT 3."
         else :
-            print "process not supported for Gamma Gamma processes at LEP"
+            print "process not supported for Gamma Gamma processes at EE"
             quit()
     else :
-        print "Only internal matrix elements currently supported for Gamma Gamma processes at LEP"
+        print "Only internal matrix elements currently supported for Gamma Gamma processes at EE"
         quit()
 elif(collider=="GammaGamma") :
     if(simulation=="") :
         if("mumu" in parameterName) :
             process = StringBuilder(insert_ME("MEgg2ff"))
             process +="set /Herwig/MatrixElements/MEgg2ff:Process Muon\n"
             process +="set /Herwig/Cuts/Cuts:MHatMin 3.\n"
         else :
-            print "process not supported for Gamma Gamma processes at LEP"
+            print "process not supported for Gamma Gamma processes at EE"
             quit()
     else :
-        print "Only internal matrix elements currently supported for Gamma Gamma processes at LEP"
+        print "Only internal matrix elements currently supported for Gamma Gamma processes at EE"
         quit()
 # TVT
 elif(collider=="TVT") :
     process = StringBuilder("set /Herwig/Generators/EventGenerator:EventHandler:BeamB /Herwig/Particles/pbar-\n")
     if "Run-II" in parameterName :  process+=collider_lumi(1960.0)
     elif "Run-I" in parameterName : process+=collider_lumi(1800.0)
     elif "900" in parameterName :   process+=collider_lumi(900.0)
     elif "630" in parameterName :   process+=collider_lumi(630.0)
     elif "300" in parameterName :   process+=collider_lumi(300.0)
 
     if(simulation=="") :
         if "PromptPhoton" in parameterName :
             process+=insert_ME("MEGammaJet")
             process+="set /Herwig/Cuts/PhotonKtCut:MinKT 15.\n"
         elif "DiPhoton-GammaGamma" in parameterName :
             process+=insert_ME("MEGammaGamma")
             process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
             parameterName=parameterName.replace("-GammaGamma","")
         elif "DiPhoton-GammaJet" in parameterName :
             process+=insert_ME("MEGammaJet")
             process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
             parameterName=parameterName.replace("-GammaJet","")
         elif "UE" in parameterName :
             if "Dipole" in parameters["shower"]:
                 process+="read snippets/MB-DipoleShower.in\n"
             else:
                 process+="read snippets/MB.in\n"
             process+="read snippets/Diffraction.in\n"
                 
             process += "set /Herwig/Decays/DecayHandler:LifeTimeOption 0\n"
             process += "set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm\n"
         elif "Jets" in parameterName :
             process+=insert_ME("MEQCD2to2")
             process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
             if "Run-II-Jets-10" in parameterName :  process+=jet_kt_cut( 30.)+mhatmin_cut(500.)
             elif "Run-II-Jets-11" in parameterName: process+=jet_kt_cut( 30.)+mhatmin_cut(900.)
             elif "Run-I-Jets-1" in parameterName :  process+=jet_kt_cut( 20.)
             elif "Run-I-Jets-2" in parameterName :  process+=jet_kt_cut( 40.)
             elif "Run-I-Jets-3" in parameterName :  process+=jet_kt_cut( 65.)
             elif "Run-I-Jets-4" in parameterName :  process+=jet_kt_cut( 90.)
             elif "Run-I-Jets-5" in parameterName :  process+=jet_kt_cut(160.)
             elif "Run-I-Jets-6" in parameterName :  process+=jet_kt_cut( 30.)+mhatmin_cut(100.)
             elif "Run-I-Jets-7" in parameterName :  process+=jet_kt_cut( 30.)+mhatmin_cut(400.)
             elif "Run-I-Jets-8" in parameterName :  process+=jet_kt_cut( 30.)+mhatmin_cut(700.)
             elif "Run-II-Jets-0" in parameterName : process+=jet_kt_cut( 15.)
             elif "Run-II-Jets-1" in parameterName : process+=jet_kt_cut( 25.)
             elif "Run-II-Jets-2" in parameterName : process+=jet_kt_cut( 40.)
             elif "Run-II-Jets-3" in parameterName : process+=jet_kt_cut( 60.)
             elif "Run-II-Jets-4" in parameterName : process+=jet_kt_cut( 85.)
             elif "Run-II-Jets-5" in parameterName : process+=jet_kt_cut(110.)
             elif "Run-II-Jets-6" in parameterName : process+=jet_kt_cut(160.)
             elif "Run-II-Jets-7" in parameterName : process+=jet_kt_cut(250.)
             elif "Run-II-Jets-8" in parameterName : process+=jet_kt_cut( 30.)+mhatmin_cut(100.)
             elif "Run-II-Jets-9" in parameterName : process+=jet_kt_cut( 30.)+mhatmin_cut(300.)
             elif "900-Jets-1" in parameterName :    process+=jet_kt_cut( 10.)
             elif "300-Jets-1" in parameterName :    process+=jet_kt_cut(  6.)
             elif "630-Jets-1" in parameterName :    process+=jet_kt_cut( 20.)
             elif "630-Jets-2" in parameterName :    process+=jet_kt_cut( 40.)
             elif "630-Jets-3" in parameterName :    process+=jet_kt_cut( 75.)
             elif "900-Jets-1" in parameterName :    process+=jet_kt_cut( 10.)
         elif "Run-I-WZ" in parameterName :
             process+=insert_ME("MEqq2W2ff","Electron")
             process+=insert_ME("MEqq2gZ2ff","Electron")
         elif "Run-II-W" in parameterName or "Run-I-W" in parameterName :
             process+=insert_ME("MEqq2W2ff","Electron")
         elif "Run-II-Z-e" in parameterName or "Run-I-Z" in parameterName :
             process +=insert_ME("MEqq2gZ2ff","Electron")
         elif "Run-II-Z-LowMass-mu" in parameterName :
             process +=insert_ME("MEqq2gZ2ff","Muon")
             process+=addLeptonPairCut("25","70")
         elif "Run-II-Z-HighMass-mu" in parameterName :
             process +=insert_ME("MEqq2gZ2ff","Muon")
             process+=addLeptonPairCut("150","600")
         elif "Run-II-Z-mu" in parameterName :
             process +=insert_ME("MEqq2gZ2ff","Muon")
     elif(simulation=="Powheg") :
         if "Run-I-WZ" in parameterName :
             process+=insert_ME("PowhegMEqq2W2ff","Electron")
             process+=insert_ME("PowhegMEqq2gZ2ff","Electron")
         elif "Run-II-W" in parameterName or "Run-I-W" in parameterName :
             process+=insert_ME("PowhegMEqq2W2ff","Electron")
         elif "Run-II-Z-e" in parameterName or "Run-I-Z" in parameterName :
             process+=insert_ME("PowhegMEqq2gZ2ff","Electron")
         elif "Run-II-Z-LowMass-mu" in parameterName :
             process+=insert_ME("PowhegMEqq2gZ2ff","Muon")
             process+=addLeptonPairCut("25","70")
         elif "Run-II-Z-HighMass-mu" in parameterName :
             process+=insert_ME("PowhegMEqq2gZ2ff","Muon")
             process+=addLeptonPairCut("150","600")
         elif "Run-II-Z-mu" in parameterName :
             process+=insert_ME("PowhegMEqq2gZ2ff","Muon")
         elif "DiPhoton-GammaGamma" in parameterName :
             process+=insert_ME("MEGammaGammaPowheg","GammaGamma")
             process+=insert_ME("MEGammaGamma","gg")
             process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
             process+=jet_kt_cut(5.)
             parameterName=parameterName.replace("-GammaGamma","")
         elif "DiPhoton-GammaJet" in parameterName :
             process+=insert_ME("MEGammaGammaPowheg","VJet")
             process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
             process+=jet_kt_cut(5.)
             parameterName=parameterName.replace("-GammaJet","")
     elif(simulation=="Matchbox" or simulation=="Merging" ) :
         if "Jets" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p p -> j j","2","0","MaxJetPtScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p p -> j j","2","0","MaxJetPtScale",1,0)
             process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
             if "Run-II-Jets-10" in parameterName :
                 process+=addFirstJet("30")
                 process+=addSecondJet("25")
                 process+=addJetPairCut("500")
             elif "Run-II-Jets-11" in parameterName :
                 process+=addFirstJet("30")
                 process+=addSecondJet("25")
                 process+=addJetPairCut("900")
             elif "Run-II-Jets-12" in parameterName :
                 process+=addFirstJet("30")
                 process+=addSecondJet("25")
                 process+=addJetPairCut("300")
             elif "Run-I-Jets-1" in parameterName : process+=addFirstJet("20")
             elif "Run-I-Jets-2" in parameterName : process+=addFirstJet("40")
             elif "Run-I-Jets-3" in parameterName : process+=addFirstJet("65")
             elif "Run-I-Jets-4" in parameterName : process+=addFirstJet("90")
             elif "Run-I-Jets-5" in parameterName : process+=addFirstJet("160")
             elif "Run-I-Jets-6" in parameterName : process+=addFirstJet("30")+addSecondJet("25")+addJetPairCut("100")
             elif "Run-I-Jets-7" in parameterName : process+=addFirstJet("30")+addSecondJet("25")+addJetPairCut("400")
             elif "Run-I-Jets-8" in parameterName : process+=addFirstJet("30")+addSecondJet("25")+addJetPairCut("700")
             elif "Run-II-Jets-0" in parameterName : process+=addFirstJet("15")
             elif "Run-II-Jets-1" in parameterName : process+=addFirstJet("25")
             elif "Run-II-Jets-2" in parameterName : process+=addFirstJet("40")
             elif "Run-II-Jets-3" in parameterName : process+=addFirstJet("60")
             elif "Run-II-Jets-4" in parameterName : process+=addFirstJet("85")
             elif "Run-II-Jets-5" in parameterName : process+=addFirstJet("110")
             elif "Run-II-Jets-6" in parameterName : process+=addFirstJet("160")
             elif "Run-II-Jets-7" in parameterName : process+=addFirstJet("250")
             elif "Run-II-Jets-8" in parameterName : process+=addFirstJet("30")+addSecondJet("25")+addJetPairCut("100")
             elif "Run-II-Jets-9" in parameterName : process+=addFirstJet("30")+addSecondJet("25")+addJetPairCut("300")
             elif "900-Jets-1" in parameterName : process+=addFirstJet("10")
             elif "300-Jets-1" in parameterName : process+=addFirstJet("6")
             elif "630-Jets-1" in parameterName : process+=addFirstJet("20")
             elif "630-Jets-2" in parameterName : process+=addFirstJet("40")
             elif "630-Jets-3" in parameterName : process+=addFirstJet("75")
             elif "900-Jets-1" in parameterName : process+=addFirstJet("10")
             else :
                 logging.error("Exit 00007")
                 sys.exit(1)
         elif "Run-I-WZ" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p pbar e+ e-","0","2","LeptonPairMassScale",0,0)
                 process+=addProcess(thefactory,"p pbar e+ nu","0","2","LeptonPairMassScale",0,0)
                 process+=addProcess(thefactory,"p pbar e- nu","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=particlegroup('epm','e+','e-')
                 process+=particlegroup('epmnu','e+','e-','nu_e','nu_ebar')
                 process+=addProcess(thefactory,"p pbar epm epmnu","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("60","120")
         elif "Run-II-W" in parameterName or "Run-I-W" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p pbar e+ nu","0","2","LeptonPairMassScale",0,0)
                 process+=addProcess(thefactory,"p pbar e- nu","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=particlegroup('epm','e+','e-')
                 process+=addProcess(thefactory,"p pbar epm nu","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("60","120")
         elif "Run-II-Z-e" in parameterName or "Run-I-Z" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p pbar e+ e-","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p pbar e+ e-","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("60","120")
         elif "Run-II-Z-LowMass-mu" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("25","70")
         elif "Run-II-Z-HighMass-mu" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("150","600")
         elif "Run-II-Z-mu" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("60","120")
 # Star
 elif(collider=="Star" ) :
     process = StringBuilder("set /Herwig/Decays/DecayHandler:LifeTimeOption 0\n")
     process+= "set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm\n"
     process+= "set /Herwig/Generators/EventGenerator:EventHandler:BeamB /Herwig/Particles/p+\n"
     process+= collider_lumi(200.0)
     process+= "set /Herwig/Cuts/Cuts:X2Min 0.01\n"
     if(simulation=="") :
         if "UE" in parameterName :
             if "Dipole" in parameters["shower"]:
                 process+="read snippets/MB-DipoleShower.in\n"
             else:
                 process+="read snippets/MB.in\n"    
             process+="read snippets/Diffraction.in\n"
             
             
         else :
             process+=insert_ME("MEQCD2to2")
             process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
             if "Jets-1" in parameterName :   process+=jet_kt_cut(2.)
             elif "Jets-2" in parameterName : process+=jet_kt_cut(5.)
             elif "Jets-3" in parameterName : process+=jet_kt_cut(20.)
             elif "Jets-4" in parameterName : process+=jet_kt_cut(25.)
     else :
         logging.error("Star not supported for %s " % simulation)
         sys.exit(1)
 # ISR and SppS
 elif(collider=="ISR" or collider =="SppS" or collider == "EHS" ) :
     process = StringBuilder("set /Herwig/Decays/DecayHandler:LifeTimeOption 0\n")
     process+="set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm\n"
     if(collider=="SppS") :
         process = StringBuilder("set /Herwig/Generators/EventGenerator:EventHandler:BeamB /Herwig/Particles/pbar-\n")
     if    "30" in parameterName : process+=collider_lumi( 30.4)
     elif  "44" in parameterName : process+=collider_lumi( 44.4)
     elif  "53" in parameterName : process+=collider_lumi( 53.0)
     elif  "62" in parameterName : process+=collider_lumi( 62.2)
     elif  "63" in parameterName : process+=collider_lumi( 63.0)
     elif "200" in parameterName : process+=collider_lumi(200.0)
     elif "500" in parameterName : process+=collider_lumi(500.0)
     elif "546" in parameterName : process+=collider_lumi(546.0)
     elif "900" in parameterName : process+=collider_lumi(900.0)
     if(simulation=="") :
         if "Dipole" in parameters["shower"]:
             process+="read snippets/MB-DipoleShower.in\n"
         else:
             process+="read snippets/MB.in\n"
         process+="read snippets/Diffraction.in\n"
     else :
         logging.error(" SppS and ISR not supported for %s " % simulation)
         sys.exit(1)
 # LHC
 elif(collider=="LHC") :
     if   parameterName.startswith("7-")   : process = StringBuilder(collider_lumi(7000.0))
     elif parameterName.startswith("8-")   : process = StringBuilder(collider_lumi(8000.0))
     elif parameterName.startswith("13-")  : process = StringBuilder(collider_lumi(13000.0))
     elif parameterName.startswith("900")  : process = StringBuilder(collider_lumi(900.0))
     elif parameterName.startswith("2360") : process = StringBuilder(collider_lumi(2360.0))
     elif parameterName.startswith("2760") : process = StringBuilder(collider_lumi(2760.0))
     else                                  : process = StringBuilder(collider_lumi(7000.0))
     if(simulation=="") :
         if "VBF" in parameterName :
             process+=insert_ME("MEPP2HiggsVBF")
             if "GammaGamma" in parameterName :
                process+=selectDecayMode("h0",["h0->gamma,gamma;"])
                addedBRReweighter = True
             elif "WW" in parameterName :
                process+=selectDecayMode("h0",["h0->W+,W-;"])
                addedBRReweighter = True
             elif "ZZ" in parameterName :
                process+=selectDecayMode("h0",["h0->Z0,Z0;"])
                addedBRReweighter = True
             elif "8-" not in parameterName :
                 process+=selectDecayMode("h0",["h0->tau-,tau+;"])
                 addedBRReweighter = True
                 process+="set /Herwig/Particles/tau-:Stable Stable\n"
                 
         elif "ggHJet" in parameterName :
             process+=selectDecayMode("h0",["h0->tau-,tau+;"])
             addedBRReweighter = True
             process+="set /Herwig/Particles/tau-:Stable Stable\n"
             process+=insert_ME("MEHiggsJet")
             process+=jet_kt_cut(20.)
         elif "ggH" in parameterName :
             process+=insert_ME("MEHiggs")
             process+=insert_ME("MEHiggsJet","qqbar")
             process+=jet_kt_cut(0.0)
             if "GammaGamma" in parameterName :
                process+=selectDecayMode("h0",["h0->gamma,gamma;"])
                addedBRReweighter = True
             elif "WW" in parameterName :
                process+=selectDecayMode("h0",["h0->W+,W-;"])
                addedBRReweighter = True
             elif "ZZ" in parameterName :
                process+=selectDecayMode("h0",["h0->Z0,Z0;"])
                addedBRReweighter = True
             elif "8-" not in parameterName :
                 process+=selectDecayMode("h0",["h0->tau-,tau+;"])
                 addedBRReweighter = True
                 process+="set /Herwig/Particles/tau-:Stable Stable\n"
                 
         elif "PromptPhoton" in parameterName :
             process+=insert_ME("MEGammaJet")
             if "PromptPhoton-1" in parameterName :
                 process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
             elif "PromptPhoton-2" in parameterName :
                 process+="set /Herwig/Cuts/PhotonKtCut:MinKT 25.\n"
             elif "PromptPhoton-3" in parameterName :
                 process+="set /Herwig/Cuts/PhotonKtCut:MinKT 80.\n"
             elif "PromptPhoton-4" in parameterName :
                 process+="set /Herwig/Cuts/PhotonKtCut:MinKT 150.\n"
         elif "DiPhoton-GammaGamma" in parameterName :
             process+=insert_ME("MEGammaGamma")
             process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
             parameterName=parameterName.replace("-GammaGamma","")
         elif "DiPhoton-GammaJet" in parameterName :
             process+=insert_ME("MEGammaJet")
             process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
             parameterName=parameterName.replace("-GammaJet","")
         elif "8-WH" in parameterName :
             process+=insert_ME("MEPP2WH")
             process+=jet_kt_cut(0.0)
             if "GammaGamma" in parameterName :
                process+=selectDecayMode("h0",["h0->gamma,gamma;"])
                addedBRReweighter = True
             elif "WW" in parameterName :
                process+=selectDecayMode("h0",["h0->W+,W-;"])
                addedBRReweighter = True
             elif "ZZ" in parameterName :
                process+=selectDecayMode("h0",["h0->Z0,Z0;"])
                addedBRReweighter = True
         elif "8-ZH" in parameterName :
             process+=insert_ME("MEPP2ZH")
             process+=jet_kt_cut(0.0)
             if "GammaGamma" in parameterName :
                process+=selectDecayMode("h0",["h0->gamma,gamma;"])
                addedBRReweighter = True
             elif "WW" in parameterName :
                process+=selectDecayMode("h0",["h0->W+,W-;"])
                addedBRReweighter = True
             elif "ZZ" in parameterName :
                process+=selectDecayMode("h0",["h0->Z0,Z0;"])
                addedBRReweighter = True
         elif "WH" in parameterName :
             process+=selectDecayMode("h0",["h0->b,bbar;"])
             process+=selectDecayMode("W+",["W+->nu_e,e+;",
                                            "W+->nu_mu,mu+;"])
             addedBRReweighter = True
             process+=insert_ME("MEPP2WH")
             process+=jet_kt_cut(0.0)
         elif "ZH" in parameterName :
             process+=selectDecayMode("h0",["h0->b,bbar;"])
             process+=selectDecayMode("Z0",["Z0->e-,e+;",
                                            "Z0->mu-,mu+;"])
             addedBRReweighter = True
             process+=insert_ME("MEPP2ZH")
             process+=jet_kt_cut(0.0)
         elif "UE" in parameterName :
             if "Dipole" in parameters["shower"]:
                 process+="read snippets/MB-DipoleShower.in\n"
             else:
                 process+="set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV\n"                
                 process+="read snippets/MB.in\n"
             process+="read snippets/Diffraction.in\n"
             if "Long" in parameterName :
                 process += "set /Herwig/Decays/DecayHandler:MaxLifeTime 100*mm\n"
         elif "8-DiJets" in parameterName or "7-DiJets" in parameterName or "13-DiJets" in parameterName :
             process+=insert_ME("MEQCD2to2")
             process+="set MEQCD2to2:MaximumFlavour 5\n"
             process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
             if "13-DiJets" not in parameterName :
                 if "-A" in parameterName :
                     process+=jet_kt_cut(45.)
                     process+="set /Herwig/Cuts/JetKtCut:MinEta -3.\n"
                     process+="set /Herwig/Cuts/JetKtCut:MaxEta  3.\n"
                 elif "-B" in parameterName :
                     process+=jet_kt_cut(20.)
                     process+="set /Herwig/Cuts/JetKtCut:MinEta -2.7\n"
                     process+="set /Herwig/Cuts/JetKtCut:MaxEta  2.7\n"
                 elif "-C" in parameterName :
                     process+=jet_kt_cut(20.)
                     process+="set /Herwig/Cuts/JetKtCut:MinEta -4.8\n"
                     process+="set /Herwig/Cuts/JetKtCut:MaxEta  4.8\n"
             else :
                 if "-A" in parameterName :
                     process+=jet_kt_cut(60.)
                     process+="set /Herwig/Cuts/JetKtCut:MinEta -3.\n"
                     process+="set /Herwig/Cuts/JetKtCut:MaxEta  3.\n"
                 elif "-B" in parameterName :
                     process+=jet_kt_cut(180.)
                     process+="set /Herwig/Cuts/JetKtCut:MinEta -3.\n"
                     process+="set /Herwig/Cuts/JetKtCut:MaxEta  3.\n"
                 
             if "DiJets-1" in parameterName   : process+=mhatmin_cut(90.)
             elif "DiJets-2" in parameterName : process+=mhatmin_cut(200.)
             elif "DiJets-3" in parameterName : process+=mhatmin_cut(450.)
             elif "DiJets-4" in parameterName : process+=mhatmin_cut(750.)
             elif "DiJets-5" in parameterName : process+=mhatmin_cut(950.)
             elif "DiJets-6" in parameterName : process+=mhatmin_cut(1550.)
             elif "DiJets-7" in parameterName : process+=mhatmin_cut(2150.)
             elif "DiJets-8" in parameterName : process+=mhatmin_cut(2750.)
             elif "DiJets-9" in parameterName : process+=mhatmin_cut(3750.)
             elif "DiJets-10" in parameterName : process+=mhatmin_cut(4750.)
             elif "DiJets-11" in parameterName : process+=mhatmin_cut(5750.)
         elif(      "7-Jets" in parameterName 
                or  "8-Jets" in parameterName 
                or "13-Jets" in parameterName 
                or "2760-Jets" in parameterName 
             ) :
             process+=insert_ME("MEQCD2to2")
             process+="set MEQCD2to2:MaximumFlavour 5\n"
             process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
             if "Jets-10" in parameterName  : process+=jet_kt_cut(1800.)
             elif "Jets-0" in parameterName : process+=jet_kt_cut(5.)
             elif "Jets-1" in parameterName : process+=jet_kt_cut(10.)
             elif "Jets-2" in parameterName : process+=jet_kt_cut(20.)
             elif "Jets-3" in parameterName : process+=jet_kt_cut(40.)
             elif "Jets-4" in parameterName : process+=jet_kt_cut(70.)
             elif "Jets-5" in parameterName : process+=jet_kt_cut(150.)
             elif "Jets-6" in parameterName : process+=jet_kt_cut(200.)
             elif "Jets-7" in parameterName : process+=jet_kt_cut(300.)
             elif "Jets-8" in parameterName : process+=jet_kt_cut(500.)
             elif "Jets-9" in parameterName : process+=jet_kt_cut(800.)
         elif(    "7-Charm" in parameterName  or "7-Bottom" in parameterName
              or "8-Bottom" in parameterName) :
             
             if("8-Bottom" in parameterName) :
                 addBRReweighter()
                 process+=selectDecayMode("Jpsi",["Jpsi->mu-,mu+;"])
                 
             if "Bottom" in parameterName :
                 process+="cp MEHeavyQuark MEBottom\n" 
                 process+="set MEBottom:QuarkType Bottom\n"
                 process+=insert_ME("MEBottom")
             else : 
                 process+="cp MEHeavyQuark MECharm\n" 
                 process+="set MECharm:QuarkType Charm\n"
                 process+=insert_ME("MECharm")
             process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
             if "-0" in parameterName :
                 if "Bottom" in parameterName :
                     process+="set MEBottom:Process Pair\n" 
                 process+=jet_kt_cut(0.)
             elif "-1" in parameterName : process+=jet_kt_cut(5.)
             elif "-2" in parameterName : process+=jet_kt_cut(15.)
             elif "-3" in parameterName : process+=jet_kt_cut(20.)
             elif "-4" in parameterName : process+=jet_kt_cut(50.)
             elif "-5" in parameterName : process+=jet_kt_cut(80.)
             elif "-6" in parameterName : process+=jet_kt_cut(110.)
             elif "-7" in parameterName : process+=jet_kt_cut(30.)+mhatmin_cut(90.)
             elif "-8" in parameterName : process+=jet_kt_cut(30.)+mhatmin_cut(340.)
             elif "-9" in parameterName : process+=jet_kt_cut(30.)+mhatmin_cut(500.)
         elif "Top-L" in parameterName :
             process+="set MEHeavyQuark:QuarkType Top\n"
             process+=insert_ME("MEHeavyQuark")
             process+=selectDecayMode("t",["t->nu_e,e+,b;",
                                           "t->nu_mu,mu+,b;"])
             process+=addBRReweighter()
             
         elif "Top-SL" in parameterName :
             process+="set MEHeavyQuark:QuarkType Top\n"
             process+=insert_ME("MEHeavyQuark")
             process+="set /Herwig/Particles/t:Synchronized Not_synchronized\n"
             process+="set /Herwig/Particles/tbar:Synchronized Not_synchronized\n"
             process+=selectDecayMode("t",["t->nu_e,e+,b;","t->nu_mu,mu+,b;"])
             process+=selectDecayMode("tbar",["tbar->b,bbar,cbar;",
                                              "tbar->bbar,cbar,d;",
                                              "tbar->bbar,cbar,s;",
                                              "tbar->bbar,s,ubar;",
                                              "tbar->bbar,ubar,d;"])
             process+=addBRReweighter()
             
         elif "Top-All" in parameterName :
             process+="set MEHeavyQuark:QuarkType Top\n"
             process+=insert_ME("MEHeavyQuark")
         elif "WZ" in parameterName :
             process+=insert_ME("MEPP2VV","WZ")
             process+=selectDecayMode("W+",["W+->nu_e,e+;",
                                            "W+->nu_mu,mu+;"])
             process+=selectDecayMode("W-",["W-->nu_ebar,e-;",
                                            "W-->nu_mubar,mu-;"])
             process+=selectDecayMode("Z0",["Z0->e-,e+;",
                                            "Z0->mu-,mu+;"])
             addedBRReweighter = True
             
         elif "WW-emu" in parameterName :
             process+=insert_ME("MEPP2VV","WW")
             process+="set /Herwig/Particles/W+:Synchronized 0\n"
             process+="set /Herwig/Particles/W-:Synchronized 0\n"
             process+=selectDecayMode("W+",["W+->nu_e,e+;"])
             process+=selectDecayMode("W-",["W-->nu_mubar,mu-;"])
             addedBRReweighter = True
             
         elif "WW-ll" in parameterName :
             process+=insert_ME("MEPP2VV","WW")
             process+=selectDecayMode("W+",["W+->nu_e,e+;","W+->nu_mu,mu+;","W+->nu_tau,tau+;"])
             addedBRReweighter = True
             
         elif "ZZ-ll" in parameterName :
             process+=insert_ME("MEPP2VV","ZZ")
             process+=selectDecayMode("Z0",["Z0->e-,e+;",
                                            "Z0->mu-,mu+;",
                                            "Z0->tau-,tau+;"])
             addedBRReweighter = True
 
         elif "ZZ-lv" in parameterName :
             process+=insert_ME("MEPP2VV","ZZ")
             process+=selectDecayMode("Z0",["Z0->e-,e+;",
                                            "Z0->mu-,mu+;",
                                            "Z0->tau-,tau+;",
                                            "Z0->nu_e,nu_ebar;",
                                            "Z0->nu_mu,nu_mubar;",
                                            "Z0->nu_tau,nu_taubar;"])
             addedBRReweighter = True
             
         elif "W-Z-e" in parameterName :
             process+=insert_ME("MEqq2gZ2ff","Electron")
             process+=insert_ME("MEqq2W2ff","Electron")
         elif "W-Z-mu" in parameterName :
             process+=insert_ME("MEqq2gZ2ff","Muon")
             process+=insert_ME("MEqq2W2ff","Muon")
         elif "W-e" in parameterName :
             process+=insert_ME("MEqq2W2ff","Electron")
         elif "W-mu" in parameterName :
             process+=insert_ME("MEqq2W2ff","Muon")
         elif "Z-e" in parameterName :
             process+=insert_ME("MEqq2gZ2ff","Electron")
         elif "Z-mu" in parameterName :
             process+=insert_ME("MEqq2gZ2ff","Muon")
         elif "Z-LowMass-e" in parameterName :
             process+=insert_ME("MEqq2gZ2ff","Electron")
             process+=mhat_minm_maxm(20,20,70)
         elif "Z-MedMass-e" in parameterName :
             process+=insert_ME("MEqq2gZ2ff","Electron")
             process+=mhat_minm_maxm(40,40,130)
         elif "Z-LowMass-mu" in parameterName :
             process+=insert_ME("MEqq2gZ2ff","Muon")
             process+=mhat_minm_maxm(10,10,70)
         elif "Z-Mass1" in parameterName :
             process+=mhat_minm_maxm(10,10,35)
             if "-e" in parameterName :
                 process+=insert_ME("MEqq2gZ2ff","Electron")
             else :
                 process+=insert_ME("MEqq2gZ2ff","Muon")
         elif "Z-Mass2" in parameterName :
             process+=mhat_minm_maxm(25,25,70)
             if "-e" in parameterName :
                 process+=insert_ME("MEqq2gZ2ff","Electron")
             else :
                 process+=insert_ME("MEqq2gZ2ff","Muon")
         elif "Z-Mass3" in parameterName :
             process+=mhat_minm_maxm(60,60,120)
             if "-e" in parameterName :
                 process+=insert_ME("MEqq2gZ2ff","Electron")
             else :
                 process+=insert_ME("MEqq2gZ2ff","Muon")
         elif "Z-Mass4" in parameterName :
             process+=mhat_minm_maxm(110,110,8000)
             if "-e" in parameterName :
                 process+=insert_ME("MEqq2gZ2ff","Electron")
             else :
                 process+=insert_ME("MEqq2gZ2ff","Muon")
         elif "Z-HighMass1" in parameterName :
             process+=mhat_minm_maxm(116,116,400)
             if "-e" in parameterName :
                 process+=insert_ME("MEqq2gZ2ff","Electron")
             else :
                 process+=insert_ME("MEqq2gZ2ff","Muon")
         elif "Z-HighMass2" in parameterName :
             process+=mhat_minm_maxm(400,400,7000)
             if "-e" in parameterName :
                 process+=insert_ME("MEqq2gZ2ff","Electron")
             else :
                 process+=insert_ME("MEqq2gZ2ff","Muon")
         elif "W-Jet" in parameterName :
             process+=insert_ME("MEWJet","Electron","WDecay")
             if "W-Jet-1-e" in parameterName :
                 process+="set /Herwig/Cuts/WBosonKtCut:MinKT 100.0*GeV\n"
                 parameterName=parameterName.replace("W-Jet-1-e","W-Jet-e")
             elif "W-Jet-2-e" in parameterName :
                 process+="set /Herwig/Cuts/WBosonKtCut:MinKT 190.0*GeV\n"
                 parameterName=parameterName.replace("W-Jet-2-e","W-Jet-e")
             elif "W-Jet-3-e" in parameterName :
                 process+="set /Herwig/Cuts/WBosonKtCut:MinKT 270.0*GeV\n"
                 parameterName=parameterName.replace("W-Jet-3-e","W-Jet-e")
         elif "Z-Jet" in parameterName :
             if "-e" in parameterName :
                 process+=insert_ME("MEZJet","Electron","ZDecay")
                 if "Z-Jet-0-e" in parameterName :
                     process+="set /Herwig/Cuts/ZBosonKtCut:MinKT 35.0*GeV\n"
                     parameterName=parameterName.replace("Z-Jet-0-e","Z-Jet-e")
                 elif "Z-Jet-1-e" in parameterName :
                     process+="set /Herwig/Cuts/ZBosonKtCut:MinKT 100.0*GeV\n"
                     parameterName=parameterName.replace("Z-Jet-1-e","Z-Jet-e")
                 elif "Z-Jet-2-e" in parameterName :
                     process+="set /Herwig/Cuts/ZBosonKtCut:MinKT 190.0*GeV\n"
                     parameterName=parameterName.replace("Z-Jet-2-e","Z-Jet-e")
                 elif "Z-Jet-3-e" in parameterName :
                     process+="set /Herwig/Cuts/ZBosonKtCut:MinKT 270.0*GeV\n"
                     parameterName=parameterName.replace("Z-Jet-3-e","Z-Jet-e")
             else :
                 process+=insert_ME("MEZJet","Muon","ZDecay")
                 process+="set /Herwig/Cuts/ZBosonKtCut:MinKT 35.0*GeV\n"
                 parameterName=parameterName.replace("Z-Jet-0-mu","Z-Jet-mu")
         elif "WGamma" in parameterName :
             process+=insert_ME("MEPP2VGamma","1")
             process+="set MEPP2VGamma:MassOption 1"
             process+="set /Herwig/Cuts/PhotonKtCut:MinKT 10.\n"
             
             
             if "-e" in parameterName :
                 process+=selectDecayMode("W+",["W+->nu_e,e+;"])
                 addedBRReweighter=True
             else :
                 process+=selectDecayMode("W+",["W+->nu_mu,mu+;"])
                 addedBRReweighter=True
         elif "ZGamma" in parameterName :
             process+=insert_ME("MEPP2VGamma","2")
             process+="set /Herwig/Cuts/PhotonKtCut:MinKT 10.\n"
             if "-e" in parameterName :
                 process+=selectDecayMode("Z0",["Z0->e-,e+;"])
                 addedBRReweighter=True
             else :
                 process+=selectDecayMode("Z0",["Z0->mu-,mu+;"])
                 addedBRReweighter=True
         else :
             logging.error(" Process %s not supported for internal matrix elements" % name)
             sys.exit(1)
     elif(simulation=="Powheg") :
         if "VBF" in parameterName :
             process+=insert_ME("PowhegMEPP2HiggsVBF")
             if "GammaGamma" in parameterName :
                process+=selectDecayMode("h0",["h0->gamma,gamma;"])
                addedBRReweighter = True
             elif "WW" in parameterName :
                process+=selectDecayMode("h0",["h0->W+,W-;"])
                addedBRReweighter = True
             elif "ZZ" in parameterName :
                process+=selectDecayMode("h0",["h0->Z0,Z0;"])
                addedBRReweighter = True
             elif "8-" not in parameterName :
                 process+=selectDecayMode("h0",["h0->tau-,tau+;"])
                 addedBRReweighter = True
                 process+="set /Herwig/Particles/tau-:Stable Stable\n"
             
         elif "ggHJet" in parameterName :
             logging.error(" Process %s not supported for POWHEG matrix elements" % name)
             sys.exit(1)
         elif "ggH" in parameterName :
             process+=insert_ME("PowhegMEHiggs")
             if "GammaGamma" in parameterName :
                process+=selectDecayMode("h0",["h0->gamma,gamma;"])
                addedBRReweighter = True
             elif "WW" in parameterName :
                process+=selectDecayMode("h0",["h0->W+,W-;"])
                addedBRReweighter = True
             elif "ZZ" in parameterName :
                process+=selectDecayMode("h0",["h0->Z0,Z0;"])
                addedBRReweighter = True
             elif "8-" not in parameterName :
                 process+=selectDecayMode("h0",["h0->tau-,tau+;"])
                 addedBRReweighter = True
                 process+="set /Herwig/Particles/tau-:Stable Stable\n"
         elif "8-WH" in parameterName :
             process+=insert_ME("PowhegMEPP2WH")
             process+=jet_kt_cut(0.0)
             if "GammaGamma" in parameterName :
                process+=selectDecayMode("h0",["h0->gamma,gamma;"])
                addedBRReweighter = True
             elif "WW" in parameterName :
                process+=selectDecayMode("h0",["h0->W+,W-;"])
                addedBRReweighter = True
             elif "ZZ" in parameterName :
                process+=selectDecayMode("h0",["h0->Z0,Z0;"])
                addedBRReweighter = True
         elif "8-ZH" in parameterName :
             process+=insert_ME("PowhegMEPP2ZH")
             process+=jet_kt_cut(0.0)
             if "GammaGamma" in parameterName :
                process+=selectDecayMode("h0",["h0->gamma,gamma;"])
                addedBRReweighter = True
             elif "WW" in parameterName :
                process+=selectDecayMode("h0",["h0->W+,W-;"])
                addedBRReweighter = True
             elif "ZZ" in parameterName :
                process+=selectDecayMode("h0",["h0->Z0,Z0;"])
                addedBRReweighter = True
         elif "WH" in parameterName :
             process+=selectDecayMode("h0",["h0->b,bbar;"])
             process+=selectDecayMode("W+",["W+->nu_e,e+;",
                                            "W+->nu_mu,mu+;"])
             addedBRReweighter = True
             process+=insert_ME("PowhegMEPP2WH")
             process+=jet_kt_cut(0.0)
         elif "ZH" in parameterName :
             process+=selectDecayMode("h0",["h0->b,bbar;"])
             process+=selectDecayMode("Z0",["Z0->e-,e+;",
                                            "Z0->mu-,mu+;"])
             addedBRReweighter = True
             process+=insert_ME("PowhegMEPP2ZH")
             process+=jet_kt_cut(0.0)
         elif "UE" in parameterName :
             logging.error(" Process %s not supported for powheg matrix elements" % name)
             sys.exit(1)
         elif "WZ" in parameterName :
             process+="create Herwig::HwDecayHandler /Herwig/NewPhysics/DecayHandler\n"
             process+="set /Herwig/NewPhysics/DecayHandler:NewStep No\n"
             process+="set /Herwig/Shower/ShowerHandler:SplitHardProcess No\n";
             process+="set /Herwig/Decays/ZDecayer:PhotonGenerator NULL\n";
             process+="set /Herwig/Decays/WDecayer:PhotonGenerator NULL\n";
             process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 0 /Herwig/Particles/tau-\n"
             process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 1 /Herwig/Particles/tau+\n"
             process+="insert /Herwig/Generators/EventGenerator:EventHandler:PreCascadeHandlers 0 /Herwig/NewPhysics/DecayHandler\n"
             process+=insert_ME("PowhegMEPP2VV","WZ")
             process+=selectDecayMode("W+",["W+->nu_e,e+;",
                                            "W+->nu_mu,mu+;"])
             process+=selectDecayMode("W-",["W-->nu_ebar,e-;",
                                            "W-->nu_mubar,mu-;"])
             process+=selectDecayMode("Z0",["Z0->e-,e+;",
                                            "Z0->mu-,mu+;"])
             addedBRReweighter = True
             
         elif "WW-emu" in parameterName :
             process+="create Herwig::HwDecayHandler /Herwig/NewPhysics/DecayHandler\n"
             process+="set /Herwig/NewPhysics/DecayHandler:NewStep No\n"
             process+="set /Herwig/Shower/ShowerHandler:SplitHardProcess No\n";
             process+="set /Herwig/Decays/ZDecayer:PhotonGenerator NULL\n";
             process+="set /Herwig/Decays/WDecayer:PhotonGenerator NULL\n";
             process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 0 /Herwig/Particles/tau-\n"
             process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 1 /Herwig/Particles/tau+\n"
             process+="insert /Herwig/Generators/EventGenerator:EventHandler:PreCascadeHandlers 0 /Herwig/NewPhysics/DecayHandler\n"
             process+=insert_ME("PowhegMEPP2VV","WW")
             process+="set /Herwig/Particles/W+:Synchronized 0\n"
             process+="set /Herwig/Particles/W-:Synchronized 0\n"
             process+=selectDecayMode("W+",["W+->nu_e,e+;"])
             process+=selectDecayMode("W-",["W-->nu_mubar,mu-;"])
             addedBRReweighter = True
             
         elif "WW-ll" in parameterName :
             process+="create Herwig::HwDecayHandler /Herwig/NewPhysics/DecayHandler\n"
             process+="set /Herwig/NewPhysics/DecayHandler:NewStep No\n"
             process+="set /Herwig/Shower/ShowerHandler:SplitHardProcess No\n";
             process+="set /Herwig/Decays/ZDecayer:PhotonGenerator NULL\n";
             process+="set /Herwig/Decays/WDecayer:PhotonGenerator NULL\n";
             process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 0 /Herwig/Particles/tau-\n"
             process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 1 /Herwig/Particles/tau+\n"
             process+="insert /Herwig/Generators/EventGenerator:EventHandler:PreCascadeHandlers 0 /Herwig/NewPhysics/DecayHandler\n"
             process+=insert_ME("PowhegMEPP2VV","WW")
             process+=selectDecayMode("W+",["W+->nu_e,e+;",
                                            "W+->nu_mu,mu+;",
                                            "W+->nu_tau,tau+;"])
             addedBRReweighter = True
             
         elif "ZZ-ll" in parameterName :
             process+="create Herwig::HwDecayHandler /Herwig/NewPhysics/DecayHandler\n"
             process+="set /Herwig/NewPhysics/DecayHandler:NewStep No\n"
             process+="set /Herwig/Shower/ShowerHandler:SplitHardProcess No\n";
             process+="set /Herwig/Decays/ZDecayer:PhotonGenerator NULL\n";
             process+="set /Herwig/Decays/WDecayer:PhotonGenerator NULL\n";
             process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 0 /Herwig/Particles/tau-\n"
             process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 1 /Herwig/Particles/tau+\n"
             process+="insert /Herwig/Generators/EventGenerator:EventHandler:PreCascadeHandlers 0 /Herwig/NewPhysics/DecayHandler\n"
             process+=insert_ME("PowhegMEPP2VV","ZZ")
             process+=selectDecayMode("Z0",["Z0->e-,e+;",
                                            "Z0->mu-,mu+;",
                                            "Z0->tau-,tau+;"])
             addedBRReweighter = True
             
         elif "ZZ-lv" in parameterName :
             process+="create Herwig::HwDecayHandler /Herwig/NewPhysics/DecayHandler\n"
             process+="set /Herwig/NewPhysics/DecayHandler:NewStep No\n"
             process+="set /Herwig/Shower/ShowerHandler:SplitHardProcess No\n";
             process+="set /Herwig/Decays/ZDecayer:PhotonGenerator NULL\n";
             process+="set /Herwig/Decays/WDecayer:PhotonGenerator NULL\n";
             process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 0 /Herwig/Particles/tau-\n"
             process+="insert /Herwig/NewPhysics/DecayHandler:Excluded 1 /Herwig/Particles/tau+\n"
             process+="insert /Herwig/Generators/EventGenerator:EventHandler:PreCascadeHandlers 0 /Herwig/NewPhysics/DecayHandler\n"
             process+=insert_ME("PowhegMEPP2VV","ZZ")
             process+=selectDecayMode("Z0",["Z0->e-,e+;",
                                            "Z0->mu-,mu+;",
                                            "Z0->tau-,tau+;",
                                            "Z0->nu_e,nu_ebar;",
                                            "Z0->nu_mu,nu_mubar;",
                                            "Z0->nu_tau,nu_taubar;"])
             addedBRReweighter = True
             
         elif "W-Z-e" in parameterName :
             process+=insert_ME("PowhegMEqq2gZ2ff","Electron")
             process+=insert_ME("PowhegMEqq2W2ff","Electron")
         elif "W-Z-mu" in parameterName :
             process+=insert_ME("MEqq2gZ2ff","Muon")
             process+=insert_ME("MEqq2W2ff","Muon")
         elif "W-e" in parameterName :
             process+=insert_ME("PowhegMEqq2W2ff","Electron")
         elif "W-mu" in parameterName :
             process+=insert_ME("PowhegMEqq2W2ff","Muon")
         elif "Z-e" in parameterName :
             process+=insert_ME("PowhegMEqq2gZ2ff","Electron")
         elif "Z-mu" in parameterName :
             process+=insert_ME("PowhegMEqq2gZ2ff","Muon")
         elif "Z-LowMass-e" in parameterName :
             process+=insert_ME("PowhegMEqq2gZ2ff","Electron")
             process+=mhat_minm_maxm(20,20,70)
         elif "Z-MedMass-e" in parameterName :
             process+=insert_ME("PowhegMEqq2gZ2ff","Electron")
             process+=mhat_minm_maxm(40,40,130)
         elif "Z-LowMass-mu" in parameterName :
             process+=insert_ME("PowhegMEqq2gZ2ff","Muon")
             process+=mhat_minm_maxm(10,10,70)
         elif "Z-Mass1" in parameterName :
             process+=mhat_minm_maxm(10,10,35)
             if "-e" in parameterName :
                 process+=insert_ME("PowhegMEqq2gZ2ff","Electron")
             else :
                 process+=insert_ME("PowhegMEqq2gZ2ff","Muon")
         elif "Z-Mass2" in parameterName :
             process+=mhat_minm_maxm(25,25,70)
             if "-e" in parameterName :
                 process+=insert_ME("PowhegMEqq2gZ2ff","Electron")
             else :
                 process+=insert_ME("PowhegMEqq2gZ2ff","Muon")
         elif "Z-Mass3" in parameterName :
             process+=mhat_minm_maxm(60,60,120)
             if "-e" in parameterName :
                 process+=insert_ME("PowhegMEqq2gZ2ff","Electron")
             else :
                 process+=insert_ME("PowhegMEqq2gZ2ff","Muon")
         elif "Z-Mass4" in parameterName :
             process+=mhat_minm_maxm(110,110,8000)
             if "-e" in parameterName :
                 process+=insert_ME("PowhegMEqq2gZ2ff","Electron")
             else :
                 process+=insert_ME("PowhegMEqq2gZ2ff","Muon")
         elif "Z-HighMass1" in parameterName :
             process+=mhat_minm_maxm(116,116,400)
             if "-e" in parameterName :
                 process+=insert_ME("PowhegMEqq2gZ2ff","Electron")
             else :
                 process+=insert_ME("PowhegMEqq2gZ2ff","Muon")
         elif "Z-HighMass2" in parameterName :
             process+=mhat_minm_maxm(400,400,7000)
             if "-e" in parameterName :
                 process+=insert_ME("PowhegMEqq2gZ2ff","Electron")
             else :
                 process+=insert_ME("PowhegMEqq2gZ2ff","Muon")
         elif "DiPhoton-GammaGamma" in parameterName :
             process+=insert_ME("MEGammaGammaPowheg","GammaGamma")
             process+=insert_ME("MEGammaGamma","gg")
             process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
             process+=jet_kt_cut(5.)
             parameterName=parameterName.replace("-GammaGamma","")
         elif "DiPhoton-GammaJet" in parameterName :
             process+=insert_ME("MEGammaGammaPowheg","VJet")
             process+="set /Herwig/Cuts/PhotonKtCut:MinKT 5.\n"
             process+=jet_kt_cut(5.)
             parameterName=parameterName.replace("-GammaJet","")
         else :
             logging.error(" Process %s not supported for internal POWHEG matrix elements" % name)
             sys.exit(1)
             
     elif( simulation=="Matchbox" or simulation=="Merging" ) :
         if "VBF" in parameterName :
             parameters["nlo"] = "read Matchbox/VBFNLO.in\n"
             if(simulation=="Merging"):
                 process+="cd /Herwig/Merging/\n"
             process+="insert "+thefactory+":DiagramGenerator:RestrictLines 0 /Herwig/Particles/Z0\n"
             process+="insert "+thefactory+":DiagramGenerator:RestrictLines 0 /Herwig/Particles/W+\n"
             process+="insert "+thefactory+":DiagramGenerator:RestrictLines 0 /Herwig/Particles/W-\n"
             process+="insert "+thefactory+":DiagramGenerator:RestrictLines 0 /Herwig/Particles/gamma\n"
             process+="do "+thefactory+":DiagramGenerator:TimeLikeRange 0 0\n"
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p p h0 j j","0","3","FixedScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p p h0 j j","0","3","FixedScale",1,1)
             process+=setHardProcessWidthToZero(["h0"])
             process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 125.7\n"
             if "GammaGamma" in parameterName :
                process+=selectDecayMode("h0",["h0->gamma,gamma;"])
                process+=addBRReweighter()
             elif "WW" in parameterName :
                process+=selectDecayMode("h0",["h0->W+,W-;"])
                process+=addBRReweighter()
             elif "ZZ" in parameterName :
                process+=selectDecayMode("h0",["h0->Z0,Z0;"])
                process+=addBRReweighter()
             elif "8-" not in parameterName :
                 process+=selectDecayMode("h0",["h0->tau-,tau+;"])
                 process+=addBRReweighter()
                 process+="set /Herwig/Particles/tau-:Stable Stable\n"
         elif "ggHJet" in parameterName :
             if(simulation=="Merging"):
                logging.warning("ggHJet not explicitly tested for %s " % simulation)
                sys.exit(0)
             parameters["nlo"] = "read Matchbox/MadGraph-GoSam.in\nread Matchbox/HiggsEffective.in\n"
             process+=selectDecayMode("h0",["h0->tau-,tau+;"])
             process+=addBRReweighter()
             process+="set /Herwig/Particles/tau-:Stable Stable\n"
             process+=setHardProcessWidthToZero(["h0"])
             process+=addProcess(thefactory,"p p h0 j","3","1","FixedScale",0,0)
             process+=addFirstJet("20")
             process+="set "+thefactory+":ScaleChoice /Herwig/MatrixElements/Matchbox/Scales/FixedScale\n"
             process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 125.7\n"
         elif "ggH" in parameterName :
             parameters["nlo"] = "read Matchbox/MadGraph-GoSam.in\nread Matchbox/HiggsEffective.in\n"
             if(simulation=="Merging"):
                 process+= "cd /Herwig/MatrixElements/Matchbox/Amplitudes\nset OpenLoops:HiggsEff On\nset MadGraph:Model heft\n"
                 process+="cd /Herwig/Merging/\n"
             process+=setHardProcessWidthToZero(["h0"])
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p p h0","2","1","FixedScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p p h0","2","1","FixedScale",2,2)
             process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 125.7\n"
             if "GammaGamma" in parameterName :
                process+=selectDecayMode("h0",["h0->gamma,gamma;"])
                process+=addBRReweighter()
             elif "WW" in parameterName :
                process+=selectDecayMode("h0",["h0->W+,W-;"])
                process+=addBRReweighter()
             elif "ZZ" in parameterName :
                process+=selectDecayMode("h0",["h0->Z0,Z0;"])
                process+=addBRReweighter()
             elif "8-" not in parameterName :
                 process+=selectDecayMode("h0",["h0->tau-,tau+;"])
                 process+=addBRReweighter()
                 process+="set /Herwig/Particles/tau-:Stable Stable\n"
         elif "8-WH" in parameterName :
             if(simulation=="Merging"):
               logging.warning("8-WH not explicitly tested for %s " % simulation)
               sys.exit(0)
             process+=setHardProcessWidthToZero(["h0","W+","W-"])
             process+=addProcess(thefactory,"p p W+ h0","0","2","FixedScale",0,0)
             process+=addProcess(thefactory,"p p W- h0","0","2","FixedScale",0,0)
             process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 125.7\n"
             if "GammaGamma" in parameterName :
                process+=selectDecayMode("h0",["h0->gamma,gamma;"])
                process+=addBRReweighter()
             elif "WW" in parameterName :
                process+=selectDecayMode("h0",["h0->W+,W-;"])
                process+=addBRReweighter()
             elif "ZZ" in parameterName :
                process+=selectDecayMode("h0",["h0->Z0,Z0;"])
                process+=addBRReweighter()
                
         elif "8-ZH" in parameterName :
             if(simulation=="Merging"):
               logging.warning("8-ZH not explicitly tested for %s " % simulation)
               sys.exit(0)
             process+=setHardProcessWidthToZero(["h0","Z0"])
             process+=addProcess(thefactory,"p p Z0 h0","0","2","FixedScale",0,0)
             process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 125.7\n"
             if "GammaGamma" in parameterName :
                process+=selectDecayMode("h0",["h0->gamma,gamma;"])
                process+=addBRReweighter()
             elif "WW" in parameterName :
                process+=selectDecayMode("h0",["h0->W+,W-;"])
                process+=addBRReweighter()
             elif "ZZ" in parameterName :
                process+=selectDecayMode("h0",["h0->Z0,Z0;"])
                process+=addBRReweighter()
                
         elif "WH" in parameterName :
             if(simulation=="Merging"):
               logging.warning("WH not explicitly tested for %s " % simulation)
               sys.exit(0)
             process+=selectDecayMode("h0",["h0->b,bbar;"])
             process+=addBRReweighter()
             process+=setHardProcessWidthToZero(["h0"])
             process+=addProcess(thefactory,"p p e+ nu h0","0","3","LeptonPairMassScale",0,0)
             process+=addProcess(thefactory,"p p e- nu h0","0","3","LeptonPairMassScale",0,0)
             process+=addProcess(thefactory,"p p mu+ nu h0","0","3","LeptonPairMassScale",0,0)
             process+=addProcess(thefactory,"p p mu- nu h0","0","3","LeptonPairMassScale",0,0)
             process+=addLeptonPairCut("60","120")
         elif "ZH" in parameterName :
             if(simulation=="Merging"):
               logging.warning("ZH not explicitly tested for %s " % simulation)
               sys.exit(0)
             process+=selectDecayMode("h0",["h0->b,bbar;"])
             process+=addBRReweighter()
             process+=setHardProcessWidthToZero(["h0"])
             process+=addProcess(thefactory,"p p e+ e- h0","0","3","LeptonPairMassScale",0,0)
             process+=addProcess(thefactory,"p p mu+ mu- h0","0","3","LeptonPairMassScale",0,0)
             process+=addLeptonPairCut("60","120")
         elif "UE" in parameterName :
             logging.error(" Process %s not supported for Matchbox matrix elements" % name)
             sys.exit(1)
         elif "8-DiJets" in parameterName or "7-DiJets" in parameterName or "13-DiJets" in parameterName :
             if(simulation=="Matchbox"):
               process+=addProcess(thefactory,"p p j j","2","0","MaxJetPtScale",0,0)
             elif(simulation=="Merging"):
               process+=addProcess(thefactory,"p p j j","2","0","MaxJetPtScale",1,1)
             process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
             if "13-DiJets" not in parameterName :
                 if "-A" in parameterName :
                     process+=addFirstJet("45")
                     process+=addSecondJet("25")
                     process+="set /Herwig/Cuts/FirstJet:YRange  -3. 3.\n"
                     process+="set /Herwig/Cuts/SecondJet:YRange -3. 3.\n"
                 elif "-B" in parameterName :
                     process+=addFirstJet("20")
                     process+=addSecondJet("15")
                     process+="set /Herwig/Cuts/FirstJet:YRange  -2.7 2.7\n"
                     process+="set /Herwig/Cuts/SecondJet:YRange -2.7 2.7\n"
                 elif "-C" in parameterName :
                     process+=addFirstJet("20")
                     process+=addSecondJet("15")
                     process+="set /Herwig/Cuts/FirstJet:YRange  -4.8 4.8\n"
                     process+="set /Herwig/Cuts/SecondJet:YRange -4.8 4.8\n"
                 else :
                     logging.error("Exit 00001")
                     sys.exit(1)
             else :
                 if "-A" in parameterName :
                     process+= addFirstJet("75.")
                     process+=addSecondJet("60.")
                     process+="set /Herwig/Cuts/JetKtCut:MinEta -3.\n"
                     process+="set /Herwig/Cuts/JetKtCut:MaxEta  3.\n"
                 elif "-B" in parameterName :
                     process+= addFirstJet("220.")
                     process+=addSecondJet("180.")
                     process+="set /Herwig/Cuts/JetKtCut:MinEta -3.\n"
                     process+="set /Herwig/Cuts/JetKtCut:MaxEta  3.\n"
                 else :
                     logging.error("Exit 00001")
                     sys.exit(1)
 
                     
             if "DiJets-1" in parameterName   : process+=addJetPairCut("90")
             elif "DiJets-2" in parameterName : process+=addJetPairCut("200")
             elif "DiJets-3" in parameterName : process+=addJetPairCut("450")
             elif "DiJets-4" in parameterName : process+=addJetPairCut("750")
             elif "DiJets-5" in parameterName : process+=addJetPairCut("950")
             elif "DiJets-6" in parameterName : process+=addJetPairCut("1550")
             elif "DiJets-7" in parameterName : process+=addJetPairCut("2150")
             elif "DiJets-8" in parameterName : process+=addJetPairCut("2750")
             elif "DiJets-9" in parameterName : process+=mhatmin_cut(3750.)
             elif "DiJets-10" in parameterName : process+=mhatmin_cut(4750.)
             elif "DiJets-11" in parameterName : process+=mhatmin_cut(5750.)
             else :
                 logging.error("Exit 00002")
                 sys.exit(1)
 
 
         elif(      "7-Jets" in parameterName 
                or  "8-Jets" in parameterName 
                or "13-Jets" in parameterName 
                or "2760-Jets" in parameterName 
             ) :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p p j j","2","0","MaxJetPtScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p p j j","2","0","MaxJetPtScale",1,1)
             process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
             if "Jets-10" in parameterName  : process+=addFirstJet("1800")
             elif "Jets-0" in parameterName : process+=addFirstJet("5")
             elif "Jets-1" in parameterName : process+=addFirstJet("10")
             elif "Jets-2" in parameterName : process+=addFirstJet("20")
             elif "Jets-3" in parameterName : process+=addFirstJet("40")
             elif "Jets-4" in parameterName : process+=addFirstJet("70")
             elif "Jets-5" in parameterName : process+=addFirstJet("150")
             elif "Jets-6" in parameterName : process+=addFirstJet("200")
             elif "Jets-7" in parameterName : process+=addFirstJet("300")
             elif "Jets-8" in parameterName : process+=addFirstJet("500")
             elif "Jets-9" in parameterName : process+=addFirstJet("800")
             else :
                 logging.error("Exit 00003")
                 sys.exit(1)
         elif(     "7-Charm" in parameterName or "7-Bottom" in parameterName
               or "8-Bottom" in parameterName) :
             parameters["bscheme"]=fourFlavour
             process+="set /Herwig/Particles/b:HardProcessMass 4.2*GeV\n"
             process+="set /Herwig/Particles/bbar:HardProcessMass 4.2*GeV\n"
             
             if("8-Bottom" in parameterName) :
                 addBRReweighter()
                 process+=selectDecayMode("Jpsi",["Jpsi->mu-,mu+;"])
             
             if "Bottom" in parameterName :
                 if(simulation=="Matchbox"):
                     process+=addProcess(thefactory,"p p b bbar","2","0","MaxJetPtScale",0,0)
                 elif(simulation=="Merging"):
                     process+=addProcess(thefactory,"p p b bbar","2","0","MaxJetPtScale",1,0)
             else:
                 if(simulation=="Matchbox"):
                     process+=addProcess(thefactory,"p p c cbar","2","0","MaxJetPtScale",0,0)
                 elif(simulation=="Merging"):
                     process+=addProcess(thefactory,"p p c cbar","2","0","MaxJetPtScale",1,0)
 
             process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
             if "-0" in parameterName   : process+=addFirstJet("0")
             elif "-1" in parameterName : process+=addFirstJet("5")
             elif "-2" in parameterName : process+=addFirstJet("15")
             elif "-3" in parameterName : process+=addFirstJet("20")
             elif "-4" in parameterName : process+=addFirstJet("50")
             elif "-5" in parameterName : process+=addFirstJet("80")
             elif "-6" in parameterName : process+=addFirstJet("110")
             elif "-7" in parameterName :
                 process+=addFirstJet("30")
                 process+=addSecondJet("25")
                 process+=addJetPairCut("90")
             elif "-8" in parameterName :
                 process+=addFirstJet("30")
                 process+=addSecondJet("25")
                 process+=addJetPairCut("340")
             elif "-9" in parameterName :
                 process+=addFirstJet("30")
                 process+=addSecondJet("25")
                 process+=addJetPairCut("500")
             else :
                 logging.error("Exit 00004")
                 sys.exit(1)
                   
         elif "Top-L" in parameterName :
             process+=setHardProcessWidthToZero(["t","tbar"])
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p p t tbar","2","0","TopPairMTScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p p t tbar","2","0","TopPairMTScale",2,2)
             process+=selectDecayMode("t",["t->nu_e,e+,b;",
                                           "t->nu_mu,mu+,b;"])
             process+=addBRReweighter()
             
         elif "Top-SL" in parameterName :
             process+=setHardProcessWidthToZero(["t","tbar"])
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p p t tbar","2","0","TopPairMTScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p p t tbar","2","0","TopPairMTScale",2,2)
             process+="set /Herwig/Particles/t:Synchronized Not_synchronized\n"
             process+="set /Herwig/Particles/tbar:Synchronized Not_synchronized\n"
             process+=selectDecayMode("t",["t->nu_e,e+,b;",
                                           "t->nu_mu,mu+,b;"])
             process+=selectDecayMode("tbar",["tbar->b,bbar,cbar;",
                                              "tbar->bbar,cbar,d;",
                                              "tbar->bbar,cbar,s;",
                                              "tbar->bbar,s,ubar;",
                                              "tbar->bbar,ubar,d;"])
             process+=addBRReweighter()
             
         elif "Top-All" in parameterName :
             process+=setHardProcessWidthToZero(["t","tbar"])
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p p t tbar","2","0","TopPairMTScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p p t tbar","2","0","TopPairMTScale",2,2)
         elif "WZ" in parameterName :
             if(simulation=="Merging"):
               logging.warning("WZ not explicitly tested for %s " % simulation)
               sys.exit(0)
             process+=setHardProcessWidthToZero(["W+","W-","Z0"])
             process+=addProcess(thefactory,"p p W+ Z0","0","2","FixedScale",0,0)
             process+=addProcess(thefactory,"p p W- Z0","0","2","FixedScale",0,0)
             process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 171.6*GeV\n\n"
             process+=selectDecayMode("W+",["W+->nu_e,e+;",
                                            "W+->nu_mu,mu+;"])
             process+=selectDecayMode("W-",["W-->nu_ebar,e-;",
                                            "W-->nu_mubar,mu-;"])
             process+=selectDecayMode("Z0",["Z0->e-,e+;",
                                            "Z0->mu-,mu+;"])
             process+=addBRReweighter()
             process+=addLeptonPairCut("60","120")
         elif "WW-emu" in parameterName :
             if(simulation=="Merging"):
               logging.warning("WW-emu not explicitly tested for %s " % simulation)
               sys.exit(0)
             
             process+=setHardProcessWidthToZero(["W+","W-","Z0"])
             process+=addProcess(thefactory,"p p W+ W-","0","2","FixedScale",0,0)
             process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 160.8*GeV\n"
             process+="set /Herwig/Particles/W+:Synchronized 0\n"
             process+="set /Herwig/Particles/W-:Synchronized 0\n"
             process+=selectDecayMode("W+",["W+->nu_e,e+;"])
             process+=selectDecayMode("W-",["W-->nu_mubar,mu-;"])
             process+=addBRReweighter()
             parameters["bscheme"] = "read Matchbox/FourFlavourScheme.in\n"
             
             process+=addLeptonPairCut("60","120")
         elif "WW-ll" in parameterName :
             if(simulation=="Merging"):
               logging.warning("WW-ll not explicitly tested for %s " % simulation)
               sys.exit(0)
             process+=setHardProcessWidthToZero(["W+","W-","Z0"])
             process+=addProcess(thefactory,"p p W+ W-","0","2","FixedScale",0,0)
             process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 160.8*GeV\n"
             process+=selectDecayMode("W+",["W+->nu_e,e+;",
                                            "W+->nu_mu,mu+;",
                                            "W+->nu_tau,tau+;"])
             process+=addBRReweighter()
             process+=addLeptonPairCut("60","120")
             parameters["bscheme"] = "read Matchbox/FourFlavourScheme.in\n"
 
         elif "ZZ-ll" in parameterName :
             if(simulation=="Merging"):
               logging.warning("ZZ-ll not explicitly tested for %s " % simulation)
               sys.exit(0)
             process+=setHardProcessWidthToZero(["W+","W-","Z0"])
             process+=addProcess(thefactory,"p p Z0 Z0","0","2","FixedScale",0,0)
             process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 182.2*GeV\n"
             process+=selectDecayMode("Z0",["Z0->e-,e+;",
                                            "Z0->mu-,mu+;",
                                            "Z0->tau-,tau+;"])
             process+=addBRReweighter()
             process+=addLeptonPairCut("60","120")
         elif "ZZ-lv" in parameterName :
             if(simulation=="Merging"):
               logging.warning("ZZ-lv not explicitly tested for %s " % simulation)
               sys.exit(0)
             process+=setHardProcessWidthToZero(["W+","W-","Z0"])
             process+=addProcess(thefactory,"p p Z0 Z0","0","2","FixedScale",0,0)
             process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 182.2*GeV\n"
             process+=selectDecayMode("Z0",["Z0->e-,e+;",
                                            "Z0->mu-,mu+;",
                                            "Z0->tau-,tau+;",
                                            "Z0->nu_e,nu_ebar;",
                                            "Z0->nu_mu,nu_mubar;",
                                            "Z0->nu_tau,nu_taubar;"])
             process+=addBRReweighter()
             process+=addLeptonPairCut("60","120")
         elif "W-Z-e" in parameterName :
             if(simulation=="Matchbox"):
               process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",0,0)
               process+=addProcess(thefactory,"p p e+ nu","0","2","LeptonPairMassScale",0,0)
               process+=addProcess(thefactory,"p p e- nu","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
               process+=particlegroup('epm','e+','e-')
               process+=particlegroup('epmnu','e+','e-','nu_e','nu_ebar')
               process+=addProcess(thefactory,"p p epm epmnu","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("60","120")
         elif "W-Z-mu" in parameterName :
             if(simulation=="Matchbox"):
               process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",0,0)
               process+=addProcess(thefactory,"p p mu+ nu","0","2","LeptonPairMassScale",0,0)
               process+=addProcess(thefactory,"p p mu- nu","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
               process+=particlegroup('mupm','mu+','mu-')
               process+=particlegroup('mupmnu','mu+','mu-','nu_mu','nu_mubar')
               process+=addProcess(thefactory,"p p mupm mupmnu","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("60","120")
         elif "W-e" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p p e+ nu","0","2","LeptonPairMassScale",0,0)
                 process+=addProcess(thefactory,"p p e- nu","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=particlegroup('epm','e+','e-')
                 process+=addProcess(thefactory,"p p epm nu","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("60","120")
 
         elif "W-mu" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p p mu+ nu","0","2","LeptonPairMassScale",0,0)
                 process+=addProcess(thefactory,"p p mu- nu","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=particlegroup('mupm','mu+','mu-')
                 process+=addProcess(thefactory,"p p mupm nu","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("60","120")
 
         elif "Z-e" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("60","120")
         elif "Z-mu" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("60","120")
         elif "Z-jj" in parameterName :
             if(simulation=="Merging"):
               logging.warning("Z-jj not explicitly tested for %s " % simulation)
               sys.exit(0)
             process+=addProcess(thefactory,"p p e+ e- j j","2","2","LeptonPairMassScale",0,0)
             process+=addFirstJet("40")
             process+=addSecondJet("30")
             process+=addLeptonPairCut("60","120")
         elif "Z-LowMass-e" in parameterName :
             if(simulation=="Matchbox"):
                process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("20","70")
         elif "Z-MedMass-e" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("40","130")
         elif "Z-LowMass-mu" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("10","70")
         elif "Z-Mass1" in parameterName :
             process+=addLeptonPairCut("10","35")
             if "-e" in parameterName :
                 if(simulation=="Matchbox"):
                     process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",0,0)
                 elif(simulation=="Merging"):
                     process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",2,2)
             else :
                 if(simulation=="Matchbox"):
                     process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",0,0)
                 elif(simulation=="Merging"):
                     process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",2,2)
         elif "Z-Mass2" in parameterName :
             process+=addLeptonPairCut("25","70")
             if "-e" in parameterName :
                 if(simulation=="Matchbox"):
                     process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",0,0)
                 elif(simulation=="Merging"):
                     process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",2,2)
             else :
                 if(simulation=="Matchbox"):
                     process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",0,0)
                 elif(simulation=="Merging"):
                     process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",2,2)
         elif "Z-Mass3" in parameterName :
             process+=addLeptonPairCut("60","120")
             if "-e" in parameterName :
                 if(simulation=="Matchbox"):
                     process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",0,0)
                 elif(simulation=="Merging"):
                     process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",2,2)
             else :
                 if(simulation=="Matchbox"):
                     process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",0,0)
                 elif(simulation=="Merging"):
                     process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",2,2)
         elif "Z-Mass4" in parameterName :
             process+=addLeptonPairCut("115","8000")
             if "-e" in parameterName :
                 if(simulation=="Matchbox"):
                   process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",0,0)
                 elif(simulation=="Merging"):
                   process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",2,2)
             else :
                 if(simulation=="Matchbox"):
                   process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",0,0)
                 elif(simulation=="Merging"):
                   process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",2,2)
         elif "Z-HighMass1" in parameterName :
             process+=addLeptonPairCut("116","400")
             if "-e" in parameterName :
                 if(simulation=="Matchbox"):
                   process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",0,0)
                 elif(simulation=="Merging"):
                   process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",2,2)
             else :
                 if(simulation=="Matchbox"):
                   process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",0,0)
                 elif(simulation=="Merging"):
                   process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",2,2)
         elif "Z-HighMass2" in parameterName :
             process+=addLeptonPairCut("400","7000")
             if "-e" in parameterName :
                 if(simulation=="Matchbox"):
                   process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",0,0)
                 elif(simulation=="Merging"):
                   process+=addProcess(thefactory,"p p e+ e-","0","2","LeptonPairMassScale",2,2)
             else :
                 if(simulation=="Matchbox"):
                   process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",0,0)
                 elif(simulation=="Merging"):
                   process+=addProcess(thefactory,"p p mu+ mu-","0","2","LeptonPairMassScale",2,2)
         elif "W-Jet" in parameterName :
             if(simulation=="Merging"):
               logging.warning("W-Jet not explicitly tested for %s " % simulation)
               sys.exit(0)
             
             process+=addProcess(thefactory,"p p e+ nu j","1","2","HTScale",0,0)
             process+=addProcess(thefactory,"p p e- nu j","1","2","HTScale",0,0)
             
             process+=addLeptonPairCut("60","120")
             if "W-Jet-1-e" in parameterName :
                 process+=addFirstJet("100")
                 parameterName=parameterName.replace("W-Jet-1-e","W-Jet-e")
             elif "W-Jet-2-e" in parameterName :
                 process+=addFirstJet("190")
                 parameterName=parameterName.replace("W-Jet-2-e","W-Jet-e")
             elif "W-Jet-3-e" in parameterName :
                 process+=addFirstJet("270")
                 parameterName=parameterName.replace("W-Jet-3-e","W-Jet-e")
             else :
                 logging.error("Exit 00005")
                 sys.exit(1)
         elif "Z-Jet" in parameterName :
             if(simulation=="Merging"):
               logging.warning("Z-Jet not explicitly tested for %s " % simulation)
               sys.exit(0)
             
             
             if "-e" in parameterName :
                 process+=addProcess(thefactory,"p p e+ e- j","1","2","HTScale",0,0)
                 if "Z-Jet-0-e" in parameterName :
                     process+=addFirstJet("35")
                     parameterName=parameterName.replace("Z-Jet-0-e","Z-Jet-e")
                 elif "Z-Jet-1-e" in parameterName :
                     process+=addFirstJet("100")
                     parameterName=parameterName.replace("Z-Jet-1-e","Z-Jet-e")
                 elif "Z-Jet-2-e" in parameterName :
                     process+=addFirstJet("190")
                     parameterName=parameterName.replace("Z-Jet-2-e","Z-Jet-e")
                 elif "Z-Jet-3-e" in parameterName :
                     process+=addFirstJet("270")
                     parameterName=parameterName.replace("Z-Jet-3-e","Z-Jet-e")
                 else :
                     logging.error("Exit 00006")
                     sys.exit(1)
             else :
                 process+=addProcess(thefactory,"p p mu+ mu- j","1","2","HTScale",0,0)
                 process+=addFirstJet("35")
                 parameterName=parameterName.replace("Z-Jet-0-mu","Z-Jet-mu")
             process+=addLeptonPairCut("60","120")
         elif "Z-bb" in parameterName :
             if(simulation=="Merging"):
               logging.warning("Z-bb not explicitly tested for %s " % simulation)
               sys.exit(0)
             parameters["bscheme"]=fourFlavour
             process+="set /Herwig/Particles/b:HardProcessMass 4.2*GeV\nset /Herwig/Particles/bbar:HardProcessMass 4.2*GeV\n"
             process+=addProcess(thefactory,"p p e+ e- b bbar","2","2","FixedScale",0,0)
             process+=addLeptonPairCut("66","116")
             process+=addFirstJet("18")
             process+=addSecondJet("15")
             process+=addLeptonPairCut("60","120")
         elif "Z-b" in parameterName :
             if(simulation=="Merging"):
               logging.warning("Z-b not explicitly tested for %s " % simulation)
               sys.exit(0)
             process+=particlegroup('bjet','b','bbar')
             process+=addProcess(thefactory,"p p e+ e- bjet","1","2","FixedScale",0,0)
             process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 91.2*GeV\n"
             process+=addLeptonPairCut("60","120")
             process+=addFirstJet("15")
         elif "W-b" in parameterName :
             if(simulation=="Merging"):
               logging.warning("W-b not explicitly tested for %s " % simulation)
               sys.exit(0)
             parameters["bscheme"]=fourFlavour
             process += "set /Herwig/Particles/b:HardProcessMass 4.2*GeV\nset /Herwig/Particles/bbar:HardProcessMass 4.2*GeV\n"
             process+=addProcess(thefactory,"p p e-  nu b bbar","2","2","FixedScale",0,0)
             process+=addProcess(thefactory,"p p mu+ nu b bbar","2","2","FixedScale",0,0)
             process += "set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 80.4*GeV\n"
             process+=addFirstJet("30")
             process+=addLeptonPairCut("60","120")
         else :
             logging.error(" Process %s not supported for Matchbox matrix elements" % name)
             sys.exit(1)
 # LHC-GammaGamma
 elif(collider=="LHC-GammaGamma" ) :
     if   "-7-" in parameterName : process = StringBuilder(collider_lumi(7000.0))
     elif "-8-" in parameterName : process = StringBuilder(collider_lumi(8000.0))
     else :                        process = StringBuilder(collider_lumi(7000.0))
     if(simulation=="") :
         if "7" in parameterName : process += insert_ME("MEgg2ff","Muon")
         else :
             logging.error(" Process %s not supported for default matrix elements" % name)
             sys.exit(1)
     else :
         logging.error("LHC-GammaGamma not supported for %s " % simulation)
         sys.exit(1)
 
 
 parameters['parameterFile'] = os.path.join(collider,"{c}-{pn}.in".format(c=collider, pn=parameterName))
 parameters['runname'] = 'Rivet-%s' % name
 parameters['process'] = str(process)
 if have_hadronic_collider :
     if collider == "EHS" :
         parameters['collider'] = "PPCollider.in\nread snippets/FixedTarget-PP.in"
     else :
         parameters['collider'] = "PPCollider.in"
 
 #check if selecteddecaymode and addedBRReweighter is consistent
 
 if selecteddecaymode and not addedBRReweighter:
     logging.error("Decaymode was selected but no BRReweighter was added.")
     sys.exit(1)
 
 if addedBRReweighter and not selecteddecaymode:
     logging.error("BRReweighter was added but no Decaymode was selected.")
     sys.exit(1)
 
 # check that we only add one process if in merging mode:
 
 if numberOfAddedProcesses > 1 and simulation =="Merging":
     logging.error("In Merging only one process is allowed at the moment. See ticket #403.")
     sys.exit(1)
 
 # Check if a process was added for Merging or Matchbox:
 
 if numberOfAddedProcesses == 0 and (simulation =="Merging" or simulation =="Matchbox"):
     logging.error("No process was selected.")
     sys.exit(1)
 
 # get template and write the file
 
 with open(os.path.join("Rivet/Templates",templateName), 'r') as f:
     templateText = f.read()
 
 template = Template( templateText )
 
 with open(os.path.join("Rivet",name+".in"), 'w') as f:
         f.write( template.substitute(parameters) )
diff --git a/Tests/python/merge-BFactory b/Tests/python/merge-BFactory
--- a/Tests/python/merge-BFactory
+++ b/Tests/python/merge-BFactory
@@ -1,283 +1,122 @@
 #! /usr/bin/env python
 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, yoda
 
 # #############################################
 
 def fillAbove(desthisto, sourcehistosbysqrts):
-    for sqrts, h in sorted(sourcehistosbysqrts.iteritems()) :
-        if(sqrts=="U1") :
-            sqrts2=9.46
-        elif sqrts=="U2" :
-            sqrts2=10.02
-        elif sqrts=="U4" :
-            sqrts2=10.58
-        else :
-            sqrts2=float(sqrts)
-            if("ARGUS_1989_I276860" in desthisto.path and sqrts2==10.00) : sqrts2=9.98
+    for sqrts, h in sorted(sourcehistosbysqrts) :
         for i in range(0,h.numPoints) :
             if(h.points[i].x-0.01<sqrts2 and
                h.points[i].x+0.01>sqrts2) :
                 desthisto.addPoint(h.points[i])
 
 def merge(hpath):
     global inhistos
     global outhistos
     try:
         fillAbove(outhistos[hpath], inhistos[hpath])
     except:
         logging.error("Unknown analysis object" + hpath)
         sys.exit(1)
 
 def useOne(hpath, sqrts):
     global inhistos
     global outhistso
     try:
         outhistos[hpath] =  inhistos[hpath][float(sqrts)]
     except:
         try:
             outhistos[hpath] =  inhistos[hpath][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")
 
     ## Check args
     if len(args) < 1:
         logging.error("Must specify at least the name of the files")
         sys.exit(1)
 
 # #######################################
 
 yodafiles=["-9.46","-10.00","-10.52","-10.52-sym","-10.54",
            "-10.58-res","-10.58","-Upsilon",
            "-Upsilon2","-Upsilon4","-10.45","-10.47","-Tau","-Phi"]
 
 ## Get histos
 inhistos = {}
 outhistos={}
 weights = {}
 for f in yodafiles:
     file = "Rivet-%s%s.yoda" % (args[0], f)
     if(file.find("9.46")>0) :
         sqrts=9.46
     elif(file.find("10.00")>0) :
         sqrts=10.00
     elif(file.find("10.45")>0) :
         sqrts=10.45
     elif(file.find("10.47")>0) :
         sqrts=10.47
     elif(file.find("10.52")>0) :
         sqrts=10.52
     elif(file.find("10.54")>0) :
         sqrts=10.54
     elif(file.find("10.58")>0) :
         sqrts=10.58
     elif(file.find("Tau")>0) :
         sqrts=10.58
     elif(file.find("Upsilon4")>0) :
         sqrts="U4"
     elif(file.find("Upsilon2")>0) :
         sqrts="U2"
     elif(file.find("Upsilon")>0) :
         sqrts="U1"
     if not os.access(file, os.R_OK):
         if(file.find("Upsilon")>=0 or file.find("Tau")>=0) : continue
         logging.error("%s can not be read" % file)
         continue
     try:
         aos = yoda.read(file)
     except:
         logging.error("%s can not be parsed as yoda" % file)
         continue
-    ## Get histos from this YODA file
-    for aopath, ao in aos.iteritems() :
-        if("RAW" in aopath) :continue
-        if(aopath.find("6265367")>0 or aopath.find("6895344")>0 or
-           aopath.find("6181155")>0 or aopath.find("2789213")>0 or
-           aopath.find("2669951")>0 or aopath.find("278933" )>0 or
-           aopath.find("276860" )>0 or aopath.find("251097" )>0 or
-           aopath.find("262551" )>0 or aopath.find("262415" )>0 ) :
-           if not inhistos.has_key(aopath):
-               inhistos[aopath] = {}
-           tmpE = inhistos[aopath]
-           sqrttemp=sqrts
-           if(aopath.find("2669951")>0 and aopath.find("d01")>0 and 
-              sqrts==10.45) :
-               sqrts=9.9
+
+
+
+
+    
            
-           if not tmpE.has_key(sqrts):
-               tmpE[sqrts] = ao
-           else:
-               raise Exception("A set with sqrts = %s already exists" % ( sqrts))
-           sqrts=sqrttemp
+           
         else :
-            if("ARGUS_1992_I319102" in aopath) :
-                if("d02" in aopath and sqrts==10.47) :
-                    outhistos[aopath] = ao
-                elif("d03"in aopath and sqrts=="U4") :
-                    outhistos[aopath] = ao
-            else:
-                outhistos[aopath] = ao
 
 ## Make empty output histos if needed
 for hpath,hsets in inhistos.iteritems():
-    if( hpath.find("2669951")>0 or hpath.find("276860" )>0) :
+    if() :
         if(type(hsets.values()[0])==yoda.core.Scatter2D) :
             outhistos[hpath] = yoda.core.Scatter2D(hsets.values()[0].path,hsets.values()[0].title)
         else :
             outhistos[hpath] = hsets.values()[0]
 
-# BELLE
-useOne("/BELLE_2006_S6265367/d01-x01-y01","10.52")
-useOne("/BELLE_2006_S6265367/d01-x01-y02","10.52")
-useOne("/BELLE_2006_S6265367/d01-x01-y03","10.52")
-useOne("/BELLE_2006_S6265367/d01-x01-y04","10.52")
-useOne("/BELLE_2006_S6265367/d01-x01-y05","10.52")
-useOne("/BELLE_2006_S6265367/d01-x01-y06","10.52")
-useOne("/BELLE_2006_S6265367/d01-x01-y07","10.52")
-useOne("/BELLE_2006_S6265367/d01-x01-y08","10.52")
-useOne("/BELLE_2006_S6265367/d02-x01-y01","10.52")
-useOne("/BELLE_2006_S6265367/d02-x01-y02","10.52")
-useOne("/BELLE_2006_S6265367/d03-x01-y01","10.52")
-useOne("/BELLE_2006_S6265367/d03-x01-y02","10.52")
-useOne("/BELLE_2006_S6265367/d04-x01-y01","10.52")
-useOne("/BELLE_2006_S6265367/d04-x01-y02","10.52")
-useOne("/BELLE_2006_S6265367/d05-x01-y01","10.52")
-useOne("/BELLE_2006_S6265367/d05-x01-y02","10.52")
-useOne("/BELLE_2006_S6265367/d06-x01-y01","10.52")
-useOne("/BELLE_2006_S6265367/d06-x01-y02","10.52")
-useOne("/BELLE_2006_S6265367/d07-x01-y01","10.52")
-useOne("/BELLE_2006_S6265367/d07-x01-y02","10.52")
-useOne("/BELLE_2006_S6265367/d08-x01-y01","10.52")
-useOne("/BELLE_2006_S6265367/d08-x01-y02","10.52")
-useOne("/BELLE_2006_S6265367/d09-x01-y01","U4")
-useOne("/BELLE_2006_S6265367/d09-x01-y02","U4")
-useOne("/BELLE_2006_S6265367/d10-x01-y01","U4")
-useOne("/BELLE_2006_S6265367/d10-x01-y02","U4")
-useOne("/BELLE_2006_S6265367/d11-x01-y01","U4")
-useOne("/BELLE_2006_S6265367/d11-x01-y02","U4")
-useOne("/BELLE_2006_S6265367/d12-x01-y01","U4")
-useOne("/BELLE_2006_S6265367/d12-x01-y02","U4")
-useOne("/BELLE_2006_S6265367/d13-x01-y01","U4")
-useOne("/BELLE_2006_S6265367/d13-x01-y02","U4")
-useOne("/BELLE_2006_S6265367/d14-x01-y01","U4")
-useOne("/BELLE_2006_S6265367/d14-x01-y02","U4")
-useOne("/BELLE_2006_S6265367/d15-x01-y01","U4")
-useOne("/BELLE_2006_S6265367/d15-x01-y02","U4")
-# BABAR
-useOne("/BABAR_2007_S6895344/d01-x01-y01","10.54")
-useOne("/BABAR_2007_S6895344/d02-x01-y01","10.54")
-useOne("/BABAR_2007_S6895344/d03-x01-y01","10.58")
-useOne("/BABAR_2007_S6895344/d04-x01-y01","10.58")
-# BABAR
-useOne("/BABAR_2005_S6181155/d01-x01-y01","10.58")
-useOne("/BABAR_2005_S6181155/d02-x01-y01","10.58")
-useOne("/BABAR_2005_S6181155/d02-x01-y02","10.54")
-useOne("/BABAR_2005_S6181155/d03-x01-y01","10.54")
-useOne("/BABAR_2005_S6181155/d04-x01-y01","10.58")
-useOne("/BABAR_2005_S6181155/d05-x01-y01","10.58")
-useOne("/BABAR_2005_S6181155/d05-x01-y02","10.54")
-# ARGUS
-useOne("/ARGUS_1993_S2789213/d01-x01-y01","10.45")
-useOne("/ARGUS_1993_S2789213/d01-x01-y02","10.45")
-useOne("/ARGUS_1993_S2789213/d01-x01-y03","10.45")
-useOne("/ARGUS_1993_S2789213/d01-x01-y04","10.45")
-useOne("/ARGUS_1993_S2789213/d01-x01-y05","10.45")
-useOne("/ARGUS_1993_S2789213/d02-x01-y01", "U1")
-useOne("/ARGUS_1993_S2789213/d02-x01-y02", "U1")
-useOne("/ARGUS_1993_S2789213/d02-x01-y03", "U1")
-useOne("/ARGUS_1993_S2789213/d02-x01-y04", "U1")
-useOne("/ARGUS_1993_S2789213/d02-x01-y05", "U1")
-useOne("/ARGUS_1993_S2789213/d03-x01-y01","U4")
-useOne("/ARGUS_1993_S2789213/d03-x01-y02","U4")
-useOne("/ARGUS_1993_S2789213/d03-x01-y03","U4")
-useOne("/ARGUS_1993_S2789213/d03-x01-y04","U4")
-useOne("/ARGUS_1993_S2789213/d03-x01-y05","U4")
-useOne("/ARGUS_1993_S2789213/d04-x01-y01","10.45")
-useOne("/ARGUS_1993_S2789213/d05-x01-y01", "U1")
-useOne("/ARGUS_1993_S2789213/d06-x01-y01","U4")
-useOne("/ARGUS_1993_S2789213/d07-x01-y01","10.45")
-useOne("/ARGUS_1993_S2789213/d08-x01-y01", "U1")
-useOne("/ARGUS_1993_S2789213/d09-x01-y01","U4")
-useOne("/ARGUS_1993_S2789213/d10-x01-y01","10.45")
-useOne("/ARGUS_1993_S2789213/d11-x01-y01", "U1")
-useOne("/ARGUS_1993_S2789213/d12-x01-y01","U4")
-useOne("/ARGUS_1993_S2789213/d13-x01-y01","10.45")
-useOne("/ARGUS_1993_S2789213/d14-x01-y01", "U1")
-useOne("/ARGUS_1993_S2789213/d15-x01-y01","U4")
-
-if("/ARGUS_1993_S2669951/d04-x01-y01" in outhistos) :
-    useOne("/ARGUS_1993_S2669951/d02-x01-y01","10.45")
-    useOne("/ARGUS_1993_S2669951/d03-x01-y01","U1")
-    useOne("/ARGUS_1993_S2669951/d04-x01-y01","U2")
-    merge("/ARGUS_1993_S2669951/d01-x01-y01")
-    merge("/ARGUS_1993_S2669951/d01-x01-y02")
-    merge("/ARGUS_1993_S2669951/d05-x01-y01")
-
-useOne("/ARGUS_1990_I278933/d01-x01-y01","9.46")
-useOne("/ARGUS_1990_I278933/d01-x01-y02","U1")
-useOne("/ARGUS_1990_I278933/d01-x01-y03","U2")
-useOne("/ARGUS_1990_I278933/d02-x01-y01","9.46")
-useOne("/ARGUS_1990_I278933/d02-x01-y02","U1")
-useOne("/ARGUS_1990_I278933/d02-x01-y03","U2")
-useOne("/ARGUS_1990_I278933/d03-x01-y01","9.46")
-useOne("/ARGUS_1990_I278933/d03-x01-y02","9.46")
-useOne("/ARGUS_1990_I278933/d04-x01-y01","U1")
-useOne("/ARGUS_1990_I278933/d04-x01-y02","U2")
-useOne("/ARGUS_1990_I278933/d05-x01-y01","9.46")
-useOne("/ARGUS_1990_I278933/d05-x01-y02","9.46")
-useOne("/ARGUS_1990_I278933/d06-x01-y01","U1")
-useOne("/ARGUS_1990_I278933/d06-x01-y02","U2")
-
-useOne("/ARGUS_1989_I262551/d01-x01-y01","10.00")
-useOne("/ARGUS_1989_I262551/d02-x01-y01","U1")
-useOne("/ARGUS_1989_I262551/d02-x01-y02","U2")
-useOne("/ARGUS_1989_I262551/d03-x01-y01","U1")
-useOne("/ARGUS_1989_I262551/d04-x01-y01","U2")
-
-merge("/ARGUS_1989_I276860/d01-x01-y01")
-merge("/ARGUS_1989_I276860/d01-x01-y02")
-merge("/ARGUS_1989_I276860/d02-x01-y01")
-merge("/ARGUS_1989_I276860/d03-x01-y01")
-merge("/ARGUS_1989_I276860/d04-x01-y01")
-merge("/ARGUS_1989_I276860/d04-x01-y02")
-for i in range(5,13) :
-    useOne("/ARGUS_1989_I276860/d%02d-x01-y01" %i,"U1")
-    useOne("/ARGUS_1989_I276860/d%02d-x01-y02" %i,"10.00")
-
-for i in range(1,8) :
-    useOne("/ARGUS_1988_I251097/d01-x01-y%02d" %i,"U1")
-    useOne("/ARGUS_1988_I251097/d02-x01-y%02d" %i,"10.00")
-useOne("/ARGUS_1988_I251097/d03-x01-y01","U1")
-useOne("/ARGUS_1988_I251097/d04-x01-y01","U2")
-useOne("/ARGUS_1988_I251097/d05-x01-y01","10.00")
-useOne("/ARGUS_1988_I251097/d06-x01-y01","10.00")
-useOne("/ARGUS_1988_I251097/d07-x01-y01","U1")
-useOne("/ARGUS_1988_I251097/d08-x01-y01","U2")
-useOne("/ARGUS_1988_I251097/d09-x01-y01","10.00")
-
-useOne("/ARGUS_1989_I262415/d03-x01-y01","U1")
-useOne("/ARGUS_1989_I262415/d04-x01-y01","10.00")
 # Choose output file
 name = args[0]+".yoda"
 # output the yoda file
 yoda.writeYODA(outhistos,name)
 sys.exit(0)
diff --git a/Tests/python/merge-LEP b/Tests/python/merge-EE
rename from Tests/python/merge-LEP
rename to Tests/python/merge-EE
--- a/Tests/python/merge-LEP
+++ b/Tests/python/merge-EE
@@ -1,900 +1,1089 @@
 #! /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, yoda, copy
 
 # # #############################################
 
 def fillAbove(desthisto, sourcehistosbysqrts):
     if type(desthisto) is yoda.core.Scatter2D :
-        for sqrts in sorted(sourcehistosbysqrts.keys()) :
-            h=sourcehistosbysqrts[sqrts]
+        for sqrts,h in sorted(sourcehistosbysqrts.iteritems()) :
+            if(sqrts=="U1") :
+                sqrts2=9.46
+            elif sqrts=="U2" :
+                sqrts2=10.02
+            elif sqrts=="U4" :
+                sqrts2=10.58
+            else :
+                sqrts2=float(sqrts)
+            if("ARGUS_1989_I276860" in desthisto.path and sqrts2==10.00) : sqrts2=9.98
             for i in range(0,h.numPoints) :
-                if sqrts==h.points[i].x :
+                if(sqrts2>=h.points[i].xMin and \
+                   sqrts2<=h.points[i].xMax) :
                     desthisto.addPoint(h.points[i])
 
     elif(type(desthisto)==yoda.core.Profile1D) :
         for sqrts, h in sorted(sourcehistosbysqrts.iteritems()) :
             for i in range(0,h.numBins) :
                 if(sqrts>=h.bins[i].xMin and \
                    sqrts<=h.bins[i].xMax) :
                     desthisto.bins[i] += h.bins[i]
                     break
     else :
         logging.error("Unknown analysis object" + desthisto.path)
         sys.exit(1)
 
 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
+        try:
+            outhistos[hpath] =  inhistos[hpath][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)
     parser.add_option("--with-gg",
                       action='store_true' ,
                       dest="gg",
                       default=False,
                       help="Include gg analyese")
     parser.add_option("--without-gg",
                       action='store_false',
                       dest="gg",
                       default=False,
                       help="Don\'t include gg analyses")
     (opts, args) = parser.parse_args()
     logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
     ## Check args
     if len(args) < 1:
         logging.error("Must specify at least the name of the files")
         sys.exit(1)
 
 #######################################
 
 yodafiles=["-130","-133","-136","-177","-192",
            "-196","-202","-205","-206","-207","-91" ,"-91-nopi" ,\
            "-161","-183","-197","-35" ,"-172",\
            "-189","-200","-44","-14","-22","-10",\
            "-12.8","-26.8","-48.0","-93.0",\
            "-12","-13","-17","-27.6","-29","-30.2",\
            "-30.7","-30","-31.3","-34","-34.8","-43.6","-50","-52","-53.3",\
            "-55","-56","-57","-58","-59.5","-60.8","-60","-61.4","-9.4","-45","-66","-76","-41","-82","-85"]
 # add gg if needed
 if(opts.gg) :
     yodafiles += ["-10.5-gg","-12.8-gg","-16.86-gg","-26.8-gg",\
                   "-35.44-gg","-97.0-gg","-11.96-gg","-13.96-gg",\
                   "-21.84-gg","-28.48-gg","-48.0-gg"]
+    
+yodafiles += ["-9.46","-10.00","-10.52","-10.52-sym","-10.54",
+              "-10.58-res","-10.58","-Upsilon",
+              "-Upsilon2","-Upsilon4","-10.45","-10.47","-Tau","-Phi"]
 ## Get histos
 inhistos = {}
 outhistos={}
 for f in yodafiles:
     file = "Rivet-%s%s.yoda" % (args[0], f)
-    sqrts=float(f.split("-")[1].replace(".yoda",""))
+    if(file.find("Tau")>0) :
+        sqrts=10.58
+    elif(file.find("Upsilon4")>0) :
+        sqrts="U4"
+    elif(file.find("Upsilon2")>0) :
+        sqrts="U2"
+    elif(file.find("Upsilon")>0) :
+        sqrts="U1"
+    elif(file.find("Phi")>0) :
+        sqrts="phi"
+    else :
+        sqrts=float(f.split("-")[1].replace(".yoda",""))
+
+
+    
     if not os.access(file, os.R_OK):
         logging.error("%s cannot be read" % file)
         continue
     try:
         aos = yoda.read(file)
     except:
         logging.error("%s cannot be parsed as yoda" % file)
         continue
     ## Get histos from this YODA file
     for aopath, ao in aos.iteritems() :
         if("RAW" in aopath) :continue
-        # jet shapes
+        # plots which neede merging/selecting
         if(aopath.find("4300807")>0 or aopath.find("6132243")>0 or
            aopath.find("5765862")>0 or aopath.find("3612880")>0 or
            aopath.find("4328825")>0 or aopath.find("5361494")>0 or
            aopath.find("2148048")>0 or aopath.find("295160")>0  or
            aopath.find("190818" )>0 or aopath.find("154270")>0 or
-           aopath.find("277658")>0 or
+           aopath.find("277658" )>0 or
+           aopath.find("6265367")>0 or aopath.find("6895344")>0 or
+           aopath.find("6181155")>0 or aopath.find("2789213")>0 or
+           aopath.find("2669951")>0 or aopath.find("278933" )>0 or
+           aopath.find("276860" )>0 or aopath.find("251097" )>0 or
+           aopath.find("262551" )>0 or aopath.find("262415" )>0 or
+           aopath.find("165122" )>0 or
            aopath.find("MULTIPLICITIES")>0) :
             if not inhistos.has_key(aopath):
                 inhistos[aopath] = {}
-            if not inhistos[aopath].has_key(sqrts):
-                inhistos[aopath][sqrts] = ao
+            tmpE = inhistos[aopath]
+            sqrttemp=sqrts
+            if(aopath.find("2669951")>0 and aopath.find("d01")>0 and 
+               sqrts==10.45) :
+                sqrts=9.9
+            if not tmpE.has_key(sqrts):
+                tmpE[sqrts] = ao
             else:
                 raise Exception("A set with sqrts = %s already exists" % ( sqrts))
+            sqrts=sqrttemp
         elif(aopath.find("OPAL_2004_I648738")>=0) :
             if(file.find("gg")>=0) :
                 if(aopath.find("y03")>=0) :
                     outhistos[aopath] = ao
             else :
                 if(aopath.find("y03")<0) :
                     outhistos[aopath] = ao
         else :
-            outhistos[aopath] = ao
+            if("ARGUS_1992_I319102" in aopath) :
+                if("d02" in aopath and sqrts==10.47) :
+                    outhistos[aopath] = ao
+                elif("d03"in aopath and sqrts=="U4") :
+                    outhistos[aopath] = ao
+            else:
+                outhistos[aopath] = ao
 
 # ## Make empty output histos if needed
 for hpath,hsets in inhistos.iteritems():
     if( hpath.find("4300807")>0 or hpath.find("6132243")>0 or 
-        hpath.find("5765862")>0 or hpath.find("295160")>0 or
+        hpath.find("5765862")>0 or hpath.find("295160" )>0 or
         hpath.find("4328825")>0 or hpath.find("5361494")>0 or
-        hpath.find("190818")>0 or hpath.find("154270")>0 or
-        hpath.find("277658")>0) :
+        hpath.find("190818" )>0 or hpath.find("154270" )>0 or
+        hpath.find("277658" )>0 or hpath.find("2669951")>0 or
+        hpath.find("276860" )>0 or hpath.find("165122" )>0) :
+        if(hpath=="/PLUTO_1981_I165122/d01-x01-y01"  or
+           hpath=="/PLUTO_1981_I165122/d03-x01-y01" ) : continue
         if(type(hsets.values()[0])==yoda.core.Scatter2D) :
             outhistos[hpath] = yoda.core.Scatter2D(hsets.values()[0].path,
                                                    hsets.values()[0].title)
         elif(type(hsets.values()[0])==yoda.core.Profile1D) :
             outhistos[hpath] = yoda.core.Profile1D(hsets.values()[0].path,
                                                    hsets.values()[0].title)
             for i in range(0,hsets.values()[0].numBins) :
                 outhistos[hpath].addBin(hsets.values()[0].bins[i].xMin,
                                         hsets.values()[0].bins[i].xMax)
         elif(type(hsets.values()[0])==yoda.core.Histo1D) :
             outhistos[hpath] = yoda.core.Histo1D(hsets.values()[0].path,
                                                 hsets.values()[0].title)
             for i in range(0,hsets.values()[0].numBins) :
                 outhistos[hpath].addBin(hsets.values()[0].bins[i].xMin,
                                         hsets.values()[0].bins[i].xMax)
         else :
             logging.error("Histogram %s is of unknown type" % hpath)
             sys.exit(1)
 
 # tasso
 useOne("/TASSO_1990_S2148048/d06-x01-y01","14")
 useOne("/TASSO_1990_S2148048/d07-x01-y01","14")
 useOne("/TASSO_1990_S2148048/d08-x01-y01","14")
 useOne("/TASSO_1990_S2148048/d06-x01-y02","22")
 useOne("/TASSO_1990_S2148048/d07-x01-y02","22")
 useOne("/TASSO_1990_S2148048/d08-x01-y02","22")
 useOne("/TASSO_1990_S2148048/d06-x01-y03","35")
 useOne("/TASSO_1990_S2148048/d07-x01-y03","35")
 useOne("/TASSO_1990_S2148048/d08-x01-y03","35")
 useOne("/TASSO_1990_S2148048/d06-x01-y04","44")
 useOne("/TASSO_1990_S2148048/d07-x01-y04","44")
 useOne("/TASSO_1990_S2148048/d08-x01-y04","44")
 # jade
 useOne("/JADE_1998_S3612880/d02-x01-y01","44")
 useOne("/JADE_1998_S3612880/d03-x01-y01","44")
 useOne("/JADE_1998_S3612880/d04-x01-y01","44")
 useOne("/JADE_1998_S3612880/d05-x01-y01","44")
 useOne("/JADE_1998_S3612880/d06-x01-y01","35")
 useOne("/JADE_1998_S3612880/d07-x01-y01","35")
 useOne("/JADE_1998_S3612880/d08-x01-y01","35")
 useOne("/JADE_1998_S3612880/d09-x01-y01","35")
 useOne("/JADE_1998_S3612880/d10-x01-y01","44")
 useOne("/JADE_1998_S3612880/d11-x01-y01","35")
 useOne("/JADE_1998_S3612880/d12-x01-y01","22")
 # opal/jade
 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(  "/OPAL_2002_S5361494/d01-x01-y01")
 merge(  "/OPAL_2002_S5361494/d01-x01-y02")
 merge(  "/OPAL_2002_S5361494/d01-x01-y03")
 merge(  "/OPAL_2002_S5361494/d01-x01-y04")
 merge("/DELPHI_2000_S4328825/d01-x01-y01")
 merge("/DELPHI_2000_S4328825/d01-x01-y02")
 merge("/DELPHI_2000_S4328825/d01-x01-y03")
 merge("/DELPHI_2000_S4328825/d01-x01-y04")
 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")
 
 # hadron multiplicities
 useOne("/PDG_HADRON_MULTIPLICITIES/d01-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d02-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d03-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d04-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d05-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d06-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d07-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d08-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d09-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d13-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d15-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d17-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d18-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d19-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d20-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d21-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d22-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d23-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d25-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d31-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d38-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d39-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d40-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d44-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d45-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d46-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d47-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d48-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d49-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d50-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d51-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d53-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES/d54-x01-y01","10")
 
 useOne("/PDG_HADRON_MULTIPLICITIES/d01-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d02-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d03-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d04-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d05-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d06-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d07-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d08-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d09-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d13-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d15-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d18-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d19-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d20-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d21-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d22-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d31-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d33-x01-y01","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d34-x01-y01","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d38-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d39-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d44-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d46-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d47-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d48-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d50-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES/d51-x01-y02","35")
 
 useOne("/PDG_HADRON_MULTIPLICITIES/d01-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d02-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d03-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d04-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d05-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d06-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d07-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d08-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d09-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d10-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d11-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d12-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d13-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d14-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d15-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d16-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d17-x01-y02","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d18-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d19-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d20-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d21-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d23-x01-y02","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d24-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d25-x01-y02","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d26-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d27-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d28-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d29-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d30-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d31-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d32-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d34-x01-y02","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d35-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d36-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d37-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d38-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d39-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d40-x01-y02","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d41-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d42-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d43-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d44-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d45-x01-y02","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d46-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d47-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d48-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d49-x01-y02","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d50-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d51-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d52-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d54-x01-y02","91")
 useOne("/PDG_HADRON_MULTIPLICITIES/d01-x01-y04","177")
 useOne("/PDG_HADRON_MULTIPLICITIES/d03-x01-y04","177")
 useOne("/PDG_HADRON_MULTIPLICITIES/d04-x01-y04","177")
 useOne("/PDG_HADRON_MULTIPLICITIES/d38-x01-y04","177")
 useOne("/PDG_HADRON_MULTIPLICITIES/d39-x01-y04","177")
 
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d02-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d03-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d04-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d05-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d06-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d07-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d08-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d09-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d13-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d15-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d17-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d18-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d19-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d20-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d21-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d22-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d23-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d25-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d31-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d38-x01-y01","10" )
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d39-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d40-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d44-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d45-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d46-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d47-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d48-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d49-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d50-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d51-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d53-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d54-x01-y01","10")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d02-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d03-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d04-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d05-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d06-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d07-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d08-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d09-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d13-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d15-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d18-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d19-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d20-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d21-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d22-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d31-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d33-x01-y01","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d34-x01-y01","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d38-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d39-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d44-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d46-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d47-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d48-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d50-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d51-x01-y02","35")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d02-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d03-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d04-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d05-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d06-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d07-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d08-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d09-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d10-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d11-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d12-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d13-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d14-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d15-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d16-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d17-x01-y02","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d18-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d19-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d20-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d21-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d23-x01-y02","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d24-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d25-x01-y02","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d26-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d27-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d28-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d29-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d30-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d31-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d32-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d34-x01-y02","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d35-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d36-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d37-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d38-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d39-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d40-x01-y02","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d41-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d42-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d43-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d44-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d45-x01-y02","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d46-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d47-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d48-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d49-x01-y02","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d50-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d51-x01-y03","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d52-x01-y01","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d54-x01-y02","91")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d03-x01-y04","177")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d04-x01-y04","177")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d38-x01-y04","177")
 useOne("/PDG_HADRON_MULTIPLICITIES_RATIOS/d39-x01-y04","177")
 # AMY analysis
 useOne("/AMY_1990_I295160/d01-x01-y01","50")
 useOne("/AMY_1990_I295160/d01-x01-y02","52")
 useOne("/AMY_1990_I295160/d01-x01-y03","55")
 useOne("/AMY_1990_I295160/d01-x01-y04","56")
 useOne("/AMY_1990_I295160/d01-x01-y05","57")
 useOne("/AMY_1990_I295160/d01-x01-y06","60")
 useOne("/AMY_1990_I295160/d01-x01-y07","60.8")
 useOne("/AMY_1990_I295160/d01-x01-y08","61.4")
 useOne("/AMY_1990_I295160/d01-x01-y09","57")
 useOne("/AMY_1990_I295160/d02-x02-y01","57")
 merge("/AMY_1990_I295160/d02-x01-y01")
 merge("/JADE_1983_I190818/d01-x01-y01")
 merge("/PLUTO_1980_I154270/d01-x01-y01")
 
 merge("/TASSO_1989_I277658/d02-x01-y01")
 useOne("/TASSO_1989_I277658/d05-x01-y01","14")
 useOne("/TASSO_1989_I277658/d05-x01-y02","22")
 useOne("/TASSO_1989_I277658/d05-x01-y03","34.8")
 useOne("/TASSO_1989_I277658/d05-x01-y04","43.6")
+
+
+# BELLE
+useOne("/BELLE_2006_S6265367/d01-x01-y01","10.52")
+useOne("/BELLE_2006_S6265367/d01-x01-y02","10.52")
+useOne("/BELLE_2006_S6265367/d01-x01-y03","10.52")
+useOne("/BELLE_2006_S6265367/d01-x01-y04","10.52")
+useOne("/BELLE_2006_S6265367/d01-x01-y05","10.52")
+useOne("/BELLE_2006_S6265367/d01-x01-y06","10.52")
+useOne("/BELLE_2006_S6265367/d01-x01-y07","10.52")
+useOne("/BELLE_2006_S6265367/d01-x01-y08","10.52")
+useOne("/BELLE_2006_S6265367/d02-x01-y01","10.52")
+useOne("/BELLE_2006_S6265367/d02-x01-y02","10.52")
+useOne("/BELLE_2006_S6265367/d03-x01-y01","10.52")
+useOne("/BELLE_2006_S6265367/d03-x01-y02","10.52")
+useOne("/BELLE_2006_S6265367/d04-x01-y01","10.52")
+useOne("/BELLE_2006_S6265367/d04-x01-y02","10.52")
+useOne("/BELLE_2006_S6265367/d05-x01-y01","10.52")
+useOne("/BELLE_2006_S6265367/d05-x01-y02","10.52")
+useOne("/BELLE_2006_S6265367/d06-x01-y01","10.52")
+useOne("/BELLE_2006_S6265367/d06-x01-y02","10.52")
+useOne("/BELLE_2006_S6265367/d07-x01-y01","10.52")
+useOne("/BELLE_2006_S6265367/d07-x01-y02","10.52")
+useOne("/BELLE_2006_S6265367/d08-x01-y01","10.52")
+useOne("/BELLE_2006_S6265367/d08-x01-y02","10.52")
+useOne("/BELLE_2006_S6265367/d09-x01-y01","U4")
+useOne("/BELLE_2006_S6265367/d09-x01-y02","U4")
+useOne("/BELLE_2006_S6265367/d10-x01-y01","U4")
+useOne("/BELLE_2006_S6265367/d10-x01-y02","U4")
+useOne("/BELLE_2006_S6265367/d11-x01-y01","U4")
+useOne("/BELLE_2006_S6265367/d11-x01-y02","U4")
+useOne("/BELLE_2006_S6265367/d12-x01-y01","U4")
+useOne("/BELLE_2006_S6265367/d12-x01-y02","U4")
+useOne("/BELLE_2006_S6265367/d13-x01-y01","U4")
+useOne("/BELLE_2006_S6265367/d13-x01-y02","U4")
+useOne("/BELLE_2006_S6265367/d14-x01-y01","U4")
+useOne("/BELLE_2006_S6265367/d14-x01-y02","U4")
+useOne("/BELLE_2006_S6265367/d15-x01-y01","U4")
+useOne("/BELLE_2006_S6265367/d15-x01-y02","U4")
+# BABAR
+useOne("/BABAR_2007_S6895344/d01-x01-y01","10.54")
+useOne("/BABAR_2007_S6895344/d02-x01-y01","10.54")
+useOne("/BABAR_2007_S6895344/d03-x01-y01","10.58")
+useOne("/BABAR_2007_S6895344/d04-x01-y01","10.58")
+# BABAR
+useOne("/BABAR_2005_S6181155/d01-x01-y01","10.58")
+useOne("/BABAR_2005_S6181155/d02-x01-y01","10.58")
+useOne("/BABAR_2005_S6181155/d02-x01-y02","10.54")
+useOne("/BABAR_2005_S6181155/d03-x01-y01","10.54")
+useOne("/BABAR_2005_S6181155/d04-x01-y01","10.58")
+useOne("/BABAR_2005_S6181155/d05-x01-y01","10.58")
+useOne("/BABAR_2005_S6181155/d05-x01-y02","10.54")
+# ARGUS
+useOne("/ARGUS_1993_S2789213/d01-x01-y01","10.45")
+useOne("/ARGUS_1993_S2789213/d01-x01-y02","10.45")
+useOne("/ARGUS_1993_S2789213/d01-x01-y03","10.45")
+useOne("/ARGUS_1993_S2789213/d01-x01-y04","10.45")
+useOne("/ARGUS_1993_S2789213/d01-x01-y05","10.45")
+useOne("/ARGUS_1993_S2789213/d02-x01-y01", "U1")
+useOne("/ARGUS_1993_S2789213/d02-x01-y02", "U1")
+useOne("/ARGUS_1993_S2789213/d02-x01-y03", "U1")
+useOne("/ARGUS_1993_S2789213/d02-x01-y04", "U1")
+useOne("/ARGUS_1993_S2789213/d02-x01-y05", "U1")
+useOne("/ARGUS_1993_S2789213/d03-x01-y01","U4")
+useOne("/ARGUS_1993_S2789213/d03-x01-y02","U4")
+useOne("/ARGUS_1993_S2789213/d03-x01-y03","U4")
+useOne("/ARGUS_1993_S2789213/d03-x01-y04","U4")
+useOne("/ARGUS_1993_S2789213/d03-x01-y05","U4")
+useOne("/ARGUS_1993_S2789213/d04-x01-y01","10.45")
+useOne("/ARGUS_1993_S2789213/d05-x01-y01", "U1")
+useOne("/ARGUS_1993_S2789213/d06-x01-y01","U4")
+useOne("/ARGUS_1993_S2789213/d07-x01-y01","10.45")
+useOne("/ARGUS_1993_S2789213/d08-x01-y01", "U1")
+useOne("/ARGUS_1993_S2789213/d09-x01-y01","U4")
+useOne("/ARGUS_1993_S2789213/d10-x01-y01","10.45")
+useOne("/ARGUS_1993_S2789213/d11-x01-y01", "U1")
+useOne("/ARGUS_1993_S2789213/d12-x01-y01","U4")
+useOne("/ARGUS_1993_S2789213/d13-x01-y01","10.45")
+useOne("/ARGUS_1993_S2789213/d14-x01-y01", "U1")
+useOne("/ARGUS_1993_S2789213/d15-x01-y01","U4")
+
+if("/ARGUS_1993_S2669951/d04-x01-y01" in outhistos) :
+    useOne("/ARGUS_1993_S2669951/d02-x01-y01","10.45")
+    useOne("/ARGUS_1993_S2669951/d03-x01-y01","U1")
+    useOne("/ARGUS_1993_S2669951/d04-x01-y01","U2")
+    merge("/ARGUS_1993_S2669951/d01-x01-y01")
+    merge("/ARGUS_1993_S2669951/d01-x01-y02")
+    merge("/ARGUS_1993_S2669951/d05-x01-y01")
+
+useOne("/ARGUS_1990_I278933/d01-x01-y01","9.46")
+useOne("/ARGUS_1990_I278933/d01-x01-y02","U1")
+useOne("/ARGUS_1990_I278933/d01-x01-y03","U2")
+useOne("/ARGUS_1990_I278933/d02-x01-y01","9.46")
+useOne("/ARGUS_1990_I278933/d02-x01-y02","U1")
+useOne("/ARGUS_1990_I278933/d02-x01-y03","U2")
+useOne("/ARGUS_1990_I278933/d03-x01-y01","9.46")
+useOne("/ARGUS_1990_I278933/d03-x01-y02","9.46")
+useOne("/ARGUS_1990_I278933/d04-x01-y01","U1")
+useOne("/ARGUS_1990_I278933/d04-x01-y02","U2")
+useOne("/ARGUS_1990_I278933/d05-x01-y01","9.46")
+useOne("/ARGUS_1990_I278933/d05-x01-y02","9.46")
+useOne("/ARGUS_1990_I278933/d06-x01-y01","U1")
+useOne("/ARGUS_1990_I278933/d06-x01-y02","U2")
+
+useOne("/ARGUS_1989_I262551/d01-x01-y01","10.00")
+useOne("/ARGUS_1989_I262551/d02-x01-y01","U1")
+useOne("/ARGUS_1989_I262551/d02-x01-y02","U2")
+useOne("/ARGUS_1989_I262551/d03-x01-y01","U1")
+useOne("/ARGUS_1989_I262551/d04-x01-y01","U2")
+
+merge("/ARGUS_1989_I276860/d01-x01-y01")
+merge("/ARGUS_1989_I276860/d01-x01-y02")
+merge("/ARGUS_1989_I276860/d02-x01-y01")
+merge("/ARGUS_1989_I276860/d03-x01-y01")
+merge("/ARGUS_1989_I276860/d04-x01-y01")
+merge("/ARGUS_1989_I276860/d04-x01-y02")
+for i in range(5,13) :
+    useOne("/ARGUS_1989_I276860/d%02d-x01-y01" %i,"U1")
+    useOne("/ARGUS_1989_I276860/d%02d-x01-y02" %i,"10.00")
+
+for i in range(1,8) :
+    useOne("/ARGUS_1988_I251097/d01-x01-y%02d" %i,"U1")
+    useOne("/ARGUS_1988_I251097/d02-x01-y%02d" %i,"10.00")
+useOne("/ARGUS_1988_I251097/d03-x01-y01","U1")
+useOne("/ARGUS_1988_I251097/d04-x01-y01","U2")
+useOne("/ARGUS_1988_I251097/d05-x01-y01","10.00")
+useOne("/ARGUS_1988_I251097/d06-x01-y01","10.00")
+useOne("/ARGUS_1988_I251097/d07-x01-y01","U1")
+useOne("/ARGUS_1988_I251097/d08-x01-y01","U2")
+useOne("/ARGUS_1988_I251097/d09-x01-y01","10.00")
+
+useOne("/ARGUS_1989_I262415/d03-x01-y01","U1")
+useOne("/ARGUS_1989_I262415/d04-x01-y01","10.00")
+
+merge("/PLUTO_1981_I165122/d01-x01-y01")
+merge("/PLUTO_1981_I165122/d02-x01-y01")
+useOne("/PLUTO_1981_I165122/d06-x01-y01","U1")
+useOne("/PLUTO_1981_I165122/d04-x01-y01","30.2")
+useOne("/PLUTO_1981_I165122/d05-x01-y01","9.4")
 # Choose output file
 name = args[0]+".yoda"
 # output the yoda file
-# print "Write yoda to ",name
 yoda.writeYODA(outhistos,name)
 sys.exit(0)
diff --git a/Tests/python/merge-LEP-Gamma b/Tests/python/merge-EE-Gamma
rename from Tests/python/merge-LEP-Gamma
rename to Tests/python/merge-EE-Gamma