diff --git a/Tests/Makefile.am b/Tests/Makefile.am
--- a/Tests/Makefile.am
+++ b/Tests/Makefile.am
@@ -1,367 +1,367 @@
 AM_LDFLAGS += -module -avoid-version -rpath /dummy/path/not/used
 
 EXTRA_DIST = Inputs python Rivet 
 
 EXTRA_LTLIBRARIES = LeptonTest.la GammaTest.la HadronTest.la DISTest.la
 
 if WANT_LIBFASTJET
 EXTRA_LTLIBRARIES += HadronJetTest.la LeptonJetTest.la
 HadronJetTest_la_SOURCES = \
 Hadron/VHTest.h Hadron/VHTest.cc\
 Hadron/VTest.h Hadron/VTest.cc\
 Hadron/HTest.h Hadron/HTest.cc
 HadronJetTest_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
 -I$(FASTJETPATH)
 HadronJetTest_la_LIBADD = $(FASTJETLIBS) 
 LeptonJetTest_la_SOURCES = \
 Lepton/TopDecay.h Lepton/TopDecay.cc
 LeptonJetTest_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
 -I$(FASTJETPATH)
 LeptonJetTest_la_LIBADD = $(FASTJETLIBS) 
 endif
 
 LeptonTest_la_SOURCES = \
 Lepton/VVTest.h Lepton/VVTest.cc \
 Lepton/VBFTest.h Lepton/VBFTest.cc \
 Lepton/VHTest.h Lepton/VHTest.cc \
 Lepton/FermionTest.h Lepton/FermionTest.cc
 
 GammaTest_la_SOURCES = \
 Gamma/GammaMETest.h  Gamma/GammaMETest.cc \
 Gamma/GammaPMETest.h Gamma/GammaPMETest.cc
 
 DISTest_la_SOURCES = \
 DIS/DISTest.h  DIS/DISTest.cc
 
 HadronTest_la_SOURCES = \
 Hadron/HadronVVTest.h  Hadron/HadronVVTest.cc\
 Hadron/HadronVBFTest.h  Hadron/HadronVBFTest.cc\
 Hadron/WHTest.h  Hadron/WHTest.cc\
 Hadron/ZHTest.h  Hadron/ZHTest.cc\
 Hadron/VGammaTest.h  Hadron/VGammaTest.cc\
 Hadron/ZJetTest.h  Hadron/ZJetTest.cc\
 Hadron/WJetTest.h  Hadron/WJetTest.cc\
 Hadron/QQHTest.h  Hadron/QQHTest.cc
 
 
 REPO = $(top_builddir)/src/HerwigDefaults.rpo
 HERWIG = $(top_builddir)/src/Herwig
 HWREAD = $(HERWIG) read --repo $(REPO) -L $(builddir)/.libs -i $(top_builddir)/src
 HWBUILD = $(HERWIG) build --repo $(REPO) -L $(builddir)/.libs -i $(top_builddir)/src
 HWINTEGRATE = $(HERWIG) integrate
 HWRUN = $(HERWIG) run -N $${NUMEVENTS:-10000}
 
 
 tests : tests-LEP tests-DIS tests-LHC tests-Gamma
 
 
 LEPDEPS = \
 test-LEP-VV \
 test-LEP-VH \
 test-LEP-VBF \
 test-LEP-BB \
 test-LEP-Quarks \
 test-LEP-Leptons
 
 if WANT_LIBFASTJET
 LEPDEPS += test-LEP-TopDecay
 endif
 
 tests-LEP : $(LEPDEPS)
 
 tests-DIS : test-DIS-Charged test-DIS-Neutral
 
 
 LHCDEPS = \
 test-LHC-WW test-LHC-WZ test-LHC-ZZ \
 test-LHC-ZGamma test-LHC-WGamma \
 test-LHC-ZH test-LHC-WH \
 test-LHC-ZJet test-LHC-WJet \
 test-LHC-Z test-LHC-W \
 test-LHC-ZZVBF test-LHC-VBF \
 test-LHC-WWVBF \
 test-LHC-bbH test-LHC-ttH \
 test-LHC-GammaGamma test-LHC-GammaJet \
 test-LHC-Higgs test-LHC-HiggsJet \
 test-LHC-QCDFast test-LHC-QCD \
 test-LHC-Top
 
 
 if WANT_LIBFASTJET
 LHCDEPS += \
 test-LHC-Bottom \
 test-LHC-WHJet test-LHC-ZHJet test-LHC-HJet \
 test-LHC-ZShower test-LHC-WShower \
 test-LHC-WHJet-Powheg test-LHC-ZHJet-Powheg test-LHC-HJet-Powheg \
 test-LHC-ZShower-Powheg test-LHC-WShower-Powheg
 endif
 
 tests-LHC : $(LHCDEPS) 
 
 tests-Gamma : test-Gamma-FF test-Gamma-WW test-Gamma-P
 
 
 
 LEPLIBS = LeptonTest.la
 HADLIBS = HadronTest.la
 
 if WANT_LIBFASTJET 
 LEPLIBS += LeptonJetTest.la
 HADLIBS += HadronJetTest.la
 endif
 
 
 test-LEP-% : Inputs/LEP-%.in $(LEPLIBS)
 	$(HWREAD) $<
 	$(HWRUN) $(notdir $(subst .in,.run,$<))
 
 test-Gamma-% : Inputs/Gamma-%.in GammaTest.la
 	$(HWREAD) $<
 	$(HWRUN) $(notdir $(subst .in,.run,$<))
 
 test-DIS-% : Inputs/DIS-%.in DISTest.la
 	$(HWREAD) $<
 	$(HWRUN) $(notdir $(subst .in,.run,$<))
 
 test-LHC-% : Inputs/LHC-%.in GammaTest.la $(HADLIBS)
 	$(HWREAD) $<
 	$(HWRUN) $(notdir $(subst .in,.run,$<))
 
 
 
 tests-Rivet : Rivet-EE Rivet-DIS Rivet-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/EE{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{7.7,9.4,12,13,17,27.6,29,30.2,30.7,30,31.3,34,34.8,41,42.1,42.6,43.6,45,50,52,53.3,55,56,57,58,59.5,60.8,60,61.4,66,76,82,85,10,12.8,21.5,22,25,26.8,34.5,35,36.2,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) \
+Rivet-inputfiles: $(shell echo Rivet/EE{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{7.7,9.4,12,13,17,27.6,27.7,29,30.2,30.7,30,31.3,31.6,34,34.8,41,42.1,42.6,43.6,45,50,52,53.3,55,56,57,58,59.5,60.8,60,61.4,66,76,82,85,10,12.8,21.5,22,25,26.8,34.5,35,36.2,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,14.8}.in) \
 	          $(shell echo Rivet/EE{,-Dipole}-{10.5,11.96,12.8,13.96,16.86,21.84,26.8,28.48,35.44,48.0,97.0}-gg.in) \
-                  $(shell echo Rivet/EE{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg}-{2.2,2.6,3.0,3.2,4.6,4.8,3.63,4.03,4.5,9.46,10.00,10.52,10.52-sym,10.54,10.45,10.47}.in) \
-                  $(shell echo Rivet/EE-{Upsilon,Upsilon2,Upsilon4,JPsi,Psi2S,Tau,Phi,10.58-res,10.58,Lambdac,Omega-Meson,Omega-Baryon,Eta,Xi0,Xic0,Xim}.in) \
+                  $(shell echo Rivet/EE{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg}-{2.2,2.6,3.0,3.2,4.17,4.3,4.41,5.0,5.2,4.6,4.8,5.8,6.2,6.6,7.0,7.4,3.63,4.03,4.5,8.8,9.27,9.46,9.51,10.52,10.52-sym,10.54,10.58,10.45,10.47,10.6}.in) \
+                  $(shell echo Rivet/EE-{Upsilon,Upsilon2,Upsilon3,Upsilon4,Upsilon4-asym,JPsi,Psi2S,Psi3770,Tau,Phi,Lambdac,Omega-Meson,Omega-Baryon,Eta,Xi0,Xic0,Xicp,Omegac0,Xim}.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}-2760-Jets-{1..3}.in ) \
 	          $(shell echo Rivet/LHC{,-Dipole}-{900,7,13}-UE-Long.in ) \
 		  $(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-7-Charm-{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}-{53,63,200,500,546,900}-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{,-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,13}-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,-Dipole}-{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{,-Dipole}-{30,44,53,62}-UE.in Rivet/EHS{,-Dipole}-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-EE-Gamma: Rivet-EE-Gamma/done
 	touch $@
 
 Rivet-EE-Gamma/done: $(shell echo Rivet-EE-Gamma-Direct-mumu-{161,172,183,189,196,206}.yoda ) \
                       $(shell echo Rivet-EE-Gamma-Direct-tautau-{189,196,206}.yoda ) \
 	              $(shell echo Rivet-EE-Gamma-{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-EE : Rivet-EE/done
 	touch $@
 
-Rivet-EE/done : $(shell echo Rivet{,-Powheg}-EE-{7.7,9.4,12,13,14,14.8,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,21.5,22,25,26.8,34.5,35,36.2,41,42.1,42.6,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) \
+Rivet-EE/done : $(shell echo Rivet{,-Powheg}-EE-{7.7,9.4,12,13,14,14.8,17,27.6,27.7,29,30.2,30.7,30,31.3,31.6,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,21.5,22,25,26.8,34.5,35,36.2,41,42.1,42.6,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,2.2,2.6,3.0,3.2,4.6,4.8,3.63,4.03,4.5,9.46,10.00,10.54,10.45,10.47,Upsilon,Upsilon2,Upsilon4,Tau,Phi,10.58-res,10.58,Lambdac,Omega-Meson,Omega-Baryon,Eta,Xi0,Xic0,Xim,JPsi,Psi2S}.yoda)
+	   $(shell echo Rivet-EE-{10.52,10.52-sym,10.6,2.2,2.6,3.0,3.2,4.6,4.8,5.8,6.2,6.6,7.0,7.4,3.63,4.03,4.17,4.3,4.41,5.0,5.2,4.5,8.8,9.27,9.46,9.51,10.54,10.58,10.45,10.47,Upsilon,Upsilon2,Upsilon3,Upsilon4,Upsilon4-asym,Tau,Phi,Lambdac,Omega-Meson,Omega-Baryon,Eta,Xi0,Xic0,Xicp,Omegac0,Xim,JPsi,Psi2S,Psi3770}.yoda)
 	rm -rf Rivet-EE
-	python/merge-EE --with-gg EE
+	python/merge-EE --with-gg --with-decay EE
 	python/merge-EE Powheg-EE
 	rivet-mkhtml -o Rivet-EE EE.yoda:Hw Powheg-EE.yoda:Hw-Powheg
 	python/plot-EE Rivet-EE
 	touch $@
 
 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 $@
 
 
 Rivet-SppS/done : $(shell echo Rivet-SppS-{53,63,200,500,546,900}-UE.yoda ) \
 	          $(shell echo Rivet-ISR-{30,44,53,62}-UE.yoda ) Rivet-EHS-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{,-Powheg}-LHC-{13-Z-{e,mu},{8,13}-W-mu,Z-HighMass{1,2}-e,{8,13}-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 anatohepmc.txt hepmctoana.txt
 	rm -rf Rivet-*
 
 distclean-local:
 	rm -rf .cache
diff --git a/Tests/Rivet/EE/EE-10.00.in b/Tests/Rivet/EE/EE-10.00.in
deleted file mode 100644
--- a/Tests/Rivet/EE/EE-10.00.in
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- ThePEG-repository -*-
-create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
-set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.0
-set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.0
-set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.4
-set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
-set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
-
-# argus eta pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I268577
-# argus phi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I276860
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262415
diff --git a/Tests/Rivet/EE/EE-10.47.in b/Tests/Rivet/EE/EE-10.47.in
--- a/Tests/Rivet/EE/EE-10.47.in
+++ b/Tests/Rivet/EE/EE-10.47.in
@@ -1,11 +1,15 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.235
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.235
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 
-# BELLE charm hadron production
+# ARGUS charged particle multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1992_I319102
+# ARGUS charm hadron production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1991_I315059
+# CLEO Identified particle spectra
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1985_I205668
diff --git a/Tests/Rivet/EE/EE-10.52-sym.in b/Tests/Rivet/EE/EE-10.52-sym.in
--- a/Tests/Rivet/EE/EE-10.52-sym.in
+++ b/Tests/Rivet/EE/EE-10.52-sym.in
@@ -1,16 +1,28 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.26*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.26*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.50
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 
 # CLEO charm hadron production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2004_S5809304
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2000_I526554
 # CLEO baryon assymetry
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2001_I552541
 # BELLE charm hadron production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2017_I1606201
+# CLEO D* polarization
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1998_I467595
+# CLEO D* polarization
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1991_I314060
+# CLEO D_1/D_2 decay
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1990_I281039
+# ARGUS Xi_c+ spectrum
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I296522
+# BELLE Sigma_c(2800) spectrum
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2004_I668024
+# BELLE charm hadron producion
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2005_I686014
diff --git a/Tests/Rivet/EE/EE-10.54.in b/Tests/Rivet/EE/EE-10.54.in
--- a/Tests/Rivet/EE/EE-10.54.in
+++ b/Tests/Rivet/EE/EE-10.54.in
@@ -1,12 +1,14 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 3.5*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 7.94*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
-# BELLE charm hadron production
+# BABAR Xi_c production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2005_S6181155
+# BABAR Lambda_c production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_S6895344
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2013_I1238276
\ No newline at end of file
+# BABAR pions, kaons and protons
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2013_I1238276
diff --git a/Tests/Rivet/EE/EE-10.58-res.in b/Tests/Rivet/EE/EE-10.58-res.in
deleted file mode 100644
--- a/Tests/Rivet/EE/EE-10.58-res.in
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- ThePEG-repository -*-
-create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
-set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 3.5*GeV
-set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 8.*GeV
-set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
-set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
-set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
-# BELLE charm hadron production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2001_S4598261
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_S6895344
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2003_I593379
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2017_I1512299
diff --git a/Tests/Rivet/EE/EE-10.58.in b/Tests/Rivet/EE/EE-10.58.in
--- a/Tests/Rivet/EE/EE-10.58.in
+++ b/Tests/Rivet/EE/EE-10.58.in
@@ -1,10 +1,12 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 3.5*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 8.*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
-# BELLE charm hadron production
+# BELLE distributions
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2019_I1718551
+# BABAR Xi_c production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2005_S6181155
diff --git a/Tests/Rivet/EE/EE-10.6.in b/Tests/Rivet/EE/EE-10.6.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-10.6.in
@@ -0,0 +1,60 @@
+# -*- ThePEG-repository -*-
+create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
+set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.3*GeV
+set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.3*GeV
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.50
+set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
+set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
+
+# BELLE Lambda polarization
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2019_I1687566
+# BELLE charmonium
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2002_I563840
+# CLEO Xi'_c production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1999_I478217
+# CLEO Xi_c production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1995_I404590
+# CLEO Xi_c1 production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1999_I501417
+# CLEO D_s1 production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1993_I352823
+# BABAR D_s1 production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2011_I892421
+# BELLE D_s1 production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2008_I762013
+# CLEO Lambda_c* production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I381696
+# ARGUS Lambda_c* production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1997_I440304
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_I357132
+# CLEO Xi_c*0 production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1995_I397770
+# CLEO Xi_c*+ production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1996_I416471
+# CLEO D_1+, D_2+ production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I378319
+# CLEO D_10, D_20 production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I372349
+# ARGUS D_s2
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1995_I397794
+# CLEO Sigma_c*
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1997_I424575
+# CLEO Lambda_c
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1990_I298611
+# BABAR Omega_c spectra
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I746745
+# BABAR Xi'_c spectra
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I722622
+# BABAR J/Psi production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2001_I558091
+# BABAR D_s spectrum
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2002_I582184
+# BABAR D_s 2317 and 2460 spectra
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I714447
+# BABAR anti-deuteron
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2014_I1286317
+# BABAR Omega_c
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I724557
+# BELLE dihadron
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2017_I1607562
diff --git a/Tests/Rivet/EE/EE-10.in b/Tests/Rivet/EE/EE-10.in
--- a/Tests/Rivet/EE/EE-10.in
+++ b/Tests/Rivet/EE/EE-10.in
@@ -1,12 +1,35 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 10.
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.
 ##################################################
 # select the analyses 
 ##################################################
 # PDG hadron multiplicities and ratios
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES_RATIOS
+# ARGUS D2 spectrum
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I268577
+# ARGUS D1/D2 spectrum and decay angles
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I280943
+# ARGUS sigma_c spectrum
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I261672
+# argus phi
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I276860
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262415
+# BABAR D hadron decays
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2010_I867611
+# LHCB D hadron decays
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2013_I1243156
+# LENA thrust and mult
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LENA_1981_I164397
+# ARGUS thrust
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1986_I227324
+# ARGUS D_s1 production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I282570
+# ARGUS Delta++
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I278932
diff --git a/Tests/Rivet/EE/EE-133.in b/Tests/Rivet/EE/EE-133.in
--- a/Tests/Rivet/EE/EE-133.in
+++ b/Tests/Rivet/EE/EE-133.in
@@ -1,14 +1,16 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 133.
 ##################################################
 # select the analyses
 ##################################################
 # OPAL event shapes and multiplicities at different energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_S6132243
 # ALEPH jet and event shapes at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
 # OPAL/JADE jet rates at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
+# DELPHI event shapes  at different energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1999_I499183
diff --git a/Tests/Rivet/EE/EE-161.in b/Tests/Rivet/EE/EE-161.in
--- a/Tests/Rivet/EE/EE-161.in
+++ b/Tests/Rivet/EE/EE-161.in
@@ -1,16 +1,20 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 161.
 ##################################################
 # select the analyses
 ##################################################
 # ALEPH jet and event shapes at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
 # OPAL/JADE jet rates at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
 # OPAL b/c/light multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_S5361494
+# OPAL event shapes
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_I440721
 # L3 event shapes etc for a wide range of CMS energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+# DELPHI event shapes  at different energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1999_I499183
diff --git a/Tests/Rivet/EE/EE-172.in b/Tests/Rivet/EE/EE-172.in
--- a/Tests/Rivet/EE/EE-172.in
+++ b/Tests/Rivet/EE/EE-172.in
@@ -1,16 +1,20 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 172.
 ##################################################
 # select the analyses
 ##################################################
 # ALEPH jet and event shapes at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
 # OPAL/JADE jet rates at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
 # OPAL b/c/light multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_S5361494
+# OPAL event shapes
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2000_I513476
 # L3 event shapes etc for a wide range of CMS energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
+# DELPHI event shapes  at different energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1999_I499183
diff --git a/Tests/Rivet/EE/EE-183.in b/Tests/Rivet/EE/EE-183.in
--- a/Tests/Rivet/EE/EE-183.in
+++ b/Tests/Rivet/EE/EE-183.in
@@ -1,20 +1,24 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 183.
 ##################################################
 # select the analyses
 ##################################################
 # ALEPH jet and event shapes at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
 # OPAL/JADE jet rates at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
 # OPAL b/c/light multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_S5361494
+# OPAL event shapes
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2000_I513476
 # DELPHI b/c/light multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_S4328825
 # L3 event shapes etc for a wide range of CMS energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
 # delphi event shapes for a wide energy range
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
+# DELPHI event shapes  at different energies
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1999_I499183
diff --git a/Tests/Rivet/EE/EE-189.in b/Tests/Rivet/EE/EE-189.in
--- a/Tests/Rivet/EE/EE-189.in
+++ b/Tests/Rivet/EE/EE-189.in
@@ -1,18 +1,20 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 189.
 # ALEPH jet and event shapes at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
 # OPAL/JADE jet rates at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
 # OPAL b/c/light multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_S5361494
+# OPAL event shapes
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2000_I513476
 # DELPHI b/c/light multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_S4328825
 # L3 event shapes etc for a wide range of CMS energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
 # delphi event shapes for a wide energy range
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
 
diff --git a/Tests/Rivet/EE/EE-22.in b/Tests/Rivet/EE/EE-22.in
--- a/Tests/Rivet/EE/EE-22.in
+++ b/Tests/Rivet/EE/EE-22.in
@@ -1,28 +1,27 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 22.
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 21*GeV
 ##################################################
 # select the analyses 
 ##################################################
 # JADE jet rates at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1998_S3612880
 # tasso event shapes at various low energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_S2148048
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I277658
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1982_I12010
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1983_I181470
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1983_I191415
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I202784
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1985_I205119
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I279165
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
-
-
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1979_I142874
diff --git a/Tests/Rivet/EE/EE-27.7.in b/Tests/Rivet/EE/EE-27.7.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-27.7.in
@@ -0,0 +1,14 @@
+# -*- ThePEG-repository -*-
+##################################################
+# LEP physics parameters (override defaults) 
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 27.7
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
+##################################################
+# select the analyses
+##################################################
+#  Validated
+##################################################
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1979_I142874
+
+ 
\ No newline at end of file
diff --git a/Tests/Rivet/EE/EE-29.in b/Tests/Rivet/EE/EE-29.in
--- a/Tests/Rivet/EE/EE-29.in
+++ b/Tests/Rivet/EE/EE-29.in
@@ -1,24 +1,27 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 29.0
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1986_I18502
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1988_I250824
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1987_I235694
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1985_I205868
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MAC_1985_I202924
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1992_I339573
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1984_I205869
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1986_I217416
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1990_I280958
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1988_I262143
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1985_I201482
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1984_I200105
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1988_I23360
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TPC_1991_I316132
+# HRS D* polarization
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1987_I250823
\ No newline at end of file
diff --git a/Tests/Rivet/EE/EE-3.0.in b/Tests/Rivet/EE/EE-3.0.in
--- a/Tests/Rivet/EE/EE-3.0.in
+++ b/Tests/Rivet/EE/EE-3.0.in
@@ -1,12 +1,13 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 3.0
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2004_I622224
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1976_I109792
diff --git a/Tests/Rivet/EE/EE-3.63.in b/Tests/Rivet/EE/EE-3.63.in
--- a/Tests/Rivet/EE/EE-3.63.in
+++ b/Tests/Rivet/EE/EE-3.63.in
@@ -1,12 +1,14 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 3.63
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 3.6
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1977_I118873
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132045
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1384778
\ No newline at end of file
diff --git a/Tests/Rivet/EE/EE-30.in b/Tests/Rivet/EE/EE-30.in
--- a/Tests/Rivet/EE/EE-30.in
+++ b/Tests/Rivet/EE/EE-30.in
@@ -1,17 +1,17 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.0
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1983_I190818
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153341
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153511
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I153656
-
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1979_I142874
diff --git a/Tests/Rivet/EE/EE-31.6.in b/Tests/Rivet/EE/EE-31.6.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-31.6.in
@@ -0,0 +1,12 @@
+# -*- ThePEG-repository -*-
+##################################################
+# LEP physics parameters (override defaults) 
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 31.6
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
+##################################################
+# select the analyses
+##################################################
+#  Validated
+##################################################
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1979_I142874
diff --git a/Tests/Rivet/EE/EE-4.03.in b/Tests/Rivet/EE/EE-4.03.in
--- a/Tests/Rivet/EE/EE-4.03.in
+++ b/Tests/Rivet/EE/EE-4.03.in
@@ -1,12 +1,14 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.03
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 4.00
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1977_I118873
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132045
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132410
diff --git a/Tests/Rivet/EE/EE-4.17.in b/Tests/Rivet/EE/EE-4.17.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-4.17.in
@@ -0,0 +1,15 @@
+# -*- ThePEG-repository -*-
+##################################################
+# LEP physics parameters (override defaults) 
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.17
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
+##################################################
+# select the analyses
+##################################################
+#  Validated
+##################################################
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132045
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132410
+# CLEO eta, eta' phi spectra in D decays
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2006_I728043
diff --git a/Tests/Rivet/EE/EE-4.3.in b/Tests/Rivet/EE/EE-4.3.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-4.3.in
@@ -0,0 +1,13 @@
+# -*- ThePEG-repository -*-
+##################################################
+# LEP physics parameters (override defaults) 
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.3
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
+##################################################
+# select the analyses
+##################################################
+#  Validated
+##################################################
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132045
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132410
\ No newline at end of file
diff --git a/Tests/Rivet/EE/EE-4.41.in b/Tests/Rivet/EE/EE-4.41.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-4.41.in
@@ -0,0 +1,13 @@
+# -*- ThePEG-repository -*-
+##################################################
+# LEP physics parameters (override defaults) 
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.41
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
+##################################################
+# select the analyses
+##################################################
+#  Validated
+##################################################
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132045
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132410
diff --git a/Tests/Rivet/EE/EE-4.6.in b/Tests/Rivet/EE/EE-4.6.in
--- a/Tests/Rivet/EE/EE-4.6.in
+++ b/Tests/Rivet/EE/EE-4.6.in
@@ -1,12 +1,13 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.6
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2004_I622224
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132410
diff --git a/Tests/Rivet/EE/EE-4.8.in b/Tests/Rivet/EE/EE-4.8.in
--- a/Tests/Rivet/EE/EE-4.8.in
+++ b/Tests/Rivet/EE/EE-4.8.in
@@ -1,12 +1,14 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 4.8
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2004_I622224
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132045
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1976_I109792
diff --git a/Tests/Rivet/EE/EE-5.0.in b/Tests/Rivet/EE/EE-5.0.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-5.0.in
@@ -0,0 +1,13 @@
+# -*- ThePEG-repository -*-
+##################################################
+# LEP physics parameters (override defaults) 
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 5.0
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
+##################################################
+# select the analyses
+##################################################
+#  Validated
+##################################################
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132045
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132410
diff --git a/Tests/Rivet/EE/EE-5.2.in b/Tests/Rivet/EE/EE-5.2.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-5.2.in
@@ -0,0 +1,12 @@
+# -*- ThePEG-repository -*-
+##################################################
+# LEP physics parameters (override defaults) 
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 5.2
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
+##################################################
+# select the analyses
+##################################################
+#  Validated
+##################################################
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DASP_1979_I132045
\ No newline at end of file
diff --git a/Tests/Rivet/EE/EE-5.8.in b/Tests/Rivet/EE/EE-5.8.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-5.8.in
@@ -0,0 +1,12 @@
+# -*- ThePEG-repository -*-
+##################################################
+# LEP physics parameters (override defaults) 
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 5.8
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
+##################################################
+# select the analyses
+##################################################
+#  Validated
+##################################################
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1976_I109792
diff --git a/Tests/Rivet/EE/EE-58.in b/Tests/Rivet/EE/EE-58.in
--- a/Tests/Rivet/EE/EE-58.in
+++ b/Tests/Rivet/EE/EE-58.in
@@ -1,11 +1,13 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 58.
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
 ##################################################
 # select the analyses 
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOPAZ_1995_I381900
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1995_I406129
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOPAZ_1997_I454183
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 VENUS_1998_I453613
diff --git a/Tests/Rivet/EE/EE-6.2.in b/Tests/Rivet/EE/EE-6.2.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-6.2.in
@@ -0,0 +1,12 @@
+# -*- ThePEG-repository -*-
+##################################################
+# LEP physics parameters (override defaults) 
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 6.2
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
+##################################################
+# select the analyses
+##################################################
+#  Validated
+##################################################
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1976_I109792
diff --git a/Tests/Rivet/EE/EE-6.6.in b/Tests/Rivet/EE/EE-6.6.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-6.6.in
@@ -0,0 +1,12 @@
+# -*- ThePEG-repository -*-
+##################################################
+# LEP physics parameters (override defaults) 
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 6.6
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
+##################################################
+# select the analyses
+##################################################
+#  Validated
+##################################################
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1976_I109792
diff --git a/Tests/Rivet/EE/EE-7.0.in b/Tests/Rivet/EE/EE-7.0.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-7.0.in
@@ -0,0 +1,12 @@
+# -*- ThePEG-repository -*-
+##################################################
+# LEP physics parameters (override defaults) 
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 7.0
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
+##################################################
+# select the analyses
+##################################################
+#  Validated
+##################################################
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1976_I109792
diff --git a/Tests/Rivet/EE/EE-7.4.in b/Tests/Rivet/EE/EE-7.4.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-7.4.in
@@ -0,0 +1,14 @@
+# -*- ThePEG-repository -*-
+##################################################
+# LEP physics parameters (override defaults) 
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 7.4
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
+##################################################
+# select the analyses
+##################################################
+#  Validated
+##################################################
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKI_1976_I109792
+# LENA thrust and mult
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LENA_1981_I164397
diff --git a/Tests/Rivet/EE/EE-8.8.in b/Tests/Rivet/EE/EE-8.8.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-8.8.in
@@ -0,0 +1,13 @@
+# -*- ThePEG-repository -*-
+##################################################
+# LEP physics parameters (override defaults) 
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 8.8
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 2.0
+##################################################
+# select the analyses
+##################################################
+#  Validated
+##################################################
+# LENA thrust and mult
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LENA_1981_I164397
diff --git a/Tests/Rivet/EE/EE-9.27.in b/Tests/Rivet/EE/EE-9.27.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-9.27.in
@@ -0,0 +1,14 @@
+# -*- ThePEG-repository -*-
+##################################################
+# LEP physics parameters (override defaults) 
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 9.27
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
+##################################################
+# select the analyses
+##################################################
+#  Validated
+##################################################
+# LENA thrust and mult
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LENA_1981_I164397
+
diff --git a/Tests/Rivet/EE/EE-9.51.in b/Tests/Rivet/EE/EE-9.51.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-9.51.in
@@ -0,0 +1,14 @@
+# -*- ThePEG-repository -*-
+##################################################
+# LEP physics parameters (override defaults) 
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 9.51
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
+##################################################
+# select the analyses
+##################################################
+#  Validated
+##################################################
+# LENA thrust and mult
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LENA_1981_I164397
+
diff --git a/Tests/Rivet/EE/EE-91.in b/Tests/Rivet/EE/EE-91.in
--- a/Tests/Rivet/EE/EE-91.in
+++ b/Tests/Rivet/EE/EE-91.in
@@ -1,115 +1,154 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # LEP physics parameters (override defaults) 
 ##################################################
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 91.2
 ##################################################
 # select the analyses
 ##################################################
 #  Validated
 ##################################################
 # ALEPH charged particle multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1991_S2435284
 # OPAL charged particle multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1992_I321190
+# OPAL charged particle multiplicity (light flavour separated)
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2001_I536266
 # DELPHI charged particle multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1991_I301657
 # ALEPH main LEP I QCD summary paper
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_S3486095
 # ALEPH D*
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1999_S4193598
 # OPAL D*
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1995_I382219
 # OPAL charged hadron analysis
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1994_S2927284
 # OPAL Delta++ analysis
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1995_S3198391
 # OPAL J/Psi analysis analysis
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1996_S3257789
 # ALEPH eta/omega analysis
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2002_S4823664
+# ALEPH pi0,eta,eta',K0,lambda in 2/3 jets
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2000_I507531
 # OPAL K*0 analysis
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_S3608263
 # OPAL flavour specific charged multiplicities etc
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_S3780481
 # OPAL f_0,f_2 and phi production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_S3702294
 # OPAL gamma,pi0,eta,eta',rho+/-,a0+/- 
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_S3749908
 # OPAL K0
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2000_S4418603
 # OPAL K* +/-
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1993_I342766
 # SLD flavour specific charged multiplicities etc
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_1996_S3398250
 # SLD flavour specific charged multiplicities etc
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_1999_S3743934
 # SLD flavour specific charged multiplicities etc
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_2004_S5693039
 # OPAL event shapes and multiplicities at different energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_S6132243
 # ALEPH jet and event shapes at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
 # OPAL/JADE jet rates at many energies
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
 # DELPHI strange baryon production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_S3137023
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2006_I719387
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_I524694
 # DELPHI f_0, rho_0 and f_2 production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1999_S3960137
 # DELPHI K*0 and phi production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_I420528
 # DELPHI f'_2 production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_I416741
 # DELPHI pi0
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_I401100
 # DELPHI K- K*+/-
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I377487
 # DELPHI K+/-, p pbar
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I394052
 # DELPHI Delta++
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I399737
 # DELPHI pi, K p, flavour seperated
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1998_I473409
 # OPAL strange baryon production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_S3396100
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_I421977
 # DELPHI tuning paper
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_S3430090
 # DELPHI b quark
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2011_I890503
 # ALEPH b quark
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2001_S4656318
 # SLD b quark
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_2002_S4869273
 # OPAL b quark
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2003_I599181
 # PDG hadron multiplicities and ratios
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES_RATIOS
 # OPAL from gluon paper
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I648738
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I631361:PROCESS=QQ
 # L3 eta
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1992_I336180
 # L3 jet rates
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
 # ALEPH pi+-, K+- and (p, anti-p) 
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1995_I382179
 # L3 eta' and omega specta
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1997_I427107
 # charged mult, different # of jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1992_I334948
 # charged mult, different rapidity regions
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1991_I324035
 # lambda, lambdabar correlations
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1993_I360638
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2000_I474010
 # delphi flavour sep charged
-# lambda, lambdabar correlations
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1997_I428178
+# ALEPH pi0
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1997_I427131
+# ALEPH Lambda polarization
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_I415745
+# OPAL Lambda polarization
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_I447188
+# DELPHI Lambda/K asymmetry
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I382285
+# OPAL b baryon polarization
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_I474012
+# DELPHI b baryon polarization
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_I513614
+# ALEPH  b baryon polarization
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_I402895
+# OPAL rho and comega polarization
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2000_I502750
+# DELPHI charged particle distributions
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1999_I448370
+# OPAL K0 spectrum
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1995_I393503
+# OPAL phi, D*, B* spin
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_I440103
+# DELPHI B*
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I395026
+# ALEPH B*
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1995_I398426
+# OPAL B*
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1996_I428493
+# L3 B*
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1995_I381046
 ##################################################
 # unvalidated 
 ##################################################
 # OPAL 4 jet angles 
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2001_S4553896
+##################################################
+# MC
+##################################################
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Bottom_Hadrons
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Particle_Multiplicities
diff --git a/Tests/Rivet/EE/EE-Eta.in b/Tests/Rivet/EE/EE-Eta.in
--- a/Tests/Rivet/EE/EE-Eta.in
+++ b/Tests/Rivet/EE/EE-Eta.in
@@ -1,23 +1,24 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 decaymode Upsilon(4S)->eta,eta'; 1. 1 /Herwig/Decays/DecayME0
 do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->eta',eta;
 # eta/omega dalitz
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 A2_2017_I1486671
 # eta decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Eta_Decay
 # BES eta' dalitz
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2015_I1364494
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1641075
 # eta -> pi+pi-pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE2_2016_I1416990
\ No newline at end of file
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE2_2016_I1416990
+
diff --git a/Tests/Rivet/EE/EE-JPsi.in b/Tests/Rivet/EE/EE-JPsi.in
--- a/Tests/Rivet/EE/EE-JPsi.in
+++ b/Tests/Rivet/EE/EE-JPsi.in
@@ -1,21 +1,27 @@
 # -*- ThePEG-repository -*-
 # e+ e- -> J/Psi
 create Herwig::MEee2VectorMeson  /Herwig/MatrixElements/MEJpsi HwMELepton.so
 set /Herwig/MatrixElements/MEJpsi:VectorMeson /Herwig/Particles/Jpsi
 set /Herwig/MatrixElements/MEJpsi:Coupling  11.43148
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEJpsi
 set EventGenerator:EventHandler:LuminosityFunction:Energy 3.096916
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
-do /Herwig/Particles/Jpsi:SelectDecayModes /Herwig/Particles/Jpsi/Jpsi->n0,nbar0; /Herwig/Particles/Jpsi/Jpsi->p+,pbar-; /Herwig/Particles/Jpsi/Jpsi->Sigma0,Sigmabar0; /Herwig/Particles/Jpsi/Jpsi->Lambda0,Lambdabar0; /Herwig/Particles/Jpsi/Jpsi->Sigma*-,Sigma*bar+;  /Herwig/Particles/Jpsi/Jpsi->Sigma*0,Sigma*bar0; /Herwig/Particles/Jpsi/Jpsi->Sigma*+,Sigma*bar-; /Herwig/Particles/Jpsi/Jpsi->Xi-,Xibar+; /Herwig/Particles/Jpsi/Jpsi->Sigma*0,Sigma*bar0; /Herwig/Particles/Jpsi/Jpsi->Xi0,Xibar0; 
+do /Herwig/Particles/Jpsi:SelectDecayModes /Herwig/Particles/Jpsi/Jpsi->n0,nbar0; /Herwig/Particles/Jpsi/Jpsi->p+,pbar-; /Herwig/Particles/Jpsi/Jpsi->Sigma0,Sigmabar0; /Herwig/Particles/Jpsi/Jpsi->Lambda0,Lambdabar0; /Herwig/Particles/Jpsi/Jpsi->Sigma*-,Sigma*bar+;  /Herwig/Particles/Jpsi/Jpsi->Sigma*0,Sigma*bar0; /Herwig/Particles/Jpsi/Jpsi->Sigma*+,Sigma*bar-; /Herwig/Particles/Jpsi/Jpsi->Xi-,Xibar+; /Herwig/Particles/Jpsi/Jpsi->Sigma*0,Sigma*bar0; /Herwig/Particles/Jpsi/Jpsi->Xi0,Xibar0; Jpsi->Xi*-,Xibar+; Jpsi->Xi*bar+,Xi-; Jpsi->eta,e-,e+;
 # J/psi-> lambda anti-lambda and sigma anti-sigma
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1510563
 # J/psi -> p pbar and n nbar
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1113599
 # J/Psi -> xi- and Sigma*+/-
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1422780
 # J/Psi -> xi0 and Sigma*0
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1506414
 # J/psi-> lambda anti-lambda
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1691850
\ No newline at end of file
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1691850
+# J/psi-> lambda anti-Sigma0 +cc
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1121378
+# J/Psi -> xi*- xibar+
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1765606
+# BES J/psi dalitz
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1697377
diff --git a/Tests/Rivet/EE/EE-Lambdac.in b/Tests/Rivet/EE/EE-Lambdac.in
--- a/Tests/Rivet/EE/EE-Lambdac.in
+++ b/Tests/Rivet/EE/EE-Lambdac.in
@@ -1,16 +1,23 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 decaymode Upsilon(4S)->Lambda_c+,Lambdabar_c-; 1. 1 /Herwig/Decays/DecayME0
 do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Lambda_c+,Lambdabar_c-;
-# Xi decays
+# Lambda_c decays (Lambda Pi+) 
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 FOCUS_2006_I693639
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1992_I319105
+# Lambda_c decays (Lambda Pi+ and Sigma+ Pi0) 
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1995_I392704
+# Lambda_c decays (e+ nu_e)
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1994_I371613
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I371611
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_2005_I668268
diff --git a/Tests/Rivet/EE/EE-Omega-Baryon.in b/Tests/Rivet/EE/EE-Omega-Baryon.in
--- a/Tests/Rivet/EE/EE-Omega-Baryon.in
+++ b/Tests/Rivet/EE/EE-Omega-Baryon.in
@@ -1,16 +1,18 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 decaymode Upsilon(4S)->Omega-,Omegabar+; 1. 1 /Herwig/Decays/DecayME0
 do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Omega-,Omegabar+;
 # Omega decays
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HyperCP_2005_I677384
+# Omega decays
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 WA46_1984_I206647
diff --git a/Tests/Rivet/EE/EE-Omegac0.in b/Tests/Rivet/EE/EE-Omegac0.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-Omegac0.in
@@ -0,0 +1,16 @@
+# -*- ThePEG-repository -*-
+create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
+set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
+set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
+set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
+set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
+create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
+set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
+set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
+set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
+decaymode Upsilon(4S)->Omega_c0,Omega_cbar0; 1. 1 /Herwig/Decays/DecayME0
+do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Omega_c0,Omega_cbar0;
+# Omega decays
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I719581
diff --git a/Tests/Rivet/EE/EE-Psi2S.in b/Tests/Rivet/EE/EE-Psi2S.in
--- a/Tests/Rivet/EE/EE-Psi2S.in
+++ b/Tests/Rivet/EE/EE-Psi2S.in
@@ -1,19 +1,25 @@
 # -*- ThePEG-repository -*-
 # e+ e- -> psi(2S)
 create Herwig::MEee2VectorMeson  /Herwig/MatrixElements/MEPsi2S HwMELepton.so
 set /Herwig/MatrixElements/MEPsi2S:VectorMeson /Herwig/Particles/psi(2S)
 set /Herwig/MatrixElements/MEPsi2S:Coupling  19.25684
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEPsi2S
-set EventGenerator:EventHandler:LuminosityFunction:Energy 3.77
+set EventGenerator:EventHandler:LuminosityFunction:Energy 3.686097
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
-do /Herwig/Particles/psi(2S):SelectDecayModes /Herwig/Particles/psi(2S)/psi(2S)->n0,nbar0; /Herwig/Particles/psi(2S)/psi(2S)->p+,pbar-; /Herwig/Particles/psi(2S)/psi(2S)->Sigma0,Sigmabar0; /Herwig/Particles/psi(2S)/psi(2S)->Lambda0,Lambdabar0; /Herwig/Particles/psi(2S)/psi(2S)->Sigma*-,Sigma*bar+;  /Herwig/Particles/psi(2S)/psi(2S)->Sigma*0,Sigma*bar0; /Herwig/Particles/psi(2S)/psi(2S)->Sigma*+,Sigma*bar-; /Herwig/Particles/psi(2S)/psi(2S)->Xi-,Xibar+; /Herwig/Particles/psi(2S)/psi(2S)->Xi0,Xibar0; /Herwig/Particles/psi(2S)/psi(2S)->Sigma*0,Sigma*bar0;
+do /Herwig/Particles/psi(2S):SelectDecayModes /Herwig/Particles/psi(2S)/psi(2S)->n0,nbar0; /Herwig/Particles/psi(2S)/psi(2S)->p+,pbar-; /Herwig/Particles/psi(2S)/psi(2S)->Sigma0,Sigmabar0; /Herwig/Particles/psi(2S)/psi(2S)->Lambda0,Lambdabar0; /Herwig/Particles/psi(2S)/psi(2S)->Sigma*-,Sigma*bar+;  /Herwig/Particles/psi(2S)/psi(2S)->Sigma*0,Sigma*bar0; /Herwig/Particles/psi(2S)/psi(2S)->Sigma*+,Sigma*bar-; /Herwig/Particles/psi(2S)/psi(2S)->Xi-,Xibar+; /Herwig/Particles/psi(2S)/psi(2S)->Xi0,Xibar0; /Herwig/Particles/psi(2S)/psi(2S)->Sigma*0,Sigma*bar0; /Herwig/Particles/psi(2S)/psi(2S)->Xi*-,Xi*bar+; /Herwig/Particles/psi(2S)/psi(2S)->Jpsi,pi+,pi-;
 # psi(2S) -> lambda anti-lambda and sigma anti-sigma
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1510563
 # psi(2S) -> p pbar and n nbar
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1658762
 # psi(2S) -> xi- and Sigma+/-
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1422780
 # psi(2S) -> xi0 and Sigma*0
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1506414
+# psi(2S) -> xi*-
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1747092
+# MARKII  psi(2s) -> J/Psi pi+pi-
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1979_I144382
+# BES psi(2s) -> J/Psi pi+pi-
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BES_1999_I507637
diff --git a/Tests/Rivet/EE/EE-Psi3770.in b/Tests/Rivet/EE/EE-Psi3770.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-Psi3770.in
@@ -0,0 +1,20 @@
+# -*- ThePEG-repository -*-
+# e+ e- -> psi(3770)
+create Herwig::MEee2VectorMeson  /Herwig/MatrixElements/MEPsi3770 HwMELepton.so
+set /Herwig/MatrixElements/MEPsi3770:VectorMeson /Herwig/Particles/psi(3770)
+set /Herwig/MatrixElements/MEPsi3770:Coupling  58.12041
+set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEPsi3770
+set EventGenerator:EventHandler:LuminosityFunction:Energy 3.7711
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
+set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
+set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
+# CLEO D lepton spectra
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2009_I823313
+# CLEO D q2
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2006_I715096
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2008_I769777
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2011_I875526
+# CLEO eta, eta' phi spectra in D decays
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2006_I728043
+# CLEO D0 -> eta pi+pi-
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2008_I779705
diff --git a/Tests/Rivet/EE/EE-Tau.in b/Tests/Rivet/EE/EE-Tau.in
--- a/Tests/Rivet/EE/EE-Tau.in
+++ b/Tests/Rivet/EE/EE-Tau.in
@@ -1,30 +1,38 @@
 # -*- ThePEG-repository -*-
 erase /Herwig/EventHandlers/EventHandler:PostSubProcessHandlers 0
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 3.5*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 8.*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.58299
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 # Matrix elements
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEee2gZ2ll
 set /Herwig/MatrixElements/MEee2gZ2ll:Allowed Tau
 set /Herwig/Particles/pi0:Stable Stable
 # Babar three pion
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_S7266081
 # BELLE pipi
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2008_I786560
 # ALEPH spectral functions
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2014_I1267648
+# ALEPH omega pi(pi)
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_I421984
 # BELLE Kpi
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2007_I753243
 # BELLE 3 charged hadrons
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2010_I841618
 # BABAR KK
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2018_I1679886
 # CLEO pi pi
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1999_I508944
+# CLEO K eta
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1996_I415409
+# CLEO 3pi- 2pi+ pi0
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I373188
+# BELLE phi K
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2006_I725750
 # MC dists
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_TAU_Decay
 
diff --git a/Tests/Rivet/EE/EE-Upsilon.in b/Tests/Rivet/EE/EE-Upsilon.in
--- a/Tests/Rivet/EE/EE-Upsilon.in
+++ b/Tests/Rivet/EE/EE-Upsilon.in
@@ -1,22 +1,39 @@
 # -*- 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
+# CLEO eta' spectra
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_2002_I601701
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOIII_2006_I728679
+# LENA thrust and mult
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LENA_1981_I164397
+# ARGUS thrust
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1986_I227324
+# BABAR D*=/- spectrum
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2009_I836615
+# CLEO Identified particle spectra
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1985_I205668
+# ARGUS Delta++
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I278932
+# ARGUS anti-deuteron
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I283027
+# BABAR anti-deuteron
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2014_I1286317
diff --git a/Tests/Rivet/EE/EE-Upsilon2.in b/Tests/Rivet/EE/EE-Upsilon2.in
--- a/Tests/Rivet/EE/EE-Upsilon2.in
+++ b/Tests/Rivet/EE/EE-Upsilon2.in
@@ -1,17 +1,25 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.01163*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.01163*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.02
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(2S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 62.72911
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 # BELLE charm hadron production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_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_1988_I251097
+# LENA thrust and mult
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LENA_1981_I164397
+# CUSB Upsilon 2S -> Upsilon 1S pi+pi-
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CUSB_1984_I199809
+# CLEO Upsilon 2S -> Upsilon 1S pi+pi-
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1998_I467642
+# BABAR anti-deuteron
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2014_I1286317
diff --git a/Tests/Rivet/EE/EE-Upsilon3.in b/Tests/Rivet/EE/EE-Upsilon3.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-Upsilon3.in
@@ -0,0 +1,19 @@
+# -*- ThePEG-repository -*-
+create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
+set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.1776*GeV
+set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.1776*GeV
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.02
+set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
+set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
+create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
+set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(3S)
+set /Herwig/MatrixElements/MEUpsilon:Coupling 74.96836
+set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
+# CLEO Upsilon 3S -> Upsilon pipi
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I356001
+# CLEO chi_b(2S) 0,1,2
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1992_I32611
+# BABAR anti-deuteron
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2014_I1286317
+
diff --git a/Tests/Rivet/EE/EE-Upsilon4-asym.in b/Tests/Rivet/EE/EE-Upsilon4-asym.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-Upsilon4-asym.in
@@ -0,0 +1,20 @@
+# -*- ThePEG-repository -*-
+create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
+set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 3.5*GeV
+set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 8.*GeV
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.99
+set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
+set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
+create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
+set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
+set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
+set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
+# BELLE charm hadron production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2001_S4598261
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_S6895344
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2003_I593379
+# BELLE distributions
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2019_I1718551
+# BABAR Xi_c production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2005_S6181155
diff --git a/Tests/Rivet/EE/EE-Upsilon4.in b/Tests/Rivet/EE/EE-Upsilon4.in
--- a/Tests/Rivet/EE/EE-Upsilon4.in
+++ b/Tests/Rivet/EE/EE-Upsilon4.in
@@ -1,41 +1,85 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 # ARGUS pi,K, proton
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2653028
 # ARGUS K*, rho, omega
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2789213
 # various semileptonic decays
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2013_I1116411
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2015_I1334693
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2011_I878990
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2013_I1238273
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2015_I1397632
 # BELLE b->s gamma
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2015_I1330289
 # BES D -> K, pi semi-leptonic
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2015_I1391138
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1519425
-# BES J/psi dalitz
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1697377
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1697371
 # multiplicities
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_Upsilon_4S_HADRON_MULTIPLICITIES
 # BES multiplicty in eta_c decays
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1724880
 # kaons in b decays
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1994_I354224
+# charm hadrons in b decays
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I719111
+# phi spectrum (CLEO and BaBar)
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2007_I728872
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2004_I632399
+# D_s spectrum
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2005_I1649168
 # # MC analyses based on old internal ones
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Meson_Meson_Leptons_Decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_D_Dalitz
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Onium_PiPi_Decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Semi_Leptonic_Decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1992_I319102
+# ARGUS charm hadron production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1991_I315059
+# BELLE B0 -> D* semi-leptonic
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2017_I1512299
+# BABAR D0 -> K- semi-leptonic
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I1091435
+# BES-III D0/+ -> pi semi-leptonic
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1655158
+# BES-III D+ -> eta semi-leptonic
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1662660
+# BABAR e- spectrum
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2017_I1498564
+# CLEO multiplicty in Upsilon(4S) decays
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1999_I504672
+# BELLE Upsilon(4S) -> pi+pi- Upsilon(1S) decays
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2009_I810744
+# BABAR Upsilon(4S) -> pi+pi- Upsilon(1,2S) decays
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I714448
+# CLEO Xi_c spectrum
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1997_I442910
+# CLEO Sigma_c spectrum
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I361356
+# CLEO baryon spectra
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1992_I315181
+# BABAR Omega_c spectra
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I746745
+# BABAR Xi'_c spectra
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I722622
+# CLEO J/psi and psi(2s) in b decays
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_2002_I606309
+# BABAR eta' in b decays
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2004_I642355
+# BELLE eta in b decays
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2010_I835104
+# BABAR D_s spectrum
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2002_I582184
+# BELLE charm hadron producion
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2005_I686014
diff --git a/Tests/Rivet/EE/EE-Xic0.in b/Tests/Rivet/EE/EE-Xic0.in
--- a/Tests/Rivet/EE/EE-Xic0.in
+++ b/Tests/Rivet/EE/EE-Xic0.in
@@ -1,16 +1,18 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 decaymode Upsilon(4S)->Xi_c0,Xi_cbar0; 1. 1 /Herwig/Decays/DecayME0
 do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Xi_c0,Xi_cbar0;
-# Xi decays
+# Xi_c decays
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2000_I537236
+# Omega decays
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I719581
diff --git a/Tests/Rivet/EE/EE-Xicp.in b/Tests/Rivet/EE/EE-Xicp.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE/EE-Xicp.in
@@ -0,0 +1,16 @@
+# -*- ThePEG-repository -*-
+create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
+set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
+set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
+set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
+set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
+set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
+create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
+set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
+set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
+set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
+decaymode Upsilon(4S)->Xi_c+,Xi_cbar-; 1. 1 /Herwig/Decays/DecayME0
+do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Xi_c+,Xi_cbar-;
+# Xi_c decays
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2018_I1698390
diff --git a/Tests/Rivet/EE/EE-Xim.in b/Tests/Rivet/EE/EE-Xim.in
--- a/Tests/Rivet/EE/EE-Xim.in
+++ b/Tests/Rivet/EE/EE-Xim.in
@@ -1,16 +1,17 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 decaymode Upsilon(4S)->Xi-,Xibar+; 1. 1 /Herwig/Decays/DecayME0
 do /Herwig/Particles/Upsilon(4S):SelectDecayModes /Herwig/Particles/Upsilon(4S)/Upsilon(4S)->Xi-,Xibar+;
-# Xi decays
+# asymmetry parameter in Xi decays
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 E756_2000_I530367
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_2000_I533575
diff --git a/Tests/Rivet/EHS/EHS-UE.in b/Tests/Rivet/EHS/EHS-UE.in
--- a/Tests/Rivet/EHS/EHS-UE.in
+++ b/Tests/Rivet/EHS/EHS-UE.in
@@ -1,2 +1,3 @@
 # -*- ThePEG-repository -*-
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 EHS_1988_I265504
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 NA22_1986_I18431
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-1.in b/Tests/Rivet/LHC/LHC-13-Jets-1.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-1.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-1.in
@@ -1,5 +1,6 @@
+# -*- ThePEG-repository -*-
 # CMS Jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
 # ATLAS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-10.in b/Tests/Rivet/LHC/LHC-13-Jets-10.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-10.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-10.in
@@ -1,5 +1,6 @@
+# -*- ThePEG-repository -*-
 # CMS Jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
 # ATLAS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-2.in b/Tests/Rivet/LHC/LHC-13-Jets-2.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-2.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-2.in
@@ -1,5 +1,6 @@
+# -*- ThePEG-repository -*-
 # CMS Jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
 # ATLAS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-3.in b/Tests/Rivet/LHC/LHC-13-Jets-3.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-3.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-3.in
@@ -1,5 +1,6 @@
+# -*- ThePEG-repository -*-
 # CMS Jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
 # ATLAS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-4.in b/Tests/Rivet/LHC/LHC-13-Jets-4.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-4.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-4.in
@@ -1,7 +1,7 @@
+# -*- ThePEG-repository -*-
 # CMS Jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1682495
 # ATLAS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
-
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-5.in b/Tests/Rivet/LHC/LHC-13-Jets-5.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-5.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-5.in
@@ -1,7 +1,7 @@
+# -*- ThePEG-repository -*-
 # CMS Jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1682495
 # ATLAS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
-
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-6.in b/Tests/Rivet/LHC/LHC-13-Jets-6.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-6.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-6.in
@@ -1,7 +1,7 @@
+# -*- ThePEG-repository -*-
 # CMS Jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1682495
 # ATLAS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
-
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-7.in b/Tests/Rivet/LHC/LHC-13-Jets-7.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-7.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-7.in
@@ -1,8 +1,9 @@
+# -*- ThePEG-repository -*-
 # CMS Jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1682495
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1711114
 # ATLAS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
-
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1724098
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-8.in b/Tests/Rivet/LHC/LHC-13-Jets-8.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-8.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-8.in
@@ -1,7 +1,10 @@
+# -*- ThePEG-repository -*-
 # CMS Jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1682495
 # ATLAS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
+# ATLAS soft-drop
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1637587
 
diff --git a/Tests/Rivet/LHC/LHC-13-Jets-9.in b/Tests/Rivet/LHC/LHC-13-Jets-9.in
--- a/Tests/Rivet/LHC/LHC-13-Jets-9.in
+++ b/Tests/Rivet/LHC/LHC-13-Jets-9.in
@@ -1,6 +1,7 @@
+# -*- ThePEG-repository -*-
 # CMS Jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1459051
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_CONF_2016_092
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1682495
 # ATLAS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1634970
diff --git a/Tests/Rivet/LHC/LHC-13-Top-All.in b/Tests/Rivet/LHC/LHC-13-Top-All.in
--- a/Tests/Rivet/LHC/LHC-13-Top-All.in
+++ b/Tests/Rivet/LHC/LHC-13-Top-All.in
@@ -1,4 +1,4 @@
 ##################################################
 # select the analyses
 ##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1646686
\ No newline at end of file
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1646686
diff --git a/Tests/Rivet/LHC/LHC-13-Top-SL.in b/Tests/Rivet/LHC/LHC-13-Top-SL.in
--- a/Tests/Rivet/LHC/LHC-13-Top-SL.in
+++ b/Tests/Rivet/LHC/LHC-13-Top-SL.in
@@ -1,10 +1,11 @@
 ##################################################
 # select the analyses
 ##################################################
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1491950
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1614149
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1662081
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1663958
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1656578
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1690148
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1705857
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1724098
diff --git a/Tests/Rivet/LHC/LHC-13-UE.in b/Tests/Rivet/LHC/LHC-13-UE.in
--- a/Tests/Rivet/LHC/LHC-13-UE.in
+++ b/Tests/Rivet/LHC/LHC-13-UE.in
@@ -1,14 +1,19 @@
+# -*- ThePEG-repository -*-
 ##################################################
 # select the analyses
 ##################################################
 # CMS UE
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1384119
 # ATLAS UE
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419652
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1467230
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1509919
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1468167
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1511284
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1653948
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1680318
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1471287
\ No newline at end of file
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1471287
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2018_I1518782
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2018_I1692008
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2018_I1665223
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1708620
diff --git a/Tests/Rivet/LHC/LHC-7-UE.in b/Tests/Rivet/LHC/LHC-7-UE.in
--- a/Tests/Rivet/LHC/LHC-7-UE.in
+++ b/Tests/Rivet/LHC/LHC-7-UE.in
@@ -1,93 +1,94 @@
+# -*- ThePEG-repository -*-
 ##################################################
 # select the analyses
 ##################################################
 # ATLAS jet shapes
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8924791
 # ATLAS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
 # ATLAS UE
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8994773
 # ATLAS UE
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8894728
 # ATLAS fragmentation function
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_CONF_2010_049
 # ATLAS UE
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8918562
 # ALICE charged particles
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2010_S8625980
 # CMS particle spectra
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8978280
 # CMS charged particle multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8884919
 # CMS charged particle pT and rapidity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2010_S8656010
 # CMS UE
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9120041
 # ATLAS track jet
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
 # LHCB phi production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2011_I919315
 # ATLAS phi production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1282441
 # LHCB promt hadron productiom
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2012_I1119400
 # ATLAS rap gap
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1084540
 # CMS forward energy flow
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9215166
 # LHC K0s/Lambda
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2011_I917009
 # TOTEM at large rapidity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOTEM_2012_I1115294
 # ATLAS Azimuthal ordering of charged hadrons
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1091481
 # ALICE single/double diffractive and inelastic sigma
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2012_I1181770
 # ATLAS inelastic cross section
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I894867
 # CMS inelastic cross section
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1193338
 # total transverse energy
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1183818
 # underlying event forward rapidities
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1218372
 # strange particles in underlying event
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_PAS_QCD_11_010
 # CMS central and forward jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
 # ATLAS charged particle in min bias
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1125575
 # ATLAS two particle correlation
 #insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094061
 # ATLAS correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1093734
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1093734
 # LHCB energy flow
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2013_I1208105
 # ATLAS charged particle event shapes
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1124167
 # CMS Jet/UE properties
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1261026
 # ATLAS leading jet UE
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811
 # LHCB charged particles in min bias
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2014_I1281685
 # ALICE identified particle spectra
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2015_I1357424
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2014_I1300380
 # LHCB min bias
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2015_I1333223
 # ALICE pion and eta pT
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2012_I1116147
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_PAS_FSQ_12_020
 # CMS charged particle rapidity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2010_PAS_QCD_10_024
 # diffractive analyses
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2012_I1115479
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1356998
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOTEM_2012_I1220862
 # atlas hadron ordering
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1624693
 # LHCF
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2015_I1351909
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2016_I1385877
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-0.in b/Tests/Rivet/LHC/LHC-8-Jets-0.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-0.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-0.in
@@ -1,2 +1,4 @@
 # ATLAS tracks in jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
\ No newline at end of file
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-1.in b/Tests/Rivet/LHC/LHC-8-Jets-1.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-1.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-1.in
@@ -1,11 +1,13 @@
 # ATLAS tracks in jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
 # ATLAS jet charge
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
 # ATLAS transverse energy correlations
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
 # CMS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
 # CMS di-jet decorrelation
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
 
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-10.in b/Tests/Rivet/LHC/LHC-8-Jets-10.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-10.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-10.in
@@ -1,14 +1,16 @@
 # ATLAS tracks in jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
 # ATLAS multijet
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1394679
 # ATLAS jet charge
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
 # ATLAS transverse energy correlations
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
 # CMS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
 # CMS di-jet decorrelation
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
 # CMS jet charge
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1605749
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-2.in b/Tests/Rivet/LHC/LHC-8-Jets-2.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-2.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-2.in
@@ -1,12 +1,14 @@
 # ATLAS tracks in jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
 # ATLAS jet charge
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
 # ATLAS transverse energy correlations
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
 # CMS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
 # CMS di-jet decorrelation
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
 
 
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-3.in b/Tests/Rivet/LHC/LHC-8-Jets-3.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-3.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-3.in
@@ -1,12 +1,14 @@
 # ATLAS tracks in jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
 # ATLAS multijet
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1394679
 # ATLAS jet charge
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
 # ATLAS transverse energy correlations
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
 # CMS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
 # CMS di-jet decorrelation
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-4.in b/Tests/Rivet/LHC/LHC-8-Jets-4.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-4.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-4.in
@@ -1,14 +1,16 @@
 # ATLAS tracks in jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
 # ATLAS multijet
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1394679
 # ATLAS jet charge
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
 # ATLAS transverse energy correlations
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
 # CMS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
 # CMS di-jet decorrelation
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
 
 
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-5.in b/Tests/Rivet/LHC/LHC-8-Jets-5.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-5.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-5.in
@@ -1,14 +1,16 @@
 # ATLAS tracks in jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
 # ATLAS multijet
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1394679
 # ATLAS jet charge
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
 # ATLAS transverse energy correlations
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
 # CMS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
 # CMS di-jet decorrelation
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
 
 
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-6.in b/Tests/Rivet/LHC/LHC-8-Jets-6.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-6.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-6.in
@@ -1,14 +1,16 @@
 # ATLAS tracks in jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
 # ATLAS multijet
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1394679
 # ATLAS jet charge
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
 # ATLAS transverse energy correlations
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
 # CMS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
 # CMS di-jet decorrelation
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
 
 
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-7.in b/Tests/Rivet/LHC/LHC-8-Jets-7.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-7.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-7.in
@@ -1,16 +1,18 @@
 # ATLAS tracks in jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
 # ATLAS multijet
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1394679
 # ATLAS jet charge
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
 # ATLAS transverse energy correlations
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
 # CMS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
 # CMS di-jet decorrelation
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
 # CMS jet charge
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1605749
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
 
 
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-8.in b/Tests/Rivet/LHC/LHC-8-Jets-8.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-8.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-8.in
@@ -1,14 +1,16 @@
 # ATLAS tracks in jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
 # ATLAS multijet
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1394679
 # ATLAS jet charge
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
 # ATLAS transverse energy correlations
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
 # CMS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
 # CMS di-jet decorrelation
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
 # CMS jet charge
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1605749
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
diff --git a/Tests/Rivet/LHC/LHC-8-Jets-9.in b/Tests/Rivet/LHC/LHC-8-Jets-9.in
--- a/Tests/Rivet/LHC/LHC-8-Jets-9.in
+++ b/Tests/Rivet/LHC/LHC-8-Jets-9.in
@@ -1,16 +1,18 @@
 # ATLAS tracks in jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419070
 # ATLAS multijet
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1394679
 # ATLAS jet charge
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1393758
 # ATLAS transverse energy correlations
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1609253
 # CMS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1487277
 # CMS di-jet decorrelation
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1421646
 # CMS jet charge
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1605749
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1604271
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1598460
 
 
diff --git a/Tests/Rivet/LHC/LHC-8-Top-SL.in b/Tests/Rivet/LHC/LHC-8-Top-SL.in
--- a/Tests/Rivet/LHC/LHC-8-Top-SL.in
+++ b/Tests/Rivet/LHC/LHC-8-Top-SL.in
@@ -1,16 +1,17 @@
+# -*- ThePEG-repository -*-
 ##################################################
 # select the analyses
 ##################################################
 # ATLAS pull in top events
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1376945
 # ATLAS top + b jet
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1390114
 # ATLAS boosted t tbar
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1397637
 # cms boosted top
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1454211
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1518399
 # this cms ones has iffy lepton code which crashes
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_PAS_TOP_15_006
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_PAS_TOP_15_006
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1404878
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1473674
\ No newline at end of file
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1473674
diff --git a/Tests/Rivet/LHC/LHC-900-UE.in b/Tests/Rivet/LHC/LHC-900-UE.in
--- a/Tests/Rivet/LHC/LHC-900-UE.in
+++ b/Tests/Rivet/LHC/LHC-900-UE.in
@@ -1,49 +1,49 @@
 ##################################################
 # select the analyses
 ##################################################
 # ATLAS UE
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8994773
 # ATLAS UE
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8918562
 # ATLAS UE
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8894728
 # ATLAS charged particles
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8591806
 # ALICE charged particles
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2010_S8706239
 # ALICE charged particles
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2010_S8625980
 # ALICE charged particles
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2010_S8624100
 # ALICE particle spectra
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2011_S8945144
 # ALICE strange particle production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2011_S8909580
 # CMS particle spectra
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8978280
 # CMS charged particle multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8884919
 # CMS charged particle pT and rapidity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2010_S8547297
 # CMS UE
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9120041
 # LHCB k_s0
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2010_S8758301
 # LHCB promt hadron production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2012_I1119400
 # CMS forward energy flow
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9215166
 # LHC K0s/Lambda
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2011_I917009
 # ATLAS Azimuthal ordering of charged hadrons
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1091481
 # ALICE single/double diffractive and inelastic sigma
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2012_I1181770
 # underlying event forward rapidities
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1218372
 # ATLAS correlations
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1093734
+# insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1093734
 # ALICE pion and eta pT
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2012_I1116147
 # CMS charged particle rapidity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2010_PAS_QCD_10_024
diff --git a/Tests/Rivet/LHC/LHC-W-e.in b/Tests/Rivet/LHC/LHC-W-e.in
--- a/Tests/Rivet/LHC/LHC-W-e.in
+++ b/Tests/Rivet/LHC/LHC-W-e.in
@@ -1,28 +1,28 @@
 ##################################################
 # select the analyses
 ##################################################
 # general analysis
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_WJETS
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_WPOL
 # ATLAS W+jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8919674
 # ATLAS W pT
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I925932
 # ATLAS W kT scales
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1217867
 # W DPI
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1216670
 # W +b 
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1219109
 # ATLAS W
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I928289_W
 # ATLAS W+jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1319490
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1319490:LMODE=EL
 # ATLAS W+charm
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1282447
 # ATLAS W inclusive cross section
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620:LMODE=WEL
 # W/Z+ jets ratios
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627_EL
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627:LMODE=EL
diff --git a/Tests/Rivet/LHC/LHC-W-mu.in b/Tests/Rivet/LHC/LHC-W-mu.in
--- a/Tests/Rivet/LHC/LHC-W-mu.in
+++ b/Tests/Rivet/LHC/LHC-W-mu.in
@@ -1,32 +1,32 @@
 ##################################################
 # select the analyses
 ##################################################
 # ATLAS W asymetry
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9002537
 # ATLAS W+jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8919674
 # ATLAS W pT
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I925932
 # ATLAS W+jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1083318
 # ATLAS W kT scales
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1217867
 # CMS double parton scattering
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1272853
 # W DPI
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1216670
 # CMS W+ jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1303894
 # ATLAS W
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I928289_W
 # ATLAS W+jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1319490
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1319490:LMODE=MU
 # W +b 
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1219109
 # ATLAS W+charm
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1282447
 # ATLAS W inclusive cross section
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620:LMODE=WMU
 # ATLAS W/Z ratio
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627_MU
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627:LMODE=MU
diff --git a/Tests/Rivet/LHC/LHC-Z-e.in b/Tests/Rivet/LHC/LHC-Z-e.in
--- a/Tests/Rivet/LHC/LHC-Z-e.in
+++ b/Tests/Rivet/LHC/LHC-Z-e.in
@@ -1,38 +1,38 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # select the analyses
 ##################################################
 # General analysis
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZINC
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZJETS
 # ATLAS pT
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9131140
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1300647
 # ATLAS Z+jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I945498
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1230812
 # ATLAS phi*
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1204784
 # CMS Z + b-hadron
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1256943
 # CMS Z pt and y
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I941555
 # ATLAS Z + bjets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1306294
 # ATLAS Z
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I928289_Z
 # CMS Z AFB
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1122847
 # CMS Z+jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1310737
 # ATLAS event shapes in Z events
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1424838
 # ATLAS forwrd backward
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1351916_EL
 # ATLAS forward backward
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1234228
 # ATLAS Z inclusive cross section
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620:LMODE=ZEL
 # W/Z+ jets ratios
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627_EL
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627:LMODE=EL
diff --git a/Tests/Rivet/LHC/LHC-Z-mu.in b/Tests/Rivet/LHC/LHC-Z-mu.in
--- a/Tests/Rivet/LHC/LHC-Z-mu.in
+++ b/Tests/Rivet/LHC/LHC-Z-mu.in
@@ -1,37 +1,37 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # select the analyses
 ##################################################
 # ATLAS Z pt
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9131140
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1300647
 # ATLAS Z+jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I945498
 # ATLAS phi*
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1204784
 # Z and real photon + jet
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1258128
 # CMS Z + b-hadron
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1256943
 # CMS Z pt and y
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I941555
 # ATLAS MPI in Z events
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1315949
 # ATLAS Z
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I928289_Z
 # CMS Z AFB
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1122847
 # CMS Z+jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1310737
 # ATLAS event shapes in Z events
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1424838
 # CMS photon radiation in Z decays
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1346843
 # ATLAS forwrd backward
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1351916_MU
 # LHCB forward Z+jet
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2014_I1262703 
 # ATLAS Z inclusive cross section
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620:LMODE=ZMU
 # ATLAS W/Z ratio
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627_MU
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627:LMODE=MU
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,1947 +1,1977 @@
 #! /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(factory,name,*particles):
     directory="MatrixElements/Matchbox"
     if(factory!="Factory") : directory="Merging"
     result = ["do /Herwig/{dir}/{fact}:StartParticleGroup {n}".format(n=name,fact=factory,dir=directory)]
     for p in particles:
         result.append(
             "insert /Herwig/{dir}/{fact}:ParticleGroup 0 /Herwig/Particles/{p}".format(p=p,fact=factory,dir=directory)
         )
     result.append("do /Herwig/{dir}/{fact}:EndParticleGroup".format(fact=factory,dir=directory))
     return '\n'.join(result)
 
 
 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 = [
     "EE-Gamma",
     "BFactory",
     "EE",
     "DIS",
     "TVT",
     "LHC-GammaGamma",
     "LHC",
     "ISR",
     "SppS",
     "Star",
     "EHS",
     "GammaGamma",
 ]
 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_AutoTunes_gss.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_AutoTunes_gss.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','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=="EE-Gamma" :
         istart+=1
         if("Direct" in name) :
             templateName="EE-Gamma-Direct.in"
         elif("Single-Resolved" in name) :
             templateName="EE-Gamma-Single-Resolved.in"
         elif("Double-Resolved" in name) :
             templateName="EE-Gamma-Double-Resolved.in"
         else :
             print "Unknown type of EE-Gamma event ",name
             quit()
     elif collider=="GammaGamma" :
         templateName="GammaGamma.in"
     elif collider != "BFactory" :
         templateName= "%s.in" % collider
     else :
         templateName= "EE.in"
 else :
     if have_hadronic_collider :
         templateName= "Hadron-%s.in" % simulation 
     elif collider != "BFactory" :
         templateName= "%s-%s.in" % (collider,simulation) 
     else :
         templateName= "EE-%s.in" % simulation
         
 # settings for four flavour scheme
 fourFlavour="""
 read Matchbox/FourFlavourScheme.in
 {bjetgroup}
 set /Herwig/Cuts/MatchboxJetMatcher:Group bjet
 """.format(bjetgroup=particlegroup(thefactory,'bjet','b','bbar','c', 'cbar',
                                    's','sbar','d','dbar','u','ubar','g'))
 
 # work out the 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()
 
 # 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))
 
 # 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 :
-            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<=3.75) :
-                        process+= "set /Herwig/MatrixElements/MEee2gZ2qq:MaximumFlavour 3\n"
-                    elif(ecms<=10.6) :
-                        process+= "set /Herwig/MatrixElements/MEee2gZ2qq:MaximumFlavour 4\n"
-                except :
-                    pass
+            process = StringBuilder(insert_ME("MEee2gZ2qq"))
+            try :
+                ecms = float(parameterName)
+                if(ecms<=3.75) :
+                    process+= "set /Herwig/MatrixElements/MEee2gZ2qq:MaximumFlavour 3\n"
+                elif(ecms<=10.6) :
+                    process+= "set /Herwig/MatrixElements/MEee2gZ2qq:MaximumFlavour 4\n"
+            except :
+                pass
     elif(simulation=="Powheg") :
         process = StringBuilder()
         try :
             ecms = float(parameterName)
             if(ecms<=3.75) :
                 process+= "set /Herwig/MatrixElements/PowhegMEee2gZ2qq:MaximumFlavour 3\n"
             elif(ecms<=10.6) :
                 process+= "set /Herwig/MatrixElements/PowhegMEee2gZ2qq:MaximumFlavour 4\n"
         except :
             pass
     elif(simulation=="Matchbox" ) :
         try :
             ecms = float(parameterName)
             if(ecms<=3.75) :
                 process = StringBuilder(addProcess(thefactory,"e- e+ -> u ubar","0","2","",0,0))
                 process+=addProcess(thefactory,"e- e+ -> d dbar","0","2","",0,0)
                 process+=addProcess(thefactory,"e- e+ -> s sbar","0","2","",0,0)
             elif(ecms<=10.6) :
                 process = StringBuilder(addProcess(thefactory,"e- e+ -> u ubar","0","2","",0,0))
                 process+=addProcess(thefactory,"e- e+ -> d dbar","0","2","",0,0)
                 process+=addProcess(thefactory,"e- e+ -> c cbar","0","2","",0,0)
                 process+=addProcess(thefactory,"e- e+ -> s sbar","0","2","",0,0)
             else :
                 process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",0,0))
         except:
             process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",0,0))
     elif(simulation=="Merging" ) :
         try :
             ecms = float(parameterName)
             if(ecms<=10.1) :
                 process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",2,2))
                 process+="read Matchbox/FourFlavourScheme.in"
             else :
                 process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",2,2))
         except:
             process = StringBuilder(addProcess(thefactory,"e- e+ -> j j","0","2","",2,2))
 # EE-Gamma
 elif(collider=="EE-Gamma") :
     if(simulation=="") :
         if("mumu" in parameterName) :
             process = StringBuilder(insert_ME("MEgg2ff","Muon"))
             process +="set /Herwig/Cuts/Cuts:MHatMin 3.\n"
         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 EE"
             quit()
     else :
         print "Only internal matrix elements currently supported for Gamma Gamma processes at EE"
         quit()
 elif(collider=="GammaGamma") :
     if(simulation=="") :
         if("mumu" in parameterName) :
             process = StringBuilder(insert_ME("MEgg2ff"))
             process +="set /Herwig/MatrixElements/MEgg2ff:Process Muon\n"
             process +="set /Herwig/Cuts/Cuts:MHatMin 3.\n"
         else :
             print "process not supported for Gamma Gamma processes at EE"
             quit()
     else :
         print "Only internal matrix elements currently supported for Gamma Gamma processes at EE"
         quit()
 # TVT
 elif(collider=="TVT") :
     process = StringBuilder("set /Herwig/Generators/EventGenerator:EventHandler:BeamB /Herwig/Particles/pbar-\n")
     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(thefactory,'epm','e+','e-')
                 process+=particlegroup(thefactory,'epmnu','e+','e-','nu_e','nu_ebar')
                 process+=addProcess(thefactory,"p pbar epm epmnu","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("60","120")
         elif "Run-II-W" in parameterName or "Run-I-W" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p pbar e+ nu","0","2","LeptonPairMassScale",0,0)
                 process+=addProcess(thefactory,"p pbar e- nu","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=particlegroup(thefactory,'epm','e+','e-')
                 process+=addProcess(thefactory,"p pbar epm nu","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("60","120")
         elif "Run-II-Z-e" in parameterName or "Run-I-Z" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p pbar e+ e-","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p pbar e+ e-","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("60","120")
         elif "Run-II-Z-LowMass-mu" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("25","70")
         elif "Run-II-Z-HighMass-mu" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("150","600")
         elif "Run-II-Z-mu" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p pbar mu+ mu-","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("60","120")
 # Star
 elif(collider=="Star" ) :
     process = StringBuilder("set /Herwig/Decays/DecayHandler:LifeTimeOption 0\n")
     process+= "set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm\n"
     process+= "set /Herwig/Generators/EventGenerator:EventHandler:BeamB /Herwig/Particles/p+\n"
     process+= collider_lumi(200.0)
     process+= "set /Herwig/Cuts/Cuts:X2Min 0.01\n"
     if(simulation=="") :
         if "UE" in parameterName :
             if "Dipole" in parameters["shower"]:
                 process+="read snippets/MB-DipoleShower.in\n"
             else:
                 process+="read snippets/MB.in\n"    
             process+="read snippets/Diffraction.in\n"
             
             
         else :
             process+=insert_ME("MEQCD2to2")
             process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
             if "Jets-1" in parameterName :   process+=jet_kt_cut(2.)
             elif "Jets-2" in parameterName : process+=jet_kt_cut(5.)
             elif "Jets-3" in parameterName : process+=jet_kt_cut(20.)
             elif "Jets-4" in parameterName : process+=jet_kt_cut(25.)
     else :
         logging.error("Star not supported for %s " % simulation)
         sys.exit(1)
 # ISR and SppS
 elif(collider=="ISR" or collider =="SppS" or collider == "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 parameterName.startswith("13-") : 
+                process+=mhat_minm_maxm(10,10,35)
+            else :
+                process+=mhat_minm_maxm(10,10,30)
             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 parameterName.startswith("13-") : 
+                process+=mhat_minm_maxm(25,25,70)
+            else :
+                process+=mhat_minm_maxm(30,30,65)
             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 parameterName.startswith("13-") : 
+                process+=mhat_minm_maxm(60,60,120)
+            else :
+                process+=mhat_minm_maxm(65,65,115)
             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 parameterName.startswith("13-") : 
+                process+=mhat_minm_maxm(110,110,8000)
+            else :
+                process+=mhat_minm_maxm(115,115,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 parameterName.startswith("13-") : 
+                process+=mhat_minm_maxm(10,10,35)
+            else :
+                process+=mhat_minm_maxm(10,10,30)
             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 parameterName.startswith("13-") : 
+                process+=mhat_minm_maxm(25,25,70)
+            else :
+                process+=mhat_minm_maxm(30,30,65)
             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 parameterName.startswith("13-") : 
+                process+=mhat_minm_maxm(60,60,120)
+            else :
+                process+=mhat_minm_maxm(65,65,115)
             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 parameterName.startswith("13-") : 
+                process+=mhat_minm_maxm(110,110,8000)
+            else:
+                process+=mhat_minm_maxm(115,115,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 Yes\nset MadGraph:Model heft\n"
                 process+="cd /Herwig/Merging/\n"
             process+=setHardProcessWidthToZero(["h0"])
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p p h0","2","1","FixedScale",0,0)
             elif(simulation=="Merging"):
                 process+=addProcess(thefactory,"p p h0","2","1","FixedScale",2,2)
             process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 125.7\n"
             if "GammaGamma" in parameterName :
                process+=selectDecayMode("h0",["h0->gamma,gamma;"])
                process+=addBRReweighter()
             elif "WW" in parameterName :
                process+=selectDecayMode("h0",["h0->W+,W-;"])
                process+=addBRReweighter()
             elif "ZZ" in parameterName :
                process+=selectDecayMode("h0",["h0->Z0,Z0;"])
                process+=addBRReweighter()
             elif "8-" not in parameterName :
                 process+=selectDecayMode("h0",["h0->tau-,tau+;"])
                 process+=addBRReweighter()
                 process+="set /Herwig/Particles/tau-:Stable Stable\n"
         elif "8-WH" in parameterName :
             if(simulation=="Merging"):
               logging.warning("8-WH not explicitly tested for %s " % simulation)
               sys.exit(0)
             process+=setHardProcessWidthToZero(["h0","W+","W-"])
             process+=addProcess(thefactory,"p p W+ h0","0","2","FixedScale",0,0)
             process+=addProcess(thefactory,"p p W- h0","0","2","FixedScale",0,0)
             process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 125.7\n"
             if "GammaGamma" in parameterName :
                process+=selectDecayMode("h0",["h0->gamma,gamma;"])
                process+=addBRReweighter()
             elif "WW" in parameterName :
                process+=selectDecayMode("h0",["h0->W+,W-;"])
                process+=addBRReweighter()
             elif "ZZ" in parameterName :
                process+=selectDecayMode("h0",["h0->Z0,Z0;"])
                process+=addBRReweighter()
                
         elif "8-ZH" in parameterName :
             if(simulation=="Merging"):
               logging.warning("8-ZH not explicitly tested for %s " % simulation)
               sys.exit(0)
             process+=setHardProcessWidthToZero(["h0","Z0"])
             process+=addProcess(thefactory,"p p Z0 h0","0","2","FixedScale",0,0)
             process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 125.7\n"
             if "GammaGamma" in parameterName :
                process+=selectDecayMode("h0",["h0->gamma,gamma;"])
                process+=addBRReweighter()
             elif "WW" in parameterName :
                process+=selectDecayMode("h0",["h0->W+,W-;"])
                process+=addBRReweighter()
             elif "ZZ" in parameterName :
                process+=selectDecayMode("h0",["h0->Z0,Z0;"])
                process+=addBRReweighter()
                
         elif "WH" in parameterName :
             if(simulation=="Merging"):
               logging.warning("WH not explicitly tested for %s " % simulation)
               sys.exit(0)
             process+=selectDecayMode("h0",["h0->b,bbar;"])
             process+=addBRReweighter()
             process+=setHardProcessWidthToZero(["h0"])
             process+=addProcess(thefactory,"p p e+ nu h0","0","3","LeptonPairMassScale",0,0)
             process+=addProcess(thefactory,"p p e- nu h0","0","3","LeptonPairMassScale",0,0)
             process+=addProcess(thefactory,"p p mu+ nu h0","0","3","LeptonPairMassScale",0,0)
             process+=addProcess(thefactory,"p p mu- nu h0","0","3","LeptonPairMassScale",0,0)
             process+=addLeptonPairCut("60","120")
         elif "ZH" in parameterName :
             if(simulation=="Merging"):
               logging.warning("ZH not explicitly tested for %s " % simulation)
               sys.exit(0)
             process+=selectDecayMode("h0",["h0->b,bbar;"])
             process+=addBRReweighter()
             process+=setHardProcessWidthToZero(["h0"])
             process+=addProcess(thefactory,"p p e+ e- h0","0","3","LeptonPairMassScale",0,0)
             process+=addProcess(thefactory,"p p mu+ mu- h0","0","3","LeptonPairMassScale",0,0)
             process+=addLeptonPairCut("60","120")
         elif "UE" in parameterName :
             logging.error(" Process %s not supported for Matchbox matrix elements" % name)
             sys.exit(1)
         elif "8-DiJets" in parameterName or "7-DiJets" in parameterName or "13-DiJets" in parameterName :
             if(simulation=="Matchbox"):
               process+=addProcess(thefactory,"p p j j","2","0","MaxJetPtScale",0,0)
             elif(simulation=="Merging"):
               process+=addProcess(thefactory,"p p j j","2","0","MaxJetPtScale",1,1)
             process+="set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0\n"
             if "13-DiJets" not in parameterName :
                 if "-A" in parameterName :
                     process+=addFirstJet("45")
                     process+=addSecondJet("25")
                     process+="set /Herwig/Cuts/FirstJet:YRange  -3. 3.\n"
                     process+="set /Herwig/Cuts/SecondJet:YRange -3. 3.\n"
                 elif "-B" in parameterName :
                     process+=addFirstJet("20")
                     process+=addSecondJet("15")
                     process+="set /Herwig/Cuts/FirstJet:YRange  -2.7 2.7\n"
                     process+="set /Herwig/Cuts/SecondJet:YRange -2.7 2.7\n"
                 elif "-C" in parameterName :
                     process+=addFirstJet("20")
                     process+=addSecondJet("15")
                     process+="set /Herwig/Cuts/FirstJet:YRange  -4.8 4.8\n"
                     process+="set /Herwig/Cuts/SecondJet:YRange -4.8 4.8\n"
                 else :
                     logging.error("Exit 00001")
                     sys.exit(1)
             else :
                 if "-A" in parameterName :
                     process+= addFirstJet("75.")
                     process+=addSecondJet("60.")
                     process+="set /Herwig/Cuts/JetKtCut:MinEta -3.\n"
                     process+="set /Herwig/Cuts/JetKtCut:MaxEta  3.\n"
                 elif "-B" in parameterName :
                     process+= addFirstJet("220.")
                     process+=addSecondJet("180.")
                     process+="set /Herwig/Cuts/JetKtCut:MinEta -3.\n"
                     process+="set /Herwig/Cuts/JetKtCut:MaxEta  3.\n"
                 else :
                     logging.error("Exit 00001")
                     sys.exit(1)
 
                     
             if "DiJets-1" in parameterName   : process+=addJetPairCut("90")
             elif "DiJets-2" in parameterName : process+=addJetPairCut("200")
             elif "DiJets-3" in parameterName : process+=addJetPairCut("450")
             elif "DiJets-4" in parameterName : process+=addJetPairCut("750")
             elif "DiJets-5" in parameterName : process+=addJetPairCut("950")
             elif "DiJets-6" in parameterName : process+=addJetPairCut("1550")
             elif "DiJets-7" in parameterName : process+=addJetPairCut("2150")
             elif "DiJets-8" in parameterName : process+=addJetPairCut("2750")
             elif "DiJets-9" in parameterName : process+=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(thefactory,'epm','e+','e-')
               process+=particlegroup(thefactory,'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(thefactory,'mupm','mu+','mu-')
               process+=particlegroup(thefactory,'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(thefactory,'epm','e+','e-')
                 process+=addProcess(thefactory,"p p epm nu","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("60","120")
 
         elif "W-mu" in parameterName :
             if(simulation=="Matchbox"):
                 process+=addProcess(thefactory,"p p mu+ nu","0","2","LeptonPairMassScale",0,0)
                 process+=addProcess(thefactory,"p p mu- nu","0","2","LeptonPairMassScale",0,0)
             elif(simulation=="Merging"):
                 process+=particlegroup(thefactory,'mupm','mu+','mu-')
                 process+=addProcess(thefactory,"p p mupm nu","0","2","LeptonPairMassScale",2,2)
             process+=addLeptonPairCut("60","120")
 
         elif "Z-e" in parameterName :
             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 parameterName.startswith("13-") : 
+                process+=addLeptonPairCut("10","35")
+            else :
+                process+=addLeptonPairCut("10","30")
             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 parameterName.startswith("13-") : 
+                process+=addLeptonPairCut("25","70")
+            else :
+                process+=addLeptonPairCut("30","75")
             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 parameterName.startswith("13-") : 
+                process+=addLeptonPairCut("60","125")
+            else :
+                process+=addLeptonPairCut("65","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 parameterName.startswith("13-") : 
+                process+=addLeptonPairCut("115","8000")
+            else :
+                process+=addLeptonPairCut("120","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(thefactory,'bjet','b','bbar')
             process+=addProcess(thefactory,"p p e+ e- bjet","1","2","FixedScale",0,0)
             process+="set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 91.2*GeV\n"
             process+=addLeptonPairCut("60","120")
             process+=addFirstJet("15")
         elif "W-b" in parameterName :
             if(simulation=="Merging"):
               logging.warning("W-b not explicitly tested for %s " % simulation)
               sys.exit(0)
             parameters["bscheme"]=fourFlavour
             process += "set /Herwig/Particles/b:HardProcessMass 4.2*GeV\nset /Herwig/Particles/bbar:HardProcessMass 4.2*GeV\n"
             process+=addProcess(thefactory,"p p e-  nu b bbar","2","2","FixedScale",0,0)
             process+=addProcess(thefactory,"p p mu+ nu b bbar","2","2","FixedScale",0,0)
             process += "set /Herwig/MatrixElements/Matchbox/Scales/FixedScale:FixedScale 80.4*GeV\n"
             process+=addFirstJet("30")
             process+=addLeptonPairCut("60","120")
         else :
             logging.error(" Process %s not supported for Matchbox matrix elements" % name)
             sys.exit(1)
 # LHC-GammaGamma
 elif(collider=="LHC-GammaGamma" ) :
     if   "-7-" in parameterName : process = StringBuilder(collider_lumi(7000.0))
     elif "-8-" in parameterName : process = StringBuilder(collider_lumi(8000.0))
     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-EE b/Tests/python/merge-EE
--- a/Tests/python/merge-EE
+++ b/Tests/python/merge-EE
@@ -1,1199 +1,1332 @@
 #! /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,h in sorted(sourcehistosbysqrts.iteritems()) :
             if(sqrts=="U1") :
                 sqrts2=9.46
+                if "LENA_1981_I164397" in desthisto.path() : sqrts2=9.4624
             elif sqrts=="U2" :
                 sqrts2=10.02
+                if "LENA_1981_I164397" in desthisto.path() : sqrts2=10.0148
             elif sqrts=="U4" :
                 sqrts2=10.58
             else :
                 sqrts2=float(sqrts)
-            if("ARGUS_1989_I276860" in desthisto.path() and sqrts2==10.) : sqrts2=9.98
+            if   ("ARGUS_1989_I276860" in desthisto.path() and sqrts2==10. ) : sqrts2=9.98
+            elif ( "LENA_1981_I164397" in desthisto.path() and sqrts2==10. ) : sqrts2=9.9903
+            elif ( "LENA_1981_I164397" in desthisto.path() and sqrts2==9.51) : sqrts2=9.5149
             step = 0.001
             if("TASSO_1980_I143691" in desthisto.path()) : step=0.3
+            if("JADE_1979_I142874"  in desthisto.path()) : step=0.3
+            if("CLEO_1985_I205668"  in desthisto.path()) : step=0.05
             for i in range(0,h.numPoints()) :
                 xmin = min(h.points()[i].xMin(),h.points()[i].x()-step)
                 xmax = max(h.points()[i].xMax(),h.points()[i].x()+step)
                 if(sqrts2>=xmin and sqrts2<=xmax) :
                     desthisto.addPoint(h.points()[i])
 
     elif(type(desthisto)==yoda.core.Profile1D) :
         for sqrts, h in sorted(sourcehistosbysqrts.iteritems()) :
             step = 0.001
             for i in range(0,h.numBins()) :
                 xmin = min(h.bins()[i].xMin(),h.bins()[i].xMid()-step)
                 xmax = max(h.bins()[i].xMax(),h.bins()[i].xMid()+step)
                 if(sqrts>=xmin and sqrts<=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:
         try:
             outhistos[hpath] =  inhistos[hpath][sqrts]
         except:
             pass
 
 def average(hpath, sqrts1,sqrts2):
     global inhistos
     global outhistos
     outhistos[hpath] = inhistos[hpath][float(sqrts1)]+inhistos[hpath][float(sqrts2)]
     outhistos[hpath].setPath(hpath)
     outhistos[hpath].scaleW(0.5)
         
 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")
+                      help="Include gg analyses")
     parser.add_option("--without-gg",
                       action='store_false',
                       dest="gg",
                       default=False,
                       help="Don\'t include gg analyses")
+    parser.add_option("--with-decay",
+                      action='store_true' ,
+                      dest="decay",
+                      default=False,
+                      help="Include decay analyses")
+    parser.add_option("--without-decay",
+                      action='store_false',
+                      dest="decay",
+                      default=False,
+                      help="Don\'t include decay 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" ,"36.2","172",\
            "189","200","44","14","14.8","21.5","22","25","10",\
            "12.8","26.8","48.0","93.0",\
-           "12","13","17","27.6","29","30.2","34.5",\
-           "30.7","30","31.3","34","34.8","43.6","50","52","53.3",\
+           "12","13","17","27.6","27.7","29","30.2","34.5",\
+           "30.7","30","31.3","31.6","34","34.8","42.1","43.6","50","52","53.3",\
            "55","56","57","58","59.5","60.8","60","61.4","7.7",
-           "9.4","45","66","76","41","42.6","82","85"]
+           "9.4","45","66","76","41","42.6","82","85","2.2","2.6","3.0","3.2","4.6","4.8",
+           "5.8","6.2","6.6","7.0","7.4","3.63","4.03","4.17","4.3",
+           "4.41","5.0","5.2","4.5","8.8","9.27","9.46","9.51","10.52","10.52-sym","10.54","10.58",
+           "10.6","10.45","10.47"]
 # 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 += ["2.2","2.6","3.0","3.2","4.6","4.8","3.63","4.03","4.5","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",
-              "Lambdac","Omega-Meson","Omega-Baryon","Eta","Xi0","Xic0","Xim","JPsi","Psi2S"]
+# add decays if needed
+if(opts.decay) :
+    yodafiles += ["Upsilon","Upsilon2","Upsilon3","Upsilon4","Upsilon4-asym",
+                  "Tau","Phi","Lambdac","Omega-Meson",
+                  "Omega-Baryon","Eta","Xi0","Xic0","Xicp",
+                  "Omegac0","Xim","JPsi","Psi2S","Psi3770"]
 ## Get histos
 inhistos = {}
 outhistos={}
 for f in yodafiles:
     file = "Rivet-%s-%s.yoda" % (args[0], f)
     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("Upsilon3")>0) :
+        sqrts="U3"
     elif(file.find("Upsilon")>0) :
         sqrts="U1"
     elif(file.find("Phi")>0) :
         sqrts="phi"
     elif(file.find("Omega-Meson")>0) :
         sqrts="omega"
     elif(file.find("JPsi")>0) :
         sqrts="psi"
     elif(file.find("Psi2S")>0) :
         sqrts="psi2s"
+    elif(file.find("Psi3770")>0) :
+        sqrts="psi1d"
     elif(file.find("Lambdac")>0 or file.find("Xic0")>0 or
          file.find("Omega")>0 or file.find("Xi0")>0 or
-         file.find("Xim")>0 or
+         file.find("Xim")>0 or file.find("Xicp")>0 or
          file.find("Eta")>0) :
         sqrts="baryon"
     else :
         sqrts=float(f.split("-")[0])
     
     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
+        if("RAW" in aopath or "/_" in aopath) :continue
         # 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("143691" )>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("118873" )>0 or
            aopath.find("177174" )>0 or aopath.find("284251" )>0 or
            aopath.find("191161" )>0 or aopath.find("1422780")>0 or
+           aopath.find("132410" )>0 or "JADE_1979_I142874" in aopath or
+           "LENA_1981_I164397"   in aopath or "ARGUS_1991_I315059" in aopath or
+           "TASSO_1989_I266893"  in aopath or "CLEO_1985_I205668" in aopath  or
+           "BABAR_2014_I1286317" in aopath or
+           ("OPAL_2000_I513476" in aopath and ("d14" in aopath or "d20" in aopath )) or
            (aopath.find("MULTIPLICITIES")>0 and aopath.find("Upsilon_4S")<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
         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
         elif(aopath.find("A2_2017_I1486671")>=0) :
             if("Eta" in file) :
                 if "d01" in aopath : outhistos[aopath] = ao
             elif("Omega" in file) :
                 if "d02" in aopath : outhistos[aopath] = ao
             else :
                 outhistos[aopath] = ao
         elif("ARGUS_1992_I319102" in aopath) :
-            if("d02" in aopath and sqrts==10.47) :
+            if(("d02" in aopath or "d04" in aopath) and sqrts==10.47) :
                 outhistos[aopath] = ao
-            elif("d03"in aopath and sqrts=="U4") :
+            elif(("d03"in aopath or "d05" in aopath) and sqrts=="U4") :
                 outhistos[aopath] = ao
         elif("MC_OmegaPhia1_3Pion_Decay" in aopath) :
             if("_1" in aopath and "Omega" in file) :
                 outhistos[aopath] = ao
             elif("_2" in aopath and "Phi" in file) :
                 outhistos[aopath] = ao
+        elif("BABAR_2006_I719581" in aopath) :
+            if("d02" in aopath and "Omega" in file) :
+                outhistos[aopath] = ao
+            elif("d01" in aopath and "Xi" in file) :
+                outhistos[aopath] = ao
+        elif("BABAR_2002_I582184" in aopath) :
+            if(("d02" in aopath or "d05" in aopath ) and "Upsilon" in file) :
+                outhistos[aopath] = ao
+            elif( not ("d02" in aopath or "d05" in aopath ) and sqrts==10.6) :
+                outhistos[aopath] = ao
+        elif(aopath=="/BABAR_2007_I746745/d01-x01-y01") :
+            htemp = aos["/RAW/BABAR_2007_I746745/d01-x01-y01"]
+            htemp.scaleW(aos["/_XSEC"].points()[0].x()/aos["/_EVTCOUNT"].val())
+            htemp.setPath("/BABAR_2007_I746745/d01-x01-y01")
+            if "/BABAR_2007_I746745/d01-x01-y01" in outhistos :
+                htemp2=htemp+outhistos["/BABAR_2007_I746745/d01-x01-y01"]
+                htemp2.setPath("/BABAR_2007_I746745/d01-x01-y01")
+                outhistos["/BABAR_2007_I746745/d01-x01-y01"]=htemp2
+            else :
+                outhistos["/BABAR_2007_I746745/d01-x01-y01"]=htemp
+        elif(aopath=="/BABAR_2007_I722622/d03-x01-y01" or
+             aopath=="/BABAR_2007_I722622/d03-x01-y02" or
+             aopath=="/BABAR_2007_I722622/d04-x01-y01") :
+            htemp = aos["/RAW"+aopath]
+            htemp.scaleW(aos["/_XSEC"].points()[0].x()/aos["/_EVTCOUNT"].val())
+            htemp.setPath(aopath)
+            if aopath in outhistos :
+                htemp2=htemp+outhistos[aopath]
+                htemp2.setPath(aopath)
+                outhistos[aopath]=htemp2
+            else :
+                outhistos[aopath]=htemp
         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("4328825")>0 or hpath.find("5361494")>0 or
         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 or
         hpath.find("118873" )>0 or hpath.find("143691" )>0 or
         hpath.find("284251" )>0 or hpath.find("191161" )>0 or
-        hpath.find("1422780")>0) :
+        hpath.find("1422780")>0 or hpath.find("132410" )>0 or
+        "OPAL_2000_I513476"   in hpath or
+        "JADE_1979_I142874"   in hpath or
+        "CLEO_1985_I205668"   in hpath or
+        "BABAR_2014_I1286317" in hpath or
+        "LENA_1981_I164397"   in hpath):
         if(hpath=="/PLUTO_1981_I165122/d01-x01-y01"  or
            hpath=="/PLUTO_1981_I165122/d03-x01-y01" ) : continue
         title=""
         path=""
         histo = hsets.values()[0]
         if hasattr(histo, 'title'):
             title=histo.title()
         if hasattr(histo, 'path'):
             path=histo.path()
         if(type(histo)==yoda.core.Scatter2D) :
             outhistos[hpath] = yoda.core.Scatter2D(path,title)
         elif(type(histo)==yoda.core.Profile1D) :
             outhistos[hpath] = yoda.core.Profile1D(path,title)
             for i in range(0,histo.numBins()) :
                 outhistos[hpath].addBin(histo.bins()[i].xMin(),
                                         histo.bins()[i].xMax())
         elif(type(histo)==yoda.core.Histo1D) :
             outhistos[hpath] = yoda.core.Histo1D(path,title)
             for i in range(0,histo.numBins()) :
                 outhistos[hpath].addBin(histo.bins()[i].xMin(),
                                         histo.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","206")
 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","206")
 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")
+useOne("/BABAR_2007_S6895344/d03-x01-y01","U4")
+useOne("/BABAR_2007_S6895344/d04-x01-y01","U4")
 # 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")
+useOne("/ARGUS_1989_I262415/d01-x01-y01","U1")
+useOne("/ARGUS_1989_I262415/d01-x01-y02","10.00")
+useOne("/ARGUS_1989_I262415/d01-x02-y01","U1")
+useOne("/ARGUS_1989_I262415/d01-x02-y02","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")
 useOne("/PLUTO_1977_I118873/d02-x01-y01","3.63")
 useOne("/PLUTO_1977_I118873/d03-x01-y01","4.03")
 useOne("/PLUTO_1977_I118873/d04-x01-y01","4.5")
 
 
 useOne("/TASSO_1982_I177174/d01-x01-y01","14.")
 useOne("/TASSO_1982_I177174/d01-x01-y02","22.")
 useOne("/TASSO_1982_I177174/d01-x01-y03","34.")
 for i in range(2,4) :
     useOne("/TASSO_1982_I177174/d0%s-x01-y01" %i ,"12.")
     useOne("/TASSO_1982_I177174/d0%s-x01-y02" %i ,"14.")
     useOne("/TASSO_1982_I177174/d0%s-x01-y03" %i ,"22.")
     useOne("/TASSO_1982_I177174/d0%s-x01-y04" %i ,"25.")
     useOne("/TASSO_1982_I177174/d0%s-x01-y05" %i ,"30.")
     useOne("/TASSO_1982_I177174/d0%s-x01-y06" %i ,"34.")
     useOne("/TASSO_1982_I177174/d0%s-x01-y07" %i ,"35.")
 
 merge("/TASSO_1980_I143691/d01-x01-y01")
 useOne("/TASSO_1980_I143691/d02-x01-y01","13.")
 useOne("/TASSO_1980_I143691/d05-x01-y01","13.")
-if("/TASSO_1980_I143691/d03-x01-y01" in inhistos) :
+if("/TASSO_1980_I143691/d03-x01-y01" in inhistos and
+   "17." in inhistos["/TASSO_1980_I143691/d03-x01-y01"] and
+   "22." in inhistos["/TASSO_1980_I143691/d03-x01-y01"]) :
     average("/TASSO_1980_I143691/d03-x01-y01","17.","22.")
     average("/TASSO_1980_I143691/d06-x01-y01","17.","22.")
 useOne("/TASSO_1980_I143691/d04-x01-y01","30.2")
 useOne("/TASSO_1980_I143691/d07-x01-y01","30.2")
-        
+      
 useOne("/TASSO_1990_I284251/d01-x01-y01","42.6")
 useOne("/TASSO_1990_I284251/d01-x01-y02","35.")
 useOne("/TASSO_1990_I284251/d01-x01-y03","34.5")
 useOne("/TASSO_1990_I284251/d02-x01-y01","14.8")
 useOne("/TASSO_1990_I284251/d03-x01-y01","21.5")
 merge("/TASSO_1990_I284251/d04-x01-y01")
 useOne("/TASSO_1990_I284251/d05-x01-y01","42.6")
 useOne("/TASSO_1990_I284251/d05-x01-y02","42.6")
 useOne("/TASSO_1990_I284251/d05-x01-y03","35")
 useOne("/TASSO_1990_I284251/d05-x01-y04","35")
 useOne("/TASSO_1990_I284251/d06-x01-y01","14.8")
 useOne("/TASSO_1990_I284251/d06-x01-y02","14.8")
 useOne("/TASSO_1990_I284251/d07-x01-y01","21.5")
 useOne("/TASSO_1990_I284251/d07-x01-y02","21.5")
 useOne("/TASSO_1990_I284251/d08-x01-y01","42.6")
 useOne("/TASSO_1990_I284251/d08-x01-y02","35.")
 useOne("/TASSO_1990_I284251/d08-x01-y03","34.5")
 merge("/TASSO_1990_I284251/d09-x01-y01")
 useOne("/TASSO_1990_I284251/d10-x01-y01","35")
 useOne("/TASSO_1990_I284251/d10-x01-y02","35")
-
+merge("/DASP_1979_I132410/d01-x01-y01")
 # BES xi analysis
 useOne("/BESIII_2016_I1422780/d02-x01-y01","psi")
 useOne("/BESIII_2016_I1422780/d02-x01-y02","psi")
 useOne("/BESIII_2016_I1422780/d02-x01-y03","psi")
 useOne("/BESIII_2016_I1422780/d02-x01-y04","psi2s")
 useOne("/BESIII_2016_I1422780/d02-x01-y05","psi2s")
 useOne("/BESIII_2016_I1422780/d02-x01-y06","psi2s")
 if ( "/BESIII_2016_I1422780/d01-x01-y03" in inhistos and
      "psi" in inhistos["/BESIII_2016_I1422780/d01-x01-y03"]) :
     for point in inhistos["/BESIII_2016_I1422780/d01-x01-y03"]["psi"].points():
         outhistos["/BESIII_2016_I1422780/d01-x01-y03"].addPoint(point)
 if ( "/BESIII_2016_I1422780/d01-x01-y03" in inhistos and
      "psi2s" in inhistos["/BESIII_2016_I1422780/d01-x01-y03"]) :
     for point in inhistos["/BESIII_2016_I1422780/d01-x01-y03"]["psi2s"].points():
         outhistos["/BESIII_2016_I1422780/d01-x01-y03"].addPoint(point)
 
 # pluto analysis
 for id in range(1,3) :
     for iy in range(1,5) :
         merge("/PLUTO_1983_I191161/d0%s-x01-y0%s" % (id,iy))
 
+merge("/OPAL_2000_I513476/d14-x01-y01")
+merge("/OPAL_2000_I513476/d20-x01-y01")
+merge("/OPAL_2000_I513476/d20-x01-y02")
+merge("/OPAL_2000_I513476/d20-x01-y03")
+merge("/OPAL_2000_I513476/d20-x01-y04")
+
+merge("/JADE_1979_I142874/d02-x01-y01")
+merge("/LENA_1981_I164397/d03-x01-y01")
+
+useOne("/LENA_1981_I164397/d04-x01-y01","9.51")
+useOne("/LENA_1981_I164397/d04-x01-y02","10.")
+useOne("/LENA_1981_I164397/d04-x01-y03","U1")
+useOne("/LENA_1981_I164397/d04-x01-y04","U2")
+
+useOne("/ARGUS_1991_I315059/d01-x01-y01","10.47")
+useOne("/ARGUS_1991_I315059/d01-x01-y02","10.47")
+useOne("/ARGUS_1991_I315059/d01-x01-y03","10.47")
+useOne("/ARGUS_1991_I315059/d02-x01-y01","10.47")
+useOne("/ARGUS_1991_I315059/d03-x01-y01","10.47")
+useOne("/ARGUS_1991_I315059/d04-x01-y01","10.47")
+useOne("/ARGUS_1991_I315059/d05-x01-y01","U4")
+useOne("/ARGUS_1991_I315059/d06-x01-y01","U4")
+useOne("/ARGUS_1991_I315059/d07-x01-y01","U4")
+
+for i in [3,4,5,6,7,8,18,19,20,21,22,23] :
+    useOne("/TASSO_1989_I266893/d%02d-x01-y01" %i ,"34.8")
+for i in range(9,15) :
+    useOne("/TASSO_1989_I266893/d%02d-x01-y01" %i ,"42.1")
+for i in range(1,4) :
+    useOne("/TASSO_1989_I266893/d15-x01-y%02d" %i ,"34.8")
+    useOne("/TASSO_1989_I266893/d16-x01-y%02d" %i ,"42.1")
+
+for i in range(1,12) :
+    useOne("/CLEO_1985_I205668/d%02d-x01-y01" %i ,10.47)
+    useOne("/CLEO_1985_I205668/d%02d-x01-y02" %i , "U1")
+for i in range(12,24) :
+    merge("/CLEO_1985_I205668/d%02d-x01-y01" %i)
+
+useOne("/BABAR_2014_I1286317/d01-x01-y01", "U3")
+useOne("/BABAR_2014_I1286317/d02-x01-y01", "U2")
+useOne("/BABAR_2014_I1286317/d03-x01-y01", "U1")
+useOne("/BABAR_2014_I1286317/d06-x01-y01", "U3")
+useOne("/BABAR_2014_I1286317/d06-x02-y01", "U2")
+useOne("/BABAR_2014_I1286317/d06-x03-y01", "U1")
+
+useOne("/BABAR_2014_I1286317/d04-x01-y01", "10.6")
+useOne("/BABAR_2014_I1286317/d05-x01-y01", "10.6")
+useOne("/BABAR_2014_I1286317/d06-x04-y01", "10.6")
+    
+    
+# normalize where we have sum histos
+if("/BABAR_2007_I746745/d01-x01-y01" in outhistos and
+   outhistos["/BABAR_2007_I746745/d01-x01-y01"].effNumEntries()!=0.) :
+    outhistos["/BABAR_2007_I746745/d01-x01-y01"].normalize()
+if("/BABAR_2007_I722622/d03-x01-y01" in outhistos) :
+    outhistos["/BABAR_2007_I722622/d03-x01-y01"].normalize()
+if("/BABAR_2007_I722622/d03-x01-y02" in outhistos) :
+    outhistos["/BABAR_2007_I722622/d03-x01-y02"].normalize()
+if("/BABAR_2007_I722622/d04-x01-y01" in outhistos) :
+    outhistos["/BABAR_2007_I722622/d04-x01-y01"].normalize()
+
 # Choose output file
 name = args[0]+".yoda"
 # output the yoda file
 yoda.writeYODA(outhistos,name)
 sys.exit(0)
diff --git a/Tests/python/merge-LHC-EW b/Tests/python/merge-LHC-EW
--- a/Tests/python/merge-LHC-EW
+++ b/Tests/python/merge-LHC-EW
@@ -1,460 +1,470 @@
 #! /usr/bin/env python
 import logging
 import sys
 import os, yoda
 
 """%prog
 
 Script for merging aida files
 
 """
 
 def fillAbove(scale,desthisto, sourcehistosbyptmin) :
     pthigh= 1e100
     ptlow =-1e100
     for pt, h in sorted(sourcehistosbyptmin.iteritems(),reverse=True):
         ptlow=pt
         if(type(desthisto)==yoda.core.Scatter2D) :
-            for i in range(0,h.numPoints) :
-                xMin = h.points[i].x-h.points[i].xErrs.minus
+            for i in range(0,h.numPoints()) :
+                xMin = h.points()[i].x()-h.points()[i].xErrs().minus
                 if( xMin*scale >= ptlow and 
                     xMin*scale <  pthigh ) :
-                    desthisto.addPoint(h.points[i])
+                    desthisto.addPoint(h.points()[i])
         elif(type(desthisto)==yoda.core.Profile1D) :
             for i in range(0,h.numBins()) :
                 if(h.bins()[i].xMin()*scale  >= ptlow and 
                    h.bins()[i].xMin()*scale  <  pthigh ) :
                     desthisto.bins()[i] += h.bins()[i]
         elif(type(desthisto)==yoda.core.Histo1D) :
             for i in range(0,h.numBins()) :
                 if(h.bins()[i].xMin()*scale  >= ptlow and 
                    h.bins()[i].xMin()*scale  <  pthigh ) :
                     desthisto.bins()[i] += h.bins()[i]
         else :
-            logging.error("Can't merge %s, unknown type" % desthisto.path)
+            logging.error("Can't merge %s, unknown type" % desthisto.path())
             sys.exit(1)
         pthigh=pt
 
 def mergeByMass(hpath, sqrts, scale=1.):
     global inhistos_mass
     global outhistos
     try:
         fillAbove(scale,outhistos[hpath], inhistos_mass[hpath][float(sqrts)])
     except:
         pass
 
 def useOneMass(hpath, sqrts, ptmin):
     global inhistos_mass
     global outhistos
     try:
        ## Find best pT_min match
         ptmins = inhistos_mass[hpath][float(sqrts)].keys()
         closest_ptmin = None
         for ptm in ptmins:
             if closest_ptmin is None or \
                     abs(ptm-float(ptmin)) < abs(closest_ptmin-float(ptmin)):
                 closest_ptmin = ptm
         if closest_ptmin != float(ptmin):
             logging.warning("Inexact match for requested pTmin=%s: " % ptmin + \
                                 "using pTmin=%e instead" % closest_ptmin)
         outhistos[hpath] =  inhistos_mass[hpath][float(sqrts)][closest_ptmin]
     except:
         pass
 
 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 base")
     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=["-13-Z-e","-13-Z-mu","-Z-HighMass1-e","-Z-HighMass2-e",
-               "-8-Z-Mass1-e","-8-Z-Mass1-mu","-8-Z-Mass2-e","-8-Z-Mass2-mu","-8-Z-Mass3-e","-8-Z-Mass3-mu","-8-Z-Mass4-e","-8-Z-Mass4-mu",
+               "-8-Z-Mass1-e" ,"-8-Z-Mass1-mu" ,"-8-Z-Mass2-e" ,"-8-Z-Mass2-mu" ,"-8-Z-Mass3-e" ,"-8-Z-Mass3-mu" ,"-8-Z-Mass4-e" ,"-8-Z-Mass4-mu" ,
+               "-13-Z-Mass1-e","-13-Z-Mass1-mu","-13-Z-Mass2-e","-13-Z-Mass2-mu","-13-Z-Mass3-e","-13-Z-Mass3-mu","-13-Z-Mass4-e","-13-Z-Mass4-mu",
                "-W-e","-W-mu","-Z-e","-Z-mu","-Z-mu-Short","-Z-LowMass-e","-Z-LowMass-mu",
                "-Z-MedMass-e",
                "-WW-emu","-WW-ll","-WZ","-ZZ-ll","-ZZ-lv","-8-WZ","-13-WZ","-8-ZZ-lv","-8-WW-ll",
                "-7-W-Jet-1-e","-7-W-Jet-2-e","-7-W-Jet-3-e","-7-Z-Jet-1-e","-7-Z-Jet-2-e","-7-Z-Jet-3-e",
                "-7-WGamma-e","-7-WGamma-mu","-7-ZGamma-e","-7-ZGamma-mu"]
     ## Get histos
     outhistos={}
 
     inhistos_mass = {}
     for f in yodafiles:
         file='Rivet-'+args[0]+f+".yoda"
         if not os.access(file, os.R_OK):
             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
         mass=66
         if(file.find("HighMass1")>=0) :
             mass = 116
         elif(file.find("HighMass2")>=0) :
             mass = 400
         elif(file.find("Mass1")>=0) :
             mass = 12
         elif(file.find("Mass2")>=0) :
             mass = 30
         elif(file.find("Mass3")>=0) :
             mass = 66
         elif(file.find("Mass4")>=0) :
             mass = 116
         ## Get histos from this YODA file
         for aopath, ao in aos.iteritems() :
             if("RAW" in aopath) :continue
             if(aopath.find("ATLAS_2010_S8919674")>0) :
                 if((aopath.find("d01")>0 or aopath.find("d05")>0 or 
                     aopath.find("d07")>0) and file.find("-e")>0) : 
                     outhistos[aopath] = ao
                 elif((aopath.find("d02")>0 or aopath.find("d06")>0 or 
                       aopath.find("d08")>0) and file.find("-mu")>0) : 
                     outhistos[aopath] = ao
             elif (aopath.find("ATLAS_2011_S9131140")>0) :
                 if(aopath.find("d01")>0 and file.find("-e")>0) : 
                     outhistos[aopath] = ao
                 elif(aopath.find("d02")>0 and file.find("-mu")>0) : 
                     outhistos[aopath] = ao
             elif (aopath.find("ATLAS_2011_I925932")>0) :
                 if(aopath.find("d01")>0 and file.find("-e")>0) : 
                     outhistos[aopath] = ao
                 elif(aopath.find("d02")>0 and file.find("-mu")>0) : 
                     outhistos[aopath] = ao
             elif (aopath.find("ATLAS_2011_I945498")>0) :
                 if(aopath.find("y01")>0 and file.find("-e")>0) : 
                     outhistos[aopath] = ao
                 elif(aopath.find("y02")>0 and file.find("-mu")>0) : 
                     outhistos[aopath] = ao
                 elif(aopath.find("y03")>0 and file.find("-mu")>0) : 
                     outhistos[aopath] = ao
             elif (aopath.find("ATLAS_2013_I1217867")>0) :
                 if(aopath.find("y01")>0 and file.find("-e")>0) : 
                     outhistos[aopath] = ao
                 elif(aopath.find("y02")>0 and file.find("-mu")>0) : 
                     outhistos[aopath] = ao
             elif (aopath.find("CMS_2012_I941555")>0) :
                 if((aopath.find("y01")>0 or aopath.find("y03")>0 ) and file.find("-mu")>0) : 
                     outhistos[aopath] = ao
                 elif(aopath.find("y02")>0 and file.find("-e")>0) : 
                     outhistos[aopath] = ao
             elif (aopath.find("ATLAS_2014_I1300647" )>0) :
                 if(aopath.find("y01")>0 and file.find("-e")>0) : 
                     outhistos[aopath] = ao
                 elif((not aopath.find("y01")>0) and file.find("-mu")>0) :
                     outhistos[aopath] = ao
             elif (aopath.find("ATLAS_2014_I1288706" )>0) :
                 if(aopath.find("y02")>0 and file.find("-e")>0) : 
                     outhistos[aopath] = ao
                 elif(aopath.find("y01")>0 and file.find("-mu")>0) :
                     outhistos[aopath] = ao
             elif (aopath.find("ATLAS_2012_I1204784" )>0) :
                 if( file.find("-e")>0 and
                     ( aopath.find("d03")>0 or 
                       ((aopath.find("d01")>0 or aopath.find("d02")>0) and aopath.find("y01")>0))) : 
                     outhistos[aopath] = ao
                 elif(file.find("-mu")>0 and
                      ( aopath.find("d04")>0 or 
                        ((aopath.find("d01")>0 or aopath.find("d02")>0) and aopath.find("y02")>0))) : 
                     outhistos[aopath] = ao
-            elif (aopath.find("ATLAS_2014_I1312627_EL") >0) :
-                if(file.find("-e")>0) :
+            elif (aopath.find("ATLAS_2014_I1312627")>0) :
+                if("EL" in aopath) :
                     if(file.find("W")>0 and aopath.find("x02")>0) :
                         outhistos[aopath] = ao
                     elif(file.find("Z")>0 and aopath.find("x03")>0) :
                         outhistos[aopath] = ao
-            elif (aopath.find("ATLAS_2014_I1312627_MU") >0) :
-                if(file.find("-mu")>0) :
+                elif ("MU" in aopath) :
                     if(file.find("W")>0 and aopath.find("x02")>0) :
                         outhistos[aopath] = ao
                     elif(file.find("Z")>0 and aopath.find("x03")>0) :
                         outhistos[aopath] = ao
-            elif (aopath.find("ATLAS_2014_I1312627") >0) :
-                if(file.find("-e")>0) :
+                else :
                     if(file.find("W")>0 and aopath.find("x02")>0) :
                         outhistos[aopath] = ao
                     elif(file.find("Z")>0 and aopath.find("x03")>0) :
                         outhistos[aopath] = ao
+            elif (aopath.find("CMS_2018_I1711625")>0) :
+                if( file.find("-e")>0 and aopath.find("d06-x01-y01") > 0 ):
+                    if aopath in outhistos :
+                        outhistos[aopath] += ao
+                    else :
+                        outhistos[aopath]  = ao
+                elif( file.find("-mu")>0 and (aopath.find("d03-x01-y01") > 0 or aopath.find("d05-x01-y01") > 0) ):
+                    if aopath in outhistos :
+                        outhistos[aopath] += ao
+                    else :
+                        outhistos[aopath]  = ao
             elif (aopath.find("CMS_2013_I1224539_WJET" )>0) :
                 if(file.find("-1-e")>0 and (aopath.find("d52")>0 or aopath.find("d53")>0 or aopath.find("d56")>0 or aopath.find("d57")>0 or aopath.find("d60")>0 or aopath.find("d61")>0 or aopath.find("d64")>0 or aopath.find("d65")>0 or aopath.find("d68")>0 or aopath.find("d69")>0 or aopath.find("d72")>0)) :
                     outhistos[aopath] = ao
                 elif(file.find("-2-e")>0 and (aopath.find("d54")>0 or aopath.find("d58")>0 or aopath.find("d62")>0 or aopath.find("d66")>0 or aopath.find("d70")>0 or aopath.find("d73")>0)) :
                     outhistos[aopath] = ao
                 elif(file.find("-3-e")>0 and (aopath.find("d55")>0 or aopath.find("d59")>0 or aopath.find("d63")>0 or aopath.find("d67")>0 or aopath.find("d71")>0 or aopath.find("d74")>0)) :
                     outhistos[aopath] = ao
             elif (aopath.find("CMS_2013_I1224539_ZJET" )>0) :
                 if(file.find("-1-e")>0 and (aopath.find("d29")>0 or aopath.find("d30")>0 or aopath.find("d33")>0 or aopath.find("d34")>0 or aopath.find("d37")>0 or aopath.find("d38")>0 or aopath.find("d41")>0 or aopath.find("d42")>0 or aopath.find("d45")>0 or aopath.find("d46")>0 or aopath.find("d49")>0)) :
                     outhistos[aopath] = ao
                 elif(file.find("-2-e")>0 and (aopath.find("d31")>0 or aopath.find("d35")>0 or aopath.find("d39")>0 or aopath.find("d43")>0 or aopath.find("d47")>0 or aopath.find("d50")>0)) :
                     outhistos[aopath] = ao
                 elif(file.find("-3-e")>0 and (aopath.find("d32")>0 or aopath.find("d36")>0 or aopath.find("d40")>0 or aopath.find("d44")>0 or aopath.find("d48")>0 or aopath.find("d51")>0)) :
                     outhistos[aopath] = ao
             elif (aopath.find("CMS_2013_I1258128")>0) :
                 if(aopath.find("d01")>0 or aopath.find("d02")>0 or
                    aopath.find("d03")>0 or aopath.find("d04")>0) :
                     outhistos[aopath] = ao
             elif (aopath.find("CMS_2013_I1209721" )>0 and file.find("-0")>0 ) :
                 outhistos[aopath] = ao
             elif (aopath.find("ATLAS_2011_I928289")>0) :
                 if(file.find("-e")>=0 and (aopath.find("y01")>=0 or aopath.find("y02")>=0)) :
                     outhistos[aopath] = ao
                 elif(file.find("-mu")>=0 and (aopath.find("y03")>=0 or aopath.find("y04")>=0)) :
                     outhistos[aopath] = ao
             elif (aopath.find("CMS_2013_I1122847")>0) :
                 if(file.find("-mu")>=0 and aopath.find("d01")>=0 ) :
                     outhistos[aopath] = ao
                 elif(file.find("-e")>=0 and (aopath.find("d02")>=0 or aopath.find("d03")>=0)) :
                     outhistos[aopath] = ao
             elif (aopath.find("ATLAS_2016_I1424838")>0) :
                 ihist = int(aopath.split("/")[2].split("-")[0].replace("d",""))
                 if(file.find("-mu")>=0 and ihist>30 ) :
                     outhistos[aopath] = ao
                 elif(file.find("-e")>=0 and ihist<=30) :
                     outhistos[aopath] = ao
 
             elif "ATLAS_2016_I1502620" in aopath :
                 newPath = aopath.split(":")[0]+"/"+aopath.split("/")[-1]
                 if newPath in outhistos :
                     continue
                 else :                
                     outhistos[newPath] = ao
                     ao.setPath(newPath)
             elif ("CMS_2015_I1310737" in aopath or "ATLAS_2013_I1219109" in aopath or
                   ("ATLAS_2014_I1319490" in aopath and "y01" in aopath )) :
                 if aopath in outhistos :
                     outhistos[aopath] += ao
                 else :
                     outhistos[aopath] = ao
             elif (aopath.find("ATLAS_2015_I1351916")>=0) :
                 if(aopath.find("-y02")>=0) :
                     pathBase = "/%s/" % aopath.split("/")[1]
                     if("d03" in aopath) :
                         hp = aos[pathBase+"_ncf_pos"]
                         hm = aos[pathBase+"_ncf_neg"]
                     else :
                         hp = aos[pathBase+"_ncc_pos"]
                         hm = aos[pathBase+"_ncc_neg"]
                     ratio = (hp-hm)/(hp+hm)
                     title=""
                     if hasattr(ao, 'title'):
-                        title=ao.title()
+                        title=ao.title
                     hnew = yoda.Scatter2D(aopath,title)
                     hnew.combineWith(ratio)
                     outhistos[aopath] = hnew
                 else :
                     continue
             elif (aopath.find("ATLAS_2014_I1282447")>=0) :
                 if((aopath.find("/ATLAS_2014_I1282447/d02-x01-y01")>=0 or
                     aopath.find("/ATLAS_2014_I1282447/d08-x01-y01")>=0 or 
                     aopath.find("/ATLAS_2014_I1282447/d02-x01-y02")>=0 or 
                     aopath.find("/ATLAS_2014_I1282447/d02-x01-y01")>=0 or
                     aopath.find("/ATLAS_2014_I1282447/d05-x01-y02")>=0 or 
                     aopath.find("/ATLAS_2014_I1282447/d05-x01-y03")>=0 or 
                     aopath.find("/ATLAS_2014_I1282447/d06-x01-y01")>=0 or
                     aopath.find("/ATLAS_2014_I1282447/d06-x01-y02")>=0 or 
                     aopath.find("/ATLAS_2014_I1282447/d06-x01-y03")>=0 or 
                     aopath.find("/ATLAS_2014_I1282447/d06-x01-y04")>=0) and 
                    not (aopath.find("plus")>=0 or aopath.find("minus")>=0 or
                         aopath.find("inc")>=0)) :
                     continue
                 if aopath in outhistos :
                     outhistos[aopath] += ao
                 else :
                     outhistos[aopath] = ao
             elif (aopath.find("ATLAS_2015_I1408516")>=0) :
                 if not inhistos_mass.has_key(aopath):
                     inhistos_mass[aopath] = {}
                 tmpE = inhistos_mass[aopath]
                 sqrts=8000
                 if not tmpE.has_key(sqrts):
                     tmpE[sqrts] = {}
                 tmpP = tmpE[sqrts]
                 if not tmpP.has_key(mass):
                     tmpP[mass] = ao
                 else:
                     raise Exception("A set with mass = %s already exists" % ( mass))
             elif (aopath.find("ATLAS_2013_I1234228")>=0) :
                 if not inhistos_mass.has_key(aopath):
                     inhistos_mass[aopath] = {}
                 tmpE = inhistos_mass[aopath]
                 sqrts=7000
                 if not tmpE.has_key(sqrts):
                     tmpE[sqrts] = {}
                 tmpP = tmpE[sqrts]
                 if not tmpP.has_key(mass):
                     tmpP[mass] = ao
                 else:
                     raise Exception("A set with mass = %s already exists" % ( mass))
             elif (aopath.find("ATLAS_2017_I1514251")>=0) :
                 outhistos[aopath] = ao
                 if(type(ao)==yoda.core.Scatter2D) :
                     ao.scaleY(2.)
                 elif(type(ao)==yoda.core.Histo1D) :
                     ao.scaleW(2.)
             elif ( "2015_041_" in aopath) :
                 aopath=aopath.replace("_EL","").replace("_MU","")
                 ao.setPath(aopath)
                 outhistos[aopath] = ao
             else :
                 outhistos[aopath] = ao
     for hpath,hsets in inhistos_mass.iteritems():
         if(hpath!="/ATLAS_2015_I1408516:LMODE=EL/d41-x01-y01" and
            hpath!="/ATLAS_2015_I1408516:LMODE=MU/d41-x01-y02" and
            hpath!="/ATLAS_2013_I1234228/d01-x01-y02" ) :
             continue
         title=""
         path=""
         histo = hsets.values()[0].values()[0]
         if hasattr(histo, 'title'):
             title=histo.title()
         if hasattr(histo, 'path'):
             path=histo.path()
         if(type(histo)==yoda.core.Scatter2D) :
             outhistos[hpath] = yoda.core.Scatter2D(path,title)
         elif(type(histo)==yoda.core.Profile1D) :
             outhistos[hpath] = yoda.core.Profile1D(path,title)
             for i in range(0,histo.numBins()) :
                 outhistos[hpath].addBin(histo.bins()[i].xMin(),
                                         histo.bins()[i].xMax())
         elif(type(histo)==yoda.core.Histo1D) :
             outhistos[hpath] = yoda.core.Histo1D(path,title)
             for i in range(0,histo.numBins()) :
                 outhistos[hpath].addBin(histo.bins()[i].xMin(),
                                         histo.bins()[i].xMax())
         else :
             logging.error("Histogram %s is of unknown type" % hpath)
             sys.exit(1)
     # sort out mass bins for ATLAS Z-> e,mu at 8 TeV
     for ltype in ["EL","MU"] :
         if(ltype=="EL") :
             y = "y01"
             mergeByMass("/ATLAS_2015_I1408516:LMODE=EL/d41-x01-y01", "8000")
         else :
             y = "y04"
             mergeByMass("/ATLAS_2015_I1408516:LMODE=MU/d41-x01-y02", "8000")
         for d in [2,3,04,14,26,38]:
             useOneMass("/ATLAS_2015_I1408516:LMODE=%s/d%02d-x01-%s" % (ltype,d,y), "8000", "30" )
         for d in [5,6,7,8,9,10,15,17,18,19,20,21,22,27,29,30,31,32,33,34,39]:
             useOneMass("/ATLAS_2015_I1408516:LMODE=%s/d%02d-x01-%s" % (ltype,d,y), "8000", "66" )
         for d in [11,12,13,16,28,40]:
             useOneMass("/ATLAS_2015_I1408516:LMODE=%s/d%02d-x01-%s" % (ltype,d,y), "8000", "116" )
         for d in [23,35]:
             useOneMass("/ATLAS_2015_I1408516:LMODE=%s/d%02d-x01-%s" % (ltype,d,y), "8000", "12" )
         for d in [24,36]:
             useOneMass("/ATLAS_2015_I1408516:LMODE=%s/d%02d-x01-%s" % (ltype,d,y), "8000", "12" )
         for d in [25,37]:
             useOneMass("/ATLAS_2015_I1408516:LMODE=%s/d%02d-x01-%s" % (ltype,d,y), "8000", "30" )
     # sort out ratios for ATLAS W+c
     if("/ATLAS_2014_I1282447/d02-x01-y01_plus" in outhistos and 
        "/ATLAS_2014_I1282447/d02-x01-y01_minus" in outhistos) :
         d02y01_plus  = outhistos["/ATLAS_2014_I1282447/d02-x01-y01_plus"]
         d02y01_minus = outhistos["/ATLAS_2014_I1282447/d02-x01-y01_minus"]
         ratio_d02y01 = d02y01_plus/d02y01_minus
         ratio_d02y01.setPath("/ATLAS_2014_I1282447/d02-x01-y01")
         del outhistos["/ATLAS_2014_I1282447/d02-x01-y01_plus"]
         del outhistos["/ATLAS_2014_I1282447/d02-x01-y01_minus"]
         outhistos["/ATLAS_2014_I1282447/d02-x01-y01"] = ratio_d02y01
     if("/ATLAS_2014_I1282447/d02-x01-y02_plus" in outhistos and 
        "/ATLAS_2014_I1282447/d02-x01-y02_minus" in outhistos) :
         d02y02_plus  = outhistos["/ATLAS_2014_I1282447/d02-x01-y02_plus"]
         d02y02_minus = outhistos["/ATLAS_2014_I1282447/d02-x01-y02_minus"]
         ratio_d02y02 = d02y02_plus/d02y02_minus
         ratio_d02y02.setPath("/ATLAS_2014_I1282447/d02-x01-y02")
         del outhistos["/ATLAS_2014_I1282447/d02-x01-y02_plus"]
         del outhistos["/ATLAS_2014_I1282447/d02-x01-y02_minus"]
         outhistos["/ATLAS_2014_I1282447/d02-x01-y02"] = ratio_d02y02
     if("/ATLAS_2014_I1282447/d08-x01-y01_plus" in outhistos and 
        "/ATLAS_2014_I1282447/d08-x01-y01_minus" in outhistos) :
         d08y01_plus  = outhistos["/ATLAS_2014_I1282447/d08-x01-y01_plus"]
         d08y01_minus = outhistos["/ATLAS_2014_I1282447/d08-x01-y01_minus"]
         ratio_d08y01 = d08y01_plus/d08y01_minus
         ratio_d08y01.setPath("/ATLAS_2014_I1282447/d08-x01-y01")
         del outhistos["/ATLAS_2014_I1282447/d08-x01-y01_plus"]
         del outhistos["/ATLAS_2014_I1282447/d08-x01-y01_minus"]
         outhistos["/ATLAS_2014_I1282447/d08-x01-y01"] = ratio_d08y01
     if ("/ATLAS_2014_I1282447/d05-x01-y01" in outhistos and
         "/ATLAS_2014_I1282447/d01-x01-y02" in outhistos) :
         h_winc = outhistos["/ATLAS_2014_I1282447/d05-x01-y01"]
         h_d    = outhistos["/ATLAS_2014_I1282447/d01-x01-y02"]
         ratio_wd      =  h_d/h_winc
         ratio_wd.setPath("/ATLAS_2014_I1282447/d05-x01-y02")
         outhistos["/ATLAS_2014_I1282447/d05-x01-y02"] = ratio_wd
     if ("/ATLAS_2014_I1282447/d05-x01-y01" in outhistos and
         "/ATLAS_2014_I1282447/d01-x01-y03" in outhistos) :
         h_winc = outhistos["/ATLAS_2014_I1282447/d05-x01-y01"]
         h_dstar= outhistos["/ATLAS_2014_I1282447/d01-x01-y03"]
         ratio_wdstar      =  h_dstar/h_winc
         ratio_wdstar.setPath("/ATLAS_2014_I1282447/d05-x01-y03")
         outhistos["/ATLAS_2014_I1282447/d05-x01-y03"] = ratio_wdstar
     if("/ATLAS_2014_I1282447/d06-x01-y01_winc" in outhistos and
        "/ATLAS_2014_I1282447/d06-x01-y02_winc" in outhistos) :
         h_winc_plus  = outhistos["/ATLAS_2014_I1282447/d06-x01-y01_winc"]
         h_winc_minus = outhistos["/ATLAS_2014_I1282447/d06-x01-y02_winc"]
         if( "/ATLAS_2014_I1282447/d06-x01-y01_wplus" in outhistos ) :
             h_wd_plus      = outhistos["/ATLAS_2014_I1282447/d06-x01-y01_wplus"]
             ratio_wd_plus       =  h_wd_plus/h_winc_plus
             ratio_wd_plus.setPath("/ATLAS_2014_I1282447/d06-x01-y01")
             outhistos["/ATLAS_2014_I1282447/d06-x01-y01"] = ratio_wd_plus
             del outhistos["/ATLAS_2014_I1282447/d06-x01-y01_wplus"]
         if( "/ATLAS_2014_I1282447/d06-x01-y02_wminus" in outhistos ) :
             h_wd_minus     = outhistos["/ATLAS_2014_I1282447/d06-x01-y02_wminus"]
             ratio_wd_minus      =  h_wd_minus/h_winc_minus
             ratio_wd_minus.setPath("/ATLAS_2014_I1282447/d06-x01-y02")
             outhistos["/ATLAS_2014_I1282447/d06-x01-y02"] = ratio_wd_minus
             del outhistos["/ATLAS_2014_I1282447/d06-x01-y02_wminus"]
         if ( "/ATLAS_2014_I1282447/d06-x01-y03_wplus" in outhistos) : 
             h_wdstar_plus  = outhistos["/ATLAS_2014_I1282447/d06-x01-y03_wplus"]
             ratio_wdstar_plus       =  h_wdstar_plus/h_winc_plus
             ratio_wdstar_plus.setPath("/ATLAS_2014_I1282447/d06-x01-y03")
             outhistos["/ATLAS_2014_I1282447/d06-x01-y03"] = ratio_wdstar_plus 
             del outhistos["/ATLAS_2014_I1282447/d06-x01-y03_wplus"]
         if ( "/ATLAS_2014_I1282447/d06-x01-y04_wminus" in outhistos) :
             h_wdstar_minus = outhistos["/ATLAS_2014_I1282447/d06-x01-y04_wminus"]
             ratio_wdstar_minus      =  h_wdstar_minus/h_winc_minus
             ratio_wdstar_minus.setPath("/ATLAS_2014_I1282447/d06-x01-y04")
             outhistos["/ATLAS_2014_I1282447/d06-x01-y04"] = ratio_wdstar_minus
             del outhistos["/ATLAS_2014_I1282447/d06-x01-y04_wminus"]
         del outhistos["/ATLAS_2014_I1282447/d06-x01-y01_winc"]
         del outhistos["/ATLAS_2014_I1282447/d06-x01-y02_winc"]
 
         
     mergeByMass("/ATLAS_2013_I1234228/d01-x01-y02", "7000")
     # ATLAS W/Z ratios
     iy=0
-    for suffix in ["","_EL","_MU"] :
+    for suffix in ["",":LMODE=EL",":LMODE=MU"] :
         iy+=1
         basePath = "/ATLAS_2014_I1312627%s/" % suffix
         for ihist in range(1,21) :
             num = "%sd%02d-x02-y%02d" % (basePath,ihist,iy) 
             den = "%sd%02d-x03-y%02d" % (basePath,ihist,iy)
             if(den in outhistos and num in outhistos) :
                 ratio = outhistos[num]/outhistos[den]
                 ratio.setPath("%sd%02d-x01-y%02d" % (basePath,ihist,iy))
                 del outhistos[num]
                 del outhistos[den]
                 outhistos[ "%sd%02d-x01-y%02d" % (basePath,ihist,iy)]=ratio
             elif den in outhistos :
                 del outhistos[den]
             elif num in outhistos :
                 del outhistos[num]
     # Choose output file
     name = args[0]+"-EW.yoda"
     yoda.writeYODA(outhistos,name)
     sys.exit(0)
diff --git a/Tests/python/merge-LHC-Jets b/Tests/python/merge-LHC-Jets
--- a/Tests/python/merge-LHC-Jets
+++ b/Tests/python/merge-LHC-Jets
@@ -1,1655 +1,1671 @@
 #! /usr/bin/env python
 import logging
 import sys
 import math
 
 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 rescale(path,scale) :
     if(path not in outhistos) : return
     outhistos[path].scaleW(scale)
 
 def fillAbove(scale,desthisto, sourcehistosbyptmin) :
     pthigh= 1e100
     ptlow =-1e100
     for pt, h in sorted(sourcehistosbyptmin.iteritems(),reverse=True):
         ptlow=pt
         if(type(desthisto)==yoda.core.Scatter2D) :
             for i in range(0,h.numPoints()) :
                 xMin = h.points()[i].x()-h.points()[i].xErrs().minus
                 if( xMin*scale >= ptlow and 
                     xMin*scale <  pthigh ) :
                     desthisto.addPoint(h.points()[i])
         elif(type(desthisto)==yoda.core.Profile1D) :
             for i in range(0,h.numBins()) :
                 if(h.bins()[i].xMin()*scale  >= ptlow and 
                    h.bins()[i].xMin()*scale  <  pthigh ) :
                     desthisto.bins()[i] += h.bins()[i]
         elif(type(desthisto)==yoda.core.Histo1D) :
             for i in range(0,h.numBins()) :
                 if(h.bins()[i].xMin()*scale  >= ptlow and 
                    h.bins()[i].xMin()*scale  <  pthigh ) :
                     desthisto.bins()[i] += h.bins()[i]
         elif(type(desthisto)==yoda.core.Counter) :
                     desthisto += h
         else :
-            logging.error("Can't merge %s, unknown type" % desthisto.path)
+            logging.error("Can't merge %s, unknown type" % desthisto.path())
             sys.exit(1)
         pthigh=pt
 
 def mergeByPt(hpath, sqrts, scale=1.) :
     global inhistos_pt
     global outhistos
     try:
         fillAbove(scale,outhistos[hpath], inhistos_pt[hpath][float(sqrts)])
     except:
         pass
 
 def mergeByMass(hpath, sqrts, scale=1.):
     global inhistos_mass
     global outhistos
     try:
         fillAbove(scale,outhistos[hpath], inhistos_mass[hpath][float(sqrts)])
     except:
         pass
 
 def useOnePt(hpath, sqrts, ptmin):
     global inhistos_pt
     global outhistos
     try:
        ## Find best pT_min match
         ptmins = inhistos_pt[hpath][float(sqrts)].keys()
         closest_ptmin = None
         for ptm in ptmins:
             if closest_ptmin is None or \
                     abs(ptm-float(ptmin)) < abs(closest_ptmin-float(ptmin)):
                 closest_ptmin = ptm
         if closest_ptmin != float(ptmin):
             logging.warning("Inexact match for requested pTmin=%s: " % ptmin + \
                                 "using pTmin=%e instead" % closest_ptmin)
         outhistos[hpath] =  inhistos_pt[hpath][float(sqrts)][closest_ptmin]
     except:
         pass
 
 def useOneMass(hpath, sqrts, ptmin):
     global inhistos_pt
     global outhistos
     try:
         ## Find best pT_min match
         ptmins = inhistos_mass[hpath][float(sqrts)].keys()
         closest_ptmin = None
         for ptm in ptmins:
             if closest_ptmin is None or \
                abs(ptm-float(ptmin)) < abs(closest_ptmin-float(ptmin)):
                 closest_ptmin = ptm
         if closest_ptmin != float(ptmin):
             logging.warning("Inexact match for requested mass=%s: " % ptmin + \
                             "using mass=%e instead" % closest_ptmin)
         outhistos[hpath] =  inhistos_mass[hpath][float(sqrts)][closest_ptmin]
     except:
         pass
 
 # #######################################
 
 if __name__ == "__main__":
     import logging
     from optparse import OptionParser, OptionGroup
     parser = OptionParser(usage="%prog name")
     verbgroup = OptionGroup(parser, "Verbosity control")
     parser.add_option("--with-ue",
                       action='store_true' ,
                       dest="ue",
                       default=True,
                       help="Include UE analyses")
     parser.add_option("--without-ue",
                       action='store_false',
                       dest="ue",
                       default=True,
                       help="Don\'t include UE analyses")
     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")
 
     (opts, args) = parser.parse_args()
 
     ## Check args
     if len(args) < 1:
         logging.error("Must specify at least the name of the files")
         sys.exit(1)
 yodafiles=["-7-Bottom-0.yoda","-7-Bottom-1.yoda","-7-Bottom-2.yoda",
            "-7-Bottom-3.yoda","-7-Bottom-4.yoda","-7-Bottom-5.yoda","-7-Bottom-6.yoda",
            "-7-Charm-1.yoda","-7-Charm-2.yoda",
            "-7-Charm-3.yoda","-7-Charm-4.yoda","-7-Charm-5.yoda",
            "-7-Top-SL.yoda","-7-Top-L.yoda",
            "-8-Top-SL.yoda","-8-Top-L.yoda","-8-Top-All.yoda",
            "-13-Top-L.yoda","-13-Top-SL.yoda","-13-Top-All.yoda"]
 
 for i in range(1,11) :
     for j in [7,8,13] :
         yodafiles.append("-%1.1i-Jets-%1.1i.yoda" % (j,i))
         
 for i in range(1,4) :
     yodafiles.append("-2760-Jets-%1.1i.yoda" % i)
 
 if(opts.ue) :
     yodafiles += ["-7-Jets-0.yoda"    ,"-8-Jets-0.yoda" ,
                   "-900-UE.yoda"   ,"-2360-UE.yoda"    ,
                   "-2760-UE.yoda"     ,"-7-UE.yoda"     ,
                   "-900-UE-Long.yoda" ,"-8-UE.yoda"     ,
                   "-7-UE-Long.yoda","-13-UE.yoda","-13-UE-Long.yoda"]
 ## Get histos
 inhistos_pt   = {}
 inhistos_mass = {}
 outhistos={}
 weights = {}
 for f in yodafiles:
     file='Rivet-'+args[0]+f
     ptmin=0.
     sqrts=7000
     # CMS energy
     if(file.find("-900-")>0) :
         sqrts=900
     elif(file.find("-2360-")>0) :
         sqrts=2360
     elif(file.find("-2760-")>0) :
         sqrts=2760
     elif(file.find("-7-")>=0) :
         sqrts=7000
     elif(file.find("-8-")>=0) :
         sqrts=8000
     elif(file.find("-13-")>0) :
         sqrts=13000
     # pT min
     if(file.find("UE")>0) :
         ptmin=0.
     elif(file.find("Jets-0")>0) :
         ptmin=4.
     elif(file.find("Jets-10")>0) :
         ptmin=1900.
     elif(file.find("Jets-1")>0) :
         if( not opts.ue) :
             ptmin = 10.
         else :
             ptmin = 20.
     elif(file.find("Jets-2")>0) :
         ptmin=40.
     elif(file.find("Jets-3")>0) :
         ptmin=80.
     elif(file.find("Jets-4")>0) :
         ptmin=110.
     elif(file.find("Jets-5")>0) :
         ptmin=210.
     elif(file.find("Jets-6")>0) :
         ptmin=260.
     elif(file.find("Jets-7")>0) :
         ptmin=400.
     elif(file.find("Jets-8")>0) :
         ptmin=600.
     elif(file.find("Jets-9")>0) :
         ptmin=900.
     elif(file.find("Bottom-0")>0) :
         ptmin=0.
     elif(file.find("Bottom-1")>0 or file.find("Charm-1")>0) :
         ptmin=10.
     elif(file.find("Bottom-2")>0 or file.find("Charm-2")>0) :
         ptmin=20.
     elif(file.find("Bottom-3")>0 or file.find("Charm-3")>0) :
         ptmin=30.
     elif(file.find("Bottom-4")>0 or file.find("Charm-4")>0) :
         ptmin=70.
     elif(file.find("Bottom-5")>0 or file.find("Charm-5")>0) :
         ptmin=100.
     elif(file.find("Bottom-6")>0 or file.find("Charm-6")>0) :
         ptmin=130.
     elif(file.find("Top-SL.yoda")>0 or file.find("Top-L.yoda")>0 or \
          file.find("Top-All.yoda")>0):
         ptmin=0.
     if not os.access(file, os.R_OK):
         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("S8924791")>0 or aopath.find("S8971293")>0 or
            aopath.find("S8817804")>0 or aopath.find("I1082936")>0 or
            aopath.find("S8994773")>0 or aopath.find("S8918562")>0 or
            aopath.find("S8624100")>0 or aopath.find("S8625980")>0 or
            aopath.find("S8894728")>0 or aopath.find("S8957746")>0 or
            aopath.find("S9126244")>0 or aopath.find("S9120041")>0 or
            aopath.find("S8950903")>0 or aopath.find("S9086218")>0 or
            aopath.find("S9088458")>0 or aopath.find("I919017" )>0 or
            aopath.find("I926145" )>0 or aopath.find("S8941262")>0 or
            aopath.find("S8973270")>0 or aopath.find("I1118269")>0 or
            aopath.find("I1188891")>0 or aopath.find("I1082009")>0 or
            aopath.find("I1087342")>0 or aopath.find("S9035664")>0 or
            aopath.find("I1125575")>0 or aopath.find("I1094564")>0 or
            aopath.find("I930220" )>0 or aopath.find("I1224539")>0 or
            aopath.find("I1273574")>0 or aopath.find("I1261026")>0 or
            aopath.find("I1307243")>0 or aopath.find("I1325553")>0 or
            aopath.find("I1298810")>0 or aopath.find("I1298811")>0 or
            aopath.find("I1208923")>0 or aopath.find("I1305624")>0 or
            aopath.find("I1419070")>0 or aopath.find("I1394679")>0 or
            aopath.find("I929691" )>0 or aopath.find("I1393758")>0 or
            aopath.find("I1459051")>0 or aopath.find("I1487277")>0 or
            aopath.find("I1421646")>0 or aopath.find("I1111014")>0 or
            aopath.find("I1605749")>0 or aopath.find("I1682495")>0 or
            aopath.find("I1609253")>0 or aopath.find("1385107" )>0 or
            aopath.find("I1486238")>0 or aopath.find("1634970" )>0 or
+           aopath.find("I1604271")>0 or aopath.find("I1598460")>0 or
+           aopath.find("1724098" )>0 or
            aopath.find("ATLAS_2016_CONF_2016_092")>0 or
            aopath.find("CMS_2012_PAS_QCD_11_010")>0) :
            if("1419070" in aopath and ("forward" in aopath or "central" in aopath )) :
                continue
            if not inhistos_pt.has_key(aopath):
                inhistos_pt[aopath] = {}
            tmpE = inhistos_pt[aopath]
            if not tmpE.has_key(sqrts):
                tmpE[sqrts] = {}
            if not tmpE[sqrts].has_key(ptmin):
                tmpE[sqrts][ptmin] = ao
            else:
                tmpE[sqrts][ptmin] += ao
                #raise Exception("A set with ptmin = %s already exists" % ( ptmin))
         else :
             if("1509919" in aopath and "Ctr_cut" in aopath) :
                 continue
             elif "I1393758" in aopath and ("d02" in aopath or "d04" in aopath or
                                            "d06" in aopath or "d08" in aopath or
                                            "d10" in aopath or "d12" in aopath) :
                 continue
             elif "1387176" in aopath and "y02" in aopath:
                 continue
             elif "1454211" in aopath and "cutflow" in aopath :
                 continue
             elif("ATLAS_2016_I1468168" in aopath) :
                 newPath=aopath.replace("Passed_events","d02-x01-y01")
                 outhistos[newPath] = ao
                 ao.setPath(newPath)
             elif(aopath.find("I1243871")>0) :
                 if(aopath.find("x01")>0 and file.find("-7-Top-L.yoda")>0 ) :
                     outhistos[aopath] = ao
                 elif(aopath.find("x02")>0 and file.find("-7-Top-SL.yoda")>0 ) :
                     outhistos[aopath] = ao
             elif(aopath.find("1467230")>0 or aopath.find("1419652")>0) :
                 if(aopath.find("y01")>0 and file.find("Long")>0 ) :
                     outhistos[aopath] = ao
                 elif(aopath.find("y02")>0 and file.find("Long")<0 ) :
                     outhistos[aopath] = ao
             elif("CMS_2017_I1471287" in aopath) :
                 if("CMS_2017_I1471287/d" in aopath) :
                     outhistos[aopath] = ao
             elif("ATLAS_2018_I1705857" in aopath ) :
                 ihist = int(aopath.split("/d")[1].split("-")[0])
                 if "-SL" in file :
                     if ihist in [9,10,11,12,19,20,21,22,23,24,25,26,33,34,35,36,37,38,45,46,47,48,49,50] :
                         outhistos[aopath] = ao
                 elif "-L" in file :
                     if ihist in [3,4,5,6,7,8,13,14,15,16,17,18,27,28,29,30,31,32,39,40,41,42,43,44]  :
                         outhistos[aopath] = ao
                 if ihist in [1,2] :
                     if aopath not in outhistos :
                         outhistos[aopath] = ao
                     else :
                         title=""
                         path=""
                         if hasattr(ao, 'title'):
-                            title=ao.title()
+                            title=ao.title
                         if hasattr(ao, 'path'):
                             path=ao.path()
                         temp = yoda.core.Histo1D(path,title)
                         for i in range(0,ao.numBins()) :
                             temp.addBin(ao.bins()[i].xMin(),ao.bins()[i].xMax())
                         if("-SL" in file) :
                             temp.bins()[0] += outhistos[aopath].bins()[0]
                             temp.bins()[1] += outhistos[aopath].bins()[1]
                             temp.bins()[2] += ao.bins()[2]
                             temp.bins()[3] += ao.bins()[3]
                             temp.bins()[2] += ao.bins()[2]
                             temp.bins()[3] += ao.bins()[3]
                         else :
                             temp.bins()[0] += ao.bins()[0]
                             temp.bins()[1] += ao.bins()[1]
                             temp.bins()[2] += outhistos[aopath].bins()[2]
                             temp.bins()[3] += outhistos[aopath].bins()[3]
                             temp.bins()[2] += outhistos[aopath].bins()[2]
                             temp.bins()[3] += outhistos[aopath].bins()[3]
                         outhistos[aopath] = temp
             else :
                 outhistos[aopath] = ao
 
 
 
 yodafiles=["-7-Bottom-7.yoda","-7-Bottom-8.yoda","-7-Bottom-9.yoda"]
 for i in range(1,8) :
     yodafiles.append("-7-DiJets-%1.1i-A.yoda" % i)
     yodafiles.append("-7-DiJets-%1.1i-B.yoda" % i)
     yodafiles.append("-7-DiJets-%1.1i-C.yoda" % i)
 for i in range(1,12) :
     yodafiles.append("-13-DiJets-%1.1i-A.yoda" % i)
 # for i in range(6,12) :
 #     yodafiles.append("-13-DiJets-%1.1i-B.yoda" % i)
 
 for f in yodafiles:
     file='Rivet-'+args[0]+f
     if    "-7-Jets" in file or  "-7-DiJets" in file or "-7-Bottom" in file :
         sqrts =  7000
     elif "-13-Jets" in file or "-13-DiJets" in file :
         sqrts = 13000
     if(file.find("-DiJets-2")>0) :
         mass=250
     elif(file.find("-DiJets-3")>0) :
         mass=500
     elif(file.find("-DiJets-4")>0) :
         mass=800
     elif(file.find("-DiJets-5")>0) :
         mass=1000
     elif(file.find("-DiJets-6")>0) :
         mass=1600
     elif(file.find("-DiJets-7")>0) :
         mass=2200
     elif(file.find("-DiJets-8")>0) :
         mass=2800
     elif(file.find("-DiJets-9")>0) :
         mass=3900
     elif(file.find("-DiJets-10")>0) :
         mass=4900
     elif(file.find("-DiJets-11")>0) :
         mass=5900
     elif(file.find("-DiJets-1")>0) :
         mass=100
     elif(file.find("-Bottom-7")>0) :
         mass=110
     elif(file.find("-Bottom-8")>0) :
         mass=370
     elif(file.find("-Bottom-9")>0) :
         mass=550
     elif(file.find("-Jets-1")>0) :
         mass=0
     if not os.access(file, os.R_OK):
         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("8817804")>0 or aopath.find("8968497")>0 or 
            aopath.find("1082936")>0 or aopath.find("I930220")>0 or
            aopath.find("1261026")>0 or aopath.find("1090423")>0 or
            aopath.find("1268975")>0 or aopath.find("1519995") >0 or
            aopath.find("1663452") >0 or
            aopath.find("1634970" )>0 or
            aopath.find("CMS_2013_I1208923")>0) :
            if not inhistos_mass.has_key(aopath):
                inhistos_mass[aopath] = {}
            tmpE = inhistos_mass[aopath]
            if not tmpE.has_key(sqrts):
                tmpE[sqrts] = {}
            tmpP = tmpE[sqrts]
            if not tmpP.has_key(mass):
                tmpP[mass] = ao
            else:
                print aopath
                print sqrts,mass,file
                raise Exception("A set with mass = %s already exists" % ( mass))
 
 
         
 ## Make empty output histos if needed
 for hpath,hsets in inhistos_pt.iteritems():
     if( hpath.find("8924791")>0  or 
         hpath.find("8971293")>0 or 
         hpath.find("8817804")>0 or 
         hpath.find("8968497")>0 or 
         (hpath.find("9120041")>0 and (hpath.find("d01")>0 or hpath.find("d02")>0)) or 
         hpath.find("9126244")>0 or 
         hpath.find("926145") >0 or 
         hpath.find("9086218")>0 or 
         hpath.find("1082936")>0 or 
         hpath.find("8941262")>0 or 
         hpath.find("1118269")>0 or 
         hpath.find("1087342")>0 or 
         hpath.find("1188891")>0 or
         hpath.find("919017")>0  or
         hpath.find("9035664")>0 or
         hpath.find("1125575")>0 or
         hpath.find("1094564")>0 or
         hpath.find("I930220")>0 or
         hpath.find("S9088458")>0 or 
         hpath.find("I1273574")>0 or 
         hpath.find("I1261026")>0 or 
         hpath.find("I1090423")>0 or
         hpath.find("QCD_11_010")>0 or
         hpath.find("1298811"   )>0 or
         hpath.find("I1325553"  )>0 or
         hpath.find("I1298810"  )>0 or
         hpath.find("1307243"   )>0 or
         hpath.find("I1419070")>0 or
         hpath.find("I1394679")>0 or
         hpath.find("I1487277")>0 or
+        hpath.find("I1604271")>0 or
+        hpath.find("I1598460")>0 or
         hpath.find("CMS_2013_I1208923")>0 or
         hpath.find("1393758")>0 or
         hpath.find("ATLAS_2016_CONF_2016_092")>0 or
         hpath.find("1111014")>0 or hpath.find("1385107")>0 or hpath.find("I1486238") or
         hpath.find("1459051")>0 or hpath.find("1634970")>0) :
         title=""
         path=""
         histo = hsets.values()[0].values()[0]
         if hasattr(histo, 'title'):
-            title=histo.title()
+            title=histo.title
         if hasattr(histo, 'path'):
             path=histo.path()
         if(type(histo)==yoda.core.Counter) :
             outhistos[hpath] = yoda.core.Counter(path,title)
         elif(type(histo)==yoda.core.Scatter2D) :
             outhistos[hpath] = yoda.core.Scatter2D(path,title)
         elif(type(histo)==yoda.core.Profile1D) :
             outhistos[hpath] = yoda.core.Profile1D(path,title)
             for i in range(0,histo.numBins()) :
                 outhistos[hpath].addBin(histo.bins()[i].xMin(),
                                         histo.bins()[i].xMax())
         elif(type(histo)==yoda.core.Histo1D) :
             outhistos[hpath] = yoda.core.Histo1D(path,title)
             for i in range(0,histo.numBins()) :
                 outhistos[hpath].addBin(histo.bins()[i].xMin(),
                                         histo.bins()[i].xMax())
         else :
             logging.error("Histogram %s is of unknown type" % hpath)
             sys.exit(1) 
 
 ## Make empty output histos if needed
 for hpath,hsets in inhistos_mass.iteritems():
     if(hpath.find("1268975")>0 or
        hpath.find("1634970")>0) :
         title=""
         path=""
         histo = hsets.values()[0].values()[0]
         if hasattr(histo, 'title'):
             title=histo.title()
         if hasattr(histo, 'path'):
             path=histo.path()
         if(type(histo)==yoda.core.Counter) :
             outhistos[hpath] = yoda.core.Counter(path,title)
         elif(type(histo)==yoda.core.Scatter2D) :
             outhistos[hpath] = yoda.core.Scatter2D(path,title)
         elif(type(histo)==yoda.core.Profile1D) :
             outhistos[hpath] = yoda.core.Profile1D(path,title)
             for i in range(0,histo.numBins()) :
                 outhistos[hpath].addBin(histo.bins()[i].xMin(),
                                         histo.bins()[i].xMax())
         elif(type(histo)==yoda.core.Histo1D) :
             outhistos[hpath] = yoda.core.Histo1D(path,title)
             for i in range(0,histo.numBins()) :
                 outhistos[hpath].addBin(histo.bins()[i].xMin(),
                                         histo.bins()[i].xMax())
         else :
             logging.error("Histogram %s is of unknown type" % hpath)
             sys.exit(1)
         
 
 logging.info("Processing CMS_2011_S8957746")
 useOnePt("/CMS_2011_S8957746/d01-x01-y01", "7000", "80" )
 useOnePt("/CMS_2011_S8957746/d02-x01-y01", "7000", "80" )
 useOnePt("/CMS_2011_S8957746/d03-x01-y01", "7000", "110" )
 useOnePt("/CMS_2011_S8957746/d04-x01-y01", "7000", "110" )
 useOnePt("/CMS_2011_S8957746/d05-x01-y01", "7000", "210" )
 useOnePt("/CMS_2011_S8957746/d06-x01-y01", "7000", "210" )
 
 logging.info("Processing ATLAS_2010_S8894728")
 useOnePt("/ATLAS_2010_S8894728/d01-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d01-x01-y02",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d01-x01-y03",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d02-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d02-x01-y02", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d02-x01-y03", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d03-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d03-x01-y02",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d03-x01-y03",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d04-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d04-x01-y02", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d04-x01-y03", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d05-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d06-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d07-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d08-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d09-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d09-x01-y02",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d09-x01-y03",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d10-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d10-x01-y02", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d10-x01-y03", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d11-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d11-x01-y02",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d11-x01-y03",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d12-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d12-x01-y02", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d12-x01-y03", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d13-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d13-x01-y02",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d13-x01-y03",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d13-x01-y04",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d14-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d14-x01-y02", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d14-x01-y03", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d14-x01-y04", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d15-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d15-x01-y02",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d15-x01-y03",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d15-x01-y04",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d16-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d16-x01-y02", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d16-x01-y03", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d16-x01-y04", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d17-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d17-x01-y02",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d17-x01-y03",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d18-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d18-x01-y02", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d18-x01-y03", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d19-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d19-x01-y02",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d19-x01-y03",  "900", "0" )
 useOnePt("/ATLAS_2010_S8894728/d20-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d20-x01-y02", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d20-x01-y03", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d21-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8894728/d22-x01-y01", "7000", "0" )
 
 logging.info("Processing ATLAS_2011_S8994773")
 useOnePt("/ATLAS_2011_S8994773/d01-x01-y01", "900", "0" )
 useOnePt("/ATLAS_2011_S8994773/d02-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2011_S8994773/d03-x01-y01", "900", "0" )
 useOnePt("/ATLAS_2011_S8994773/d04-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2011_S8994773/d13-x01-y01", "900", "0" )
 useOnePt("/ATLAS_2011_S8994773/d13-x01-y02", "900", "0" )
 useOnePt("/ATLAS_2011_S8994773/d13-x01-y03", "900", "0" )
 useOnePt("/ATLAS_2011_S8994773/d14-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2011_S8994773/d14-x01-y02", "7000", "0" )
 useOnePt("/ATLAS_2011_S8994773/d14-x01-y03", "7000", "0" )
 
 logging.info("Processing ALICE_2010_S8624100")
 useOnePt("/ALICE_2010_S8624100/d11-x01-y01", "900", "0" )
 useOnePt("/ALICE_2010_S8624100/d12-x01-y01", "900", "0" )
 useOnePt("/ALICE_2010_S8624100/d13-x01-y01", "900", "0" )
 useOnePt("/ALICE_2010_S8624100/d17-x01-y01","2360", "0" )
 useOnePt("/ALICE_2010_S8624100/d18-x01-y01","2360", "0" )
 useOnePt("/ALICE_2010_S8624100/d19-x01-y01","2360", "0" )
 
 logging.info("Processing ALICE_2010_S8625980")
 useOnePt("/ALICE_2010_S8625980/d03-x01-y01", "7000", "0" )
 useOnePt("/ALICE_2010_S8625980/d04-x01-y01",  "900", "0" )
 useOnePt("/ALICE_2010_S8625980/d05-x01-y01", "2360", "0" )
 useOnePt("/ALICE_2010_S8625980/d06-x01-y01", "7000", "0" )
 
 logging.info("Processing ATLAS_2010_S8918562")
 useOnePt("/ATLAS_2010_S8918562/d01-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d02-x01-y01", "2360", "0" )
 useOnePt("/ATLAS_2010_S8918562/d03-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8918562/d04-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d05-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8918562/d06-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d07-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8918562/d08-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d09-x01-y01", "2360", "0" )
 useOnePt("/ATLAS_2010_S8918562/d10-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8918562/d11-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d12-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8918562/d13-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d14-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8918562/d15-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d16-x01-y01", "2360", "0" )
 useOnePt("/ATLAS_2010_S8918562/d17-x01-y01", "7000", "0" )
 
 
 useOnePt("/ATLAS_2010_S8918562/d18-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d19-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8918562/d20-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d21-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8918562/d22-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d23-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8918562/d24-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d25-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8918562/d26-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d27-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8918562/d28-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d29-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8918562/d30-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d31-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8918562/d32-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d33-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8918562/d34-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d35-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8918562/d36-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d37-x01-y01", "7000", "0" )
 useOnePt("/ATLAS_2010_S8918562/d38-x01-y01",  "900", "0" )
 useOnePt("/ATLAS_2010_S8918562/d39-x01-y01", "7000", "0" )
 
 
 
 logging.info("Processing ATLAS_2011_S8971293")
 useOnePt("/ATLAS_2011_S8971293/d01-x01-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S8971293/d01-x01-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S8971293/d01-x01-y03", "7000", "210" )
 useOnePt("/ATLAS_2011_S8971293/d01-x01-y04", "7000", "260" )
 useOnePt("/ATLAS_2011_S8971293/d01-x01-y05", "7000", "260" )
 useOnePt("/ATLAS_2011_S8971293/d01-x01-y06", "7000", "400" )
 useOnePt("/ATLAS_2011_S8971293/d01-x01-y07", "7000", "400" )
 useOnePt("/ATLAS_2011_S8971293/d01-x01-y08", "7000", "600" )
 useOnePt("/ATLAS_2011_S8971293/d01-x01-y09", "7000", "600" )
 logging.info("Processing ATLAS_2011_S8924791")
 if( not opts.ue) :
     useOnePt("/ATLAS_2011_S8924791/d01-x01-y01", "7000", "10" )
     useOnePt("/ATLAS_2011_S8924791/d01-x01-y02", "7000", "10" )
     useOnePt("/ATLAS_2011_S8924791/d01-x02-y01", "7000", "10" )
     useOnePt("/ATLAS_2011_S8924791/d01-x02-y02", "7000", "10" )
     useOnePt("/ATLAS_2011_S8924791/d01-x03-y01", "7000", "10" )
     useOnePt("/ATLAS_2011_S8924791/d01-x03-y02", "7000", "10" )
     useOnePt("/ATLAS_2011_S8924791/d01-x04-y01", "7000", "10" )
     useOnePt("/ATLAS_2011_S8924791/d01-x04-y02", "7000", "10" )
     useOnePt("/ATLAS_2011_S8924791/d01-x05-y01", "7000", "10" )
     useOnePt("/ATLAS_2011_S8924791/d01-x05-y02", "7000", "10" )
     useOnePt("/ATLAS_2011_S8924791/d01-x06-y01", "7000", "10" )
     useOnePt("/ATLAS_2011_S8924791/d01-x06-y02", "7000", "10" )
 else :
     useOnePt("/ATLAS_2011_S8924791/d01-x01-y01", "7000", "20" )
     useOnePt("/ATLAS_2011_S8924791/d01-x01-y02", "7000", "20" )
     useOnePt("/ATLAS_2011_S8924791/d01-x02-y01", "7000", "20" )
     useOnePt("/ATLAS_2011_S8924791/d01-x02-y02", "7000", "20" )
     useOnePt("/ATLAS_2011_S8924791/d01-x03-y01", "7000", "20" )
     useOnePt("/ATLAS_2011_S8924791/d01-x03-y02", "7000", "20" )
     useOnePt("/ATLAS_2011_S8924791/d01-x04-y01", "7000", "20" )
     useOnePt("/ATLAS_2011_S8924791/d01-x04-y02", "7000", "20" )
     useOnePt("/ATLAS_2011_S8924791/d01-x05-y01", "7000", "20" )
     useOnePt("/ATLAS_2011_S8924791/d01-x05-y02", "7000", "20" )
     useOnePt("/ATLAS_2011_S8924791/d01-x06-y01", "7000", "20" )
     useOnePt("/ATLAS_2011_S8924791/d01-x06-y02", "7000", "20" )
 
 useOnePt("/ATLAS_2011_S8924791/d02-x01-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d02-x01-y02", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d02-x02-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d02-x02-y02", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d02-x03-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d02-x03-y02", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d02-x04-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d02-x04-y02", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d02-x05-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d02-x05-y02", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d02-x06-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d02-x06-y02", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d03-x01-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d03-x01-y02", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d03-x02-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d03-x02-y02", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d03-x03-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d03-x03-y02", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d03-x04-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d03-x04-y02", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d03-x05-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d03-x05-y02", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d03-x06-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d03-x06-y02", "7000", "40" )
 useOnePt("/ATLAS_2011_S8924791/d04-x01-y01", "7000", "80" )
 useOnePt("/ATLAS_2011_S8924791/d04-x01-y02", "7000", "80" )
 useOnePt("/ATLAS_2011_S8924791/d04-x02-y01", "7000", "80" )
 useOnePt("/ATLAS_2011_S8924791/d04-x02-y02", "7000", "80" )
 useOnePt("/ATLAS_2011_S8924791/d04-x03-y01", "7000", "80" )
 useOnePt("/ATLAS_2011_S8924791/d04-x03-y02", "7000", "80" )
 useOnePt("/ATLAS_2011_S8924791/d04-x04-y01", "7000", "80" )
 useOnePt("/ATLAS_2011_S8924791/d04-x04-y02", "7000", "80" )
 useOnePt("/ATLAS_2011_S8924791/d04-x05-y01", "7000", "80" )
 useOnePt("/ATLAS_2011_S8924791/d04-x05-y02", "7000", "80" )
 useOnePt("/ATLAS_2011_S8924791/d04-x06-y01", "7000", "80" )
 useOnePt("/ATLAS_2011_S8924791/d04-x06-y02", "7000", "80" )
 useOnePt("/ATLAS_2011_S8924791/d05-x01-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d05-x01-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d05-x02-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d05-x02-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d05-x03-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d05-x03-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d05-x04-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d05-x04-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d05-x05-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d05-x05-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d05-x06-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d05-x06-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d06-x01-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d06-x01-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d06-x02-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d06-x02-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d06-x03-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d06-x03-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d06-x04-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d06-x04-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d06-x05-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d06-x05-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d06-x06-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d06-x06-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S8924791/d07-x01-y01", "7000", "210" )
 useOnePt("/ATLAS_2011_S8924791/d07-x01-y02", "7000", "210" )
 useOnePt("/ATLAS_2011_S8924791/d07-x02-y01", "7000", "210" )
 useOnePt("/ATLAS_2011_S8924791/d07-x02-y02", "7000", "210" )
 useOnePt("/ATLAS_2011_S8924791/d07-x03-y01", "7000", "210" )
 useOnePt("/ATLAS_2011_S8924791/d07-x03-y02", "7000", "210" )
 useOnePt("/ATLAS_2011_S8924791/d07-x04-y01", "7000", "210" )
 useOnePt("/ATLAS_2011_S8924791/d07-x04-y02", "7000", "210" )
 useOnePt("/ATLAS_2011_S8924791/d07-x05-y01", "7000", "210" )
 useOnePt("/ATLAS_2011_S8924791/d07-x05-y02", "7000", "210" )
 useOnePt("/ATLAS_2011_S8924791/d07-x06-y01", "7000", "210" )
 useOnePt("/ATLAS_2011_S8924791/d07-x06-y02", "7000", "210" )
 useOnePt("/ATLAS_2011_S8924791/d08-x01-y01", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d08-x01-y02", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d08-x02-y01", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d08-x02-y02", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d08-x03-y01", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d08-x03-y02", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d08-x04-y01", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d08-x04-y02", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d08-x05-y01", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d08-x05-y02", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d08-x06-y01", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d08-x06-y02", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d09-x01-y01", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d09-x01-y02", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d09-x02-y01", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d09-x02-y02", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d09-x03-y01", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d09-x03-y02", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d09-x04-y01", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d09-x04-y02", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d09-x05-y01", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d09-x05-y02", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d09-x06-y01", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d09-x06-y02", "7000", "260" )
 useOnePt("/ATLAS_2011_S8924791/d10-x01-y01", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d10-x01-y02", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d10-x02-y01", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d10-x02-y02", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d10-x03-y01", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d10-x03-y02", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d10-x04-y01", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d10-x04-y02", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d10-x05-y01", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d10-x05-y02", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d10-x06-y01", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d10-x06-y02", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d11-x01-y01", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d11-x01-y02", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d11-x02-y01", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d11-x02-y02", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d11-x03-y01", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d11-x03-y02", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d11-x04-y01", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d11-x04-y02", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d11-x05-y01", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d11-x05-y02", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d11-x06-y01", "7000", "400" )
 useOnePt("/ATLAS_2011_S8924791/d11-x06-y02", "7000", "400" )
 logging.info("Processing ATLAS_2010_S8817804")
 mergeByPt("/ATLAS_2010_S8817804/d01-x01-y01", "7000")
 mergeByPt("/ATLAS_2010_S8817804/d02-x01-y01", "7000")
 mergeByPt("/ATLAS_2010_S8817804/d03-x01-y01", "7000")
 mergeByPt("/ATLAS_2010_S8817804/d04-x01-y01", "7000")
 mergeByPt("/ATLAS_2010_S8817804/d05-x01-y01", "7000")
 mergeByPt("/ATLAS_2010_S8817804/d06-x01-y01", "7000")
 mergeByPt("/ATLAS_2010_S8817804/d07-x01-y01", "7000")
 mergeByPt("/ATLAS_2010_S8817804/d08-x01-y01", "7000")
 mergeByPt("/ATLAS_2010_S8817804/d09-x01-y01", "7000")
 mergeByPt("/ATLAS_2010_S8817804/d10-x01-y01", "7000")
 
 mergeByMass("/ATLAS_2010_S8817804/d11-x01-y01", "7000")
 mergeByMass("/ATLAS_2010_S8817804/d12-x01-y01", "7000")
 mergeByMass("/ATLAS_2010_S8817804/d13-x01-y01", "7000")
 mergeByMass("/ATLAS_2010_S8817804/d14-x01-y01", "7000")
 mergeByMass("/ATLAS_2010_S8817804/d15-x01-y01", "7000")
 mergeByMass("/ATLAS_2010_S8817804/d16-x01-y01", "7000")
 mergeByMass("/ATLAS_2010_S8817804/d17-x01-y01", "7000")
 mergeByMass("/ATLAS_2010_S8817804/d18-x01-y01", "7000")
 mergeByMass("/ATLAS_2010_S8817804/d19-x01-y01", "7000")
 mergeByMass("/ATLAS_2010_S8817804/d20-x01-y01", "7000")
 
 useOneMass("/ATLAS_2010_S8817804/d21-x01-y01", "7000", "250" )
 useOneMass("/ATLAS_2010_S8817804/d22-x01-y01", "7000", "250" )
 useOneMass("/ATLAS_2010_S8817804/d23-x01-y01", "7000", "650" )
 useOneMass("/ATLAS_2010_S8817804/d24-x01-y01", "7000", "250" )
 useOneMass("/ATLAS_2010_S8817804/d25-x01-y01", "7000", "250" )
 useOneMass("/ATLAS_2010_S8817804/d26-x01-y01", "7000", "650" )
 
 
 logging.info("Processing ATLAS_2011_I930220")
 mergeByPt("/ATLAS_2011_I930220/d01-x01-y01",  "7000" )
 mergeByPt("/ATLAS_2011_I930220/d02-x01-y01",  "7000" )
 mergeByPt("/ATLAS_2011_I930220/d03-x01-y01",  "7000" )
 mergeByPt("/ATLAS_2011_I930220/d04-x01-y01",  "7000" )
 mergeByPt("/ATLAS_2011_I930220/d05-x01-y01",  "7000" )
 mergeByPt("/ATLAS_2011_I930220/d06-x01-y01",  "7000" )
 mergeByMass("/ATLAS_2011_I930220/d07-x01-y01", "7000")
 useOneMass("/ATLAS_2011_I930220/d08-x01-y01", "7000", "110" )
 useOneMass("/ATLAS_2011_I930220/d09-x01-y01", "7000", "110" )
 useOneMass("/ATLAS_2011_I930220/d10-x01-y01", "7000", "370" )
 
 logging.info("Processing ATLAS_2012_I1082936")
 mergeByPt("/ATLAS_2012_I1082936/d01-x01-y01", "7000")
 mergeByPt("/ATLAS_2012_I1082936/d01-x01-y02", "7000")
 mergeByPt("/ATLAS_2012_I1082936/d01-x01-y03", "7000")
 mergeByPt("/ATLAS_2012_I1082936/d01-x01-y04", "7000")
 mergeByPt("/ATLAS_2012_I1082936/d01-x01-y05", "7000")
 mergeByPt("/ATLAS_2012_I1082936/d01-x01-y06", "7000")
 mergeByPt("/ATLAS_2012_I1082936/d01-x01-y07", "7000")
 mergeByPt("/ATLAS_2012_I1082936/d02-x01-y01", "7000")
 mergeByPt("/ATLAS_2012_I1082936/d02-x01-y02", "7000")
 mergeByPt("/ATLAS_2012_I1082936/d02-x01-y03", "7000")
 mergeByPt("/ATLAS_2012_I1082936/d02-x01-y04", "7000")
 mergeByPt("/ATLAS_2012_I1082936/d02-x01-y05", "7000")
 mergeByPt("/ATLAS_2012_I1082936/d02-x01-y06", "7000")
 mergeByPt("/ATLAS_2012_I1082936/d02-x01-y07", "7000")
 
 mergeByMass("/ATLAS_2012_I1082936/d03-x01-y01", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d03-x01-y02", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d03-x01-y03", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d03-x01-y04", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d03-x01-y05", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d03-x01-y06", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d03-x01-y07", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d03-x01-y08", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d03-x01-y09", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d04-x01-y01", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d04-x01-y02", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d04-x01-y03", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d04-x01-y04", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d04-x01-y05", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d04-x01-y06", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d04-x01-y07", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d04-x01-y08", "7000", 1000.)
 mergeByMass("/ATLAS_2012_I1082936/d04-x01-y09", "7000", 1000.)
 
 
 logging.info("Processing CMS_2011_S8968497")
 
 useOneMass("/CMS_2011_S8968497/d01-x01-y01", "7000", "1700" )
 useOneMass("/CMS_2011_S8968497/d02-x01-y01", "7000", "1700" )
 useOneMass("/CMS_2011_S8968497/d03-x01-y01", "7000", "1100" )
 useOneMass("/CMS_2011_S8968497/d04-x01-y01", "7000", "1100" )
 useOneMass("/CMS_2011_S8968497/d05-x01-y01", "7000", "650" )
 useOneMass("/CMS_2011_S8968497/d06-x01-y01", "7000", "650" )
 useOneMass("/CMS_2011_S8968497/d07-x01-y01", "7000", "250" )
 useOneMass("/CMS_2011_S8968497/d08-x01-y01", "7000", "250" )
 useOneMass("/CMS_2011_S8968497/d09-x01-y01", "7000", "250" )
 
 
 logging.info("Processing ATLAS_2011_S9126244")
 mergeByPt("/ATLAS_2011_S9126244/d01-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9126244/d01-x01-y02", "7000")
 mergeByPt("/ATLAS_2011_S9126244/d02-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9126244/d02-x01-y02", "7000")
 mergeByPt("/ATLAS_2011_S9126244/d03-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9126244/d03-x01-y02", "7000")
 mergeByPt("/ATLAS_2011_S9126244/d04-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9126244/d04-x01-y02", "7000")
 mergeByPt("/ATLAS_2011_S9126244/d05-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9126244/d05-x01-y02", "7000")
 
 
 useOnePt("/ATLAS_2011_S9126244/d06-x01-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S9126244/d06-x01-y02", "7000", "40" )
 useOnePt("/ATLAS_2011_S9126244/d07-x01-y01", "7000", "80" )
 useOnePt("/ATLAS_2011_S9126244/d07-x01-y02", "7000", "80" )
 useOnePt("/ATLAS_2011_S9126244/d08-x01-y01", "7000", "80" )
 useOnePt("/ATLAS_2011_S9126244/d08-x01-y02", "7000", "80" )
 useOnePt("/ATLAS_2011_S9126244/d09-x01-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d09-x01-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d10-x01-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d10-x01-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d11-x01-y01", "7000", "210" )
 useOnePt("/ATLAS_2011_S9126244/d11-x01-y02", "7000", "210" )
 useOnePt("/ATLAS_2011_S9126244/d12-x01-y01", "7000", "210" )
 useOnePt("/ATLAS_2011_S9126244/d12-x01-y02", "7000", "210" )
 useOnePt("/ATLAS_2011_S9126244/d13-x01-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S9126244/d13-x01-y02", "7000", "40" )
 useOnePt("/ATLAS_2011_S9126244/d14-x01-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S9126244/d14-x01-y02", "7000", "40" )
 useOnePt("/ATLAS_2011_S9126244/d15-x01-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d15-x01-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d16-x01-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d16-x01-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d17-x01-y01", "7000", "210" )
 useOnePt("/ATLAS_2011_S9126244/d17-x01-y02", "7000", "210" )
 useOnePt("/ATLAS_2011_S9126244/d18-x01-y01", "7000", "210" )
 useOnePt("/ATLAS_2011_S9126244/d18-x01-y02", "7000", "210" )
 useOnePt("/ATLAS_2011_S9126244/d19-x01-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S9126244/d20-x01-y01", "7000", "80" )
 useOnePt("/ATLAS_2011_S9126244/d21-x01-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d22-x01-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d23-x01-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d24-x01-y01", "7000", "210" )
 useOnePt("/ATLAS_2011_S9126244/d25-x01-y01", "7000", "210" )
 mergeByPt("/ATLAS_2011_S9126244/d26-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9126244/d26-x01-y02", "7000")
 mergeByPt("/ATLAS_2011_S9126244/d27-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9126244/d27-x01-y02", "7000")
 mergeByPt("/ATLAS_2011_S9126244/d28-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9126244/d28-x01-y02", "7000")
 mergeByPt("/ATLAS_2011_S9126244/d29-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9126244/d29-x01-y02", "7000")
 useOnePt("/ATLAS_2011_S9126244/d30-x01-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S9126244/d31-x01-y01", "7000", "80" )
 useOnePt("/ATLAS_2011_S9126244/d32-x01-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d33-x01-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d34-x01-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d35-x01-y01", "7000", "210" )
 useOnePt("/ATLAS_2011_S9126244/d36-x01-y01", "7000", "210" )
 useOnePt("/ATLAS_2011_S9126244/d37-x01-y01", "7000", "40" )
 useOnePt("/ATLAS_2011_S9126244/d37-x01-y02", "7000", "40" )
 useOnePt("/ATLAS_2011_S9126244/d38-x01-y01", "7000", "80" )
 useOnePt("/ATLAS_2011_S9126244/d38-x01-y02", "7000", "80" )
 useOnePt("/ATLAS_2011_S9126244/d39-x01-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d39-x01-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d40-x01-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d40-x01-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d41-x01-y01", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d41-x01-y02", "7000", "110" )
 useOnePt("/ATLAS_2011_S9126244/d42-x01-y01", "7000", "210" )
 useOnePt("/ATLAS_2011_S9126244/d42-x01-y02", "7000", "210" )
 useOnePt("/ATLAS_2011_S9126244/d43-x01-y01", "7000", "210" )
 useOnePt("/ATLAS_2011_S9126244/d43-x01-y02", "7000", "210" )
 
 # CMS_2011_S9120041 UE analysis
 logging.info("Processing CMS_2011_S9120041")
 mergeByPt("/CMS_2011_S9120041/d01-x01-y01", "7000")
 mergeByPt("/CMS_2011_S9120041/d02-x01-y01", "7000")
 if(opts.ue) :
     useOnePt("/CMS_2011_S9120041/d03-x01-y01",  "900", "0" )
     useOnePt("/CMS_2011_S9120041/d04-x01-y01",  "900", "0" )
     useOnePt("/CMS_2011_S9120041/d05-x01-y01", "7000", "0" )
     useOnePt("/CMS_2011_S9120041/d06-x01-y01", "7000", "0" )
     useOnePt("/CMS_2011_S9120041/d07-x01-y01", "7000", "0" )
     useOnePt("/CMS_2011_S9120041/d11-x01-y01",  "900", "0" )
     useOnePt("/CMS_2011_S9120041/d12-x01-y01",  "900", "0" )
     useOnePt("/CMS_2011_S9120041/d13-x01-y01",  "900", "0" )
     useOnePt("/CMS_2011_S9120041/d08-x01-y01", "7000", "20" )
     useOnePt("/CMS_2011_S9120041/d09-x01-y01", "7000", "20" )
     useOnePt("/CMS_2011_S9120041/d10-x01-y01", "7000", "20" )
 else :
     useOnePt("/CMS_2011_S9120041/d08-x01-y01", "7000", "10" )
     useOnePt("/CMS_2011_S9120041/d09-x01-y01", "7000", "10" )
     useOnePt("/CMS_2011_S9120041/d10-x01-y01", "7000", "10" )
 
 # CMS dijet decorrelation
 logging.info("Processing CMS_2011_S8950903")
 useOnePt("/CMS_2011_S8950903/d01-x01-y01", "7000", "80" )
 useOnePt("/CMS_2011_S8950903/d02-x01-y01", "7000", "110" )
 useOnePt("/CMS_2011_S8950903/d03-x01-y01", "7000", "110" )
 useOnePt("/CMS_2011_S8950903/d04-x01-y01", "7000", "210" )
 useOnePt("/CMS_2011_S8950903/d05-x01-y01", "7000", "260" )
 
 # CMS jet cross section
 logging.info("Processing CMS_2011_S9086218")
 mergeByPt("/CMS_2011_S9086218/d01-x01-y01", "7000")
 mergeByPt("/CMS_2011_S9086218/d02-x01-y01", "7000")
 mergeByPt("/CMS_2011_S9086218/d03-x01-y01", "7000")
 mergeByPt("/CMS_2011_S9086218/d04-x01-y01", "7000")
 mergeByPt("/CMS_2011_S9086218/d05-x01-y01", "7000")
 mergeByPt("/CMS_2011_S9086218/d06-x01-y01", "7000")
 
 # CMS 2/3 jet cross section ratio
 logging.info("Processing CMS_2011_S9086218")
 mergeByPt("/CMS_2011_S9088458/d01-x01-y01", "7000",500.)
 
 # ATLAS track jet
 logging.info("Processing ATLAS_2011_I919017")
 for d in range(1,3) :
     for y in range(1,5) :
         mergeByPt("/ATLAS_2011_I919017/d0%s-x01-y0%s" % (d,y), "7000")
         if( opts.ue) :
             for x in range(2,6) :
                 for y in ["01","02","06","07","11","12","16","17","21","22"] :
                     useOnePt("/ATLAS_2011_I919017/d0%s-x0%s-y%s" % (d,x,y),  "7000",  "0" )
                 for y in ["03","04","08","09","13","14","18","19","23","24"] :
                     useOnePt("/ATLAS_2011_I919017/d0%s-x0%s-y%s" % (d,x,y),  "7000",  "4" )
                 for y in range(5,30,5) :
                     useOnePt("/ATLAS_2011_I919017/d0%s-x%02d-y%02d" % (d,x,y) ,  "7000", "20" )
         else :
             for x in range(2,6) :
                 for y in range(5,30,5) :
                     useOnePt("/ATLAS_2011_I919017/d0%s-x%02d-y%02d" % (d,x,y) ,  "7000", "10" )
 
 logging.info("Processing ATLAS_2011_I926145")
 mergeByPt("/ATLAS_2011_I926145/d01-x01-y01", "7000",1.5)
 mergeByPt("/ATLAS_2011_I926145/d02-x01-y01", "7000",1.5)
 mergeByPt("/ATLAS_2011_I926145/d03-x01-y01", "7000",1.5)
 
 logging.info("Processing CMS_2011_S8941262")
 useOnePt("/CMS_2011_S8941262/d01-x01-y01",  "7000", "10" )
 useOnePt("/CMS_2011_S8941262/d03-x01-y01",  "7000", "10" )
 mergeByPt("/CMS_2011_S8941262/d02-x01-y01", "7000",1.5)
 
 logging.info("Processing CMS_2011_S8973270")
 useOnePt("/CMS_2011_S8973270/d01-x01-y01",  "7000", "70" )
 useOnePt("/CMS_2011_S8973270/d02-x01-y01",  "7000", "100" )
 useOnePt("/CMS_2011_S8973270/d03-x01-y01",  "7000", "130" )
 useOnePt("/CMS_2011_S8973270/d04-x01-y01",  "7000", "70" )
 useOnePt("/CMS_2011_S8973270/d05-x01-y01",  "7000", "100" )
 useOnePt("/CMS_2011_S8973270/d06-x01-y01",  "7000", "130" )
 
 logging.info("Processing ATLAS_2012_I1082009")
 useOnePt("/ATLAS_2012_I1082009/d08-x01-y01", "7000", "40" )
 useOnePt("/ATLAS_2012_I1082009/d09-x01-y01", "7000", "40" )
 useOnePt("/ATLAS_2012_I1082009/d10-x01-y01", "7000", "40" )
 useOnePt("/ATLAS_2012_I1082009/d11-x01-y01", "7000", "80" )
 useOnePt("/ATLAS_2012_I1082009/d12-x01-y01", "7000", "80" )
 useOnePt("/ATLAS_2012_I1082009/d13-x01-y01", "7000", "40" )
 
 logging.info("Processing ATLAS_2012_I1118269")
 mergeByPt("/ATLAS_2012_I1118269/d01-x01-y01", "7000")
 useOnePt("/ATLAS_2012_I1118269/d02-x01-y01", "7000", "10" )
 
 logging.info("Processing ATLAS_2012_I1188891")
 mergeByPt("/ATLAS_2012_I1188891/d01-x01-y01", "7000")
 mergeByPt("/ATLAS_2012_I1188891/d02-x01-y01", "7000")
 mergeByPt("/ATLAS_2012_I1188891/d03-x01-y01", "7000")
 mergeByPt("/ATLAS_2012_I1188891/d04-x01-y01", "7000")
 mergeByPt("/ATLAS_2012_I1188891/d05-x01-y01", "7000")
 mergeByPt("/ATLAS_2012_I1188891/d06-x01-y01", "7000")
 
 logging.info("Processing CMS_2012_I1087342")
 mergeByPt("/CMS_2012_I1087342/d01-x01-y01", "7000")
 mergeByPt("/CMS_2012_I1087342/d02-x01-y01", "7000")
 mergeByPt("/CMS_2012_I1087342/d03-x01-y01", "7000")
 logging.info("Processing CMS_2012_PAS_QCD_11_010")
 mergeByPt("/CMS_2012_PAS_QCD_11_010/d01-x01-y01", "7000")
 mergeByPt("/CMS_2012_PAS_QCD_11_010/d02-x01-y01", "7000")
 mergeByPt("/CMS_2012_PAS_QCD_11_010/d03-x01-y01", "7000")
 mergeByPt("/CMS_2012_PAS_QCD_11_010/d04-x01-y01", "7000")
 
 logging.info("Processing ATLAS_2011_S9035664")
 mergeByPt("/ATLAS_2011_S9035664/d11-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9035664/d12-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9035664/d13-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9035664/d14-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9035664/d15-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9035664/d16-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9035664/d17-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9035664/d18-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9035664/d20-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9035664/d21-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9035664/d22-x01-y01", "7000")
 mergeByPt("/ATLAS_2011_S9035664/d23-x01-y01", "7000")
 
 logging.info("Processing ATLAS_2012_I1125575")
 mergeByPt("/ATLAS_2012_I1125575/d01-x01-y01", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d01-x01-y02", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d01-x02-y01", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d01-x02-y02", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d01-x03-y01", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d01-x03-y02", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d01-x04-y01", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d01-x04-y02", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d01-x05-y01", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d01-x05-y02", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d02-x01-y01", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d02-x01-y02", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d02-x02-y01", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d02-x02-y02", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d02-x03-y01", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d02-x03-y02", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d02-x04-y01", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d02-x04-y02", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d02-x05-y01", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d02-x05-y02", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d03-x01-y01", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d03-x01-y02", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d03-x02-y01", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d03-x02-y02", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d03-x03-y01", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d03-x03-y02", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d03-x04-y01", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d03-x04-y02", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d03-x05-y01", "7000")
 mergeByPt("/ATLAS_2012_I1125575/d03-x05-y02", "7000")
 for d in range(4,7) :
     for x in range(1,6) :
         if(opts.ue) :
             for y in range(1,9) :
                 useOnePt("/ATLAS_2012_I1125575/d0%s-x0%s-y0%s" % (d,x,y),  "7000", "0" )
             for y in ["09","10","11","12","13","14","15","16"] :
                 useOnePt("/ATLAS_2012_I1125575/d0%s-x0%s-y%s" % (d,x,y),  "7000", "0" )
             for y in range(17,19) :
                 useOnePt("/ATLAS_2012_I1125575/d0%s-x0%s-y%s" % (d,x,y),  "7000", "20" )
         else :
             for y in range(17,19) :
                 useOnePt("/ATLAS_2012_I1125575/d0%s-x0%s-y%s" % (d,x,y),  "7000", "10" )
         for y in range(19,21) :
             useOnePt("/ATLAS_2012_I1125575/d0%s-x0%s-y%s" % (d,x,y),  "7000", "40" )
 
 # ATLAS_2012_I1094564
 useOnePt("/ATLAS_2012_I1094564/d01-x01-y01",  "7000", "210" )
 useOnePt("/ATLAS_2012_I1094564/d02-x01-y01",  "7000", "260" )
 useOnePt("/ATLAS_2012_I1094564/d03-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d04-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d05-x01-y01",  "7000", "210" )
 useOnePt("/ATLAS_2012_I1094564/d06-x01-y01",  "7000", "260" )
 useOnePt("/ATLAS_2012_I1094564/d07-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d08-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d09-x01-y01",  "7000", "210" )
 useOnePt("/ATLAS_2012_I1094564/d10-x01-y01",  "7000", "260" )
 useOnePt("/ATLAS_2012_I1094564/d11-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d12-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d13-x01-y01",  "7000", "210" )
 useOnePt("/ATLAS_2012_I1094564/d14-x01-y01",  "7000", "260" )
 useOnePt("/ATLAS_2012_I1094564/d15-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d16-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d17-x01-y01",  "7000", "210" )
 useOnePt("/ATLAS_2012_I1094564/d18-x01-y01",  "7000", "260" )
 useOnePt("/ATLAS_2012_I1094564/d19-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d20-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d21-x01-y01",  "7000", "210" )
 useOnePt("/ATLAS_2012_I1094564/d22-x01-y01",  "7000", "260" )
 useOnePt("/ATLAS_2012_I1094564/d23-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d24-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d25-x01-y01",  "7000", "210" )
 useOnePt("/ATLAS_2012_I1094564/d26-x01-y01",  "7000", "260" )
 useOnePt("/ATLAS_2012_I1094564/d27-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d28-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d29-x01-y01",  "7000", "210" )
 useOnePt("/ATLAS_2012_I1094564/d30-x01-y01",  "7000", "260" )
 useOnePt("/ATLAS_2012_I1094564/d31-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d32-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d33-x01-y01",  "7000", "210" )
 useOnePt("/ATLAS_2012_I1094564/d34-x01-y01",  "7000", "260" )
 useOnePt("/ATLAS_2012_I1094564/d35-x01-y01",  "7000", "400" )
 useOnePt("/ATLAS_2012_I1094564/d36-x01-y01",  "7000", "400" )
 
 logging.info("Processing CMS_2013_I1224539_DIJET")
 useOnePt("/CMS_2013_I1224539_DIJET/d01-x01-y01",  "7000", "210" )
 useOnePt("/CMS_2013_I1224539_DIJET/d02-x01-y01",  "7000", "260" )
 useOnePt("/CMS_2013_I1224539_DIJET/d03-x01-y01",  "7000", "400" )
 useOnePt("/CMS_2013_I1224539_DIJET/d04-x01-y01",  "7000", "400" )
 useOnePt("/CMS_2013_I1224539_DIJET/d05-x01-y01",  "7000", "600" )
 useOnePt("/CMS_2013_I1224539_DIJET/d06-x01-y01",  "7000", "600" )
 useOnePt("/CMS_2013_I1224539_DIJET/d07-x01-y01",  "7000", "600" )
 useOnePt("/CMS_2013_I1224539_DIJET/d08-x01-y01",  "7000", "210" )
 useOnePt("/CMS_2013_I1224539_DIJET/d09-x01-y01",  "7000", "260" )
 useOnePt("/CMS_2013_I1224539_DIJET/d10-x01-y01",  "7000", "400" )
 useOnePt("/CMS_2013_I1224539_DIJET/d11-x01-y01",  "7000", "400" )
 useOnePt("/CMS_2013_I1224539_DIJET/d12-x01-y01",  "7000", "600" )
 useOnePt("/CMS_2013_I1224539_DIJET/d13-x01-y01",  "7000", "600" )
 useOnePt("/CMS_2013_I1224539_DIJET/d14-x01-y01",  "7000", "600" )
 useOnePt("/CMS_2013_I1224539_DIJET/d15-x01-y01",  "7000", "210" )
 useOnePt("/CMS_2013_I1224539_DIJET/d16-x01-y01",  "7000", "260" )
 useOnePt("/CMS_2013_I1224539_DIJET/d17-x01-y01",  "7000", "400" )
 useOnePt("/CMS_2013_I1224539_DIJET/d18-x01-y01",  "7000", "400" )
 useOnePt("/CMS_2013_I1224539_DIJET/d19-x01-y01",  "7000", "600" )
 useOnePt("/CMS_2013_I1224539_DIJET/d20-x01-y01",  "7000", "600" )
 useOnePt("/CMS_2013_I1224539_DIJET/d21-x01-y01",  "7000", "600" )
 useOnePt("/CMS_2013_I1224539_DIJET/d22-x01-y01",  "7000", "210" )
 useOnePt("/CMS_2013_I1224539_DIJET/d23-x01-y01",  "7000", "260" )
 useOnePt("/CMS_2013_I1224539_DIJET/d24-x01-y01",  "7000", "400" )
 useOnePt("/CMS_2013_I1224539_DIJET/d25-x01-y01",  "7000", "600" )
 useOnePt("/CMS_2013_I1224539_DIJET/d26-x01-y01",  "7000", "600" )
 useOnePt("/CMS_2013_I1224539_DIJET/d27-x01-y01",  "7000", "600" )
 useOnePt("/CMS_2013_I1224539_DIJET/d28-x01-y01",  "7000", "600" )
 
 useOnePt("/CMS_2013_I1273574/d01-x01-y01",  "7000", "80" )
 mergeByPt("/CMS_2013_I1273574/d02-x01-y01", "7000",1.)
 useOnePt("/CMS_2013_I1273574/d03-x01-y01",  "7000", "80" )
 useOnePt("/CMS_2013_I1273574/d04-x01-y01",  "7000", "80" )
 useOnePt("/CMS_2013_I1273574/d05-x01-y01",  "7000", "80" )
 useOnePt("/CMS_2013_I1273574/d06-x01-y01",  "7000", "80" )
 mergeByPt("/CMS_2013_I1273574/d07-x01-y01", "7000",1.)
 useOnePt("/CMS_2013_I1273574/d08-x01-y01",  "7000", "80" )
 mergeByPt("/CMS_2013_I1273574/d09-x01-y01", "7000",1.)
 useOnePt("/CMS_2013_I1273574/d10-x01-y01",  "7000", "80" )
 mergeByPt("/CMS_2013_I1273574/d11-x01-y01", "7000",1.)
 
 useOnePt("/CMS_2013_I1261026/d01-x01-y01",  "7000", "0" )
 useOnePt("/CMS_2013_I1261026/d02-x01-y01",  "7000", "0" )
 useOnePt("/CMS_2013_I1261026/d03-x01-y01",  "7000", "0" )
 useOnePt("/CMS_2013_I1261026/d04-x01-y01",  "7000", "0" )
 useOnePt("/CMS_2013_I1261026/d05-x01-y01",  "7000", "0" )
 useOnePt("/CMS_2013_I1261026/d06-x01-y01",  "7000", "0" )
 useOnePt("/CMS_2013_I1261026/d07-x01-y01",  "7000", "0" )
 useOnePt("/CMS_2013_I1261026/d08-x01-y01",  "7000", "0" )
 useOnePt("/CMS_2013_I1261026/d09-x01-y01",  "7000", "0" )
 useOnePt("/CMS_2013_I1261026/d10-x01-y01",  "7000", "0" )
 useOnePt("/CMS_2013_I1261026/d11-x01-y01",  "7000", "0" )
 useOnePt("/CMS_2013_I1261026/d12-x01-y01",  "7000", "0" )
 useOnePt("/CMS_2013_I1261026/d13-x01-y01",  "7000", "0" )
 useOnePt("/CMS_2013_I1261026/d14-x01-y01",  "7000", "0" )
 useOnePt("/CMS_2013_I1261026/d15-x01-y01",  "7000", "0" )
 useOnePt("/CMS_2013_I1261026/d16-x01-y01",  "7000", "0" )
 useOnePt("/CMS_2013_I1261026/d17-x01-y01",  "7000", "0" )
 
 
 logging.info("Processing CMS_2012_I1090423")
 useOneMass("/CMS_2012_I1090423/d01-x01-y01", "7000", "2900" )
 useOneMass("/CMS_2012_I1090423/d02-x01-y01", "7000", "2300" )
 useOneMass("/CMS_2012_I1090423/d03-x01-y01", "7000", "1700" )
 useOneMass("/CMS_2012_I1090423/d04-x01-y01", "7000", "1100" )
 useOneMass("/CMS_2012_I1090423/d05-x01-y01", "7000", "1100" )
 useOneMass("/CMS_2012_I1090423/d06-x01-y01", "7000", "650" )
 useOneMass("/CMS_2012_I1090423/d07-x01-y01", "7000", "650" )
 useOneMass("/CMS_2012_I1090423/d08-x01-y01", "7000", "250" )
 useOneMass("/CMS_2012_I1090423/d09-x01-y01", "7000", "250" )
 
 
 logging.info("Processing ATLAS_2014_I1298811")
 mergeByPt("/ATLAS_2014_I1298811/d01-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d01-x01-y02", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d02-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d02-x01-y02", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d03-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d03-x01-y02", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d04-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d04-x01-y02", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d05-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d05-x01-y02", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d06-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d06-x01-y02", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d07-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d07-x01-y02", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d08-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d08-x01-y02", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d09-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d09-x01-y02", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d10-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1298811/d10-x01-y02", "7000")
 useOnePt("/ATLAS_2014_I1298811/d11-x01-y01",  "7000", "0" )
 useOnePt("/ATLAS_2014_I1298811/d12-x01-y01",  "7000", "0" )
 
 useOnePt("/ATLAS_2014_I1298811/d13-x01-y01",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d13-x01-y02",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d14-x01-y01",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d14-x01-y02",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d15-x01-y01",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d15-x01-y02",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d25-x01-y01",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d25-x01-y02",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d26-x01-y01",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d26-x01-y02",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d27-x01-y01",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d27-x01-y02",  "7000", "4" )
 
 useOnePt("/ATLAS_2014_I1298811/d16-x01-y01",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d16-x01-y02",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d17-x01-y01",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d17-x01-y02",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d18-x01-y01",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d18-x01-y02",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d28-x01-y01",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d28-x01-y02",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d29-x01-y01",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d29-x01-y02",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d30-x01-y01",  "7000", "4" )
 useOnePt("/ATLAS_2014_I1298811/d30-x01-y02",  "7000", "4" )
 
 useOnePt("/ATLAS_2014_I1298811/d19-x01-y01",  "7000", "40" )
 useOnePt("/ATLAS_2014_I1298811/d19-x01-y02",  "7000", "40" )
 useOnePt("/ATLAS_2014_I1298811/d20-x01-y01",  "7000", "40" )
 useOnePt("/ATLAS_2014_I1298811/d20-x01-y02",  "7000", "40" )
 useOnePt("/ATLAS_2014_I1298811/d21-x01-y01",  "7000", "40" )
 useOnePt("/ATLAS_2014_I1298811/d21-x01-y02",  "7000", "40" )
 useOnePt("/ATLAS_2014_I1298811/d31-x01-y01",  "7000", "40" )
 useOnePt("/ATLAS_2014_I1298811/d31-x01-y02",  "7000", "40" )
 useOnePt("/ATLAS_2014_I1298811/d32-x01-y01",  "7000", "40" )
 useOnePt("/ATLAS_2014_I1298811/d32-x01-y02",  "7000", "40" )
 useOnePt("/ATLAS_2014_I1298811/d33-x01-y01",  "7000", "40" )
 useOnePt("/ATLAS_2014_I1298811/d33-x01-y02",  "7000", "40" )
 
 useOnePt("/ATLAS_2014_I1298811/d22-x01-y01",  "7000", "210" )
 useOnePt("/ATLAS_2014_I1298811/d22-x01-y02",  "7000", "210" )
 useOnePt("/ATLAS_2014_I1298811/d23-x01-y01",  "7000", "210" )
 useOnePt("/ATLAS_2014_I1298811/d23-x01-y02",  "7000", "210" )
 useOnePt("/ATLAS_2014_I1298811/d24-x01-y01",  "7000", "210" )
 useOnePt("/ATLAS_2014_I1298811/d24-x01-y02",  "7000", "210" )
 useOnePt("/ATLAS_2014_I1298811/d34-x01-y01",  "7000", "210" )
 useOnePt("/ATLAS_2014_I1298811/d34-x01-y02",  "7000", "210" )
 useOnePt("/ATLAS_2014_I1298811/d35-x01-y01",  "7000", "210" )
 useOnePt("/ATLAS_2014_I1298811/d35-x01-y02",  "7000", "210" )
 useOnePt("/ATLAS_2014_I1298811/d36-x01-y01",  "7000", "210" )
 useOnePt("/ATLAS_2014_I1298811/d36-x01-y02",  "7000", "210" )
 
 
 logging.info("Processing ATLAS_2014_I1268975")
 mergeByMass("/ATLAS_2014_I1268975/d01-x01-y01", "7000", 1000.)
 mergeByMass("/ATLAS_2014_I1268975/d01-x01-y02", "7000", 1000.)
 mergeByMass("/ATLAS_2014_I1268975/d01-x01-y03", "7000", 1000.)
 mergeByMass("/ATLAS_2014_I1268975/d01-x01-y04", "7000", 1000.)
 mergeByMass("/ATLAS_2014_I1268975/d01-x01-y05", "7000", 1000.)
 mergeByMass("/ATLAS_2014_I1268975/d01-x01-y06", "7000", 1000.)
 
 mergeByMass("/ATLAS_2014_I1268975/d02-x01-y01", "7000", 1000.)
 mergeByMass("/ATLAS_2014_I1268975/d02-x01-y02", "7000", 1000.)
 mergeByMass("/ATLAS_2014_I1268975/d02-x01-y03", "7000", 1000.)
 mergeByMass("/ATLAS_2014_I1268975/d02-x01-y04", "7000", 1000.)
 mergeByMass("/ATLAS_2014_I1268975/d02-x01-y05", "7000", 1000.)
 mergeByMass("/ATLAS_2014_I1268975/d02-x01-y06", "7000", 1000.)
 
 logging.info("Processing ATLAS_2014_I1307243")
 useOnePt( "/ATLAS_2014_I1307243/d01-x01-y01",  "7000", "80" )
 mergeByPt("/ATLAS_2014_I1307243/d02-x01-y01", "7000")
 useOnePt( "/ATLAS_2014_I1307243/d03-x01-y01",  "7000", "80" )
 mergeByPt("/ATLAS_2014_I1307243/d04-x01-y01", "7000")
 useOnePt( "/ATLAS_2014_I1307243/d05-x01-y01",  "7000", "80" )
 mergeByPt("/ATLAS_2014_I1307243/d06-x01-y01", "7000")
 useOnePt( "/ATLAS_2014_I1307243/d07-x01-y01",  "7000", "80" )
 mergeByPt("/ATLAS_2014_I1307243/d08-x01-y01", "7000")
 useOnePt( "/ATLAS_2014_I1307243/d09-x01-y01",  "7000", "80" )
 mergeByPt("/ATLAS_2014_I1307243/d10-x01-y01", "7000")
 useOnePt( "/ATLAS_2014_I1307243/d11-x01-y01",  "7000", "80" )
 mergeByPt("/ATLAS_2014_I1307243/d12-x01-y01", "7000")
 useOnePt( "/ATLAS_2014_I1307243/d13-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d14-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d15-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d16-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d17-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d18-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d19-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d20-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d21-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d22-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d23-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d24-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d25-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d26-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d27-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d28-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d29-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d30-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d31-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d32-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d33-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d34-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d35-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d36-x01-y01",  "7000", "80" )
 useOnePt( "/ATLAS_2014_I1307243/d37-x01-y01",  "7000", "80" )
 mergeByPt("/ATLAS_2014_I1307243/d38-x01-y01", "7000")
 useOnePt( "/ATLAS_2014_I1307243/d39-x01-y01",  "7000", "80" )
 mergeByPt("/ATLAS_2014_I1307243/d40-x01-y01", "7000")
 
 
 logging.info("Processing ATLAS_2014_I1325553")
 mergeByPt("/ATLAS_2014_I1325553/d01-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1325553/d02-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1325553/d03-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1325553/d04-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1325553/d05-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1325553/d06-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1325553/d07-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1325553/d08-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1325553/d09-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1325553/d10-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1325553/d11-x01-y01", "7000")
 mergeByPt("/ATLAS_2014_I1325553/d12-x01-y01", "7000")
 
 logging.info("Processing ATLAS_2016_I1419070")
 for i in range(1,13) :
     if(i<10) :
         mergeByPt("/ATLAS_2016_I1419070/d0%s-x01-y01" % i, "8000")
     else :
         mergeByPt("/ATLAS_2016_I1419070/d%s-x01-y01"  % i, "8000")
 
 # remake differences and sums
 for ihist in range(1,4) :
     if not ("/ATLAS_2016_I1419070/d0%s-x01-y01" % ihist) in outhistos :
         continue
     h1 = outhistos["/ATLAS_2016_I1419070/d0%s-x01-y01" % ihist  ]
     h2 = outhistos["/ATLAS_2016_I1419070/d0%s-x01-y01" % (ihist+3)]
     sstring = "/ATLAS_2016_I1419070/d%s-x01-y01"  % (9+ihist)
     dstring = "/ATLAS_2016_I1419070/d0%s-x01-y01" % (6+ihist)
     hdiff = yoda.Scatter2D(dstring,dstring)
     hsum  = yoda.Scatter2D(sstring,sstring)
     outhistos[dstring]= hdiff
     outhistos[sstring]= hsum
     for nbin in range(0,h2.numBins()) :
         bsum  = h1.bins()[nbin]+h2.bins()[nbin]
         try:
           ydiff = h2.bins()[nbin].mean()-h1.bins()[nbin].mean()
         except:
           ydiff = 0
         try:
           ysum  = bsum.mean()
           bstderr = bsum.stdErr()
         except:
           ysum  = 0
           bstderr = 0
         try:
           yerr  = math.sqrt(h1.bins()[nbin].stdErr()**2+h2.bins()[nbin].stdErr()**2)
         except:
           yerr  = 0
         x    = h1.bins()[nbin].xMid()
         xerr = 0.5*h1.bins()[nbin].xWidth()
         hdiff.addPoint(x,ydiff,xerr,yerr)
         hsum.addPoint(x,ysum ,xerr,bstderr)
 
 logging.info("Processing ATLAS_2015_I1394679")
 for i in range(1,5) :
     mergeByPt("/ATLAS_2015_I1394679/d0%s-x01-y01" % i, "8000")
 for i in range(5,11) :
     if(i<10) :
         useOnePt( "/ATLAS_2015_I1394679/d0%s-x01-y01" % i,  "8000", "110" )
     else :
         useOnePt( "/ATLAS_2015_I1394679/d%s-x01-y01" % i,  "8000", "110" )
 
 for i in range(0,4) :
     useOnePt( "/ATLAS_2015_I1394679/d%s-x01-y01" % (11+4*i),  "8000", "110" )
     useOnePt( "/ATLAS_2015_I1394679/d%s-x01-y01" % (12+4*i),  "8000", "260" )
     useOnePt( "/ATLAS_2015_I1394679/d%s-x01-y01" % (13+4*i),  "8000", "600" )
     useOnePt( "/ATLAS_2015_I1394679/d%s-x01-y01" % (14+4*i),  "8000", "900" )
 
 for i in range(0,5) :
     useOnePt( "/ATLAS_2015_I1394679/d%s-x01-y01" % (27+4*i),  "8000", "110" )
     useOnePt( "/ATLAS_2015_I1394679/d%s-x01-y01" % (28+4*i),  "8000", "260" )
     useOnePt( "/ATLAS_2015_I1394679/d%s-x01-y01" % (29+4*i),  "8000", "400" )
     useOnePt( "/ATLAS_2015_I1394679/d%s-x01-y01" % (30+4*i),  "8000", "400" )
 
 logging.info("Processing CMS_2013_I1208923")
 for i in range(1,6) :
     mergeByPt  ("/CMS_2013_I1208923/d01-x01-y0%s" % i, "7000")
     mergeByMass("/CMS_2013_I1208923/d02-x01-y0%s" % i, "7000", 1.)
 
 logging.info("Processing CMS_2014_I1298810")
 for i in range(1,19) :
     if(i<10) :
         mergeByPt("/CMS_2014_I1298810/d0"+str(i)+"-x01-y01", "7000")
     else :
         mergeByPt("/CMS_2014_I1298810/d"+str(i)+"-x01-y01", "7000")
 
 logging.info("Processing CMS_2014_I1305624")
 for x in range(1,6) :
     useOnePt( "/CMS_2014_I1305624/d01-x%02d-y01" % x,  "7000", "110" )
     useOnePt( "/CMS_2014_I1305624/d01-x%02d-y02" % x,  "7000", "110" )
     useOnePt( "/CMS_2014_I1305624/d01-x%02d-y03" % x,  "7000", "260" )
     useOnePt( "/CMS_2014_I1305624/d01-x%02d-y04" % x,  "7000", "260" )
     useOnePt( "/CMS_2014_I1305624/d01-x%02d-y05" % x,  "7000", "400" )
 
 logging.info("Processing ATLAS_2011_I929691")
 
 for x in range(0,3) :
     useOnePt( "/ATLAS_2011_I929691/d%02d-x01-y01" % (10*x+ 1),  "7000", "20" )
     useOnePt( "/ATLAS_2011_I929691/d%02d-x01-y01" % (10*x+ 2),  "7000", "40" )
     useOnePt( "/ATLAS_2011_I929691/d%02d-x01-y01" % (10*x+ 3),  "7000", "40" )
     useOnePt( "/ATLAS_2011_I929691/d%02d-x01-y01" % (10*x+ 4),  "7000", "80" )
     useOnePt( "/ATLAS_2011_I929691/d%02d-x01-y01" % (10*x+ 5),  "7000", "110" )
     useOnePt( "/ATLAS_2011_I929691/d%02d-x01-y01" % (10*x+ 6),  "7000", "110" )
     useOnePt( "/ATLAS_2011_I929691/d%02d-x01-y01" % (10*x+ 7),  "7000", "210" )
     useOnePt( "/ATLAS_2011_I929691/d%02d-x01-y01" % (10*x+ 8),  "7000", "260" )
     useOnePt( "/ATLAS_2011_I929691/d%02d-x01-y01" % (10*x+ 9),  "7000", "260" )
     useOnePt( "/ATLAS_2011_I929691/d%02d-x01-y01" % (10*x+10),  "7000", "400" )
 
 logging.info("Processing ATLAS_2015_I1393758")
 for i in range(1,13) :
     mergeByPt("/ATLAS_2015_I1393758/d%02d-x01-y01" % i, "8000")
 
 logging.info("Processing CMS_2016_I1459051")
 for i in range(1,15) :
     mergeByPt("/CMS_2016_I1459051/d%02d-x01-y01" % i, "13000")
     
 logging.info("Processing ATLAS_2016_CONF_2016_092")
 for i in range(1,7) :
     mergeByPt("/ATLAS_2016_CONF_2016_092/d%02d-x01-y01" % i, "13000")
     
 logging.info("Processing ATLAS_2017_I1609253")
 useOnePt( "/ATLAS_2017_I1609253/d01-x01-y01",  "8000", "260" )
 useOnePt( "/ATLAS_2017_I1609253/d02-x01-y01",  "8000", "260" )
 useOnePt( "/ATLAS_2017_I1609253/d03-x01-y01",  "8000", "260" )
 useOnePt( "/ATLAS_2017_I1609253/d04-x01-y01",  "8000", "260" )
 useOnePt( "/ATLAS_2017_I1609253/d05-x01-y01",  "8000", "400" )
 useOnePt( "/ATLAS_2017_I1609253/d06-x01-y01",  "8000", "400" )
 useOnePt( "/ATLAS_2017_I1609253/d07-x01-y01",  "8000", "400" )
 useOnePt( "/ATLAS_2017_I1609253/d08-x01-y01",  "8000", "400" )
 useOnePt( "/ATLAS_2017_I1609253/d09-x01-y01",  "8000", "400" )
 useOnePt( "/ATLAS_2017_I1609253/d10-x01-y01",  "8000", "400" )
 useOnePt( "/ATLAS_2017_I1609253/d11-x01-y01",  "8000", "600" )
 useOnePt( "/ATLAS_2017_I1609253/d12-x01-y01",  "8000", "600" )
 
 logging.info("Processing CMS_2016_I1487277")
 mergeByPt("/CMS_2016_I1487277/d01-x01-y01", "8000")
 mergeByPt("/CMS_2016_I1487277/d02-x01-y01", "8000")
 mergeByPt("/CMS_2016_I1487277/d03-x01-y01", "8000")
 mergeByPt("/CMS_2016_I1487277/d04-x01-y01", "8000")
 mergeByPt("/CMS_2016_I1487277/d05-x01-y01", "8000")
 mergeByPt("/CMS_2016_I1487277/d06-x01-y01", "8000")
 mergeByPt("/CMS_2016_I1487277/d07-x01-y01", "8000")
 
 logging.info("Processing CMS_2016_I1421646")
 useOnePt( "/CMS_2016_I1421646/d01-x01-y01",  "8000", "210" )
 useOnePt( "/CMS_2016_I1421646/d02-x01-y01",  "8000", "260" )
 useOnePt( "/CMS_2016_I1421646/d03-x01-y01",  "8000", "400" )
 useOnePt( "/CMS_2016_I1421646/d04-x01-y01",  "8000", "400" )
 useOnePt( "/CMS_2016_I1421646/d05-x01-y01",  "8000", "600" )
 useOnePt( "/CMS_2016_I1421646/d06-x01-y01",  "8000", "900" )
 useOnePt( "/CMS_2016_I1421646/d07-x01-y01",  "8000", "900" )
 
 
 logging.info("Processing CMS_2017_I1605749")
 for i in [1,2,3,4,5,6,7,8,9,10,13,16] :
     useOnePt("/CMS_2017_I1605749/d%02d-x01-y01" % i, "8000", "400" )
 for i in [11,14,17]:
     useOnePt("/CMS_2017_I1605749/d%02d-x01-y01" % i, "8000", "600" )
 for i in [12,15,18]:
     useOnePt("/CMS_2017_I1605749/d%02d-x01-y01" % i, "8000", "900" )
 
 def CMS_2012_I1111014_name(i,j) :
     if(i+j<100) :
         return "/CMS_2012_I1111014/d%02d-x01-y01" % (i+j)
     else :
         return "/CMS_2012_I1111014/d%03d-x01-y01" % (i+j)
 
 logging.info("Processing CMS_2012_I1111014")
 for j in [0,22,44,66,87,106]:
     for i in [1,2,3] :
         useOnePt(CMS_2012_I1111014_name(i,j), "7000", "20" )
     for i in [4,5,6,7]:
         useOnePt(CMS_2012_I1111014_name(i,j), "7000", "40" )
     for i in [8,9,10]:
         useOnePt(CMS_2012_I1111014_name(i,j), "7000", "80" )
     for i in [11,12,13,14,15,16]:
         useOnePt(CMS_2012_I1111014_name(i,j), "7000", "110" )
     for i in [17,18]:
         useOnePt(CMS_2012_I1111014_name(i,j), "7000", "210" )
     useOnePt(CMS_2012_I1111014_name(19,j), "7000", "260" )
     if(j<87) :
         for i in [20,21]:
             useOnePt(CMS_2012_I1111014_name(i,j), "7000", "400" )
     if(j<66) :
         useOnePt(CMS_2012_I1111014_name(22,j), "7000", "600" )
 
 for i in [126,127,128] :
     for j in [1,2] :
         mergeByPt("/CMS_2012_I1111014/d%03d-x01-y%02d" % (i,j), "7000")
         
 logging.info("Processing CMS_2018_I1682495")
 for i in [0,1,2,3] :
     useOnePt("/CMS_2018_I1682495/d%02d-x01-y01" % (12*i+ 1), "13000", "110" )
     useOnePt("/CMS_2018_I1682495/d%02d-x01-y01" % (12*i+ 2), "13000", "260" )
     useOnePt("/CMS_2018_I1682495/d%02d-x01-y01" % (12*i+ 3), "13000", "260" )
     useOnePt("/CMS_2018_I1682495/d%02d-x01-y01" % (12*i+ 4), "13000", "400" )
     useOnePt("/CMS_2018_I1682495/d%02d-x01-y01" % (12*i+ 5), "13000", "400" )
     useOnePt("/CMS_2018_I1682495/d%02d-x01-y01" % (12*i+ 6), "13000", "600" )
     useOnePt("/CMS_2018_I1682495/d%02d-x01-y01" % (12*i+ 7), "13000", "600" )
     useOnePt("/CMS_2018_I1682495/d%02d-x01-y01" % (12*i+ 8), "13000", "900" )
     useOnePt("/CMS_2018_I1682495/d%02d-x01-y01" % (12*i+ 9), "13000", "900" )
     useOnePt("/CMS_2018_I1682495/d%02d-x01-y01" % (12*i+10), "13000", "900" )
     useOnePt("/CMS_2018_I1682495/d%02d-x01-y01" % (12*i+11), "13000", "900" )
     useOnePt("/CMS_2018_I1682495/d%02d-x01-y01" % (12*i+12), "13000", "900" )
     
 logging.info("Processing CMS_2015_I1385107")
 for i in range(1,9) :
     mergeByPt("/CMS_2015_I1385107/d%02d-x01-y01" % i, "2760")
 
 
 logging.info("Processing CMS_2018_I1663452")
 useOneMass("/CMS_2018_I1663452/d01-x01-y01", "13000", "5900" )
 useOneMass("/CMS_2018_I1663452/d02-x01-y01", "13000", "4900" )
 useOneMass("/CMS_2018_I1663452/d03-x01-y01", "13000", "3900" )
 useOneMass("/CMS_2018_I1663452/d04-x01-y01", "13000", "3900" )
 useOneMass("/CMS_2018_I1663452/d05-x01-y01", "13000", "2800" )
 useOneMass("/CMS_2018_I1663452/d06-x01-y01", "13000", "2800" )
 useOneMass("/CMS_2018_I1663452/d07-x01-y01", "13000", "2200" )
     
 logging.info("Processing CMS_2017_I1519995")
 useOneMass("/CMS_2017_I1519995/d01-x01-y01", "13000", "3900" )
 useOneMass("/CMS_2017_I1519995/d02-x01-y01", "13000", "3900" )
 useOneMass("/CMS_2017_I1519995/d03-x01-y01", "13000", "2800" )
 useOneMass("/CMS_2017_I1519995/d04-x01-y01", "13000", "2800" )
 useOneMass("/CMS_2017_I1519995/d05-x01-y01", "13000", "2200" )
 useOneMass("/CMS_2017_I1519995/d06-x01-y01", "13000", "1600" )
 
 logging.info("Processing CMS_2016_I1486238")
 for i in [1,5,9,10,12,13,14,16,17] :
     useOnePt("/CMS_2016_I1486238/d%02d-x01-y01" % i, "7000", "20" )
 mergeByPt("/CMS_2016_I1486238/d11-x01-y01", "7000")
 mergeByPt("/CMS_2016_I1486238/d15-x01-y01", "7000")
 
 logging.info("Processing ATLAS_2018_I1634970")
 for i in range(1,7) :
     mergeByPt("/ATLAS_2018_I1634970/d%02d-x01-y01"%i, "13000")
 for i in range(7,13) :
     mergeByMass("/ATLAS_2018_I1634970/d%02d-x01-y01"%i, "13000", 1.)
-        
-        
 
 
+logging.info("Processing ATLAS_2017_I1604271")
+for i in range(1,13) :
+    mergeByPt("/ATLAS_2017_I1604271/d%02d-x01-y01" % i, "8000")
+    
+logging.info("Processing CMS_2017_I1598460")
+for i in range(1,7) :
+    mergeByPt("/CMS_2017_I1598460/d%02d-x01-y01" % i, "8000")
+
+logging.info("Processing ATLAS_2019_I1724098")
+for i in range(1,45) :
+    if(i<=6 or (i>=23 and i<=28)) :
+        useOnePt("/ATLAS_2019_I1724098/d%02d-x01-y01" % i, "13000", "400")
+    else :
+        useOnePt("/ATLAS_2019_I1724098/d%02d-x01-y01" % i, "13000", "0")
 # rescaling for semi-leptonic top decays (we only simulate 1 charge combination)
 for i in range(96,116,2) :
     rescale("/ATLAS_2018_I1656578/d%s-x01-y01" % i,2.)
 for i in range(15,29,2) :
     rescale("/ATLAS_2017_I1614149/d%s-x01-y01" % i,2.)
 for i in range(1,23,2) :
     rescale("/ATLAS_2015_I1404878/d%02d-x01-y01" % i,2.)
 rescale("/ATLAS_2015_I1397637/d01-x01-y01",2.)
 for i in range(1,22,1) :
     rescale("/ATLAS_2015_I1345452/d%02d-x01-y01" % i,2.)
 for i in range(1,10,1) :
     rescale("/ATLAS_2014_I1304688/d%02d-x01-y01" % i,2.)
 for i in range(1,82) :
     rescale("/CMS_2018_I1663958/d%02d-x01-y01" % i,2.)
 for i in range(169,173,1) :
     rescale("/CMS_2018_I1663958/d%02d-x01-y01" % i,2.)
 for i in range(8,15) :
     rescale("/CMS_2018_I1662081/d%02d-x01-y01" % i,2.)
 for i in range(1,41) :
     rescale("/CMS_2016_I1491950/d%02d-x02-y01" % i,2.)
 for i in range(1,13) :
     rescale("/CMS_2016_I1454211/d%02d-x01-y01" % i,2.)
 rescale("/CMS_2017_I1518399/d01-x01-y01",2.)
 # Choose output file
 name = args[0]+"-Jets.yoda"
 yoda.writeYODA(outhistos,name)
 sys.exit(0)
diff --git a/Tests/python/merge-SppS b/Tests/python/merge-SppS
--- a/Tests/python/merge-SppS
+++ b/Tests/python/merge-SppS
@@ -1,177 +1,176 @@
 #! /usr/bin/env python
 # import lighthisto
 import logging
 import sys
 import math
 
 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 useOne(hpath, sqrts):
     global inhistos
     global outhistos
     try:
         outhistos[hpath] =  inhistos[hpath][float(sqrts)]
     except:
         pass
 
 if __name__ == "__main__":
     import logging
     from optparse import OptionParser, OptionGroup
     parser = OptionParser(usage="%prog name")
     verbgroup = OptionGroup(parser, "Verbosity control")
     verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
                          default=logging.INFO, help="print debug (very verbose) messages")
     verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
                          default=logging.INFO, help="be very quiet")
     parser.add_option_group(verbgroup)
     (opts, args) = parser.parse_args()
     logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
 
     ## Check args
     if len(args) < 1:
         logging.error("Must specify at least the name of the files")
         sys.exit(1)
 
 #######################################
 
 name=args[0].replace("SppS","")
 yodafiles=["ISR%s-44-UE.yoda"  %name,
            "ISR%s-62-UE.yoda"  %name,
            "SppS%s-63-UE.yoda" %name,
            "ISR%s-30-UE.yoda"  %name, 
            "ISR%s-53-UE.yoda"  %name,
            "SppS%s-200-UE.yoda"%name,
            "SppS%s-500-UE.yoda"%name,
            "SppS%s-900-UE.yoda"%name,
            "SppS%s-546-UE.yoda"%name,
            "SppS%s-53-UE.yoda" %name,
            "EHS%s-UE.yoda"     %name]
            
 ## Get histos
 inhistos = {}
 outhistos={}
 for fname in yodafiles:
     file = 'Rivet-'+fname
-    print file
     if(file.find("44")>0) :
         sqrts=44
     elif(file.find("63")>0) :
         sqrts=63
     elif(file.find("30")>0) :
         sqrts=30
     elif(file.find("53")>0) :
         sqrts=53
     elif(file.find("200")>0) :
         sqrts=200
     elif(file.find("500")>0) :
         sqrts=500
     elif(file.find("900")>0) :
         sqrts=900
     elif(file.find("546")>0) :
         sqrts=546
     elif(file.find("53")>0) :
         sqrts=53
     elif(file.find("EHS")>0) :
         sqrts=math.sqrt(2.*.938*250.)
     if not os.access(file, os.R_OK):
         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("1926373")>0 or aopath.find("1867512")>0 or
            aopath.find("1583476")>0 or aopath.find("2044935")>0 or
            aopath.find("1178091")>0 ) :
             if not inhistos.has_key(aopath):
                 inhistos[aopath] = {}
             if not inhistos[aopath].has_key(sqrts):
                 inhistos[aopath][sqrts] = ao
             else:
                 raise Exception("A set with sqrts = %s already exists" % ( sqrts))
         else :
             outhistos[aopath] = ao
 
 # UA5_1989_S1926373
 useOne("/UA5_1989_S1926373/d01-x01-y01","200")
 useOne("/UA5_1989_S1926373/d02-x01-y01","900")
 useOne("/UA5_1989_S1926373/d03-x01-y01","200")
 useOne("/UA5_1989_S1926373/d04-x01-y01","200")
 useOne("/UA5_1989_S1926373/d05-x01-y01","200")
 useOne("/UA5_1989_S1926373/d06-x01-y01","200")
 useOne("/UA5_1989_S1926373/d07-x01-y01","900")
 useOne("/UA5_1989_S1926373/d08-x01-y01","900")
 useOne("/UA5_1989_S1926373/d09-x01-y01","900")
 useOne("/UA5_1989_S1926373/d10-x01-y01","900")
 useOne("/UA5_1989_S1926373/d11-x01-y01","200")
 useOne("/UA5_1989_S1926373/d12-x01-y01","900")
 # UA5_1988_S1867512
 useOne("/UA5_1988_S1867512/d02-x01-y01","200")
 useOne("/UA5_1988_S1867512/d02-x01-y02","546")
 useOne("/UA5_1988_S1867512/d02-x01-y03","900")
 useOne("/UA5_1988_S1867512/d03-x01-y01","200")
 useOne("/UA5_1988_S1867512/d03-x01-y02","546")
 useOne("/UA5_1988_S1867512/d03-x01-y03","900")
 # UA5_1986_S1583476
 useOne("/UA5_1986_S1583476/d01-x01-y01","200")
 useOne("/UA5_1986_S1583476/d01-x01-y02","200")
 useOne("/UA5_1986_S1583476/d01-x01-y03","900")
 useOne("/UA5_1986_S1583476/d01-x01-y04","900")
 useOne("/UA5_1986_S1583476/d02-x01-y01","200")
 useOne("/UA5_1986_S1583476/d02-x01-y02","200")
 useOne("/UA5_1986_S1583476/d02-x01-y03","200")
 useOne("/UA5_1986_S1583476/d02-x01-y04","200")
 useOne("/UA5_1986_S1583476/d02-x01-y05","200")
 useOne("/UA5_1986_S1583476/d02-x01-y06","200")
 useOne("/UA5_1986_S1583476/d03-x01-y01","900")
 useOne("/UA5_1986_S1583476/d03-x01-y02","900")
 useOne("/UA5_1986_S1583476/d03-x01-y03","900")
 useOne("/UA5_1986_S1583476/d03-x01-y04","900")
 useOne("/UA5_1986_S1583476/d03-x01-y05","900")
 useOne("/UA5_1986_S1583476/d03-x01-y06","900")
 useOne("/UA5_1986_S1583476/d03-x01-y07","900")
 useOne("/UA5_1986_S1583476/d03-x01-y08","900")
 useOne("/UA5_1986_S1583476/d03-x01-y09","900")
 # UA1_1990_S2044935
 useOne("/UA1_1990_S2044935/d01-x01-y01","200")
 useOne("/UA1_1990_S2044935/d01-x01-y02","500")
 useOne("/UA1_1990_S2044935/d01-x01-y03","900")
 useOne("/UA1_1990_S2044935/d02-x01-y01","200")
 useOne("/UA1_1990_S2044935/d02-x01-y02","500")
 useOne("/UA1_1990_S2044935/d02-x01-y03","900")
 useOne("/UA1_1990_S2044935/d03-x01-y01","900")
 useOne("/UA1_1990_S2044935/d04-x01-y01","900")
 useOne("/UA1_1990_S2044935/d05-x01-y01","900")
 useOne("/UA1_1990_S2044935/d06-x01-y01","200")
 useOne("/UA1_1990_S2044935/d07-x01-y01","900")
 useOne("/UA1_1990_S2044935/d08-x01-y01","63")
 useOne("/UA1_1990_S2044935/d09-x01-y01","200")
 useOne("/UA1_1990_S2044935/d10-x01-y01","500")
 useOne("/UA1_1990_S2044935/d11-x01-y01","900")
 useOne("/UA1_1990_S2044935/d12-x01-y01","200")
 useOne("/UA1_1990_S2044935/d12-x01-y02","500")
 useOne("/UA1_1990_S2044935/d12-x01-y03","900")
 # SFM_1984_S1178091
 useOne("/SFM_1984_S1178091/d01-x01-y01","30")
 useOne("/SFM_1984_S1178091/d01-x01-y02","44")
 useOne("/SFM_1984_S1178091/d01-x01-y03","53")
 useOne("/SFM_1984_S1178091/d01-x01-y04","63")
 useOne("/SFM_1984_S1178091/d02-x01-y01","30")
 useOne("/SFM_1984_S1178091/d02-x01-y02","44")
 useOne("/SFM_1984_S1178091/d02-x01-y03","53")
 useOne("/SFM_1984_S1178091/d02-x01-y04","63")
 # Choose output file
 name = args[0]+".yoda"
 # output the yoda file
 yoda.writeYODA(outhistos,name)
 sys.exit(0)
diff --git a/Tests/python/merge-Star b/Tests/python/merge-Star
--- a/Tests/python/merge-Star
+++ b/Tests/python/merge-Star
@@ -1,174 +1,171 @@
 #! /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, sourcehistosbyptmin):
     pthigh= 1e100
     ptlow =-1e100
     for pt, h in sorted(sourcehistosbyptmin.iteritems(),reverse=True):
         ptlow=pt
         if(type(desthisto)==yoda.core.Scatter2D) :
             for i in range(0,h.numPoints()) :
                 xMin = h.points()[i].x-h.points()[i].xErrs().minus
                 if( xMin >= ptlow and 
                     xMin <  pthigh ) :
                     desthisto.addPoint(h.points()[i])
         elif(type(desthisto)==yoda.core.Profile1D) :
             for i in range(0,h.numBins()) :
                 if(h.bins()[i].xMin()  >= ptlow and 
                    h.bins()[i].xMin()  <  pthigh ) :
                     desthisto.bins()[i] += h.bins()[i]
         elif(type(desthisto)==yoda.core.Histo1D) :
             for i in range(0,h.numBins()) :
                 if(h.bins()[i].xMin()  >= ptlow and 
                    h.bins()[i].xMin()  <  pthigh ) :
                     desthisto.bins()[i] += h.bins()[i]
         else :
             logging.error("Can't merge %s, unknown type" % desthisto.path)
             sys.exit(1)
         pthigh=pt
 
 def mergeByPt(hpath, sqrts):
     global inhistos
     global outhistos
     try:
         fillAbove(outhistos[hpath], inhistos[hpath][float(sqrts)])
     except:
         pass
 
 def useOnePt(hpath, sqrts, ptmin):
     global inhistos
     global outhistos
     try:
        ## Find best pT_min match
         ptmins = inhistos[hpath][float(sqrts)].keys()
         closest_ptmin = None
         for ptm in ptmins:
             if closest_ptmin is None or \
                     abs(ptm-float(ptmin)) < abs(closest_ptmin-float(ptmin)):
                 closest_ptmin = ptm
         if closest_ptmin != float(ptmin):
             logging.warning("Inexact match for requested pTmin=%s: " % ptmin + \
                                 "using pTmin=%e instead" % closest_ptmin)
         outhistos[hpath] =  inhistos[hpath][float(sqrts)][closest_ptmin]
     except:
         pass
 
 # #######################################
 
 if __name__ == "__main__":
     import logging
     from optparse import OptionParser, OptionGroup
     parser = OptionParser(usage="%prog name")
     verbgroup = OptionGroup(parser, "Verbosity control")
     verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
                          default=logging.INFO, help="print debug (very verbose) messages")
     verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
                          default=logging.INFO, help="be very quiet")
     parser.add_option_group(verbgroup)
     (opts, args) = parser.parse_args()
     logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
 
     ## Check args
     if len(args) < 1:
         logging.error("Must specify at least the name of the files")
         sys.exit(1)
 
 yodafiles=["-UE.yoda","-Jets-1.yoda","-Jets-2.yoda","-Jets-3.yoda","-Jets-4.yoda"]
 
 ## Get histos
 inhistos = {}
 outhistos={}
 weights = {}
 for f in yodafiles:
     file='Rivet-'+args[0]+f
-    print file
     if(file.find("-UE")>0) :
         sqrts=200
         ptmin=0.
     elif(file.find("-Jets-1")>0) :
         sqrts=200
         ptmin=2.
     elif(file.find("-Jets-2")>0) :
         sqrts=200
         ptmin=5.
     elif(file.find("-Jets-3")>0) :
         sqrts=200
         ptmin=26.
     elif(file.find("-Jets-4")>0) :
         sqrts=200
         ptmin=15.
 
     if not os.access(file, os.R_OK):
         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() :
-        print aopath
         if("RAW" in aopath) :continue
         if(aopath.find("6870392")>0 or aopath.find("HELEN")>0) :
             if not inhistos.has_key(aopath):
                 inhistos[aopath] = {}
             tmpE = inhistos[aopath]
             if not tmpE.has_key(sqrts):
                 tmpE[sqrts] = {}
             tmpP = tmpE[sqrts]
             if not tmpP.has_key(ptmin):
                 tmpP[ptmin] = ao
             else:
                 raise Exception("A set with ptmin = %s already exists" % ( ptmin))
         else :
             outhistos[aopath] = ao
 
 ## Make empty output histos if needed
 for hpath,hsets in inhistos.iteritems():
     if( (hpath.find("6870392")>0 and hpath.find("d02-x01-y01" )>0 ) or
         hpath.find("HELEN")>0 ) :
         title=""
         path=""
         histo = hsets.values()[0].values()[0]
         if hasattr(histo, 'title'):
             title=histo.title()
         if hasattr(histo, 'path'):
             path=histo.path()
         if(type(histo)==yoda.core.Scatter2D) :
             outhistos[hpath] = yoda.core.Scatter2D(path,title)
         elif(type(histo)==yoda.core.Profile1D) :
             outhistos[hpath] = yoda.core.Profile1D(path,title)
             for i in range(0,histo.numBins()) :
                 outhistos[hpath].addBin(histo.bins()[i].xMin(),
                                         histo.bins()[i].xMax())
         elif(type(histo)==yoda.core.Histo1D) :
             outhistos[hpath] = yoda.core.Histo1D(path,title)
             for i in range(0,histo.numBins()) :
                 outhistos[hpath].addBin(histo.bins()[i].xMin(),
                                         histo.bins()[i].xMax())
         else :
             logging.error("Histogram %s is of unknown type" % hpath)
             print hpath,type(histo)
             sys.exit(1)
 
 useOnePt("/STAR_2006_S6870392/d01-x01-y01","200","2")
 mergeByPt("/STAR_2006_S6870392/d02-x01-y01","200")
 mergeByPt("/STAR_2009_UE_HELEN/d01-x01-y01","200")
 mergeByPt("/STAR_2009_UE_HELEN/d02-x01-y01","200")
 mergeByPt("/STAR_2009_UE_HELEN/d03-x01-y01","200")
 
 # Choose output file
 name = args[0]+".yoda"
-print "write to ",name
 yoda.writeYODA(outhistos,name)
 sys.exit(0)
diff --git a/Tests/python/plot-EE b/Tests/python/plot-EE
--- a/Tests/python/plot-EE
+++ b/Tests/python/plot-EE
@@ -1,3596 +1,4447 @@
 #! /usr/bin/env python
 import glob,os,sys
 
 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)
 
 directory=args[0]
         
 header="""<html>
 <head>
 <title>{title}</title>
 <style>
       html {{ font-family: sans-serif; }}
       img {{ border: 0; }}
       a {{ text-decoration: none; font-weight: bold; }}
     </style>
             <script type="text/x-mathjax-config">
         MathJax.Hub.Config({{
           tex2jax: {{inlineMath: [["$","$"]]}}
         }});
         </script>
         <script type="text/javascript"
           src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
         </script>
         </head>
 <body><center><h1>{title}</h1></center>"""
 
 
 analyses={ "HadronDecays"     : { },
-           "TauDecays" : { "2pi"      : {},
+           "TauDecays" : { "1pi"      : {},
+                           "2pi"      : {},
                            "Kpi"      : {},
                            "KK"       : {},
                            "lnu"      : {},
                            "Keta"     : {},
                            "3pi"      : {},
                            "Kpipi"    : {},
                            "KKpi"     : {},
                            "2pieta"   : {},
                            "2pigamma" : {},
                            "3K"       : {},
                            "4pi"      : {},
                            "5pi"      : {},},
            "Charged" : {"TotalChargedMult" : { 0 : {}, 1 : {}, 4 : {}, 5 : {}, 51 : {}, 41 : {} , "C" : {} },
-                        "ChargedSpectrum" : {  0   : { "x" : {}, "p" : {}, "xi" : {}},
+                        "ChargedSpectrum" : {  0   : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}},
                                                1   : { "x" : {}, "p" : {}, "xi" : {}},
                                                2   : { "x" : {}, "p" : {}, "xi" : {}},
                                                4   : { "x" : {}, "p" : {}, "xi" : {}},
                                                5   : { "x" : {}, "p" : {}, "xi" : {}},
                                                21  : { "x" : {}, "p" : {}, "xi" : {}},
                                                "C" : { "x" : {}, "p" : {}, "xi" : {}}},
                         "ChargedRapidityThrust"          : { },
                         "ChargedpTInThrust"              : { },
                         "ChargedpTOutThrust"             : { },
                         "ChargedpTThrust"                : { },
                         "ChargedpTvsxpThrust"            : { },
                         "ChargedpTOutvsxpThrust"         : { },
                         "ChargedxFThrust"                : { },
                         "ChargedRapiditySphericity"      : { },
                         "ChargedpTInSphericity"          : { },
                         "ChargedpTOutSphericity"         : { },
                         "ChargedpLSphericity"            : { },
                         "ChargedpTSphericity"            : { },
                         "ChargedpT2Sphericity"           : { },
                         "ChargedFlowSphericity"          : { },
                         "ChargedEnergyFlowSphericity"    : { },
                         "ChargedAveragepT2inSphericity"  : { },
                         "ChargedAveragepT2outSphericity" : { },
                         "ChargedAveragepTThrust"         : { },
                         "ChargedAveragepT2Thrust"        : { },
                         "ChargedSumpTThrust"             : { },
                         "ChargedSumpT2Thrust"            : { },
                         "ChargedAveragepTSphericity"     : { },
                         "ChargedAveragepT2Sphericity"    : { },
                         "ChargedSumpTSphericity"         : { },
                         "ChargedSumpT2Sphericity"        : { },
                         "DistChargedMult"  : {0 : {}, 1 : {}, 2 : {}, 4 : {}, 5 : {} , 21 : {}, "C" :{}}},
            "IdentifiedParticle"  : { 22         : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      111        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      211        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      221        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      331        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      223        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      333        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      321        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      311        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      313        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      323        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      2212       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      413        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      423        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
+                                     10413      : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
+                                     10423      : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      3122       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      3212       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      2224       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      3312       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      3222       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      "3224B"    : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      431        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      433        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
+                                     435        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
+                                     10433      : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      3112       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      3224       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      3114       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      3324       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      3124       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      443        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
+                                     100443     : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      9010221    : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      9000211    : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      225        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      335        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      113        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      213        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      421        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      411        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
+                                     415        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      425        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      511        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
+                                     513        : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      4122       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      3334       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      4332       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      4132       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
+                                     4232       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      4112       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
+                                     4222       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      4114       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      4124       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
+                                     4312       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
+                                     4322       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
+                                     4314       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
+                                     4324       : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      14122      : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}},
                                      "321/2212" : { "x" : {}, "p" : {}, "xi" : {}, "Other" : {}, "Ratio" : {}}},
            "IdentifiedParticleFlavour" : {111        : { 1  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          4  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          5  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          41 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          51 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} } },
                                           211        : { 1  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          4  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          5  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          41 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          51 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} } },
                                           321        : { 1  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          4  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          5  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          41 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          51 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} } },
                                           311        : { 1  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          4  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          5  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          41 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          51 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} } },
                                           313        : { 1  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          4  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          5  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          41 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          51 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} } },
                                           333        : { 1  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          4  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          5  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          41 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          51 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} } },
                                           2212       : { 1  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          4  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          5  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          41 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          51 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} } },
                                           3122       : { 1  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          4  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          5  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          41 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          51 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} } },
                                           413        : { 1  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          4  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          5  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          41 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          51 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} } },
                                           "321/2212" : { 1  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          4  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          5  : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          41 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} },
                                                          51 : {"x" : {}, "xi" : {}, "p" : {}, "Ratio" : {}, "Other" : {} } },},
            "MultiplicityFlavour" : {111        : { 1 : {}, 4 : {}, 5 : {}, 41 : {}, 51 : {} },
                                     211        : { 1 : {}, 4 : {}, 5 : {}, 41 : {}, 51 : {} },
                                     321        : { 1 : {}, 4 : {}, 5 : {}, 41 : {}, 51 : {} },
                                     2212       : { 1 : {}, 4 : {}, 5 : {}, 41 : {}, 51 : {} },
                                     413        : { 1 : {}, 4 : {}, 5 : {}, 41 : {}, 51 : {} },
                                     3122       : { 1 : {}, 4 : {}, 5 : {}, 41 : {}, 51 : {} },
                                     313        : { 1 : {}, 4 : {}, 5 : {}, 41 : {}, 51 : {} },
                                     333        : { 1 : {}, 4 : {}, 5 : {}, 41 : {}, 51 : {} },
                                     311        : { 1 : {}, 4 : {}, 5 : {}, 41 : {}, 51 : {} },
                                     "321/2212" : { 1 : {}, 4 : {}, 5 : {}, 41 : {}, 51 : {} },
            }, 
            "Multiplicity"  : { 22: {}, 111 : {}, 211 : {}, 221 : {}, 331 : {}, 113 : {},9010221 : {},9000211 : {}, 213 : {},
                                223 : {}, 333 : {}, 321  : {}, 311 : {}, 411 : {}, 421 : {}, 431 : {}, 521 : {}, "511B" : {}, 531 : {}, 511 : {},
-                               313 : {}, 323 : {}, 2212 : {}, 413 : {}, 423 : {}, 433 : {}, 513 : {}, 515 : {},
-                               3122  : {}, 3312 : {}, 3212 : {}, 3112 : {}, 3114 : {}, 3324: {}, 3334 : {}, "321/2212" : {}, 4132 : {},
+                               313 : {}, 323 : {}, 2212 : {}, 413 : {}, 423 : {}, 425 : {}, 10423 : {}, 433 : {}, 10433 : {}, 513 : {}, 515 : {},
+                               3122  : {}, 3312 : {}, 3212 : {}, 3112 : {}, 3114 : {}, 3324: {}, 3334 : {}, "321/2212" : {}, 4132 : {}, 4232 : {}, 4124 : {}, 14122 : {},
                                443 : {}, 100443 : {}, 553 : {}, 20223 : {}, 20333 : {}, 20443 : {}, 225 :{}, 335 : {}, 20431 : {}, 435 : {}, 315 : {}, 325 : {},
                                3222 : {}, 2224 : {},  3224 : {}, 3114 : {}, 4122 : {}, 5122 :{}, 3124 :{}, 4222 : {}, "3222B" : {}, "3224B" : {},
            },
            "EventShapes" : { "T" : {}, "S" : {}, "D" : {}, "O" : {}, "Minor" : {}, "Major" : {},
                              "y12_dur"  : {}, "y23_dur"  : {}, "y34_dur"  : {}, "y45_dur"  : {}, "y56_dur"  : {},
                              "y12_jade" : {}, "y23_jade" : {}, "y34_jade" : {}, "y45_jade" : {}, "y56_jade" : {},
                              "HeavyJetMass" : {} , "JetMassDifference" : {} ,
                              "LightJetMass" : {}, "TotalJetMass" : {} , "EEC" : {}, "AEEC" : {} ,
                              "P" : {}, "A" : {} , "Qx" : {}, "Q21" : {}, "BW" : {}, "BT" : {}, "BN" : {},
                              "Bdiff" : {}, "C" : {},
                              "1jet_dur"  : {}, "2jet_dur"  : {}, "3jet_dur"  : {}, "4jet_dur"  : {}, "5jet_dur"  : {}, "6jet_dur"  : {},
                              "1jet_jade" : {}, "2jet_jade" : {}, "3jet_jade" : {}, "4jet_jade" : {}, "5jet_jade" : {}, "6jet_jade" : {},
                              "Moment_T":{}, "Moment_H":{},"Moment_C":{},"Moment_S":{},"Moment_L":{},"Moment_y":{},"Moment_BW":{},
                              "Moment_BN":{},"Moment_BT":{},"Moment_O":{},"Moment_M":{},"Moment_m":{},},
            "FourJet" : {"BZ" : {}, "KSW" : {}, "NR" : {}, "alpha34" : {} },
            "EventShapesFlavour" : { "T" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},
                                     "S" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},
                                     "D" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},
                                     "O" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},
                                     "Minor" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},
                                     "Major" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},
                              "y12" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},"y23" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},"y34" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},"y45" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},"y56" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}}, "HeavyJetMass" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}} , "JetMassDifference" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}} ,
                              "LightJetMass" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}}, "TotalJetMass" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}} , "EEC" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}}, "AEEC" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}} ,
                              "P" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}}, "A" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}} , "BW" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}}, "BT" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}}, "BN" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},
                              "Bdiff" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}}, "C" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},
                                     "1jet" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},"2jet" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},"3jet" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},"4jet" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},"5jet" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},"6jet" : { 1 : {}, 2 : {}, 4 : {}, 5 : {}},},
 
            "QED" : {},
+           "Polarization"  : { 213    : { "alpha" : {}, "rho00" : {}, "cos" : {}, "rho10" : {}, "rho11" : {}, "phi" : {}, "Other" : {}},
+                               223    : { "alpha" : {}, "rho00" : {}, "cos" : {}, "rho10" : {}, "rho11" : {}, "phi" : {}, "Other" : {}},
+                               413    : { "alpha" : {}, "rho00" : {}, "cos" : {}, "rho10" : {}, "rho11" : {}, "phi" : {}, "Other" : {}},
+                               513    : { "alpha" : {}, "rho00" : {}, "cos" : {}, "rho10" : {}, "rho11" : {}, "phi" : {}, "Other" : {}},
+                               3122   : { "alpha" : {}, "rho00" : {}, "cos" : {}, "rho10" : {}, "rho11" : {}, "phi" : {}, "Other" : {}},
+                               333    : { "alpha" : {}, "rho00" : {}, "cos" : {}, "rho10" : {}, "rho11" : {}, "phi" : {}, "Other" : {}},
+                               313    : { "alpha" : {}, "rho00" : {}, "cos" : {}, "rho10" : {}, "rho11" : {}, "phi" : {}, "Other" : {}},
+                               5122   : { "alpha" : {}, "rho00" : {}, "cos" : {}, "rho10" : {}, "rho11" : {}, "phi" : {}, "Other" : {}},
+                               }
 }
 particleNames = {
+    11 : "$e^-$", 13 : "$\\mu^-$",
     22 : "$\\gamma$",
     111 : "$\\pi^0$", 211 : "$\\pi^\\pm$", 221 : "$\\eta$", 331 : "$\\eta^\\prime$",
     113 : "$\\rho^0$", 213 : "$\\rho^\\pm$", 223 : "$\\omega$", 333 : "$\\phi$",
     115 : "$a_2^0$", 215 : "$a_2^\pm$", 225 : "$f_2$", 335 : "$f^\\prime_2$",
     20223 : "$f_1$", 20333 : "$f^\\prime_1$", 20113 : "$a^0_1$", 20213 : "$a^\\pm_1$",
     9010221 : "$f_0(980)$", 9000211 : "$a^\\pm_0(980)$",
     
     311 : "$K^0,\\bar{K}^0$", 321 : "$K^\\pm$",  313 : "$K^{*0},\\bar{K}^{*0}$", 323 : "$K^{*\\pm}$",
     315 : "$K^0_2,\\bar{K}^0_2$", 325 : "$K^\\pm_2$",
     411 : "$D^\\pm$", 421 : "$D^0,\\bar{D}^0$", 413: "$D^{*\\pm}$", 415 : "$D^\\pm_2$", 425 : "$D^0_2, \\bar{D}^0_2$", 423: "$D^{*0},\\bar{D}^{*0}$",
-    431 : "$D_s^\\pm$", 435 : "$D^\\pm_{s2}$", 20431 : "$D^\\pm_{s1}$", 433 : "$D_s^{*\\pm}$",
+    10423: "$D^0_1,\\bar{D}_1^0$",10413: "$D^\\pm_1",
+    431 : "$D_s^\\pm$", 435 : "$D^\\pm_{s2}$", 20431 : "$D^\\pm_{s1}$", 433 : "$D_s^{*\\pm}$", 10433 : "$D_{s1}(2536)^+$",
 
     511 : "$B^0,\\bar{B}^0$", "511B" : "$B^0,\\bar{B}^0, B^\\pm$",
     521 : "$B^\\pm$", 531 : "$B^0_s,\\bar{B}^0_s$", 513 : "$B^*$",515 : "$B^{**}$",
     
     443 : "$J/\\psi$" , 100443 : "$\\psi(2S)$", 553 : "$\Upsilon(1S)$", 20443 : "$\\chi_{c1}(1P)$",
-    441  : "$\\eta_c$", 100553 : "$\Upsilon(2S)$", 300553 : "$\Upsilon(4S)$", 445 : "$\\chi_{c2}(1P)$",
+    441  : "$\\eta_c$", 100553 : "$\Upsilon(2S)$", 200553 : "$\Upsilon(3S)$", 300553 : "$\Upsilon(4S)$", 400553 : "$\Upsilon(5S)$", 445 : "$\\chi_{c2}(1P)$",
+    120553 : "$\chi_{b1}(2S)$", 110551 : "$\chi_{b0}(2S)$", 100555 : "$\chi_{b2}(2S)$",
     30443 : "$\\psi(3770)$", 
     2212 : "$p,\\bar{p}$", 2224 : "$\\Delta^{++},\\bar{\\Delta}^{--}$",
 
     3122 : "$\\Lambda^0,\\bar{\\Lambda}^0$",
     3222 : "$\\Sigma^+,\\bar{\Sigma}^-$", "3222B" : "$\\Sigma^\\pm,\\bar{\Sigma}^\\pm$",
     3212 : "$\\Sigma^0,\\bar{\Sigma}^0$", 3112 : "$\\Sigma^-,\\bar{\Sigma}^+$",
     3224 : "$\\Sigma^{*+},\\bar{\Sigma}^{*-}$", "3224B" : "$\\Sigma^{*\\pm},\\bar{\Sigma}^{*\\pm}$",
     3214 : "$\\Sigma^{*0},\\bar{\Sigma}^{*0}$", 3114 : "$\\Sigma^{*-},\\bar{\Sigma}^{*+}$",
     3322 : "$\\Xi^0,\\bar{\\Xi}^0$", 3312 : "$\\Xi^-,\\bar{\\Xi}^+$", 3324 : "$\\Xi^{*0},\\bar{\\Xi}^{*0}$", 3314 : "$\\Xi^{*-},\\bar{\\Xi}^{*+}$",
     3334 : "$\\Omega^-,\\bar{\\Omega}^+$", 3124 : "$\\Lambda^0(1520),\\bar{\\Lambda}^0(1520)$",
 
-    4122 : "$\\Lambda_c^+,\\bar{\\Lambda}^+_c$", 4222 : "$\\Sigma_c^{++}, \\Sigma_c^{0}, \\bar{\\Sigma}_c^{++}, \\bar{\\Sigma}_c^{0}$",
-    
-    5122 : "$\\Lambda_b^0,\\bar{\\Lambda}^0_b$", 14122 : "$\\Lambda_c(2595)^+,\\bar{\\Lambda}(2595)_c^+$",
-    4124 : "$\\Lambda_c(2625)^+,\\bar{\\Lambda}(2595)_c^+$", 4112 : "$\\Sigma_c^0,\\bar{\\Sigma}_c^0$", 4114 : "$\\Sigma_c^{*0},\\bar{\\Sigma}_c^{*0}$",
-    4332 : "$\\Omega_c^0,\\bar{\\Omega}_c^0$", 4132 : "$\\Xi_c^0,\\bar{\\Xi}_c^0$",
+    4122  : "$\\Lambda_c^+,\\bar{\\Lambda}^+_c$", 4222 : "$\\Sigma_c^{++}, \\Sigma_c^{0}, \\bar{\\Sigma}_c^{++}, \\bar{\\Sigma}_c^{0}$",
+    14122 : "$\\Lambda_c(2595)^+,\\bar{\\Lambda}(2595)_c^+$", 4314 : "$\\Xi^{*0}_c$", 4324 : "$\\Xi^{*+}_c$", 4322 : "$\\Xi_c^{\\prime+}$",
+    4312  : "$\\Xi_c^{\\prime0}$",
+    5122 : "$\\Lambda_b^0,\\bar{\\Lambda}^0_b$",
+    4124 : "$\\Lambda_c(2625)^+,\\bar{\\Lambda}(2625)_c^+$", 4112 : "$\\Sigma_c^0,\\bar{\\Sigma}_c^0$", 4114 : "$\\Sigma_c^{*0},\\bar{\\Sigma}_c^{*0}$",
+    4332 : "$\\Omega_c^0,\\bar{\\Omega}_c^0$", 4132 : "$\\Xi_c^0,\\bar{\\Xi}_c^0$", 4232 : "$\\Xi_c^+,\\bar{\\Xi}_c^-$",
     "321/2212" : "$K^\\pm,p,\\bar{p}$"
     }
 # hadron species
 mLight   = [211,111,221,331,213,113,223,333,225,335,20213,20113,20223,20333,9010221, 9000111, 9000211]
 mStrange = [311,321,313,323,315,325]
-mCharm   = [411,421,413,423,425,431,433,435,20431]
+mCharm   = [411,421,413,423,415,425,20431,10413,10423,431,433,435,10433]
 mBottom  = [511,"511B",521,531,513,515]
 mccbar   = [441,443,100443,20443,30443]
-mbbbar   = [553,100553,300553]
+mbbbar   = [553,100553,200553,300553,400553,110551,120553,100555]
 bLight   = [2212,2224]
 bStrange = [3122,3222,"3222B",3212,3112,3114,3224,"3224B",3312,3322,3324,3334,3124]
-bCharm   = [4122,4112,4222,4114,4332,4132,14122,4124]
+bCharm   = [4122,4112,4222,4114,4332,4132,4232,4312,4322,14122,4124,4312,4322,4314,4324]
 bBottom  = [5122]
 # hadron decays
 modes = {}
 # neutral pion
 analyses["HadronDecays"][111] = { "Modes" : {"$\\pi^0\\to\\gamma e^+e^-$" : {} } }
 analyses["HadronDecays"][111]["Modes"]["$\\pi^0\\to\\gamma e^+e^-$"]["MC"] = ["/MC_Meson_Meson_Leptons_Decay/h2_111p_22p_11_mVf",
                                                                               "/MC_Meson_Meson_Leptons_Decay/h2_111p_22p_11_mVfbar",
                                                                               "/MC_Meson_Meson_Leptons_Decay/h2_111p_22p_11_mff"]
 # eta
 analyses["HadronDecays"][221] = { "Modes" : {"$\\eta\\to\\pi^0\\pi^0\\pi^0$"   : {},
                                              "$\\eta\\to\\pi^+\\pi^-\\pi^0$"   : {},
                                              "$\\eta\\to\\gamma e^+e^-$"       : {},
+                                             "$\\eta\\to\\gamma \\mu^+\\mu^-$" : {},
                                              "$\\eta\\to\\gamma \\pi^+\\pi^-$" : {},
                                              "$\\eta\\to\\gamma\\gamma\\pi^0$" : {} } }
 analyses["HadronDecays"][221]["Modes"]["$\\eta\\to\\pi^0\\pi^0\\pi^0$"]["MC"  ] = ["/MC_Eta_Decay/dpi0pi0_0"]
 analyses["HadronDecays"][221]["Modes"]["$\\eta\\to\\pi^+\\pi^-\\pi^0$"]["MC"  ] = ["/MC_Eta_Decay/dpi0pim_0","/MC_Eta_Decay/dpi0pip_0",
                                                                                    "/MC_Eta_Decay/dpippim_0"]
 analyses["HadronDecays"][221]["Modes"]["$\\eta\\to\\pi^+\\pi^-\\pi^0$"]["data"] = ["/KLOE2_2016_I1416990/d01-x01-y01","/KLOE2_2016_I1416990/d02-x01-y01",
                                                                                    "/KLOE2_2016_I1416990/d02-x01-y02","/KLOE2_2016_I1416990/d02-x01-y03",
                                                                                    "/KLOE2_2016_I1416990/d02-x01-y04","/KLOE2_2016_I1416990/d02-x01-y05",
                                                                                    "/KLOE2_2016_I1416990/d02-x01-y06","/KLOE2_2016_I1416990/d02-x01-y07",
                                                                                    "/KLOE2_2016_I1416990/d02-x01-y08","/KLOE2_2016_I1416990/d02-x01-y09",
                                                                                    "/KLOE2_2016_I1416990/d02-x01-y10","/KLOE2_2016_I1416990/d02-x01-y11",
                                                                                    "/KLOE2_2016_I1416990/d02-x01-y12","/KLOE2_2016_I1416990/d02-x01-y13",
                                                                                    "/KLOE2_2016_I1416990/d02-x01-y14","/KLOE2_2016_I1416990/d02-x01-y15",
                                                                                    "/KLOE2_2016_I1416990/d02-x01-y16","/KLOE2_2016_I1416990/d02-x01-y17"]
 analyses["HadronDecays"][221]["Modes"]["$\\eta\\to\\gamma e^+e^-$"]["MC"  ] = ["/MC_Meson_Meson_Leptons_Decay/h2_221p_22p_11_mVf",
                                                                                "/MC_Meson_Meson_Leptons_Decay/h2_221p_22p_11_mVfbar",
                                                                                "/MC_Meson_Meson_Leptons_Decay/h2_221p_22p_11_mff"]
 analyses["HadronDecays"][221]["Modes"]["$\\eta\\to\\gamma e^+e^-$"]["data"] = ["/A2_2017_I1486671/d01-x01-y01"]
+analyses["HadronDecays"][221]["Modes"]["$\\eta\\to\\gamma \\mu^+\\mu^-$"]["MC"  ] = ["/MC_Meson_Meson_Leptons_Decay/h2_221p_22p_13_mVf",
+                                                                                     "/MC_Meson_Meson_Leptons_Decay/h2_221p_22p_13_mVfbar",
+                                                                                     "/MC_Meson_Meson_Leptons_Decay/h2_221p_22p_13_mff"]
 analyses["HadronDecays"][221]["Modes"]["$\\eta\\to\\gamma \\pi^+\\pi^-$"]["MC"  ] = ["/MC_Eta_Decay/mpimgamma_0","/MC_Eta_Decay/mpipgamma_0",
                                                                                      "/MC_Eta_Decay/mpippim_0"  ,"/MC_Eta_Decay/photonenergy_0"]
 analyses["HadronDecays"][221]["Modes"]["$\\eta\\to\\gamma\\gamma\\pi^0$" ]["MC"  ] = ["/MC_Eta_Decay/mgammagamma_0","/MC_Eta_Decay/mpi0gamma_0"]
 # eta'
 analyses["HadronDecays"][331] = { "Modes" : {"$\\eta^\\prime\\to\\pi^0\\pi^0\\pi^0$"   : {},
                                              "$\\eta^\\prime\\to\\pi^+\\pi^-\\pi^0$"   : {},
                                              "$\\eta^\\prime\\to\\eta\\pi^0\\pi^0$"    : {},
                                              "$\\eta^\\prime\\to\\eta\\pi^+\\pi^-$"    : {},
                                              "$\\eta^\\prime\\to\\gamma e^+e^-$"       : {},
                                              "$\\eta^\\prime\\to\\gamma \\mu^+\\mu^-$"       : {},
                                              "$\\eta^\\prime\\to\\gamma \\pi^+\\pi^-$" : {},
                                              "$\\eta^\\prime\\to\\gamma\\gamma\\pi^0$" : {} } }
 analyses["HadronDecays"][331]["Modes"]["$\\eta^\\prime\\to\\gamma e^+e^-$"]["MC"  ] = ["/MC_Meson_Meson_Leptons_Decay/h2_331p_22p_11_mVf",
                                                                                        "/MC_Meson_Meson_Leptons_Decay/h2_331p_22p_11_mVfbar",
                                                                                        "/MC_Meson_Meson_Leptons_Decay/h2_331p_22p_11_mff"]
 analyses["HadronDecays"][331]["Modes"]["$\\eta^\\prime\\to\\gamma e^+e^-$"]["data"] = ["/BESIII_2015_I1364494/d01-x01-y03"]
 analyses["HadronDecays"][331]["Modes"]["$\\eta^\\prime\\to\\gamma \\mu^+\\mu^-$"]["MC"] = ["/MC_Meson_Meson_Leptons_Decay/h2_331p_22p_13_mff",
                                                                                            "/MC_Meson_Meson_Leptons_Decay/h2_331p_22p_13_mVfbar",
                                                                                            "/MC_Meson_Meson_Leptons_Decay/h2_331p_22p_13_mVf"]
 analyses["HadronDecays"][331]["Modes"]["$\\eta^\\prime\\to\\pi^+\\pi^-\\pi^0$"]["MC"] =  ["/MC_Eta_Decay/dpi0pim_1","/MC_Eta_Decay/dpippim_1",
                                                                                           "/MC_Eta_Decay/dpi0pip_1"]
 analyses["HadronDecays"][331]["Modes"]["$\\eta^\\prime\\to\\gamma \\pi^+\\pi^-$"]["MC"  ] =["/MC_Eta_Decay/mpimgamma_1","/MC_Eta_Decay/mpipgamma_1",
                                                                                             "/MC_Eta_Decay/mpippim_1","/MC_Eta_Decay/photonenergy_1"]
 analyses["HadronDecays"][331]["Modes"]["$\\eta^\\prime\\to\\gamma \\pi^+\\pi^-$"]["data"] = ["/BESIII_2018_I1641075/d01-x01-y05"]
 analyses["HadronDecays"][331]["Modes"]["$\\eta^\\prime\\to\\gamma\\gamma\\pi^0$"]["MC"  ] = ["/MC_Eta_Decay/mgammagamma_1","/MC_Eta_Decay/mpi0gamma_1"]
 analyses["HadronDecays"][331]["Modes"]["$\\eta^\\prime\\to\\pi^0\\pi^0\\pi^0$"]["MC"  ] = ["/MC_Eta_Decay/dpi0pi0_1"]
 analyses["HadronDecays"][331]["Modes"]["$\\eta^\\prime\\to\\eta\\pi^0\\pi^0$"]["MC"  ] = ["/MC_Eta_Decay/dpi0eta","/MC_Eta_Decay/dpi0pi0_2"]
 analyses["HadronDecays"][331]["Modes"]["$\\eta^\\prime\\to\\eta\\pi^+\\pi^-$"]["MC"  ] = ["/MC_Eta_Decay/dpimeta","/MC_Eta_Decay/dpipeta",
                                                                                           "/MC_Eta_Decay/dpippim_2"]
 # omega
 analyses["HadronDecays"][223] = { "Modes" : {"$\\omega\\to\\pi^+\\pi^-\\pi^0$" : {},
                                              "$\\omega\\to e^+e^-\\pi^0$"   : {},
                                              "$\\omega\\to \\mu^+\\mu^-\\pi^0$"   : {},}}
 analyses["HadronDecays"][223]["Modes"]["$\\omega\\to\\pi^+\\pi^-\\pi^0$"]["MC"] = ["/MC_OmegaPhia1_3Pion_Decay/dalitz_1","/MC_OmegaPhia1_3Pion_Decay/m0_1",
                                                                                    "/MC_OmegaPhia1_3Pion_Decay/mminus_1","/MC_OmegaPhia1_3Pion_Decay/mplus_1",
                                                                                    "/MC_OmegaPhia1_3Pion_Decay/xhist_1","/MC_OmegaPhia1_3Pion_Decay/yhist_1"]
 analyses["HadronDecays"][223]["Modes"]["$\\omega\\to e^+e^-\\pi^0$"]["MC"] = ["/MC_Meson_Meson_Leptons_Decay/h_223p_111p_11_mPf",
                                                                               "/MC_Meson_Meson_Leptons_Decay/h_223p_111p_11_mPfbar",
                                                                               "/MC_Meson_Meson_Leptons_Decay/h_223p_111p_11_mff"]
 analyses["HadronDecays"][223]["Modes"]["$\\omega\\to \\mu^+\\mu^-\\pi^0$"]["MC"] = ["/MC_Meson_Meson_Leptons_Decay/h_223p_111p_13_mPf",
                                                                                     "/MC_Meson_Meson_Leptons_Decay/h_223p_111p_13_mPfbar",
                                                                                     "/MC_Meson_Meson_Leptons_Decay/h_223p_111p_13_mff"]
 analyses["HadronDecays"][223]["Modes"]["$\\omega\\to e^+e^-\\pi^0$"]["data"] = ["/A2_2017_I1486671/d02-x01-y01"]
 # phi
 analyses["HadronDecays"][333] = { "Modes" : {"$\\phi\\to\\pi^+\\pi^-\\pi^0$"   : {},
                                              "$\\phi\\to e^+e^-\\pi^0$"        : {},
                                              "$\\phi\\to e^+e^-\\eta$"         : {},
                                              "$\\phi\\to \\mu^+\\mu-\\gamma$"         : {},
                                              "$\\phi\\to \\pi^0\\pi^0\\gamma$" : {},
-                                             "$\\phi\\to \\eta\\pi^0\\gamma$"  : {},}}
+                                             "$\\phi\\to \\eta\\pi^0\\gamma$"  : {},
+                                             "$\\phi\\to \\mu^+\\mu^-\\pi^0$"  : {},
+                                             "$\\phi\\to \\mu^+\\mu^-\\eta$"   : {},}}
 analyses["HadronDecays"][333]["Modes"]["$\\phi\\to\\pi^+\\pi^-\\pi^0$"]["MC"] = ["/MC_OmegaPhia1_3Pion_Decay/dalitz_2","/MC_OmegaPhia1_3Pion_Decay/m0_2",
                                                                                  "/MC_OmegaPhia1_3Pion_Decay/mminus_2","/MC_OmegaPhia1_3Pion_Decay/mplus_2",
                                                                                  "/MC_OmegaPhia1_3Pion_Decay/xhist_2","/MC_OmegaPhia1_3Pion_Decay/yhist_2"]
 analyses["HadronDecays"][333]["Modes"]["$\\phi\\to\\pi^+\\pi^-\\pi^0$"]["data"] = ["/SND_2001_I558279/d01-x01-y01","/SND_2001_I558279/d02-x01-y01"]
 analyses["HadronDecays"][333]["Modes"]["$\\phi\\to e^+e^-\\pi^0$"]["MC"] = ["/MC_Meson_Meson_Leptons_Decay/h_333p_111p_11_mPf",
                                                                             "/MC_Meson_Meson_Leptons_Decay/h_333p_111p_11_mPfbar",
                                                                             "/MC_Meson_Meson_Leptons_Decay/h_333p_111p_11_mff"]
 analyses["HadronDecays"][333]["Modes"]["$\\phi\\to e^+e^-\\pi^0$"]["data"] = ["/KLOE2_2016_I1416825/d01-x01-y01"]
+analyses["HadronDecays"][333]["Modes"]["$\\phi\\to \\mu^+\\mu^-\\pi^0$"]["MC"] = ["/MC_Meson_Meson_Leptons_Decay/h_333p_111p_13_mPf",
+                                                                                  "/MC_Meson_Meson_Leptons_Decay/h_333p_111p_13_mPfbar",
+                                                                                  "/MC_Meson_Meson_Leptons_Decay/h_333p_111p_13_mff"]
 analyses["HadronDecays"][333]["Modes"]["$\\phi\\to e^+e^-\\eta$"]["MC"] = ["/MC_Meson_Meson_Leptons_Decay/h_333p_221p_11_mPf",
                                                                             "/MC_Meson_Meson_Leptons_Decay/h_333p_221p_11_mPfbar",
                                                                             "/MC_Meson_Meson_Leptons_Decay/h_333p_221p_11_mff"]
 analyses["HadronDecays"][333]["Modes"]["$\\phi\\to e^+e^-\\eta$"]["data"] = ["/KLOE2_2014_I1317236/d01-x01-y01"]
+analyses["HadronDecays"][333]["Modes"]["$\\phi\\to \\mu^+\\mu^-\\eta$"]["MC"] = ["/MC_Meson_Meson_Leptons_Decay/h_333p_221p_13_mPf",
+                                                                            "/MC_Meson_Meson_Leptons_Decay/h_333p_221p_13_mPfbar",
+                                                                            "/MC_Meson_Meson_Leptons_Decay/h_333p_221p_13_mff"]
 
 analyses["HadronDecays"][333]["Modes"]["$\\phi\\to \\pi^0\\pi^0\\gamma$"]["data"] = ["/KLOE_2002_I585183/d01-x01-y01","/SND_2000_I525398/d01-x01-y01"]
 analyses["HadronDecays"][333]["Modes"]["$\\phi\\to \\eta\\pi^0\\gamma$" ]["data"] = ["/KLOE_2009_I818106/d01-x01-y01","/SND_2000_I527094/d01-x01-y01"]
 analyses["HadronDecays"][333]["Modes"]["$\\phi\\to \\mu^+\\mu-\\gamma$"]["MC"]=["/MC_Meson_Meson_Leptons_Decay/h2_333p_22p_13_mff","/MC_Meson_Meson_Leptons_Decay/h2_333p_22p_13_mVfbar",
                                                                                 "/MC_Meson_Meson_Leptons_Decay/h2_333p_22p_13_mVf"]
+
+
 # a_1+    
 analyses["HadronDecays"][20213] = { "Modes" : { "$a_1^+\\to\\pi^+\\pi^0\\pi^0$" : {},
                                                 "$a_1^+\\to\\pi^+\\pi^-\\pi^+$" : {},}}
 analyses["HadronDecays"][20213]["Modes"]["$a_1^+\\to\\pi^+\\pi^0\\pi^0$"]["MC"] = ["/MC_OmegaPhia1_3Pion_Decay/dalitz1","/MC_OmegaPhia1_3Pion_Decay/hist1A",
                                                                                   "/MC_OmegaPhia1_3Pion_Decay/hist1B"]
 analyses["HadronDecays"][20213]["Modes"]["$a_1^+\\to\\pi^+\\pi^-\\pi^+$"]["MC"] = ["/MC_OmegaPhia1_3Pion_Decay/dalitz3","/MC_OmegaPhia1_3Pion_Decay/hist3A",
                                                                                   "/MC_OmegaPhia1_3Pion_Decay/hist3B"]
 # a_10
 analyses["HadronDecays"][20113] = { "Modes" : { "$a_1^0\\to\\pi^0\\pi^0\\pi^0$" : {},
                                                 "$a_1^0\\to\\pi^+\\pi^-\\pi^0$" : {},}}
 analyses["HadronDecays"][20113]["Modes"]["$a_1^0\\to\\pi^0\\pi^0\\pi^0$"]["MC"] = ["/MC_OmegaPhia1_3Pion_Decay/dalitz0","/MC_OmegaPhia1_3Pion_Decay/hist0"]
 analyses["HadronDecays"][20113]["Modes"]["$a_1^0\\to\\pi^+\\pi^-\\pi^0$"]["MC"] = ["/MC_OmegaPhia1_3Pion_Decay/dalitz2","/MC_OmegaPhia1_3Pion_Decay/hist2A",
                                                                                    "/MC_OmegaPhia1_3Pion_Decay/hist2B" ,"/MC_OmegaPhia1_3Pion_Decay/hist2C"]
 # charm decays
 # D+
 analyses["HadronDecays"][411] = { "Modes" : { "$D^+\\to\\bar{K}^0e^+\\nu_e$"                : {},
                                               "$D^+\\to\\pi^0e^+\\nu_e$"                    : {},
                                               "$D^+\\to \\bar{K}_1(1270)^0e^+\\nu_e$"       : {},
                                               "$D^+\\to\\bar{K}^0\\mu^+\\nu_\\mu$"          : {},
                                               "$D^+\\to\\pi^0\\mu^+\\nu_\\mu$"              : {},
                                               "$D^+\\to \\bar{K}_1(1270)^0\\mu^+\\nu_\\mu$" : {},
                                               "$D^+\\to\\eta e^+\\nu_e$"                    : {},
                                               "$D^+\\to\\eta\\mu^+\\nu_\\mu$"               : {},
                                               "$D^+\\to\\eta^\\prime e^+\\nu_e$"            : {},
                                               "$D^+\\to\\eta^\\prime\\mu^+\\nu_\\mu$"       : {},
                                               "$D^+\\to\\rho^0 e^+\\nu_e$"                  : {},
                                               "$D^+\\to\\rho^0\\mu^+\\nu_\\mu$"             : {},
                                               "$D^+\\to\\omega e^+\\nu_e$"                  : {},
                                               "$D^+\\to\\omega\\mu^+\\nu_\\mu$"             : {},
                                               "$D^+\\to\\bar{K}^{*0}e^+\\nu_e$"             : {},
                                               "$D^+\\to\\bar{K}^{*0}\\mu^+\\nu_\\mu$"       : {},
                                               "$D^+\\to\\bar{K}_2^{*0}e^+\\nu_e$"           : {},
                                               "$D^+\\to\\bar{K}_2^{*0}\\mu^+\\nu_\\mu$"     : {},
                                               "$D^+\\to K^-\\pi^+\\pi^+$"                          : {},
                                               "$D^+\\to K^+\\pi^-\\pi^+$"                          : {},
                                               "$D^+\\to\\bar{K}^0\\pi^+\\pi^0$"                    : {},
                                               }}
+analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\bar{K}^0e^+\\nu_e$"               ]["data"] = ["/BESIII_2017_I1519425/d01-x01-y01"]
 analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\bar{K}^0e^+\\nu_e$"               ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_311m_11m_energy",
-                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_311m_11m_scale"]
-analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\bar{K}^0e^+\\nu_e$"               ]["data"] = ["/BESIII_2017_I1519425/d01-x01-y01"]
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_311m_11m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_311p_11p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_311p_11p_scale"]
+analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\bar{K}^0\\mu^+\\nu_\\mu$"         ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_311m_13m_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_311m_13m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_311p_13p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_311p_13p_scale"]
 analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\pi^0e^+\\nu_e$"                   ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_111p_11m_energy",
-                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_111p_11m_scale"]
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_111p_11m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_111p_11p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_111p_11p_scale"]
+analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\pi^0\\mu^+\\nu_\\mu$"             ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_111p_13m_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_111p_13m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_111p_13p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_111p_13p_scale"]
 analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\pi^0e^+\\nu_e$"                   ]["data"] = ["/BESIII_2017_I1519425/d02-x01-y01"]
+analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\pi^0\\mu^+\\nu_\\mu$"             ]["data"] = ["/BESIII_2018_I1655158/d01-x01-y01"]
 analyses["HadronDecays"][411]["Modes"]["$D^+\\to \\bar{K}_1(1270)^0e^+\\nu_e$"      ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_10313m_11m_energy",
-                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_10313m_11m_scale"]
-analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\bar{K}^0\\mu^+\\nu_\\mu$"         ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411m_311p_13p_energy",
-                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_311p_13p_scale"]
-analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\pi^0\\mu^+\\nu_\\mu$"             ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411m_111p_13p_energy",
-                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_111p_13p_scale"]
-analyses["HadronDecays"][411]["Modes"]["$D^+\\to \\bar{K}_1(1270)^0\\mu^+\\nu_\\mu$"]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411m_10313p_13p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_10313m_11m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_10313p_11p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_10313p_11p_scale"]
+analyses["HadronDecays"][411]["Modes"]["$D^+\\to \\bar{K}_1(1270)^0\\mu^+\\nu_\\mu$"]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_10313m_13m_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_10313m_13m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_10313p_13p_energy",
                                                                                                  "/MC_Semi_Leptonic_Decay/h_411m_10313p_13p_scale"]
 analyses["HadronDecays"][411]["Modes"]["$D^+\\to K^-\\pi^+\\pi^+$"                         ]["MC"  ] = ["/MC_D_Dalitz/dalitz3","/MC_D_Dalitz/h_Kpiall3",
                                                                                                         "/MC_D_Dalitz/h_Kpihigh3","/MC_D_Dalitz/h_Kpilow3",
                                                                                                         "/MC_D_Dalitz/h_pipi3"]
 analyses["HadronDecays"][411]["Modes"]["$D^+\\to K^+\\pi^-\\pi^+$"                         ]["MC"  ] = ["/MC_D_Dalitz/dalitz5","/MC_D_Dalitz/h_kppim5",
                                                                                                         "/MC_D_Dalitz/h_kppip5","/MC_D_Dalitz/h_pippim5",]
 analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\bar{K}^0\\pi^+\\pi^0$"                   ]["MC"  ] = ["/MC_D_Dalitz/dalitz4","/MC_D_Dalitz/h_Kpi04",
                                                                                                         "/MC_D_Dalitz/h_Kpip4","/MC_D_Dalitz/h_pipi4"]
 analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\eta e^+\\nu_e$"                   ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_221p_11m_energy",
-                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_221p_11m_scale"]
-analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\eta\\mu^+\\nu_\\mu$"              ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411m_221p_13p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_221p_11m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_221p_11p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_221p_11p_scale"]
+analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\eta\\mu^+\\nu_\\mu$"              ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_221p_13m_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_221p_13m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_221p_13p_energy",
                                                                                                  "/MC_Semi_Leptonic_Decay/h_411m_221p_13p_scale"]
 analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\eta^\\prime e^+\\nu_e$"           ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_331p_11m_energy",
-                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_331p_11m_scale"]
-analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\eta^\\prime\\mu^+\\nu_\\mu$"      ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411m_331p_13p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_331p_11m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_331p_11p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_331p_11p_scale"]
+analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\eta^\\prime\\mu^+\\nu_\\mu$"      ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_331p_13m_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_331p_13m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_331p_13p_energy",
                                                                                                  "/MC_Semi_Leptonic_Decay/h_411m_331p_13p_scale"]
 analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\rho^0 e^+\\nu_e$"                 ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_113p_11m_energy",
-                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_113p_11m_scale"]
-analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\rho^0\\mu^+\\nu_\\mu$"            ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411m_113p_13p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_113p_11m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_113p_11p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_113p_11p_scale"]
+analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\rho^0\\mu^+\\nu_\\mu$"            ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_113p_13m_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_113p_13m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_113p_13p_energy",
                                                                                                  "/MC_Semi_Leptonic_Decay/h_411m_113p_13p_scale"]
 analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\omega e^+\\nu_e$"                 ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_223p_11m_energy",
-                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_223p_11m_scale"]
-analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\omega\\mu^+\\nu_\\mu$"            ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411m_223p_13p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_223p_11m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_223p_11p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_223p_11p_scale"]
+analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\omega\\mu^+\\nu_\\mu$"            ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_223p_13m_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_223p_13m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_223p_13p_energy",
                                                                                                  "/MC_Semi_Leptonic_Decay/h_411m_223p_13p_scale"]
 analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\bar{K}^{*0}e^+\\nu_e$"            ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_313m_11m_energy",
-                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_313m_11m_scale"]
-analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\bar{K}^{*0}\\mu^+\\nu_\\mu$"      ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411m_313p_13p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_313m_11m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_313p_11p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_313p_11p_scale"]
+analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\bar{K}^{*0}\\mu^+\\nu_\\mu$"      ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_313m_13m_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_313m_13m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_313p_13p_energy",
                                                                                                  "/MC_Semi_Leptonic_Decay/h_411m_313p_13p_scale"]
 analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\bar{K}_2^{*0}e^+\\nu_e$"          ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_315m_11m_energy",
-                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_315m_11m_scale"]
-analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\bar{K}_2^{*0}\\mu^+\\nu_\\mu$"    ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411m_315p_13p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_315m_11m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_315p_11p_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_315p_11p_scale"]
+analyses["HadronDecays"][411]["Modes"]["$D^+\\to\\bar{K}_2^{*0}\\mu^+\\nu_\\mu$"    ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_411p_315m_13m_energy",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411p_315m_13m_scale",
+                                                                                                 "/MC_Semi_Leptonic_Decay/h_411m_315p_13p_energy",
                                                                                                  "/MC_Semi_Leptonic_Decay/h_411m_315p_13p_scale"]
 # D^0
 analyses["HadronDecays"][421] ={ "Modes" : { "$D^0\\to K^-e^+\\nu_e$"                : {},
                                              "$D^0\\to K^-\\mu^+\\nu_\\mu$"          : {},
                                              "$D^0\\to K^{*-}e^+\\nu_e$"             : {},
                                              "$D^0\\to K^{*-}\\mu^+\\nu_\\mu$"       : {},
                                              "$D^0\\to K^{*-}_2e^+\\nu_e$"           : {},
                                              "$D^0\\to K^{*-}_2\\mu^+\\nu_\\mu$"     : {},
                                              "$D^0\\to K_1(1270)^{-}e^+\\nu_e$"      : {},
                                              "$D^0\\to K_1(1270)^{-}\\mu^+\\nu_\\mu$": {},
                                              "$D^0\\to \\pi^-e^+\\nu_e$"             : {},
                                              "$D^0\\to \\pi^-\\mu^+\\nu_\\mu$"       : {},
                                              "$D^0\\to \\rho^-e^+\\nu_e$"            : {},
                                              "$D^0\\to \\rho^-\\mu^+\\nu_\\mu$"      : {},
                                              "$D^0\\to K^-\\pi^+\\pi^0$"             : {},
                                              "$D^0\\to \\bar{K}^0\\pi^+\\pi^-$"      : {},
                                              }}
 analyses["HadronDecays"][421]["Modes"]["$D^0\\to K^{*-}e^+\\nu_e$"             ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421p_323m_11m_energy",
-                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_323m_11m_scale"]
-analyses["HadronDecays"][421]["Modes"]["$D^0\\to K^{*-}\\mu^+\\nu_\\mu$"       ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421m_323p_13p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_323m_11m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_323p_11p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_323p_11p_scale"]
+analyses["HadronDecays"][421]["Modes"]["$D^0\\to K^{*-}\\mu^+\\nu_\\mu$"       ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421p_323m_13m_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_323m_13m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_323p_13p_energy",
                                                                                             "/MC_Semi_Leptonic_Decay/h_421m_323p_13p_scale"]
 analyses["HadronDecays"][421]["Modes"]["$D^0\\to K^{*-}_2e^+\\nu_e$"           ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421p_325m_11m_energy",
-                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_325m_11m_scale"]
-analyses["HadronDecays"][421]["Modes"]["$D^0\\to K^{*-}_2\\mu^+\\nu_\\mu$"     ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421m_325p_13p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_325m_11m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_325p_11p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_325p_11p_scale"]
+analyses["HadronDecays"][421]["Modes"]["$D^0\\to K^{*-}_2\\mu^+\\nu_\\mu$"     ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421p_325m_13m_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_325m_13m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_325p_13p_energy",
                                                                                             "/MC_Semi_Leptonic_Decay/h_421m_325p_13p_scale"]
 analyses["HadronDecays"][421]["Modes"]["$D^0\\to K_1(1270)^{-}e^+\\nu_e$"      ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421p_10323m_11m_energy",
-                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_10323m_11m_scale"]
-analyses["HadronDecays"][421]["Modes"]["$D^0\\to K_1(1270)^{-}\\mu^+\\nu_\\mu$"]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421m_10323p_13p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_10323m_11m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_10323p_11p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_10323p_11p_scale"]
+analyses["HadronDecays"][421]["Modes"]["$D^0\\to K_1(1270)^{-}\\mu^+\\nu_\\mu$"]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421p_10323m_13m_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_10323m_13m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_10323p_13p_energy",
                                                                                             "/MC_Semi_Leptonic_Decay/h_421m_10323p_13p_scale"]
-analyses["HadronDecays"][421]["Modes"]["$D^0\\to K^-e^+\\nu_e$"                ]["data"] = ["/BESIII_2015_I1391138/d01-x01-y03"]
+analyses["HadronDecays"][421]["Modes"]["$D^0\\to K^-e^+\\nu_e$"                ]["data"] = ["/BESIII_2015_I1391138/d01-x01-y03",
+                                                                                            "/BABAR_2007_I1091435/d01-x01-y01"]
 analyses["HadronDecays"][421]["Modes"]["$D^0\\to K^-e^+\\nu_e$"                ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421p_321m_11m_energy",
-                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_321m_11m_scale"]
-analyses["HadronDecays"][421]["Modes"]["$D^0\\to K^-\\mu^+\\nu_\\mu$"          ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421m_321p_13p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_321m_11m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_321p_11p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_321p_11p_scale"]
+analyses["HadronDecays"][421]["Modes"]["$D^0\\to K^-\\mu^+\\nu_\\mu$"          ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421p_321m_13m_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_321m_13m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_321p_13p_energy",
                                                                                             "/MC_Semi_Leptonic_Decay/h_421m_321p_13p_scale"]
 analyses["HadronDecays"][421]["Modes"]["$D^0\\to \\pi^-e^+\\nu_e$"             ]["data"] = ["/BABAR_2015_I1334693/d01-x01-y01",
                                                                                             "/BESIII_2015_I1391138/d02-x01-y03"]
+analyses["HadronDecays"][421]["Modes"]["$D^0\\to \\pi^-\\mu^+\\nu_\\mu$"       ]["data"] = ["/BESIII_2018_I1655158/d02-x01-y01"]
 analyses["HadronDecays"][421]["Modes"]["$D^0\\to \\pi^-e^+\\nu_e$"             ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421p_211m_11m_energy",
-                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_211m_11m_scale"]
-analyses["HadronDecays"][421]["Modes"]["$D^0\\to \\pi^-\\mu^+\\nu_\\mu$"       ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421m_211p_13p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_211m_11m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_211p_11p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_211p_11p_scale"]
+analyses["HadronDecays"][421]["Modes"]["$D^0\\to \\pi^-\\mu^+\\nu_\\mu$"       ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421p_211m_13m_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_211m_13m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_211p_13p_energy",
                                                                                             "/MC_Semi_Leptonic_Decay/h_421m_211p_13p_scale"]
 analyses["HadronDecays"][421]["Modes"]["$D^0\\to \\rho^-e^+\\nu_e$"            ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421p_213m_11m_energy",
-                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_213m_11m_scale"]
-analyses["HadronDecays"][421]["Modes"]["$D^0\\to \\rho^-\\mu^+\\nu_\\mu$"      ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421m_213p_13p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_213m_11m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_213p_11p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_213p_11p_scale"]
+analyses["HadronDecays"][421]["Modes"]["$D^0\\to \\rho^-\\mu^+\\nu_\\mu$"      ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_421p_213m_13m_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421p_213m_13m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_421m_213p_13p_energy",
                                                                                             "/MC_Semi_Leptonic_Decay/h_421m_213p_13p_scale"]
 analyses["HadronDecays"][421]["Modes"]["$D^0\\to K^-\\pi^+\\pi^0$"             ]["MC"  ] = ["/MC_D_Dalitz/dalitz2","/MC_D_Dalitz/h_minus2",
                                                                                             "/MC_D_Dalitz/h_neutral2","/MC_D_Dalitz/h_pipi2"]
 analyses["HadronDecays"][421]["Modes"]["$D^0\\to \\bar{K}^0\\pi^+\\pi^-$"      ]["MC"  ] = ["/MC_D_Dalitz/dalitz1","/MC_D_Dalitz/h_minus1",
                                                                                             "/MC_D_Dalitz/h_pipi1","/MC_D_Dalitz/h_plus1"]
 analyses["HadronDecays"][431] = { "Modes" : { "$D_s^+\\to \\eta e^+\\nu_e$"                : {},
                                               "$D_s^+\\to \\eta \\mu^+\\nu_\\mu$"          : {},
                                               "$D_s^+\\to \\eta^\\prime e^+\\nu_e$"        : {},
                                               "$D_s^+\\to \\eta^\\prime \\mu^+\\nu_\\mu$"  : {},
                                               "$D_s^+\\to \\phi e^+\\nu_e$"                : {},
                                               "$D_s^+\\to \\phi \\mu^+\\nu_\\mu$"          : {},
                                               "$D_s^+\\to K^0 e^+\\nu_e$"                  : {},
                                               "$D_s^+\\to K^0 \\mu^+\\nu_\\mu$"            : {},
                                               "$D_s^+\\to K^{*0} e^+\\nu_e$"               : {},
                                               "$D_s^+\\to K^{*0} \\mu^+\\nu_\\mu$"         : {},
                                               "$D_s^+\\to K^+\\pi^-\\pi^+$"                : {},
                                               }}
 analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to \\eta e^+\\nu_e$"               ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_431p_221p_11m_energy",
-                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_221p_11m_scale"]
-analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to \\eta \\mu^+\\nu_\\mu$"         ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_431m_221p_13p_energy",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_221p_11m_scale",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_221p_11p_energy",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_221p_11p_scale"]
+analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to \\eta \\mu^+\\nu_\\mu$"         ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_431p_221p_13m_energy",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_221p_13m_scale",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_221p_13p_energy",
                                                                                                 "/MC_Semi_Leptonic_Decay/h_431m_221p_13p_scale"]
 analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to \\eta^\\prime e^+\\nu_e$"       ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_431p_331p_11m_energy",
-                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_331p_11m_scale"]
-analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to \\eta^\\prime \\mu^+\\nu_\\mu$" ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_431m_331p_13p_energy",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_331p_11m_scale",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_331p_11p_energy",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_331p_11p_scale"]
+analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to \\eta^\\prime \\mu^+\\nu_\\mu$" ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_431p_331p_13m_energy",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_331p_13m_scale",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_331p_13p_energy",
                                                                                                 "/MC_Semi_Leptonic_Decay/h_431m_331p_13p_scale"]
 analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to \\phi e^+\\nu_e$"               ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_431p_333p_11m_energy",
-                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_333p_11m_scale"]
-analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to \\phi \\mu^+\\nu_\\mu$"         ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_431m_333p_13p_energy",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_333p_11m_scale",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_333p_11p_energy",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_333p_11p_scale"]
+analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to \\phi \\mu^+\\nu_\\mu$"         ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_431p_333p_13m_energy",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_333p_13m_scale",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_333p_13p_energy",
                                                                                                 "/MC_Semi_Leptonic_Decay/h_431m_333p_13p_scale"]
-analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to K^0 e^+\\nu_e$"                 ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_431p_311m_11m_energy",
-                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_311m_11m_scale",
-                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_311p_11m_energy",
-                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_311p_11m_scale"]
-analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to K^0 \\mu^+\\nu_\\mu$"           ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_431m_311p_13p_energy",
-                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_311p_13p_scale"]
+analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to K^0 e^+\\nu_e$"                 ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_431p_311p_11m_energy",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_311p_11m_scale",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_311m_11p_energy",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_311m_11p_scale"]
+analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to K^0 \\mu^+\\nu_\\mu$"           ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_431p_311p_13m_energy",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_311p_13m_scale",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_311m_13p_energy",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_311m_13p_scale"]
 analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to K^{*0} e^+\\nu_e$"              ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_431p_313p_11m_energy",
                                                                                                 "/MC_Semi_Leptonic_Decay/h_431p_313p_11m_scale",
-                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_313m_11m_energy",
-                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_313m_11m_scale"]
-analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to K^{*0} \\mu^+\\nu_\\mu$"        ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_431m_313p_13p_scale",
-                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_313p_13p_energy"]
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_313m_11p_energy",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_313m_11p_scale"]
+analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to K^{*0} \\mu^+\\nu_\\mu$"        ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_431p_313p_13m_scale",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431p_313p_13m_energy",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_313m_13p_scale",
+                                                                                                "/MC_Semi_Leptonic_Decay/h_431m_313m_13p_energy"]
 analyses["HadronDecays"][431]["Modes"]["$D_s^+\\to K^+\\pi^-\\pi^+$"               ]["MC"  ] = ["/MC_D_Dalitz/dalitz6","/MC_D_Dalitz/h_kppim6",
                                                                                                 "/MC_D_Dalitz/h_kppip6","/MC_D_Dalitz/h_pippim6"]
+# D_2
+analyses["HadronDecays"][425] = { "Modes" : { "$D^0_2\\to D^+\pi^-$"      : {},
+                                              "$D^0_2\\to D^{*+}\pi^-$"      : {}}}
+analyses["HadronDecays"][425]["Modes"]["$D^0_2\\to D^+\pi^-$"   ]["data"] = ["/ARGUS_1989_I268577/d03-x01-y01"]  
+analyses["HadronDecays"][425]["Modes"]["$D^0_2\\to D^{*+}\pi^-$"]["data"] = ["/ARGUS_1989_I280943/d03-x01-y02","/BABAR_2010_I867611/d01-x01-y02",
+                                                                             "/CLEO_1990_I281039/d01-x01-y02","/LHCB_2013_I1243156/d08-x01-y02",
+                                                                             "/CLEOII_1994_I372349/d02-x01-y01"]
+
+analyses["HadronDecays"][415] = { "Modes" : { "$D^+_2\\to D^{*0}\pi^+$"      : {}}}
+analyses["HadronDecays"][415]["Modes"]["$D^+_2\\to D^{*0}\pi^+$"]["data"] = ["/CLEOII_1994_I378319/d02-x01-y01"]
+
+
+
+# D_1
+analyses["HadronDecays"][10423] = { "Modes" : { "$D^0_1\\to D^{*+}\pi^-$"      : {}}}  
+analyses["HadronDecays"][10423]["Modes"]["$D^0_1\\to D^{*+}\pi^-$"]["data"] = ["/ARGUS_1989_I280943/d03-x01-y01","/BABAR_2010_I867611/d01-x01-y01",
+                                                                               "/CLEO_1990_I281039/d01-x01-y01","/LHCB_2013_I1243156/d08-x01-y01",
+                                                                               "/CLEOII_1994_I372349/d02-x01-y02"]
+
+analyses["HadronDecays"][10413] = { "Modes" : { "$D^+_1\\to D^{*0}\pi^+$"      : {}}}
+analyses["HadronDecays"][10413]["Modes"]["$D^+_1\\to D^{*0}\pi^+$"]["data"] = ["/CLEOII_1994_I378319/d03-x01-y01"]
+# D_s1(2536)
+analyses["HadronDecays"][10433] = { "Modes" : { "$D^+_{s1}\\to D^{*+}K^0$"      : {}}}
+analyses["HadronDecays"][10433]["Modes"]["$D^+_{s1}\\to D^{*+}K^0$"]["data"]= ["/BABAR_2011_I892421/d01-x01-y01","/BABAR_2011_I892421/d02-x01-y01",
+                                                                               "/BELLE_2008_I762013/d01-x01-y01","/BELLE_2008_I762013/d02-x01-y01",
+                                                                               "/BELLE_2008_I762013/d03-x01-y01"]
+# B0
 analyses["HadronDecays"][511]={ "Spectrum" : {},
                                 "Modes" : { "$B^0\\to\\pi^- e^+\\nu_e$"         : {},
                                             "$B^0\\to\\pi^- \\mu^+\\nu_\\mu$"   : {},
                                             "$B^0\\to\\rho^- e^+\\nu_e$"         : {},
                                             "$B^0\\to\\rho^- \\mu^+\\nu_\\mu$"   : {},
                                             "$B^0\\to D^- e^+\\nu_e$"         : {},
                                             "$B^0\\to D^- \\mu^+\\nu_\\mu$"   : {},
                                             "$B^0\\to D^{*-} e^+\\nu_e$"         : {},
                                             "$B^0\\to D^{*-} \\mu^+\\nu_\\mu$"   : {},
                                             "$B^0\\to D^{*-}_2 e^+\\nu_e$"       : {},
                                             "$B^0\\to D^{*-}_2 \\mu^+\\nu_\\mu$" : {},
                                             "$B^0\\to D^{*-}_0(2400) e^+\\nu_e$"       : {},
                                             "$B^0\\to D^{*-}_0(2400) \\mu^+\\nu_\\mu$" : {},
                                             "$B^0\\to D^{-}_1(2430) e^+\\nu_e$"        : {},
                                             "$B^0\\to D^{-}_1(2430) \\mu^+\\nu_\\mu$"  : {},
                                             "$B^0\\to D^{-}_1(2420) e^+\\nu_e$"        : {},
                                             "$B^0\\to D^{-}_1(2420) \\mu^+\\nu_\\mu$"  : {},
                                             "$B^0\\to K^{*0} e^+e^-$"        : {},
                                             "$B^0\\to K^{*0} \\mu^+\\mu^-$"  : {},
                                             "$B^0\\to K^0 e^+e^-$"        : {},
                                             "$B^0\\to K^0 \\mu^+\\mu^-$"  : {},
                                             "$B\\to X_s\\gamma$"  : {},}}
-analyses["HadronDecays"][521]={"Modes" : { "$B^+\\to\\pi^0 e^+\\nu_e$"       : {},
+analyses["HadronDecays"][521]={ "Spectrum" : {},
+                                "Modes" : { "$B^+\\to\\pi^0 e^+\\nu_e$"       : {},
                                            "$B^+\\to\\pi^0 \\mu^+\\nu_\\mu$" : {},
                                            "$B^+\\to\\omega e^+\\nu_e$"       : {},
                                            "$B^+\\to\\omega \\mu^+\\nu_\\mu$" : {},
                                            "$B^+\\to\\rho^0 e^+\\nu_e$"       : {},
                                            "$B^+\\to\\rho^0 \\mu^+\\nu_\\mu$" : {},
                                            "$B^+\\to\\eta^\\prime e^+\\nu_e$"       : {},
                                            "$B^+\\to\\eta^\\prime \\mu^+\\nu_\\mu$" : {},
                                            "$B^+\\to\\eta e^+\\nu_e$"       : {},
                                            "$B^+\\to\\eta \\mu^+\\nu_\\mu$" : {},
                                            "$B^+\\to\\bar{D}^0 e^+\\nu_e$"          : {},
                                            "$B^+\\to\\bar{D}^0 \\mu^+\\nu_\\mu$"    : {},
                                            "$B^+\\to\\bar{D}^{*0} e^+\\nu_e$"       : {},
                                            "$B^+\\to\\bar{D}^{*0} \\mu^+\\nu_\\mu$" : {},
                                            "$B^+\\to\\bar{D}^{*0}_2 e^+\\nu_e$"      : {},
                                            "$B^+\\to\\bar{D}^{*0}_2 \\mu^+\\nu_\\mu$": {},
                                            "$B^+\\to\\bar{D}^{*0}_0(2400) e^+\\nu_e$"      : {},
                                            "$B^+\\to\\bar{D}^{*0}_0(2400) \\mu^+\\nu_\\mu$": {},
                                            "$B^+\\to\\bar{D}^{0}_1(2430) e^+\\nu_e$"       : {},
                                            "$B^+\\to\\bar{D}^{0}_1(2430) \\mu^+\\nu_\\mu$" : {},
                                            "$B^+\\to\\bar{D}^{0}_1(2420) e^+\\nu_e$"       : {},
                                            "$B^+\\to\\bar{D}^{0}_1(2420) \\mu^+\\nu_\\mu$" : {},
                                            "$B^+\\to K^{*+} e^+e^-$"        : {},
                                            "$B^+\\to K^{*+} \\mu^+\\mu^-$"  : {},
                                            "$B^+\\to K^- e^+e^-$"        : {},
                                            "$B^+\\to K^- \\mu^+\\mu^-$"  : {},}
 }
 
 
-analyses["HadronDecays"][511]["Spectrum"][311] = ["/ARGUS_1994_I354224/d01-x01-y01"]
+analyses["HadronDecays"][511]["Spectrum"][311 ] = ["/ARGUS_1994_I354224/d01-x01-y01"]
+
+analyses["HadronDecays"][521]["Spectrum"][411 ] = ["/BABAR_2006_I719111/d01-x01-y01","/BABAR_2006_I719111/d01-x01-y02"]
+analyses["HadronDecays"][521]["Spectrum"][421 ] = ["/BABAR_2006_I719111/d02-x01-y01","/BABAR_2006_I719111/d02-x01-y02"]
+analyses["HadronDecays"][521]["Spectrum"][431 ] = ["/BABAR_2006_I719111/d03-x01-y01","/BABAR_2006_I719111/d03-x01-y02"]
+analyses["HadronDecays"][521]["Spectrum"][4122] = ["/BABAR_2006_I719111/d04-x01-y01","/BABAR_2006_I719111/d04-x01-y02"]
+analyses["HadronDecays"][511]["Spectrum"][411 ] = ["/BABAR_2006_I719111/d05-x01-y01","/BABAR_2006_I719111/d05-x01-y02",
+                                                   "/ARGUS_1991_I315059/d05-x01-y01"]
+analyses["HadronDecays"][511]["Spectrum"][413 ] = ["/ARGUS_1991_I315059/d07-x01-y01"]
+analyses["HadronDecays"][511]["Spectrum"][421 ] = ["/BABAR_2006_I719111/d06-x01-y01","/BABAR_2006_I719111/d06-x01-y02",
+                                                   "/ARGUS_1991_I315059/d06-x01-y01"]
+analyses["HadronDecays"][511]["Spectrum"][431 ] = ["/BABAR_2006_I719111/d07-x01-y01","/BABAR_2006_I719111/d07-x01-y02"]
+analyses["HadronDecays"][511]["Spectrum"][4122] = ["/BABAR_2006_I719111/d08-x01-y01","/BABAR_2006_I719111/d08-x01-y02"]
 
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\pi^0 e^+\\nu_e$"          ]["data"] = ["/BELLE_2013_I1238273/d02-x01-y01"]
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\pi^0 e^+\\nu_e$"          ]["MC"] = ["/MC_Semi_Leptonic_Decay/h_521p_111p_11m_energy",
-                                                                                       "/MC_Semi_Leptonic_Decay/h_521p_111p_11m_scale"]
-analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\pi^0 \\mu^+\\nu_\\mu$"    ]["MC"] = ["/MC_Semi_Leptonic_Decay/h_521m_111p_13p_energy",
+                                                                                       "/MC_Semi_Leptonic_Decay/h_521p_111p_11m_scale",
+                                                                                       "/MC_Semi_Leptonic_Decay/h_521m_111p_11p_energy",
+                                                                                       "/MC_Semi_Leptonic_Decay/h_521m_111p_11p_scale"]
+analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\pi^0 \\mu^+\\nu_\\mu$"    ]["MC"] = ["/MC_Semi_Leptonic_Decay/h_521p_111p_13m_energy",
+                                                                                       "/MC_Semi_Leptonic_Decay/h_521p_111p_13m_scale",
+                                                                                       "/MC_Semi_Leptonic_Decay/h_521m_111p_13p_energy",
                                                                                        "/MC_Semi_Leptonic_Decay/h_521m_111p_13p_scale"]
-
-
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to\\pi^- e^+\\nu_e$"          ]["data"] = ["/BELLE_2011_I878990/d01-x01-y01","/BELLE_2013_I1238273/d01-x01-y01"]
-#analyses["HadronDecays"][511]["Modes"]["$B^0\\to\\pi^- \\mu^+\\nu_\\mu$"    ]["data"] = []
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to\\pi^- e^+\\nu_e$"          ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511p_211m_11m_energy",
-                                                                                         "/MC_Semi_Leptonic_Decay/h_511p_211m_11m_scale",]
-analyses["HadronDecays"][511]["Modes"]["$B^0\\to\\pi^- \\mu^+\\nu_\\mu$"    ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511m_211p_13p_scale",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511p_211m_11m_scale",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_211p_11p_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_211p_11p_scale"]
+analyses["HadronDecays"][511]["Modes"]["$B^0\\to\\pi^- \\mu^+\\nu_\\mu$"    ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511p_211m_13m_scale",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511p_211m_13m_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_211p_13p_scale",
                                                                                          "/MC_Semi_Leptonic_Decay/h_511m_211p_13p_energy"]
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to\\rho^- e^+\\nu_e$"         ]["data"] = ["/BELLE_2013_I1238273/d03-x01-y01"]
-#analyses["HadronDecays"][511]["Modes"]["$B^0\\to\\rho^- \\mu^+\\nu_\\mu$"   ]["data"] = []
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to\\rho^- e^+\\nu_e$"         ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511p_213m_11m_energy",
-                                                                                         "/MC_Semi_Leptonic_Decay/h_511p_213m_11m_scale"]
-analyses["HadronDecays"][511]["Modes"]["$B^0\\to\\rho^- \\mu^+\\nu_\\mu$"   ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511m_213p_13p_energy",
-                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_213p_13p_scale",]
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511p_213m_11m_scale",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_213p_11p_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_213p_11p_scale"]
+analyses["HadronDecays"][511]["Modes"]["$B^0\\to\\rho^- \\mu^+\\nu_\\mu$"   ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511p_213m_13m_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511p_213m_13m_scale",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_213p_13p_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_213p_13p_scale"]
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\omega e^+\\nu_e$"         ]["data"] = ["/BELLE_2013_I1238273/d05-x01-y01","/BABAR_2013_I1116411/d01-x01-y01"]
-#analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\omega \\mu^+\\nu_\\mu$"   ]["data"] = []
-analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\omega e^+\\nu_e$"         ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521m_223p_13p_energy",
-                                                                                         "/MC_Semi_Leptonic_Decay/h_521m_223p_13p_scale"]
-analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\omega \\mu^+\\nu_\\mu$"   ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_223p_11m_energy",
-                                                                                         "/MC_Semi_Leptonic_Decay/h_521p_223p_11m_scale",]
+analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\omega e^+\\nu_e$"         ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521m_223p_11p_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_521m_223p_11p_scale",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_521p_223p_11m_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_521p_223p_11m_scale"]
+analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\omega \\mu^+\\nu_\\mu$"   ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521m_223p_13p_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_521m_223p_13p_scale",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_521p_223p_13m_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_521p_223p_13m_scale",]
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\rho^0 e^+\\nu_e$"         ]["data"] = ["/BELLE_2013_I1238273/d04-x01-y01"]
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\rho^0 e^+\\nu_e$"         ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_113p_11m_energy",
-                                                                                         "/MC_Semi_Leptonic_Decay/h_521p_113p_11m_scale"]
-analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\rho^0 \\mu^+\\nu_\\mu$"   ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521m_113p_13p_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_521p_113p_11m_scale",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_521m_113p_11p_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_521m_113p_11p_scale"]
+analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\rho^0 \\mu^+\\nu_\\mu$"   ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_113p_13m_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_521p_113p_13m_scale",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_521m_113p_13p_energy",
                                                                                          "/MC_Semi_Leptonic_Decay/h_521m_113p_13p_scale"]
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^- e^+\\nu_e$"            ]["data"] = ["/BELLE_2015_I1397632/d01-x01-y01"]
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^- \\mu^+\\nu_\\mu$"      ]["data"] = ["/BELLE_2015_I1397632/d01-x01-y02"]
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^- e^+\\nu_e$"            ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511p_411m_11m_energy",
-                                                                                         "/MC_Semi_Leptonic_Decay/h_511p_411m_11m_scale",]
-analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^- \\mu^+\\nu_\\mu$"      ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511m_411p_13p_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511p_411m_11m_scale",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_411p_11p_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_411p_11p_scale"]
+analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^- \\mu^+\\nu_\\mu$"      ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511p_411m_13m_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511p_411m_13m_scale",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_411p_13p_energy",
                                                                                          "/MC_Semi_Leptonic_Decay/h_511m_411p_13p_scale"]
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{*-} e^+\\nu_e$"         ]["data"] = ["/BELLE_2017_I1512299/d01-x01-y01","/BELLE_2017_I1512299/d02-x01-y01",
                                                                                          "/BELLE_2017_I1512299/d03-x01-y01","/BELLE_2017_I1512299/d04-x01-y01",]
-#analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{*-} \\mu^+\\nu_\\mu$"   ]["data"] = []
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{*-} e^+\\nu_e$"         ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511p_413m_11m_energy",
-                                                                                         "/MC_Semi_Leptonic_Decay/h_511p_413m_11m_scale",]
-analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{*-} \\mu^+\\nu_\\mu$"   ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511m_413p_13p_energy",
-                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_413p_13p_scale",]
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511p_413m_11m_scale",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_413p_11p_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_413p_11p_scale"]
+analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{*-} \\mu^+\\nu_\\mu$"   ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511p_413m_13m_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511p_413m_13m_scale",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_413p_13p_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_413p_13p_scale"]
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{*-}_2 e^+\\nu_e$"       ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511p_415m_11m_energy",
-                                                                                         "/MC_Semi_Leptonic_Decay/h_511p_415m_11m_scale"]
-analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{*-}_2 \\mu^+\\nu_\\mu$" ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511m_415p_13p_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511p_415m_11m_scale",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_415p_11p_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_415p_11p_scale"]
+analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{*-}_2 \\mu^+\\nu_\\mu$" ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511p_415m_13m_energy",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511p_415m_13m_scale",
+                                                                                         "/MC_Semi_Leptonic_Decay/h_511m_415p_13p_energy",
                                                                                          "/MC_Semi_Leptonic_Decay/h_511m_415p_13p_scale"]
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\eta^\\prime e^+\\nu_e$"      ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_331p_11m_energy",
-                                                                                            "/MC_Semi_Leptonic_Decay/h_521p_331p_11m_scale"]
-analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\eta^\\prime \\mu^+\\nu_\\mu$"]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521m_331p_13p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_521p_331p_11m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_521m_331p_11p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_521m_331p_11p_scale"]
+analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\eta^\\prime \\mu^+\\nu_\\mu$"]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_331p_13m_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_521p_331p_13m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_521m_331p_13p_energy",
                                                                                             "/MC_Semi_Leptonic_Decay/h_521m_331p_13p_scale"]
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\eta e^+\\nu_e$"      ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_221p_11m_energy",
-                                                                                    "/MC_Semi_Leptonic_Decay/h_521p_221p_11m_scale"]
-analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\eta \\mu^+\\nu_\\mu$"]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521m_221p_13p_energy",
+                                                                                    "/MC_Semi_Leptonic_Decay/h_521p_221p_11m_scale",
+                                                                                    "/MC_Semi_Leptonic_Decay/h_521m_221p_11p_energy",
+                                                                                    "/MC_Semi_Leptonic_Decay/h_521m_221p_11p_scale"]
+analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\eta \\mu^+\\nu_\\mu$"]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_221p_13m_energy",
+                                                                                    "/MC_Semi_Leptonic_Decay/h_521p_221p_13m_scale",
+                                                                                    "/MC_Semi_Leptonic_Decay/h_521m_221p_13p_energy",
                                                                                     "/MC_Semi_Leptonic_Decay/h_521m_221p_13p_scale"]
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^0 e^+\\nu_e$"         ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_421m_11m_energy",
-                                                                                            "/MC_Semi_Leptonic_Decay/h_521p_421m_11m_scale"]
-analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^0 \\mu^+\\nu_\\mu$"   ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521m_421p_13p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_521p_421m_11m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_521m_421p_11p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_521m_421p_11p_scale"]
+analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^0 \\mu^+\\nu_\\mu$"   ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_421m_13m_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_521p_421m_13m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_521m_421p_13p_energy",
                                                                                             "/MC_Semi_Leptonic_Decay/h_521m_421p_13p_scale"]
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^0 e^+\\nu_e$"         ]["data"] = ["/BELLE_2015_I1397632/d02-x01-y01"]
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^0 \\mu^+\\nu_\\mu$"   ]["data"] = ["/BELLE_2015_I1397632/d02-x01-y02"]
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^{*0} e^+\\nu_e$"      ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_423m_11m_energy",
-                                                                                            "/MC_Semi_Leptonic_Decay/h_521p_423m_11m_scale"]
-analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^{*0} \\mu^+\\nu_\\mu$"]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521m_423p_13p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_521p_423m_11m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_521m_423p_11p_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_521m_423p_11p_scale"]
+analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^{*0} \\mu^+\\nu_\\mu$"]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_423m_13m_energy",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_521p_423m_13m_scale",
+                                                                                            "/MC_Semi_Leptonic_Decay/h_521m_423p_13p_energy",
                                                                                             "/MC_Semi_Leptonic_Decay/h_521m_423p_13p_scale"]
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^{*0}_2 e^+\\nu_e$"      ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_425m_11m_energy",
-                                                                                              "/MC_Semi_Leptonic_Decay/h_521p_425m_11m_scale"]
-analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^{*0}_2 \\mu^+\\nu_\\mu$"]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521m_425p_13p_energy",
+                                                                                              "/MC_Semi_Leptonic_Decay/h_521p_425m_11m_scale",
+                                                                                              "/MC_Semi_Leptonic_Decay/h_521m_425p_11p_energy",
+                                                                                              "/MC_Semi_Leptonic_Decay/h_521m_425p_11p_scale"]
+analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^{*0}_2 \\mu^+\\nu_\\mu$"]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_425m_13m_energy",
+                                                                                              "/MC_Semi_Leptonic_Decay/h_521p_425m_13m_scale",
+                                                                                              "/MC_Semi_Leptonic_Decay/h_521m_425p_13p_energy",
                                                                                               "/MC_Semi_Leptonic_Decay/h_521m_425p_13p_scale"]
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^{*0}_0(2400) e^+\\nu_e$"      ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_10421m_11m_energy",
-                                                                                                    "/MC_Semi_Leptonic_Decay/h_521p_10421m_11m_scale"]
-analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^{*0}_0(2400) \\mu^+\\nu_\\mu$"]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521m_10421p_13p_energy",
+                                                                                                    "/MC_Semi_Leptonic_Decay/h_521p_10421m_11m_scale",
+                                                                                                    "/MC_Semi_Leptonic_Decay/h_521m_10421p_11p_energy",
+                                                                                                    "/MC_Semi_Leptonic_Decay/h_521m_10421p_11p_scale"]
+analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^{*0}_0(2400) \\mu^+\\nu_\\mu$"]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_10421m_13m_energy",
+                                                                                                    "/MC_Semi_Leptonic_Decay/h_521p_10421m_13m_scale",
+                                                                                                    "/MC_Semi_Leptonic_Decay/h_521m_10421p_13p_energy",
                                                                                                     "/MC_Semi_Leptonic_Decay/h_521m_10421p_13p_scale"]
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^{0}_1(2430) e^+\\nu_e$"       ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_20423m_11m_energy",
-                                                                                                    "/MC_Semi_Leptonic_Decay/h_521p_20423m_11m_scale"]
-analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^{0}_1(2430) \\mu^+\\nu_\\mu$" ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521m_20423p_13p_energy",
+                                                                                                    "/MC_Semi_Leptonic_Decay/h_521p_20423m_11m_scale",
+                                                                                                    "/MC_Semi_Leptonic_Decay/h_521m_20423p_11p_energy",
+                                                                                                    "/MC_Semi_Leptonic_Decay/h_521m_20423p_11p_scale"]
+analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^{0}_1(2430) \\mu^+\\nu_\\mu$" ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_20423m_13m_energy",
+                                                                                                    "/MC_Semi_Leptonic_Decay/h_521p_20423m_13m_scale",
+                                                                                                    "/MC_Semi_Leptonic_Decay/h_521m_20423p_13p_energy",
                                                                                                     "/MC_Semi_Leptonic_Decay/h_521m_20423p_13p_scale"]
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^{0}_1(2420) e^+\\nu_e$"       ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_10423m_11m_energy",
-                                                                                                    "/MC_Semi_Leptonic_Decay/h_521p_10423m_11m_scale"]
-analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^{0}_1(2420) \\mu^+\\nu_\\mu$" ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521m_10423p_13p_energy",
+                                                                                                    "/MC_Semi_Leptonic_Decay/h_521p_10423m_11m_scale",
+                                                                                                    "/MC_Semi_Leptonic_Decay/h_521m_10423p_11p_energy",
+                                                                                                    "/MC_Semi_Leptonic_Decay/h_521m_10423p_11p_scale"]
+analyses["HadronDecays"][521]["Modes"]["$B^+\\to\\bar{D}^{0}_1(2420) \\mu^+\\nu_\\mu$" ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_521p_10423m_13m_energy",
+                                                                                                    "/MC_Semi_Leptonic_Decay/h_521p_10423m_13m_scale",
+                                                                                                    "/MC_Semi_Leptonic_Decay/h_521m_10423p_13p_energy",
                                                                                                     "/MC_Semi_Leptonic_Decay/h_521m_10423p_13p_scale"]
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{*-}_0(2400) e^+\\nu_e$"       ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511p_10411m_11m_energy",
-                                                                                               "/MC_Semi_Leptonic_Decay/h_511p_10411m_11m_scale"]
-analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{*-}_0(2400) \\mu^+\\nu_\\mu$" ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511m_10411p_13p_energy",
+                                                                                               "/MC_Semi_Leptonic_Decay/h_511p_10411m_11m_scale",
+                                                                                               "/MC_Semi_Leptonic_Decay/h_511m_10411p_11p_energy",
+                                                                                               "/MC_Semi_Leptonic_Decay/h_511m_10411p_11p_scale"]
+analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{*-}_0(2400) \\mu^+\\nu_\\mu$" ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511p_10411m_13m_energy",
+                                                                                               "/MC_Semi_Leptonic_Decay/h_511p_10411m_13m_scale",
+                                                                                               "/MC_Semi_Leptonic_Decay/h_511m_10411p_13p_energy",
                                                                                                "/MC_Semi_Leptonic_Decay/h_511m_10411p_13p_scale"]
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{-}_1(2430) e^+\\nu_e$"        ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511p_20413m_11m_energy",
-                                                                                               "/MC_Semi_Leptonic_Decay/h_511p_20413m_11m_scale"]
-analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{-}_1(2430) \\mu^+\\nu_\\mu$"  ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511m_20413p_13p_energy",
+                                                                                               "/MC_Semi_Leptonic_Decay/h_511p_20413m_11m_scale",
+                                                                                               "/MC_Semi_Leptonic_Decay/h_511m_20413p_11p_energy",
+                                                                                               "/MC_Semi_Leptonic_Decay/h_511m_20413p_11p_scale"]
+analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{-}_1(2430) \\mu^+\\nu_\\mu$"  ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511p_20413m_13m_energy",
+                                                                                               "/MC_Semi_Leptonic_Decay/h_511p_20413m_13m_scale",
+                                                                                               "/MC_Semi_Leptonic_Decay/h_511m_20413p_13p_energy",
                                                                                                "/MC_Semi_Leptonic_Decay/h_511m_20413p_13p_scale"]
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{-}_1(2420) e^+\\nu_e$"        ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511p_10413m_11m_energy",
-                                                                                               "/MC_Semi_Leptonic_Decay/h_511p_10413m_11m_scale"]
-analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{-}_1(2420) \\mu^+\\nu_\\mu$"  ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511m_10413p_13p_energy",
+                                                                                               "/MC_Semi_Leptonic_Decay/h_511p_10413m_11m_scale",
+                                                                                               "/MC_Semi_Leptonic_Decay/h_511m_10413p_11p_energy",
+                                                                                               "/MC_Semi_Leptonic_Decay/h_511m_10413p_11p_scale"]
+analyses["HadronDecays"][511]["Modes"]["$B^0\\to D^{-}_1(2420) \\mu^+\\nu_\\mu$"  ]["MC"  ] = ["/MC_Semi_Leptonic_Decay/h_511p_10413m_13m_energy",
+                                                                                               "/MC_Semi_Leptonic_Decay/h_511p_10413m_13m_scale",
+                                                                                               "/MC_Semi_Leptonic_Decay/h_511m_10413p_13p_energy",
                                                                                                "/MC_Semi_Leptonic_Decay/h_511m_10413p_13p_scale"]
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to K^{*0} e^+e^-$"      ]["MC"  ] = ["/MC_Meson_Meson_Leptons_Decay/h2_511p_313p_11_mVf",
                                                                                    "/MC_Meson_Meson_Leptons_Decay/h2_511p_313p_11_mVfbar",
                                                                                    "/MC_Meson_Meson_Leptons_Decay/h2_511p_313p_11_mff"]
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to K^{*0} \\mu^+\\mu^-$"]["MC"  ] = ["/MC_Meson_Meson_Leptons_Decay/h2_511p_313p_13_mVf",
                                                                                    "/MC_Meson_Meson_Leptons_Decay/h2_511p_313p_13_mVfbar",
                                                                                    "/MC_Meson_Meson_Leptons_Decay/h2_511p_313p_13_mff"]
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to K^0 e^+e^-$"      ]["MC"  ] = ["/MC_Meson_Meson_Leptons_Decay/h_511p_311p_11_mPf",
                                                                                 "/MC_Meson_Meson_Leptons_Decay/h_511p_311p_11_mPfbar",
                                                                                 "/MC_Meson_Meson_Leptons_Decay/h_511p_311p_11_mff",
                                                                                 "/MC_Meson_Meson_Leptons_Decay/h_511m_311m_11_mPf",
                                                                                 "/MC_Meson_Meson_Leptons_Decay/h_511m_311m_11_mPfbar",
                                                                                 "/MC_Meson_Meson_Leptons_Decay/h_511m_311m_11_mff"]
 analyses["HadronDecays"][511]["Modes"]["$B^0\\to K^0 \\mu^+\\mu^-$"]["MC"  ] = ["/MC_Meson_Meson_Leptons_Decay/h_511m_311m_13_mPf",
                                                                                 "/MC_Meson_Meson_Leptons_Decay/h_511m_311m_13_mPfbar",
                                                                                 "/MC_Meson_Meson_Leptons_Decay/h_511m_311m_13_mff"]
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to K^{*+} e^+e^-$"      ]["MC"  ] = ["/MC_Meson_Meson_Leptons_Decay/h2_521m_323m_11_mVf",
                                                                                    "/MC_Meson_Meson_Leptons_Decay/h2_521m_323m_11_mff",
                                                                                    "/MC_Meson_Meson_Leptons_Decay/h2_521m_323m_11_mVfbar"]
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to K^{*+} \\mu^+\\mu^-$"]["MC"  ] = []
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to K^- e^+e^-$"         ]["MC"  ] = []
 analyses["HadronDecays"][521]["Modes"]["$B^+\\to K^- \\mu^+\\mu^-$"   ]["MC"  ] = ["/MC_Meson_Meson_Leptons_Decay/h_521m_321m_13_mPfbar",
                                                                                    "/MC_Meson_Meson_Leptons_Decay/h_521m_321m_13_mff",
                                                                                    "/MC_Meson_Meson_Leptons_Decay/h_521m_321m_13_mPf"]
 analyses["HadronDecays"][511]["Modes"]["$B\\to X_s\\gamma$"]["data"]=["/BELLE_2015_I1330289/d01-x01-y02"]
 # charmonium
 analyses["HadronDecays"][443] = { "Modes" : { "$J/\\psi\\to\\eta e^+e^-$"                   : {},
                                               "$J/\\psi\\to\\gamma e^+e^-$"                 : {},
+                                              "$J/\\psi\\to\\gamma \\mu^+\\mu^-$"           : {},
                                               "$J/\\psi\\to p\\bar{p}$"                     : {},
                                               "$J/\\psi\\to n\\bar{n}$"                     : {},
                                               "$J/\\psi\\to \\Sigma^{*-}\\bar\\Sigma^{*+}$" : {},
                                               "$J/\\psi\\to \\Sigma^{*0}\\bar\\Sigma^{*0}$" : {},
                                               "$J/\\psi\\to \\Sigma^{*+}\\bar\\Sigma^{*-}$" : {},
                                               "$J/\\psi\\to \\Xi^{-}\\bar\\Xi^{+}$"         : {},
+                                              "$J/\\psi\\to \\Xi^{*-}\\bar\\Xi^{*+}$"       : {},
                                               "$J/\\psi\\to \\Xi^{0}\\bar\\Xi^{0}$"         : {},
                                               "$J/\\psi\\to \\Lambda^{0}\\bar\\Lambda^{0}$" : {},
+                                              "$J/\\psi\\to \\Lambda^{0}\\bar\\Sigma^{0}$"  : {},
                                               "$J/\\psi\\to \\Sigma^{0}\\bar\\Sigma^{0}$"   : {},
 }}
 
 analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to\\eta e^+e^-$"  ]["data"] = ["/BESIII_2018_I1697377/d01-x01-y01"]
 analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to\\gamma e^+e^-$"]["MC"  ] = ["/MC_Meson_Meson_Leptons_Decay/h2_443p_22p_11_mVf",
                                                                                  "/MC_Meson_Meson_Leptons_Decay/h2_443p_22p_11_mVfbar",
                                                                                  "/MC_Meson_Meson_Leptons_Decay/h2_443p_22p_11_mff"]
+analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to\\gamma \\mu^+\\mu^-$"]["MC"  ] = ["/MC_Meson_Meson_Leptons_Decay/h2_443p_22p_13_mVf",
+                                                                                       "/MC_Meson_Meson_Leptons_Decay/h2_443p_22p_13_mVfbar",
+                                                                                       "/MC_Meson_Meson_Leptons_Decay/h2_443p_22p_13_mff"]
 analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to p\\bar{p}$"  ]["data"] = ["/BESIII_2012_I1113599/d01-x01-y01"]
 analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to p\\bar{p}$"  ]["MC"]   = ["/BESIII_2012_I1113599/ctheta_p"]
 analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to n\\bar{n}$"  ]["data"] = ["/BESIII_2012_I1113599/d01-x01-y02"]
 analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to n\\bar{n}$"  ]["MC"]   = ["/BESIII_2012_I1113599/ctheta_n"]
 analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to \\Sigma^{*-}\\bar\\Sigma^{*+}$"]["data"] = ["/BESIII_2016_I1422780/d02-x01-y02","/BESIII_2016_I1422780/d01-x01-y03"]
 analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to \\Sigma^{*0}\\bar\\Sigma^{*0}$"]["data"] = ["/BESIII_2017_I1506414/d01-x01-y01","/BESIII_2017_I1506414/d02-x01-y01"]
 analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to \\Sigma^{*+}\\bar\\Sigma^{*-}$"]["data"] = ["/BESIII_2016_I1422780/d02-x01-y03","/BESIII_2016_I1422780/d01-x01-y03"]
 analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to \\Xi^{-}\\bar\\Xi^{+}$"        ]["data"] = ["/BESIII_2016_I1422780/d02-x01-y01","/BESIII_2016_I1422780/d01-x01-y03"]
 analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to \\Xi^{0}\\bar\\Xi^{0}$"        ]["data"] = ["/BESIII_2017_I1506414/d01-x01-y02","/BESIII_2017_I1506414/d02-x02-y01"]
 analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to \\Lambda^{0}\\bar\\Lambda^{0}$"]["data"] = ["/BESIII_2017_I1510563/d01-x01-y01","/BESIII_2017_I1510563/d02-x01-y01",
                                                                                                  "/BESIII_2019_I1691850/d01-x01-y01","/BESIII_2019_I1691850/d01-x02-y01",
                                                                                                  "/BESIII_2019_I1691850/d01-x03-y01","/BESIII_2019_I1691850/d01-x04-y01",
                                                                                                  "/BESIII_2019_I1691850/d01-x05-y01",]
+analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to \\Lambda^{0}\\bar\\Sigma^{0}$" ]["data"] = ["/BESIII_2012_I1121378/d01-x01-y01","/BESIII_2012_I1121378/d01-x01-y02",
+                                                                                                 "/BESIII_2012_I1121378/d05-x01-y01",]
 analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to \\Lambda^{0}\\bar\\Lambda^{0}$"]["MC"  ] = ["/BESIII_2019_I1691850/T1_n","/BESIII_2019_I1691850/T1_p",
                                                                                                  "/BESIII_2019_I1691850/T2_n","/BESIII_2019_I1691850/T2_p",
                                                                                                  "/BESIII_2019_I1691850/T3_n","/BESIII_2019_I1691850/T3_p",
                                                                                                  "/BESIII_2019_I1691850/T4_n","/BESIII_2019_I1691850/T4_p",
                                                                                                  "/BESIII_2019_I1691850/T5_n","/BESIII_2019_I1691850/T5_p",
                                                                                                  "/BESIII_2019_I1691850/mu_n","/BESIII_2019_I1691850/mu_p",
                                                                                                  "/BESIII_2019_I1691850/cThetaL",]
 analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to \\Sigma^{0}\\bar\\Sigma^{0}$"  ]["data"] = ["/BESIII_2017_I1510563/d01-x01-y03","/BESIII_2017_I1510563/d02-x02-y01"]
+analyses["HadronDecays"][443]["Modes"]["$J/\\psi\\to \\Xi^{*-}\\bar\\Xi^{*+}$"      ]["data"] = ["/BESIII_2019_I1765606/d02-x01-y01","/BESIII_2019_I1765606/d01-x01-y01"]
 
 # eta_c
 analyses["HadronDecays"][441] = {"DistChargedMult" : {}}
 
 analyses["HadronDecays"][441]["DistChargedMult"]["data"] = ["/BESIII_2019_I1724880/d01-x01-y01"]
 # psi(3770)
 analyses["HadronDecays"][30443] = { "Modes" : { "$\\psi(3770)\\to J/\\psi\\pi^0\\pi^0$" : {},
                                                 "$\\psi(3770)\\to J/\\psi\\pi^+\\pi^-$" : {},}}
 analyses["HadronDecays"][30443]["Modes"]["$\\psi(3770)\\to J/\\psi\\pi^0\\pi^0$"]["MC"  ] = ["/MC_Onium_PiPi_Decay/h_30443_443_mpi0pi0","/MC_Onium_PiPi_Decay/h_30443_443_hpi0pi0"]
 analyses["HadronDecays"][30443]["Modes"]["$\\psi(3770)\\to J/\\psi\\pi^+\\pi^-$"]["MC"  ] = ["/MC_Onium_PiPi_Decay/h_30443_443_hpippim","/MC_Onium_PiPi_Decay/h_30443_443_mpippim"]
 
 # psi(2S)
 analyses["HadronDecays"][100443] = { "Modes" : { "$\\psi(2S)\\to p\\bar{p}$"     : {},
                                                  "$\\psi(2S)\\to n\\bar{n}$"     : {},
                                                  "$\\psi(2S)\\to \\Sigma^{*-}\\bar\\Sigma^{*+}$" : {},
                                                  "$\\psi(2S)\\to \\Sigma^{*0}\\bar\\Sigma^{*0}$" : {},
                                                  "$\\psi(2S)\\to \\Sigma^{*+}\\bar\\Sigma^{*-}$" : {},
                                                  "$\\psi(2S)\\to \\Xi^{-}\\bar\\Xi^{+}$"         : {},
+                                                 "$\\psi(2S)\\to \\Xi^{*-}\\bar\\Xi^{*+}$"       : {},
                                                  "$\\psi(2S)\\to \\Xi^{0}\\bar\\Xi^{0}$"         : {},
                                                  "$\\psi(2S)\\to \\Lambda^{0}\\bar\\Lambda^{0}$" : {},
-                                                 "$\\psi(2S)\\to \\Sigma^{0}\\bar\\Sigma^{0}$"   : {}, }}
+                                                 "$\\psi(2S)\\to \\Sigma^{0}\\bar\\Sigma^{0}$"   : {},
+                                                 "$\\psi(2S)\\to J/\\psi\\pi^+\\pi^-$"           : {},
+                                                 "$\\psi(2S)\\to J/\\psi\\pi^0\\pi^0$"           : {},}}
+
 analyses["HadronDecays"][100443]["Modes"]["$\\psi(2S)\\to p\\bar{p}$"  ]["data"] = ["/BESIII_2018_I1658762/d01-x01-y01"]
 analyses["HadronDecays"][100443]["Modes"]["$\\psi(2S)\\to p\\bar{p}$"  ]["MC"]   = ["/BESIII_2018_I1658762/ctheta_p"]
 analyses["HadronDecays"][100443]["Modes"]["$\\psi(2S)\\to n\\bar{n}$"  ]["data"] = ["/BESIII_2018_I1658762/d01-x01-y02"]
 analyses["HadronDecays"][100443]["Modes"]["$\\psi(2S)\\to n\\bar{n}$"  ]["MC"]   = ["/BESIII_2018_I1658762/ctheta_n"]
 analyses["HadronDecays"][100443]["Modes"]["$\\psi(2S)\\to \\Sigma^{*-}\\bar\\Sigma^{*+}$"]["data"] = ["/BESIII_2016_I1422780/d02-x01-y05","/BESIII_2016_I1422780/d01-x01-y03"]
 analyses["HadronDecays"][100443]["Modes"]["$\\psi(2S)\\to \\Sigma^{*0}\\bar\\Sigma^{*0}$"]["data"] = ["/BESIII_2017_I1506414/d01-x01-y03","/BESIII_2017_I1506414/d02-x03-y01"]
 analyses["HadronDecays"][100443]["Modes"]["$\\psi(2S)\\to \\Sigma^{*+}\\bar\\Sigma^{*-}$"]["data"] = ["/BESIII_2016_I1422780/d02-x01-y06","/BESIII_2016_I1422780/d01-x01-y03"]
 analyses["HadronDecays"][100443]["Modes"]["$\\psi(2S)\\to \\Xi^{-}\\bar\\Xi^{+}$"        ]["data"] = ["/BESIII_2016_I1422780/d02-x01-y04","/BESIII_2016_I1422780/d01-x01-y03"]
 analyses["HadronDecays"][100443]["Modes"]["$\\psi(2S)\\to \\Xi^{0}\\bar\\Xi^{0}$"        ]["data"] = ["/BESIII_2017_I1506414/d01-x01-y04","/BESIII_2017_I1506414/d02-x04-y01"]
 analyses["HadronDecays"][100443]["Modes"]["$\\psi(2S)\\to \\Lambda^{0}\\bar\\Lambda^{0}$"]["data"] = ["/BESIII_2017_I1510563/d01-x01-y02","/BESIII_2017_I1510563/d02-x03-y01"]
 analyses["HadronDecays"][100443]["Modes"]["$\\psi(2S)\\to \\Sigma^{0}\\bar\\Sigma^{0}$"  ]["data"] = ["/BESIII_2017_I1510563/d01-x01-y04","/BESIII_2017_I1510563/d02-x04-y01"]
+analyses["HadronDecays"][100443]["Modes"]["$\\psi(2S)\\to \\Xi^{*-}\\bar\\Xi^{*+}$"      ]["data"] = ["/BESIII_2019_I1747092/d01-x01-y01","/BESIII_2019_I1747092/d01-x01-y02",
+                                                                                                      "/BESIII_2019_I1747092/d02-x01-y01"]
+
+analyses["HadronDecays"][100443]["Modes"]["$\\psi(2S)\\to J/\\psi\\pi^+\\pi^-$"]["data"] = ["/MARKII_1979_I144382/d01-x01-y01","/BES_1999_I507637/d01-x01-y01",
+                                                                                            "/BES_1999_I507637/d01-x01-y02","/BES_1999_I507637/d01-x01-y03","/BES_1999_I507637/d01-x01-y04"]
+analyses["HadronDecays"][100443]["Modes"]["$\\psi(2S)\\to J/\\psi\\pi^0\\pi^0$"]["MC"  ] = ["/MC_Onium_PiPi_Decay/h_100443_443_hpi0pi0",
+                                                                                            "/MC_Onium_PiPi_Decay/h_100443_443_mpi0pi0"]
+analyses["HadronDecays"][100443]["Modes"]["$\\psi(2S)\\to J/\\psi\\pi^+\\pi^-$"]["MC"  ] = ["/MC_Onium_PiPi_Decay/h_100443_443_hpippim",
+                                                                                            "/MC_Onium_PiPi_Decay/h_100443_443_mpippim"]
+
+
+
 # bottomonium
 # upsilon(1s)
-analyses["HadronDecays"][553] = { "Mult" : {}, "Spectrum" : {} }
+analyses["HadronDecays"][553] = { "Mult" : {}, "Spectrum" : {}, "Shapes" : [] }
+analyses["HadronDecays"][553]["Shapes"]=["/ARGUS_1986_I227324/d01-x01-y01","/ARGUS_1986_I227324/d02-x01-y01","/LENA_1981_I164397/d04-x01-y03"]
 analyses["HadronDecays"][553]["Mult"][3122   ] = ["/ARGUS_1988_I251097/d01-x01-y01"]
 analyses["HadronDecays"][553]["Mult"][3312   ] = ["/ARGUS_1988_I251097/d01-x01-y02"]
 analyses["HadronDecays"][553]["Mult"][3212   ] = ["/ARGUS_1988_I251097/d01-x01-y03"]
 analyses["HadronDecays"][553]["Mult"][3114   ] = ["/ARGUS_1988_I251097/d01-x01-y04"]
 analyses["HadronDecays"][553]["Mult"][3224   ] = ["/ARGUS_1988_I251097/d01-x01-y05"]
 analyses["HadronDecays"][553]["Mult"][3324   ] = ["/ARGUS_1988_I251097/d01-x01-y06"]
 analyses["HadronDecays"][553]["Mult"][3334   ] = ["/ARGUS_1988_I251097/d01-x01-y07"]
 analyses["HadronDecays"][553]["Mult"][333    ] = ["/ARGUS_1989_I262551/d03-x01-y01","/ARGUS_1993_S2789213/d02-x01-y05"]
 analyses["HadronDecays"][553]["Mult"][211    ] = ["/ARGUS_1989_I276860/d01-x01-y01","/ARGUS_1989_I276860/d01-x01-y02"]
 analyses["HadronDecays"][553]["Mult"][311    ] = ["/ARGUS_1989_I276860/d02-x01-y01"]
 analyses["HadronDecays"][553]["Mult"][321    ] = ["/ARGUS_1989_I276860/d03-x01-y01"]
 analyses["HadronDecays"][553]["Mult"][2212   ] = ["/ARGUS_1989_I276860/d04-x01-y01","/ARGUS_1989_I276860/d04-x01-y02"]
 analyses["HadronDecays"][553]["Mult"][111    ] = ["/ARGUS_1990_I278933/d01-x01-y02"]
 analyses["HadronDecays"][553]["Mult"][221    ] = ["/ARGUS_1990_I278933/d02-x01-y02"]
-analyses["HadronDecays"][553]["Mult"][331    ] = ["/ARGUS_1993_S2669951/d01-x01-y01","/ARGUS_1993_S2669951/d01-x01-y02"]
+analyses["HadronDecays"][553]["Mult"][331    ] = ["/ARGUS_1993_S2669951/d01-x01-y01","/ARGUS_1993_S2669951/d01-x01-y02",
+                                                  "/CLEOII_2002_I601701/d02-x01-y03","/CLEOIII_2006_I728679/d02-x01-y01"]
 analyses["HadronDecays"][553]["Mult"][113    ] = ["/ARGUS_1993_S2789213/d02-x01-y02"]
 analyses["HadronDecays"][553]["Mult"][223    ] = ["/ARGUS_1993_S2789213/d02-x01-y01"]
 analyses["HadronDecays"][553]["Mult"][313    ] = ["/ARGUS_1993_S2789213/d02-x01-y03"]
 analyses["HadronDecays"][553]["Mult"][323    ] = ["/ARGUS_1993_S2789213/d02-x01-y04"]
 analyses["HadronDecays"][553]["Mult"][9010221] = ["/ARGUS_1993_S2669951/d05-x01-y01"]
+analyses["HadronDecays"][553]["Mult"][3124   ] = ["/ARGUS_1989_I262415/d01-x01-y01",
+                                                  "/ARGUS_1989_I262415/d01-x02-y01"]
 analyses["HadronDecays"][553]["Spectrum"][3122] = ["/ARGUS_1988_I251097/d03-x01-y01"]
 analyses["HadronDecays"][553]["Spectrum"][3312] = ["/ARGUS_1988_I251097/d07-x01-y01"]
 analyses["HadronDecays"][553]["Spectrum"][3124] = ["/ARGUS_1989_I262415/d03-x01-y01"]
 analyses["HadronDecays"][553]["Spectrum"][333 ] = ["/ARGUS_1989_I262551/d02-x01-y01"]
 analyses["HadronDecays"][553]["Spectrum"][211 ] = ["/ARGUS_1989_I276860/d05-x01-y01","/ARGUS_1989_I276860/d09-x01-y01"]
 analyses["HadronDecays"][553]["Spectrum"][321 ] = ["/ARGUS_1989_I276860/d06-x01-y01","/ARGUS_1989_I276860/d10-x01-y01"]
 analyses["HadronDecays"][553]["Spectrum"][311 ] = ["/ARGUS_1989_I276860/d07-x01-y01","/ARGUS_1989_I276860/d11-x01-y01",
                                                    "/PLUTO_1981_I165122/d06-x01-y01"]
 analyses["HadronDecays"][553]["Spectrum"][2212] = ["/ARGUS_1989_I276860/d08-x01-y01","/ARGUS_1989_I276860/d12-x01-y01"]
 analyses["HadronDecays"][553]["Spectrum"][111 ] = ["/ARGUS_1990_I278933/d04-x01-y01"]
 analyses["HadronDecays"][553]["Spectrum"][221 ] = ["/ARGUS_1990_I278933/d06-x01-y01"]
 analyses["HadronDecays"][553]["Spectrum"][9010221] = ["/ARGUS_1993_S2669951/d03-x01-y01"]
-analyses["HadronDecays"][553]["Spectrum"][323] = ["/ARGUS_1993_S2789213/d05-x01-y01"]
-analyses["HadronDecays"][553]["Spectrum"][313] = ["/ARGUS_1993_S2789213/d08-x01-y01"]
-analyses["HadronDecays"][553]["Spectrum"][113] = ["/ARGUS_1993_S2789213/d11-x01-y01"]
-analyses["HadronDecays"][553]["Spectrum"][223] = ["/ARGUS_1993_S2789213/d14-x01-y01"]
+analyses["HadronDecays"][553]["Spectrum"][323    ] = ["/ARGUS_1993_S2789213/d05-x01-y01"]
+analyses["HadronDecays"][553]["Spectrum"][313    ] = ["/ARGUS_1993_S2789213/d08-x01-y01"]
+analyses["HadronDecays"][553]["Spectrum"][113    ] = ["/ARGUS_1993_S2789213/d11-x01-y01"]
+analyses["HadronDecays"][553]["Spectrum"][223    ] = ["/ARGUS_1993_S2789213/d14-x01-y01"]
+analyses["HadronDecays"][553]["Spectrum"][331    ] = ["/CLEOII_2002_I601701/d01-x01-y03","/CLEOIII_2006_I728679/d01-x01-y01"]
+analyses["HadronDecays"][553]["Spectrum"][413    ] = ["/BABAR_2009_I836615/d01-x01-y01"]
 # upsion(2s)
-analyses["HadronDecays"][100553] = { "Mult" : {}, "Spectrum" : {},
+analyses["HadronDecays"][100553] = { "Mult" : {}, "Spectrum" : {}, "Shapes" : [], "Other" : [],
                                      "Modes" : { "$\\Upsilon(2S)\\to J/\\psi\\pi^0\\pi^0$" : {},
                                                  "$\\Upsilon(2S)\\to J/\\psi\\pi^+\\pi^-$" : {},
                                                  "$\\Upsilon(2S)\\to \\Upsilon(1S))\\pi^0\\pi^0$" : {},
                                                  "$\\Upsilon(2S)\\to \\Upsilon(1S)\\pi^+\\pi^-$"  : {},}}
+analyses["HadronDecays"][100553]["Shapes"] = ["/LENA_1981_I164397/d04-x01-y04"]
+analyses["HadronDecays"][100553]["Other"] = ["/CLEOII_2002_I606309/d01-x01-y01","/CLEOII_2002_I606309/d01-x01-y02",
+                                             "/CLEOII_2002_I606309/d02-x01-y01","/CLEOII_2002_I606309/d04-x01-y01","/CLEOII_2002_I606309/d04-x01-y02"]
 analyses["HadronDecays"][100553]["Mult"][111]= ["/ARGUS_1990_I278933/d01-x01-y03"]
 analyses["HadronDecays"][100553]["Mult"][221]= ["/ARGUS_1990_I278933/d02-x01-y03"]
 analyses["HadronDecays"][100553]["Mult"][333]= ["/ARGUS_1989_I262551/d04-x01-y01"]
 analyses["HadronDecays"][100553]["Spectrum"][3122] = ["/ARGUS_1988_I251097/d04-x01-y01"]
 analyses["HadronDecays"][100553]["Spectrum"][3312] = ["/ARGUS_1988_I251097/d08-x01-y01"]
 analyses["HadronDecays"][100553]["Spectrum"][333 ] = ["/ARGUS_1989_I262551/d02-x01-y02"]
 analyses["HadronDecays"][100553]["Spectrum"][111 ] = ["/ARGUS_1990_I278933/d04-x01-y02"]
 analyses["HadronDecays"][100553]["Spectrum"][221 ] = ["/ARGUS_1990_I278933/d06-x01-y02"]
 analyses["HadronDecays"][100553]["Spectrum"][9010221] = ["/ARGUS_1993_S2669951/d04-x01-y01"]
-analyses["HadronDecays"][100553]["Modes"]["$\\Upsilon(2S)\\to J/\\psi\\pi^0\\pi^0$"]["MC"] = ["/MC_Onium_PiPi_Decay/h_100443_443_hpi0pi0",
-                                                                                              "/MC_Onium_PiPi_Decay/h_100443_443_mpi0pi0"]
-analyses["HadronDecays"][100553]["Modes"]["$\\Upsilon(2S)\\to J/\\psi\\pi^+\\pi^-$"]["MC"] = ["/MC_Onium_PiPi_Decay/h_100443_443_hpippim",
-                                                                                              "/MC_Onium_PiPi_Decay/h_100443_443_mpippim"]
+analyses["HadronDecays"][100553]["Modes"]["$\\Upsilon(2S)\\to \\Upsilon(1S))\\pi^0\\pi^0$"]["data"] = ["/CLEOII_1998_I467642/d03-x01-y01"]
 analyses["HadronDecays"][100553]["Modes"]["$\\Upsilon(2S)\\to \\Upsilon(1S))\\pi^0\\pi^0$"]["MC"] = ["/MC_Onium_PiPi_Decay/h_100553_553_mpi0pi0",
                                                                                                      "/MC_Onium_PiPi_Decay/h_100553_553_hpi0pi0"]
-analyses["HadronDecays"][100553]["Modes"]["$\\Upsilon(2S)\\to \\Upsilon(1S)\\pi^+\\pi^-$" ]["MC"] = ["/MC_Onium_PiPi_Decay/h_100553_553_mpippim",
-                                                                                                     "/MC_Onium_PiPi_Decay/h_100553_553_hpippim"]
+analyses["HadronDecays"][100553]["Modes"]["$\\Upsilon(2S)\\to \\Upsilon(1S)\\pi^+\\pi^-$" ]["data"] = ["/CUSB_1984_I199809/d01-x01-y01",
+                                                                                                       "/CLEOII_1998_I467642/d01-x01-y01","/CLEOII_1998_I467642/d02-x01-y01",
+                                                                                                       "/CLEOII_1998_I467642/d04-x01-y01","/CLEOII_1998_I467642/d04-x01-y02",
+                                                                                                       "/CLEOII_1998_I467642/d05-x01-y01","/CLEOII_1998_I467642/d05-x01-y02",
+                                                                                                       "/CLEOII_1998_I467642/d06-x01-y01","/CLEOII_1998_I467642/d06-x01-y02",
+                                                                                                       "/CLEOII_1994_I356001/d04-x01-y01","/CLEOII_1994_I356001/d04-x01-y02"]
+analyses["HadronDecays"][100553]["Modes"]["$\\Upsilon(2S)\\to \\Upsilon(1S)\\pi^+\\pi^-$" ]["MC"  ] = ["/MC_Onium_PiPi_Decay/h_100553_553_mpippim",
+                                                                                                       "/MC_Onium_PiPi_Decay/h_100553_553_hpippim"]
+# Upsilon 3S
+analyses["HadronDecays"][200553] = { "Modes" : {"$\\Upsilon(3S)\\to\\Upsilon(1S)\\pi^0\\pi^0$" : {},
+                                                "$\\Upsilon(3S)\\to\\Upsilon(1S)\\pi^+\\pi^-$" : {},
+                                                "$\\Upsilon(3S)\\to\\Upsilon(2S)\\pi^0\\pi^0$" : {},
+                                                "$\\Upsilon(3S)\\to\\Upsilon(2S)\\pi^+\\pi^-$" : {}}}
+analyses["HadronDecays"][200553]["Modes"]["$\\Upsilon(3S)\\to\\Upsilon(1S)\\pi^0\\pi^0$"]["data"]=["/CLEOII_1994_I356001/d01-x01-y01"]
+analyses["HadronDecays"][200553]["Modes"]["$\\Upsilon(3S)\\to\\Upsilon(1S)\\pi^+\\pi^-$"]["data"]=["/CLEOII_1994_I356001/d02-x01-y01",
+                                                                                                   "/CLEOII_1994_I356001/d02-x01-y02"]
+analyses["HadronDecays"][200553]["Modes"]["$\\Upsilon(3S)\\to\\Upsilon(2S)\\pi^0\\pi^0$"]["data"]=["/CLEOII_1994_I356001/d01-x01-y02"]
+analyses["HadronDecays"][200553]["Modes"]["$\\Upsilon(3S)\\to\\Upsilon(2S)\\pi^+\\pi^-$"]["data"]=["/CLEOII_1994_I356001/d03-x01-y01",
+                                                                                                   "/CLEOII_1994_I356001/d03-x01-y02"]
 
+analyses["HadronDecays"][200553]["Modes"]["$\\Upsilon(3S)\\to\\Upsilon(1S)\\pi^0\\pi^0$"]["MC"]=["/MC_Onium_PiPi_Decay/h_200553_553_hpi0pi0",
+                                                                                                 "/MC_Onium_PiPi_Decay/h_200553_553_mpi0pi0"]
+analyses["HadronDecays"][200553]["Modes"]["$\\Upsilon(3S)\\to\\Upsilon(1S)\\pi^+\\pi^-$"]["MC"]=["/MC_Onium_PiPi_Decay/h_200553_553_hpippim",
+                                                                                                 "/MC_Onium_PiPi_Decay/h_200553_553_mpippim"]
+analyses["HadronDecays"][200553]["Modes"]["$\\Upsilon(3S)\\to\\Upsilon(2S)\\pi^0\\pi^0$"]["MC"]=["/MC_Onium_PiPi_Decay/h_200553_100553_hpi0pi0",
+                                                                                                 "/MC_Onium_PiPi_Decay/h_200553_100553_mpi0pi0"]
+analyses["HadronDecays"][200553]["Modes"]["$\\Upsilon(3S)\\to\\Upsilon(2S)\\pi^+\\pi^-$"]["MC"]=["/MC_Onium_PiPi_Decay/h_200553_100553_hpippim",
+                                                                                                 "/MC_Onium_PiPi_Decay/h_200553_100553_mpippim"]
 # upsilon(4s)
 analyses["HadronDecays"][300553] = { "Mult" : {}, "Spectrum" : {}, "DistChargedMult" : {},
                                      "Modes" : {"$\\Upsilon(4S)\\to\\Upsilon(1S)\\pi^0\\pi^0$" : {},
                                                 "$\\Upsilon(4S)\\to\\Upsilon(1S)\\pi^+\\pi^-$" : {},
+                                                "$\\Upsilon(4S)\\to\\Upsilon(2S)\\pi^0\\pi^0$" : {},
+                                                "$\\Upsilon(4S)\\to\\Upsilon(2S)\\pi^+\\pi^-$" : {},
                                                 "$\\Upsilon(4S)\\to J/\\psi\\pi^0\\pi^0$"      : {},
                                                 "$\\Upsilon(4S)\\to J/\\psi\\pi^+\\pi^-$"      : {},}}
-analyses["HadronDecays"][300553]["Modes"]["$\\Upsilon(4S)\\to\\Upsilon(1S)\\pi^0\\pi^0$"]["MC"]=["/MC_Onium_PiPi_Decay/h_300553_100553_hpi0pi0",
+analyses["HadronDecays"][300553]["Modes"]["$\\Upsilon(4S)\\to\\Upsilon(1S)\\pi^0\\pi^0$"]["MC"]=["/MC_Onium_PiPi_Decay/h_300553_553_hpi0pi0",
+                                                                                                 "/MC_Onium_PiPi_Decay/h_300553_553_mpi0pi0"]
+analyses["HadronDecays"][300553]["Modes"]["$\\Upsilon(4S)\\to\\Upsilon(1S)\\pi^+\\pi^-$"]["MC"]=["/MC_Onium_PiPi_Decay/h_300553_553_hpippim",
+                                                                                                 "/MC_Onium_PiPi_Decay/h_300553_553_mpippim"]
+analyses["HadronDecays"][300553]["Modes"]["$\\Upsilon(4S)\\to\\Upsilon(1S)\\pi^+\\pi^-$"]["data"]=["/BELLE_2009_I810744/d01-x01-y01",
+                                                                                                   "/BABAR_2006_I714448/d01-x01-y01"]
+analyses["HadronDecays"][300553]["Modes"]["$\\Upsilon(4S)\\to\\Upsilon(2S)\\pi^0\\pi^0$"]["MC"]=["/MC_Onium_PiPi_Decay/h_300553_100553_hpi0pi0",
                                                                                                  "/MC_Onium_PiPi_Decay/h_300553_100553_mpi0pi0"]
-analyses["HadronDecays"][300553]["Modes"]["$\\Upsilon(4S)\\to\\Upsilon(1S)\\pi^+\\pi^-$"]["MC"]=["/MC_Onium_PiPi_Decay/h_300553_100553_hpippim",
+analyses["HadronDecays"][300553]["Modes"]["$\\Upsilon(4S)\\to\\Upsilon(2S)\\pi^+\\pi^-$"]["data"]=["/BABAR_2006_I714448/d01-x01-y02"]
+analyses["HadronDecays"][300553]["Modes"]["$\\Upsilon(4S)\\to\\Upsilon(2S)\\pi^+\\pi^-$"]["MC"]=["/MC_Onium_PiPi_Decay/h_300553_100553_hpippim",
                                                                                                  "/MC_Onium_PiPi_Decay/h_300553_100553_mpippim"]
 analyses["HadronDecays"][300553]["Modes"]["$\\Upsilon(4S)\\to J/\\psi\\pi^0\\pi^0$"     ]["MC"]=["/MC_Onium_PiPi_Decay/h_300553_553_hpi0pi0",
                                                                                                  "/MC_Onium_PiPi_Decay/h_300553_553_mpi0pi0"]
 analyses["HadronDecays"][300553]["Modes"]["$\\Upsilon(4S)\\to J/\\psi\\pi^+\\pi^-$"     ]["MC"]=["/MC_Onium_PiPi_Decay/h_300553_553_mpippim",
                                                                                                  "/MC_Onium_PiPi_Decay/h_300553_553_hpippim"]
-analyses["HadronDecays"][300553]["DistChargedMult"]["data"] = ["/ARGUS_1992_I319102/d03-x01-y01"]
+analyses["HadronDecays"][300553]["DistChargedMult"]["data"] = ["/ARGUS_1992_I319102/d03-x01-y01","/CLEOII_1999_I504672/d02-x01-y01"]
+analyses["HadronDecays"][300553]["Mult"]["Charged"] = ["/CLEOII_1999_I504672/d01-x01-y01","/CLEOII_1999_I504672/d01-x01-y02",
+                                                       "/CLEOII_1999_I504672/d01-x01-y03","/ARGUS_1992_I319102/d05-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   211 ] = ["/ARGUS_1993_S2653028/d07-x01-y01","/ARGUS_1993_S2653028/d08-x01-y01",
                                                      "/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d87-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   321 ] = ["/ARGUS_1993_S2653028/d09-x01-y01",
                                                      "/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d60-x01-y01",
                                                      "/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d61-x01-y01",
                                                      "/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d62-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   2212] = ["/ARGUS_1993_S2653028/d10-x01-y01","/ARGUS_1993_S2653028/d11-x01-y01",
                                                      "/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d110-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   223 ] = ["/ARGUS_1993_S2789213/d03-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   113 ] = ["/ARGUS_1993_S2789213/d03-x01-y02",
                                                      "/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d90-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   313 ] = ["/ARGUS_1993_S2789213/d03-x01-y03",
                                                      "/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d65-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   323 ] = ["/ARGUS_1993_S2789213/d03-x01-y04",
                                                      "/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d64-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   333 ] = ["/ARGUS_1993_S2789213/d03-x01-y05",
                                                      "/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d92-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   111 ] = ["/BELLE_2001_S4598261/d02-x01-y01",
                                                      "/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d88-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   4222] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d104-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   4112] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d106-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   4122] = ["/BABAR_2007_S6895344/d04-x01-y01",
                                                      "/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d96-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   3122] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d113-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   3312] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d116-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   411 ] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d29-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   421 ] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d30-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   413 ] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d31-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   423 ] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d32-x01-y01"]
-analyses["HadronDecays"][300553]["Mult"][   431 ] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d33-x01-y01"]
-analyses["HadronDecays"][300553]["Mult"][   433 ] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d34-x01-y01"]
+analyses["HadronDecays"][300553]["Mult"][   431 ] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d33-x01-y01","/BABAR_2002_I582184/d02-x01-y01"]
+analyses["HadronDecays"][300553]["Mult"][   433 ] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d34-x01-y01","/BABAR_2002_I582184/d02-x01-y02"]
 analyses["HadronDecays"][300553]["Mult"][   443 ] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d48-x01-y01",
                                                      "/BABAR_2003_I593379/d01-x01-y01","/BABAR_2003_I593379/d01-x01-y02"]
 analyses["HadronDecays"][300553]["Mult"][100443 ] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d50-x01-y01",
                                                      "/BABAR_2003_I593379/d01-x01-y07"]
 analyses["HadronDecays"][300553]["Mult"][ 20443 ] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d51-x01-y01",
                                                      "/BABAR_2003_I593379/d01-x01-y03","/BABAR_2003_I593379/d01-x01-y04"]
 analyses["HadronDecays"][300553]["Mult"][   445 ] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d53-x01-y01",
                                                      "/BABAR_2003_I593379/d01-x01-y05","/BABAR_2003_I593379/d01-x01-y06"]
 analyses["HadronDecays"][300553]["Mult"][   311 ] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d63-x01-y01"]
 analyses["HadronDecays"][300553]["Mult"][   221 ] = ["/PDG_Upsilon_4S_HADRON_MULTIPLICITIES/d89-x01-y01"]
 
 analyses["HadronDecays"][300553]["Spectrum"][111   ] = ["/BELLE_2001_S4598261/d01-x01-y01"]
 analyses["HadronDecays"][300553]["Spectrum"][211   ] = ["/ARGUS_1993_S2653028/d01-x01-y01","/ARGUS_1993_S2653028/d02-x01-y01"]
 analyses["HadronDecays"][300553]["Spectrum"][321   ] = ["/ARGUS_1993_S2653028/d03-x01-y01","/ARGUS_1993_S2653028/d06-x01-y01"]
-analyses["HadronDecays"][300553]["Spectrum"][2212  ] = ["/ARGUS_1993_S2653028/d04-x01-y01","/ARGUS_1993_S2653028/d05-x01-y01"]
+analyses["HadronDecays"][300553]["Spectrum"][2212  ] = ["/ARGUS_1993_S2653028/d04-x01-y01","/ARGUS_1993_S2653028/d05-x01-y01",
+                                                        "/CLEO_1992_I315181/d01-x01-y01"]
 analyses["HadronDecays"][300553]["Spectrum"][113   ] = ["/ARGUS_1993_S2789213/d12-x01-y01"]
-analyses["HadronDecays"][300553]["Spectrum"][4122  ] = ["/BABAR_2007_S6895344/d03-x01-y01"]
-analyses["HadronDecays"][300553]["Spectrum"][4132  ] = ["/BABAR_2005_S6181155/d01-x01-y01","/BABAR_2005_S6181155/d02-x01-y01"]
+analyses["HadronDecays"][300553]["Spectrum"][3122  ] = ["/CLEO_1992_I315181/d03-x01-y01"]
+analyses["HadronDecays"][300553]["Spectrum"][3312  ] = ["/CLEO_1992_I315181/d04-x01-y01"]
+analyses["HadronDecays"][300553]["Spectrum"][4122  ] = ["/BABAR_2007_S6895344/d03-x01-y01","/CLEO_1992_I315181/d02-x01-y01"]
+analyses["HadronDecays"][300553]["Spectrum"][4132  ] = ["/BABAR_2005_S6181155/d01-x01-y01","/BABAR_2005_S6181155/d02-x01-y01",
+                                                        "/CLEOII_1997_I442910/d01-x01-y01"]
 analyses["HadronDecays"][300553]["Spectrum"][323   ] = ["/ARGUS_1993_S2789213/d06-x01-y01"]
 analyses["HadronDecays"][300553]["Spectrum"][313   ] = ["/ARGUS_1993_S2789213/d09-x01-y01"]
-analyses["HadronDecays"][300553]["Spectrum"][443   ] = ["/BABAR_2003_I593379/d06-x01-y01","/BABAR_2003_I593379/d10-x01-y01"]
+analyses["HadronDecays"][300553]["Spectrum"][443   ] = ["/BABAR_2003_I593379/d06-x01-y01","/BABAR_2003_I593379/d10-x01-y01","/CLEOII_2002_I606309/d03-x01-y01"]
 analyses["HadronDecays"][300553]["Spectrum"][20443 ] = ["/BABAR_2003_I593379/d07-x01-y01"]
 analyses["HadronDecays"][300553]["Spectrum"][445   ] = ["/BABAR_2003_I593379/d07-x01-y02"]
-analyses["HadronDecays"][300553]["Spectrum"][100443] = ["/BABAR_2003_I593379/d08-x01-y01"]
+analyses["HadronDecays"][300553]["Spectrum"][100443] = ["/BABAR_2003_I593379/d08-x01-y01","/CLEOII_2002_I606309/d03-x01-y02"]
+analyses["HadronDecays"][300553]["Spectrum"][431   ] = ["/CLEO_2005_I1649168/d01-x01-y07","/BABAR_2002_I582184/d05-x01-y01"]
+analyses["HadronDecays"][300553]["Spectrum"][433   ] = ["/BABAR_2002_I582184/d05-x01-y02"]
+analyses["HadronDecays"][300553]["Spectrum"][333   ] = ["/CLEO_2007_I728872/d01-x01-y05"]
+analyses["HadronDecays"][300553]["Spectrum"][4232  ] = ["/CLEOII_1997_I442910/d02-x01-y01"]
+analyses["HadronDecays"][300553]["Spectrum"][11] = ["/BABAR_2017_I1498564/d01-x01-y01","/BABAR_2017_I1498564/d01-x01-y02"]
+
+# chi_b (2P)
+analyses["HadronDecays"][110551] = { "Mult" : {},"DistChargedMult" : {},"Shapes" : []}
+analyses["HadronDecays"][120553] = { "Mult" : {},"DistChargedMult" : {},"Shapes" : []}
+analyses["HadronDecays"][100555] = { "Mult" : {},"DistChargedMult" : {},"Shapes" : []}
+analyses["HadronDecays"][110551]["Mult"]["Charged"] = ["/CLEOII_1992_I32611/d01-x03-y01"]
+analyses["HadronDecays"][120553]["Mult"]["Charged"] = ["/CLEOII_1992_I32611/d01-x02-y01"]
+analyses["HadronDecays"][100555]["Mult"]["Charged"] = ["/CLEOII_1992_I32611/d01-x01-y01"]
+analyses["HadronDecays"][110551]["DistChargedMult"]["data"] = ["/CLEOII_1992_I32611/d02-x01-y01"]
+analyses["HadronDecays"][120553]["DistChargedMult"]["data"] = ["/CLEOII_1992_I32611/d02-x01-y02"]
+analyses["HadronDecays"][100555]["DistChargedMult"]["data"] = ["/CLEOII_1992_I32611/d02-x01-y03"]
+analyses["HadronDecays"][110551]["Shapes"] = ["/CLEOII_1992_I32611/d01-x03-y02","/CLEOII_1992_I32611/d03-x01-y01"]
+analyses["HadronDecays"][120553]["Shapes"] = ["/CLEOII_1992_I32611/d01-x02-y02","/CLEOII_1992_I32611/d03-x01-y02"]
+analyses["HadronDecays"][100555]["Shapes"] = ["/CLEOII_1992_I32611/d01-x01-y02","/CLEOII_1992_I32611/d03-x01-y03"]
+
+# upsilon(5s)
+analyses["HadronDecays"][400553] = {"Spectrum" : {}}
+analyses["HadronDecays"][400553]["Spectrum"][431   ] = ["/CLEO_2005_I1649168/d01-x01-y08"]
+analyses["HadronDecays"][400553]["Spectrum"][333   ] = ["/CLEO_2007_I728872/d02-x01-y05" ]
 #
 analyses["HadronDecays"][3312] = { "Modes" : { "$\\Xi^-\\to\\Lambda^0\\pi^-$" : {} } }
-analyses["HadronDecays"][3312]["Modes"]["$\\Xi^-\\to\\Lambda^0\\pi^-$"]["data"] = ["/E756_2000_I530367/d01-x01-y01","/E756_2000_I530367/d01-x01-y02"]
+analyses["HadronDecays"][3312]["Modes"]["$\\Xi^-\\to\\Lambda^0\\pi^-$"]["data"] = ["/E756_2000_I530367/d01-x01-y01","/E756_2000_I530367/d01-x01-y02",
+                                                                                   "/CLEOII_2000_I533575/d01-x01-y01","/CLEOII_2000_I533575/d01-x01-y02",
+                                                                                   "/CLEOII_2000_I533575/d02-x01-y01","/CLEOII_2000_I533575/d02-x01-y02"]
 analyses["HadronDecays"][3312]["Modes"]["$\\Xi^-\\to\\Lambda^0\\pi^-$"]["MC"  ] = ["/E756_2000_I530367/cthetaP","/E756_2000_I530367/cthetaM"]
 analyses["HadronDecays"][3322] = { "Modes" : { "$\\Xi^0\\to\\Lambda^0\\pi^0$" : {}, "$\\Xi^0\\to\\Sigma^0\\gamma$" : {},
                                                "$\\Xi^0\\to\\Lambda^0\\gamma$" : {} } }
 analyses["HadronDecays"][3322]["Modes"]["$\\Xi^0\\to\\Lambda^0\\pi^0$"]["data"] = ["/NA48_2010_I868871/d01-x01-y01"]
 analyses["HadronDecays"][3322]["Modes"]["$\\Xi^0\\to\\Lambda^0\\pi^0$"]["MC"  ] = ["/NA48_2010_I868871/ctheta_pi0"]
 analyses["HadronDecays"][3322]["Modes"]["$\\Xi^0\\to\\Lambda^0\\gamma$"]["data"] = ["/NA48_2010_I868871/d02-x01-y01"]
 analyses["HadronDecays"][3322]["Modes"]["$\\Xi^0\\to\\Lambda^0\\gamma$"]["MC"  ] = ["/NA48_2010_I868871/ctheta_gamma"]
 analyses["HadronDecays"][3322]["Modes"]["$\\Xi^0\\to\\Sigma^0\\gamma$"]["data"] = ["/NA48_2010_I868871/d03-x01-y01"]
 analyses["HadronDecays"][3322]["Modes"]["$\\Xi^0\\to\\Sigma^0\\gamma$"]["MC"  ] = ["/NA48_2010_I868871/ctheta_Sigma_0" ,"/NA48_2010_I868871/ctheta_Sigma_1" ,
                                                                                    "/NA48_2010_I868871/ctheta_Sigma_2" ,"/NA48_2010_I868871/ctheta_Sigma_3" ,
                                                                                    "/NA48_2010_I868871/ctheta_Sigma_4" ,"/NA48_2010_I868871/ctheta_Sigma_5" ,
                                                                                    "/NA48_2010_I868871/ctheta_Sigma_6" ,"/NA48_2010_I868871/ctheta_Sigma_7" ,
                                                                                    "/NA48_2010_I868871/ctheta_Sigma_8" ,"/NA48_2010_I868871/ctheta_Sigma_9" ,
                                                                                    "/NA48_2010_I868871/ctheta_Sigma_10","/NA48_2010_I868871/ctheta_Sigma_11",
                                                                                    "/NA48_2010_I868871/ctheta_Sigma_12","/NA48_2010_I868871/ctheta_Sigma_13",
                                                                                    "/NA48_2010_I868871/ctheta_Sigma_14","/NA48_2010_I868871/ctheta_Sigma_15",
                                                                                    "/NA48_2010_I868871/ctheta_Sigma_16","/NA48_2010_I868871/ctheta_Sigma_17",
                                                                                    "/NA48_2010_I868871/ctheta_Sigma_18","/NA48_2010_I868871/ctheta_Sigma_19"]
 
-analyses["HadronDecays"][3334] = { "Modes" : { "$\\Omega^-\\to\\Lambda^0K^-$" : {} } }
-analyses["HadronDecays"][3334]["Modes"]["$\\Omega^-\\to\\Lambda^0K^-$"]["data"] = ["/HyperCP_2005_I677384/d01-x01-y01","/HyperCP_2005_I677384/d01-x01-y02",
-                                                                                   "/HyperCP_2005_I677384/d01-x01-y03"]
-analyses["HadronDecays"][3334]["Modes"]["$\\Omega^-\\to\\Lambda^0K^-$"]["MC"  ] = ["/HyperCP_2005_I677384/cthetaM","/HyperCP_2005_I677384/cthetaP",
-                                                                                   "/HyperCP_2005_I677384/cthetaAll"]
+analyses["HadronDecays"][3334] = { "Modes" : { "$\\Omega^-\\to\\Lambda^0K^-$" : {},"$\\Omega^-\\to\\Xi^0\\pi^-$" : {},
+                                               "$\\Omega^-\\to\\Xi^-\\pi^0$" : {} } }
+analyses["HadronDecays"][3334]["Modes"]["$\\Omega^-\\to\\Lambda^0K^-$"]["data"] = ["/HyperCP_2005_I677384/d01-x01-y01",
+                                                                                   "/HyperCP_2005_I677384/d01-x01-y02",
+                                                                                   "/HyperCP_2005_I677384/d01-x01-y03",
+                                                                                   "/WA46_1984_I206647/d01-x01-y01"]
+analyses["HadronDecays"][3334]["Modes"]["$\\Omega^-\\to\\Lambda^0K^-$"]["MC"  ] = ["/HyperCP_2005_I677384/cthetaM",
+                                                                                   "/HyperCP_2005_I677384/cthetaP",
+                                                                                   "/HyperCP_2005_I677384/cthetaAll",
+                                                                                   "/WA46_1984_I206647/cthetaLambda"]
+analyses["HadronDecays"][3334]["Modes"]["$\\Omega^-\\to\\Xi^0\\pi^-$"]["data"]=["/WA46_1984_I206647/d01-x01-y02"]
+analyses["HadronDecays"][3334]["Modes"]["$\\Omega^-\\to\\Xi^0\\pi^-$"]["MC"  ]=["/WA46_1984_I206647/cthetaXi0"]
+analyses["HadronDecays"][3334]["Modes"]["$\\Omega^-\\to\\Xi^-\\pi^0$"]["data"]=["/WA46_1984_I206647/d01-x01-y03"]
+analyses["HadronDecays"][3334]["Modes"]["$\\Omega^-\\to\\Xi^-\\pi^0$"]["MC"  ]=["/WA46_1984_I206647/cthetaXim"]
 
-analyses["HadronDecays"][4132] = { "Modes" : { "$\\Xi^0_c\\to\\Xi^-\\pi^+$" : {} } }
+
+analyses["HadronDecays"][4132] = { "Modes" : { "$\\Xi^0_c\\to\\Xi^-\\pi^+$" : {}, "$\\Xi^0_c\\to\\Omega^-K^+" : {} } }
 analyses["HadronDecays"][4132]["Modes"]["$\\Xi^0_c\\to\\Xi^-\\pi^+$"]["data"] = ["/CLEO_2000_I537236/d01-x01-y01"]
 analyses["HadronDecays"][4132]["Modes"]["$\\Xi^0_c\\to\\Xi^-\\pi^+$"]["MC"  ] = ["/CLEO_2000_I537236/ctheta"]
+analyses["HadronDecays"][4132]["Modes"]["$\\Xi^0_c\\to\\Omega^-K^+"]["data"] = ["/BABAR_2006_I719581/d01-x01-y01","/BABAR_2006_I719581/d02-x01-y01"]
 
-analyses["HadronDecays"][4122] = { "Modes" : { "$\\Lambda^+_c\\to\\Lambda^0\\pi^+$" : {} } }
-analyses["HadronDecays"][4122]["Modes"]["$\\Lambda^+_c\\to\\Lambda^0\\pi^+$"]["data"] = ["/FOCUS_2006_I693639/d01-x01-y01"]
-analyses["HadronDecays"][4122]["Modes"]["$\\Lambda^+_c\\to\\Lambda^0\\pi^+$"]["MC"  ] = ["/FOCUS_2006_I693639/ctheta"]
-
+analyses["HadronDecays"][4122] = { "Modes" : { "$\\Lambda^+_c\\to\\Lambda^0\\pi^+$" : {}, "$\\Lambda^+_c\\to\\Sigma^+\\pi^0$" : {},
+                                               "$\\Lambda^+_c\\to\\Lambda^0 e^+\\bar{\\nu}_e$" : {} } }
+analyses["HadronDecays"][4122]["Modes"]["$\\Lambda^+_c\\to\\Lambda^0\\pi^+$"]["data"] = ["/FOCUS_2006_I693639/d01-x01-y01","/FOCUS_2006_I693639/d02-x01-y01",
+                                                                                         "/FOCUS_2006_I693639/d03-x01-y01",
+                                                                                         "/CLEO_1995_I392704/d01-x01-y01","/CLEO_1995_I392704/d03-x01-y01",
+                                                                                         "/ARGUS_1992_I319105/d02-x01-y01","/ARGUS_1992_I319105/d03-x01-y01"]
+analyses["HadronDecays"][4122]["Modes"]["$\\Lambda^+_c\\to\\Sigma^+\\pi^0$"]["data"] = ["/CLEO_1995_I392704/d02-x01-y01","/CLEO_1995_I392704/d04-x01-y01"]
+analyses["HadronDecays"][4122]["Modes"]["$\\Lambda^+_c\\to\\Lambda^0 e^+\\bar{\\nu}_e$"]["data"] = ["/CLEOII_2005_I668268/d01-x01-y01","/CLEOII_1994_I371611/d01-x01-y01",
+                                                                                                    "/CLEOII_1994_I371611/d02-x01-y01","/ARGUS_1994_I371613/d01-x01-y01"]
 # charged multiplicity (total)
+analyses["Charged"]["TotalChargedMult"][0][9.5  ] = ["/LENA_1981_I164397/d03-x01-y01"]
+analyses["Charged"]["TotalChargedMult"][0][10.47] = ["/ARGUS_1992_I319102/d04-x01-y01"]
 analyses["Charged"]["TotalChargedMult"][0][12.0 ] = ["/JADE_1983_I190818/d01-x01-y01"]
 analyses["Charged"]["TotalChargedMult"][0][14.0 ] = ["/TASSO_1989_I277658/d02-x01-y01"]
 analyses["Charged"]["TotalChargedMult"][0][21.65] = ["/PLUTO_1980_I154270/d01-x01-y01"]
-analyses["Charged"]["TotalChargedMult"][0][22.0 ] = ["/TASSO_1980_I143691/d01-x01-y01"]
+analyses["Charged"]["TotalChargedMult"][0][22.0 ] = ["/TASSO_1980_I143691/d01-x01-y01","/JADE_1979_I142874/d02-x01-y01"]
 analyses["Charged"]["TotalChargedMult"][0][29.0 ] = ["/TPC_1987_I235694/d05-x01-y04","/HRS_1986_I18502/d03-x01-y01"]
 analyses["Charged"]["TotalChargedMult"][0][50.0 ] = ["/AMY_1990_I295160/d02-x01-y01"]
 analyses["Charged"]["TotalChargedMult"][0][55.7 ] = ["/AMY_1990_I295160/d02-x02-y01"]
+analyses["Charged"]["TotalChargedMult"][0][57.8 ] = ["/TOPAZ_1997_I454183/d01-x01-y01"]
 analyses["Charged"]["TotalChargedMult"][0][91.2 ] = ["/ALEPH_1991_S2435284/d02-x01-y01","/OPAL_1992_I321190/d05-x01-y01",
                                                      "/DELPHI_1991_I301657/d04-x01-y01","/ALEPH_2004_S5765862/d01-x01-y01",
                                                      "/DELPHI_1996_S3430090/d35-x01-y01","/DELPHI_1998_I473409/d01-x01-y01",
                                                      "/OPAL_1998_S3780481/d09-x01-y04","/ALEPH_1996_S3486095/d19-x01-y01"]
+analyses["Charged"]["TotalChargedMult"][0][161.0] = ["/OPAL_1997_I440721/d02-x01-y01"]
+analyses["Charged"]["TotalChargedMult"][0][172.0] = ["/OPAL_2000_I513476/d14-x01-y01"]
 # light quark events
 analyses["Charged"]["TotalChargedMult"][1][29.0  ] = ["/TPC_1987_I235694/d04-x01-y04"]
+analyses["Charged"]["TotalChargedMult"][1][58.0  ] = ["/VENUS_1998_I453613/d01-x01-y02"]
 analyses["Charged"]["TotalChargedMult"][1][91.2  ] = ["/OPAL_2002_S5361494/d01-x01-y03","/OPAL_1998_S3780481/d09-x01-y01",
                                                       "/DELPHI_1998_I473409/d03-x01-y01","/SLD_2004_S5693039/d08-x02-y01",
-                                                      "/SLD_1996_S3398250/d03-x01-y01"]
+                                                      "/SLD_1996_S3398250/d03-x01-y01","/DELPHI_1999_I448370/d09-x01-y02",
+                                                      "/OPAL_2001_I536266/d01-x01-y01","/OPAL_2001_I536266/d01-x01-y02",
+                                                      "/OPAL_2001_I536266/d01-x01-y03","/OPAL_2001_I536266/d02-x01-y01",
+                                                      "/OPAL_2001_I536266/d02-x01-y02","/OPAL_2001_I536266/d02-x01-y03"]
 analyses["Charged"]["TotalChargedMult"][1 ][195.0] = ["/DELPHI_2000_S4328825/d01-x01-y03"]
 
 # charm events
 analyses["Charged"]["TotalChargedMult"][4][29.0  ] = ["/TPC_1987_I235694/d03-x01-y04"]
 analyses["Charged"]["TotalChargedMult"][4][91.2  ] = ["/OPAL_2002_S5361494/d01-x01-y02","/OPAL_1998_S3780481/d09-x01-y02",
                                                       "/SLD_2004_S5693039/d08-x02-y02","/SLD_1996_S3398250/d02-x01-y01"]
 analyses["Charged"]["TotalChargedMult"][4 ][195.0] = ["/DELPHI_2000_S4328825/d01-x01-y02"]
 # bottom events
 analyses["Charged"]["TotalChargedMult"][5][29.0  ] = ["/TPC_1987_I235694/d02-x01-y04"]
+analyses["Charged"]["TotalChargedMult"][5][58.0  ] = ["/VENUS_1998_I453613/d01-x01-y01"]
 analyses["Charged"]["TotalChargedMult"][5][91.2  ] = ["/OPAL_2002_S5361494/d01-x01-y01","/OPAL_1998_S3780481/d09-x01-y03",
                                                       "/DELPHI_1998_I473409/d02-x01-y01","/SLD_2004_S5693039/d08-x02-y03",
-                                                      "/SLD_1996_S3398250/d01-x01-y01"]
+                                                      "/SLD_1996_S3398250/d01-x01-y01","/DELPHI_1999_I448370/d09-x01-y01"]
 analyses["Charged"]["TotalChargedMult"][5 ][195.0] = ["/DELPHI_2000_S4328825/d01-x01-y01"]
 # difference charm-light
 analyses["Charged"]["TotalChargedMult"][41][91.2 ] = ["/SLD_2004_S5693039/d08-x03-y02","/SLD_1996_S3398250/d04-x01-y01"]
 # difference bottom-light
+analyses["Charged"]["TotalChargedMult"][51][58.0 ] = ["/VENUS_1998_I453613/d01-x01-y03"]
 analyses["Charged"]["TotalChargedMult"][51][91.2 ] = ["/OPAL_2002_S5361494/d01-x01-y04","/SLD_2004_S5693039/d08-x03-y03",
                                                      "/SLD_1996_S3398250/d05-x01-y01"]
 analyses["Charged"]["TotalChargedMult"][51][195.0] = ["/DELPHI_2000_S4328825/d01-x01-y04"]
 # with cuts
 analyses["Charged"]["TotalChargedMult"]["C"][91.2] = ["\ALEPH_1996_S3486095/d20-x01-y01","\ALEPH_1996_S3486095/d21-x01-y01",
                                                       "\ALEPH_1996_S3486095/d22-x01-y01","\ALEPH_1996_S3486095/d23-x01-y01"]
 # charged multiplicity (dist)
 analyses["Charged"]["DistChargedMult"][0][10.47] = ["/ARGUS_1992_I319102/d02-x01-y01"]
 analyses["Charged"]["DistChargedMult"][0][14.0] = ["/TASSO_1989_I277658/d05-x01-y01"]
 analyses["Charged"]["DistChargedMult"][0][22.0] = ["/TASSO_1989_I277658/d05-x01-y02"]
 analyses["Charged"]["DistChargedMult"][0][29.0] = ["/HRS_1986_I18502/d01-x01-y01"]
 analyses["Charged"]["DistChargedMult"][0][34.8] = ["/TASSO_1989_I277658/d05-x01-y03"]
 analyses["Charged"]["DistChargedMult"][0][35.0] = ["/TASSO_1988_I263859/d06-x01-y01"]
 analyses["Charged"]["DistChargedMult"][0][43.6] = ["/TASSO_1989_I277658/d05-x01-y04"]
 analyses["Charged"]["DistChargedMult"][0][50.0] = ["/AMY_1990_I295160/d01-x01-y01"]
 analyses["Charged"]["DistChargedMult"][0][52.0] = ["/AMY_1990_I295160/d01-x01-y02"]
 analyses["Charged"]["DistChargedMult"][0][55.0] = ["/AMY_1990_I295160/d01-x01-y03"]
 analyses["Charged"]["DistChargedMult"][0][56.0] = ["/AMY_1990_I295160/d01-x01-y04"]
 analyses["Charged"]["DistChargedMult"][0][57.0] = ["/AMY_1990_I295160/d01-x01-y05"]
 analyses["Charged"]["DistChargedMult"][0][60.0] = ["/AMY_1990_I295160/d01-x01-y06"]
 analyses["Charged"]["DistChargedMult"][0][60.8] = ["/AMY_1990_I295160/d01-x01-y07"]
 analyses["Charged"]["DistChargedMult"][0][61.4] = ["/AMY_1990_I295160/d01-x01-y08"]
 analyses["Charged"]["DistChargedMult"][0][55.7] = ["/AMY_1990_I295160/d01-x01-y09"]
 analyses["Charged"]["DistChargedMult"][0][91.2] = ["/ALEPH_1991_S2435284/d01-x01-y01","/OPAL_1992_I321190/d01-x01-y01",
                                                    "/DELPHI_1991_I301657/d02-x01-y01","/L3_2004_I652683/d59-x01-y01",
                                                    "/ALEPH_1996_S3486095/d18-x01-y01"]
 analyses["Charged"]["DistChargedMult"][2][91.2] = ["/L3_2004_I652683/d59-x01-y02"]
 analyses["Charged"]["DistChargedMult"][5][91.2] = ["/L3_2004_I652683/d59-x01-y03"]
 
-analyses["Charged"]["DistChargedMult"][0][130.1]=["/L3_2004_I652683/d60-x01-y01"]
-analyses["Charged"]["DistChargedMult"][0][136.3]=["/L3_2004_I652683/d60-x01-y02"]
-analyses["Charged"]["DistChargedMult"][0][161.3]=["/L3_2004_I652683/d60-x01-y03"]
-analyses["Charged"]["DistChargedMult"][0][172.3]=["/L3_2004_I652683/d61-x01-y01"]
-analyses["Charged"]["DistChargedMult"][0][182.8]=["/L3_2004_I652683/d61-x01-y02"]
-analyses["Charged"]["DistChargedMult"][0][188.6]=["/L3_2004_I652683/d61-x01-y03"]
-analyses["Charged"]["DistChargedMult"][0][194.4]=["/L3_2004_I652683/d62-x01-y01"]
-analyses["Charged"]["DistChargedMult"][0][200.2]=["/L3_2004_I652683/d62-x01-y02"]
-analyses["Charged"]["DistChargedMult"][0][206.2]=["/L3_2004_I652683/d62-x01-y03"]
+analyses["Charged"]["DistChargedMult"][0][130.1] = ["/L3_2004_I652683/d60-x01-y01"]
+analyses["Charged"]["DistChargedMult"][0][136.3] = ["/L3_2004_I652683/d60-x01-y02"]
+analyses["Charged"]["DistChargedMult"][0][161.0] = ["/OPAL_1997_I440721/d26-x01-y01"]
+analyses["Charged"]["DistChargedMult"][0][161.3] = ["/L3_2004_I652683/d60-x01-y03"]
+analyses["Charged"]["DistChargedMult"][0][172.0] = ["/OPAL_2000_I513476/d13-x01-y01"]
+analyses["Charged"]["DistChargedMult"][0][172.3] = ["/L3_2004_I652683/d61-x01-y01"]
+analyses["Charged"]["DistChargedMult"][0][182.8] = ["/L3_2004_I652683/d61-x01-y02"]
+analyses["Charged"]["DistChargedMult"][0][183.0] = ["/OPAL_2000_I513476/d13-x01-y02"]
+analyses["Charged"]["DistChargedMult"][0][188.6] = ["/L3_2004_I652683/d61-x01-y03"]
+analyses["Charged"]["DistChargedMult"][0][189.0] = ["/OPAL_2000_I513476/d13-x01-y03"]
+analyses["Charged"]["DistChargedMult"][0][194.4] = ["/L3_2004_I652683/d62-x01-y01"]
+analyses["Charged"]["DistChargedMult"][0][200.2] = ["/L3_2004_I652683/d62-x01-y02"]
+analyses["Charged"]["DistChargedMult"][0][206.2] = ["/L3_2004_I652683/d62-x01-y03"]
 
 
 analyses["Charged"]["DistChargedMult"]["C"][91.2]=["/DELPHI_1991_I324035/d01-x01-y01","/DELPHI_1991_I324035/d02-x01-y01",
                                                    "/DELPHI_1991_I324035/d03-x01-y01","/DELPHI_1991_I324035/d04-x01-y01",
                                                    "/DELPHI_1991_I324035/d05-x01-y01","/DELPHI_1991_I324035/d06-x01-y01",
                                                    "/DELPHI_1991_I324035/d07-x01-y01","/DELPHI_1991_I324035/d08-x01-y01",
                                                    "/DELPHI_1991_I324035/d09-x01-y01","/DELPHI_1991_I324035/d10-x01-y01",
                                                    "/DELPHI_1991_I324035/d11-x01-y01","/DELPHI_1991_I324035/d12-x01-y01",
                                                    "/DELPHI_1991_I324035/d13-x01-y01",
                                                    "/DELPHI_1992_I334948/d01-x01-y01","/DELPHI_1992_I334948/d01-x01-y02",
                                                    "/DELPHI_1992_I334948/d01-x01-y03","/DELPHI_1992_I334948/d02-x01-y01",
                                                    "/DELPHI_1992_I334948/d02-x01-y02","/DELPHI_1992_I334948/d02-x01-y03",
                                                    "/DELPHI_1992_I334948/d03-x01-y01","/DELPHI_1992_I334948/d03-x01-y02",
                                                    "/DELPHI_1992_I334948/d03-x01-y03",]
 
 analyses["Charged"]["DistChargedMult"][21][ 5.25] = ["/OPAL_2004_I631361/d01-x01-y01"]
 analyses["Charged"]["DistChargedMult"][21][ 5.98] = ["/OPAL_2004_I631361/d01-x01-y02"]
 analyses["Charged"]["DistChargedMult"][21][ 6.98] = ["/OPAL_2004_I631361/d01-x01-y03"]
 analyses["Charged"]["DistChargedMult"][21][ 8.43] = ["/OPAL_2004_I631361/d02-x01-y01"]
 analyses["Charged"]["DistChargedMult"][21][10.92] = ["/OPAL_2004_I631361/d02-x01-y02"]
 analyses["Charged"]["DistChargedMult"][21][14.24] = ["/OPAL_2004_I631361/d03-x01-y01"]
 analyses["Charged"]["DistChargedMult"][21][17.72] = ["/OPAL_2004_I631361/d03-x01-y02"]
 
 # charged particle spectra
 # xi
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][2.2  ] = ["/BESII_2004_I622224/d01-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][2.6  ] = ["/BESII_2004_I622224/d02-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][3.0  ] = ["/BESII_2004_I622224/d03-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][3.2  ] = ["/BESII_2004_I622224/d04-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][4.6  ] = ["/BESII_2004_I622224/d05-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][4.8  ] = ["/BESII_2004_I622224/d06-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][12.0 ] = ["/TASSO_1980_I153511/d05-x01-y01","/TASSO_1982_I177174/d02-x01-y01",
                                                           "/TASSO_1982_I177174/d03-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][58.0 ] = ["/TOPAZ_1995_I381900/d01-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][91.2 ] = ["/ALEPH_1996_S3486095/d17-x01-y01","/DELPHI_1996_S3430090/d08-x01-y01",
                                                           "/L3_2004_I652683/d65-x01-y01","/OPAL_1998_S3780481/d08-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][130.1] = ["/L3_2004_I652683/d66-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][133.0] = ["/ALEPH_2004_S5765862/d11-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][136.3] = ["/L3_2004_I652683/d66-x01-y02"]
-analyses["Charged"]["ChargedSpectrum"][0]["xi"][161.0] = ["/ALEPH_2004_S5765862/d12-x01-y01"]
+analyses["Charged"]["ChargedSpectrum"][0]["xi"][161.0] = ["/ALEPH_2004_S5765862/d12-x01-y01","/OPAL_1997_I440721/d25-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][161.3] = ["/L3_2004_I652683/d66-x01-y03"]
-analyses["Charged"]["ChargedSpectrum"][0]["xi"][172.0] = ["/ALEPH_2004_S5765862/d13-x01-y01"]
+analyses["Charged"]["ChargedSpectrum"][0]["xi"][172.0] = ["/ALEPH_2004_S5765862/d13-x01-y01","/OPAL_2000_I513476/d19-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][172.3] = ["/L3_2004_I652683/d67-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][182.8] = ["/L3_2004_I652683/d67-x01-y02"]
-analyses["Charged"]["ChargedSpectrum"][0]["xi"][183.0] = ["/DELPHI_2003_I620250/d32-x01-y01","/ALEPH_2004_S5765862/d14-x01-y01"]
+analyses["Charged"]["ChargedSpectrum"][0]["xi"][183.0] = ["/DELPHI_2003_I620250/d32-x01-y01","/ALEPH_2004_S5765862/d14-x01-y01",
+                                                          "/OPAL_2000_I513476/d19-x01-y02"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][188.6] = ["/L3_2004_I652683/d67-x01-y03"]
-analyses["Charged"]["ChargedSpectrum"][0]["xi"][189.0] = ["/ALEPH_2004_S5765862/d15-x01-y01","/DELPHI_2003_I620250/d32-x01-y02"]
+analyses["Charged"]["ChargedSpectrum"][0]["xi"][189.0] = ["/ALEPH_2004_S5765862/d15-x01-y01","/DELPHI_2003_I620250/d32-x01-y02",
+                                                          "/OPAL_2000_I513476/d19-x01-y03"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][192.0] = ["/DELPHI_2003_I620250/d32-x01-y03"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][194.4] = ["/L3_2004_I652683/d68-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][200.2] = ["/L3_2004_I652683/d68-x01-y02"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][206.2] = ["/L3_2004_I652683/d68-x01-y03"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][196.0] = ["/DELPHI_2003_I620250/d32-x01-y04","/ALEPH_2004_S5765862/d16-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][200.0] = ["/DELPHI_2003_I620250/d33-x01-y01","/ALEPH_2004_S5765862/d17-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][200.5] = ["/OPAL_2003_I595335/d05-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][202.0] = ["/DELPHI_2003_I620250/d33-x01-y02"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][205.0] = ["/DELPHI_2003_I620250/d33-x01-y03"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][206.0] = ["/ALEPH_2004_S5765862/d18-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["xi"][207.0] = ["/DELPHI_2003_I620250/d33-x01-y04"]
 
-
 # x
+analyses["Charged"]["ChargedSpectrum"][0]["x" ][ 3.0 ] = ["/MARKI_1976_I109792/d02-x01-y01"]
+analyses["Charged"]["ChargedSpectrum"][0]["x" ][ 4.8 ] = ["/MARKI_1976_I109792/d03-x01-y01"]
+analyses["Charged"]["ChargedSpectrum"][0]["x" ][ 5.8 ] = ["/MARKI_1976_I109792/d04-x01-y01"]
+analyses["Charged"]["ChargedSpectrum"][0]["x" ][ 6.2 ] = ["/MARKI_1976_I109792/d05-x01-y01"]
+analyses["Charged"]["ChargedSpectrum"][0]["x" ][ 6.6 ] = ["/MARKI_1976_I109792/d06-x01-y01"]
+analyses["Charged"]["ChargedSpectrum"][0]["x" ][ 7.0 ] = ["/MARKI_1976_I109792/d07-x01-y01"]
+analyses["Charged"]["ChargedSpectrum"][0]["x" ][ 7.4 ] = ["/MARKI_1976_I109792/d08-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][13.0 ] = ["/TASSO_1980_I143691/d05-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][14.0 ] = ["/TASSO_1982_I177174/d01-x01-y01","/TASSO_1982_I177174/d02-x01-y02",
                                                           "/TASSO_1982_I177174/d03-x01-y02"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][19.5 ] = ["/TASSO_1980_I143691/d06-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][22.0 ] = ["/TASSO_1982_I177174/d01-x01-y02","/TASSO_1982_I177174/d02-x01-y03",
                                                           "/TASSO_1982_I177174/d03-x01-y03"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][25.0 ] = ["/TASSO_1982_I177174/d02-x01-y04","/TASSO_1982_I177174/d03-x01-y04"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][29.0 ] = ["/TPC_1988_I262143/d01-x01-y04"  ,"/HRS_1985_I201482/d10-x01-y01",
                                                           "/HRS_1985_I201482/d12-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][30.0 ] = ["/TASSO_1982_I177174/d02-x01-y05","/TASSO_1982_I177174/d03-x01-y05",
                                                           "/TASSO_1980_I143691/d07-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][30.8 ] = ["/TASSO_1980_I153511/d06-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][33.0 ] = ["/TASSO_1982_I177174/d01-x01-y03"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][34.0 ] = ["/TASSO_1982_I177174/d02-x01-y06","/TASSO_1982_I177174/d03-x01-y06"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][35.0 ] = ["/TASSO_1982_I177174/d02-x01-y07","/TASSO_1982_I177174/d03-x01-y07",
                                                           "/TASSO_1988_I263859/d10-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][55.2 ] = ["/AMY_1990_I283337/d02-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][91.2 ] = ["/DELPHI_1998_I473409/d16-x01-y01","/DELPHI_1998_I473409/d17-x01-y01",
                                                           "/ALEPH_1996_S3486095/d09-x01-y01","/OPAL_1998_S3780481/d04-x01-y01",
                                                           "/SLD_2004_S5693039/d01-x01-y01","/SLD_1999_S3743934/d04-x01-y01",
                                                           "/DELPHI_1996_S3430090/d07-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][133.0] = ["/ALEPH_2004_S5765862/d02-x01-y01","/ALEPH_2004_S5765862/d19-x01-y01"]
-analyses["Charged"]["ChargedSpectrum"][0]["x" ][161.0] = ["/ALEPH_2004_S5765862/d03-x01-y01","/ALEPH_2004_S5765862/d20-x01-y01"]
-analyses["Charged"]["ChargedSpectrum"][0]["x" ][172.0] = ["/ALEPH_2004_S5765862/d04-x01-y01","/ALEPH_2004_S5765862/d21-x01-y01"]
-analyses["Charged"]["ChargedSpectrum"][0]["x" ][183.0] = ["/ALEPH_2004_S5765862/d05-x01-y01","/ALEPH_2004_S5765862/d22-x01-y01"]
-analyses["Charged"]["ChargedSpectrum"][0]["x" ][189.0] = ["/ALEPH_2004_S5765862/d06-x01-y01","/ALEPH_2004_S5765862/d23-x01-y01"]
+analyses["Charged"]["ChargedSpectrum"][0]["x" ][161.0] = ["/ALEPH_2004_S5765862/d03-x01-y01","/ALEPH_2004_S5765862/d20-x01-y01",
+                                                          "/OPAL_1997_I440721/d24-x01-y01"]
+analyses["Charged"]["ChargedSpectrum"][0]["x" ][172.0] = ["/ALEPH_2004_S5765862/d04-x01-y01","/ALEPH_2004_S5765862/d21-x01-y01",
+                                                          "/OPAL_2000_I513476/d18-x01-y01"]
+analyses["Charged"]["ChargedSpectrum"][0]["x" ][183.0] = ["/ALEPH_2004_S5765862/d05-x01-y01","/ALEPH_2004_S5765862/d22-x01-y01",
+                                                          "/OPAL_2000_I513476/d18-x01-y02"]
+analyses["Charged"]["ChargedSpectrum"][0]["x" ][189.0] = ["/ALEPH_2004_S5765862/d06-x01-y01","/ALEPH_2004_S5765862/d23-x01-y01",
+                                                          "/OPAL_2000_I513476/d18-x01-y03"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][196.0] = ["/ALEPH_2004_S5765862/d07-x01-y01","/ALEPH_2004_S5765862/d24-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][200.0] = ["/ALEPH_2004_S5765862/d08-x01-y01","/ALEPH_2004_S5765862/d25-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][200.5] = ["/OPAL_2003_I595335/d04-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][0]["x" ][206.0] = ["/ALEPH_2004_S5765862/d09-x01-y01","/ALEPH_2004_S5765862/d26-x01-y01"]
 # with cuts
 analyses["Charged"]["ChargedSpectrum"]["C"]["x" ][29.0 ] = ["/HRS_1985_I201482/d11-x01-y01","/HRS_1985_I201482/d13-x01-y01",
                                                             "/HRS_1985_I201482/d14-x01-y01","/HRS_1985_I201482/d15-x01-y01"]
+# misc
+analyses["Charged"]["ChargedSpectrum"][0]["Other"][91.2] = ["/DELPHI_1999_I448370/d01-x01-y01","/DELPHI_1999_I448370/d02-x01-y01",
+                                                            "/DELPHI_1999_I448370/d03-x01-y01","/DELPHI_1999_I448370/d04-x01-y01",
+                                                            "/DELPHI_1999_I448370/d05-x01-y01","/DELPHI_1999_I448370/d05-x01-y02",
+                                                            "/DELPHI_1999_I448370/d05-x01-y03","/DELPHI_1999_I448370/d06-x01-y01",
+                                                            "/DELPHI_1999_I448370/d06-x01-y02","/DELPHI_1999_I448370/d07-x01-y01",
+                                                            "/DELPHI_1999_I448370/d07-x01-y02","/DELPHI_1999_I448370/d08-x01-y01",
+                                                            "/DELPHI_1999_I448370/d08-x01-y02"]
 # flavour separated
 analyses["Charged"]["ChargedSpectrum"][1]["x" ][91.2] = ["/DELPHI_1998_I473409/d32-x01-y01","/DELPHI_1998_I473409/d33-x01-y01",
                                                          "/DELPHI_1997_I428178/d01-x01-y03","/OPAL_1998_S3780481/d01-x01-y01",
                                                          "/SLD_2004_S5693039/d08-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][1]["xi"][91.2] = ["/OPAL_1998_S3780481/d05-x01-y01"]
 
 analyses["Charged"]["ChargedSpectrum"][2]["x" ][13.0 ] = ["/OPAL_2004_I648738/d06-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][2]["x" ][28.0 ] = ["/OPAL_2004_I648738/d07-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][2]["x" ][49.0 ] = ["/OPAL_2004_I648738/d08-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][2]["x" ][100.0] = ["/OPAL_2004_I648738/d09-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][2]["x" ][91.2 ] = ["/OPAL_2004_I648738/d10-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][2]["x" ][196.0] = ["/OPAL_2004_I648738/d11-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][2]["xi"][91.2 ] = ["/L3_2004_I652683/d65-x01-y02"]
 
 analyses["Charged"]["ChargedSpectrum"][4]["x" ][91.2 ] = ["/DELPHI_1997_I428178/d01-x01-y02","/OPAL_1998_S3780481/d02-x01-y01",
                                                          "/SLD_2004_S5693039/d08-x01-y02"]
 analyses["Charged"]["ChargedSpectrum"][4]["xi"][91.2 ] = ["/OPAL_1998_S3780481/d06-x01-y01"]
 
 analyses["Charged"]["ChargedSpectrum"][5]["x" ][13.0 ] = ["/OPAL_2004_I648738/d06-x01-y02"]
 analyses["Charged"]["ChargedSpectrum"][5]["x" ][28.0 ] = ["/OPAL_2004_I648738/d07-x01-y02"]
 analyses["Charged"]["ChargedSpectrum"][5]["x" ][49.0 ] = ["/OPAL_2004_I648738/d08-x01-y02"]
 analyses["Charged"]["ChargedSpectrum"][5]["x" ][100.0] = ["/OPAL_2004_I648738/d09-x01-y02"]
 analyses["Charged"]["ChargedSpectrum"][5]["x" ][91.2 ] = ["/DELPHI_1998_I473409/d24-x01-y01","/DELPHI_1998_I473409/d25-x01-y01",
                                                           "/DELPHI_1997_I428178/d01-x01-y01","/OPAL_1998_S3780481/d03-x01-y01",
                                                           "/SLD_2004_S5693039/d08-x01-y03","/OPAL_2004_I648738/d10-x01-y02"]
 analyses["Charged"]["ChargedSpectrum"][5]["xi"][91.2 ] = ["/OPAL_1998_S3780481/d07-x01-y01","/L3_2004_I652683/d65-x01-y03"]
 analyses["Charged"]["ChargedSpectrum"][5]["x" ][196.0] = ["/OPAL_2004_I648738/d11-x01-y02"]
 # gluons
 analyses["Charged"]["ChargedSpectrum"][21]["x"][ 6.5 ] = ["/OPAL_2004_I648738/d06-x01-y03"]
 analyses["Charged"]["ChargedSpectrum"][21]["x"][14.0 ] = ["/OPAL_2004_I648738/d07-x01-y03"]
 analyses["Charged"]["ChargedSpectrum"][21]["x"][14.24] = ["/OPAL_2004_I631361/d05-x01-y01"]
 analyses["Charged"]["ChargedSpectrum"][21]["x"][17.72] = ["/OPAL_2004_I631361/d05-x01-y02"]
 analyses["Charged"]["ChargedSpectrum"][21]["x"][24.5 ] = ["/OPAL_2004_I648738/d08-x01-y03"]
 analyses["Charged"]["ChargedSpectrum"][21]["x"][50.0 ] = ["/OPAL_2004_I648738/d09-x01-y03"]
 # rapidity w.r.t thrust
 analyses["Charged"]["ChargedRapidityThrust"][13.0 ] = ["/TASSO_1980_I143691/d02-x01-y01"]
 analyses["Charged"]["ChargedRapidityThrust"][19.5 ] = ["/TASSO_1980_I143691/d03-x01-y01"]
 analyses["Charged"]["ChargedRapidityThrust"][29.0 ] = ["/HRS_1985_I201482/d19-x01-y01","/HRS_1985_I201482/d20-x01-y01"]
 analyses["Charged"]["ChargedRapidityThrust"][30.0 ] = ["/TASSO_1980_I143691/d04-x01-y01"]
 analyses["Charged"]["ChargedRapidityThrust"][55.2 ] = ["/AMY_1990_I283337/d01-x01-y01"]
 analyses["Charged"]["ChargedRapidityThrust"][91.2 ] = ["/DELPHI_1996_S3430090/d05-x01-y01","/ALEPH_1996_S3486095/d10-x01-y01"]
 analyses["Charged"]["ChargedRapidityThrust"][133.0] = ["/ALEPH_2004_S5765862/d36-x01-y01"]
-analyses["Charged"]["ChargedRapidityThrust"][161.0] = ["/ALEPH_2004_S5765862/d37-x01-y01"]
-analyses["Charged"]["ChargedRapidityThrust"][172.0] = ["/ALEPH_2004_S5765862/d38-x01-y01"]
-analyses["Charged"]["ChargedRapidityThrust"][183.0] = ["/DELPHI_2003_I620250/d30-x01-y01","/ALEPH_2004_S5765862/d39-x01-y01"]
-analyses["Charged"]["ChargedRapidityThrust"][189.0] = ["/DELPHI_2003_I620250/d30-x01-y02","/ALEPH_2004_S5765862/d40-x01-y01"]
+analyses["Charged"]["ChargedRapidityThrust"][161.0] = ["/ALEPH_2004_S5765862/d37-x01-y01","/OPAL_1997_I440721/d23-x01-y01"]
+analyses["Charged"]["ChargedRapidityThrust"][172.0] = ["/ALEPH_2004_S5765862/d38-x01-y01","/OPAL_2000_I513476/d17-x01-y01"]
+analyses["Charged"]["ChargedRapidityThrust"][183.0] = ["/DELPHI_2003_I620250/d30-x01-y01","/ALEPH_2004_S5765862/d39-x01-y01",
+                                                       "/OPAL_2000_I513476/d17-x01-y02"]
+analyses["Charged"]["ChargedRapidityThrust"][189.0] = ["/DELPHI_2003_I620250/d30-x01-y02","/ALEPH_2004_S5765862/d40-x01-y01",
+                                                       "/OPAL_2000_I513476/d17-x01-y03"]
 analyses["Charged"]["ChargedRapidityThrust"][192.0] = ["/DELPHI_2003_I620250/d30-x01-y03"]
 analyses["Charged"]["ChargedRapidityThrust"][196.0] = ["/DELPHI_2003_I620250/d30-x01-y04","/ALEPH_2004_S5765862/d41-x01-y01"]
 analyses["Charged"]["ChargedRapidityThrust"][200.0] = ["/DELPHI_2003_I620250/d31-x01-y01","/ALEPH_2004_S5765862/d42-x01-y01"]
 analyses["Charged"]["ChargedRapidityThrust"][200.5] = ["/OPAL_2003_I595335/d03-x01-y01"]
 analyses["Charged"]["ChargedRapidityThrust"][202.0] = ["/DELPHI_2003_I620250/d31-x01-y02"]
 analyses["Charged"]["ChargedRapidityThrust"][205.0] = ["/DELPHI_2003_I620250/d31-x01-y03"]
 analyses["Charged"]["ChargedRapidityThrust"][206.0] = ["/ALEPH_2004_S5765862/d43-x01-y01"]
 analyses["Charged"]["ChargedRapidityThrust"][207.0] = ["/DELPHI_2003_I620250/d31-x01-y04"]
 # pt in w.r.t thrust
 analyses["Charged"]["ChargedpTInThrust" ][91.2 ] = ["/DELPHI_1996_S3430090/d01-x01-y01","/ALEPH_1996_S3486095/d11-x01-y01"]
 analyses["Charged"]["ChargedpTInThrust" ][133.0] = ["/ALEPH_2004_S5765862/d27-x01-y01"]
-analyses["Charged"]["ChargedpTInThrust" ][161.0] = ["/ALEPH_2004_S5765862/d28-x01-y01"]
-analyses["Charged"]["ChargedpTInThrust" ][172.0] = ["/ALEPH_2004_S5765862/d29-x01-y01"]
-analyses["Charged"]["ChargedpTInThrust" ][183.0] = ["/DELPHI_2003_I620250/d34-x01-y01","/ALEPH_2004_S5765862/d30-x01-y01"]
-analyses["Charged"]["ChargedpTInThrust" ][189.0] = ["/DELPHI_2003_I620250/d34-x01-y02","/ALEPH_2004_S5765862/d31-x01-y01"]
+analyses["Charged"]["ChargedpTInThrust" ][161.0] = ["/ALEPH_2004_S5765862/d28-x01-y01","/OPAL_1997_I440721/d21-x01-y01"]
+analyses["Charged"]["ChargedpTInThrust" ][172.0] = ["/ALEPH_2004_S5765862/d29-x01-y01","/OPAL_2000_I513476/d15-x01-y01"]
+analyses["Charged"]["ChargedpTInThrust" ][183.0] = ["/DELPHI_2003_I620250/d34-x01-y01","/ALEPH_2004_S5765862/d30-x01-y01",
+                                                    "/OPAL_2000_I513476/d15-x01-y02"]
+analyses["Charged"]["ChargedpTInThrust" ][189.0] = ["/DELPHI_2003_I620250/d34-x01-y02","/ALEPH_2004_S5765862/d31-x01-y01",
+                                                    "/OPAL_2000_I513476/d15-x01-y03"]
 analyses["Charged"]["ChargedpTInThrust" ][192.0] = ["/DELPHI_2003_I620250/d34-x01-y03"]
 analyses["Charged"]["ChargedpTInThrust" ][196.0] = ["/DELPHI_2003_I620250/d34-x01-y04","/ALEPH_2004_S5765862/d32-x01-y01"]
 analyses["Charged"]["ChargedpTInThrust" ][200.0] = ["/DELPHI_2003_I620250/d35-x01-y01","/ALEPH_2004_S5765862/d33-x01-y01"]
 analyses["Charged"]["ChargedpTInThrust" ][200.5] = ["/OPAL_2003_I595335/d01-x01-y01"]
 analyses["Charged"]["ChargedpTInThrust" ][202.0] = ["/DELPHI_2003_I620250/d35-x01-y02"]
 analyses["Charged"]["ChargedpTInThrust" ][205.0] = ["/DELPHI_2003_I620250/d35-x01-y03"]
 analyses["Charged"]["ChargedpTInThrust" ][206.0] = ["/ALEPH_2004_S5765862/d34-x01-y01"]
 analyses["Charged"]["ChargedpTInThrust" ][207.0] = ["/DELPHI_2003_I620250/d35-x01-y04"]
 # pt out thrust
 analyses["Charged"]["ChargedpTOutThrust"][91.2 ] = ["/DELPHI_1996_S3430090/d02-x01-y01","/ALEPH_1996_S3486095/d12-x01-y01"]
-analyses["Charged"]["ChargedpTOutThrust"][183.0] = ["/DELPHI_2003_I620250/d36-x01-y01"]
-analyses["Charged"]["ChargedpTOutThrust"][189.0] = ["/DELPHI_2003_I620250/d36-x01-y02"]
+analyses["Charged"]["ChargedpTOutThrust"][161.0] = ["/OPAL_1997_I440721/d22-x01-y01"]
+analyses["Charged"]["ChargedpTOutThrust"][172.0] = ["/OPAL_2000_I513476/d16-x01-y01"]
+analyses["Charged"]["ChargedpTOutThrust"][183.0] = ["/DELPHI_2003_I620250/d36-x01-y01","/OPAL_2000_I513476/d16-x01-y02"]
+analyses["Charged"]["ChargedpTOutThrust"][189.0] = ["/DELPHI_2003_I620250/d36-x01-y02","/OPAL_2000_I513476/d16-x01-y03"]
 analyses["Charged"]["ChargedpTOutThrust"][192.0] = ["/DELPHI_2003_I620250/d36-x01-y03"]
 analyses["Charged"]["ChargedpTOutThrust"][196.0] = ["/DELPHI_2003_I620250/d36-x01-y04"]
 analyses["Charged"]["ChargedpTOutThrust"][200.0] = ["/DELPHI_2003_I620250/d37-x01-y01"]
 analyses["Charged"]["ChargedpTOutThrust"][200.5] = ["/OPAL_2003_I595335/d02-x01-y01"]
 analyses["Charged"]["ChargedpTOutThrust"][202.0] = ["/DELPHI_2003_I620250/d37-x01-y02"]
 analyses["Charged"]["ChargedpTOutThrust"][205.0] = ["/DELPHI_2003_I620250/d37-x01-y03"]
 analyses["Charged"]["ChargedpTOutThrust"][206.0] = ["/ALEPH_2004_S5765862/d35-x01-y01"]
 analyses["Charged"]["ChargedpTOutThrust"][207.0] = ["/DELPHI_2003_I620250/d37-x01-y04"]
 # pT
 analyses["Charged"]["ChargedpTThrust"       ][29.0] = ["/HRS_1985_I201482/d22-x01-y01","/HRS_1985_I201482/d23-x01-y01"]
 analyses["Charged"]["ChargedpTvsxpThrust"   ][91.2] = ["/DELPHI_1996_S3430090/d10-x01-y01"]
 analyses["Charged"]["ChargedpTOutvsxpThrust"][91.2] = ["/DELPHI_1996_S3430090/d09-x01-y01"]
 # averages
 analyses["Charged"]["ChargedAveragepTThrust"     ][20.] = ["/PLUTO_1983_I191161/d01-x01-y01"]
 analyses["Charged"]["ChargedAveragepT2Thrust"    ][20.] = ["/PLUTO_1983_I191161/d01-x01-y02"]
 analyses["Charged"]["ChargedSumpTThrust"         ][20.] = ["/PLUTO_1983_I191161/d01-x01-y03"]
 analyses["Charged"]["ChargedSumpT2Thrust"        ][20.] = ["/PLUTO_1983_I191161/d01-x01-y04"]
 analyses["Charged"]["ChargedAveragepTSphericity" ][20.] = ["/PLUTO_1983_I191161/d02-x01-y01"]
 analyses["Charged"]["ChargedAveragepT2Sphericity"][20.] = ["/PLUTO_1983_I191161/d02-x01-y02"]
 analyses["Charged"]["ChargedSumpTSphericity"     ][20.] = ["/PLUTO_1983_I191161/d02-x01-y03"]
 analyses["Charged"]["ChargedSumpT2Sphericity"    ][20.] = ["/PLUTO_1983_I191161/d02-x01-y04"]
 # xF
 analyses["Charged"]["ChargedxFThrust"][29.0] = ["/HRS_1985_I201482/d16-x01-y01","/HRS_1985_I201482/d17-x01-y01"]
 # rapidity sphericity
 analyses["Charged"]["ChargedRapiditySphericity"][35.0 ] = ["/TASSO_1988_I263859/d11-x01-y01"]
 analyses["Charged"]["ChargedRapiditySphericity"][91.2 ] = ["/DELPHI_1996_S3430090/d06-x01-y01"]
 analyses["Charged"]["ChargedRapiditySphericity"][133.0] = ["/ALEPH_2004_S5765862/d44-x01-y01"]
 analyses["Charged"]["ChargedRapiditySphericity"][161.0] = ["/ALEPH_2004_S5765862/d45-x01-y01"]
 analyses["Charged"]["ChargedRapiditySphericity"][172.0] = ["/ALEPH_2004_S5765862/d46-x01-y01"]
 analyses["Charged"]["ChargedRapiditySphericity"][183.0] = ["/ALEPH_2004_S5765862/d47-x01-y01"]
 analyses["Charged"]["ChargedRapiditySphericity"][189.0] = ["/ALEPH_2004_S5765862/d48-x01-y01"]
 analyses["Charged"]["ChargedRapiditySphericity"][196.0] = ["/ALEPH_2004_S5765862/d49-x01-y01"]
 analyses["Charged"]["ChargedRapiditySphericity"][200.0] = ["/ALEPH_2004_S5765862/d50-x01-y01"]
 analyses["Charged"]["ChargedRapiditySphericity"][206.0] = ["/ALEPH_2004_S5765862/d51-x01-y01"]
 # pt in sphericity
 analyses["Charged"]["ChargedpTInSphericity" ][35.0 ] = ["/TASSO_1988_I263859/d07-x01-y01"]
 analyses["Charged"]["ChargedpTInSphericity" ][55.2 ] = ["/AMY_1990_I283337/d06-x01-y01"]
 analyses["Charged"]["ChargedpTInSphericity" ][91.2 ] = ["/DELPHI_1996_S3430090/d03-x01-y01"]
 # pt out sphericity
 analyses["Charged"]["ChargedpTOutSphericity"][35.0 ] = ["/TASSO_1988_I263859/d08-x01-y01"]
 analyses["Charged"]["ChargedpTOutSphericity"][55.2 ] = ["/AMY_1990_I283337/d07-x01-y01"]
 analyses["Charged"]["ChargedpTOutSphericity"][91.2 ] = ["/DELPHI_1996_S3430090/d04-x01-y01"]
 # others
 analyses["Charged"]["ChargedpLSphericity" ][55.2] = ["/AMY_1990_I283337/d03-x01-y01" ]
 analyses["Charged"]["ChargedpTSphericity" ][55.2] = ["/AMY_1990_I283337/d04-x01-y01" ]
 analyses["Charged"]["ChargedpTSphericity" ][35.0] = ["/TASSO_1988_I263859/d09-x01-y01"]
 analyses["Charged"]["ChargedpT2Sphericity"][55.2] = ["/AMY_1990_I283337/d05-x01-y01" ]
 analyses["Charged"]["ChargedFlowSphericity"][55.2] = ["/AMY_1990_I283337/d10-x01-y01" ]
 analyses["Charged"]["ChargedEnergyFlowSphericity"][55.2] = ["/AMY_1990_I283337/d11-x01-y01" ]
 analyses["Charged"]["ChargedAveragepT2inSphericity" ][29.0] = ["/HRS_1985_I201482/d24-x01-y01"]
 analyses["Charged"]["ChargedAveragepT2inSphericity" ][35.0] = ["/TASSO_1988_I263859/d04-x01-y01"]
 analyses["Charged"]["ChargedAveragepT2inSphericity" ][55.2] = ["/AMY_1990_I283337/d08-x01-y01"]
 analyses["Charged"]["ChargedAveragepT2outSphericity"][29.0] = ["/HRS_1985_I201482/d25-x01-y01"]
 analyses["Charged"]["ChargedAveragepT2outSphericity"][35.0] = ["/TASSO_1988_I263859/d05-x01-y01"]
 analyses["Charged"]["ChargedAveragepT2outSphericity"][55.2] = ["/AMY_1990_I283337/d09-x01-y01"]
 # identified particle (flavour sep)
 analyses["IdentifiedParticleFlavour"][111 ][5]["x"][91.2]=["/DELPHI_1996_I401100/d03-x01-y01","/SLD_2004_S5693039/d05-x01-y03"]
 analyses["IdentifiedParticleFlavour"][211 ][5]["x"][91.2]=["/DELPHI_1998_I473409/d26-x01-y01","/DELPHI_1998_I473409/d27-x01-y01",
                                                       "/SLD_1999_S3743934/d10-x01-y03"]
 analyses["IdentifiedParticleFlavour"][321 ][5]["x"][91.2]=["/DELPHI_1998_I473409/d28-x01-y01","/DELPHI_1998_I473409/d29-x01-y01",
                                                       "/SLD_2004_S5693039/d06-x01-y03","/SLD_1999_S3743934/d12-x01-y03"]
 analyses["IdentifiedParticleFlavour"][2212][5]["x"][91.2]=["/DELPHI_1998_I473409/d30-x01-y01","/DELPHI_1998_I473409/d31-x01-y01",
                                                       "/SLD_2004_S5693039/d07-x01-y03","/SLD_1999_S3743934/d16-x01-y03"]
 
 analyses["IdentifiedParticleFlavour"][211 ][4]["x"][91.2]=["/SLD_2004_S5693039/d05-x01-y02","/SLD_1999_S3743934/d10-x01-y02"]
                                                       
 analyses["IdentifiedParticleFlavour"][321 ][4]["x"][91.2]=["/SLD_2004_S5693039/d06-x01-y02","/SLD_1999_S3743934/d12-x01-y02"]
 analyses["IdentifiedParticleFlavour"][2212][4]["x"][91.2]=["/SLD_2004_S5693039/d07-x01-y02","/SLD_1999_S3743934/d16-x01-y02"]
 
 analyses["IdentifiedParticleFlavour"][211 ][1]["x"][91.2]=["/DELPHI_1998_I473409/d34-x01-y01","/DELPHI_1998_I473409/d35-x01-y01",
                                                       "/SLD_2004_S5693039/d05-x01-y01","/SLD_1999_S3743934/d10-x01-y01"]
 analyses["IdentifiedParticleFlavour"][321 ][1]["x"][91.2]=["/DELPHI_1998_I473409/d36-x01-y01","/DELPHI_1998_I473409/d37-x01-y01",
                                                            "/SLD_2004_S5693039/d06-x01-y01","/SLD_1999_S3743934/d12-x01-y01"]
 analyses["IdentifiedParticleFlavour"][2212][1]["x"][91.2]=["/DELPHI_1998_I473409/d38-x01-y01","/DELPHI_1998_I473409/d39-x01-y01",
                                                            "/SLD_2004_S5693039/d07-x01-y01","/SLD_1999_S3743934/d16-x01-y01"]
 
 analyses["IdentifiedParticleFlavour"][413][5]["x"][91.2]=["/OPAL_1995_I382219/d04-x01-y01"]
 analyses["IdentifiedParticleFlavour"][413][4]["x"][91.2]=["/OPAL_1995_I382219/d05-x01-y01"]
 
 analyses["IdentifiedParticleFlavour"][313 ][1]["x"][91.2]=["/SLD_1999_S3743934/d14-x01-y01"]
 analyses["IdentifiedParticleFlavour"][313 ][4]["x"][91.2]=["/SLD_1999_S3743934/d14-x01-y02"]
 analyses["IdentifiedParticleFlavour"][313 ][5]["x"][91.2]=["/SLD_1999_S3743934/d14-x01-y03"]
 analyses["IdentifiedParticleFlavour"][3122][1]["x"][91.2]=["/SLD_1999_S3743934/d18-x01-y01"]
 analyses["IdentifiedParticleFlavour"][3122][4]["x"][91.2]=["/SLD_1999_S3743934/d18-x01-y02"]
 analyses["IdentifiedParticleFlavour"][3122][5]["x"][91.2]=["/SLD_1999_S3743934/d18-x01-y03"]
 analyses["IdentifiedParticleFlavour"][311 ][1]["x"][91.2]=["/SLD_1999_S3743934/d20-x01-y01"]
 analyses["IdentifiedParticleFlavour"][311 ][4]["x"][91.2]=["/SLD_1999_S3743934/d20-x01-y02"]
 analyses["IdentifiedParticleFlavour"][311 ][5]["x"][91.2]=["/SLD_1999_S3743934/d20-x01-y03"]
 analyses["IdentifiedParticleFlavour"][333 ][1]["x"][91.2]=["/SLD_1999_S3743934/d22-x01-y01"]
 analyses["IdentifiedParticleFlavour"][333 ][4]["x"][91.2]=["/SLD_1999_S3743934/d22-x01-y02"]
 analyses["IdentifiedParticleFlavour"][333 ][5]["x"][91.2]=["/SLD_1999_S3743934/d22-x01-y03"]
 
 analyses["IdentifiedParticleFlavour"][211 ][41]["x"][91.2]=["/SLD_1999_S3743934/d11-x01-y01"]
 analyses["IdentifiedParticleFlavour"][211 ][51]["x"][91.2]=["/SLD_1999_S3743934/d11-x01-y02"]
 analyses["IdentifiedParticleFlavour"][321 ][41]["x"][91.2]=["/SLD_1999_S3743934/d13-x01-y01"]
 analyses["IdentifiedParticleFlavour"][321 ][51]["x"][91.2]=["/SLD_1999_S3743934/d13-x01-y02"]
 analyses["IdentifiedParticleFlavour"][313 ][41]["x"][91.2]=["/SLD_1999_S3743934/d15-x01-y01"]
 analyses["IdentifiedParticleFlavour"][313 ][51]["x"][91.2]=["/SLD_1999_S3743934/d15-x01-y02"]
 analyses["IdentifiedParticleFlavour"][2212][41]["x"][91.2]=["/SLD_1999_S3743934/d17-x01-y01"]
 analyses["IdentifiedParticleFlavour"][2212][51]["x"][91.2]=["/SLD_1999_S3743934/d17-x01-y02"]
 analyses["IdentifiedParticleFlavour"][3122][41]["x"][91.2]=["/SLD_1999_S3743934/d19-x01-y01"]
 analyses["IdentifiedParticleFlavour"][3122][51]["x"][91.2]=["/SLD_1999_S3743934/d19-x01-y02"]
 analyses["IdentifiedParticleFlavour"][311 ][41]["x"][91.2]=["/SLD_1999_S3743934/d21-x01-y01"]
 analyses["IdentifiedParticleFlavour"][311 ][51]["x"][91.2]=["/SLD_1999_S3743934/d21-x01-y02"]
 analyses["IdentifiedParticleFlavour"][333 ][41]["x"][91.2]=["/SLD_1999_S3743934/d23-x01-y01"]
 analyses["IdentifiedParticleFlavour"][333 ][51]["x"][91.2]=["/SLD_1999_S3743934/d23-x01-y02"]
 
 analyses["IdentifiedParticleFlavour"][211][5]["Ratio"][91.2]=["/DELPHI_1998_I473409/d08-x01-y01"]
 analyses["IdentifiedParticleFlavour"][211][1]["Ratio"][91.2]=["/DELPHI_1998_I473409/d12-x01-y01"]
 
 analyses["IdentifiedParticleFlavour"][321][5]["Ratio"][91.2]=["/DELPHI_1998_I473409/d09-x01-y01"]
 analyses["IdentifiedParticleFlavour"][321][1]["Ratio"][91.2]=["/DELPHI_1998_I473409/d13-x01-y01"]
 
 analyses["IdentifiedParticleFlavour"][2212][5]["Ratio"][91.2]=["/DELPHI_1998_I473409/d10-x01-y01"]
 analyses["IdentifiedParticleFlavour"][2212][1]["Ratio"][91.2]=["/DELPHI_1998_I473409/d14-x01-y01"]
 
 analyses["IdentifiedParticleFlavour"]["321/2212"][5]["Ratio"][91.2]=["/DELPHI_1998_I473409/d11-x01-y01"]
 analyses["IdentifiedParticleFlavour"]["321/2212"][1]["Ratio"][91.2]=["/DELPHI_1998_I473409/d15-x01-y01"]
 analyses["IdentifiedParticleFlavour"][311][4]["Other"][29.0]=["/HRS_1990_I280958/d05-x01-y01"]
 analyses["IdentifiedParticleFlavour"][311][1]["Other"][29.0]=["/HRS_1990_I280958/d06-x01-y01"]
 
 
 analyses["MultiplicityFlavour"]["321/2212"][1][91.2] = ["/DELPHI_1998_I473409/d03-x01-y05"]
 analyses["MultiplicityFlavour"]["321/2212"][5][91.2] = ["/DELPHI_1998_I473409/d02-x01-y05"]
 
 analyses["MultiplicityFlavour"][211 ][41][91.2]=["/SLD_1999_S3743934/d25-x01-y01"]
 analyses["MultiplicityFlavour"][211 ][51][91.2]=["/SLD_1999_S3743934/d25-x01-y02"]
 analyses["MultiplicityFlavour"][321 ][41][91.2]=["/SLD_1999_S3743934/d25-x02-y01"]
 analyses["MultiplicityFlavour"][321 ][51][91.2]=["/SLD_1999_S3743934/d25-x02-y02"]
 analyses["MultiplicityFlavour"][311 ][41][91.2]=["/SLD_1999_S3743934/d25-x03-y01"]
 analyses["MultiplicityFlavour"][311 ][51][91.2]=["/SLD_1999_S3743934/d25-x03-y02"]
 analyses["MultiplicityFlavour"][313 ][41][91.2]=["/SLD_1999_S3743934/d25-x04-y01"]
 analyses["MultiplicityFlavour"][313 ][51][91.2]=["/SLD_1999_S3743934/d25-x04-y02"]
 analyses["MultiplicityFlavour"][333 ][41][91.2]=["/SLD_1999_S3743934/d25-x05-y01"]
 analyses["MultiplicityFlavour"][333 ][51][91.2]=["/SLD_1999_S3743934/d25-x05-y02"]
 analyses["MultiplicityFlavour"][2212][41][91.2]=["/SLD_1999_S3743934/d25-x06-y01"]
 analyses["MultiplicityFlavour"][2212][51][91.2]=["/SLD_1999_S3743934/d25-x06-y02"]
 analyses["MultiplicityFlavour"][3122][41][91.2]=["/SLD_1999_S3743934/d25-x07-y01"]
 analyses["MultiplicityFlavour"][3122][51][91.2]=["/SLD_1999_S3743934/d25-x07-y02"]
 
 analyses["MultiplicityFlavour"][211 ][1][91.2]=["/SLD_2004_S5693039/d05-x02-y01","/SLD_1999_S3743934/d24-x01-y02",
                                                 "/DELPHI_1998_I473409/d03-x01-y02"]
 analyses["MultiplicityFlavour"][211 ][4][91.2]=["/SLD_2004_S5693039/d05-x02-y02","/SLD_1999_S3743934/d24-x01-y03"]
 analyses["MultiplicityFlavour"][211 ][5][91.2]=["/SLD_2004_S5693039/d05-x02-y03","/SLD_1999_S3743934/d24-x01-y04",
                                                 "/DELPHI_1998_I473409/d02-x01-y02"]
 analyses["MultiplicityFlavour"][321 ][1][91.2]=["/SLD_2004_S5693039/d06-x02-y01","/SLD_1999_S3743934/d24-x02-y02",
                                                 "/DELPHI_1998_I473409/d03-x01-y03"]
 analyses["MultiplicityFlavour"][321 ][4][91.2]=["/SLD_2004_S5693039/d06-x02-y02","/SLD_1999_S3743934/d24-x02-y03"]
 analyses["MultiplicityFlavour"][321 ][5][91.2]=["/SLD_2004_S5693039/d06-x02-y03","/SLD_1999_S3743934/d24-x02-y04",
                                                 "/DELPHI_1998_I473409/d02-x01-y03"]
 analyses["MultiplicityFlavour"][311 ][1][91.2]=["/SLD_1999_S3743934/d24-x03-y02"]
 analyses["MultiplicityFlavour"][311 ][4][91.2]=["/SLD_1999_S3743934/d24-x03-y03"]
 analyses["MultiplicityFlavour"][311 ][5][91.2]=["/SLD_1999_S3743934/d24-x03-y04"]
 analyses["MultiplicityFlavour"][313 ][1][91.2]=["/SLD_1999_S3743934/d24-x04-y02"]
 analyses["MultiplicityFlavour"][313 ][4][91.2]=["/SLD_1999_S3743934/d24-x04-y03"]
 analyses["MultiplicityFlavour"][313 ][5][91.2]=["/SLD_1999_S3743934/d24-x04-y04"]
 analyses["MultiplicityFlavour"][333 ][1][91.2]=["/SLD_1999_S3743934/d24-x05-y02"]
 analyses["MultiplicityFlavour"][333 ][4][91.2]=["/SLD_1999_S3743934/d24-x05-y03"]
 analyses["MultiplicityFlavour"][333 ][5][91.2]=["/SLD_1999_S3743934/d24-x05-y04"]
 analyses["MultiplicityFlavour"][2212][1][91.2]=["/SLD_2004_S5693039/d07-x02-y01","/SLD_1999_S3743934/d24-x06-y02",
                                                 "/DELPHI_1998_I473409/d03-x01-y04"]
 analyses["MultiplicityFlavour"][2212][4][91.2]=["/SLD_2004_S5693039/d07-x02-y02","/SLD_1999_S3743934/d24-x06-y03"]
 analyses["MultiplicityFlavour"][2212][5][91.2]=["/SLD_2004_S5693039/d07-x02-y03","/SLD_1999_S3743934/d24-x06-y04",
                                                 "/DELPHI_1998_I473409/d02-x01-y04"]
 analyses["MultiplicityFlavour"][3122][1][91.2]=["/SLD_1999_S3743934/d24-x07-y02"]
 analyses["MultiplicityFlavour"][3122][4][91.2]=["/SLD_1999_S3743934/d24-x07-y03"]
 analyses["MultiplicityFlavour"][3122][5][91.2]=["/SLD_1999_S3743934/d24-x07-y04"]
 
 
 
 # identified particle distributions
 # photons
 # x_E
 analyses["IdentifiedParticle"][22  ]["x" ][14.0]=["/CELLO_1983_I191415/d01-x01-y01"]
 analyses["IdentifiedParticle"][22  ]["x" ][22.0]=["/CELLO_1983_I191415/d02-x01-y01"]
 analyses["IdentifiedParticle"][22  ]["x" ][29.0]=["/TPC_1985_I205868/d01-x01-y01" ]
 analyses["IdentifiedParticle"][22  ]["x" ][34.0]=["/CELLO_1983_I191415/d03-x01-y01"]
 analyses["IdentifiedParticle"][22  ]["x" ][35.0]=["/CELLO_1989_I276764/d02-x01-y01","/JADE_1990_I282847/d01-x01-y01"]
 analyses["IdentifiedParticle"][22  ]["x" ][44.0]=["/JADE_1990_I282847/d02-x01-y01"]
 analyses["IdentifiedParticle"][22  ]["x" ][91.2]=["/OPAL_1998_S3749908/d02-x01-y01"]
 # xi
 analyses["IdentifiedParticle"][22  ]["xi"][91.2]=["/ALEPH_1996_S3486095/d28-x01-y01","/OPAL_1998_S3749908/d03-x01-y01"]
 # charged pions
 # x
+analyses["IdentifiedParticle"][211 ]["x" ][3.635] = ["/DASP_1979_I132045/d18-x01-y01"]
+analyses["IdentifiedParticle"][211 ]["x" ][4.04 ] = ["/DASP_1979_I132045/d18-x01-y02"]
+analyses["IdentifiedParticle"][211 ]["x" ][4.17 ] = ["/DASP_1979_I132045/d18-x01-y03"]
+analyses["IdentifiedParticle"][211 ]["x" ][4.30 ] = ["/DASP_1979_I132045/d18-x01-y04"]
+analyses["IdentifiedParticle"][211 ]["x" ][4.41 ] = ["/DASP_1979_I132045/d18-x01-y05"]
+analyses["IdentifiedParticle"][211 ]["x" ][4.72 ] = ["/DASP_1979_I132045/d18-x01-y06"]
+analyses["IdentifiedParticle"][211 ]["x" ][5.0  ] = ["/DASP_1979_I132045/d18-x01-y07"]
+analyses["IdentifiedParticle"][211 ]["x" ][5.2  ] = ["/DASP_1979_I132045/d18-x01-y08"]
+
 analyses["IdentifiedParticle"][211 ]["x" ][10.0 ] = ["/ARGUS_1989_I276860/d09-x01-y02"]
 analyses["IdentifiedParticle"][211 ]["x" ][10.52] = ["/BELLE_2013_I1216515/d01-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["x" ][12.0 ] = ["/TASSO_1980_I153656/d02-x01-y02"]
 analyses["IdentifiedParticle"][211 ]["x" ][14.0 ] = ["/TASSO_1983_I181470/d20-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["x" ][22.0 ] = ["/TASSO_1983_I181470/d22-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["x" ][29.0 ] = ["/TPC_1988_I262143/d01-x01-y01","/TPC_1988_I262143/d05-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["x" ][30.0 ] = ["/TASSO_1980_I153656/d05-x01-y02"]
 analyses["IdentifiedParticle"][211 ]["x" ][34.0 ] = ["/TASSO_1989_I267755/d07-x01-y01","/TASSO_1983_I181470/d24-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["x" ][44.0 ] = ["/TASSO_1989_I267755/d10-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["x" ][91.2 ] = ["/ALEPH_1995_I382179/d01-x01-y01","/DELPHI_1998_I473409/d19-x01-y01",
                                                      "/ALEPH_1996_S3486095/d25-x01-y01","/SLD_2004_S5693039/d02-x01-y02",
                                                      "/SLD_1999_S3743934/d01-x01-y02"]
 analyses["IdentifiedParticle"][211 ]["Other" ][91.2 ] = ["/SLD_1999_S3743934/d26-x01-y01","/SLD_1999_S3743934/d26-x01-y02",
                                                          "/SLD_1999_S3743934/d27-x01-y01","/SLD_2004_S5693039/d09-x01-y01",
                                                          "/SLD_2004_S5693039/d09-x01-y02","/SLD_2004_S5693039/d09-x01-y03",]
 # p
+analyses["IdentifiedParticle"][211 ]["p" ][3.635] = ["/DASP_1979_I132045/d01-x01-y01"]
+analyses["IdentifiedParticle"][211 ]["p" ][4.04 ] = ["/DASP_1979_I132045/d01-x01-y02"]
+analyses["IdentifiedParticle"][211 ]["p" ][4.17 ] = ["/DASP_1979_I132045/d01-x01-y03"]
+analyses["IdentifiedParticle"][211 ]["p" ][4.30 ] = ["/DASP_1979_I132045/d01-x01-y04"]
+analyses["IdentifiedParticle"][211 ]["p" ][4.41 ] = ["/DASP_1979_I132045/d01-x01-y05"]
+analyses["IdentifiedParticle"][211 ]["p" ][4.72 ] = ["/DASP_1979_I132045/d01-x01-y06"]
+analyses["IdentifiedParticle"][211 ]["p" ][5.0  ] = ["/DASP_1979_I132045/d01-x01-y07"]
+analyses["IdentifiedParticle"][211 ]["p" ][5.2  ] = ["/DASP_1979_I132045/d01-x01-y08"]
 analyses["IdentifiedParticle"][211 ]["p" ][10.0 ] = ["/ARGUS_1989_I276860/d05-x01-y02"]
 analyses["IdentifiedParticle"][211 ]["p" ][10.54] = ["/BABAR_2013_I1238276/d01-x01-y01","/BABAR_2013_I1238276/d02-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["p" ][12.0 ] = ["/TASSO_1980_I153656/d02-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["p" ][14.0 ] = ["/TASSO_1983_I181470/d19-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["p" ][22.0 ] = ["/TASSO_1983_I181470/d25-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["p" ][30.0 ] = ["/TASSO_1980_I153656/d05-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["p" ][34.0 ] = ["/TASSO_1983_I181470/d13-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["p" ][91.2 ] = ["/DELPHI_1998_I473409/d18-x01-y01","/OPAL_1994_S2927284/d01-x01-y01"]
 # xi
 analyses["IdentifiedParticle"][211 ]["xi"][58.0 ] = ["/TOPAZ_1995_I381900/d02-x01-y01"]
 # ratios
 analyses["IdentifiedParticle"][211 ]["Ratio"][12.0 ] = ["/TASSO_1980_I153656/d08-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["Ratio"][29.0 ] = ["/TPC_1988_I262143/d06-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["Ratio"][30.0 ] = ["/TASSO_1980_I153656/d11-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["Ratio"][34.0 ] = ["/TASSO_1989_I267755/d01-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["Ratio"][44.0 ] = ["/TASSO_1989_I267755/d04-x01-y01"]
 analyses["IdentifiedParticle"][211 ]["Ratio"][91.2 ] = ["/DELPHI_1998_I473409/d04-x01-y01","/SLD_1999_S3743934/d01-x01-y01"]
 # neutral pions
 # x
 analyses["IdentifiedParticle"][111 ]["x" ][10.0]=["/ARGUS_1990_I278933/d03-x01-y01","/ARGUS_1990_I278933/d03-x01-y02"]
 analyses["IdentifiedParticle"][111 ]["x" ][14.0]=["/TASSO_1982_I168232/d02-x03-y03","/CELLO_1983_I191415/d04-x01-y01"]
 analyses["IdentifiedParticle"][111 ]["x" ][22.0]=["/CELLO_1983_I191415/d05-x01-y01"]
 analyses["IdentifiedParticle"][111 ]["x" ][29.0]=["/TPC_1985_I205868/d02-x01-y01" ]
 analyses["IdentifiedParticle"][111 ]["x" ][34.0]=["/TASSO_1982_I168232/d03-x03-y03","/TASSO_1986_I230950/d02-x01-y01",
                                                   "/CELLO_1983_I191415/d06-x01-y01"]
 analyses["IdentifiedParticle"][111 ]["x" ][35.0]=["/CELLO_1989_I276764/d03-x01-y01","/CELLO_1989_I276764/d04-x01-y01",
                                                   "/JADE_1990_I282847/d03-x01-y01"]
 analyses["IdentifiedParticle"][111 ]["x" ][44.0]=["/TASSO_1989_I267755/d13-x01-y01","/JADE_1990_I282847/d04-x01-y01"]
 analyses["IdentifiedParticle"][111 ]["x" ][91.2]=["/DELPHI_1996_I401100/d01-x01-y01","/ALEPH_1996_S3486095/d29-x01-y01",
-                                                  "/OPAL_1998_S3749908/d04-x01-y01",]
+                                                  "/OPAL_1998_S3749908/d04-x01-y01","/ALEPH_1997_I427131/d02-x01-y02",
+                                                  "/ALEPH_2000_I507531/d01-x01-y01","/ALEPH_2000_I507531/d04-x01-y01",
+                                                  "/ALEPH_2000_I507531/d07-x01-y01","/ALEPH_2000_I507531/d08-x01-y01",
+                                                  "/ALEPH_2000_I507531/d09-x01-y01"]
 # p/E
 analyses["IdentifiedParticle"][111 ]["p" ][14.0]=["/TASSO_1982_I168232/d02-x01-y01","/TASSO_1982_I168232/d02-x02-y02"]
 analyses["IdentifiedParticle"][111 ]["p" ][34.0]=["/TASSO_1982_I168232/d03-x01-y01","/TASSO_1982_I168232/d03-x02-y02",
                                                   "/TASSO_1986_I230950/d01-x01-y01"]
 # xi
 analyses["IdentifiedParticle"][111 ]["xi"][91.2]=["/OPAL_1998_S3749908/d05-x01-y01"]
+# others
+analyses["IdentifiedParticle"][111 ]["Other"][91.2]=["/ALEPH_1997_I427131/d03-x01-y01","/ALEPH_1997_I427131/d04-x01-y01"]
 # eta
 #x
 analyses["IdentifiedParticle"][221 ]["x" ][10.0]=["/ARGUS_1990_I278933/d05-x01-y01","/ARGUS_1990_I278933/d05-x01-y02"]
 analyses["IdentifiedParticle"][221 ]["x" ][29.0]=["/HRS_1988_I250824/d01-x01-y01"]
 analyses["IdentifiedParticle"][221 ]["x" ][35.0]=["/CELLO_1989_I276764/d05-x01-y01" ,"/JADE_1990_I282847/d05-x01-y01"]
 analyses["IdentifiedParticle"][221 ]["x" ][91.2]=["/ALEPH_2002_S4823664/d02-x01-y02","/L3_1992_I336180/d01-x01-y01",
-                                                  "/ALEPH_1996_S3486095/d30-x01-y01","/OPAL_1998_S3749908/d06-x01-y01",]
+                                                  "/ALEPH_1996_S3486095/d30-x01-y01","/OPAL_1998_S3749908/d06-x01-y01",
+                                                  "/ALEPH_2000_I507531/d02-x01-y01","/ALEPH_2000_I507531/d05-x01-y01",
+                                                  "/ALEPH_2000_I507531/d10-x01-y01","/ALEPH_2000_I507531/d11-x01-y01",
+                                                  "/ALEPH_2000_I507531/d12-x01-y01"]
 # xi
 analyses["IdentifiedParticle"][221 ]["xi"][91.2]=["/L3_1992_I336180/d02-x01-y01","/OPAL_1998_S3749908/d07-x01-y01"]
 # eta'
 # x
 analyses["IdentifiedParticle"][331 ]["x" ][91.2]=["/L3_1997_I427107/d07-x01-y01"    ,"/L3_1997_I427107/d09-x01-y01",
-                                                  "/ALEPH_1996_S3486095/d31-x01-y01","/OPAL_1998_S3749908/d12-x01-y01"]
+                                                  "/ALEPH_1996_S3486095/d31-x01-y01","/OPAL_1998_S3749908/d12-x01-y01",
+                                                  "/ALEPH_2000_I507531/d03-x01-y01","/ALEPH_2000_I507531/d06-x01-y01",
+                                                  "/ALEPH_2000_I507531/d13-x01-y01","/ALEPH_2000_I507531/d14-x01-y01",
+                                                  "/ALEPH_2000_I507531/d15-x01-y01"]
 # xi
 analyses["IdentifiedParticle"][331 ]["xi"][91.2]=["/L3_1997_I427107/d08-x01-y01","/L3_1997_I427107/d10-x01-y01",
                                                   "/OPAL_1998_S3749908/d13-x01-y01"]
 # rho +/-
 analyses["IdentifiedParticle"][213 ]["x" ][91.2] = ["/OPAL_1998_S3749908/d08-x01-y01"]
 analyses["IdentifiedParticle"][213 ]["xi"][91.2] = ["/OPAL_1998_S3749908/d09-x01-y01"]
 # rho0
 analyses["IdentifiedParticle"][113 ]["x" ][10.0] = ["/ARGUS_1993_S2789213/d10-x01-y01"]
 analyses["IdentifiedParticle"][113 ]["x" ][35.0] = ["/JADE_1984_I203145/d02-x01-y01"]
 analyses["IdentifiedParticle"][113 ]["x" ][91.2] = ["/DELPHI_1999_S3960137/d01-x01-y01","/ALEPH_1996_S3486095/d37-x01-y01"]
 # omega
 analyses["IdentifiedParticle"][223 ]["x" ][10.0] = ["/ARGUS_1993_S2789213/d13-x01-y01"]
 analyses["IdentifiedParticle"][223 ]["x" ][91.2] = ["/ALEPH_2002_S4823664/d03-x01-y02","/L3_1997_I427107/d05-x01-y01",
                                                     "/ALEPH_1996_S3486095/d38-x01-y01","/OPAL_1998_S3749908/d10-x01-y01",]
 analyses["IdentifiedParticle"][223 ]["xi"][91.2] = ["/L3_1997_I427107/d06-x01-y01","/OPAL_1998_S3749908/d11-x01-y01"]
 # phi
 analyses["IdentifiedParticle"][333 ]["x"    ][10.0] = ["/ARGUS_1989_I262551/d01-x01-y01"]
 analyses["IdentifiedParticle"][333 ]["x"    ][29.0] = ["/TPC_1984_I200105/d01-x01-y01"]
 analyses["IdentifiedParticle"][333 ]["x"    ][91.2] = ["/DELPHI_1996_I420528/d03-x01-y01","/ALEPH_1996_S3486095/d40-x01-y01",
                                                        "/OPAL_1998_S3702294/d02-x01-y03","/SLD_1999_S3743934/d09-x01-y01"]
 analyses["IdentifiedParticle"][333 ]["Other"][29.0] = ["/TPC_1984_I200105/d03-x01-y01"]
 # f_2
 analyses["IdentifiedParticle"][225]["x"    ][91.2]=["/DELPHI_1999_S3960137/d01-x01-y03","/OPAL_1998_S3702294/d02-x01-y02"]
 # f_2'
 analyses["IdentifiedParticle"][335]["x"    ][91.2]=["/DELPHI_1996_I416741/d01-x01-y01"]
 # f_0(980)
 analyses["IdentifiedParticle"][9010221]["x"    ][10.0]=["/ARGUS_1993_S2669951/d02-x01-y01"]
 analyses["IdentifiedParticle"][9010221]["x"    ][91.2]=["/DELPHI_1999_S3960137/d01-x01-y02","/OPAL_1998_S3702294/d02-x01-y01"]
 # a_0 =/-
 analyses["IdentifiedParticle"][9000211]["x"    ][91.2]=["/OPAL_1998_S3749908/d14-x01-y01"]
 analyses["IdentifiedParticle"][9000211]["xi"   ][91.2]=["/OPAL_1998_S3749908/d15-x01-y01"]
 # strange mesons
 # K0
 # x
 analyses["IdentifiedParticle"][311 ]["x"    ][3.63] = ["/PLUTO_1977_I118873/d02-x01-y01"]
 analyses["IdentifiedParticle"][311 ]["x"    ][4.03] = ["/PLUTO_1977_I118873/d03-x01-y01"]
 analyses["IdentifiedParticle"][311 ]["x"    ][4.5]  = ["/PLUTO_1977_I118873/d04-x01-y01"]
 analyses["IdentifiedParticle"][311 ]["x"    ][9.4]  = ["/PLUTO_1981_I165122/d05-x01-y01"]
 analyses["IdentifiedParticle"][311 ]["x"    ][10.0] = ["/ARGUS_1989_I276860/d11-x01-y02"]
 analyses["IdentifiedParticle"][311 ]["x"    ][14.0] = ["/TASSO_1980_I153341/d04-x01-y01","/TASSO_1985_I205119/d01-x01-y01"]
 analyses["IdentifiedParticle"][311 ]["x"    ][22.0] = ["/TASSO_1985_I205119/d02-x01-y01"]
 analyses["IdentifiedParticle"][311 ]["x"    ][29.0] = ["/TPC_1984_I205869/d04-x01-y01","/HRS_1990_I280958/d03-x01-y01"]
 analyses["IdentifiedParticle"][311 ]["x"    ][30.0] = ["/PLUTO_1981_I165122/d04-x01-y01"]
 analyses["IdentifiedParticle"][311 ]["x"    ][34.0] = ["/TASSO_1985_I205119/d03-x01-y01"]
 analyses["IdentifiedParticle"][311 ]["x"    ][34.5] = ["/TASSO_1990_I284251/d01-x01-y03"]
 analyses["IdentifiedParticle"][311 ]["x"    ][35.0] = ["/TASSO_1990_I284251/d01-x01-y02","/CELLO_1990_I283026/d01-x01-y01"]
 analyses["IdentifiedParticle"][311 ]["x"    ][42.6] = ["/TASSO_1990_I284251/d01-x01-y01"]
 analyses["IdentifiedParticle"][311 ]["x"    ][91.2] = ["/OPAL_2000_S4418603/d03-x01-y01","/DELPHI_1995_I377487/d08-x01-y01",
-                                                       "/ALEPH_1996_S3486095/d32-x01-y01","/SLD_1999_S3743934/d05-x01-y01"]
+                                                       "/ALEPH_1996_S3486095/d32-x01-y01","/SLD_1999_S3743934/d05-x01-y01",
+                                                       "/OPAL_1995_I393503/d02-x01-y01"]
 # p
 analyses["IdentifiedParticle"][311 ]["p"    ][10.0] = ["/ARGUS_1989_I276860/d07-x01-y02"]
 analyses["IdentifiedParticle"][311 ]["p"    ][14.0] = ["/TASSO_1980_I153341/d02-x01-y01","/TASSO_1985_I205119/d07-x01-y01"]
 analyses["IdentifiedParticle"][311 ]["p"    ][22.0] = ["/TASSO_1985_I205119/d08-x01-y01"]
 analyses["IdentifiedParticle"][311 ]["p"    ][34.0] = ["/TASSO_1985_I205119/d09-x01-y01"]
 # xi
 analyses["IdentifiedParticle"][311 ]["xi"   ][58.0] = ["/TOPAZ_1995_I381900/d03-x01-y01"]
-analyses["IdentifiedParticle"][311 ]["xi"   ][91.2] = ["/DELPHI_1995_I377487/d09-x01-y01"]
+analyses["IdentifiedParticle"][311 ]["xi"   ][91.2] = ["/DELPHI_1995_I377487/d09-x01-y01","/OPAL_1995_I393503/d03-x01-y01",
+                                                       "/ALEPH_2000_I507531/d16-x01-y01","/ALEPH_2000_I507531/d18-x01-y01",
+                                                       "/ALEPH_2000_I507531/d20-x01-y01","/ALEPH_2000_I507531/d21-x01-y01",
+                                                       "/ALEPH_2000_I507531/d21-x01-y01"]
 # other
 analyses["IdentifiedParticle"][311 ]["Other"][14.8 ] = ["/TASSO_1990_I284251/d06-x01-y01","/TASSO_1990_I284251/d06-x01-y02"]
 analyses["IdentifiedParticle"][311 ]["Other"][21.5 ] = ["/TASSO_1990_I284251/d07-x01-y01","/TASSO_1990_I284251/d07-x01-y02"]
 analyses["IdentifiedParticle"][311 ]["Other"][29.0 ] = ["/HRS_1990_I280958/d04-x01-y01"]
 analyses["IdentifiedParticle"][311 ]["Other"][35.0 ] = ["/TASSO_1990_I284251/d05-x01-y03","/TASSO_1990_I284251/d05-x01-y04"]
 analyses["IdentifiedParticle"][311 ]["Other"][42.6 ] = ["/TASSO_1990_I284251/d05-x01-y01","/TASSO_1990_I284251/d05-x01-y02"]
 # K+/-
 # x
+analyses["IdentifiedParticle"][321 ]["x" ][3.635] = ["/DASP_1979_I132045/d19-x01-y01"]
+analyses["IdentifiedParticle"][321 ]["x" ][4.04 ] = ["/DASP_1979_I132045/d20-x01-y01"]
+analyses["IdentifiedParticle"][321 ]["x" ][4.17 ] = ["/DASP_1979_I132045/d21-x01-y01"]
+analyses["IdentifiedParticle"][321 ]["x" ][4.30 ] = ["/DASP_1979_I132045/d22-x01-y01"]
+analyses["IdentifiedParticle"][321 ]["x" ][4.41 ] = ["/DASP_1979_I132045/d23-x01-y01"]
+analyses["IdentifiedParticle"][321 ]["x" ][4.72 ] = ["/DASP_1979_I132045/d24-x01-y01"]
+analyses["IdentifiedParticle"][321 ]["x" ][5.0  ] = ["/DASP_1979_I132045/d25-x01-y01"]
+analyses["IdentifiedParticle"][321 ]["x" ][5.2  ] = ["/DASP_1979_I132045/d26-x01-y01"]
 analyses["IdentifiedParticle"][321 ]["x"    ][10.0 ] = ["/ARGUS_1989_I276860/d10-x01-y02"]
 analyses["IdentifiedParticle"][321 ]["x"    ][10.52] = ["/BELLE_2013_I1216515/d01-x01-y02"]
 analyses["IdentifiedParticle"][321 ]["x"    ][12.0 ] = ["/TASSO_1980_I153656/d03-x01-y02"]
 analyses["IdentifiedParticle"][321 ]["x"    ][14.0 ] = ["/TASSO_1983_I181470/d26-x01-y01"]
 analyses["IdentifiedParticle"][321 ]["x"    ][22.0 ] = ["/TASSO_1983_I181470/d10-x01-y01"]
 analyses["IdentifiedParticle"][321 ]["x"    ][29.0 ] = ["/TPC_1988_I262143/d01-x01-y02","/TPC_1988_I262143/d05-x01-y02"]
 analyses["IdentifiedParticle"][321 ]["x"    ][30.0 ] = ["/TASSO_1980_I153656/d06-x01-y02"]
 analyses["IdentifiedParticle"][321 ]["x"    ][34.0 ] = ["/TASSO_1989_I267755/d08-x01-y01","/TASSO_1983_I181470/d12-x01-y01"]
 analyses["IdentifiedParticle"][321 ]["x"    ][44.0 ] = ["/TASSO_1989_I267755/d11-x01-y01"]
 analyses["IdentifiedParticle"][321 ]["x"    ][91.2 ] = ["/ALEPH_1995_I382179/d02-x01-y01","/DELPHI_1995_I394052/d05-x01-y01",
                                                         "/DELPHI_1998_I473409/d21-x01-y01","/SLD_1999_S3743934/d02-x01-y02",
                                                         "/ALEPH_1996_S3486095/d26-x01-y01","/SLD_2004_S5693039/d03-x01-y02"]
 # p
+analyses["IdentifiedParticle"][321 ]["p" ][3.635] = ["/DASP_1979_I132045/d02-x01-y01"]
+analyses["IdentifiedParticle"][321 ]["p" ][4.04 ] = ["/DASP_1979_I132045/d03-x01-y01"]
+analyses["IdentifiedParticle"][321 ]["p" ][4.17 ] = ["/DASP_1979_I132045/d04-x01-y01"]
+analyses["IdentifiedParticle"][321 ]["p" ][4.30 ] = ["/DASP_1979_I132045/d05-x01-y01"]
+analyses["IdentifiedParticle"][321 ]["p" ][4.41 ] = ["/DASP_1979_I132045/d06-x01-y01"]
+analyses["IdentifiedParticle"][321 ]["p" ][4.72 ] = ["/DASP_1979_I132045/d07-x01-y01"]
+analyses["IdentifiedParticle"][321 ]["p" ][5.0  ] = ["/DASP_1979_I132045/d08-x01-y01"]
+analyses["IdentifiedParticle"][321 ]["p" ][5.2  ] = ["/DASP_1979_I132045/d09-x01-y01"]
 analyses["IdentifiedParticle"][321 ]["p"    ][10.0 ] = ["/ARGUS_1989_I276860/d06-x01-y02"]
 analyses["IdentifiedParticle"][321 ]["p"    ][10.54] = ["/BABAR_2013_I1238276/d01-x01-y02","/BABAR_2013_I1238276/d02-x01-y02"]
 analyses["IdentifiedParticle"][321 ]["p"    ][12.0 ] = ["/TASSO_1980_I153656/d03-x01-y01"]
 analyses["IdentifiedParticle"][321 ]["p"    ][14.0 ] = ["/TASSO_1983_I181470/d21-x01-y01"]
 analyses["IdentifiedParticle"][321 ]["p"    ][22.0 ] = ["/TASSO_1983_I181470/d27-x01-y01"]
 analyses["IdentifiedParticle"][321 ]["p"    ][30.0 ] = ["/TASSO_1980_I153656/d06-x01-y01"]
 analyses["IdentifiedParticle"][321 ]["p"    ][34.0 ] = ["/TASSO_1983_I181470/d15-x01-y01"]
 analyses["IdentifiedParticle"][321 ]["p"    ][91.2 ] = ["/DELPHI_1995_I394052/d03-x01-y01","/DELPHI_1998_I473409/d20-x01-y01",
                                                         "/OPAL_1994_S2927284/d02-x01-y01"]
 # xi
 analyses["IdentifiedParticle"][321 ]["xi"   ][58.0 ] = ["/TOPAZ_1995_I381900/d02-x01-y02"]
 # ratio
 analyses["IdentifiedParticle"][321 ]["Ratio"][12.0 ] = ["/TASSO_1980_I153656/d09-x01-y01"]
 analyses["IdentifiedParticle"][321 ]["Ratio"][29.0 ] = ["/TPC_1988_I262143/d07-x01-y01","/TPC_1988_I262143/d06-x01-y02"]
 analyses["IdentifiedParticle"][321 ]["Ratio"][30.0 ] = ["/TASSO_1980_I153656/d12-x01-y01"]
 analyses["IdentifiedParticle"][321 ]["Ratio"][34.0 ] = ["/TASSO_1989_I267755/d02-x01-y01"]
 analyses["IdentifiedParticle"][321 ]["Ratio"][44.0 ] = ["/TASSO_1989_I267755/d05-x01-y01"]
 analyses["IdentifiedParticle"][321 ]["Ratio"][91.2 ] = ["/DELPHI_1998_I473409/d05-x01-y01","/SLD_1999_S3743934/d02-x01-y01"]
 # other
 analyses["IdentifiedParticle"][321 ]["Other"][91.2 ] = ["/SLD_1999_S3743934/d30-x01-y01","/SLD_1999_S3743934/d30-x01-y02",
                                                         "/SLD_1999_S3743934/d31-x01-y01","/SLD_2004_S5693039/d10-x01-y01",
-                                                        "/SLD_2004_S5693039/d10-x01-y02","/SLD_2004_S5693039/d10-x01-y03"]
+                                                        "/SLD_2004_S5693039/d10-x01-y02","/SLD_2004_S5693039/d10-x01-y03",
+                                                        "/DELPHI_1995_I382285/a_K","/DELPHI_1995_I382285/d01-x01-y01"]
 # K*0
 analyses["IdentifiedParticle"][313 ]["x"    ][10.0 ] = ["/ARGUS_1993_S2789213/d07-x01-y01"]
 analyses["IdentifiedParticle"][313 ]["x"    ][29.0 ] = ["/TPC_1984_I205869/d03-x01-y01"]
 analyses["IdentifiedParticle"][313 ]["x"    ][91.2 ] = ["/DELPHI_1996_I420528/d01-x01-y01","/ALEPH_1996_S3486095/d39-x01-y01",
                                                         "/OPAL_1997_S3608263/d01-x01-y01","/SLD_1999_S3743934/d08-x01-y01"]
 analyses["IdentifiedParticle"][313 ]["Other"][91.2 ] = ["/SLD_1999_S3743934/d28-x01-y01","/SLD_1999_S3743934/d28-x01-y02",
                                                         "/SLD_1999_S3743934/d29-x01-y01"]
 # K* +/-
 analyses["IdentifiedParticle"][323 ]["x"    ][10.0 ] = ["/ARGUS_1993_S2789213/d04-x01-y01"]
 analyses["IdentifiedParticle"][323 ]["x"    ][14.8 ] = ["/TASSO_1990_I284251/d02-x01-y01"]
 analyses["IdentifiedParticle"][323 ]["x"    ][21.5 ] = ["/TASSO_1990_I284251/d03-x01-y01"]
 analyses["IdentifiedParticle"][323 ]["x"    ][34.5 ] = ["/TASSO_1990_I284251/d08-x01-y03"]
 analyses["IdentifiedParticle"][323 ]["x"    ][35.0 ] = ["/TASSO_1990_I284251/d08-x01-y02","/CELLO_1990_I283026/d02-x01-y01",
                                                         "/JADE_1984_I203145/d03-x01-y01"]
 analyses["IdentifiedParticle"][323 ]["x"    ][42.6 ] = ["/TASSO_1990_I284251/d08-x01-y01"]
 analyses["IdentifiedParticle"][323 ]["x"    ][91.2 ] = ["/OPAL_1993_I342766/d01-x01-y01","/DELPHI_1995_I377487/d10-x01-y01",
                                                         "/ALEPH_1996_S3486095/d43-x01-y01"]
 analyses["IdentifiedParticle"][323 ]["Other"][35.0 ] = ["/TASSO_1990_I284251/d10-x01-y01","/TASSO_1990_I284251/d10-x01-y02"]
 # charm
 # D+/-
+analyses["IdentifiedParticle"][421 ]["x"    ][10.47] = ["/ARGUS_1991_I315059/d03-x01-y01"]
 analyses["IdentifiedParticle"][421 ]["x"    ][10.5 ] = ["/CLEO_2004_S5809304/d03-x01-y01","/CLEO_2004_S5809304/d04-x01-y01"]
 analyses["IdentifiedParticle"][421 ]["x"    ][29.0 ] = ["/HRS_1988_I23360/d02-x01-y01"]
 # D0
+analyses["IdentifiedParticle"][411 ]["x"    ][10.47] = ["/ARGUS_1991_I315059/d02-x01-y01"]
 analyses["IdentifiedParticle"][411 ]["x"    ][10.5 ] = ["/CLEO_2004_S5809304/d02-x01-y01","/CLEO_2004_S5809304/d09-x01-y01"]
 analyses["IdentifiedParticle"][411 ]["x"    ][29.0 ] = ["/HRS_1988_I23360/d02-x01-y02"]
 # D* 0
+analyses["IdentifiedParticle"][423 ]["x"    ][10.47] = ["/ARGUS_1991_I315059/d04-x01-y01"]
 analyses["IdentifiedParticle"][423 ]["x"    ][10.5]=["/CLEO_2004_S5809304/d07-x01-y01","/CLEO_2004_S5809304/d08-x01-y01"]
 # D* +/-
 analyses["IdentifiedParticle"][413 ]["x"    ][29.0 ] = ["/TPC_1986_I217416/d01-x01-y01","/TPC_1986_I217416/d01-x01-y02",
                                                         "/HRS_1988_I23360/d01-x01-y01","/HRS_1988_I23360/d01-x01-y02"]
 analyses["IdentifiedParticle"][413 ]["x"    ][34.4 ] = ["/JADE_1984_I202785/d01-x01-y01"]
 analyses["IdentifiedParticle"][413 ]["x"    ][36.2 ] = ["/TASSO_1989_I278856/d01-x01-y01","/TASSO_1989_I278856/d01-x01-y02",
                                                         "/TASSO_1989_I278856/d02-x01-y01","/TASSO_1989_I278856/d02-x01-y02"]
 analyses["IdentifiedParticle"][413 ]["x"    ][91.2 ] = ["/ALEPH_1999_S4193598/d01-x01-y01"]
 analyses["IdentifiedParticle"][413 ]["x"    ][10.5 ] = ["/CLEO_2004_S5809304/d05-x01-y01","/CLEO_2004_S5809304/d06-x01-y01"]
 analyses["IdentifiedParticle"][413 ]["Other"][34.4 ] = ["/JADE_1984_I202785/d03-x01-y01"]
 # D_2
-analyses["IdentifiedParticle"][425 ]["x"    ][10.0 ] = ["/ARGUS_1989_I268577/d02-x01-y01"]
+analyses["IdentifiedParticle"][425  ]["x"    ][10.0 ] = ["/ARGUS_1989_I268577/d02-x01-y01","/ARGUS_1989_I280943/d04-x01-y02"]
+analyses["IdentifiedParticle"][425  ]["x"    ][10.6 ] = ["/CLEOII_1994_I372349/d01-x01-y01"]
+analyses["IdentifiedParticle"][10423]["x"    ][10.0 ] = ["/ARGUS_1989_I280943/d04-x01-y01"]
+analyses["IdentifiedParticle"][10423]["x"    ][10.6 ] = ["/CLEOII_1994_I372349/d01-x01-y02"]
+analyses["IdentifiedParticle"][10413]["x"    ][10.6 ] = ["/CLEOII_1994_I378319/d04-x01-y02"]
+analyses["IdentifiedParticle"][415  ]["x"    ][10.6 ] = ["/CLEOII_1994_I378319/d04-x01-y01"]
 # D_s+
-analyses["IdentifiedParticle"][431 ]["x"    ][10.5 ] = ["/CLEO_2000_I526554/d02-x01-y01","/CLEO_2000_I526554/d04-x01-y01"]
+analyses["IdentifiedParticle"][431  ]["x"    ][10.5 ] = ["/CLEO_2000_I526554/d02-x01-y01","/CLEO_2000_I526554/d04-x01-y01"]
+analyses["IdentifiedParticle"][431  ]["x"    ][10.58] = ["/BABAR_2002_I582184/d03-x01-y02"]
 # D_s*+
-analyses["IdentifiedParticle"][433 ]["x"    ][10.5 ] = ["/CLEO_2000_I526554/d01-x01-y01","/CLEO_2000_I526554/d03-x01-y01"]
+analyses["IdentifiedParticle"][433  ]["x"    ][10.5 ] = ["/CLEO_2000_I526554/d01-x01-y01","/CLEO_2000_I526554/d03-x01-y01"]
+analyses["IdentifiedParticle"][433  ]["x"    ][10.58] = ["/BABAR_2002_I582184/d04-x01-y02"]
+# D_s2
+analyses["IdentifiedParticle"][435]["x"    ][10.58] = ["/ARGUS_1995_I397794/d02-x01-y01"]
+# D_s1(2536)
+analyses["IdentifiedParticle"][10433]["x"    ][10   ] = ["/ARGUS_1989_I282570/d02-x01-y01"]
+analyses["IdentifiedParticle"][10433]["x"    ][10.5 ] = ["/CLEOII_1993_I352823/d03-x01-y01"]
+analyses["IdentifiedParticle"][10433]["x"    ][10.6 ] = ["/CLEOII_1993_I352823/d04-x01-y01"]
 # charmonium
-analyses["IdentifiedParticle"][443 ]["x"    ][91.2 ] = ["/OPAL_1996_S3257789/d01-x01-y01"]
+analyses["IdentifiedParticle"][443   ]["p"    ][10.6 ] = ["/BELLE_2002_I563840/d03-x01-y01","/BELLE_2002_I563840/d03-x01-y02"]
+analyses["IdentifiedParticle"][443   ]["x"    ][91.2 ] = ["/OPAL_1996_S3257789/d01-x01-y01"]
+analyses["IdentifiedParticle"][443   ]["Other"][10.6 ] = ["/BELLE_2002_I563840/d02-x01-y01","/BELLE_2002_I563840/d02-x01-y02",
+                                                          "/BELLE_2002_I563840/d02-x02-y01","/BELLE_2002_I563840/d02-x02-y02",
+                                                          "/BELLE_2002_I563840/d02-x03-y01","/BELLE_2002_I563840/d02-x03-y02",
+                                                          "/BELLE_2002_I563840/d04-x01-y01","/BELLE_2002_I563840/d04-x01-y02",
+                                                          "/BELLE_2002_I563840/d04-x02-y01","/BELLE_2002_I563840/d04-x02-y02"]
+analyses["IdentifiedParticle"][100443]["p"    ][10.6 ] = ["/BELLE_2002_I563840/d03-x02-y01"]
 # other
 analyses["IdentifiedParticle"]["321/2212"]["Ratio"][91.2 ] = ["/DELPHI_1998_I473409/d07-x01-y01"]
 #
 #  Baryons
 #
 # light unflavoured
 # proton
 # x
+analyses["IdentifiedParticle"][2212]["x" ][3.635] = ["/DASP_1979_I132045/d27-x01-y01"]
+analyses["IdentifiedParticle"][2212]["x" ][4.04 ] = ["/DASP_1979_I132045/d28-x01-y01"]
+analyses["IdentifiedParticle"][2212]["x" ][4.17 ] = ["/DASP_1979_I132045/d29-x01-y01"]
+analyses["IdentifiedParticle"][2212]["x" ][4.30 ] = ["/DASP_1979_I132045/d30-x01-y01"]
+analyses["IdentifiedParticle"][2212]["x" ][4.41 ] = ["/DASP_1979_I132045/d31-x01-y01"]
+analyses["IdentifiedParticle"][2212]["x" ][4.72 ] = ["/DASP_1979_I132045/d32-x01-y01"]
+analyses["IdentifiedParticle"][2212]["x" ][5.0  ] = ["/DASP_1979_I132045/d33-x01-y01"]
+analyses["IdentifiedParticle"][2212]["x" ][5.2  ] = ["/DASP_1979_I132045/d34-x01-y01"]
 analyses["IdentifiedParticle"][2212]["x"    ][10.0 ] = ["/ARGUS_1989_I276860/d12-x01-y02"]
 analyses["IdentifiedParticle"][2212]["x"    ][12.0 ] = ["/TASSO_1980_I153656/d04-x01-y02"]
 analyses["IdentifiedParticle"][2212]["x"    ][14.0 ] = ["/TASSO_1983_I181470/d14-x01-y01"]
 analyses["IdentifiedParticle"][2212]["x"    ][22.0 ] = ["/TASSO_1983_I181470/d16-x01-y01"]
 analyses["IdentifiedParticle"][2212]["x"    ][29.0 ] = ["/TPC_1988_I262143/d01-x01-y03","/TPC_1988_I262143/d05-x01-y03"]
 analyses["IdentifiedParticle"][2212]["x"    ][30.0 ] = ["/TASSO_1980_I153656/d07-x01-y02"]
 analyses["IdentifiedParticle"][2212]["x"    ][34.0 ] = ["/TASSO_1989_I267755/d09-x01-y01","/TASSO_1983_I181470/d18-x01-y01"]
 analyses["IdentifiedParticle"][2212]["x"    ][44.0 ] = ["/TASSO_1989_I267755/d12-x01-y01"]
 analyses["IdentifiedParticle"][2212]["x"    ][91.2 ] = ["/ALEPH_1995_I382179/d03-x01-y01","/DELPHI_1995_I394052/d06-x01-y01",
                                                         "/DELPHI_1998_I473409/d23-x01-y01","/ALEPH_1996_S3486095/d27-x01-y01",
                                                         "/SLD_2004_S5693039/d04-x01-y02","/SLD_1999_S3743934/d03-x01-y02"]
 # p
+analyses["IdentifiedParticle"][2212]["p" ][3.635] = ["/DASP_1979_I132045/d10-x01-y01"]
+analyses["IdentifiedParticle"][2212]["p" ][4.04 ] = ["/DASP_1979_I132045/d11-x01-y01"]
+analyses["IdentifiedParticle"][2212]["p" ][4.17 ] = ["/DASP_1979_I132045/d12-x01-y01"]
+analyses["IdentifiedParticle"][2212]["p" ][4.30 ] = ["/DASP_1979_I132045/d13-x01-y01"]
+analyses["IdentifiedParticle"][2212]["p" ][4.41 ] = ["/DASP_1979_I132045/d14-x01-y01"]
+analyses["IdentifiedParticle"][2212]["p" ][4.72 ] = ["/DASP_1979_I132045/d15-x01-y01"]
+analyses["IdentifiedParticle"][2212]["p" ][5.0  ] = ["/DASP_1979_I132045/d16-x01-y01"]
+analyses["IdentifiedParticle"][2212]["p" ][5.2  ] = ["/DASP_1979_I132045/d17-x01-y01"]
 analyses["IdentifiedParticle"][2212]["p"    ][10.0 ] = ["/ARGUS_1989_I276860/d08-x01-y02"]
 analyses["IdentifiedParticle"][2212]["p"    ][10.54] = ["/BABAR_2013_I1238276/d01-x01-y03","/BABAR_2013_I1238276/d02-x01-y03"] 
 analyses["IdentifiedParticle"][2212]["p"    ][12.0 ] = ["/TASSO_1980_I153656/d04-x01-y01"]
 analyses["IdentifiedParticle"][2212]["p"    ][14.0 ] = ["/TASSO_1983_I181470/d23-x01-y01"]
 analyses["IdentifiedParticle"][2212]["p"    ][22.0 ] = ["/TASSO_1983_I181470/d11-x01-y01"]
 analyses["IdentifiedParticle"][2212]["p"    ][30.0 ] = ["/TASSO_1980_I153656/d07-x01-y01"]
 analyses["IdentifiedParticle"][2212]["p"    ][34.0 ] = ["/TASSO_1989_I267755/d03-x01-y01","/JADE_1981_I166363/d01-x01-y01",
                                                         "/TASSO_1983_I181470/d17-x01-y01"]
 analyses["IdentifiedParticle"][2212]["p"    ][44.0 ] = ["/TASSO_1989_I267755/d06-x01-y01"]
 analyses["IdentifiedParticle"][2212]["p"    ][91.2 ] = ["/DELPHI_1995_I394052/d04-x01-y01","/DELPHI_1998_I473409/d22-x01-y01",
                                                         "/OPAL_1994_S2927284/d03-x01-y01",]
 # xi
 analyses["IdentifiedParticle"][2212]["xi"   ][58.0 ] = ["/TOPAZ_1995_I381900/d02-x01-y03"]
 # ratio
 analyses["IdentifiedParticle"][2212]["Ratio"][12.0 ] = ["/TASSO_1980_I153656/d10-x01-y01"]
 analyses["IdentifiedParticle"][2212]["Ratio"][29.0 ] = ["/TPC_1988_I262143/d06-x01-y03","/TPC_1988_I262143/d07-x01-y02",
                                                         "/TPC_1988_I262143/d07-x01-y03"]
 analyses["IdentifiedParticle"][2212]["Ratio"][30.0 ] = ["/TASSO_1980_I153656/d13-x01-y01"]
 analyses["IdentifiedParticle"][2212]["Ratio"][91.2 ] = ["/SLD_1999_S3743934/d03-x01-y01","/DELPHI_1998_I473409/d06-x01-y01"]
 analyses["IdentifiedParticle"][2212]["Other"][91.2 ] = ["/SLD_1999_S3743934/d32-x01-y01","/SLD_1999_S3743934/d32-x01-y02",
                                                         "/SLD_1999_S3743934/d33-x01-y01","/SLD_2004_S5693039/d11-x01-y01",
                                                         "/SLD_2004_S5693039/d11-x01-y02","/SLD_2004_S5693039/d11-x01-y03"]
 # Delta++
 analyses["IdentifiedParticle"][2224]["x"    ][91.2 ] = ["/OPAL_1995_S3198391/d01-x01-y01","/DELPHI_1995_I399737/d01-x01-y01"]
 # hyperons
 # lambda0
 # x
 analyses["IdentifiedParticle"][3122]["x"    ][10.0 ] = ["/ARGUS_1988_I251097/d05-x01-y01","/ARGUS_1988_I251097/d06-x01-y01"]
 analyses["IdentifiedParticle"][3122]["x"    ][10.52] = ["/BELLE_2017_I1606201/d01-x01-y01"]
 analyses["IdentifiedParticle"][3122]["x"    ][14.0 ] = ["/TASSO_1985_I205119/d04-x01-y01"]
 analyses["IdentifiedParticle"][3122]["x"    ][22.0 ] = ["/TASSO_1985_I205119/d05-x01-y01"]
 analyses["IdentifiedParticle"][3122]["x"    ][29.0 ] = ["/HRS_1992_I339573/d01-x01-y01"]
 analyses["IdentifiedParticle"][3122]["x"    ][34.0 ] = ["/TASSO_1985_I205119/d06-x01-y01"] 
 analyses["IdentifiedParticle"][3122]["x"    ][34.8 ] = ["/TASSO_1989_I266893/d08-x01-y01"]
+analyses["IdentifiedParticle"][3122]["x"    ][42.1 ] = ["/TASSO_1989_I266893/d14-x01-y01"]
 analyses["IdentifiedParticle"][3122]["x"    ][35.0 ] = ["/CELLO_1990_I283026/d03-x01-y01"]
 analyses["IdentifiedParticle"][3122]["x"    ][91.2 ] = ["/OPAL_1997_S3396100/d01-x01-y01","/ALEPH_1996_S3486095/d33-x01-y01",
                                                         "/DELPHI_1993_I360638/d01-x01-y01","/SLD_1999_S3743934/d07-x01-y01"]
 # p
 analyses["IdentifiedParticle"][3122]["p"    ][14.0 ] = ["/TASSO_1985_I205119/d10-x01-y01"]
 analyses["IdentifiedParticle"][3122]["p"    ][22.0 ] = ["/TASSO_1985_I205119/d11-x01-y01"]
 analyses["IdentifiedParticle"][3122]["p"    ][34.0 ] = ["/JADE_1981_I166363/d02-x01-y01","/TASSO_1985_I205119/d12-x01-y01"]
 analyses["IdentifiedParticle"][3122]["p"    ][34.8 ] = ["/TASSO_1989_I266893/d03-x01-y01"]
+analyses["IdentifiedParticle"][3122]["p"    ][42.1 ] = ["/TASSO_1989_I266893/d09-x01-y01"]
 # xi
-analyses["IdentifiedParticle"][3122]["xi"   ][91.2 ] = ["/OPAL_1997_S3396100/d02-x01-y01"]
+analyses["IdentifiedParticle"][3122]["xi"   ][91.2 ] = ["/OPAL_1997_S3396100/d02-x01-y01","/ALEPH_2000_I507531/d17-x01-y01",
+                                                        "/ALEPH_2000_I507531/d19-x01-y01","/ALEPH_2000_I507531/d22-x01-y01",
+                                                        "/ALEPH_2000_I507531/d23-x01-y01","/ALEPH_2000_I507531/d24-x01-y01",
+                                                        "/ALEPH_2000_I507531/d25-x01-y01"]
 # other
 analyses["IdentifiedParticle"][3122]["Other"][34.8 ] = ["/TASSO_1989_I266893/d04-x01-y01","/TASSO_1989_I266893/d05-x01-y01",
                                                         "/TASSO_1989_I266893/d06-x01-y01","/TASSO_1989_I266893/d07-x01-y01",
                                                         "/TASSO_1989_I266893/d15-x01-y01","/TASSO_1989_I266893/d15-x01-y02",
                                                         "/TASSO_1989_I266893/d15-x01-y03"]
+analyses["IdentifiedParticle"][3122]["Other"][42.1 ] = ["/TASSO_1989_I266893/d10-x01-y01","/TASSO_1989_I266893/d11-x01-y01",
+                                                        "/TASSO_1989_I266893/d12-x01-y01","/TASSO_1989_I266893/d13-x01-y01",
+                                                        "/TASSO_1989_I266893/d16-x01-y01","/TASSO_1989_I266893/d16-x01-y02",
+                                                        "/TASSO_1989_I266893/d16-x01-y03"]
 analyses["IdentifiedParticle"][3122]["Other"][91.2 ] = ["/DELPHI_1993_I360638/d03-x01-y01","/DELPHI_1993_I360638/d04-x01-y01",
                                                         "/DELPHI_1993_I360638/d05-x01-y01","/DELPHI_1993_I360638/d06-x01-y01",
                                                         "/SLD_1999_S3743934/d34-x01-y01","/SLD_1999_S3743934/d34-x01-y02",
-                                                        "/SLD_1999_S3743934/d35-x01-y01"]
+                                                        "/SLD_1999_S3743934/d35-x01-y01","/OPAL_1997_I447188/d03-x01-y01",
+                                                        "/OPAL_1997_I447188/d03-x01-y02","/OPAL_1997_I447188/d03-x01-y03",
+                                                        "/OPAL_2000_I474010/d04-x01-y01","/OPAL_2000_I474010/d05-x01-y01",
+                                                        "/DELPHI_1995_I382285/a_Lam","/DELPHI_1995_I382285/d01-x01-y02",
+                                                        "/ALEPH_1996_I415745/d03-x01-y01"]
 # Sigma+
 analyses["IdentifiedParticle"][3222]["x"    ][91.2 ] = ["/OPAL_1997_I421977/d01-x01-y01"]
 # sigma0
 analyses["IdentifiedParticle"][3212]["x"    ][10.52] = ["/BELLE_2017_I1606201/d02-x01-y01"]
 # sigma-
 analyses["IdentifiedParticle"][3112]["x"    ][91.2 ] = ["/OPAL_1997_I421977/d02-x01-y01","/DELPHI_2000_I524694/d01-x01-y01"]
 # Sigma*+
 analyses["IdentifiedParticle"][3224   ]["x"    ][10.52] = ["/BELLE_2017_I1606201/d03-x01-y01"]
 analyses["IdentifiedParticle"][3224   ]["x"    ][91.2 ] = ["/DELPHI_1995_S3137023/d03-x01-y01","/OPAL_1997_S3396100/d05-x01-y01"]
 analyses["IdentifiedParticle"][3224   ]["xi"   ][91.2 ] = ["/OPAL_1997_S3396100/d06-x01-y01"]
 analyses["IdentifiedParticle"]["3224B"]["x"    ][91.2 ] = ["/ALEPH_1996_S3486095/d35-x01-y01"]
 # sigma*-
 analyses["IdentifiedParticle"][3114   ]["x"    ][91.2 ] = ["/OPAL_1997_S3396100/d07-x01-y01"]
 analyses["IdentifiedParticle"][3114   ]["xi"   ][91.2 ] = ["/OPAL_1997_S3396100/d08-x01-y01"]
 # xi-
 analyses["IdentifiedParticle"][3312]["x"    ][10.0 ] = ["/ARGUS_1988_I251097/d09-x01-y01"]
 analyses["IdentifiedParticle"][3312]["x"    ][10.52] = ["/BELLE_2017_I1606201/d05-x01-y01"]
 analyses["IdentifiedParticle"][3312]["x"    ][34.4 ] = ["/TASSO_1983_I192072/d02-x01-y01"]
 analyses["IdentifiedParticle"][3312]["x"    ][34.8 ] = ["/TASSO_1989_I266893/d23-x01-y01"]
 analyses["IdentifiedParticle"][3312]["p"    ][34.8 ] = ["/TASSO_1989_I266893/d18-x01-y01"]
 analyses["IdentifiedParticle"][3312]["x"    ][91.2 ] = ["/OPAL_1997_S3396100/d03-x01-y01","/DELPHI_1995_S3137023/d02-x01-y01",
                                                         "/ALEPH_1996_S3486095/d34-x01-y01"]
 analyses["IdentifiedParticle"][3312]["xi"   ][91.2 ] = ["/OPAL_1997_S3396100/d04-x01-y01","/DELPHI_2006_I719387/d01-x03-y01",]
 analyses["IdentifiedParticle"][3312]["Other"][34.8 ] = ["/TASSO_1989_I266893/d19-x01-y01","/TASSO_1989_I266893/d20-x01-y01",
                                                         "/TASSO_1989_I266893/d21-x01-y01","/TASSO_1989_I266893/d22-x01-y01"]
 # xi*0
 analyses["IdentifiedParticle"][3324]["x"    ][10.52] = ["/BELLE_2017_I1606201/d07-x01-y01"]
 analyses["IdentifiedParticle"][3324]["x"    ][91.2 ] = ["/OPAL_1997_S3396100/d09-x01-y01","/ALEPH_1996_S3486095/d36-x01-y01"]
 analyses["IdentifiedParticle"][3324]["xi"   ][91.2 ] = ["/OPAL_1997_S3396100/d10-x01-y01"]
 # omega
 analyses["IdentifiedParticle"][3334]["x"    ][10.52] = ["/BELLE_2017_I1606201/d06-x01-y01"]
 # lambda 1520
 analyses["IdentifiedParticle"][3124]["x"    ][10.0 ] = ["/ARGUS_1989_I262415/d04-x01-y01"]
 analyses["IdentifiedParticle"][3124]["x"    ][10.52] = ["/BELLE_2017_I1606201/d04-x01-y01"]
 analyses["IdentifiedParticle"][3124]["x"    ][91.2 ] = ["/OPAL_1997_S3396100/d11-x01-y01","/DELPHI_2000_I524694/d03-x01-y01"]
 analyses["IdentifiedParticle"][3124]["xi"   ][91.2 ] = ["/OPAL_1997_S3396100/d12-x01-y01"]
 # charm baryons
 # lambda_c
 analyses["IdentifiedParticle"][4122 ]["x"    ][10.52] = ["/BELLE_2017_I1606201/d08-x01-y01"]
 analyses["IdentifiedParticle"][4122 ]["x"    ][10.54] = ["/BABAR_2007_S6895344/d01-x01-y01"]
+analyses["IdentifiedParticle"][4122 ]["x"    ][10.6 ] = ["/CLEO_1990_I298611/d01-x01-y01","/CLEO_1990_I298611/d02-x01-y01",
+                                                         "/CLEO_1990_I298611/d03-x01-y01","/CLEO_1990_I298611/d04-x01-y01",
+                                                         "/CLEO_1990_I298611/d05-x01-y01","/CLEO_1990_I298611/d06-x01-y01"]
 analyses["IdentifiedParticle"][4122 ]["Other"][10.5 ] = ["/CLEO_2001_I552541/d03-x01-y01","/CLEO_2001_I552541/d03-x01-y02",
                                                          "/CLEO_2001_I552541/d03-x01-y03","/CLEO_2001_I552541/d03-x01-y04",
                                                          "/CLEO_2001_I552541/d04-x01-y01","/CLEO_2001_I552541/d04-x01-y02",
                                                          "/CLEO_2001_I552541/d04-x01-y03","/CLEO_2001_I552541/d04-x01-y04",]
 # sigma_c0
 analyses["IdentifiedParticle"][4112 ]["x"    ][10.52] = ["/BELLE_2017_I1606201/d11-x01-y01"]
+analyses["IdentifiedParticle"][4222 ]["x"    ][10.  ] = ["/ARGUS_1988_I261672/d01-x01-y01"]
 # sigma_c*0
 analyses["IdentifiedParticle"][4114 ]["x"    ][10.52] = ["/BELLE_2017_I1606201/d12-x01-y01"]
 # xi_c
 analyses["IdentifiedParticle"][4132 ]["x"    ][10.52] = ["/BELLE_2017_I1606201/d14-x01-y01","/BELLE_2017_I1606201/d15-x01-y01"]
 analyses["IdentifiedParticle"][4132 ]["p"    ][10.58] = ["/BABAR_2005_S6181155/d02-x01-y02"]
+analyses["IdentifiedParticle"][4232 ]["x"    ][10.52] = ["/ARGUS_1990_I296522/d02-x01-y01"]
+analyses["IdentifiedParticle"][4232 ]["x"    ][10.6 ] = ["/CLEOII_1995_I404590/d02-x01-y01"]
+# xi_c'
+analyses["IdentifiedParticle"][4312 ]["x"    ][10.58] = ["/CLEOII_1999_I478217/d01-x01-y01"]
+# xi_c*
+analyses["IdentifiedParticle"][4314 ]["x"    ][10.58] = ["/CLEOII_1995_I397770/d02-x01-y01"]
+analyses["IdentifiedParticle"][4324 ]["x"    ][10.58] = ["/CLEOII_1996_I416471/d02-x01-y01"]
 # omega_c
 analyses["IdentifiedParticle"][4332 ]["x"    ][10.52] = ["/BELLE_2017_I1606201/d13-x01-y01"]
+analyses["IdentifiedParticle"][4332 ]["x"    ][10.6] = ["/BABAR_2007_I746745/d01-x01-y01"]
 # lambda_c(2595)
 analyses["IdentifiedParticle"][14122]["x"    ][10.52] = ["/BELLE_2017_I1606201/d09-x01-y01"]
+analyses["IdentifiedParticle"][14122]["x"    ][10.58] = ["/ARGUS_1993_I357132/d02-x01-y01","/CLEOII_1994_I381696/d05-x01-y01"]
 # lambda_c(2625)
 analyses["IdentifiedParticle"][4124 ]["x"    ][10.52] = ["/BELLE_2017_I1606201/d10-x01-y01"]
+analyses["IdentifiedParticle"][4124 ]["x"    ][10.58] = ["/ARGUS_1997_I440304/d02-x01-y01","/CLEOII_1994_I381696/d06-x01-y01"]
 # b fragmentation
 analyses["IdentifiedParticle"][511]["weak"     ] = ["/DELPHI_2011_I890503/d01-x01-y01","/SLD_2002_S4869273/d01-x01-y01",
                                                     "/ALEPH_2001_S4656318/d01-x01-y01","/OPAL_2003_I599181/d01-x01-y01"]
 analyses["IdentifiedParticle"][511]["weak_mean"] = ["/DELPHI_2011_I890503/d02-x01-y01","/ALEPH_2001_S4656318/d07-x01-y01",
                                                     "/OPAL_2003_I599181/d02-x01-y01"]
 analyses["IdentifiedParticle"][511]["lead"     ] = ["/ALEPH_2001_S4656318/d01-x01-y02"]
 analyses["IdentifiedParticle"][511]["lead_mean"] = ["/ALEPH_2001_S4656318/d07-x01-y02"]
+analyses["IdentifiedParticle"][513]["x"][91.2]   = ["/DELPHI_1995_I395026/d04-x01-y01"]
 # multiplcities
 analyses["Multiplicity"]["321/2212"][91.2] = ["/DELPHI_1998_I473409/d01-x01-y05"]
 # mesons
 analyses["Multiplicity"][211 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d01-x01-y01"]
 analyses["Multiplicity"][211 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d01-x01-y02"]
 analyses["Multiplicity"][211 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d01-x01-y03","/DELPHI_1996_S3430090/d36-x01-y01",
                                          "/DELPHI_1998_I473409/d01-x01-y02","/SLD_2004_S5693039/d02-x02-y02",
                                          "/SLD_1999_S3743934/d24-x01-y01"]
 analyses["Multiplicity"][211 ][165.0] = ["/PDG_HADRON_MULTIPLICITIES/d01-x01-y04"] 
 analyses["Multiplicity"][111 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d02-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d02-x01-y01","/ARGUS_1990_I278933/d01-x01-y01"]
 analyses["Multiplicity"][111 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d02-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d02-x01-y02"]
 analyses["Multiplicity"][111 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d02-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d02-x01-y03",
                                          "/DELPHI_1996_S3430090/d36-x01-y02","/ALEPH_1996_S3486095/d44-x01-y02"]
 
 analyses["Multiplicity"][321 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d03-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d03-x01-y01"]
 analyses["Multiplicity"][321 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d03-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d03-x01-y02"]
 analyses["Multiplicity"][321 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d03-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d03-x01-y03",
                                          "/DELPHI_1996_S3430090/d36-x01-y03","/DELPHI_1998_I473409/d01-x01-y03",
                                          "/SLD_2004_S5693039/d03-x02-y02","/SLD_1999_S3743934/d24-x02-y01"]
 analyses["Multiplicity"][321 ][165.0] = ["/PDG_HADRON_MULTIPLICITIES/d03-x01-y04","/PDG_HADRON_MULTIPLICITIES_RATIOS/d03-x01-y04"]
 analyses["Multiplicity"][311 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d04-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d04-x01-y01","/PLUTO_1981_I165122/d02-x01-y01"]
 analyses["Multiplicity"][311 ][30.  ] = ["/TASSO_1990_I284251/d04-x01-y01"]
 analyses["Multiplicity"][311 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d04-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d04-x01-y02"]
 analyses["Multiplicity"][311 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d04-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d04-x01-y03",
                                          "/DELPHI_1996_S3430090/d36-x01-y04","/ALEPH_1996_S3486095/d44-x01-y05","/SLD_1999_S3743934/d24-x03-y01"]
 analyses["Multiplicity"][311 ][165.0] = ["/PDG_HADRON_MULTIPLICITIES/d04-x01-y04","/PDG_HADRON_MULTIPLICITIES_RATIOS/d04-x01-y04"]
+analyses["Multiplicity"][221 ][4.   ] = ["/DASP_1979_I132410/d01-x01-y01"]
 analyses["Multiplicity"][221 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d05-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d05-x01-y01","/ARGUS_1990_I278933/d02-x01-y01"]
 analyses["Multiplicity"][221 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d05-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d05-x01-y02"]
 analyses["Multiplicity"][221 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d05-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d05-x01-y03",
                                          "/DELPHI_1996_S3430090/d36-x01-y05","/ALEPH_1996_S3486095/d44-x01-y03"]
 analyses["Multiplicity"][331 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d06-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d06-x01-y01"]
 analyses["Multiplicity"][331 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d06-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d06-x01-y02"]
 analyses["Multiplicity"][331 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d06-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d06-x01-y03",
                                          "/DELPHI_1996_S3430090/d36-x01-y06","/ALEPH_1996_S3486095/d44-x01-y04"]
 analyses["Multiplicity"][411 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d07-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d07-x01-y01"]
+analyses["Multiplicity"][411 ][10.47] = ["/ARGUS_1991_I315059/d01-x01-y02"]
 analyses["Multiplicity"][411 ][10.58] = ["/CLEO_2004_S5809304/d01-x01-y01"]
 analyses["Multiplicity"][411 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d07-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d07-x01-y02"]
 analyses["Multiplicity"][411 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d07-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d07-x01-y03","/DELPHI_1996_S3430090/d36-x01-y07"]
 analyses["Multiplicity"][421 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d08-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d08-x01-y01"]
+analyses["Multiplicity"][421 ][10.47] = ["/ARGUS_1991_I315059/d01-x01-y01"]
 analyses["Multiplicity"][421 ][10.58] = ["/CLEO_2004_S5809304/d01-x01-y02","/CLEO_2004_S5809304/d01-x01-y03"]
 analyses["Multiplicity"][421 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d08-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d08-x01-y02"]
 analyses["Multiplicity"][421 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d08-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d08-x01-y03","/DELPHI_1996_S3430090/d36-x01-y08"]
 analyses["Multiplicity"][431 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d09-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d09-x01-y01"]
+analyses["Multiplicity"][431 ][10.58] = ["/BABAR_2002_I582184/d01-x01-y01"]
 analyses["Multiplicity"][431 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d09-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d09-x01-y02"]
 analyses["Multiplicity"][431 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d09-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d09-x01-y03"]
+analyses["Multiplicity"][433 ][10.58] = ["/BABAR_2002_I582184/d01-x01-y02"]
+analyses["Multiplicity"][413 ][10.47] = ["/ARGUS_1991_I315059/d01-x01-y03"]
 analyses["Multiplicity"]["511B"][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d10-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d10-x01-y01","/DELPHI_1996_S3430090/d36-x01-y09"]
 analyses["Multiplicity"][521 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d11-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d11-x01-y01"]
 analyses["Multiplicity"][531 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d12-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d12-x01-y01"]
 analyses["Multiplicity"][9010221][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d13-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d13-x01-y01"]
 analyses["Multiplicity"][9010221][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d13-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d13-x01-y02"]
 analyses["Multiplicity"][9010221][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d13-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d13-x01-y03","/DELPHI_1996_S3430090/d37-x01-y01"]
 analyses["Multiplicity"][9000211][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d14-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d14-x01-y01"]
 analyses["Multiplicity"][113 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d15-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d15-x01-y01","/ARGUS_1993_S2789213/d01-x01-y02"]
 analyses["Multiplicity"][113 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d15-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d15-x01-y02"]
 analyses["Multiplicity"][113 ][34.0 ] = ["/TASSO_1982_I179022/d01-x01-y01"]
 analyses["Multiplicity"][113 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d15-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d15-x01-y03",
                                          "/ALEPH_1996_S3486095/d44-x01-y06","/DELPHI_1996_S3430090/d38-x01-y01"]
 analyses["Multiplicity"][213 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d16-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d16-x01-y01"]
 analyses["Multiplicity"][223 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d17-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d17-x01-y01","/ARGUS_1993_S2789213/d01-x01-y01"]
 analyses["Multiplicity"][223 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d17-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d17-x01-y02",
                                          "/ALEPH_1996_S3486095/d44-x01-y07"]
 analyses["Multiplicity"][323 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d18-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d18-x01-y01","/ARGUS_1993_S2789213/d01-x01-y04"]
 analyses["Multiplicity"][323 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d18-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d18-x01-y02"]
 analyses["Multiplicity"][323 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d18-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d18-x01-y03",
                                          "/OPAL_1993_I342766/d02-x01-y01","/DELPHI_1996_S3430090/d38-x01-y02","/ALEPH_1996_S3486095/d44-x01-y09"]
 analyses["Multiplicity"][313 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d19-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d19-x01-y01","/ARGUS_1993_S2789213/d01-x01-y03"]
 analyses["Multiplicity"][313 ][30.  ] = ["/TASSO_1990_I284251/d09-x01-y01"]
 analyses["Multiplicity"][313 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d19-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d19-x01-y02"]
 analyses["Multiplicity"][313 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d19-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d19-x01-y03",
                                          "/DELPHI_1996_S3430090/d38-x01-y03","/ALEPH_1996_S3486095/d44-x01-y10","/SLD_1999_S3743934/d24-x04-y01"]
 analyses["Multiplicity"][333 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d20-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d20-x01-y01","/ARGUS_1993_S2789213/d01-x01-y05"]
 analyses["Multiplicity"][333 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d20-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d20-x01-y02"]
 analyses["Multiplicity"][333 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d20-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d20-x01-y03",
                                          "/DELPHI_1996_S3430090/d38-x01-y04","/ALEPH_1996_S3486095/d44-x01-y08","/SLD_1999_S3743934/d24-x05-y01"]
 analyses["Multiplicity"][413 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d21-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d21-x01-y01"]
 analyses["Multiplicity"][413 ][10.58] = ["/CLEO_2004_S5809304/d01-x01-y04","/CLEO_2004_S5809304/d01-x01-y05"]
 analyses["Multiplicity"][413 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d21-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d21-x01-y02"]
 analyses["Multiplicity"][413 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d21-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d21-x01-y03",
                                          "/DELPHI_1996_S3430090/d38-x01-y05","/OPAL_1995_I382219/d03-x01-y01"]
-analyses["Multiplicity"][423 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d22-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d22-x01-y01"]
-analyses["Multiplicity"][423 ][10.58] = ["/CLEO_2004_S5809304/d01-x01-y06","/CLEO_2004_S5809304/d01-x01-y07"]
-analyses["Multiplicity"][423 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d22-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d22-x01-y02"]
+analyses["Multiplicity"][423  ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d22-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d22-x01-y01"]
+analyses["Multiplicity"][423  ][10.58] = ["/CLEO_2004_S5809304/d01-x01-y06","/CLEO_2004_S5809304/d01-x01-y07"]
+analyses["Multiplicity"][423  ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d22-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d22-x01-y02"]
+analyses["Multiplicity"][425  ][10.0 ] = ["/ARGUS_1989_I268577/d01-x01-y01","/ARGUS_1989_I280943/d01-x01-y02"]
+analyses["Multiplicity"][10423][10.0 ] = ["/ARGUS_1989_I280943/d01-x01-y01"]
 analyses["Multiplicity"][433 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d23-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d23-x01-y01"]
 analyses["Multiplicity"][433 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d23-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d23-x01-y02"]
-analyses["Multiplicity"][513 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d24-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d24-x01-y01"]
+analyses["Multiplicity"][10433][10.] = ["/ARGUS_1989_I282570/d01-x01-y01","/ARGUS_1989_I282570/d01-x01-y02"]
+analyses["Multiplicity"][513 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d24-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d24-x01-y01",
+                                         "/DELPHI_1995_I395026/d02-x01-y01","/ALEPH_1995_I398426/d01-x01-y01",
+                                         "/L3_1995_I381046/d01-x01-y01","/OPAL_1996_I428493/d01-x01-y01",
+                                         "/DELPHI_1995_I395026/d01-x01-y01"]
 analyses["Multiplicity"][443    ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d25-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d25-x01-y01"]
+analyses["Multiplicity"][443    ][10.6 ] = ["/BABAR_2001_I558091/d01-x01-y01","/BELLE_2002_I563840/d01-x01-y01",
+                                            "/BELLE_2002_I563840/d01-x02-y01","/BELLE_2002_I563840/d01-x02-y02"]
 analyses["Multiplicity"][443    ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d25-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d25-x01-y02",
                                             "/OPAL_1996_S3257789/d02-x01-y01"]
+analyses["Multiplicity"][100443 ][10.6 ] = ["/BELLE_2002_I563840/d01-x02-y03"]
 analyses["Multiplicity"][100443 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d26-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d26-x01-y01",
                                             "/OPAL_1996_S3257789/d02-x01-y02"]
 analyses["Multiplicity"][553    ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d27-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d27-x01-y01"]
 analyses["Multiplicity"][20223  ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d28-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d28-x01-y01"]
 analyses["Multiplicity"][20333  ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d29-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d29-x01-y01"]
 analyses["Multiplicity"][20443  ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d30-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d30-x01-y01"]
 analyses["Multiplicity"][225 ][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d31-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d31-x01-y01"]
 analyses["Multiplicity"][225 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d31-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d31-x01-y02"]
 analyses["Multiplicity"][225 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d31-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d31-x01-y03","/DELPHI_1996_S3430090/d39-x01-y01"]
 analyses["Multiplicity"][335 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d32-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d32-x01-y01"]
 analyses["Multiplicity"][325 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d33-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d33-x01-y01"]
 analyses["Multiplicity"][315 ][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d34-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d34-x01-y01"]
 analyses["Multiplicity"][315 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d34-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d34-x01-y02","/DELPHI_1996_S3430090/d39-x01-y02"]
 analyses["Multiplicity"][515 ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d35-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d35-x01-y01"]
 analyses["Multiplicity"][20431][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d36-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d36-x01-y01"]
+analyses["Multiplicity"][435  ][10.58] = ["/ARGUS_1995_I397794/d01-x01-y01","/ARGUS_1995_I397794/d01-x02-y01"]
 analyses["Multiplicity"][435  ][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d37-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d37-x01-y01"]
 #baryons
 analyses["Multiplicity"][2212][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d38-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d38-x01-y01"]
 analyses["Multiplicity"][2212][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d38-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d38-x01-y02"]
 analyses["Multiplicity"][2212][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d38-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d38-x01-y03",
                                          "/DELPHI_1996_S3430090/d40-x01-y01","/DELPHI_1998_I473409/d01-x01-y04",
                                          "/SLD_2004_S5693039/d04-x02-y02","/SLD_1999_S3743934/d24-x06-y01"]
 analyses["Multiplicity"][2212][165.0] = ["/PDG_HADRON_MULTIPLICITIES/d38-x01-y04","/PDG_HADRON_MULTIPLICITIES_RATIOS/d38-x01-y04"]
 analyses["Multiplicity"][3122][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d39-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d39-x01-y01","/ARGUS_1988_I251097/d02-x01-y01"]
 analyses["Multiplicity"][3122][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d39-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d39-x01-y02"]
 analyses["Multiplicity"][3122][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d39-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d39-x01-y03",
                                          "/DELPHI_1996_S3430090/d40-x01-y02","/ALEPH_1996_S3486095/d44-x01-y11","/DELPHI_1993_I360638/d02-x01-y01",
-                                         "/SLD_1999_S3743934/d24-x07-y01"]
+                                         "/SLD_1999_S3743934/d24-x07-y01",
+                                         "/OPAL_2000_I474010/d01-x01-y01","/OPAL_2000_I474010/d01-x01-y02","/OPAL_2000_I474010/d01-x01-y03",
+                                         "/OPAL_2000_I474010/d02-x01-y01","/OPAL_2000_I474010/d02-x01-y02","/OPAL_2000_I474010/d02-x01-y03",
+                                         "/OPAL_2000_I474010/d03-x01-y01","/OPAL_2000_I474010/d03-x01-y02","/OPAL_2000_I474010/d03-x01-y03"]
 analyses["Multiplicity"][3122][165.0] = ["/PDG_HADRON_MULTIPLICITIES/d39-x01-y04","/PDG_HADRON_MULTIPLICITIES_RATIOS/d39-x01-y04"]
 analyses["Multiplicity"][3212][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d40-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d40-x01-y01","/ARGUS_1988_I251097/d02-x01-y03"]
 analyses["Multiplicity"][3212][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d40-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d40-x01-y02"]
 analyses["Multiplicity"][3112][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d41-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d41-x01-y01"]
 analyses["Multiplicity"][3222][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d42-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d42-x01-y01","/ALEPH_1996_S3486095/d44-x01-y12"]
 analyses["Multiplicity"][3312][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d44-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d44-x01-y01","/ARGUS_1988_I251097/d02-x01-y02"]
 analyses["Multiplicity"][3312][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d44-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d44-x01-y02"]
 analyses["Multiplicity"][3312][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d44-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d44-x01-y03",
                                          "/DELPHI_1996_S3430090/d40-x01-y03","/ALEPH_1996_S3486095/d44-x01-y13"]
 analyses["Multiplicity"][2224][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d45-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d45-x01-y01"]
 analyses["Multiplicity"][2224][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d45-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d45-x01-y02","/DELPHI_1996_S3430090/d40-x01-y05"]
 analyses["Multiplicity"][3114][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d46-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d46-x01-y01","/ARGUS_1988_I251097/d02-x01-y04"]
 analyses["Multiplicity"][3114][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d46-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d46-x01-y02"]
 analyses["Multiplicity"][3114][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d46-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d46-x01-y03"]
 analyses["Multiplicity"][3224][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d47-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d47-x01-y01","/ARGUS_1988_I251097/d02-x01-y05"]
 analyses["Multiplicity"][3224][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d47-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d47-x01-y02"]
 analyses["Multiplicity"][3224][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d47-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d47-x01-y03"]
 analyses["Multiplicity"][3324][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d49-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d49-x01-y01","/ARGUS_1988_I251097/d02-x01-y06"]
 analyses["Multiplicity"][3324][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d49-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d49-x01-y02",
                                          "/DELPHI_1996_S3430090/d40-x01-y07","/ALEPH_1996_S3486095/d44-x01-y15"]
 analyses["Multiplicity"][3334][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d50-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d50-x01-y01","/ARGUS_1988_I251097/d02-x01-y07"]
 analyses["Multiplicity"][3334][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d50-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d50-x01-y02"]
 analyses["Multiplicity"][3334][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d50-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d50-x01-y03",
                                          "/DELPHI_1996_S3430090/d40-x01-y04","/ALEPH_1996_S3486095/d44-x01-y16"]
 analyses["Multiplicity"][4122][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d51-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d51-x01-y01",
                                          "/BABAR_2007_S6895344/d02-x01-y01"]
 analyses["Multiplicity"][4122][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d51-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d51-x01-y02"]
 analyses["Multiplicity"][4122][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d51-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d51-x01-y03"]
 analyses["Multiplicity"][5122][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d52-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d52-x01-y01","/DELPHI_1996_S3430090/d40-x01-y08"]
 analyses["Multiplicity"][4222][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d53-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d53-x01-y01"]
-analyses["Multiplicity"][3124][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d54-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d54-x01-y01"]
+analyses["Multiplicity"][3124][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d54-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d54-x01-y01","/ARGUS_1989_I262415/d01-x01-y02","/ARGUS_1989_I262415/d01-x02-y02"]
 analyses["Multiplicity"][3124][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d54-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d54-x01-y02"]
 #
 analyses["Multiplicity"]["3222B"][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d43-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d43-x01-y01"]
 analyses["Multiplicity"]["3224B"][10.  ] = ["/PDG_HADRON_MULTIPLICITIES/d48-x01-y01","/PDG_HADRON_MULTIPLICITIES_RATIOS/d48-x01-y01"]
 analyses["Multiplicity"]["3224B"][32.0 ] = ["/PDG_HADRON_MULTIPLICITIES/d48-x01-y02","/PDG_HADRON_MULTIPLICITIES_RATIOS/d48-x01-y02"]
 analyses["Multiplicity"]["3224B"][91.2 ] = ["/PDG_HADRON_MULTIPLICITIES/d48-x01-y03","/PDG_HADRON_MULTIPLICITIES_RATIOS/d48-x01-y03",
                                             "/DELPHI_1996_S3430090/d40-x01-y06","/ALEPH_1996_S3486095/d44-x01-y14"]
-analyses["Multiplicity"][4132][10.52] = ["/BABAR_2005_S6181155/d03-x01-y01"]
+analyses["Multiplicity"][4132][10.52] = ["/BABAR_2005_S6181155/d03-x01-y01","/ARGUS_1990_I296522/d01-x01-y01",
+                                         "/ARGUS_1990_I296522/d01-x01-y02","/ARGUS_1990_I296522/d01-x02-y01",
+                                         "/ARGUS_1990_I296522/d01-x02-y02"]
+analyses["Multiplicity"][4232][10.52] = ["/ARGUS_1990_I296522/d01-x01-y03","/ARGUS_1990_I296522/d01-x02-y03"]
+analyses["Multiplicity"][14122][10.6] = ["/ARGUS_1993_I357132/d01-x01-y01"]
+analyses["Multiplicity"][4124 ][10.6] = ["/ARGUS_1997_I440304/d01-x01-y01","/ARGUS_1997_I440304/d01-x02-y01"]
 # event shapes
 # thrust based
+# thrust
+analyses["EventShapes"]["T"][9.98 ] = ["/ARGUS_1986_I227324/d02-x01-y02"]
+analyses["EventShapes"]["T"][9.5149] = ["/LENA_1981_I164397/d04-x01-y01"]
+analyses["EventShapes"]["T"][9.9903] = ["/LENA_1981_I164397/d04-x01-y02"]
 analyses["EventShapes"]["T"][14.0 ] = ["/TASSO_1990_S2148048/d08-x01-y01"]
 analyses["EventShapes"]["T"][22.0 ] = ["/TASSO_1990_S2148048/d08-x01-y02"]
 analyses["EventShapes"]["T"][29.0 ] = ["/HRS_1985_I201482/d03-x01-y01","/HRS_1985_I201482/d04-x01-y01"]
 analyses["EventShapes"]["T"][35.0 ] = ["/TASSO_1990_S2148048/d08-x01-y03","/TASSO_1988_I263859/d03-x01-y01",
                                        "/JADE_1998_S3612880/d06-x01-y01"]
 analyses["EventShapes"]["T"][44.0 ] = ["/TASSO_1990_S2148048/d08-x01-y04","/JADE_1998_S3612880/d02-x01-y01"]
 analyses["EventShapes"]["T"][45.0 ] = ["/DELPHI_2003_I620250/d01-x01-y01"]
 analyses["EventShapes"]["T"][55.2 ] = ["/AMY_1990_I283337/d12-x01-y01"]
 analyses["EventShapes"]["T"][58.0 ] = ["/TOPAZ_1993_I361661/d01-x01-y01"]
 analyses["EventShapes"]["T"][66.0 ] = ["/DELPHI_2003_I620250/d01-x01-y02"]
 analyses["EventShapes"]["T"][76.0 ] = ["/DELPHI_2003_I620250/d01-x01-y03"]
 analyses["EventShapes"]["T"][91.2 ] = ["/DELPHI_1996_S3430090/d11-x01-y01","/ALEPH_1996_S3486095/d03-x01-y01",
                                        "/OPAL_2004_S6132243/d01-x01-y01","/ALEPH_2004_S5765862/d54-x01-y01"]
-analyses["EventShapes"]["T"][133.0] = ["/ALEPH_2004_S5765862/d55-x01-y01","/OPAL_2004_S6132243/d01-x01-y02"]
-analyses["EventShapes"]["T"][161.0] = ["/ALEPH_2004_S5765862/d56-x01-y01"]
-analyses["EventShapes"]["T"][172.0] = ["/ALEPH_2004_S5765862/d57-x01-y01"]
+analyses["EventShapes"]["T"][133.0] = ["/ALEPH_2004_S5765862/d55-x01-y01","/OPAL_2004_S6132243/d01-x01-y02",
+                                       "/DELPHI_1999_I499183/d13-x01-y01"]
+analyses["EventShapes"]["T"][161.0] = ["/ALEPH_2004_S5765862/d56-x01-y01","/DELPHI_1999_I499183/d13-x01-y02",
+                                       "/OPAL_1997_I440721/d03-x01-y01"]
+analyses["EventShapes"]["T"][172.0] = ["/ALEPH_2004_S5765862/d57-x01-y01","/DELPHI_1999_I499183/d13-x01-y03",
+                                       "/OPAL_2000_I513476/d01-x01-y01"]
 analyses["EventShapes"]["T"][177.0] = ["/OPAL_2004_S6132243/d01-x01-y03"]
-analyses["EventShapes"]["T"][183.0] = ["/DELPHI_2003_I620250/d38-x01-y01","/ALEPH_2004_S5765862/d58-x01-y01"]
-analyses["EventShapes"]["T"][189.0] = ["/DELPHI_2003_I620250/d38-x01-y02","/ALEPH_2004_S5765862/d59-x01-y01"]
+analyses["EventShapes"]["T"][183.0] = ["/DELPHI_2003_I620250/d38-x01-y01","/ALEPH_2004_S5765862/d58-x01-y01",
+                                       "/DELPHI_1999_I499183/d14-x01-y01","/OPAL_2000_I513476/d01-x01-y02"]
+analyses["EventShapes"]["T"][189.0] = ["/DELPHI_2003_I620250/d38-x01-y02","/ALEPH_2004_S5765862/d59-x01-y01",
+                                       "/OPAL_2000_I513476/d01-x01-y03"]
 analyses["EventShapes"]["T"][192.0] = ["/DELPHI_2003_I620250/d38-x01-y03"]
 analyses["EventShapes"]["T"][196.0] = ["/DELPHI_2003_I620250/d38-x01-y04"]
 analyses["EventShapes"]["T"][200.0] = ["/DELPHI_2003_I620250/d39-x01-y01","/ALEPH_2004_S5765862/d60-x01-y01"]
 analyses["EventShapes"]["T"][197.0] = ["/OPAL_2004_S6132243/d01-x01-y04"]
 analyses["EventShapes"]["T"][202.0] = ["/DELPHI_2003_I620250/d39-x01-y02"]
 analyses["EventShapes"]["T"][205.0] = ["/DELPHI_2003_I620250/d39-x01-y03"]
 analyses["EventShapes"]["T"][206.0] = ["/ALEPH_2004_S5765862/d61-x01-y01"]
 analyses["EventShapes"]["T"][207.0] = ["/DELPHI_2003_I620250/d39-x01-y04"]
 analyses["EventShapes"]["T"][41.4 ] = ["/L3_2004_I652683/d21-x01-y01"]
 analyses["EventShapes"]["T"][55.3 ] = ["/L3_2004_I652683/d21-x01-y02"]
 analyses["EventShapes"]["T"][65.4 ] = ["/L3_2004_I652683/d21-x01-y03"]
 analyses["EventShapes"]["T"][75.7 ] = ["/L3_2004_I652683/d22-x01-y01"]
 analyses["EventShapes"]["T"][82.3 ] = ["/L3_2004_I652683/d22-x01-y02"]
 analyses["EventShapes"]["T"][85.1 ] = ["/L3_2004_I652683/d22-x01-y03"]
 analyses["EventShapes"]["T"][130.1] = ["/L3_2004_I652683/d23-x01-y01"]
 analyses["EventShapes"]["T"][136.3] = ["/L3_2004_I652683/d23-x01-y02"]
 analyses["EventShapes"]["T"][161.3] = ["/L3_2004_I652683/d23-x01-y03"]
 analyses["EventShapes"]["T"][172.3] = ["/L3_2004_I652683/d24-x01-y01"]
 analyses["EventShapes"]["T"][182.8] = ["/L3_2004_I652683/d24-x01-y02"]
 analyses["EventShapes"]["T"][188.6] = ["/L3_2004_I652683/d24-x01-y03"]
 analyses["EventShapes"]["T"][194.4] = ["/L3_2004_I652683/d25-x01-y01"]
 analyses["EventShapes"]["T"][200.2] = ["/L3_2004_I652683/d25-x01-y02"]
 analyses["EventShapes"]["T"][206.2] = ["/L3_2004_I652683/d25-x01-y03"]
 analyses["EventShapes"]["Moment_T"][91.2 ] = ["/OPAL_2004_S6132243/d15-x01-y01"]
 analyses["EventShapes"]["Moment_T"][133.0] = ["/OPAL_2004_S6132243/d15-x01-y02"]
 analyses["EventShapes"]["Moment_T"][177.0] = ["/OPAL_2004_S6132243/d15-x01-y03"]
 analyses["EventShapes"]["Moment_T"][197.0] = ["/OPAL_2004_S6132243/d15-x01-y04"]
 
 analyses["EventShapesFlavour"]["T"][2][91.2] = ["/L3_2004_I652683/d47-x01-y01"]
 analyses["EventShapesFlavour"]["T"][5][91.2] = ["/L3_2004_I652683/d47-x01-y02"]
 analyses["EventShapesFlavour"]["HeavyJetMass"][2][91.2] = ["/L3_2004_I652683/d48-x01-y01"]
 analyses["EventShapesFlavour"]["HeavyJetMass"][5][91.2] = ["/L3_2004_I652683/d48-x01-y02"]
 analyses["EventShapesFlavour"]["BT"][2][91.2] = ["/L3_2004_I652683/d49-x01-y01"]
 analyses["EventShapesFlavour"]["BT"][5][91.2] = ["/L3_2004_I652683/d49-x01-y02"]
 analyses["EventShapesFlavour"]["BW"][2][91.2] = ["/L3_2004_I652683/d50-x01-y01"]
 analyses["EventShapesFlavour"]["BW"][5][91.2] = ["/L3_2004_I652683/d50-x01-y02"]
 analyses["EventShapesFlavour"]["C"][2][91.2] = ["/L3_2004_I652683/d51-x01-y01"]
 analyses["EventShapesFlavour"]["C"][5][91.2] = ["/L3_2004_I652683/d51-x01-y02"]
 analyses["EventShapesFlavour"]["D"][2][91.2] = ["/L3_2004_I652683/d52-x01-y01"]
 analyses["EventShapesFlavour"]["D"][5][91.2] = ["/L3_2004_I652683/d52-x01-y02"]
 
 analyses["EventShapes"]["Moment_H" ][91.2 ] = ["/OPAL_2004_S6132243/d16-x01-y01"]
 analyses["EventShapes"]["Moment_H" ][133.0] = ["/OPAL_2004_S6132243/d16-x01-y02"]
 analyses["EventShapes"]["Moment_H" ][177.0] = ["/OPAL_2004_S6132243/d16-x01-y03"]
 analyses["EventShapes"]["Moment_H" ][197.0] = ["/OPAL_2004_S6132243/d16-x01-y04"]
 analyses["EventShapes"]["Moment_C" ][91.2 ] = ["/OPAL_2004_S6132243/d17-x01-y01"]
 analyses["EventShapes"]["Moment_C" ][133.0] = ["/OPAL_2004_S6132243/d17-x01-y02"]
 analyses["EventShapes"]["Moment_C" ][177.0] = ["/OPAL_2004_S6132243/d17-x01-y03"]
 analyses["EventShapes"]["Moment_C" ][197.0] = ["/OPAL_2004_S6132243/d17-x01-y04"]
 analyses["EventShapes"]["Moment_BT"][91.2 ] = ["/OPAL_2004_S6132243/d18-x01-y01"]
 analyses["EventShapes"]["Moment_BT"][133.0] = ["/OPAL_2004_S6132243/d18-x01-y02"]
 analyses["EventShapes"]["Moment_BT"][177.0] = ["/OPAL_2004_S6132243/d18-x01-y03"]
 analyses["EventShapes"]["Moment_BT"][197.0] = ["/OPAL_2004_S6132243/d18-x01-y04"]
 analyses["EventShapes"]["Moment_BW"][91.2 ] = ["/OPAL_2004_S6132243/d19-x01-y01"]
 analyses["EventShapes"]["Moment_BW"][133.0] = ["/OPAL_2004_S6132243/d19-x01-y02"]
 analyses["EventShapes"]["Moment_BW"][177.0] = ["/OPAL_2004_S6132243/d19-x01-y03"]
 analyses["EventShapes"]["Moment_BW"][197.0] = ["/OPAL_2004_S6132243/d19-x01-y04"]
 analyses["EventShapes"]["Moment_y" ][91.2 ] = ["/OPAL_2004_S6132243/d20-x01-y01"]
 analyses["EventShapes"]["Moment_y" ][133.0] = ["/OPAL_2004_S6132243/d20-x01-y02"]
 analyses["EventShapes"]["Moment_y" ][177.0] = ["/OPAL_2004_S6132243/d20-x01-y03"]
 analyses["EventShapes"]["Moment_y" ][197.0] = ["/OPAL_2004_S6132243/d20-x01-y04"]
 analyses["EventShapes"]["Moment_M" ][91.2 ] = ["/OPAL_2004_S6132243/d21-x01-y01"]
 analyses["EventShapes"]["Moment_M" ][133.0] = ["/OPAL_2004_S6132243/d21-x01-y02"]
 analyses["EventShapes"]["Moment_M" ][177.0] = ["/OPAL_2004_S6132243/d21-x01-y03"]
 analyses["EventShapes"]["Moment_M" ][197.0] = ["/OPAL_2004_S6132243/d21-x01-y04"]
 analyses["EventShapes"]["Moment_m" ][91.2 ] = ["/OPAL_2004_S6132243/d22-x01-y01"]
 analyses["EventShapes"]["Moment_m" ][133.0] = ["/OPAL_2004_S6132243/d22-x01-y02"]
 analyses["EventShapes"]["Moment_m" ][177.0] = ["/OPAL_2004_S6132243/d22-x01-y03"]
 analyses["EventShapes"]["Moment_m" ][197.0] = ["/OPAL_2004_S6132243/d22-x01-y04"]
 analyses["EventShapes"]["Moment_S" ][91.2 ] = ["/OPAL_2004_S6132243/d23-x01-y01"]
 analyses["EventShapes"]["Moment_S" ][133.0] = ["/OPAL_2004_S6132243/d23-x01-y02"]
 analyses["EventShapes"]["Moment_S" ][177.0] = ["/OPAL_2004_S6132243/d23-x01-y03"]
 analyses["EventShapes"]["Moment_S" ][197.0] = ["/OPAL_2004_S6132243/d23-x01-y04"]
 analyses["EventShapes"]["Moment_O" ][91.2 ] = ["/OPAL_2004_S6132243/d24-x01-y01"]
 analyses["EventShapes"]["Moment_O" ][133.0] = ["/OPAL_2004_S6132243/d24-x01-y02"]
 analyses["EventShapes"]["Moment_O" ][177.0] = ["/OPAL_2004_S6132243/d24-x01-y03"]
 analyses["EventShapes"]["Moment_O" ][197.0] = ["/OPAL_2004_S6132243/d24-x01-y04"]
 analyses["EventShapes"]["Moment_L" ][91.2 ] = ["/OPAL_2004_S6132243/d25-x01-y01"]
 analyses["EventShapes"]["Moment_L" ][133.0] = ["/OPAL_2004_S6132243/d25-x01-y02"]
 analyses["EventShapes"]["Moment_L" ][177.0] = ["/OPAL_2004_S6132243/d25-x01-y03"]
 analyses["EventShapes"]["Moment_L" ][197.0] = ["/OPAL_2004_S6132243/d25-x01-y04"]
 analyses["EventShapes"]["Moment_BN"][91.2 ] = ["/OPAL_2004_S6132243/d26-x01-y01"]
 analyses["EventShapes"]["Moment_BN"][133.0] = ["/OPAL_2004_S6132243/d26-x01-y02"]
 analyses["EventShapes"]["Moment_BN"][177.0] = ["/OPAL_2004_S6132243/d26-x01-y03"]
 analyses["EventShapes"]["Moment_BN"][197.0] = ["/OPAL_2004_S6132243/d26-x01-y04"]
 
 analyses["EventShapes"]["Major"][45.0 ] = ["/DELPHI_2003_I620250/d02-x01-y01"]
 analyses["EventShapes"]["Major"][55.2 ] = ["/AMY_1990_I283337/d13-x01-y01"]
 analyses["EventShapes"]["Major"][66.0 ] = ["/DELPHI_2003_I620250/d02-x01-y02"]
 analyses["EventShapes"]["Major"][76.0 ] = ["/DELPHI_2003_I620250/d02-x01-y03"]
 analyses["EventShapes"]["Major"][91.2 ] = ["/DELPHI_1996_S3430090/d12-x01-y01","/OPAL_2004_S6132243/d07-x01-y01",
                                            "/ALEPH_2004_S5765862/d94-x01-y01"]
-analyses["EventShapes"]["Major"][133.0] = ["/ALEPH_2004_S5765862/d95-x01-y01","/OPAL_2004_S6132243/d07-x01-y02"]
-analyses["EventShapes"]["Major"][161.0] = ["/ALEPH_2004_S5765862/d96-x01-y01"]
-analyses["EventShapes"]["Major"][172.0] = ["/ALEPH_2004_S5765862/d97-x01-y01"]
+analyses["EventShapes"]["Major"][133.0] = ["/ALEPH_2004_S5765862/d95-x01-y01","/OPAL_2004_S6132243/d07-x01-y02",
+                                           "/DELPHI_1999_I499183/d15-x01-y01"]
+analyses["EventShapes"]["Major"][161.0] = ["/ALEPH_2004_S5765862/d96-x01-y01","/DELPHI_1999_I499183/d15-x01-y02",
+                                           "/OPAL_1997_I440721/d04-x01-y01"]
+analyses["EventShapes"]["Major"][172.0] = ["/ALEPH_2004_S5765862/d97-x01-y01","/DELPHI_1999_I499183/d15-x01-y03",
+                                           "/OPAL_2000_I513476/d02-x01-y01"]
 analyses["EventShapes"]["Major"][177.0] = ["/OPAL_2004_S6132243/d07-x01-y03"]
-analyses["EventShapes"]["Major"][183.0] = ["/DELPHI_2003_I620250/d40-x01-y01","/ALEPH_2004_S5765862/d98-x01-y01"]
-analyses["EventShapes"]["Major"][189.0] = ["/DELPHI_2003_I620250/d40-x01-y02","/ALEPH_2004_S5765862/d99-x01-y01"]
+analyses["EventShapes"]["Major"][183.0] = ["/DELPHI_2003_I620250/d40-x01-y01","/ALEPH_2004_S5765862/d98-x01-y01",
+                                           "/DELPHI_1999_I499183/d16-x01-y01","/OPAL_2000_I513476/d02-x01-y02"]
+analyses["EventShapes"]["Major"][189.0] = ["/DELPHI_2003_I620250/d40-x01-y02","/ALEPH_2004_S5765862/d99-x01-y01",
+                                           "/OPAL_2000_I513476/d02-x01-y03"]
 analyses["EventShapes"]["Major"][192.0] = ["/DELPHI_2003_I620250/d40-x01-y03"]
 analyses["EventShapes"]["Major"][196.0] = ["/DELPHI_2003_I620250/d40-x01-y04"]
 analyses["EventShapes"]["Major"][197.0] = ["/OPAL_2004_S6132243/d07-x01-y04"]
 analyses["EventShapes"]["Major"][200.0] = ["/DELPHI_2003_I620250/d41-x01-y01","/ALEPH_2004_S5765862/d100-x01-y01"]
 analyses["EventShapes"]["Major"][202.0] = ["/DELPHI_2003_I620250/d41-x01-y02"]
 analyses["EventShapes"]["Major"][205.0] = ["/DELPHI_2003_I620250/d41-x01-y03"]
 analyses["EventShapes"]["Major"][206.0] = ["/ALEPH_2004_S5765862/d101-x01-y01"]
 analyses["EventShapes"]["Major"][207.0] = ["/DELPHI_2003_I620250/d41-x01-y04"]
 analyses["EventShapes"]["Minor"][45.0 ] = ["/DELPHI_2003_I620250/d03-x01-y01"]
 analyses["EventShapes"]["Minor"][55.2 ] = ["/AMY_1990_I283337/d14-x01-y01"]
 analyses["EventShapes"]["Minor"][66.0 ] = ["/DELPHI_2003_I620250/d03-x01-y02"]
 analyses["EventShapes"]["Minor"][76.0 ] = ["/DELPHI_2003_I620250/d03-x01-y03"]
 analyses["EventShapes"]["Minor"][91.2 ] = ["/DELPHI_1996_S3430090/d13-x01-y01","/ALEPH_2004_S5765862/d102-x01-y01",
                                            "/ALEPH_1996_S3486095/d04-x01-y01","/OPAL_2004_S6132243/d08-x01-y01"]
-analyses["EventShapes"]["Minor"][133.0] = ["/ALEPH_2004_S5765862/d103-x01-y01","/OPAL_2004_S6132243/d08-x01-y02"]
-analyses["EventShapes"]["Minor"][161.0] = ["/ALEPH_2004_S5765862/d104-x01-y01"]
-analyses["EventShapes"]["Minor"][172.0] = ["/ALEPH_2004_S5765862/d105-x01-y01"]
+analyses["EventShapes"]["Minor"][133.0] = ["/ALEPH_2004_S5765862/d103-x01-y01","/OPAL_2004_S6132243/d08-x01-y02",
+                                           "/DELPHI_1999_I499183/d17-x01-y01"]
+analyses["EventShapes"]["Minor"][161.0] = ["/ALEPH_2004_S5765862/d104-x01-y01","/DELPHI_1999_I499183/d17-x01-y02",
+                                           "/OPAL_1997_I440721/d05-x01-y01"]
+analyses["EventShapes"]["Minor"][172.0] = ["/ALEPH_2004_S5765862/d105-x01-y01","/DELPHI_1999_I499183/d17-x01-y03",
+                                           "/OPAL_2000_I513476/d03-x01-y01"]
 analyses["EventShapes"]["Minor"][177.0] = ["/OPAL_2004_S6132243/d08-x01-y03"]
-analyses["EventShapes"]["Minor"][183.0] = ["/DELPHI_2003_I620250/d42-x01-y01","/ALEPH_2004_S5765862/d106-x01-y01"]
-analyses["EventShapes"]["Minor"][189.0] = ["/DELPHI_2003_I620250/d42-x01-y02","/ALEPH_2004_S5765862/d107-x01-y01"]
+analyses["EventShapes"]["Minor"][183.0] = ["/DELPHI_2003_I620250/d42-x01-y01","/ALEPH_2004_S5765862/d106-x01-y01",
+                                           "/DELPHI_1999_I499183/d18-x01-y01","/OPAL_2000_I513476/d03-x01-y02"]
+analyses["EventShapes"]["Minor"][189.0] = ["/DELPHI_2003_I620250/d42-x01-y02","/ALEPH_2004_S5765862/d107-x01-y01",
+                                           "/OPAL_2000_I513476/d03-x01-y03"]
 analyses["EventShapes"]["Minor"][192.0] = ["/DELPHI_2003_I620250/d42-x01-y03"]
 analyses["EventShapes"]["Minor"][196.0] = ["/DELPHI_2003_I620250/d42-x01-y04"]
 analyses["EventShapes"]["Minor"][197.0] = ["/OPAL_2004_S6132243/d08-x01-y04"]
 analyses["EventShapes"]["Minor"][200.0] = ["/DELPHI_2003_I620250/d43-x01-y01","/ALEPH_2004_S5765862/d108-x01-y01"]
 analyses["EventShapes"]["Minor"][202.0] = ["/DELPHI_2003_I620250/d43-x01-y02"]
 analyses["EventShapes"]["Minor"][205.0] = ["/DELPHI_2003_I620250/d43-x01-y03"]
 analyses["EventShapes"]["Minor"][206.0] = ["/ALEPH_2004_S5765862/d109-x01-y01"]
 analyses["EventShapes"]["Minor"][207.0] = ["/DELPHI_2003_I620250/d43-x01-y04"]
 
 analyses["EventShapes"]["O"][45.0 ] = ["/DELPHI_2003_I620250/d06-x01-y01"]
 analyses["EventShapes"]["O"][55.2 ] = ["/AMY_1990_I283337/d15-x01-y01"]
 analyses["EventShapes"]["O"][66.0 ] = ["/DELPHI_2003_I620250/d06-x01-y02"]
 analyses["EventShapes"]["O"][76.0 ] = ["/DELPHI_2003_I620250/d06-x01-y03"]
 analyses["EventShapes"]["O"][91.2 ] = ["/ALEPH_2004_S5765862/d133-x01-y01","/DELPHI_1996_S3430090/d14-x01-y01",
                                        "/ALEPH_1996_S3486095/d08-x01-y01","/OPAL_2004_S6132243/d11-x01-y01"]
-analyses["EventShapes"]["O"][133.0] = ["/ALEPH_2004_S5765862/d134-x01-y01","/OPAL_2004_S6132243/d11-x01-y02"]
-analyses["EventShapes"]["O"][161.0] = ["/ALEPH_2004_S5765862/d135-x01-y01"]
-analyses["EventShapes"]["O"][172.0] = ["/ALEPH_2004_S5765862/d136-x01-y01"]
+analyses["EventShapes"]["O"][133.0] = ["/ALEPH_2004_S5765862/d134-x01-y01","/OPAL_2004_S6132243/d11-x01-y02",
+                                       "/DELPHI_1999_I499183/d19-x01-y01"]
+analyses["EventShapes"]["O"][161.0] = ["/ALEPH_2004_S5765862/d135-x01-y01","/DELPHI_1999_I499183/d19-x01-y02",
+                                       "/OPAL_1997_I440721/d06-x01-y01"]
+analyses["EventShapes"]["O"][172.0] = ["/ALEPH_2004_S5765862/d136-x01-y01","/DELPHI_1999_I499183/d19-x01-y03",
+                                       "/OPAL_2000_I513476/d05-x01-y01"]
 analyses["EventShapes"]["O"][177.0] = ["/OPAL_2004_S6132243/d11-x01-y03"]
-analyses["EventShapes"]["O"][183.0] = ["/DELPHI_2003_I620250/d44-x01-y01","/ALEPH_2004_S5765862/d137-x01-y01"]
-analyses["EventShapes"]["O"][189.0] = ["/DELPHI_2003_I620250/d44-x01-y02","/ALEPH_2004_S5765862/d138-x01-y01"]
+analyses["EventShapes"]["O"][183.0] = ["/DELPHI_2003_I620250/d44-x01-y01","/ALEPH_2004_S5765862/d137-x01-y01",
+                                       "/DELPHI_1999_I499183/d20-x01-y01","/OPAL_2000_I513476/d05-x01-y02"]
+analyses["EventShapes"]["O"][189.0] = ["/DELPHI_2003_I620250/d44-x01-y02","/ALEPH_2004_S5765862/d138-x01-y01",
+                                       "/OPAL_2000_I513476/d05-x01-y03"]
 analyses["EventShapes"]["O"][192.0] = ["/DELPHI_2003_I620250/d44-x01-y03"]
 analyses["EventShapes"]["O"][196.0] = ["/DELPHI_2003_I620250/d44-x01-y04"]
 analyses["EventShapes"]["O"][197.0] = ["/OPAL_2004_S6132243/d11-x01-y04"]
 analyses["EventShapes"]["O"][200.0] = ["/DELPHI_2003_I620250/d45-x01-y01","/ALEPH_2004_S5765862/d139-x01-y01"]
 analyses["EventShapes"]["O"][202.0] = ["/DELPHI_2003_I620250/d45-x01-y02"]
 analyses["EventShapes"]["O"][205.0] = ["/DELPHI_2003_I620250/d45-x01-y03"]
 analyses["EventShapes"]["O"][206.0] = ["/ALEPH_2004_S5765862/d140-x01-y01"]
 analyses["EventShapes"]["O"][207.0] = ["/DELPHI_2003_I620250/d45-x01-y04"]
 # jet broadenings
+# wide
+analyses["EventShapes"]["BW"][35.0 ] = ["/JADE_1998_S3612880/d09-x01-y01"]
+analyses["EventShapes"]["BW"][41.4 ] = ["/L3_2004_I652683/d36-x01-y01"]
+analyses["EventShapes"]["BW"][44.0 ] = ["/JADE_1998_S3612880/d05-x01-y01"]
 analyses["EventShapes"]["BW"][45.0 ] = ["/DELPHI_2003_I620250/d13-x01-y01"]
+analyses["EventShapes"]["BW"][55.3 ] = ["/L3_2004_I652683/d36-x01-y02"]
+analyses["EventShapes"]["BW"][65.4 ] = ["/L3_2004_I652683/d36-x01-y03"]
 analyses["EventShapes"]["BW"][66.0 ] = ["/DELPHI_2003_I620250/d13-x01-y02"]
+analyses["EventShapes"]["BW"][75.7 ] = ["/L3_2004_I652683/d37-x01-y01"]
 analyses["EventShapes"]["BW"][76.0 ] = ["/DELPHI_2003_I620250/d13-x01-y03"]
-analyses["EventShapes"]["BW"][91.2 ] = ["/DELPHI_1996_S3430090/d23-x01-y01","/ALEPH_2004_S5765862/d78-x01-y01","/OPAL_2004_S6132243/d05-x01-y01"]
-analyses["EventShapes"]["BW"][133.0] = ["/OPAL_2004_S6132243/d05-x01-y02","/ALEPH_2004_S5765862/d79-x01-y01"]
-analyses["EventShapes"]["BW"][161.0] = ["/ALEPH_2004_S5765862/d80-x01-y01"]
-analyses["EventShapes"]["BW"][172.0] = ["/ALEPH_2004_S5765862/d81-x01-y01"]
+analyses["EventShapes"]["BW"][82.3 ] = ["/L3_2004_I652683/d37-x01-y02"]
+analyses["EventShapes"]["BW"][85.1 ] = ["/L3_2004_I652683/d37-x01-y03"]
+analyses["EventShapes"]["BW"][91.2 ] = ["/DELPHI_1996_S3430090/d23-x01-y01","/ALEPH_2004_S5765862/d78-x01-y01",
+                                        "/OPAL_2004_S6132243/d05-x01-y01"]
+analyses["EventShapes"]["BW"][130.1] = ["/L3_2004_I652683/d38-x01-y01"]
+analyses["EventShapes"]["BW"][133.0] = ["/OPAL_2004_S6132243/d05-x01-y02","/ALEPH_2004_S5765862/d79-x01-y01",
+                                        "/DELPHI_1999_I499183/d33-x01-y01"]
+analyses["EventShapes"]["BW"][136.3] = ["/L3_2004_I652683/d38-x01-y02"]
+analyses["EventShapes"]["BW"][161.0] = ["/ALEPH_2004_S5765862/d80-x01-y01","/DELPHI_1999_I499183/d33-x01-y02",
+                                        "/OPAL_1997_I440721/d12-x01-y01"]
+analyses["EventShapes"]["BW"][161.3] = ["/L3_2004_I652683/d38-x01-y03"]
+analyses["EventShapes"]["BW"][172.0] = ["/ALEPH_2004_S5765862/d81-x01-y01","/DELPHI_1999_I499183/d33-x01-y03",
+                                        "/OPAL_2000_I513476/d10-x01-y01"]
+analyses["EventShapes"]["BW"][172.3] = ["/L3_2004_I652683/d39-x01-y01"]
 analyses["EventShapes"]["BW"][177.0] = ["/OPAL_2004_S6132243/d05-x01-y03"]
-analyses["EventShapes"]["BW"][183.0] = ["/DELPHI_2003_I620250/d46-x01-y01","/ALEPH_2004_S5765862/d82-x01-y01"]
-analyses["EventShapes"]["BW"][189.0] = ["/DELPHI_2003_I620250/d46-x01-y02","/ALEPH_2004_S5765862/d83-x01-y01"]
+analyses["EventShapes"]["BW"][182.8] = ["/L3_2004_I652683/d39-x01-y02"]
+analyses["EventShapes"]["BW"][183.0] = ["/DELPHI_2003_I620250/d46-x01-y01","/ALEPH_2004_S5765862/d82-x01-y01",
+                                        "/DELPHI_1999_I499183/d34-x01-y01","/OPAL_2000_I513476/d10-x01-y02"]
+analyses["EventShapes"]["BW"][188.6] = ["/L3_2004_I652683/d39-x01-y03"]
+analyses["EventShapes"]["BW"][189.0] = ["/DELPHI_2003_I620250/d46-x01-y02","/ALEPH_2004_S5765862/d83-x01-y01",
+                                        "/OPAL_2000_I513476/d10-x01-y03"]
 analyses["EventShapes"]["BW"][192.0] = ["/DELPHI_2003_I620250/d46-x01-y03"]
+analyses["EventShapes"]["BW"][194.4] = ["/L3_2004_I652683/d40-x01-y01"]
 analyses["EventShapes"]["BW"][196.0] = ["/DELPHI_2003_I620250/d46-x01-y04"]
 analyses["EventShapes"]["BW"][197.0] = ["/OPAL_2004_S6132243/d05-x01-y04"]
 analyses["EventShapes"]["BW"][200.0] = ["/DELPHI_2003_I620250/d47-x01-y01","/ALEPH_2004_S5765862/d84-x01-y01"]
+analyses["EventShapes"]["BW"][200.2] = ["/L3_2004_I652683/d40-x01-y02"]
 analyses["EventShapes"]["BW"][202.0] = ["/DELPHI_2003_I620250/d47-x01-y02"]
 analyses["EventShapes"]["BW"][205.0] = ["/DELPHI_2003_I620250/d47-x01-y03"]
 analyses["EventShapes"]["BW"][206.0] = ["/ALEPH_2004_S5765862/d85-x01-y01"]
+analyses["EventShapes"]["BW"][206.2] = ["/L3_2004_I652683/d40-x01-y03"]
 analyses["EventShapes"]["BW"][207.0] = ["/DELPHI_2003_I620250/d47-x01-y04"]
-analyses["EventShapes"]["BW"][41.4 ] = ["/L3_2004_I652683/d36-x01-y01"]
-analyses["EventShapes"]["BW"][55.3 ] = ["/L3_2004_I652683/d36-x01-y02"]
-analyses["EventShapes"]["BW"][65.4 ] = ["/L3_2004_I652683/d36-x01-y03"]
-analyses["EventShapes"]["BW"][75.7 ] = ["/L3_2004_I652683/d37-x01-y01"]
-analyses["EventShapes"]["BW"][82.3 ] = ["/L3_2004_I652683/d37-x01-y02"]
-analyses["EventShapes"]["BW"][85.1 ] = ["/L3_2004_I652683/d37-x01-y03"]
-analyses["EventShapes"]["BW"][130.1] = ["/L3_2004_I652683/d38-x01-y01"]
-analyses["EventShapes"]["BW"][136.3] = ["/L3_2004_I652683/d38-x01-y02"]
-analyses["EventShapes"]["BW"][161.3] = ["/L3_2004_I652683/d38-x01-y03"]
-analyses["EventShapes"]["BW"][172.3] = ["/L3_2004_I652683/d39-x01-y01"]
-analyses["EventShapes"]["BW"][182.8] = ["/L3_2004_I652683/d39-x01-y02"]
-analyses["EventShapes"]["BW"][188.6] = ["/L3_2004_I652683/d39-x01-y03"]
-analyses["EventShapes"]["BW"][194.4] = ["/L3_2004_I652683/d40-x01-y01"]
-analyses["EventShapes"]["BW"][200.2] = ["/L3_2004_I652683/d40-x01-y02"]
-analyses["EventShapes"]["BW"][206.2] = ["/L3_2004_I652683/d40-x01-y03"]
-analyses["EventShapes"]["BW"][35.0] = ["/JADE_1998_S3612880/d09-x01-y01"]
-analyses["EventShapes"]["BW"][44.0] = ["/JADE_1998_S3612880/d05-x01-y01"]
+# narrow
 analyses["EventShapes"]["BN"][45.0 ] = ["/DELPHI_2003_I620250/d14-x01-y01"]
 analyses["EventShapes"]["BN"][66.0 ] = ["/DELPHI_2003_I620250/d14-x01-y02"]
 analyses["EventShapes"]["BN"][76.0 ] = ["/DELPHI_2003_I620250/d14-x01-y03"]
 analyses["EventShapes"]["BN"][91.2 ] = ["/DELPHI_1996_S3430090/d24-x01-y01","/OPAL_2004_S6132243/d13-x01-y01"]
-analyses["EventShapes"]["BN"][133.0] = ["/OPAL_2004_S6132243/d13-x01-y02"]
+analyses["EventShapes"]["BN"][133.0] = ["/OPAL_2004_S6132243/d13-x01-y02","/DELPHI_1999_I499183/d35-x01-y01"]
+analyses["EventShapes"]["BN"][161.0] = ["/DELPHI_1999_I499183/d35-x01-y02"]
+analyses["EventShapes"]["BN"][172.0] = ["/DELPHI_1999_I499183/d35-x01-y03"]
 analyses["EventShapes"]["BN"][177.0] = ["/OPAL_2004_S6132243/d13-x01-y03"]
+analyses["EventShapes"]["BN"][183.0] = ["/DELPHI_1999_I499183/d36-x01-y01"]
 analyses["EventShapes"]["BN"][197.0] = ["/OPAL_2004_S6132243/d13-x01-y04"]
+# total
+analyses["EventShapes"]["BT"][35.0 ] = ["/JADE_1998_S3612880/d08-x01-y01"]
 analyses["EventShapes"]["BT"][41.4 ] = ["/L3_2004_I652683/d31-x01-y01"]
+analyses["EventShapes"]["BT"][44.0 ] = ["/JADE_1998_S3612880/d04-x01-y01"]
+analyses["EventShapes"]["BT"][45.0 ] = ["/DELPHI_2003_I620250/d15-x01-y01"]
 analyses["EventShapes"]["BT"][55.3 ] = ["/L3_2004_I652683/d31-x01-y02"]
 analyses["EventShapes"]["BT"][65.4 ] = ["/L3_2004_I652683/d31-x01-y03"]
+analyses["EventShapes"]["BT"][66.0 ] = ["/DELPHI_2003_I620250/d15-x01-y02"]
 analyses["EventShapes"]["BT"][75.7 ] = ["/L3_2004_I652683/d32-x01-y01"]
+analyses["EventShapes"]["BT"][76.0 ] = ["/DELPHI_2003_I620250/d15-x01-y03"]
 analyses["EventShapes"]["BT"][82.3 ] = ["/L3_2004_I652683/d32-x01-y02"]
 analyses["EventShapes"]["BT"][85.1 ] = ["/L3_2004_I652683/d32-x01-y03"]
 analyses["EventShapes"]["BT"][91.2 ] = ["/DELPHI_1996_S3430090/d25-x01-y01","/OPAL_2004_S6132243/d04-x01-y01",
                                         "/ALEPH_2004_S5765862/d70-x01-y01"]
 analyses["EventShapes"]["BT"][130.1] = ["/L3_2004_I652683/d33-x01-y01"]
-analyses["EventShapes"]["BT"][133.0] = ["/OPAL_2004_S6132243/d04-x01-y02","/ALEPH_2004_S5765862/d71-x01-y01"]
+analyses["EventShapes"]["BT"][133.0] = ["/OPAL_2004_S6132243/d04-x01-y02","/ALEPH_2004_S5765862/d71-x01-y01",
+                                        "/DELPHI_1999_I499183/d37-x01-y01"]
 analyses["EventShapes"]["BT"][136.3] = ["/L3_2004_I652683/d33-x01-y02"]
+analyses["EventShapes"]["BT"][161.0] = ["/ALEPH_2004_S5765862/d72-x01-y01","/DELPHI_1999_I499183/d37-x01-y02",
+                                        "/OPAL_1997_I440721/d11-x01-y01"]
 analyses["EventShapes"]["BT"][161.3] = ["/L3_2004_I652683/d33-x01-y03"]
+analyses["EventShapes"]["BT"][172.0] = ["/ALEPH_2004_S5765862/d73-x01-y01","/DELPHI_1999_I499183/d37-x01-y03",
+                                        "/OPAL_2000_I513476/d09-x01-y01"]
 analyses["EventShapes"]["BT"][172.3] = ["/L3_2004_I652683/d34-x01-y01"]
 analyses["EventShapes"]["BT"][177.0] = ["/OPAL_2004_S6132243/d04-x01-y03"]
 analyses["EventShapes"]["BT"][182.8] = ["/L3_2004_I652683/d34-x01-y02"]
+analyses["EventShapes"]["BT"][183.0] = ["/DELPHI_2003_I620250/d48-x01-y01","/ALEPH_2004_S5765862/d74-x01-y01",
+                                        "/DELPHI_1999_I499183/d38-x01-y01","/OPAL_2000_I513476/d09-x01-y02"]
 analyses["EventShapes"]["BT"][188.6] = ["/L3_2004_I652683/d34-x01-y03"]
+analyses["EventShapes"]["BT"][189.0] = ["/DELPHI_2003_I620250/d48-x01-y02","/ALEPH_2004_S5765862/d75-x01-y01",
+                                        "/OPAL_2000_I513476/d09-x01-y03"]
+analyses["EventShapes"]["BT"][192.0] = ["/DELPHI_2003_I620250/d48-x01-y03"]
 analyses["EventShapes"]["BT"][194.4] = ["/L3_2004_I652683/d35-x01-y01"]
+analyses["EventShapes"]["BT"][196.0] = ["/DELPHI_2003_I620250/d48-x01-y04"]
 analyses["EventShapes"]["BT"][197.0] = ["/OPAL_2004_S6132243/d04-x01-y04"]
+analyses["EventShapes"]["BT"][200.0] = ["/DELPHI_2003_I620250/d49-x01-y01","/ALEPH_2004_S5765862/d76-x01-y01"]
 analyses["EventShapes"]["BT"][200.2] = ["/L3_2004_I652683/d35-x01-y02"]
-analyses["EventShapes"]["BT"][206.2] = ["/L3_2004_I652683/d35-x01-y03"]
-analyses["EventShapes"]["BT"][45.0 ] = ["/DELPHI_2003_I620250/d15-x01-y01"]
-analyses["EventShapes"]["BT"][66.0 ] = ["/DELPHI_2003_I620250/d15-x01-y02"]
-analyses["EventShapes"]["BT"][76.0 ] = ["/DELPHI_2003_I620250/d15-x01-y03"]
-analyses["EventShapes"]["BT"][161.0] = ["/ALEPH_2004_S5765862/d72-x01-y01"]
-analyses["EventShapes"]["BT"][172.0] = ["/ALEPH_2004_S5765862/d73-x01-y01"]
-analyses["EventShapes"]["BT"][183.0] = ["/DELPHI_2003_I620250/d48-x01-y01","/ALEPH_2004_S5765862/d74-x01-y01"]
-analyses["EventShapes"]["BT"][189.0] = ["/DELPHI_2003_I620250/d48-x01-y02","/ALEPH_2004_S5765862/d75-x01-y01"]
-analyses["EventShapes"]["BT"][192.0] = ["/DELPHI_2003_I620250/d48-x01-y03"]
-analyses["EventShapes"]["BT"][196.0] = ["/DELPHI_2003_I620250/d48-x01-y04"]
-analyses["EventShapes"]["BT"][200.0] = ["/DELPHI_2003_I620250/d49-x01-y01","/ALEPH_2004_S5765862/d76-x01-y01"]
 analyses["EventShapes"]["BT"][202.0] = ["/DELPHI_2003_I620250/d49-x01-y02"]
 analyses["EventShapes"]["BT"][205.0] = ["/DELPHI_2003_I620250/d49-x01-y03"]
 analyses["EventShapes"]["BT"][206.0] = ["/ALEPH_2004_S5765862/d77-x01-y01"]
+analyses["EventShapes"]["BT"][206.2] = ["/L3_2004_I652683/d35-x01-y03"]
 analyses["EventShapes"]["BT"][207.0] = ["/DELPHI_2003_I620250/d49-x01-y04"]
-analyses["EventShapes"]["BT"][35.0] = ["/JADE_1998_S3612880/d08-x01-y01"]
-analyses["EventShapes"]["BT"][44.0] = ["/JADE_1998_S3612880/d04-x01-y01"]
+# difference
 analyses["EventShapes"]["Bdiff"][45.0 ] = ["/DELPHI_2003_I620250/d16-x01-y01"]
 analyses["EventShapes"]["Bdiff"][66.0 ] = ["/DELPHI_2003_I620250/d16-x01-y02"]
 analyses["EventShapes"]["Bdiff"][76.0 ] = ["/DELPHI_2003_I620250/d16-x01-y03"]
 analyses["EventShapes"]["Bdiff"][91.2 ] = ["/DELPHI_1996_S3430090/d26-x01-y01"]
-analyses["EventShapes"]["Bdiff"][183.0] = ["/DELPHI_2003_I620250/d50-x01-y01"]
+analyses["EventShapes"]["Bdiff"][133.0] = ["/DELPHI_1999_I499183/d39-x01-y01"]
+analyses["EventShapes"]["Bdiff"][161.0] = ["/DELPHI_1999_I499183/d39-x01-y02"]
+analyses["EventShapes"]["Bdiff"][172.0] = ["/DELPHI_1999_I499183/d39-x01-y03"]
+analyses["EventShapes"]["Bdiff"][183.0] = ["/DELPHI_2003_I620250/d50-x01-y01","/DELPHI_1999_I499183/d40-x01-y01"]
 analyses["EventShapes"]["Bdiff"][189.0] = ["/DELPHI_2003_I620250/d50-x01-y02"]
 analyses["EventShapes"]["Bdiff"][192.0] = ["/DELPHI_2003_I620250/d50-x01-y03"]
 analyses["EventShapes"]["Bdiff"][196.0] = ["/DELPHI_2003_I620250/d50-x01-y04"]
 analyses["EventShapes"]["Bdiff"][200.0] = ["/DELPHI_2003_I620250/d51-x01-y01"]
 analyses["EventShapes"]["Bdiff"][202.0] = ["/DELPHI_2003_I620250/d51-x01-y02"]
 analyses["EventShapes"]["Bdiff"][205.0] = ["/DELPHI_2003_I620250/d51-x01-y03"]
 analyses["EventShapes"]["Bdiff"][207.0] = ["/DELPHI_2003_I620250/d51-x01-y04"]
 # C and D
 analyses["EventShapes"]["C"][45.0 ] = ["/DELPHI_2003_I620250/d17-x01-y01"]
 analyses["EventShapes"]["C"][66.0 ] = ["/DELPHI_2003_I620250/d17-x01-y02"]
 analyses["EventShapes"]["C"][76.0 ] = ["/DELPHI_2003_I620250/d17-x01-y03"]
 analyses["EventShapes"]["C"][91.2 ] = ["/DELPHI_1996_S3430090/d18-x01-y01","/ALEPH_1996_S3486095/d07-x01-y01",
                                        "/ALEPH_2004_S5765862/d86-x01-y01","/OPAL_2004_S6132243/d03-x01-y01"]
-analyses["EventShapes"]["C"][133.0] = ["/OPAL_2004_S6132243/d03-x01-y02","/ALEPH_2004_S5765862/d87-x01-y01"]
-analyses["EventShapes"]["C"][161.0] = ["/ALEPH_2004_S5765862/d88-x01-y01"]
-analyses["EventShapes"]["C"][172.0] = ["/ALEPH_2004_S5765862/d89-x01-y01"]
+analyses["EventShapes"]["C"][133.0] = ["/OPAL_2004_S6132243/d03-x01-y02","/ALEPH_2004_S5765862/d87-x01-y01",
+                                       "/DELPHI_1999_I499183/d41-x01-y01"]
+analyses["EventShapes"]["C"][161.0] = ["/ALEPH_2004_S5765862/d88-x01-y01","/DELPHI_1999_I499183/d41-x01-y02",
+                                       "/OPAL_1997_I440721/d09-x01-y01"]
+analyses["EventShapes"]["C"][172.0] = ["/ALEPH_2004_S5765862/d89-x01-y01","/DELPHI_1999_I499183/d41-x01-y03",
+                                       "/OPAL_2000_I513476/d06-x01-y01"]
 analyses["EventShapes"]["C"][177.0] = ["/OPAL_2004_S6132243/d03-x01-y03"]
-analyses["EventShapes"]["C"][183.0] = ["/DELPHI_2003_I620250/d52-x01-y01","/ALEPH_2004_S5765862/d90-x01-y01"]
-analyses["EventShapes"]["C"][189.0] = ["/DELPHI_2003_I620250/d52-x01-y02","/ALEPH_2004_S5765862/d91-x01-y01"]
+analyses["EventShapes"]["C"][183.0] = ["/DELPHI_2003_I620250/d52-x01-y01","/ALEPH_2004_S5765862/d90-x01-y01",
+                                       "/DELPHI_1999_I499183/d42-x01-y01","/OPAL_2000_I513476/d06-x01-y02"]
+analyses["EventShapes"]["C"][189.0] = ["/DELPHI_2003_I620250/d52-x01-y02","/ALEPH_2004_S5765862/d91-x01-y01",
+                                       "/OPAL_2000_I513476/d06-x01-y03"]
 analyses["EventShapes"]["C"][192.0] = ["/DELPHI_2003_I620250/d52-x01-y03"]
 analyses["EventShapes"]["C"][196.0] = ["/DELPHI_2003_I620250/d52-x01-y04"]
 analyses["EventShapes"]["C"][197.0] = ["/OPAL_2004_S6132243/d03-x01-y04"]
 analyses["EventShapes"]["C"][200.0] = ["/DELPHI_2003_I620250/d53-x01-y01","/ALEPH_2004_S5765862/d92-x01-y01"]
 analyses["EventShapes"]["C"][202.0] = ["/DELPHI_2003_I620250/d53-x01-y02"]
 analyses["EventShapes"]["C"][205.0] = ["/DELPHI_2003_I620250/d53-x01-y03"]
 analyses["EventShapes"]["C"][206.0] = ["/ALEPH_2004_S5765862/d93-x01-y01"]
 analyses["EventShapes"]["C"][207.0] = ["/DELPHI_2003_I620250/d53-x01-y04"]
 analyses["EventShapes"]["C"][130.1] = ["/L3_2004_I652683/d41-x01-y01"]
 analyses["EventShapes"]["C"][136.3] = ["/L3_2004_I652683/d41-x01-y02"]
 analyses["EventShapes"]["C"][161.3] = ["/L3_2004_I652683/d41-x01-y03"]
 analyses["EventShapes"]["C"][172.3] = ["/L3_2004_I652683/d42-x01-y01"]
 analyses["EventShapes"]["C"][182.8] = ["/L3_2004_I652683/d42-x01-y02"]
 analyses["EventShapes"]["C"][188.6] = ["/L3_2004_I652683/d42-x01-y03"]
 analyses["EventShapes"]["C"][194.4] = ["/L3_2004_I652683/d43-x01-y01"]
 analyses["EventShapes"]["C"][200.2] = ["/L3_2004_I652683/d43-x01-y02"]
 analyses["EventShapes"]["C"][206.2] = ["/L3_2004_I652683/d43-x01-y03"]
-
+# D parameter
 analyses["EventShapes"]["D"][91.2 ] = ["/DELPHI_1996_S3430090/d19-x01-y01","/OPAL_2004_S6132243/d14-x01-y01"]
 analyses["EventShapes"]["D"][130.1] = ["/L3_2004_I652683/d44-x01-y01"]
-analyses["EventShapes"]["D"][133.0] = ["/OPAL_2004_S6132243/d14-x01-y02"]
+analyses["EventShapes"]["D"][133.0] = ["/OPAL_2004_S6132243/d14-x01-y02","/DELPHI_1999_I499183/d43-x01-y01"]
 analyses["EventShapes"]["D"][136.3] = ["/L3_2004_I652683/d44-x01-y02"]
+analyses["EventShapes"]["D"][161.0] = ["/DELPHI_1999_I499183/d43-x01-y02"]
 analyses["EventShapes"]["D"][161.3] = ["/L3_2004_I652683/d44-x01-y03"]
+analyses["EventShapes"]["D"][172.0] = ["/DELPHI_1999_I499183/d43-x01-y03"]
 analyses["EventShapes"]["D"][172.3] = ["/L3_2004_I652683/d45-x01-y01"]
 analyses["EventShapes"]["D"][177.0] = ["/OPAL_2004_S6132243/d14-x01-y03"]
 analyses["EventShapes"]["D"][182.8] = ["/L3_2004_I652683/d45-x01-y02"]
+analyses["EventShapes"]["D"][183.0] = ["/DELPHI_2003_I620250/d54-x01-y01","/DELPHI_1999_I499183/d44-x01-y01"]
 analyses["EventShapes"]["D"][188.6] = ["/L3_2004_I652683/d45-x01-y03"]
-analyses["EventShapes"]["D"][194.4] = ["/L3_2004_I652683/d46-x01-y01"]
-analyses["EventShapes"]["D"][197.0] = ["/OPAL_2004_S6132243/d14-x01-y04"]
-analyses["EventShapes"]["D"][200.2] = ["/L3_2004_I652683/d46-x01-y02"]
-analyses["EventShapes"]["D"][206.2] = ["/L3_2004_I652683/d46-x01-y03"]
-analyses["EventShapes"]["D"][183.0] = ["/DELPHI_2003_I620250/d54-x01-y01"]
 analyses["EventShapes"]["D"][189.0] = ["/DELPHI_2003_I620250/d54-x01-y02"]
 analyses["EventShapes"]["D"][192.0] = ["/DELPHI_2003_I620250/d54-x01-y03"]
+analyses["EventShapes"]["D"][194.4] = ["/L3_2004_I652683/d46-x01-y01"]
 analyses["EventShapes"]["D"][196.0] = ["/DELPHI_2003_I620250/d54-x01-y04"]
+analyses["EventShapes"]["D"][197.0] = ["/OPAL_2004_S6132243/d14-x01-y04"]
 analyses["EventShapes"]["D"][200.0] = ["/DELPHI_2003_I620250/d55-x01-y01"]
+analyses["EventShapes"]["D"][200.2] = ["/L3_2004_I652683/d46-x01-y02"]
 analyses["EventShapes"]["D"][202.0] = ["/DELPHI_2003_I620250/d55-x01-y02"]
 analyses["EventShapes"]["D"][205.0] = ["/DELPHI_2003_I620250/d55-x01-y03"]
+analyses["EventShapes"]["D"][206.2] = ["/L3_2004_I652683/d46-x01-y03"]
 analyses["EventShapes"]["D"][207.0] = ["/DELPHI_2003_I620250/d55-x01-y04"]
 # hemispheres
-analyses["EventShapes"]["HeavyJetMass"][14.0] = ["/TASSO_1989_I279165/d02-x01-y01"]
-analyses["EventShapes"]["HeavyJetMass"][22.0] = ["/TASSO_1989_I279165/d02-x01-y02"]
-analyses["EventShapes"]["HeavyJetMass"][34.8] = ["/TASSO_1989_I279165/d02-x01-y03"]
-analyses["EventShapes"]["HeavyJetMass"][35.0] = ["/JADE_1998_S3612880/d07-x01-y01"]
-
-
-analyses["EventShapes"]["HeavyJetMass"][43.5] = ["/TASSO_1989_I279165/d02-x01-y04"]
-analyses["EventShapes"]["HeavyJetMass"][44.0] = ["/JADE_1998_S3612880/d03-x01-y01"]
-analyses["EventShapes"]["HeavyJetMass"][45.0] = ["/DELPHI_2003_I620250/d07-x01-y01","/DELPHI_2003_I620250/d08-x01-y01"]
-analyses["EventShapes"]["HeavyJetMass"][55.2] = ["/AMY_1990_I283337/d21-x01-y01"]
-analyses["EventShapes"]["HeavyJetMass"][58.0] = ["/TOPAZ_1993_I361661/d02-x01-y01"]
-analyses["EventShapes"]["HeavyJetMass"][66.0] = ["/DELPHI_2003_I620250/d07-x01-y02","/DELPHI_2003_I620250/d08-x01-y02"]
-analyses["EventShapes"]["HeavyJetMass"][76.0] = ["/DELPHI_2003_I620250/d07-x01-y03","/DELPHI_2003_I620250/d08-x01-y03"]
-analyses["EventShapes"]["HeavyJetMass"][91.2] = ["/DELPHI_1996_S3430090/d20-x01-y01","/ALEPH_1996_S3486095/d06-x01-y01","/OPAL_2004_S6132243/d02-x01-y01","/ALEPH_2004_S5765862/d62-x01-y01"]
-analyses["EventShapes"]["HeavyJetMass"][133.0] = ["/OPAL_2004_S6132243/d02-x01-y02","/ALEPH_2004_S5765862/d63-x01-y01"]
-analyses["EventShapes"]["HeavyJetMass"][161.0] = ["/ALEPH_2004_S5765862/d64-x01-y01"]
-analyses["EventShapes"]["HeavyJetMass"][172.0] = ["/ALEPH_2004_S5765862/d65-x01-y01"]
+# heavy jet mass
+analyses["EventShapes"]["HeavyJetMass"][14.0 ] = ["/TASSO_1989_I279165/d02-x01-y01"]
+analyses["EventShapes"]["HeavyJetMass"][22.0 ] = ["/TASSO_1989_I279165/d02-x01-y02"]
+analyses["EventShapes"]["HeavyJetMass"][34.8 ] = ["/TASSO_1989_I279165/d02-x01-y03"]
+analyses["EventShapes"]["HeavyJetMass"][35.0 ] = ["/JADE_1998_S3612880/d07-x01-y01"]
+analyses["EventShapes"]["HeavyJetMass"][41.4 ] = ["/L3_2004_I652683/d26-x01-y01"]
+analyses["EventShapes"]["HeavyJetMass"][43.5 ] = ["/TASSO_1989_I279165/d02-x01-y04"]
+analyses["EventShapes"]["HeavyJetMass"][44.0 ] = ["/JADE_1998_S3612880/d03-x01-y01"]
+analyses["EventShapes"]["HeavyJetMass"][45.0 ] = ["/DELPHI_2003_I620250/d07-x01-y01","/DELPHI_2003_I620250/d08-x01-y01"]
+analyses["EventShapes"]["HeavyJetMass"][55.2 ] = ["/AMY_1990_I283337/d21-x01-y01"]
+analyses["EventShapes"]["HeavyJetMass"][55.3 ] = ["/L3_2004_I652683/d26-x01-y02"]
+analyses["EventShapes"]["HeavyJetMass"][58.0 ] = ["/TOPAZ_1993_I361661/d02-x01-y01"]
+analyses["EventShapes"]["HeavyJetMass"][65.4 ] = ["/L3_2004_I652683/d26-x01-y03"]
+analyses["EventShapes"]["HeavyJetMass"][66.0 ] = ["/DELPHI_2003_I620250/d07-x01-y02","/DELPHI_2003_I620250/d08-x01-y02"]
+analyses["EventShapes"]["HeavyJetMass"][75.7 ] = ["/L3_2004_I652683/d27-x01-y01"]
+analyses["EventShapes"]["HeavyJetMass"][76.0 ] = ["/DELPHI_2003_I620250/d07-x01-y03","/DELPHI_2003_I620250/d08-x01-y03"]
+analyses["EventShapes"]["HeavyJetMass"][82.3 ] = ["/L3_2004_I652683/d27-x01-y02"]
+analyses["EventShapes"]["HeavyJetMass"][85.1 ] = ["/L3_2004_I652683/d27-x01-y03"]
+analyses["EventShapes"]["HeavyJetMass"][91.2 ] = ["/DELPHI_1996_S3430090/d20-x01-y01","/ALEPH_1996_S3486095/d06-x01-y01",
+                                                  "/OPAL_2004_S6132243/d02-x01-y01","/ALEPH_2004_S5765862/d62-x01-y01"]
+analyses["EventShapes"]["HeavyJetMass"][130.1] = ["/L3_2004_I652683/d28-x01-y01"]
+analyses["EventShapes"]["HeavyJetMass"][133.0] = ["/OPAL_2004_S6132243/d02-x01-y02","/ALEPH_2004_S5765862/d63-x01-y01",
+                                                  "/DELPHI_1999_I499183/d27-x01-y01"]
+analyses["EventShapes"]["HeavyJetMass"][136.3] = ["/L3_2004_I652683/d28-x01-y02"]
+analyses["EventShapes"]["HeavyJetMass"][161.0] = ["/ALEPH_2004_S5765862/d64-x01-y01","/DELPHI_1999_I499183/d27-x01-y02",
+                                                  "/OPAL_1997_I440721/d10-x01-y01"]
+analyses["EventShapes"]["HeavyJetMass"][161.3] = ["/L3_2004_I652683/d28-x01-y03"]
+analyses["EventShapes"]["HeavyJetMass"][172.0] = ["/ALEPH_2004_S5765862/d65-x01-y01","/DELPHI_1999_I499183/d27-x01-y03",
+                                                  "/OPAL_2000_I513476/d07-x01-y01"]
+analyses["EventShapes"]["HeavyJetMass"][172.3] = ["/L3_2004_I652683/d29-x01-y01"]
 analyses["EventShapes"]["HeavyJetMass"][177.0] = ["/OPAL_2004_S6132243/d02-x01-y03"]
+analyses["EventShapes"]["HeavyJetMass"][182.8] = ["/L3_2004_I652683/d29-x01-y02"]
 analyses["EventShapes"]["HeavyJetMass"][183.0] = ["/DELPHI_2003_I620250/d56-x01-y01","/DELPHI_2003_I620250/d58-x01-y01",
-                                                  "/DELPHI_2003_I620250/d60-x01-y01","/ALEPH_2004_S5765862/d66-x01-y01"]
+                                                  "/DELPHI_2003_I620250/d60-x01-y01","/ALEPH_2004_S5765862/d66-x01-y01",
+                                                  "/DELPHI_1999_I499183/d28-x01-y01","/OPAL_2000_I513476/d07-x01-y02"]
+analyses["EventShapes"]["HeavyJetMass"][188.6] = ["/L3_2004_I652683/d29-x01-y03"]
 analyses["EventShapes"]["HeavyJetMass"][189.0] = ["/DELPHI_2003_I620250/d56-x01-y02","/DELPHI_2003_I620250/d58-x01-y02",
-                                                  "/DELPHI_2003_I620250/d60-x01-y02","/ALEPH_2004_S5765862/d67-x01-y01"]
+                                                  "/DELPHI_2003_I620250/d60-x01-y02","/ALEPH_2004_S5765862/d67-x01-y01",
+                                                  "/OPAL_2000_I513476/d07-x01-y03"]
 analyses["EventShapes"]["HeavyJetMass"][192.0] = ["/DELPHI_2003_I620250/d56-x01-y03","/DELPHI_2003_I620250/d58-x01-y03",
                                                   "/DELPHI_2003_I620250/d60-x01-y03"]
+analyses["EventShapes"]["HeavyJetMass"][194.4] = ["/L3_2004_I652683/d30-x01-y01"]
 analyses["EventShapes"]["HeavyJetMass"][196.0] = ["/DELPHI_2003_I620250/d56-x01-y04","/DELPHI_2003_I620250/d58-x01-y04",
                                                   "/DELPHI_2003_I620250/d60-x01-y04"]
 analyses["EventShapes"]["HeavyJetMass"][197.0] = ["/OPAL_2004_S6132243/d02-x01-y04"]
 analyses["EventShapes"]["HeavyJetMass"][200.0] = ["/DELPHI_2003_I620250/d57-x01-y01","/DELPHI_2003_I620250/d59-x01-y01",
                                                   "/DELPHI_2003_I620250/d61-x01-y01","/ALEPH_2004_S5765862/d68-x01-y01"]
+analyses["EventShapes"]["HeavyJetMass"][200.2] = ["/L3_2004_I652683/d30-x01-y02"]
 analyses["EventShapes"]["HeavyJetMass"][202.0] = ["/DELPHI_2003_I620250/d57-x01-y02","/DELPHI_2003_I620250/d59-x01-y02",
                                                   "/DELPHI_2003_I620250/d61-x01-y02"]
 analyses["EventShapes"]["HeavyJetMass"][205.0] = ["/DELPHI_2003_I620250/d57-x01-y03","/DELPHI_2003_I620250/d59-x01-y03",
                                                   "/DELPHI_2003_I620250/d61-x01-y03"]
 analyses["EventShapes"]["HeavyJetMass"][206.0] = ["/ALEPH_2004_S5765862/d69-x01-y01"]
+analyses["EventShapes"]["HeavyJetMass"][206.2] = ["/L3_2004_I652683/d30-x01-y03"]
 analyses["EventShapes"]["HeavyJetMass"][207.0] = ["/DELPHI_2003_I620250/d57-x01-y04","/DELPHI_2003_I620250/d59-x01-y04",
                                                   "/DELPHI_2003_I620250/d61-x01-y04"]
-analyses["EventShapes"]["HeavyJetMass"][41.4 ] = ["/L3_2004_I652683/d26-x01-y01"]
-analyses["EventShapes"]["HeavyJetMass"][55.3 ] = ["/L3_2004_I652683/d26-x01-y02"]
-analyses["EventShapes"]["HeavyJetMass"][65.4 ] = ["/L3_2004_I652683/d26-x01-y03"]
-analyses["EventShapes"]["HeavyJetMass"][75.7 ] = ["/L3_2004_I652683/d27-x01-y01"]
-analyses["EventShapes"]["HeavyJetMass"][82.3 ] = ["/L3_2004_I652683/d27-x01-y02"]
-analyses["EventShapes"]["HeavyJetMass"][85.1 ] = ["/L3_2004_I652683/d27-x01-y03"]
-analyses["EventShapes"]["HeavyJetMass"][130.1] = ["/L3_2004_I652683/d28-x01-y01"]
-analyses["EventShapes"]["HeavyJetMass"][136.3] = ["/L3_2004_I652683/d28-x01-y02"]
-analyses["EventShapes"]["HeavyJetMass"][161.3] = ["/L3_2004_I652683/d28-x01-y03"]
-analyses["EventShapes"]["HeavyJetMass"][172.3] = ["/L3_2004_I652683/d29-x01-y01"]
-analyses["EventShapes"]["HeavyJetMass"][182.8] = ["/L3_2004_I652683/d29-x01-y02"]
-analyses["EventShapes"]["HeavyJetMass"][188.6] = ["/L3_2004_I652683/d29-x01-y03"]
-analyses["EventShapes"]["HeavyJetMass"][194.4] = ["/L3_2004_I652683/d30-x01-y01"]
-analyses["EventShapes"]["HeavyJetMass"][200.2] = ["/L3_2004_I652683/d30-x01-y02"]
-analyses["EventShapes"]["HeavyJetMass"][206.2] = ["/L3_2004_I652683/d30-x01-y03"]
-
-analyses["EventShapes"]["JetMassDifference"][14.0] = ["/TASSO_1989_I279165/d01-x01-y01"]
-analyses["EventShapes"]["JetMassDifference"][22.0] = ["/TASSO_1989_I279165/d01-x01-y02"]
-analyses["EventShapes"]["JetMassDifference"][34.8] = ["/TASSO_1989_I279165/d01-x01-y03"]
-analyses["EventShapes"]["JetMassDifference"][43.5] = ["/TASSO_1989_I279165/d01-x01-y04"]
-analyses["EventShapes"]["JetMassDifference"][45.0] = ["/DELPHI_2003_I620250/d10-x01-y01"]
-analyses["EventShapes"]["JetMassDifference"][55.2] = ["/AMY_1990_I283337/d22-x01-y01"]
-analyses["EventShapes"]["JetMassDifference"][66.0] = ["/DELPHI_2003_I620250/d10-x01-y02"]
-analyses["EventShapes"]["JetMassDifference"][76.0] = ["/DELPHI_2003_I620250/d10-x01-y03"]
-analyses["EventShapes"]["JetMassDifference"][91.2] = ["/DELPHI_1996_S3430090/d22-x01-y01","/ALEPH_2004_S5765862/d110-x01-y01"]
-analyses["EventShapes"]["JetMassDifference"][133.0] = ["/ALEPH_2004_S5765862/d111-x01-y01"]
-analyses["EventShapes"]["JetMassDifference"][161.0] = ["/ALEPH_2004_S5765862/d112-x01-y01"]
-analyses["EventShapes"]["JetMassDifference"][172.0] = ["/ALEPH_2004_S5765862/d113-x01-y01"]
-analyses["EventShapes"]["JetMassDifference"][183.0] = ["/DELPHI_2003_I620250/d64-x01-y01","/ALEPH_2004_S5765862/d114-x01-y01"]
+# jet mass difference
+analyses["EventShapes"]["JetMassDifference"][14.0 ] = ["/TASSO_1989_I279165/d01-x01-y01"]
+analyses["EventShapes"]["JetMassDifference"][22.0 ] = ["/TASSO_1989_I279165/d01-x01-y02"]
+analyses["EventShapes"]["JetMassDifference"][34.8 ] = ["/TASSO_1989_I279165/d01-x01-y03"]
+analyses["EventShapes"]["JetMassDifference"][43.5 ] = ["/TASSO_1989_I279165/d01-x01-y04"]
+analyses["EventShapes"]["JetMassDifference"][45.0 ] = ["/DELPHI_2003_I620250/d10-x01-y01"]
+analyses["EventShapes"]["JetMassDifference"][55.2 ] = ["/AMY_1990_I283337/d22-x01-y01"]
+analyses["EventShapes"]["JetMassDifference"][66.0 ] = ["/DELPHI_2003_I620250/d10-x01-y02"]
+analyses["EventShapes"]["JetMassDifference"][76.0 ] = ["/DELPHI_2003_I620250/d10-x01-y03"]
+analyses["EventShapes"]["JetMassDifference"][91.2 ] = ["/DELPHI_1996_S3430090/d22-x01-y01","/ALEPH_2004_S5765862/d110-x01-y01"]
+analyses["EventShapes"]["JetMassDifference"][133.0] = ["/ALEPH_2004_S5765862/d111-x01-y01","/DELPHI_1999_I499183/d31-x01-y01"]
+analyses["EventShapes"]["JetMassDifference"][161.0] = ["/ALEPH_2004_S5765862/d112-x01-y01","/DELPHI_1999_I499183/d31-x01-y02"]
+analyses["EventShapes"]["JetMassDifference"][172.0] = ["/ALEPH_2004_S5765862/d113-x01-y01","/DELPHI_1999_I499183/d31-x01-y03"]
+analyses["EventShapes"]["JetMassDifference"][183.0] = ["/DELPHI_2003_I620250/d64-x01-y01","/ALEPH_2004_S5765862/d114-x01-y01",
+                                                       "/DELPHI_1999_I499183/d32-x01-y01"]
 analyses["EventShapes"]["JetMassDifference"][189.0] = ["/DELPHI_2003_I620250/d64-x01-y02","/ALEPH_2004_S5765862/d115-x01-y01"]
 analyses["EventShapes"]["JetMassDifference"][192.0] = ["/DELPHI_2003_I620250/d64-x01-y03"]
 analyses["EventShapes"]["JetMassDifference"][196.0] = ["/DELPHI_2003_I620250/d64-x01-y04"]
 analyses["EventShapes"]["JetMassDifference"][200.0] = ["/DELPHI_2003_I620250/d65-x01-y01","/ALEPH_2004_S5765862/d116-x01-y01"]
 analyses["EventShapes"]["JetMassDifference"][202.0] = ["/DELPHI_2003_I620250/d65-x01-y02"]
 analyses["EventShapes"]["JetMassDifference"][205.0] = ["/DELPHI_2003_I620250/d65-x01-y03"]
 analyses["EventShapes"]["JetMassDifference"][206.0] = ["/ALEPH_2004_S5765862/d117-x01-y01"]
 analyses["EventShapes"]["JetMassDifference"][207.0] = ["/DELPHI_2003_I620250/d65-x01-y04"]
-analyses["EventShapes"]["LightJetMass"][14.0] = ["/TASSO_1989_I279165/d03-x01-y01"]
-analyses["EventShapes"]["LightJetMass"][22.0] = ["/TASSO_1989_I279165/d03-x01-y02"]
-analyses["EventShapes"]["LightJetMass"][34.8] = ["/TASSO_1989_I279165/d03-x01-y03"]
-analyses["EventShapes"]["LightJetMass"][43.5] = ["/TASSO_1989_I279165/d03-x01-y04"]
-analyses["EventShapes"]["LightJetMass"][45.0] = ["/DELPHI_2003_I620250/d09-x01-y01"]
-analyses["EventShapes"]["LightJetMass"][55.2] = ["/AMY_1990_I283337/d20-x01-y01"]
-analyses["EventShapes"]["LightJetMass"][66.0] = ["/DELPHI_2003_I620250/d09-x01-y02"]
-analyses["EventShapes"]["LightJetMass"][76.0] = ["/DELPHI_2003_I620250/d09-x01-y03"]
-analyses["EventShapes"]["LightJetMass"][91.2] = ["/DELPHI_1996_S3430090/d21-x01-y01","/OPAL_2004_S6132243/d12-x01-y01"]
-analyses["EventShapes"]["LightJetMass"][133.0] = ["/OPAL_2004_S6132243/d12-x01-y02"]
+# light jet mass
+analyses["EventShapes"]["LightJetMass"][14.0 ] = ["/TASSO_1989_I279165/d03-x01-y01"]
+analyses["EventShapes"]["LightJetMass"][22.0 ] = ["/TASSO_1989_I279165/d03-x01-y02"]
+analyses["EventShapes"]["LightJetMass"][34.8 ] = ["/TASSO_1989_I279165/d03-x01-y03"]
+analyses["EventShapes"]["LightJetMass"][43.5 ] = ["/TASSO_1989_I279165/d03-x01-y04"]
+analyses["EventShapes"]["LightJetMass"][45.0 ] = ["/DELPHI_2003_I620250/d09-x01-y01"]
+analyses["EventShapes"]["LightJetMass"][55.2 ] = ["/AMY_1990_I283337/d20-x01-y01"]
+analyses["EventShapes"]["LightJetMass"][66.0 ] = ["/DELPHI_2003_I620250/d09-x01-y02"]
+analyses["EventShapes"]["LightJetMass"][76.0 ] = ["/DELPHI_2003_I620250/d09-x01-y03"]
+analyses["EventShapes"]["LightJetMass"][91.2 ] = ["/DELPHI_1996_S3430090/d21-x01-y01","/OPAL_2004_S6132243/d12-x01-y01"]
+analyses["EventShapes"]["LightJetMass"][133.0] = ["/OPAL_2004_S6132243/d12-x01-y02","/DELPHI_1999_I499183/d29-x01-y01"]
+analyses["EventShapes"]["LightJetMass"][161.0] = ["/DELPHI_1999_I499183/d29-x01-y02"]
+analyses["EventShapes"]["LightJetMass"][172.0] = ["/DELPHI_1999_I499183/d29-x01-y03"]
 analyses["EventShapes"]["LightJetMass"][177.0] = ["/OPAL_2004_S6132243/d12-x01-y03"]
-analyses["EventShapes"]["LightJetMass"][183.0] = ["/DELPHI_2003_I620250/d62-x01-y01"]
+analyses["EventShapes"]["LightJetMass"][183.0] = ["/DELPHI_2003_I620250/d62-x01-y01","/DELPHI_1999_I499183/d30-x01-y01"]
 analyses["EventShapes"]["LightJetMass"][189.0] = ["/DELPHI_2003_I620250/d62-x01-y02"]
 analyses["EventShapes"]["LightJetMass"][192.0] = ["/DELPHI_2003_I620250/d62-x01-y03"]
 analyses["EventShapes"]["LightJetMass"][196.0] = ["/DELPHI_2003_I620250/d62-x01-y04"]
 analyses["EventShapes"]["LightJetMass"][197.0] = ["/OPAL_2004_S6132243/d12-x01-y04"]
 analyses["EventShapes"]["LightJetMass"][200.0] = ["/DELPHI_2003_I620250/d63-x01-y01"]
 analyses["EventShapes"]["LightJetMass"][202.0] = ["/DELPHI_2003_I620250/d63-x01-y02"]
 analyses["EventShapes"]["LightJetMass"][205.0] = ["/DELPHI_2003_I620250/d63-x01-y03"]
 analyses["EventShapes"]["LightJetMass"][207.0] = ["/DELPHI_2003_I620250/d63-x01-y04"]
-analyses["EventShapes"]["TotalJetMass"][45.0] = ["/DELPHI_2003_I620250/d11-x01-y01","/DELPHI_2003_I620250/d12-x01-y01"]
-analyses["EventShapes"]["TotalJetMass"][66.0] = ["/DELPHI_2003_I620250/d11-x01-y02","/DELPHI_2003_I620250/d12-x01-y02"]
-analyses["EventShapes"]["TotalJetMass"][76.0] = ["/DELPHI_2003_I620250/d11-x01-y03","/DELPHI_2003_I620250/d12-x01-y03"]
+# total jet mass
+analyses["EventShapes"]["TotalJetMass"][45.0 ] = ["/DELPHI_2003_I620250/d11-x01-y01","/DELPHI_2003_I620250/d12-x01-y01"]
+analyses["EventShapes"]["TotalJetMass"][66.0 ] = ["/DELPHI_2003_I620250/d11-x01-y02","/DELPHI_2003_I620250/d12-x01-y02"]
+analyses["EventShapes"]["TotalJetMass"][76.0 ] = ["/DELPHI_2003_I620250/d11-x01-y03","/DELPHI_2003_I620250/d12-x01-y03"]
 # jets
 # y12
 analyses["EventShapes"]["y12_dur"][91.2 ] = ["/ALEPH_2004_S5765862/d149-x01-y01"]
 analyses["EventShapes"]["y12_dur"][133.0] = ["/ALEPH_2004_S5765862/d150-x01-y01"]
 analyses["EventShapes"]["y12_dur"][161.0] = ["/ALEPH_2004_S5765862/d151-x01-y01"]
 analyses["EventShapes"]["y12_dur"][172.0] = ["/ALEPH_2004_S5765862/d152-x01-y01"]
 analyses["EventShapes"]["y12_dur"][183.0] = ["/ALEPH_2004_S5765862/d153-x01-y01"]
 analyses["EventShapes"]["y12_dur"][189.0] = ["/ALEPH_2004_S5765862/d154-x01-y01"]
 analyses["EventShapes"]["y12_dur"][200.0] = ["/ALEPH_2004_S5765862/d155-x01-y01"]
 analyses["EventShapes"]["y12_dur"][206.0] = ["/ALEPH_2004_S5765862/d156-x01-y01"]
 # y23
-analyses["EventShapes"]["y23_dur"][22.0] = ["/JADE_1998_S3612880/d12-x01-y01"]
+analyses["EventShapes"]["y23_dur"][22.0 ] = ["/JADE_1998_S3612880/d12-x01-y01"]
 analyses["EventShapes"]["y23_dur"][35.0 ] = ["/JADE_OPAL_2000_S4300807/d24-x01-y01","/JADE_1998_S3612880/d11-x01-y01"]
 analyses["EventShapes"]["y23_dur"][44.0 ] = ["/JADE_OPAL_2000_S4300807/d25-x01-y01","/JADE_1998_S3612880/d10-x01-y01"]
 analyses["EventShapes"]["y23_dur"][58.0 ] = ["/TOPAZ_1993_I361661/d03-x01-y01"]
 analyses["EventShapes"]["y23_dur"][91.2 ] = ["/ALEPH_2004_S5765862/d157-x01-y01","/ALEPH_1996_S3486095/d05-x01-y01",
                                              "/OPAL_2004_S6132243/d06-x01-y01","/JADE_OPAL_2000_S4300807/d26-x01-y01",
                                              "/DELPHI_1996_S3430090/d27-x01-y01"]
 analyses["EventShapes"]["y23_dur"][133.0] = ["/ALEPH_2004_S5765862/d158-x01-y01","/OPAL_2004_S6132243/d06-x01-y02",
                                              "/JADE_OPAL_2000_S4300807/d27-x01-y01"]
-analyses["EventShapes"]["y23_dur"][161.0] = ["/ALEPH_2004_S5765862/d159-x01-y01","/JADE_OPAL_2000_S4300807/d28-x01-y01"]
-analyses["EventShapes"]["y23_dur"][172.0] = ["/ALEPH_2004_S5765862/d160-x01-y01","/JADE_OPAL_2000_S4300807/d29-x01-y01"]
+analyses["EventShapes"]["y23_dur"][161.0] = ["/ALEPH_2004_S5765862/d159-x01-y01","/JADE_OPAL_2000_S4300807/d28-x01-y01",
+                                             "/OPAL_1997_I440721/d20-x01-y01"]
+analyses["EventShapes"]["y23_dur"][172.0] = ["/ALEPH_2004_S5765862/d160-x01-y01","/JADE_OPAL_2000_S4300807/d29-x01-y01",
+                                             "/OPAL_2000_I513476/d11-x01-y01"]
 analyses["EventShapes"]["y23_dur"][177.0] = ["/OPAL_2004_S6132243/d06-x01-y03"]
-analyses["EventShapes"]["y23_dur"][183.0] = ["/ALEPH_2004_S5765862/d161-x01-y01","/JADE_OPAL_2000_S4300807/d30-x01-y01"]
-analyses["EventShapes"]["y23_dur"][189.0] = ["/ALEPH_2004_S5765862/d162-x01-y01","/JADE_OPAL_2000_S4300807/d31-x01-y01"]
+analyses["EventShapes"]["y23_dur"][183.0] = ["/ALEPH_2004_S5765862/d161-x01-y01","/JADE_OPAL_2000_S4300807/d30-x01-y01",
+                                             "/OPAL_2000_I513476/d11-x01-y02"]
+analyses["EventShapes"]["y23_dur"][189.0] = ["/ALEPH_2004_S5765862/d162-x01-y01","/JADE_OPAL_2000_S4300807/d31-x01-y01",
+                                             "/OPAL_2000_I513476/d11-x01-y03"]
 analyses["EventShapes"]["y23_dur"][197.0] = ["/OPAL_2004_S6132243/d06-x01-y04"]
 analyses["EventShapes"]["y23_dur"][200.0] = ["/ALEPH_2004_S5765862/d163-x01-y01"]
 analyses["EventShapes"]["y23_dur"][206.0] = ["/ALEPH_2004_S5765862/d164-x01-y01"]
 # y34                           
 analyses["EventShapes"]["y34_dur"][35.0 ] = ["/JADE_OPAL_2000_S4300807/d24-x01-y02"]
 analyses["EventShapes"]["y34_dur"][44.0 ] = ["/JADE_OPAL_2000_S4300807/d25-x01-y02"]
 analyses["EventShapes"]["y34_dur"][91.2 ] = ["/ALEPH_2004_S5765862/d165-x01-y01","/JADE_OPAL_2000_S4300807/d26-x01-y02",
                                              "/DELPHI_1996_S3430090/d29-x01-y01"]
 analyses["EventShapes"]["y34_dur"][133.0] = ["/ALEPH_2004_S5765862/d166-x01-y01","/JADE_OPAL_2000_S4300807/d27-x01-y02"]
 analyses["EventShapes"]["y34_dur"][161.0] = ["/ALEPH_2004_S5765862/d167-x01-y01","/JADE_OPAL_2000_S4300807/d28-x01-y02"]
 analyses["EventShapes"]["y34_dur"][172.0] = ["/ALEPH_2004_S5765862/d168-x01-y01","/JADE_OPAL_2000_S4300807/d29-x01-y02"]
 analyses["EventShapes"]["y34_dur"][183.0] = ["/ALEPH_2004_S5765862/d169-x01-y01","/JADE_OPAL_2000_S4300807/d30-x01-y02"]
 analyses["EventShapes"]["y34_dur"][189.0] = ["/ALEPH_2004_S5765862/d170-x01-y01","/JADE_OPAL_2000_S4300807/d31-x01-y02"]
 analyses["EventShapes"]["y34_dur"][206.0] = ["/ALEPH_2004_S5765862/d172-x01-y01"]
 # y45                           
 analyses["EventShapes"]["y45_dur"][35.0 ] = ["/JADE_OPAL_2000_S4300807/d24-x01-y03"]
 analyses["EventShapes"]["y45_dur"][44.0 ] = ["/JADE_OPAL_2000_S4300807/d25-x01-y03"]
 analyses["EventShapes"]["y45_dur"][91.2 ] = ["/ALEPH_2004_S5765862/d173-x01-y01","/JADE_OPAL_2000_S4300807/d26-x01-y03",
                                              "/DELPHI_1996_S3430090/d31-x01-y01"]
 analyses["EventShapes"]["y45_dur"][133.0] = ["/ALEPH_2004_S5765862/d174-x01-y01","/JADE_OPAL_2000_S4300807/d27-x01-y03"]
 analyses["EventShapes"]["y45_dur"][161.0] = ["/ALEPH_2004_S5765862/d175-x01-y01","/JADE_OPAL_2000_S4300807/d28-x01-y03"]
 analyses["EventShapes"]["y45_dur"][172.0] = ["/ALEPH_2004_S5765862/d176-x01-y01","/JADE_OPAL_2000_S4300807/d29-x01-y03"]
 analyses["EventShapes"]["y45_dur"][183.0] = ["/ALEPH_2004_S5765862/d177-x01-y01","/JADE_OPAL_2000_S4300807/d30-x01-y03"]
 analyses["EventShapes"]["y45_dur"][189.0] = ["/ALEPH_2004_S5765862/d178-x01-y01","/JADE_OPAL_2000_S4300807/d31-x01-y03"]
 analyses["EventShapes"]["y45_dur"][200.0] = ["/ALEPH_2004_S5765862/d179-x01-y01"]
 # y56                           
 analyses["EventShapes"]["y56_dur"][35.0 ] = ["/JADE_OPAL_2000_S4300807/d24-x01-y04"]
 analyses["EventShapes"]["y56_dur"][44.0 ] = ["/JADE_OPAL_2000_S4300807/d25-x01-y04"]
 analyses["EventShapes"]["y56_dur"][91.2 ] = ["/ALEPH_2004_S5765862/d180-x01-y01","/JADE_OPAL_2000_S4300807/d26-x01-y04"]
 analyses["EventShapes"]["y56_dur"][133.0] = ["/ALEPH_2004_S5765862/d181-x01-y01","/JADE_OPAL_2000_S4300807/d27-x01-y04"]
 analyses["EventShapes"]["y56_dur"][161.0] = ["/ALEPH_2004_S5765862/d182-x01-y01","/JADE_OPAL_2000_S4300807/d28-x01-y04"]
 analyses["EventShapes"]["y56_dur"][172.0] = ["/ALEPH_2004_S5765862/d183-x01-y01","/JADE_OPAL_2000_S4300807/d29-x01-y04"]
 analyses["EventShapes"]["y56_dur"][183.0] = ["/ALEPH_2004_S5765862/d184-x01-y01","/JADE_OPAL_2000_S4300807/d30-x01-y04"]
 analyses["EventShapes"]["y56_dur"][189.0] = ["/ALEPH_2004_S5765862/d185-x01-y01","/JADE_OPAL_2000_S4300807/d31-x01-y04"]
 analyses["EventShapes"]["y56_dur"][200.0] = ["/ALEPH_2004_S5765862/d186-x01-y01"]
 # jade scheme
 analyses["EventShapes"]["y23_jade"][57.7 ] = ["/AMY_1995_I406129/d02-x01-y01","/AMY_1995_I406129/d03-x01-y01",
                                               "/AMY_1995_I406129/d04-x01-y01","/AMY_1995_I406129/d06-x01-y01"]
 analyses["EventShapes"]["y23_jade"][91.2 ] = ["/DELPHI_1996_S3430090/d28-x01-y01"]
 analyses["EventShapes"]["y34_jade"][91.2 ] = ["/DELPHI_1996_S3430090/d30-x01-y01"]
 analyses["EventShapes"]["y45_jade"][91.2 ] = ["/DELPHI_1996_S3430090/d32-x01-y01"]
 # jet fractions
 # 1 jet
 analyses["EventShapes"]["1jet_dur"][91.2 ] = ["/ALEPH_2004_S5765862/d187-x01-y01"]
 analyses["EventShapes"]["1jet_dur"][133.0] = ["/ALEPH_2004_S5765862/d188-x01-y01"]
 analyses["EventShapes"]["1jet_dur"][161.0] = ["/ALEPH_2004_S5765862/d189-x01-y01"]
 analyses["EventShapes"]["1jet_dur"][172.0] = ["/ALEPH_2004_S5765862/d190-x01-y01"]
 analyses["EventShapes"]["1jet_dur"][183.0] = ["/ALEPH_2004_S5765862/d191-x01-y01"]
 analyses["EventShapes"]["1jet_dur"][189.0] = ["/ALEPH_2004_S5765862/d192-x01-y01"]
 analyses["EventShapes"]["1jet_dur"][200.0] = ["/ALEPH_2004_S5765862/d193-x01-y01"]
 analyses["EventShapes"]["1jet_dur"][206.0] = ["/ALEPH_2004_S5765862/d194-x01-y01"]
 # 2 jet
 analyses["EventShapes"]["2jet_dur"][35.0 ] = ["/JADE_OPAL_2000_S4300807/d16-x01-y01"]
 analyses["EventShapes"]["2jet_dur"][44.0 ] = ["/JADE_OPAL_2000_S4300807/d17-x01-y01"]
 analyses["EventShapes"]["2jet_dur"][91.2 ] = ["/ALEPH_2004_S5765862/d195-x01-y01","/JADE_OPAL_2000_S4300807/d18-x01-y01"]
 analyses["EventShapes"]["2jet_dur"][133.0] = ["/ALEPH_2004_S5765862/d196-x01-y01","/JADE_OPAL_2000_S4300807/d19-x01-y01"]
 analyses["EventShapes"]["2jet_dur"][161.0] = ["/ALEPH_2004_S5765862/d197-x01-y01","/JADE_OPAL_2000_S4300807/d20-x01-y01"]
 analyses["EventShapes"]["2jet_dur"][172.0] = ["/ALEPH_2004_S5765862/d198-x01-y01","/JADE_OPAL_2000_S4300807/d21-x01-y01"]
 analyses["EventShapes"]["2jet_dur"][183.0] = ["/ALEPH_2004_S5765862/d199-x01-y01","/JADE_OPAL_2000_S4300807/d22-x01-y01"]
 analyses["EventShapes"]["2jet_dur"][189.0] = ["/ALEPH_2004_S5765862/d200-x01-y01","/JADE_OPAL_2000_S4300807/d23-x01-y01"]
 analyses["EventShapes"]["2jet_dur"][200.0] = ["/ALEPH_2004_S5765862/d201-x01-y01"]
 analyses["EventShapes"]["2jet_dur"][206.0] = ["/ALEPH_2004_S5765862/d202-x01-y01"]
 # 3 jet
 analyses["EventShapes"]["3jet_dur"][35.0 ] = ["/JADE_OPAL_2000_S4300807/d16-x01-y02"]
 analyses["EventShapes"]["3jet_dur"][44.0 ] = ["/JADE_OPAL_2000_S4300807/d17-x01-y02"]
 analyses["EventShapes"]["3jet_dur"][91.2 ] = ["/ALEPH_2004_S5765862/d203-x01-y01","/JADE_OPAL_2000_S4300807/d18-x01-y02"]
 analyses["EventShapes"]["3jet_dur"][133.0] = ["/ALEPH_2004_S5765862/d204-x01-y01","/JADE_OPAL_2000_S4300807/d19-x01-y02"]
 analyses["EventShapes"]["3jet_dur"][161.0] = ["/ALEPH_2004_S5765862/d205-x01-y01","/JADE_OPAL_2000_S4300807/d20-x01-y02"]
 analyses["EventShapes"]["3jet_dur"][172.0] = ["/ALEPH_2004_S5765862/d206-x01-y01","/JADE_OPAL_2000_S4300807/d21-x01-y02"]
 analyses["EventShapes"]["3jet_dur"][183.0] = ["/ALEPH_2004_S5765862/d207-x01-y01","/JADE_OPAL_2000_S4300807/d22-x01-y02"]
 analyses["EventShapes"]["3jet_dur"][189.0] = ["/ALEPH_2004_S5765862/d208-x01-y01","/JADE_OPAL_2000_S4300807/d23-x01-y02"]
 analyses["EventShapes"]["3jet_dur"][200.0] = ["/ALEPH_2004_S5765862/d209-x01-y01"]
 analyses["EventShapes"]["3jet_dur"][206.0] = ["/ALEPH_2004_S5765862/d210-x01-y01"]
 # 4 jet
 analyses["EventShapes"]["4jet_dur"][35.0 ] = ["/JADE_OPAL_2000_S4300807/d16-x01-y03"]
 analyses["EventShapes"]["4jet_dur"][44.0 ] = ["/JADE_OPAL_2000_S4300807/d17-x01-y03"]
 analyses["EventShapes"]["4jet_dur"][91.2 ] = ["/ALEPH_2004_S5765862/d211-x01-y01","/JADE_OPAL_2000_S4300807/d18-x01-y03"]
 analyses["EventShapes"]["4jet_dur"][133.0] = ["/ALEPH_2004_S5765862/d212-x01-y01","/JADE_OPAL_2000_S4300807/d19-x01-y03"]
 analyses["EventShapes"]["4jet_dur"][161.0] = ["/ALEPH_2004_S5765862/d213-x01-y01","/JADE_OPAL_2000_S4300807/d20-x01-y03"]
 analyses["EventShapes"]["4jet_dur"][172.0] = ["/ALEPH_2004_S5765862/d214-x01-y01","/JADE_OPAL_2000_S4300807/d21-x01-y03"]
 analyses["EventShapes"]["4jet_dur"][183.0] = ["/ALEPH_2004_S5765862/d215-x01-y01","/JADE_OPAL_2000_S4300807/d22-x01-y03"]
 analyses["EventShapes"]["4jet_dur"][189.0] = ["/ALEPH_2004_S5765862/d216-x01-y01","/JADE_OPAL_2000_S4300807/d23-x01-y03"]
 analyses["EventShapes"]["4jet_dur"][200.0] = ["/ALEPH_2004_S5765862/d217-x01-y01"]
 analyses["EventShapes"]["4jet_dur"][206.0] = ["/ALEPH_2004_S5765862/d218-x01-y01"]
 # 5 jet
 analyses["EventShapes"]["5jet_dur"][35.0 ] = ["/JADE_OPAL_2000_S4300807/d16-x01-y04"]
 analyses["EventShapes"]["5jet_dur"][44.0 ] = ["/JADE_OPAL_2000_S4300807/d17-x01-y04"]
 analyses["EventShapes"]["5jet_dur"][91.2 ] = ["/ALEPH_2004_S5765862/d219-x01-y01","/JADE_OPAL_2000_S4300807/d18-x01-y04"]
 analyses["EventShapes"]["5jet_dur"][133.0] = ["/ALEPH_2004_S5765862/d220-x01-y01","/JADE_OPAL_2000_S4300807/d19-x01-y04"]
 analyses["EventShapes"]["5jet_dur"][161.0] = ["/ALEPH_2004_S5765862/d221-x01-y01","/JADE_OPAL_2000_S4300807/d20-x01-y04"]
 analyses["EventShapes"]["5jet_dur"][172.0] = ["/ALEPH_2004_S5765862/d222-x01-y01","/JADE_OPAL_2000_S4300807/d21-x01-y04"]
 analyses["EventShapes"]["5jet_dur"][183.0] = ["/ALEPH_2004_S5765862/d223-x01-y01","/JADE_OPAL_2000_S4300807/d22-x01-y04"]
 analyses["EventShapes"]["5jet_dur"][189.0] = ["/ALEPH_2004_S5765862/d224-x01-y01","/JADE_OPAL_2000_S4300807/d23-x01-y04"]
 analyses["EventShapes"]["5jet_dur"][200.0] = ["/ALEPH_2004_S5765862/d225-x01-y01"]
 analyses["EventShapes"]["5jet_dur"][206.0] = ["/ALEPH_2004_S5765862/d226-x01-y01"]
 # 6 jet                                       
 analyses["EventShapes"]["6jet_dur"][35.0 ] = ["/JADE_OPAL_2000_S4300807/d16-x01-y05"]
 analyses["EventShapes"]["6jet_dur"][44.0 ] = ["/JADE_OPAL_2000_S4300807/d17-x01-y05"]
 analyses["EventShapes"]["6jet_dur"][91.2 ] = ["/ALEPH_2004_S5765862/d227-x01-y01","/JADE_OPAL_2000_S4300807/d18-x01-y05"]
 analyses["EventShapes"]["6jet_dur"][133.0] = ["/ALEPH_2004_S5765862/d228-x01-y01","/JADE_OPAL_2000_S4300807/d19-x01-y05"]
 analyses["EventShapes"]["6jet_dur"][161.0] = ["/ALEPH_2004_S5765862/d229-x01-y01","/JADE_OPAL_2000_S4300807/d20-x01-y05"]
 analyses["EventShapes"]["6jet_dur"][172.0] = ["/ALEPH_2004_S5765862/d230-x01-y01","/JADE_OPAL_2000_S4300807/d21-x01-y05"]
 analyses["EventShapes"]["6jet_dur"][183.0] = ["/ALEPH_2004_S5765862/d231-x01-y01","/JADE_OPAL_2000_S4300807/d22-x01-y05"]
 analyses["EventShapes"]["6jet_dur"][189.0] = ["/ALEPH_2004_S5765862/d232-x01-y01","/JADE_OPAL_2000_S4300807/d23-x01-y05"]
 analyses["EventShapes"]["6jet_dur"][200.0] = ["/ALEPH_2004_S5765862/d233-x01-y01"]
 analyses["EventShapes"]["6jet_dur"][206.0] = ["/ALEPH_2004_S5765862/d234-x01-y01"]
 # four jet angles
 analyses["FourJet"]["BZ"     ][91.2] = ["/OPAL_2001_S4553896/d03-x01-y01"]
 analyses["FourJet"]["KSW"    ][91.2] = ["/OPAL_2001_S4553896/d04-x01-y01"]
 analyses["FourJet"]["NR"     ][91.2] = ["/OPAL_2001_S4553896/d05-x01-y01"]
 analyses["FourJet"]["alpha34"][91.2] = ["/OPAL_2001_S4553896/d06-x01-y01"]
 # EEC
 analyses["EventShapes"]["EEC" ][7.7 ] = ["/PLUTO_1981_I156315/d01-x01-y01"]
 analyses["EventShapes"]["EEC" ][9.4 ] = ["/PLUTO_1981_I156315/d01-x01-y02"]
 analyses["EventShapes"]["EEC" ][12.0] = ["/PLUTO_1981_I156315/d01-x01-y03"]
 analyses["EventShapes"]["EEC" ][13.0] = ["/PLUTO_1981_I156315/d01-x01-y04"]
 analyses["EventShapes"]["EEC" ][14.0] = ["/TASSO_1987_I248660/d01-x01-y01","/JADE_1984_I202784/d01-x01-y01"]
 analyses["EventShapes"]["EEC" ][17.0] = ["/PLUTO_1981_I156315/d01-x01-y05"]
 analyses["EventShapes"]["EEC" ][22.0] = ["/TASSO_1987_I248660/d02-x01-y01","/JADE_1984_I202784/d01-x01-y02",
                                          "/CELLO_1982_I12010/d01-x01-y01","/PLUTO_1981_I156315/d01-x01-y06"]
 analyses["EventShapes"]["EEC" ][27.6] = ["/PLUTO_1981_I156315/d01-x01-y07"]
 analyses["EventShapes"]["EEC" ][29.0] = ["/MAC_1985_I202924/d01-x01-y01","/MAC_1985_I202924/d01-x01-y02"]
 analyses["EventShapes"]["EEC" ][30.8] = ["/PLUTO_1981_I156315/d01-x01-y08"]
 analyses["EventShapes"]["EEC" ][34.0] = ["/JADE_1984_I202784/d01-x01-y03","/CELLO_1982_I12010/d01-x01-y02"]
 analyses["EventShapes"]["EEC" ][34.6] = ["/PLUTO_1985_I215869/d01-x01-y01"]
 analyses["EventShapes"]["EEC" ][34.8] = ["/TASSO_1987_I248660/d03-x01-y01"]
 analyses["EventShapes"]["EEC" ][43.5] = ["/TASSO_1987_I248660/d04-x01-y01"]
 analyses["EventShapes"]["EEC" ][53.3] = ["/TOPAZ_1989_I279575/d01-x01-y01","/TOPAZ_1989_I279575/d01-x01-y02"]
 analyses["EventShapes"]["EEC" ][91.2] = ["/DELPHI_1996_S3430090/d33-x01-y01"]
 analyses["EventShapes"]["EEC" ][59.5] = ["/TOPAZ_1989_I279575/d02-x01-y01","/TOPAZ_1989_I279575/d02-x01-y02"]
 # AEEC 
 analyses["EventShapes"]["AEEC"][8.65] = ["/PLUTO_1981_I156315/d04-x01-y01"]
 analyses["EventShapes"]["AEEC"][14.0] = ["/JADE_1984_I202784/d02-x01-y01"]
 analyses["EventShapes"]["AEEC"][22.0] = ["/JADE_1984_I202784/d02-x01-y02","/CELLO_1982_I12010/d03-x01-y01"]
 analyses["EventShapes"]["AEEC"][29.0] = ["/MAC_1985_I202924/d01-x01-y03"]
 analyses["EventShapes"]["AEEC"][30.8] = ["/PLUTO_1981_I156315/d05-x01-y01"]
 analyses["EventShapes"]["AEEC"][34.0] = ["/JADE_1984_I202784/d02-x01-y03","/CELLO_1982_I12010/d03-x01-y02"]
 analyses["EventShapes"]["AEEC"][53.3] = ["/TOPAZ_1989_I279575/d01-x01-y03"]
 analyses["EventShapes"]["AEEC"][59.5] = ["/TOPAZ_1989_I279575/d02-x01-y03"]
 analyses["EventShapes"]["AEEC"][91.2] = ["/DELPHI_1996_S3430090/d34-x01-y01"]
 # sphericity based 
+analyses["EventShapes"]["S"][9.98 ] = ["/ARGUS_1986_I227324/d01-x01-y02"]
 analyses["EventShapes"]["S"][12.0 ] = ["/TASSO_1980_I153511/d01-x01-y01"]
 analyses["EventShapes"]["S"][14.0 ] = ["/TASSO_1990_S2148048/d06-x01-y01"]
 analyses["EventShapes"]["S"][22.0 ] = ["/TASSO_1990_S2148048/d06-x01-y02"]
 analyses["EventShapes"]["S"][29.0 ] = ["/HRS_1985_I201482/d01-x01-y01"]
 analyses["EventShapes"]["S"][30.8 ] = ["/TASSO_1980_I153511/d02-x01-y01"]
 analyses["EventShapes"]["S"][35.0 ] = ["/TASSO_1990_S2148048/d06-x01-y03","/TASSO_1988_I263859/d01-x01-y01"]
 analyses["EventShapes"]["S"][44.0 ] = ["/TASSO_1990_S2148048/d06-x01-y04"]
 analyses["EventShapes"]["S"][45.0 ] = ["/DELPHI_2003_I620250/d04-x01-y01"]
 analyses["EventShapes"]["S"][55.2 ] = ["/AMY_1990_I283337/d16-x01-y01"]
 analyses["EventShapes"]["S"][66.0 ] = ["/DELPHI_2003_I620250/d04-x01-y02"]
 analyses["EventShapes"]["S"][76.0 ] = ["/DELPHI_2003_I620250/d04-x01-y03"]
 analyses["EventShapes"]["S"][91.2 ] = ["/ALEPH_2004_S5765862/d141-x01-y01","/DELPHI_1996_S3430090/d15-x01-y01",
                                        "/ALEPH_1996_S3486095/d01-x01-y01","/OPAL_2004_S6132243/d10-x01-y01"]
-analyses["EventShapes"]["S"][133.0] = ["/ALEPH_2004_S5765862/d142-x01-y01","/OPAL_2004_S6132243/d10-x01-y02"]
-analyses["EventShapes"]["S"][161.0] = ["/ALEPH_2004_S5765862/d143-x01-y01"]
-analyses["EventShapes"]["S"][172.0] = ["/ALEPH_2004_S5765862/d144-x01-y01"]
+analyses["EventShapes"]["S"][133.0] = ["/ALEPH_2004_S5765862/d142-x01-y01","/OPAL_2004_S6132243/d10-x01-y02",
+                                       "/DELPHI_1999_I499183/d21-x01-y01"]
+analyses["EventShapes"]["S"][161.0] = ["/ALEPH_2004_S5765862/d143-x01-y01","/DELPHI_1999_I499183/d21-x01-y02",
+                                       "/OPAL_1997_I440721/d07-x01-y01"]
+analyses["EventShapes"]["S"][172.0] = ["/ALEPH_2004_S5765862/d144-x01-y01","/DELPHI_1999_I499183/d21-x01-y03",
+                                       "/OPAL_2000_I513476/d08-x01-y01"]
 analyses["EventShapes"]["S"][177.0] = ["/OPAL_2004_S6132243/d10-x01-y03"]
-analyses["EventShapes"]["S"][183.0] = ["/DELPHI_2003_I620250/d66-x01-y01","/ALEPH_2004_S5765862/d145-x01-y01"]
-analyses["EventShapes"]["S"][189.0] = ["/DELPHI_2003_I620250/d66-x01-y02","/ALEPH_2004_S5765862/d146-x01-y01"]
+analyses["EventShapes"]["S"][183.0] = ["/DELPHI_2003_I620250/d66-x01-y01","/ALEPH_2004_S5765862/d145-x01-y01",
+                                       "/DELPHI_1999_I499183/d22-x01-y01", "/OPAL_2000_I513476/d08-x01-y02"]
+analyses["EventShapes"]["S"][189.0] = ["/DELPHI_2003_I620250/d66-x01-y02","/ALEPH_2004_S5765862/d146-x01-y01",
+                                       "/OPAL_2000_I513476/d08-x01-y03"]
 analyses["EventShapes"]["S"][192.0] = ["/DELPHI_2003_I620250/d66-x01-y03"]
 analyses["EventShapes"]["S"][196.0] = ["/DELPHI_2003_I620250/d66-x01-y04"]
 analyses["EventShapes"]["S"][197.0] = ["/OPAL_2004_S6132243/d10-x01-y04"]
 analyses["EventShapes"]["S"][200.0] = ["/DELPHI_2003_I620250/d67-x01-y01","/ALEPH_2004_S5765862/d147-x01-y01"]
 analyses["EventShapes"]["S"][202.0] = ["/DELPHI_2003_I620250/d67-x01-y02"]
 analyses["EventShapes"]["S"][205.0] = ["/DELPHI_2003_I620250/d67-x01-y03"]
 analyses["EventShapes"]["S"][206.0] = ["/ALEPH_2004_S5765862/d148-x01-y01"]
 analyses["EventShapes"]["S"][207.0] = ["/DELPHI_2003_I620250/d67-x01-y04"]
 
 analyses["EventShapes"]["P"][45.0 ] = ["/DELPHI_2003_I620250/d05-x01-y01"]
 analyses["EventShapes"]["P"][66.0 ] = ["/DELPHI_2003_I620250/d05-x01-y02"]
 analyses["EventShapes"]["P"][76.0 ] = ["/DELPHI_2003_I620250/d05-x01-y03"]
 analyses["EventShapes"]["P"][91.2 ] = ["/DELPHI_1996_S3430090/d17-x01-y01"]
-analyses["EventShapes"]["P"][133.0] = ["/ALEPH_2004_S5765862/d126-x01-y01"]
-analyses["EventShapes"]["P"][161.0] = ["/ALEPH_2004_S5765862/d127-x01-y01"]
-analyses["EventShapes"]["P"][172.0] = ["/ALEPH_2004_S5765862/d128-x01-y01"]
-analyses["EventShapes"]["P"][183.0] = ["/DELPHI_2003_I620250/d68-x01-y01","/ALEPH_2004_S5765862/d129-x01-y01"]
+analyses["EventShapes"]["P"][133.0] = ["/ALEPH_2004_S5765862/d126-x01-y01","/DELPHI_1999_I499183/d23-x01-y01"]
+analyses["EventShapes"]["P"][161.0] = ["/ALEPH_2004_S5765862/d127-x01-y01","/DELPHI_1999_I499183/d23-x01-y02"]
+analyses["EventShapes"]["P"][172.0] = ["/ALEPH_2004_S5765862/d128-x01-y01","/DELPHI_1999_I499183/d23-x01-y03"]
+analyses["EventShapes"]["P"][183.0] = ["/DELPHI_2003_I620250/d68-x01-y01","/ALEPH_2004_S5765862/d129-x01-y01",
+                                       "/DELPHI_1999_I499183/d24-x01-y01"]
 analyses["EventShapes"]["P"][189.0] = ["/DELPHI_2003_I620250/d68-x01-y02","/ALEPH_2004_S5765862/d130-x01-y01"]
 analyses["EventShapes"]["P"][192.0] = ["/DELPHI_2003_I620250/d68-x01-y03"]
 analyses["EventShapes"]["P"][196.0] = ["/DELPHI_2003_I620250/d68-x01-y04"]
 analyses["EventShapes"]["P"][200.0] = ["/DELPHI_2003_I620250/d69-x01-y01","/ALEPH_2004_S5765862/d131-x01-y01"]
 analyses["EventShapes"]["P"][202.0] = ["/DELPHI_2003_I620250/d69-x01-y02"]
 analyses["EventShapes"]["P"][205.0] = ["/DELPHI_2003_I620250/d69-x01-y03"]
 analyses["EventShapes"]["P"][206.0] = ["/ALEPH_2004_S5765862/d132-x01-y01"]
 analyses["EventShapes"]["P"][207.0] = ["/DELPHI_2003_I620250/d69-x01-y04"]
 
 analyses["EventShapes"]["A"][12.0 ] = ["/TASSO_1980_I153511/d03-x01-y01"]
 analyses["EventShapes"]["A"][14.0 ] = ["/TASSO_1990_S2148048/d07-x01-y01"]
 analyses["EventShapes"]["A"][22.0 ] = ["/TASSO_1990_S2148048/d07-x01-y02","/HRS_1985_I201482/d06-x01-y01"]
 analyses["EventShapes"]["A"][30.8 ] = ["/TASSO_1980_I153511/d04-x01-y01"]
 analyses["EventShapes"]["A"][35.0 ] = ["/TASSO_1990_S2148048/d07-x01-y03","/TASSO_1988_I263859/d02-x01-y01"]
 analyses["EventShapes"]["A"][44.0 ] = ["/TASSO_1990_S2148048/d07-x01-y04"]
 analyses["EventShapes"]["A"][55.2 ] = ["/AMY_1990_I283337/d17-x01-y01"]
 analyses["EventShapes"]["A"][91.2 ] = ["/ALEPH_2004_S5765862/d118-x01-y01","/DELPHI_1996_S3430090/d16-x01-y01",
                                        "/ALEPH_1996_S3486095/d02-x01-y01","/OPAL_2004_S6132243/d09-x01-y01"]
-analyses["EventShapes"]["A"][133.0] = ["/ALEPH_2004_S5765862/d119-x01-y01","/OPAL_2004_S6132243/d09-x01-y02"]
-analyses["EventShapes"]["A"][161.0] = ["/ALEPH_2004_S5765862/d120-x01-y01"]
-analyses["EventShapes"]["A"][172.0] = ["/ALEPH_2004_S5765862/d121-x01-y01"]
+analyses["EventShapes"]["A"][133.0] = ["/ALEPH_2004_S5765862/d119-x01-y01","/OPAL_2004_S6132243/d09-x01-y02",
+                                       "/DELPHI_1999_I499183/d25-x01-y01"]
+analyses["EventShapes"]["A"][161.0] = ["/ALEPH_2004_S5765862/d120-x01-y01","/DELPHI_1999_I499183/d25-x01-y02",
+                                       "/OPAL_1997_I440721/d08-x01-y01"]
+analyses["EventShapes"]["A"][172.0] = ["/ALEPH_2004_S5765862/d121-x01-y01","/DELPHI_1999_I499183/d25-x01-y03",
+                                       "/OPAL_2000_I513476/d04-x01-y01"]
 analyses["EventShapes"]["A"][177.0] = ["/OPAL_2004_S6132243/d09-x01-y03"]
-analyses["EventShapes"]["A"][183.0] = ["/DELPHI_2003_I620250/d70-x01-y01","/ALEPH_2004_S5765862/d122-x01-y01"]
-analyses["EventShapes"]["A"][189.0] = ["/DELPHI_2003_I620250/d70-x01-y02","/ALEPH_2004_S5765862/d123-x01-y01"]
+analyses["EventShapes"]["A"][183.0] = ["/DELPHI_2003_I620250/d70-x01-y01","/ALEPH_2004_S5765862/d122-x01-y01",
+                                       "/DELPHI_1999_I499183/d26-x01-y01","/OPAL_2000_I513476/d04-x01-y02"]
+analyses["EventShapes"]["A"][189.0] = ["/DELPHI_2003_I620250/d70-x01-y02","/ALEPH_2004_S5765862/d123-x01-y01",
+                                       "/OPAL_2000_I513476/d04-x01-y03"]
 analyses["EventShapes"]["A"][192.0] = ["/DELPHI_2003_I620250/d70-x01-y03"]
 analyses["EventShapes"]["A"][196.0] = ["/DELPHI_2003_I620250/d70-x01-y04"]
 analyses["EventShapes"]["A"][197.0] = ["/OPAL_2004_S6132243/d09-x01-y04"]
 analyses["EventShapes"]["A"][200.0] = ["/DELPHI_2003_I620250/d71-x01-y01","/ALEPH_2004_S5765862/d124-x01-y01"]
 analyses["EventShapes"]["A"][202.0] = ["/DELPHI_2003_I620250/d71-x01-y02"]
 analyses["EventShapes"]["A"][205.0] = ["/DELPHI_2003_I620250/d71-x01-y03"]
 analyses["EventShapes"]["A"][206.0] = ["/ALEPH_2004_S5765862/d125-x01-y01"]
 analyses["EventShapes"]["A"][207.0] = ["/DELPHI_2003_I620250/d71-x01-y04"]
 # other
 analyses["EventShapes"]["Qx" ][55.2] = ["/AMY_1990_I283337/d18-x01-y01"]
 analyses["EventShapes"]["Q21"][55.2] = ["/AMY_1990_I283337/d19-x01-y01"]
 
 analyses["QED"] = ["/ALEPH_1996_S3196992/d03-x01-y01","/ALEPH_1996_S3196992/d04-x01-y01",
                    "/ALEPH_1996_S3196992/d01-x01-y01","/ALEPH_1996_S3196992/d02-x01-y01",
                    "/ALEPH_1996_S3196992/d05-x01-y01","/ALEPH_1996_S3196992/d06-x01-y01",
                    "/ALEPH_1996_S3196992/d07-x01-y01","/ALEPH_1996_S3196992/d08-x01-y01",
                    "/OPAL_1993_S2692198/d01-x01-y01","/OPAL_1993_S2692198/d02-x01-y01",
                    "/OPAL_1993_S2692198/d03-x01-y01","/OPAL_1993_S2692198/d03-x01-y02",
                    "/OPAL_1993_S2692198/d03-x01-y03","/OPAL_1993_S2692198/d03-x01-y04",
                    "/OPAL_1993_S2692198/d04-x01-y01","/OPAL_1993_S2692198/d04-x01-y02",
                    "/OPAL_1993_S2692198/d04-x01-y03","/OPAL_1993_S2692198/d04-x01-y04",]
 # tau decays
 # 2 body
+analyses["TauDecays"]["1pi"  ]["MC"  ] = ["/MC_TAU_Decay/h_1B_xpi"]
 analyses["TauDecays"]["KK"   ]["data"] = ["/BABAR_2018_I1679886/d01-x01-y01"]
 analyses["TauDecays"]["KK"   ]["MC"  ] = ["/MC_TAU_Decay/h_2B_m2KK","/MC_TAU_Decay/h_2B_mKK"]
 analyses["TauDecays"]["Kpi"  ]["data"] = ["/BELLE_2007_I753243/d01-x01-y01"]
 analyses["TauDecays"]["Kpi"  ]["MC"  ] = ["/MC_TAU_Decay/h_2B_m2KpiA","/MC_TAU_Decay/h_2B_m2KpiB",
                                           "/MC_TAU_Decay/h_2B_mKpiA","/MC_TAU_Decay/h_2B_mKpiB"]
 analyses["TauDecays"]["2pi"  ]["data"] = ["/BELLE_2008_I786560/d01-x01-y01","/ALEPH_2014_I1267648/d01-x01-y01",
                                           "/CLEO_1999_I508944/d01-x01-y01"]
 analyses["TauDecays"]["2pi"  ]["MC"  ] = ["/MC_TAU_Decay/h_2B_m2pipi","/MC_TAU_Decay/h_2B_mpipi"]
 analyses["TauDecays"]["3pi"  ]["data"] = ["/BELLE_2010_I841618/d01-x01-y01","/BABAR_2007_S7266081/d01-x01-y01",
                                           "/BABAR_2007_S7266081/d02-x01-y01","/BABAR_2007_S7266081/d11-x01-y01",
                                           "/ALEPH_2014_I1267648/d02-x01-y01","/ALEPH_2014_I1267648/d04-x01-y01"]
 analyses["TauDecays"]["3pi"  ]["MC"  ] = ["/MC_TAU_Decay/h_3B_pi0pi0pim_1","/MC_TAU_Decay/h_3B_pi0pi0pim_2","/MC_TAU_Decay/h_3B_pi0pi0pim_3",
                                           "/MC_TAU_Decay/h_3B_pippimpim_1","/MC_TAU_Decay/h_3B_pippimpim_2","/MC_TAU_Decay/h_3B_pippimpim_3"]
 analyses["TauDecays"]["Kpipi"]["data"] = ["/BELLE_2010_I841618/d02-x01-y01" ,"/BABAR_2007_S7266081/d03-x01-y01",
                                           "/BABAR_2007_S7266081/d04-x01-y01","/BABAR_2007_S7266081/d05-x01-y01",
                                           "/BABAR_2007_S7266081/d12-x01-y01"]
 analyses["TauDecays"]["Kpipi"]["MC"  ]  = ["/MC_TAU_Decay/h_3B_pi0pi0km_1","/MC_TAU_Decay/h_3B_pi0pi0km_2","/MC_TAU_Decay/h_3B_pi0pi0km_3",
                                            "/MC_TAU_Decay/h_3B_pimk0pi0_1","/MC_TAU_Decay/h_3B_pimk0pi0_2","/MC_TAU_Decay/h_3B_pimk0pi0_3",
                                            "/MC_TAU_Decay/h_3B_pimk0pi0_4"]
 analyses["TauDecays"]["KKpi" ]["data"] = ["/BELLE_2010_I841618/d03-x01-y01","/BABAR_2007_S7266081/d06-x01-y01",
                                           "/BABAR_2007_S7266081/d07-x01-y01","/BABAR_2007_S7266081/d08-x01-y01",
                                           "/BABAR_2007_S7266081/d13-x01-y01"]
 analyses["TauDecays"]["KKpi" ]["MC"  ] = ["/MC_TAU_Decay/h_3B_klpimkl_1","/MC_TAU_Decay/h_3B_klpimkl_2","/MC_TAU_Decay/h_3B_klpimkl_3",
                                           "/MC_TAU_Decay/h_3B_kmpi0k0_1","/MC_TAU_Decay/h_3B_kmpi0k0_2","/MC_TAU_Decay/h_3B_kmpi0k0_3",
                                           "/MC_TAU_Decay/h_3B_kmpi0k0_4","/MC_TAU_Decay/h_3B_kmpimkp_1","/MC_TAU_Decay/h_3B_kmpimkp_2",
                                           "/MC_TAU_Decay/h_3B_kmpimkp_3","/MC_TAU_Decay/h_3B_kmpimkp_4","/MC_TAU_Decay/h_3B_kmpimpip_1",
                                           "/MC_TAU_Decay/h_3B_kmpimpip_2","/MC_TAU_Decay/h_3B_kmpimpip_3","/MC_TAU_Decay/h_3B_kmpimpip_4",
                                           "/MC_TAU_Decay/h_3B_kspimkl_1","/MC_TAU_Decay/h_3B_kspimkl_2","/MC_TAU_Decay/h_3B_kspimkl_3",
                                           "/MC_TAU_Decay/h_3B_kspimkl_4","/MC_TAU_Decay/h_3B_kspimks_1","/MC_TAU_Decay/h_3B_kspimks_2",
                                           "/MC_TAU_Decay/h_3B_kspimks_3"]
 analyses["TauDecays"]["3K"   ]["data"] = ["/BELLE_2010_I841618/d04-x01-y01","/BABAR_2007_S7266081/d09-x01-y01",
                                           "/BABAR_2007_S7266081/d10-x01-y01","/BABAR_2007_S7266081/d14-x01-y01"]
 analyses["TauDecays"]["Keta"]["MC"  ] = ["/MC_TAU_Decay/h_2B_m2Keta","/MC_TAU_Decay/h_2B_mKeta"]
 analyses["TauDecays"]["lnu" ]["MC"  ] = ["/MC_TAU_Decay/h_2B_m2enu","/MC_TAU_Decay/h_2B_m2munu",
                                          "/MC_TAU_Decay/h_2B_menu","/MC_TAU_Decay/h_2B_mmunu"]
 analyses["TauDecays"]["2pieta"]["MC"  ] = ["/MC_TAU_Decay/h_3B_pimpi0eta_1","/MC_TAU_Decay/h_3B_pimpi0eta_2",
                                            "/MC_TAU_Decay/h_3B_pimpi0eta_3","/MC_TAU_Decay/h_3B_pimpi0eta_4"]
 analyses["TauDecays"]["2pigamma"]["MC"  ] = ["/MC_TAU_Decay/h_3B_pimpi0gamma_1","/MC_TAU_Decay/h_3B_pimpi0gamma_2",
                                              "/MC_TAU_Decay/h_3B_pimpi0gamma_3","/MC_TAU_Decay/h_3B_pimpi0gamma_4"]
-analyses["TauDecays"]["4pi"]["data"] = ["/ALEPH_2014_I1267648/d03-x01-y01","/ALEPH_2014_I1267648/d05-x01-y01"]
+analyses["TauDecays"]["4pi"]["data"] = ["/ALEPH_2014_I1267648/d03-x01-y01","/ALEPH_2014_I1267648/d05-x01-y01",
+                                        "/ALEPH_1996_I421984/d01-x01-y01","/ALEPH_1996_I421984/d02-x01-y01",
+                                        "/ALEPH_1996_I421984/d03-x01-y01","/ALEPH_1996_I421984/d06-x01-y01"]
 analyses["TauDecays"]["4pi"]["MC"  ] = ["/MC_TAU_Decay/h_4B_pipi_1","/MC_TAU_Decay/h_4B_pipi_2",
                                         "/MC_TAU_Decay/h_4B_pipi_3","/MC_TAU_Decay/h_4B_pipi_4",
                                         "/MC_TAU_Decay/h_4B_pipi_5","/MC_TAU_Decay/h_4B_pipi_6",
                                         "/MC_TAU_Decay/h_4B_pipipi_1","/MC_TAU_Decay/h_4B_pipipi_2",
                                         "/MC_TAU_Decay/h_4B_pipipi_3","/MC_TAU_Decay/h_4B_pipipi_4",
                                         "/MC_TAU_Decay/h_4B_pipipi_5","/MC_TAU_Decay/h_4B_pipipipi_1",
                                         "/MC_TAU_Decay/h_4B_pipipipi_2"]
 analyses["TauDecays"]["5pi"]["MC"  ] = ["/MC_TAU_Decay/h_5B_pipi1_1","/MC_TAU_Decay/h_5B_pipi1_2",
                                         "/MC_TAU_Decay/h_5B_pipi1_3","/MC_TAU_Decay/h_5B_pipi1_4",
                                         "/MC_TAU_Decay/h_5B_pipi1_5","/MC_TAU_Decay/h_5B_pipi2_1",
                                         "/MC_TAU_Decay/h_5B_pipi2_2","/MC_TAU_Decay/h_5B_pipi3_1",
                                         "/MC_TAU_Decay/h_5B_pipi3_2","/MC_TAU_Decay/h_5B_pipi3_3",
                                         "/MC_TAU_Decay/h_5B_pipipi1_1","/MC_TAU_Decay/h_5B_pipipi1_2",
                                         "/MC_TAU_Decay/h_5B_pipipi1_3","/MC_TAU_Decay/h_5B_pipipi1_4",
                                         "/MC_TAU_Decay/h_5B_pipipi1_5","/MC_TAU_Decay/h_5B_pipipi2_1",
                                         "/MC_TAU_Decay/h_5B_pipipi2_2","/MC_TAU_Decay/h_5B_pipipi3_1",
                                         "/MC_TAU_Decay/h_5B_pipipi3_2","/MC_TAU_Decay/h_5B_pipipi3_3",
                                         "/MC_TAU_Decay/h_5B_pipipipi1_1","/MC_TAU_Decay/h_5B_pipipipi1_2",
                                         "/MC_TAU_Decay/h_5B_pipipipi1_3","/MC_TAU_Decay/h_5B_pipipipi2_1",
                                         "/MC_TAU_Decay/h_5B_pipipipi2_2","/MC_TAU_Decay/h_5B_pipipipi3_1",
                                         "/MC_TAU_Decay/h_5B_pipipipi3_2","/MC_TAU_Decay/h_5B_q1",
                                         "/MC_TAU_Decay/h_5B_q2","/MC_TAU_Decay/h_5B_q3"]
 analyses["EventShapes"]["2jet_jade"][35.0 ] = ["/JADE_OPAL_2000_S4300807/d07-x01-y01"]
 analyses["EventShapes"]["3jet_jade"][35.0 ] = ["/JADE_OPAL_2000_S4300807/d07-x01-y02"]
 analyses["EventShapes"]["4jet_jade"][35.0 ] = ["/JADE_OPAL_2000_S4300807/d07-x01-y03"]
 analyses["EventShapes"]["5jet_jade"][35.0 ] = ["/JADE_OPAL_2000_S4300807/d07-x01-y04"]
 analyses["EventShapes"]["6jet_jade"][35.0 ] = ["/JADE_OPAL_2000_S4300807/d07-x01-y05"]
 analyses["EventShapes"]["2jet_jade"][44.0 ] = ["/JADE_OPAL_2000_S4300807/d08-x01-y01"]
 analyses["EventShapes"]["3jet_jade"][44.0 ] = ["/JADE_OPAL_2000_S4300807/d08-x01-y02"]
 analyses["EventShapes"]["4jet_jade"][44.0 ] = ["/JADE_OPAL_2000_S4300807/d08-x01-y03"]
 analyses["EventShapes"]["5jet_jade"][44.0 ] = ["/JADE_OPAL_2000_S4300807/d08-x01-y04"]
 analyses["EventShapes"]["6jet_jade"][44.0 ] = ["/JADE_OPAL_2000_S4300807/d08-x01-y05"]
 analyses["EventShapes"]["2jet_jade"][91.2 ] = ["/JADE_OPAL_2000_S4300807/d09-x01-y01"]
 analyses["EventShapes"]["3jet_jade"][91.2 ] = ["/JADE_OPAL_2000_S4300807/d09-x01-y02"]
 analyses["EventShapes"]["4jet_jade"][91.2 ] = ["/JADE_OPAL_2000_S4300807/d09-x01-y03"]
 analyses["EventShapes"]["5jet_jade"][91.2 ] = ["/JADE_OPAL_2000_S4300807/d09-x01-y04"]
 analyses["EventShapes"]["6jet_jade"][91.2 ] = ["/JADE_OPAL_2000_S4300807/d09-x01-y05"]
 analyses["EventShapes"]["2jet_jade"][133.0] = ["/JADE_OPAL_2000_S4300807/d10-x01-y01"]
 analyses["EventShapes"]["3jet_jade"][133.0] = ["/JADE_OPAL_2000_S4300807/d10-x01-y02"]
 analyses["EventShapes"]["4jet_jade"][133.0] = ["/JADE_OPAL_2000_S4300807/d10-x01-y03"]
 analyses["EventShapes"]["5jet_jade"][133.0] = ["/JADE_OPAL_2000_S4300807/d10-x01-y04"]
 analyses["EventShapes"]["6jet_jade"][133.0] = ["/JADE_OPAL_2000_S4300807/d10-x01-y05"]
 analyses["EventShapes"]["2jet_jade"][161.0] = ["/JADE_OPAL_2000_S4300807/d11-x01-y01"]
 analyses["EventShapes"]["3jet_jade"][161.0] = ["/JADE_OPAL_2000_S4300807/d11-x01-y02"]
 analyses["EventShapes"]["4jet_jade"][161.0] = ["/JADE_OPAL_2000_S4300807/d11-x01-y03"]
 analyses["EventShapes"]["5jet_jade"][161.0] = ["/JADE_OPAL_2000_S4300807/d11-x01-y04"]
 analyses["EventShapes"]["6jet_jade"][161.0] = ["/JADE_OPAL_2000_S4300807/d11-x01-y05"]
 analyses["EventShapes"]["2jet_jade"][172.0] = ["/JADE_OPAL_2000_S4300807/d12-x01-y01"]
 analyses["EventShapes"]["3jet_jade"][172.0] = ["/JADE_OPAL_2000_S4300807/d12-x01-y02"]
 analyses["EventShapes"]["4jet_jade"][172.0] = ["/JADE_OPAL_2000_S4300807/d12-x01-y03"]
 analyses["EventShapes"]["5jet_jade"][172.0] = ["/JADE_OPAL_2000_S4300807/d12-x01-y04"]
 analyses["EventShapes"]["6jet_jade"][172.0] = ["/JADE_OPAL_2000_S4300807/d12-x01-y05"]
 analyses["EventShapes"]["2jet_jade"][183.0] = ["/JADE_OPAL_2000_S4300807/d13-x01-y01"]
 analyses["EventShapes"]["3jet_jade"][183.0] = ["/JADE_OPAL_2000_S4300807/d13-x01-y02"]
 analyses["EventShapes"]["4jet_jade"][183.0] = ["/JADE_OPAL_2000_S4300807/d13-x01-y03"]
 analyses["EventShapes"]["5jet_jade"][183.0] = ["/JADE_OPAL_2000_S4300807/d13-x01-y04"]
 analyses["EventShapes"]["6jet_jade"][183.0] = ["/JADE_OPAL_2000_S4300807/d13-x01-y05"]
 analyses["EventShapes"]["2jet_jade"][189.0] = ["/JADE_OPAL_2000_S4300807/d14-x01-y01"]
 analyses["EventShapes"]["3jet_jade"][189.0] = ["/JADE_OPAL_2000_S4300807/d14-x01-y02"]
 analyses["EventShapes"]["4jet_jade"][189.0] = ["/JADE_OPAL_2000_S4300807/d14-x01-y03"]
 analyses["EventShapes"]["5jet_jade"][189.0] = ["/JADE_OPAL_2000_S4300807/d14-x01-y04"]
 analyses["EventShapes"]["6jet_jade"][189.0] = ["/JADE_OPAL_2000_S4300807/d14-x01-y05"]
 
+# polarization
+# rho +/-
+analyses["Polarization"][213]["rho00"][91.2] = ["/OPAL_2000_I502750/d01-x01-y01"]
+analyses["Polarization"][213]["cos"  ][91.2] = ["/OPAL_2000_I502750/ctheta_rho_0","/OPAL_2000_I502750/ctheta_rho_1",
+                                                "/OPAL_2000_I502750/ctheta_rho_2","/OPAL_2000_I502750/ctheta_rho_3",
+                                                "/OPAL_2000_I502750/ctheta_rho_4","/OPAL_2000_I502750/ctheta_rho_all"]
+# omega
+analyses["Polarization"][223]["rho00"][91.2] = ["/OPAL_2000_I502750/d02-x01-y01","/OPAL_2000_I502750/d02-x02-y01"]
+analyses["Polarization"][223]["cos"  ][91.2] = ["/OPAL_2000_I502750/ctheta_omega_0","/OPAL_2000_I502750/ctheta_omega_1",
+                                                "/OPAL_2000_I502750/ctheta_omega_2","/OPAL_2000_I502750/ctheta_omega_3",
+                                                "/OPAL_2000_I502750/ctheta_omega_4","/OPAL_2000_I502750/ctheta_omega_all"]
+# phi
+analyses["Polarization"][333]["rho00"][91.2] = ["/OPAL_1997_I440103/d01-x01-y01"]
+analyses["Polarization"][333]["rho10"][91.2] = ["/OPAL_1997_I440103/d01-x01-y02","/OPAL_1997_I440103/d01-x01-y04","/OPAL_1997_I440103/d01-x01-y05"]
+analyses["Polarization"][333]["rho11"][91.2] = ["/OPAL_1997_I440103/d01-x01-y03"]
+analyses["Polarization"][333]["cos"  ][91.2] = ["/OPAL_1997_I440103/d05-x01-y01"]
+analyses["Polarization"][333]["phi"  ][91.2] = ["/OPAL_1997_I440103/d05-x01-y02","/OPAL_1997_I440103/d05-x01-y03"]
+# K*0
+analyses["Polarization"][313]["rho00"][91.2] = ["/OPAL_1997_S3608263/d02-x01-y01"]
+analyses["Polarization"][313]["rho10"][91.2] = ["/OPAL_1997_S3608263/d02-x01-y01"]
+analyses["Polarization"][313]["rho11"][91.2] = ["/OPAL_1997_S3608263/d02-x01-y02","/OPAL_1997_S3608263/d03-x01-y01",
+                                                "/OPAL_1997_S3608263/d03-x02-y01","/OPAL_1997_S3608263/d04-x01-y01",
+                                                "/OPAL_1997_S3608263/d04-x01-y02","/OPAL_1997_S3608263/d04-x02-y01",
+                                                "/OPAL_1997_S3608263/d04-x02-y02"]
+analyses["Polarization"][313]["cos"][91.2] = ["/OPAL_1997_S3608263/ctheta_00","/OPAL_1997_S3608263/ctheta_01",
+                                              "/OPAL_1997_S3608263/ctheta_02","/OPAL_1997_S3608263/ctheta_03",
+                                              "/OPAL_1997_S3608263/ctheta_04","/OPAL_1997_S3608263/ctheta_05",
+                                              "/OPAL_1997_S3608263/ctheta_06","/OPAL_1997_S3608263/ctheta_07",
+                                              "/OPAL_1997_S3608263/ctheta_08","/OPAL_1997_S3608263/ctheta_09",
+                                              "/OPAL_1997_S3608263/ctheta_10","/OPAL_1997_S3608263/ctheta_11",
+                                              "/OPAL_1997_S3608263/ctheta_large"]
+analyses["Polarization"][313]["phi"][91.2] = ["/OPAL_1997_S3608263/alpha_00","/OPAL_1997_S3608263/alpha_01",
+                                              "/OPAL_1997_S3608263/alpha_02","/OPAL_1997_S3608263/alpha_03",
+                                              "/OPAL_1997_S3608263/alpha_04","/OPAL_1997_S3608263/alpha_05",
+                                              "/OPAL_1997_S3608263/alpha_06","/OPAL_1997_S3608263/alpha_07",
+                                              "/OPAL_1997_S3608263/alpha_08","/OPAL_1997_S3608263/alpha_09",
+                                              "/OPAL_1997_S3608263/alpha_10","/OPAL_1997_S3608263/alpha_11",
+                                              "/OPAL_1997_S3608263/alpha_high_00","/OPAL_1997_S3608263/alpha_high_01",
+                                              "/OPAL_1997_S3608263/alpha_high_02","/OPAL_1997_S3608263/alpha_high_03",
+                                              "/OPAL_1997_S3608263/alpha_low_00","/OPAL_1997_S3608263/alpha_low_01",
+                                              "/OPAL_1997_S3608263/alpha_low_02","/OPAL_1997_S3608263/alpha_low_03",]
+# D*
+analyses["Polarization"][413]["rho00"][10.5] = ["/CLEO_1991_I314060/d01-x01-y02","/CLEO_1998_I467595/d04-x01-y01"]
+analyses["Polarization"][413]["alpha"][10.5] = ["/CLEO_1991_I314060/d01-x01-y01","/CLEO_1991_I314060/d01-x01-y03",
+                                                "/CLEO_1998_I467595/d03-x01-y01"]
+analyses["Polarization"][413]["cos"  ][10.5] = ["/CLEO_1991_I314060/d02-x01-y01","/CLEO_1991_I314060/d02-x01-y02",
+                                                "/CLEO_1991_I314060/d02-x01-y03","/CLEO_1991_I314060/d02-x01-y04",
+                                                "/CLEO_1991_I314060/d02-x01-y05","/CLEO_1991_I314060/d02-x01-y06",
+                                                "/CLEO_1998_I467595/d05-x01-y01","/CLEO_1998_I467595/d05-x01-y02",
+                                                "/CLEO_1998_I467595/d05-x01-y03","/CLEO_1998_I467595/d05-x01-y04",
+                                                "/CLEO_1998_I467595/d05-x01-y05","/CLEO_1998_I467595/d05-x01-y06"]
+analyses["Polarization"][413]["rho00"][29.0] = ["/TPC_1991_I316132/d02-x01-y01","/TPC_1991_I316132/d02-x02-y01",
+                                                "/HRS_1987_I250823/d01-x01-y01","/HRS_1987_I250823/d01-x02-y01",
+                                                "/HRS_1987_I250823/d01-x03-y01","/HRS_1987_I250823/d02-x01-y01",
+                                                "/HRS_1987_I250823/d03-x01-y01","/HRS_1987_I250823/d03-x02-y01",
+                                                "/HRS_1987_I250823/d04-x01-y01","/HRS_1987_I250823/d05-x01-y01",
+                                                "/HRS_1987_I250823/d06-x01-y01"]
+analyses["Polarization"][413]["rho10"][29.0] = ["/TPC_1991_I316132/d02-x01-y03","/TPC_1991_I316132/d02-x02-y03",
+                                                "/HRS_1987_I250823/d01-x01-y03","/HRS_1987_I250823/d01-x02-y03",
+                                                "/HRS_1987_I250823/d01-x03-y03","/HRS_1987_I250823/d02-x01-y03",
+                                                "/HRS_1987_I250823/d03-x01-y03","/HRS_1987_I250823/d03-x02-y03",
+                                                "/HRS_1987_I250823/d04-x01-y03","/HRS_1987_I250823/d05-x01-y03",
+                                                "/HRS_1987_I250823/d06-x01-y03"]
+analyses["Polarization"][413]["rho11"][29.0] = ["/TPC_1991_I316132/d02-x01-y02","/TPC_1991_I316132/d02-x02-y02",
+                                                "/HRS_1987_I250823/d01-x01-y02","/HRS_1987_I250823/d01-x02-y02",
+                                                "/HRS_1987_I250823/d01-x03-y02","/HRS_1987_I250823/d02-x01-y02",
+                                                "/HRS_1987_I250823/d03-x01-y02","/HRS_1987_I250823/d03-x02-y02",
+                                                "/HRS_1987_I250823/d04-x01-y02","/HRS_1987_I250823/d05-x01-y02",
+                                                "/HRS_1987_I250823/d06-x01-y02"]
+analyses["Polarization"][413]["alpha"][29.0] = ["/TPC_1991_I316132/d01-x01-y01","/TPC_1991_I316132/d01-x02-y01"]
+analyses["Polarization"][413]["cos"][29.0] = ["/TPC_1991_I316132/ctheta_0","/TPC_1991_I316132/ctheta_1",
+                                              "/TPC_1991_I316132/ctheta_2","/TPC_1991_I316132/ctheta_3",
+                                              "/TPC_1991_I316132/ctheta_4","/TPC_1991_I316132/ctheta_5",
+                                              "/TPC_1991_I316132/ctheta_all",]
+analyses["Polarization"][413]["phi"][29.0] = ["/TPC_1991_I316132/h_01_0","/TPC_1991_I316132/h_01_1",
+                                              "/TPC_1991_I316132/h_01_2","/TPC_1991_I316132/h_01_3",
+                                              "/TPC_1991_I316132/h_01_4","/TPC_1991_I316132/h_01_5",
+                                              "/TPC_1991_I316132/h_01_all","/TPC_1991_I316132/phi_0",
+                                              "/TPC_1991_I316132/phi_1","/TPC_1991_I316132/phi_2",
+                                              "/TPC_1991_I316132/phi_3","/TPC_1991_I316132/phi_4",
+                                              "/TPC_1991_I316132/phi_5","/TPC_1991_I316132/phi_all"]
+analyses["Polarization"][413]["rho00"][91.2] = ["/OPAL_1997_I440103/d03-x01-y01"]
+analyses["Polarization"][413]["rho11"][91.2] = ["/OPAL_1997_I440103/d03-x01-y02"]
+analyses["Polarization"][413]["cos"  ][91.2] = ["/OPAL_1997_I440103/d06-x01-y01"]
+analyses["Polarization"][413]["phi"  ][91.2] = ["/OPAL_1997_I440103/d07-x01-y01"]
+# B*
+analyses["Polarization"][513]["rho00"][91.2] = ["/ALEPH_1995_I398426/d02-x01-y01","/DELPHI_1995_I395026/d03-x01-y01",
+                                                "/OPAL_1996_I428493/d02-x01-y01","/OPAL_1997_I440103/d04-x01-y01"]
+analyses["Polarization"][513]["cos"  ][91.2] = ["/DELPHI_1995_I395026/d05-x01-y01","/OPAL_1996_I428493/d03-x01-y01",
+                                                "/OPAL_1997_I440103/d08-x01-y01","/ALEPH_1995_I398426/d03-x01-y01"]
+# Lambda0
+analyses["Polarization"][3122]["rho11"][10.58] = ["/BELLE_2019_I1687566/d01-x01-y01","/BELLE_2019_I1687566/d01-x01-y02",
+                                                  "/BELLE_2019_I1687566/d01-x02-y01","/BELLE_2019_I1687566/d01-x02-y02",
+                                                  "/BELLE_2019_I1687566/d01-x03-y01","/BELLE_2019_I1687566/d01-x03-y02",
+                                                  "/BELLE_2019_I1687566/d01-x04-y01","/BELLE_2019_I1687566/d01-x04-y02",
+                                                  "/BELLE_2019_I1687566/d02-x01-y01","/BELLE_2019_I1687566/d02-x01-y02",
+                                                  "/BELLE_2019_I1687566/d02-x01-y03","/BELLE_2019_I1687566/d02-x01-y04",
+                                                  "/BELLE_2019_I1687566/d02-x01-y05","/BELLE_2019_I1687566/d02-x01-y06",
+                                                  "/BELLE_2019_I1687566/d02-x01-y07","/BELLE_2019_I1687566/d02-x01-y08",
+                                                  "/BELLE_2019_I1687566/d02-x02-y01","/BELLE_2019_I1687566/d02-x02-y02",
+                                                  "/BELLE_2019_I1687566/d02-x02-y03","/BELLE_2019_I1687566/d02-x02-y04",
+                                                  "/BELLE_2019_I1687566/d02-x02-y05","/BELLE_2019_I1687566/d02-x02-y06",
+                                                  "/BELLE_2019_I1687566/d02-x02-y07","/BELLE_2019_I1687566/d02-x02-y08",
+                                                  "/BELLE_2019_I1687566/d02-x03-y01","/BELLE_2019_I1687566/d02-x03-y02",
+                                                  "/BELLE_2019_I1687566/d02-x03-y03","/BELLE_2019_I1687566/d02-x03-y04",
+                                                  "/BELLE_2019_I1687566/d02-x03-y05","/BELLE_2019_I1687566/d02-x03-y06",
+                                                  "/BELLE_2019_I1687566/d02-x03-y07","/BELLE_2019_I1687566/d02-x03-y08",
+                                                  "/BELLE_2019_I1687566/d02-x04-y01","/BELLE_2019_I1687566/d02-x04-y02",
+                                                  "/BELLE_2019_I1687566/d02-x04-y03","/BELLE_2019_I1687566/d02-x04-y04",
+                                                  "/BELLE_2019_I1687566/d02-x04-y05","/BELLE_2019_I1687566/d02-x04-y06",
+                                                  "/BELLE_2019_I1687566/d02-x04-y07","/BELLE_2019_I1687566/d02-x04-y08",
+                                                  "/BELLE_2019_I1687566/d03-x01-y01","/BELLE_2019_I1687566/d03-x01-y02",
+                                                  "/BELLE_2019_I1687566/d03-x01-y03","/BELLE_2019_I1687566/d03-x01-y04",
+                                                  "/BELLE_2019_I1687566/d03-x01-y05","/BELLE_2019_I1687566/d03-x01-y06",]
+analyses["Polarization"][3122]["rho00"][91.2] = ["/OPAL_1997_I447188/d01-x01-y01","/OPAL_1997_I447188/d01-x01-y02",
+                                                 "/ALEPH_1996_I415745/d01-x01-y01","/ALEPH_1996_I415745/d01-x02-y01"]
+analyses["Polarization"][3122]["rho11"][91.2] = ["/OPAL_1997_I447188/d02-x01-y01","/OPAL_1997_I447188/d02-x01-y02",
+                                                 "/OPAL_1997_I447188/d02-x01-y03","/OPAL_1997_I447188/d02-x01-y04",
+                                                 "/ALEPH_1996_I415745/d02-x01-y01","/ALEPH_1996_I415745/d02-x02-y01",
+                                                 "/ALEPH_1996_I415745/d02-x03-y01","/ALEPH_1996_I415745/d02-x04-y01"]
+analyses["Polarization"][3122]["cos"  ][91.2] = ["/OPAL_1997_I447188/d04-x01-y01","/OPAL_1997_I447188/d04-x01-y02",
+                                                 "/OPAL_1997_I447188/d04-x01-y03","/OPAL_1997_I447188/d04-x01-y04"]
+analyses["Polarization"][3122]["phi"  ][91.2] = ["/OPAL_1997_I447188/d05-x01-y01","/OPAL_1997_I447188/d05-x01-y02",
+                                                 "/OPAL_1997_I447188/d05-x01-y03","/OPAL_1997_I447188/d05-x01-y04"]
+# bottom baryons
+analyses["Polarization"][5122]["rho00"][91.2] = ["/OPAL_1998_I474012/d01-x01-y01","/DELPHI_2000_I513614/d01-x01-y01",
+                                                 "/ALEPH_1996_I402895/d01-x01-y01"]
+analyses["Polarization"][5122]["Other"][91.2] = ["/DELPHI_2000_I513614/El","/DELPHI_2000_I513614/Ev",
+                                                 "/OPAL_1998_I474012/El","/OPAL_1998_I474012/Ev",
+                                                 "/OPAL_1998_I474012/ratio","/ALEPH_1996_I402895/El",
+                                                 "/ALEPH_1996_I402895/Ev"]
+
+# find all the figures
 figures=glob.glob("%s/*/*.dat" % directory)
 used=[]
 plotOutput="""<div style="float:left; font-size:smaller; font-weight:bold;">
     <a href="#{name}">&#9875;</a><a href="{dat}">&#8984</a> {name}: {energy} GeV<br/>
     <a name="{name}"><a href="{pdf}">
       <img src="{png}">
     </a></a>
   </div>"""
 plotOutput2="""<div style="float:left; font-size:smaller; font-weight:bold;">
     <a href="#{name}">&#9875;</a><a href="{dat}">&#8984</a> {name}<br/>
     <a name="{name}"><a href="{pdf}">
       <img src="{png}">
     </a></a>
   </div>"""
     
 def writePlots(plots,output) :
     global figures
     output.write("<div style=\"float:none; overflow:auto; width:100%\">\n")
     for energy in sorted(plots.keys()) :
         try :
             float(energy)
         except:
             continue
         for name in sorted(plots[energy]) :
             dat=name[1:] +".dat"
             figName = ("%s/%s" %(directory,dat))
             if(figName not in figures) :
                 continue
             used.append(figName)
             pdf=name[1:] +".pdf"
             png=name[1:] +".png"
             output.write(plotOutput.format(name=name[1:],pdf=pdf,png=png,dat=dat,energy=energy))
             output.write("\n")
     output.write("</div>")
     
 def writePlots2(plots,output) :
     global figures
     output.write("<div style=\"float:none; overflow:auto; width:100%\">\n")
     for name in sorted(plots) :
         dat=name[1:] +".dat"
         figName = ("%s/%s" %(directory,dat))
         tempName=figName.replace(".dat","")
         found = False
         names=[]
         for name in figures :
             if(tempName+"_" in name or tempName+".dat"==name) :
                 found=True
                 names.append(name)
         if(not found) : continue
         for name in names :
             used.append(name)
             trim = name[:-4].replace("%s/"%directory,"")
             pdf=trim+".pdf"
             png=trim+".png"
             dat=trim+".dat"
             output.write(plotOutput2.format(name=trim,pdf=pdf,png=png,dat=dat))
         output.write("\n")
     output.write("</div>")
 
 def writeMisc(index) :
     global figures,used
     for val in used :
         if(val in figures) :
             del figures[figures.index(val)]
     index.write("<li> <a href=\"misc.html\">Other Plots</a>\n")
     print 'Unused figures',len(figures)
     for val in figures:
         print val
     misc=open(os.path.join(directory,"misc.html"),'w')
     misc.write(header.format(title="Comparisions of Herwig7 and Miscellaneous $e^+e^-$ Data"))
     misc.write("<div style=\"float:none; overflow:auto; width:100%\">\n")
     for val in sorted(figures) :
-        name=val.replace("Rivet-EE","").replace(".dat","")
+        name=val.replace(directory,"").replace(".dat","")
         dat=name[1:] +".dat"
         figName = ("%s/%s" %(directory,dat))
         if(figName not in figures) : continue
         del figures[figures.index(figName)]
         pdf=name[1:] +".pdf"
         png=name[1:] +".png"
         misc.write(plotOutput.format(name=name[1:],pdf=pdf,png=png,dat=dat,energy=""))
         misc.write("\n")
     misc.write("</div>")
     # footer
     misc.write("</body>\n</html>")
     misc.close()
     
 def writeQED(index) :
     index.write("<li> <a href=\"qed.html\">QED Radiation</a>\n")
     qed=open(os.path.join(directory,"qed.html"),'w')
     qed.write(header.format(title="Comparisions of Herwig7 and Photon Radiation Data"))
     writePlots2(analyses["QED"],qed)
     # footer
     qed.write("</body>\n</html>")
     qed.close()
 
 def writeTauDecays(index) :
     index.write("<li> <a href=\"taus.html\">Tau Decays</a>\n")
     decays=open(os.path.join(directory,"taus.html"),'w')
     decays.write(header.format(title="Comparisions of Herwig7 and Tau Decay Data"))
-    names = { "2pi"      : "$\\tau\\to\\nu_\\tau\\pi^-\\pi^0$",
+    names = { "1pi"      : "$\\tau\\to\\nu_\\tau\\pi^-$",
+              "2pi"      : "$\\tau\\to\\nu_\\tau\\pi^-\\pi^0$",
               "Kpi"      : "$\\tau\\to\\nu_\\tau K\\pi$",
               "KK"       : "$\\tau\\to\\nu_\\tau KK$",
               "lnu"      : "$\\tau\\to\\nu_\\tau \\ell\\nu$",
               "Keta"     : "$\\tau\\to\\nu_\\tau K\\eta$",
               "3pi"      : "$\\tau\\to\\nu_\\tau\\pi\\pi\\pi$",
               "Kpipi"    : "$\\tau\\to\\nu_\\tau K\\pi\\pi$",
               "KKpi"     : "$\\tau\\to\\nu_\\tau KK\\pi$",
               "3K"       : "$\\tau\\to\\nu_\\tau K^+K^-K^-$",
               "2pieta"   : "$\\tau\\to\\nu_\\tau\\eta\\pi\\pi$",
               "2pigamma" : "$\\tau\\to\\nu_\\tau\\gamma\\pi\\pi$",
               "4pi"      : "$\\tau\\to\\nu_\\tau4\\pi$",
               "5pi"      : "$\\tau\\to\\nu_\\tau5\\pi$",}
     index.write("<ul>\n")
+
+
+
+    # two body
+    decays.write("<h2 id=\"3body\">Two Body</h2>\n")
+    index.write("<li> <a href=\"taus.html#2body\">Two Body:</a>\n")
+    for obs in ["1pi" ] :
+        decays.write("<h3 id=\"%s\">%s</h3>\n" % (obs,names[obs]))
+        index.write("<a href=\"taus.html#%s\">%s,<a/>\n" % (obs,names[obs]))
+        for val in ["data","MC"] :
+            if(val not in analyses["TauDecays"][obs]  or len(analyses["TauDecays"][obs][val])==0) : continue
+            if(val=="data") : decays.write("<h4 id=\"%s_%s\">%s</h4>\n" % (obs,val,"Data"))
+            else            : decays.write("<h4 id=\"%s_%s\">%s</h4>\n" % (obs,val,"Monte Carlo"))
+            writePlots2(analyses["TauDecays"][obs][val],decays)
     # three body
     decays.write("<h2 id=\"3body\">Three Body</h2>\n")
     index.write("<li> <a href=\"taus.html#3body\">Three Body:</a>\n")
     for obs in ["2pi", "Kpi", "KK", "lnu", "Keta" ] :
         decays.write("<h3 id=\"%s\">%s</h3>\n" % (obs,names[obs]))
         index.write("<a href=\"taus.html#%s\">%s,<a/>\n" % (obs,names[obs]))
         for val in ["data","MC"] :
             if(val not in analyses["TauDecays"][obs]  or len(analyses["TauDecays"][obs][val])==0) : continue
             if(val=="data") : decays.write("<h4 id=\"%s_%s\">%s</h4>\n" % (obs,val,"Data"))
             else            : decays.write("<h4 id=\"%s_%s\">%s</h4>\n" % (obs,val,"Monte Carlo"))
             writePlots2(analyses["TauDecays"][obs][val],decays)
     # four body
     decays.write("<h2 id=\"4body\">Four Body</h2>\n")
     index.write("<li> <a href=\"taus.html#4body\">Four Body:</a>\n")
     for obs in ["3pi","Kpipi","KKpi","3K","2pieta","2pigamma" ] :
         decays.write("<h3 id=\"%s\">%s</h3>\n" % (obs,names[obs]))
         index.write("<a href=\"taus.html#%s\">%s,<a/>\n" % (obs,names[obs]))
         for val in ["data","MC"] :
             if(val not in analyses["TauDecays"][obs]  or len(analyses["TauDecays"][obs][val])==0) : continue
             if(val=="data") : decays.write("<h4 id=\"%s_%s\">%s</h4>\n" % (obs,val,"Data"))
             else            : decays.write("<h4 id=\"%s_%s\">%s</h4>\n" % (obs,val,"Monte Carlo"))
             writePlots2(analyses["TauDecays"][obs][val],decays)
     # five body
     decays.write("<h2 id=\"5body\">Five Body</h2>\n")
     index.write("<li> <a href=\"taus.html#5body\">FIve Body:</a>")
     for obs in ["4pi"] :
         decays.write("<h3 id=\"%s\">%s</h3>\n" % (obs,names[obs]))
         index.write("<a href=\"taus.html#%s\">%s,<a/>\n" % (obs,names[obs]))
         for val in ["data","MC"] :
             if(val not in analyses["TauDecays"][obs]  or len(analyses["TauDecays"][obs][val])==0) : continue
             if(val=="data") : decays.write("<h4 id=\"%s_%s\">%s</h4>\n" % (obs,val,"Data"))
             else            : decays.write("<h4 id=\"%s_%s\">%s</h4>\n" % (obs,val,"Monte Carlo"))
             writePlots2(analyses["TauDecays"][obs][val],decays)
     # six body
     decays.write("<h2 id=\"6body\">Six Body</h2>\n")
     index.write("<li> <a href=\"taus.html#6body\">Six Body:</a>")
     for obs in ["5pi"] :
         decays.write("<h3 id=\"%s\">%s</h3>\n" % (obs,names[obs]))
         index.write("<a href=\"taus.html#%s\">%s,<a/>\n" % (obs,names[obs]))
         for val in ["data","MC"] :
             if(val not in analyses["TauDecays"][obs]  or len(analyses["TauDecays"][obs][val])==0) : continue
             if(val=="data") : decays.write("<h4 id=\"%s_%s\">%s</h4>\n" % (obs,val,"Data"))
             else            : decays.write("<h4 id=\"%s_%s\">%s</h4>\n" % (obs,val,"Monte Carlo"))
             writePlots2(analyses["TauDecays"][obs][val],decays)
     # footer
     index.write("</ul>\n")
     decays.write("</body>\n</html>")
     decays.close()
 
 def writeParticleDecays(particles,decays,index) :
     for val in particles :
         if val not in analyses["HadronDecays"] : continue
         decays.write("<div style=\"float:none; overflow:auto; \">\n<h4 id=\"%s\">%s</h4>\n" % (val,particleNames[val]))
         index.write(" <a href=\"decays.html#%s\">%s,<a/>\n" % (val,particleNames[val]))
         if("Modes" in analyses["HadronDecays"][val] and len(analyses["HadronDecays"][val]["Modes"]) !=0) :
             for mode,plots in analyses["HadronDecays"][val]["Modes"].iteritems() :
                 decays.write("<h5>Mode: %s</h5>\n" % mode)
                 if("data" in plots) :
                     decays.write("<h5>Data</h5>\n")
                     writePlots2(plots["data"],decays)
                 if("MC"   in plots) :
                     decays.write("<h5>Monte Carlo</h5>\n")
                     writePlots2(plots["MC"],decays)
         # multiplicity dist
         if("DistChargedMult" in analyses["HadronDecays"][val] and
            len(analyses["HadronDecays"][val]["DistChargedMult"]) !=0) :
             decays.write("<h5>Charged Particle Multplicity Distribution</h5>\n")
             if("data" in analyses["HadronDecays"][val]["DistChargedMult"]) :
                 decays.write("<h5>Data</h5>\n")
                 writePlots2(analyses["HadronDecays"][val]["DistChargedMult"]["data"],decays)
             if("MC"   in analyses["HadronDecays"][val]["DistChargedMult"]) :
                 decays.write("<h5>Monte Carlo</h5>\n")
                 writePlots2(analyses["HadronDecays"][val]["DistChargedMult"]["MC"],decays)
         # multiplicities
         if("Mult" in analyses["HadronDecays"][val] and
            len(analyses["HadronDecays"][val]["Mult"]) !=0) :
             for prod,plots in sorted(analyses["HadronDecays"][val]["Mult"].iteritems()):
                 if(len(plots)==0) : continue
-                decays.write("<h5>Multiplicity of %s</h5>\n" % particleNames[prod])
+                if(prod!="Charged") :
+                    decays.write("<h5>Multiplicity of %s</h5>\n" % particleNames[prod])
+                else : 
+                    decays.write("<h5>Multiplicity of Charged Particles</h5>\n")
                 writePlots2(plots,decays)
         # spectra
         if("Spectrum" in analyses["HadronDecays"][val] and
            len(analyses["HadronDecays"][val]["Spectrum"]) !=0) :
             for prod,plots in sorted(analyses["HadronDecays"][val]["Spectrum"].iteritems()):
                 if(len(plots)==0) : continue
                 decays.write("<h5>Spectrum of %s</h5>\n" % particleNames[prod])
                 writePlots2(plots,decays)
+        # event shapes
+        if("Shapes" in analyses["HadronDecays"][val] and
+           len(analyses["HadronDecays"][val]["Shapes"]) !=0) :
+            decays.write("<h5>Events Shapes</h5>\n")
+            writePlots2(analyses["HadronDecays"][val]["Shapes"],decays)
+        # other dists
+        if("Other" in analyses["HadronDecays"][val] and
+           len(analyses["HadronDecays"][val]["Other"]) !=0) :
+            decays.write("<h5>Other Observables</h5>\n")
+            writePlots2(analyses["HadronDecays"][val]["Other"],decays)
 
 def writeDecays(index) :
     decays=open(os.path.join(directory,"decays.html"),'w')
     decays.write(header.format(title="Comparisions of Herwig7 and Hadronic Decay Data"))
     index.write("<li> <a href=\"decays.html\">Hadron Decays</a>\n")
     index.write(" <ul>\n")
     # mesons
     decays.write("<h2 id=\"MESONS\">Meson</h2>\n")
     # light
     decays.write("<h3 id=\"m_light\">Light, Unflavoured</h3>\n")
     index.write("<li><a href=\"decays.html#m_light\">Light unflavoured mesons:<a/>\n")
     writeParticleDecays(mLight,decays,index)
     # charm
     decays.write("<h3 id=\"m_charm\">Charm Mesons</h3>\n")
     index.write("<li><a href=\"decays.html#m_charm\">Charm mesons:<a/>\n")
     writeParticleDecays(mCharm,decays,index)
     # bottom
     decays.write("<h3 id=\"m_charm\">Bottom Mesons</h3>\n")
     index.write("<li><a href=\"decays.html#m_charm\">Bottom mesons:<a/>\n")
     writeParticleDecays(mBottom,decays,index)
     # charmonium
     decays.write("<h3 id=\"m_ccbar\">Charmonium</h3>\n")
     index.write("<li><a href=\"decays.html#m_ccbar\">Charmonium:<a/>\n")
     writeParticleDecays(mccbar,decays,index)
     # bottomonium
     decays.write("<h3 id=\"m_bbbar\">Bottomonium</h3>\n")
     index.write("<li><a href=\"decays.html#m_bbbar\">Bottomonium:<a/>\n")
     writeParticleDecays(mbbbar,decays,index)
     # hyperons
     decays.write("<h3 id=\"b_strange\">Hyperons</h3>\n")
     index.write("<li><a href=\"decays.html#b_strange\">Hyperons:<a/>\n")
     writeParticleDecays(bStrange,decays,index)
     # hyperons
     decays.write("<h3 id=\"b_charm\">Charm Baryons</h3>\n")
     index.write("<li><a href=\"decays.html#b_charm\">Charm Baryons:<a/>\n")
     writeParticleDecays(bCharm,decays,index)
     # footer
     index.write(" </ul>\n")
     decays.write("</body>\n</html>")
     decays.close()
     
 def writeMult(index) :
     index.write("<li> <a href=\"mult.html\">Identified Particle Multiplicities</a>\n")
     mult=open(os.path.join(directory,"mult.html"),'w')
     mult.write(header.format(title="Comparisions of Herwig7 and $e^+e^-$ Particle Multiplicities"))
     # mesons
     mult.write("<h2 id=\"MESONS\">Mesons</h2>\n")
     mult.write("<h3 id=\"m_light\">Light, Unflavoured</h3>\n")
     index.write("<ul>\n")
     index.write("<li><a href=\"mult.html#m_light\">Light unflavoured mesons:<a/>\n")
     # light
     for val in mLight:
         if(val not in analyses["Multiplicity"] or len(analyses["Multiplicity"][val])==0 ) : continue
         index.write(" <a href=\"mult.html#%s\">%s,<a/>\n" % (val,particleNames[val]))
         mult.write("<div style=\"float:none; overflow:auto; \">\n<h4 id=\"%s\">%s</h4>\n" % (val,particleNames[val]))
         writePlots(analyses["Multiplicity"][val],mult)
         mult.write("</div>\n")
     index.write("<li><a href=\"mult.html#m_strange\">Strange mesons:<a/>\n")
     mult.write("<h3 id=\"m_strange\">Strange</h3>\n")
     # strange
     for val in mStrange :
         if(val not in analyses["Multiplicity"] or len(analyses["Multiplicity"][val])==0 ) : continue
         index.write(" <a href=\"mult.html#%s\">%s,<a/>\n" % (val,particleNames[val]))
         mult.write("<div style=\"float:none; overflow:auto; \">\n<h4 id=\"%s\">%s</h4>\n" % (val,particleNames[val]))
         writePlots(analyses["Multiplicity"][val],mult)
         mult.write("</div>\n")
     # charm
     index.write("<li><a href=\"mult.html#m_charm\">Charm mesons:<a/>\n")
     mult.write("<h3 id=\"m_charm\">Charm</h3>\n")
     for val in mCharm:
         if(val not in analyses["Multiplicity"] or len(analyses["Multiplicity"][val])==0 ) : continue
         index.write(" <a href=\"mult.html#%s\">%s,<a/>\n" % (val,particleNames[val]))
         mult.write("<div style=\"float:none; overflow:auto; \">\n<h4 id=\"%s\">%s</h4>\n" % (val,particleNames[val]))
         writePlots(analyses["Multiplicity"][val],mult)
         mult.write("</div>\n")
     # bottom
     mult.write("<h3 id=\"m_bottom\">Bottom</h3>\n")
     index.write("<li><a href=\"mult.html#m_bottom\">Bottom mesons:<a/>\n")
     for val in mBottom :
         if(val not in analyses["Multiplicity"] or len(analyses["Multiplicity"][val])==0 ) : continue
         index.write(" <a href=\"mult.html#%s\">%s,<a/>\n" % (val,particleNames[val]))
         mult.write("<div style=\"float:none; overflow:auto; \">\n<h4 id=\"%s\">%s</h4>\n" % (val,particleNames[val]))
         writePlots(analyses["Multiplicity"][val],mult)
     # charmonium
     index.write("<li><a href=\"mult.html#m_ccbar\">$c\\bar{c}$ mesons:<a/>\n")
     mult.write("<h3 id=\"m_ccbar\">$c\\bar{c}$</h3>\n")
     for val in mccbar : 
         if(val not in analyses["Multiplicity"] or len(analyses["Multiplicity"][val])==0 ) : continue
         index.write(" <a href=\"mult.html#%s\">%s,<a/>\n" % (val,particleNames[val]))
         mult.write("<div style=\"float:none; overflow:auto; \">\n<h4 id=\"%s\">%s</h4>\n" % (val,particleNames[val]))
         writePlots(analyses["Multiplicity"][val],mult)
     # bottomonium
     index.write("<li><a href=\"mult.html#m_bbbar\">$b\\bar{b}$ mesons:<a/>\n")
     mult.write("<h3 id=\"m_bbbar\">$b\\bar{b}$</h3>\n")
     for val in mbbbar : 
         if(val not in analyses["Multiplicity"] or len(analyses["Multiplicity"][val])==0 ) : continue
         index.write(" <a href=\"mult.html#%s\">%s,<a/>\n" % (val,particleNames[val]))
         mult.write("<div style=\"float:none; overflow:auto; \">\n<h4 id=\"%s\">%s</h4>\n" % (val,particleNames[val]))
         writePlots(analyses["Multiplicity"][val],mult)
     # baryons
     mult.write("<h2 id=\"BARYONS\">Baryons</h2>\n")
     # light unflavoured
     index.write("<li><a href=\"mult.html#b_light\">Light unflavoured baryons:<a/>\n")
     mult.write("<h3 id=\"b_light\">Light, Unflavoured</h3>\n")
     for val in bLight:
         if(val not in analyses["Multiplicity"] or len(analyses["Multiplicity"][val])==0 ) : continue
         index.write(" <a href=\"mult.html#%s\">%s,<a/>\n" % (val,particleNames[val]))
         mult.write("<div style=\"float:none; overflow:auto; \">\n<h4 id=\"%s\">%s</h4>\n" % (val,particleNames[val]))
         writePlots(analyses["Multiplicity"][val],mult)
     # hyperons
     index.write("<li><a href=\"mult.html#b_strange\">Hyperons:<a/>\n")
     mult.write("<h3 id=\"b_strange\">Hyperons</h3>\n")
     for val in bStrange:
         if(val not in analyses["Multiplicity"] or len(analyses["Multiplicity"][val])==0 ) : continue
         index.write(" <a href=\"mult.html#%s\">%s,<a/>\n" % (val,particleNames[val]))
         mult.write("<div style=\"float:none; overflow:auto; \">\n<h4 id=\"%s\">%s</h4>\n" % (val,particleNames[val]))
         writePlots(analyses["Multiplicity"][val],mult)
     # charm baryons
     index.write("<li><a href=\"mult.html#b_charm\">Charm:<a/>\n")
     mult.write("<h3 id=\"b_charm\">Charm Baryons</h3>\n")
     for val in bCharm:
         if(val not in analyses["Multiplicity"] or len(analyses["Multiplicity"][val])==0 ) : continue
         index.write(" <a href=\"mult.html#%s\">%s,<a/>\n" % (val,particleNames[val]))
         mult.write("<div style=\"float:none; overflow:auto; \">\n<h4 id=\"%s\">%s</h4>\n" % (val,particleNames[val]))
         writePlots(analyses["Multiplicity"][val],mult)
     # bottom
     index.write("<li><a href=\"mult.html#b_bottom\">Bottom:<a/>\n")
     mult.write("<h3 id=\"b_bottom\">Bottom Baryons</h3>\n")
     for val in bBottom:
         if(val not in analyses["Multiplicity"] or len(analyses["Multiplicity"][val])==0 ) : continue
         index.write(" <a href=\"mult.html#%s\">%s,<a/>\n" % (val,particleNames[val]))
         mult.write("<div style=\"float:none; overflow:auto; \">\n<h4 id=\"%s\">%s</h4>\n" % (val,particleNames[val]))
         writePlots(analyses["Multiplicity"][val],mult)
     # other
     index.write("<li><a href=\"mult.html#other\">Other:<a/>\n")
     mult.write("<h3 id=\"other\">Other</h3>\n")
     for val in ["321/2212"]:
         if(val not in analyses["Multiplicity"] or len(analyses["Multiplicity"][val])==0 ) : continue
         index.write(" <a href=\"mult.html#%s\">%s,<a/>\n" % (val,particleNames[val]))
         mult.write("<div style=\"float:none; overflow:auto; \">\n<h4 id=\"%s\">%s</h4>\n" % (val,particleNames[val]))
         writePlots(analyses["Multiplicity"][val],mult)
     # footer
     index.write(" </ul>\n")
     mult.write("</body>\n</html>")
     mult.close()
 
 def writeSpectrum(particles,index,ident) :
     latexNames = { "x"     : "Scaled Momentum/Energy",
                    "xi"    : "Log of Scaled Momentum/Energy",
                    "p"     : "Momentum/Energy",
                    "Ratio" : "Ratios of particle multiplicities",
                    "Other" : "Other distributions" }
     for pdgId in particles:
         if(pdgId not in analyses["IdentifiedParticle"]) : continue
         sumL = len(analyses["IdentifiedParticle"][pdgId]["x"])+len(analyses["IdentifiedParticle"][pdgId]["p"])+\
                len(analyses["IdentifiedParticle"][pdgId]["xi"])+len(analyses["IdentifiedParticle"][pdgId]["Ratio"])\
                +len(analyses["IdentifiedParticle"][pdgId]["Other"])
         if(sumL==0) : continue
         # lines in html
         ident.write("<div style=\"float:none; overflow:auto; \">\n<h4 id=\"%s\">%s</h4>\n" % (pdgId,particleNames[pdgId]))
         index.write(" <a href=\"identified.html#%s\">%s,<a/>\n" % (pdgId,particleNames[pdgId]))
         # plots
         for val in ["x","p","xi","Ratio","Other"] :
             if(len(analyses["IdentifiedParticle"][pdgId][val])==0) : continue
             ident.write("<div style=\"float:none; overflow:auto; \">\n<h3 id=\"%s_%s\">%s</h3>\n" % (pdgId,val,latexNames[val]))
             writePlots(analyses["IdentifiedParticle"][pdgId][val],ident)
             ident.write("</div>\n")
             
+def writePolar(particles,index,pol) :
+    latexNames = { "rho00"     : "Longitudinal polarization",
+                   "rho10"     : "Off-diagonal $(\\rho_{10}$)",
+                   "rho11"     : "Transerve polarization",
+                   "alpha"     : "Asymmetry $\\alpha$",
+                   "cos"       : "$\\cos\\theta$ distributions",
+                   "phi"       : "Azimuthal Angle distributions",
+                   "Other"     : "Other distributions"}
+    for pdgId in particles:
+        if(pdgId not in analyses["Polarization"]) : continue
+        sumL = len(analyses["Polarization"][pdgId]["alpha"])+len(analyses["Polarization"][pdgId]["rho00"])+\
+               len(analyses["Polarization"][pdgId]["cos"])+len(analyses["Polarization"][pdgId]["phi"])+\
+               len(analyses["Polarization"][pdgId]["rho10"])+len(analyses["Polarization"][pdgId]["rho11"])
+        if(sumL==0) : continue
+        # lines in html
+        pol.write("<div style=\"float:none; overflow:auto; \">\n<h4 id=\"%s\">%s</h4>\n" % (pdgId,particleNames[pdgId]))
+        index.write(" <a href=\"polarization.html#%s\">%s,<a/>\n" % (pdgId,particleNames[pdgId]))
+        # plots
+        for val in ["rho00","alpha","rho10","rho11","cos","phi","Other"] :
+            if(len(analyses["Polarization"][pdgId][val])==0) : continue
+            pol.write("<div style=\"float:none; overflow:auto; \">\n<h3 id=\"%s_%s\">%s</h3>\n" % (pdgId,val,latexNames[val]))
+            writePlots(analyses["Polarization"][pdgId][val],pol)
+            pol.write("</div>\n")
+            
 # output the identified particle plots
 def writeIdentified(index) :
     ident=open(os.path.join(directory,"identified.html"),'w')
     # header for page
     ident.write(header.format(title="Comparisions of Herwig7 and $e^+e^-$ Identified Particle Spectra"))
     # line for index
     index.write("<li> <a href=\"identified.html\">Identified Particle Spectra</a>\n")
     index.write("<ul>\n")
     # photons
     ident.write("<h2 id=\"gamma\">Photons</h2>\n")
     index.write("<li> <a href=\"identified.html#gamma\">Photons:<a/>\n")
     writeSpectrum([22],index,ident)
     ident.write("<h2 id=\"MESONS\">Mesons</h2>\n")
     # Light unflavoured mesons
     ident.write("<h3 id=\"m_light\">Light, Unflavoured</h3>\n")
     index.write("<li><a href=\"identified.html#m_light\">Light unflavoured mesons:<a/>\n")
     writeSpectrum(mLight,index,ident)
     # Strange mesons
     ident.write("<h3 id=\"m_strange\">Strange</h3>\n")
     index.write("<li><a href=\"identified.html#m_strange\">Strange mesons:<a/>\n")
     writeSpectrum(mStrange,index,ident)
     # charm mesons
     ident.write("<h3 id=\"m_charm\">Charm</h3>\n")
     index.write("<li><a href=\"identified.html#m_charm\">Charm mesons:<a/>\n")
     writeSpectrum(mCharm,index,ident)
     # charmonium
     ident.write("<h3 id=\"m_charm\">Charmonium</h3>\n")
     index.write("<li><a href=\"identified.html#m_charm\">Charmonium:<a/>\n")
     writeSpectrum(mccbar,index,ident)
     # Baryons
     ident.write("<h2 id=\"BARYONS\">Baryons</h2>\n")
     # light baryons
     ident.write("<h3 id=\"b_light\">Light, Unflavoured</h3>\n")
     index.write("<li><a href=\"identified.html#b_light\">Light unflavoured baryons:<a/>\n")
     writeSpectrum(bLight,index,ident)
     # hyperons
     ident.write("<h3 id=\"b_strange\">Hyperons</h3>\n")
     index.write("<li><a href=\"identified.html#b_strange\">Hyperons:<a/>\n")
     writeSpectrum(bStrange,index,ident)
     # charm baryons
     ident.write("<h3 id=\"b_charm\">Charm Baryons</h3>\n")
     index.write("<li><a href=\"identified.html#b_charm\">Charm baryons:<a/>\n")
     # loop over particles
     writeSpectrum(bCharm,index,ident)
      # other
     ident.write("<h3 id=\"other\">Other</h3>\n")
     index.write("<li><a href=\"identified.html#other\">Other:<a/>\n")
     # loop over particles
     writeSpectrum(["321/2212"],index,ident)
     # bottom fragmentation
     ident.write("<h2 id=\"b_frag\">Bottom Fragmentation Function</h2>\n")
     index.write("<li><a href=\"identified.html#b_frag\">Bottom Fragmentation Function:<a/>\n")
     for val in ["weak","lead","weak_mean","lead_mean"] :
         if val=="weak" :
             name="Weakly Decaying B hadron"
             name2="Weakly Decaying"
         elif val=="lead" :
             name="Leading Decaying B hadron"
             name2="Leading"
         elif val=="weak_mean":
             name="Weakly Decaying B hadron (average)"
             name2="Weakly Decaying (average)"
         elif val=="lead_mean" :
             name="Leading Decaying B hadron (average)"
             name2="Leading (average)"
         ident.write("<div style=\"float:none; overflow:auto; \">\n<h3 id=\"%s\">%s</h3>\n" % (val,name))
         index.write("<a href=\"identified.html#%s\">%s,<a/>\n" % (val,name2))
         writePlots2(analyses["IdentifiedParticle"][511][val],ident)
         ident.write("</div>\n")
+    writeSpectrum([513],index,ident)
     # footer
     index.write(" </ul>\n")    
     ident.write("</body>\n</html>")
     ident.close()
     
 def writeFlavour(index) :
     flavour=open(os.path.join(directory,"flavour.html"),'w')
     flavour.write(header.format(title="Comparisions of Herwig7 and Flavour Separated $e^+e^-$ Data"))
     index.write("<li> <a href=\"flavour.html\">Flavour Separated</a>\n")
     index.write(" <ul>\n")
     # total multiplicity
     flavour.write("<h2 id=\"mult\">Charged Particle Multiplicity</h2>\n")
     index.write("<li> <a href=\"flavour.html#mult\">Total Charged Multiplicity: </a> \n")
     titles={ 1 : "Light (uds)", 2 : "Light (udsc)", 4 : "Charm" , 5 : "Bottom", 41 : "Charm-Light difference", 51 : "Charm-bottom difference"}
     lFormat="""<div style=\"float:none; overflow:auto; width:100%\">\n<{hlevel} id=\"{tag}\">{name}</{hlevel}>\n"""
     for flav in [1,4,5,41,51] :
         if(flav in analyses["Charged"]["TotalChargedMult"] and
            len(analyses["Charged"]["TotalChargedMult"][flav])!=0) :
             if(flav!=51) : index.write(" <a href=\"flavour.html#mult_%s\">%s,<a/>\n" % (flav,titles[flav]) )
             else        : index.write(" <a href=\"flavour.html#mult_%s\">%s.<a/>\n" % (flav,titles[flav]) )
             flavour.write(lFormat.format(hlevel="h3",tag="mult_%s"%flav,name=titles[flav]))
             writePlots(analyses["Charged"]["TotalChargedMult"][flav],flavour)
             flavour.write("</div>\n")
     # multiplicity dist
     flavour.write("<h2 id=\"multdist\">Charged Particle Multiplicity Distribution</h2>\n")
     index.write("<li> <a href=\"flavour.html#multdist\">Charged Particle Multiplicity Distribution</a>\n")
     for flav in [1,2,4,5] :
         if(flav in analyses["Charged"]["DistChargedMult"] and
            len(analyses["Charged"]["DistChargedMult"][flav])!=0) :
             if(flav!=5) : index.write(" <a href=\"flavour.html#multdist_%s\">%s,<a/>\n" % (flav,titles[flav]) )
             else        : index.write(" <a href=\"flavour.html#multdist_%s\">%s.<a/>\n" % (flav,titles[flav]) )
             flavour.write(lFormat.format(hlevel="h3",tag="multdist_%s"%flav,name=titles[flav]))
             writePlots(analyses["Charged"]["DistChargedMult"][flav],flavour)
             flavour.write("</div>\n")
     # event shapes
     flavour.write("<h2 id=\"EVENT\">Event Shapes</h2>\n")
     index.write("<li> <a href=\"flavour.html#event\">Event Shapes: </a> \n")
     index.write("<ul>")
     # thrust
     eventShapes = {"T" : "Thrust" , "HeavyJetMass" : "Heavy Jet Mass", "BT" : "Total Jet Broadening",
                    "BW" : "Wide Jet Broadening", "C" : "C", "D" : "D"}
     for obs in ["T", "HeavyJetMass","BT","BW","C","D"] :
         flavour.write(lFormat.format(hlevel="h3",tag="event_%s"%obs,name=eventShapes[obs]))
         index.write(" <li> <a href=\"flavour.html#event_%s\">%s:<a/>\n" % (obs,eventShapes[obs]))
         for flav in [1,2,4,5] :
             if(flav in analyses["EventShapesFlavour"][obs] and
                len(analyses["EventShapesFlavour"][obs][flav])!=0) :
                 if(flav!=5) : index.write(" <a href=\"flavour.html#event_%s_%s\">%s,<a/>\n" % (obs,flav,titles[flav]) )
                 else        : index.write(" <a href=\"flavour.html#event_%s_%s\">%s.<a/>\n" % (obs,flav,titles[flav]) )
                 flavour.write(lFormat.format(hlevel="h4",tag="event_%s_%s"%(obs,flav),name=titles[flav]))
             writePlots(analyses["EventShapesFlavour"][obs][flav],flavour)
         flavour.write("</div>\n")
     flavour.write("</div>\n")
     index.write("</ul>")
     # spectrum
     flavour.write("<h2 id=\"spectrum\">Charged Particle Spectra</h2>\n")
     index.write("<li> <a href=\"flavour.html#spectrum\">Charged Particle Spectra: </a> \n")
     for flav in [1,2,4,5] :
         if(flav in analyses["Charged"]["ChargedSpectrum"] and
            len(analyses["Charged"]["ChargedSpectrum"][flav])!=0) :
             if(flav!=5) : index.write(" <a href=\"flavour.html#spectra_%s\">%s,<a/>\n" % (flav,titles[flav]) )
             else        : index.write(" <a href=\"flavour.html#spectra_%s\">%s.<a/>\n" % (flav,titles[flav]) )
             flavour.write(lFormat.format(hlevel="h3",tag="spectra_%s"%flav,name=titles[flav]))
-            for obs in ["x","xi"] :
-                if obs== "x" : name="Scaled Momentum"
-                else         : name="Log of the scaled Momentum"
+            for obs in ["x","xi","Other"] :
+                if obs== "x"   : name="Scaled Momentum"
+                elif obs=="xi" : name="Log of the scaled Momentum"
+                else           : name="Other distributions"
+                if(obs not in analyses["Charged"]["ChargedSpectrum"][flav]) : continue
                 flavour.write(lFormat.format(hlevel="h4",tag="spectra_%s_%s"% (flav,obs),name=name))
                 writePlots(analyses["Charged"]["ChargedSpectrum"][flav][obs],flavour)
                 flavour.write("</div>\n")
             flavour.write("</div>\n")
     # multiplicities
     flavour.write("<h2 id=\"mults\">Identified Particle Multiplicities</h2>\n")
     index.write("<li> <a href=\"flavour.html#mults\">Identified Particle Multiplicities: </a> \n")
     for flav in [1,4,5,41,51] :
         if(flav!=51) : index.write(" <a href=\"flavour.html#mults_%s\">%s,<a/>\n" % (flav,titles[flav]) )
         else        : index.write(" <a href=\"flavour.html#mults_%s\">%s.<a/>\n" % (flav,titles[flav]) )
         flavour.write(lFormat.format(hlevel="h3",tag="mults_%s"%flav,name=titles[flav]))
         for val in mLight+mStrange+bLight+bStrange+["321/2212"] :
             if(val not in analyses["MultiplicityFlavour"] or
                flav not in analyses["MultiplicityFlavour"][val] or
                len(analyses["MultiplicityFlavour"][val][flav])==0) : continue
             flavour.write("<div style=\"float:none; overflow:auto; \">\n<h4 id=\"f_%s_%s\">%s</h4>\n" % (flav,val,particleNames[val]))
             writePlots(analyses["MultiplicityFlavour"][val][flav],flavour)
             flavour.write("</div>\n")
     # identified particle specrtra
     flavour.write("<h2 id=\"ident\">Identified Particle Spectra</h2>\n")
     index.write("<li> <a href=\"flavour.html#ident\">Identified Particle Spectra: </a> \n")
     titles[41] = "Ratio Charm to Light"
     titles[51] = "Ratio Bottom to Light"
     obsName = { "x" : "Scaled Momentum",
                 "xi" : "Log of Scaled Momentum",
                 "Ratio" : "Ratios of Particle Multiplicities",
                 "Other" : "Other Distributions" }
     for flav in [1,4,5,41,51] :
         if(flav!=51) : index.write(" <a href=\"flavour.html#identf_%s\">%s,<a/>\n" % (flav,titles[flav]) )
         else        : index.write(" <a href=\"flavour.html#identf_%s\">%s.<a/>\n" % (flav,titles[flav]) )
         flavour.write(lFormat.format(hlevel="h3",tag="identf_%s"%flav,name=titles[flav]))
         for val in [111,211,311,321,313,333,2212,3122,413,"321/2212"] :
             if(val not in analyses["IdentifiedParticleFlavour"]) : continue
             if(flav not in analyses["IdentifiedParticleFlavour"][val]) : continue
             aSum=0
             for key,temp in analyses["IdentifiedParticleFlavour"][val][flav].iteritems():
                 aSum+=len(temp)
             if(aSum==0) : continue
             flavour.write("<div style=\"float:none; overflow:auto; \">\n<h4 id=\"f_%s_%s\">%s</h4>\n" % (flav,val,particleNames[val]))
             for obs in ["x","xi","Ratio","Other"] :
                 if(obs not in analyses["IdentifiedParticleFlavour"][val][flav] or
                    len(analyses["IdentifiedParticleFlavour"][val][flav][obs])==0) : continue
                 flavour.write("<div style=\"float:none; overflow:auto; \">\n<h5 id=\"f_%s_%s_%s\">%s</h5>\n" % (flav,val,obs,obsName[obs]))
                 writePlots(analyses["IdentifiedParticleFlavour"][val][flav][obs],flavour)
                 flavour.write("</div>\n")
             flavour.write("</div>\n")
     # footer
     index.write("</ul>\n")
     flavour.write("</body>\n</html>")
     flavour.close()
     
 def writeCharged(index) :
     # headers
     charged=open(os.path.join(directory,"charged.html"),'w')
     charged.write(header.format(title="Comparisions of Herwig7 and $e^+e^-$ Data on Charged Particles"))
     index.write("<li> <a href=\"charged.html\">Charged Particles</a>\n")
     index.write("<ul>\n")
     # total multiplicity
     index.write("<li> <a href=\"charged.html#mult\">Total Charged Multiplicity</a> \n")
     charged.write("<h2 id=\"mult\">Charged Particle Multiplicity</h2>\n")
     charged.write("<div style=\"float:none; overflow:auto; width:100%\">\n")
     writePlots(analyses["Charged"]["TotalChargedMult"][0],charged)
     charged.write("</div>\n")
     # with cuts
     charged.write("<h2 id=\"mult_c\">Charged Particle Multiplicity, With Cuts</h2>\n")
     index.write("<a href=\"charged.html#mult_c\">(with cuts)</a> \n")
     charged.write("<div style=\"float:none; overflow:auto; width:100%\">\n")
     writePlots(analyses["Charged"]["TotalChargedMult"]["C"],charged)
     charged.write("</div>\n")
     # multiplicity dist
     charged.write("<h2 id=\"multdist\">Charged Particle Multiplicity Distribution</h2>\n")
     index.write("<li> <a href=\"charged.html#multdist\">Charged Multiplicity Distribution</a> \n")
     charged.write("<div style=\"float:none; overflow:auto; width:100%\">\n")
     writePlots(analyses["Charged"]["DistChargedMult"][0],charged)
     charged.write("</div>\n")
     index.write("<a href=\"charged.html#multdist_c\">(with cuts)</a> \n")
     charged.write("<h2 id=\"multdist_c\">Charged Particle Multiplicity Distributions, with cuts</h2>\n")
     charged.write("<div style=\"float:none; overflow:auto; width:100%\">\n")
     writePlots(analyses["Charged"]["DistChargedMult"]["C"],charged)
     charged.write("</div>\n")
     # spectra
     index.write("<li> <a href=\"charged.html#spectra\">Charged Spectra</a> \n")
     charged.write("<h2 id=\"spectra\">Charged Particle Spectra</h2>\n")
     for val2 in [0,"C"] :
         if(val2=="C") :
             charged.write("<h3 id=\"spectra_c\">With cuts</h2>\n")
             index.write("<a href=\"charged.html#spectra_c\">(with cuts)</a> \n")
-        for val in ["x","p","xi"] :
-            if(len(analyses["Charged"]["ChargedSpectrum"][val2][val])==0) : continue
+        for val in ["x","p","xi","Other"] :
+            if(val not in analyses["Charged"]["ChargedSpectrum"][val2] or
+               len(analyses["Charged"]["ChargedSpectrum"][val2][val])==0) : continue
             if(val=="x") :
                 charged.write("<h4 id=\"spectra\">Scaled Momentum</h2>\n")
             elif(val=="p") :
                 charged.write("<h4 id=\"spectra\">Momentum</h2>\n")
             elif(val=="xi") :
                 charged.write("<h4 id=\"spectra\">Log of the Scaled Momentum</h2>\n")
+            elif(val=="Other") :
+                charged.write("<h4 id=\"spectra\">Other Distributions</h2>\n")
             charged.write("<div style=\"float:none; overflow:auto; width:100%\">\n")
             writePlots(analyses["Charged"]["ChargedSpectrum"][val2][val],charged)
             charged.write("</div>\n")
     # with respect to axes
     lFormat="""<div style=\"float:none; overflow:auto; width:100%\">\n<{hlevel} id=\"{tag}\">{name}</{hlevel}>\n"""
     for axis in ["Thrust","Sphericity"] :
         if axis=="Thrust" :
             abbrev = "T"
         else :
             abbrev = "S"
         charged.write("<h2 id=\"%s\">Charged Particle Distribution w.r.t the %s axis</h2>\n" % (abbrev,axis))
         index.write("<li> <a href=\"charged.html#%s\">Distributions w.r.t %s axis:</a> \n" % (abbrev,axis))
         # rapidity
         index.write(" <a href=\"charged.html#%srap\">rapidity,<a/>\n" %abbrev)
         charged.write(lFormat.format(hlevel="h3",tag="%srap"%abbrev,name="Rapidity"))
         writePlots(analyses["Charged"]["ChargedRapidity%s"%axis],charged)
         charged.write("</div>\n")
         # pT in
         index.write(" <a href=\"charged.html#%sptin\">$p_\\perp^{\\text{in}}$,<a/>\n" %abbrev)
         charged.write(lFormat.format(hlevel="h3",tag="%sptin"%abbrev,name="$p_\\perp^{\\text{in}}$"))
         writePlots(analyses["Charged"]["ChargedpTIn%s"%axis],charged)
         charged.write("</div>\n")
         # pT out
         index.write(" <a href=\"charged.html#%sptout\">$p_\\perp^{\\text{out}}$,<a/>\n" %abbrev)
         charged.write(lFormat.format(hlevel="h3",tag="%sptout"%abbrev,name="$p_\\perp^{\\text{out}}$"))
         writePlots(analyses["Charged"]["ChargedpTOut%s"%axis],charged)
         charged.write("</div>\n")
         # pL
         if("ChargedpL%s"%axis in analyses["Charged"] and len(analyses["Charged"]["ChargedpL%s"%axis])!=0) :
             index.write(" <a href=\"charged.html#%spL\">$p_\\parallel$,<a/>\n" %abbrev)
             charged.write(lFormat.format(hlevel="h3",tag="%spL"%abbrev,name="$p_\\parallel$"))
             writePlots(analyses["Charged"]["ChargedpL%s"%axis],charged)
             charged.write("</div>\n")
         # pT
         if("ChargedpT%s"%axis in analyses["Charged"] and len(analyses["Charged"]["ChargedpT%s"%axis])!=0) :
             index.write(" <a href=\"charged.html#%spt\">$p_\\perp$,<a/>\n" %abbrev)
             charged.write(lFormat.format(hlevel="h3",tag="%spt"%abbrev,name="$p_\\perp$"))
             writePlots(analyses["Charged"]["ChargedpT%s"%axis],charged)
             charged.write("</div>\n")
         # pT average
         if("ChargedAveragepT%s"%axis in analyses["Charged"] and len(analyses["Charged"]["ChargedAveragepT%s"%axis])!=0) :
             index.write(" <a href=\"charged.html#%sptaver\">$\langle p_\\perp\\rangle$,<a/>\n" %abbrev)
             charged.write(lFormat.format(hlevel="h3",tag="%sptaver"%abbrev,name="$\langle p_\\perp\\rangle$"))
             writePlots(analyses["Charged"]["ChargedAveragepT%s"%axis],charged)
             charged.write("</div>\n")
         # pT2 average 
         if("ChargedAveragepT2%s"%axis in analyses["Charged"] and len(analyses["Charged"]["ChargedAveragepT2%s"%axis])!=0) :
             index.write(" <a href=\"charged.html#%spt2aver\">$\langle p^2_\\perp\\rangle$,<a/>\n" %abbrev)
             charged.write(lFormat.format(hlevel="h3",tag="%spt2aver"%abbrev,name="$\langle p^2_\\perp\\rangle$"))
             writePlots(analyses["Charged"]["ChargedAveragepT2%s"%axis],charged)
             charged.write("</div>\n")
         # pT sum
         if("ChargedSumpT%s"%axis in analyses["Charged"] and len(analyses["Charged"]["ChargedSumpT%s"%axis])!=0) :
             index.write(" <a href=\"charged.html#%sptsum\">$\sum p_\\perp$,<a/>\n" %abbrev)
             charged.write(lFormat.format(hlevel="h3",tag="%sptsum"%abbrev,name="$\sum p_\\perp$"))
             writePlots(analyses["Charged"]["ChargedSumpT%s"%axis],charged)
             charged.write("</div>\n")
         # pT2 sum
         if("ChargedSumpT2%s"%axis in analyses["Charged"] and len(analyses["Charged"]["ChargedSumpT2%s"%axis])!=0) :
             index.write(" <a href=\"charged.html#%sptsum\">$\sum p^2_\\perp$,<a/>\n" %abbrev)
             charged.write(lFormat.format(hlevel="h3",tag="%sptsum"%abbrev,name="$\sum p^2_\\perp$"))
             writePlots(analyses["Charged"]["ChargedSumpT2%s"%axis],charged)
             charged.write("</div>\n")
         # pT vs xp
         if("ChargedpTvsxp%s"%axis in analyses["Charged"] and len(analyses["Charged"]["ChargedpTvsxp%s"%axis])!=0) :
             index.write(" <a href=\"charged.html#%spt\">$p_\\perp$ vs $x_p$,<a/>\n" %abbrev)
             charged.write(lFormat.format(hlevel="h3",tag="%spt"%abbrev,name="$p_\\perp$ vs $x_p$"))
             writePlots(analyses["Charged"]["ChargedpTvsxp%s"%axis],charged)
             charged.write("</div>\n")
         # pT out vs xp
         if("ChargedpTOutvsxp%s"%axis in analyses["Charged"] and len(analyses["Charged"]["ChargedpTOutvsxp%s"%axis])!=0) :
             index.write(" <a href=\"charged.html#%spt\">$p^{\\text{out}}_\\perp$ vs $x_p$,<a/>\n" %abbrev)
             charged.write(lFormat.format(hlevel="h3",tag="%spt"%abbrev,name="$p^{\\text{out}}_\\perp$ vs $x_p$"))
             writePlots(analyses["Charged"]["ChargedpTOutvsxp%s"%axis],charged)
             charged.write("</div>\n")
         # xF
         if("ChargedxF%s"%axis in analyses["Charged"] and len(analyses["Charged"]["ChargedxF%s"%axis])!=0) :
             index.write(" <a href=\"charged.html#%sxF\">$x_F$.<a/>\n" %abbrev)
             charged.write(lFormat.format(hlevel="h3",tag="%sxF"%abbrev,name="$x_F$"))
             writePlots(analyses["Charged"]["ChargedxF%s"%axis],charged)
             charged.write("</div>\n")
         # pT2
         if("ChargedpT2%s"%axis in analyses["Charged"] and len(analyses["Charged"]["ChargedpT2%s"%axis])!=0) :
             index.write(" <a href=\"charged.html#%spt2\">$p^2_\\perp$,<a/>\n" %abbrev)
             charged.write(lFormat.format(hlevel="h3",tag="%spt2"%abbrev,name="$p^2_\\perp$"))
             writePlots(analyses["Charged"]["ChargedpT2%s"%axis],charged)
             charged.write("</div>\n")
         # average ptin
         if("ChargedAveragepT2in%s"%axis in analyses["Charged"] and len(analyses["Charged"]["ChargedAveragepT2in%s"%axis])!=0) :
             index.write(" <a href=\"charged.html#%saverpt2in\">$\langle p^2_{\\perp\\text{in}}\\rangle$,<a/>\n" %abbrev)
             charged.write(lFormat.format(hlevel="h3",tag="%saverpt2in"%abbrev,name="$\langle p^2_{\\perp\\text{in}}\\rangle$"))
             writePlots(analyses["Charged"]["ChargedAveragepT2in%s"%axis],charged)
             charged.write("</div>\n")
         # average ptout
         if("ChargedAveragepT2out%s"%axis in analyses["Charged"] and len(analyses["Charged"]["ChargedAveragepT2out%s"%axis])!=0) :
             index.write(" <a href=\"charged.html#%saverpt2out\">$\langle p^2_{\\perp\\text{out}}\\rangle$,<a/>\n" %abbrev)
             charged.write(lFormat.format(hlevel="h3",tag="%saverpt2out"%abbrev,name="$\langle p^2_{\\perp\\text{out}}\\rangle$"))
             writePlots(analyses["Charged"]["ChargedAveragepT2out%s"%axis],charged)
             charged.write("</div>\n")
         # charged flow
         if("ChargedFlow%s"%axis in analyses["Charged"] and len(analyses["Charged"]["ChargedFlow%s"%axis])!=0) :
             index.write(" <a href=\"charged.html#%sFlow\">Charge Flow,<a/>\n" %abbrev)
             charged.write(lFormat.format(hlevel="h3",tag="%sFlow"%abbrev,name="Charge Flow"))
             writePlots(analyses["Charged"]["ChargedFlow%s"%axis],charged)
             charged.write("</div>\n")
         # energy flow
         if("ChargedEnergyFlow%s"%axis in analyses["Charged"] and len(analyses["Charged"]["ChargedEnergyFlow%s"%axis])!=0) :
             index.write(" <a href=\"charged.html#%sEnergyFlow\">Energy Flow.<a/>\n" %abbrev)
             charged.write(lFormat.format(hlevel="h3",tag="%sEnergyFlow"%abbrev,name="Energy Flow"))
             writePlots(analyses["Charged"]["ChargedEnergyFlow%s"%axis],charged)
             charged.write("</div>\n")
     # footer
     index.write(" </ul>\n")
     charged.write("</body>\n</html>")
     charged.close()
     
 def writeJets(index) :
     jets=open(os.path.join(directory,"jets.html"),'w')
     jets.write(header.format(title="Comparisions of Herwig7 and $e^+e^-$ Jet Data"))
     index.write("<li> <a href=\"jets.html\">Jets</a>\n")
     index.write("<ul>\n")
     # fractions
     jets.write("<h2 id=\"FRACTION\">Jet Fractions</h2>\n")
     index.write("<li> <a href=\"jets.html#FRACTION\">Jet Fractions:</a> \n")
     lFormat="""<div style=\"float:none; overflow:auto; width:100%\">\n<{hlevel} id=\"{tag}\">{name}</{hlevel}>\n"""
     for i in range(1,7) :
         if(i<6) : index.write(" <a href=\"jets.html#%sjet\">%s jet,<a/>\n" % (i,i))
         else    :  index.write(" <a href=\"jets.html#%sjet\">%s jet.<a/>\n" % (i,i))
         jets .write(lFormat.format(hlevel="h3",tag   ="%sjet" % i,name  ="%s Jet Fraction" % i))
         jets .write(lFormat.format(hlevel="h4",tag   ="%sjet_dur" % i,name  ="%s Jet Fraction (Durham)" % i))
         writePlots(analyses["EventShapes"]["%sjet_dur" % i],jets)
         jets.write("</div>\n")
         jets .write(lFormat.format(hlevel="h4",tag   ="%sjet_jade" % i,name  ="%s Jet Fraction (JADE)" % i))
         writePlots(analyses["EventShapes"]["%sjet_jade" % i],jets)
         jets.write("</div>\n")
         jets.write("</div>\n")
     # differential jet rates
     index.write("<li> <a href=\"jets.html#DRATE\">Differential jet rates:</a> \n")
     jets.write("<h2 id=\"DRATE\">Differential Jet Rates</h2>\n")
     for i in range(1,6) :
         yval="%s%s" % (i,i+1)
         if(i!=5) : index.write(" <a href=\"jets.html#y%s\">$y_{%s}$,<a/>\n" %(yval,yval))
         else     : index.write(" <a href=\"jets.html#y%s\">$y_{%s}$.<a/>\n" %(yval,yval))
         jets .write(lFormat.format(hlevel="h3",tag   ="y%s" % yval,name  ="$y_{%s}$" % yval))
         if(len(analyses["EventShapes"]["y%s_dur" % yval])!=0) :
             jets .write(lFormat.format(hlevel="h4",tag   ="y%s_dur" % yval,name  ="$y_{%s}$ (Durham)" % yval))
             writePlots(analyses["EventShapes"]["y%s_dur" % yval],jets)
             jets.write("</div>\n")
         if(len(analyses["EventShapes"]["y%s_jade" % yval])!=0) :
             jets .write(lFormat.format(hlevel="h4",tag   ="y%s_jade" % yval,name  ="$y_{%s}$ (JADE)" % yval))
             writePlots(analyses["EventShapes"]["y%s_jade" % yval],jets)
             jets.write("</div>\n")
         jets.write("</div>\n")
     # 4 jet angles
     index.write("<li> <a href=\"jets.html#4JET\">Four jet angles:</a> \n")
     jets.write("<h2 id=\"4JET\">Four Jet Angles</h2>\n")
     for val in ["BZ","KSW","NR","alpha34"] :
         if val == "BZ"        : title="Bengtsson-Zerwas angle"
         elif val == "KSW"     : title="Korner-Schierholz-Willrodt angle"
         elif val == "NR"      : title="Modified Nachtmann-Reiter angle"
         elif val == "alpha34" : title="$\\alpha_{34}$"
         if(val!="alpha34") : index.write(" <a href=\"jets.html#%s\">%s,<a/>\n" %(val,title))
         else               : index.write(" <a href=\"jets.html#%s\">%s.<a/>\n" %(val,title))
         jets .write(lFormat.format(hlevel="h3",tag=val,name=title))
         writePlots(analyses["FourJet"][val],jets)
     # footer
     index.write(" </ul>\n")
     jets.write("</div>\n")
     jets.write("</body>\n</html>")
     jets.close()
 
 def writeEventShapes(index) :
     lFormat="""<div style=\"float:none; overflow:auto; width:100%\">\n<{hlevel} id=\"{tag}\">{name}</{hlevel}>\n"""
     index.write("<ul>\n")
     index.write("<li> <a href=\"event.html\">Event Shapes</a>\n")
     index.write("<ul>\n")
     event=open(os.path.join(directory,"event.html"),'w')
     event.write(header.format(title="Comparisions of Herwig7 and $e^+e^-$ Event Shape Data"))
     # thrust and related
     event.write("<h2 id=\"THRUST\">Thrust and Related Variables</h2>\n")
     index.write("<li> <a href=\"event.html#THRUST\">Thrust related:</a> \n")
     for obs in ["T","Major","Minor","O"]:
         title=obs
         if(title=="T") : title="Thrust"
         elif(title=="O") : title="Oblateness"
         event.write(lFormat.format(hlevel="h3",tag=obs,name=title))
         index.write(" <a href=\"event.html#%s\">%s,<a/>\n" %(obs,title))
         writePlots(analyses["EventShapes"][obs],event)
         event.write("</div>\n")
     # sphericity and related
     index.write("<li> <a href=\"event.html#SPHERICITY\">Sphericity related:</a> \n")
     event.write("<h2 id=\"SPHERICITY\">Sphericity and Related Variables</h2>\n")
     for obs in ["S","P","A","Qx","Q21"]:
         if   obs == "S"  : title="Sphericity"
         elif obs == "P"  : title="Planarity"
         elif obs == "A"  : title="Aplanarity"
         elif obs == "Qx" : title="$Q_x$"
         elif obs == "Q21": title="$Q_2-Q_1$"
         event.write(lFormat.format(hlevel="h3",tag=obs,name=title))
         index.write(" <a href=\"event.html#%s\">%s,<a/>\n" %(obs,title))
         writePlots(analyses["EventShapes"][obs],event)
         event.write("</div>\n")
     # jet masses
     event.write("<h2 id=\"MASSES\">Jet Masses</h2>\n")
     index.write("<li> <a href=\"event.html#MASSES\">Jet Masses:</a> \n")
     for obs in ["HeavyJetMass","LightJetMass","TotalJetMass","JetMassDifference"]:
         if   obs == "HeavyJetMass"      : title="Heavy Jet Mass"
         elif obs == "LightJetMass"      : title="Light Jet Mass"
         elif obs == "TotalJetMass"      : title="Total Jet Mass"
         elif obs == "JetMassDifference" : title="Jet Mass Difference"
         event.write(lFormat.format(hlevel="h3",tag=obs,name=title))
         index.write(" <a href=\"event.html#%s\">%s,<a/>\n" %(obs,title))
         writePlots(analyses["EventShapes"][obs],event)
         event.write("</div>\n")
     # EEC and AEEC
     event.write("<h2 id=\"eec\">Energy-Energy Correlations</h2>\n")
     index.write("<li> <a href=\"event.html#eec\">Energy-Energy Correlations:</a> \n")
     for obs in ["EEC","AEEC"]:
         if   obs == "EEC"  : title="Energy-Energy Correlation"
         elif obs == "AEEC" : title="Energy-Energy Asymmetry Correlation"
         event.write(lFormat.format(hlevel="h3",tag=obs,name=title))
         index.write(" <a href=\"event.html#%s\">%s,<a/>\n" %(obs,title))
         writePlots(analyses["EventShapes"][obs],event)
         event.write("</div>\n")
     # jet broadening
     event.write("<h2 id=\"JB\">Jet Broadenings</h2>\n")
     index.write("<li> <a href=\"event.html#JB\">Jet Broadening:</a> \n")
     for obs in ["BT","BW","BN","Bdiff"]:
         if   obs == "BT"    : title="Total Jet Broadening"
         elif obs == "BW"    : title="Wide Jet Broadening"
         elif obs == "BN"    : title="Narrow Jet Broadening"
         elif obs == "Bdiff" : title="Difference of Jet Broadenings"
         event.write(lFormat.format(hlevel="h3",tag=obs,name=title))
         index.write(" <a href=\"event.html#%s\">%s,<a/>\n" %(obs,title))
         writePlots(analyses["EventShapes"][obs],event)
         event.write("</div>\n")
     # C and D
     event.write("<h2 id=\"CD\">C and D parameters</h2>\n")
     index.write("<li> <a href=\"event.html#CD\">C and D parameters:</a> \n")
     for obs in ["C","D"]:
         title= "%s-parameter" % obs
         event.write(lFormat.format(hlevel="h3",tag=obs,name=title))
         index.write(" <a href=\"event.html#%s\">%s,<a/>\n" %(obs,title))
         writePlots(analyses["EventShapes"][obs],event)
         event.write("</div>\n")    
     # moments of event shapes
     event.write("<h2 id=\"MOMENT\">Moments of Event Shapes</h2>\n")
     index.write("<li> <a href=\"event.html#MOMENT\">Moments:</a> \n")
     for val in ["Moment_T","Moment_M","Moment_m","Moment_O","Moment_H","Moment_L",
                 "Moment_BT","Moment_BW","Moment_BN","Moment_C","Moment_S","Moment_y"] :
         if(val=="Moment_T") :
             event.write("<div style=\"float:none; overflow:auto; width:100%\">\n<h3 id=\"m_thrust\">Thrust</h3>\n")
             index.write(" <a href=\"event.html#m_thrust\">thrust,<a/>\n")
         elif(val=="Moment_M") :
             event.write("<div style=\"float:none; overflow:auto; width:100%\">\n<h3 id=\"m_major\">Thrust Major</h3>\n")
             index.write(" <a href=\"event.html#m_major\">major,<a/>\n")
         elif(val=="Moment_m") :
             event.write("<div style=\"float:none; overflow:auto; width:100%\">\n<h3 id=\"m_minor\">Thrust Minor</h3>\n")
             index.write(" <a href=\"event.html#m_minor\">minor,<a/>\n")
         elif(val=="Moment_O") :
             event.write("<div style=\"float:none; overflow:auto; width:100%\">\n<h3 id=\"m_O\">Oblateness</h3>\n")
             index.write(" <a href=\"event.html#m_O\">oblateness,<a/>\n")
         elif(val=="Moment_H") :
             event.write("<div style=\"float:none; overflow:auto; width:100%\">\n<h3 id=\"m_heavy\">Heavy Jet Mass</h3>\n")
             index.write(" <a href=\"event.html#m_heavy\">heavy jet mass,<a/>\n")
         elif(val=="Moment_L") :
             event.write("<div style=\"float:none; overflow:auto; width:100%\">\n<h3 id=\"m_light\">Light Jet Mass</h3>\n")
             index.write(" <a href=\"event.html#m_light\">light jet mass,<a/>\n")
         elif(val=="Moment_BT") :
             event.write("<div style=\"float:none; overflow:auto; width:100%\">\n<h3 id=\"m_bt\">Total Jet Broadening</h3>\n")
             index.write(" <a href=\"event.html#m_bt\">total jet broadening,<a/>\n")
         elif(val=="Moment_BW") :
             event.write("<div style=\"float:none; overflow:auto; width:100%\">\n<h3 id=\"m_bw\">Wide Jet Broadening</h3>\n")
             index.write(" <a href=\"event.html#m_bw\">wide jet broadening,<a/>\n")
         elif(val=="Moment_BN") :
             event.write("<div style=\"float:none; overflow:auto; width:100%\">\n<h3 id=\"m_bn\">Narrow Jet Broadening</h3>\n")
             index.write(" <a href=\"event.html#m_bn\">narrow jet broadening,<a/>\n")
         elif(val=="Moment_C") :
             event.write("<div style=\"float:none; overflow:auto; width:100%\">\n<h3 id=\"m_C\">C-parameter</h3>\n")
             index.write(" <a href=\"event.html#m_C\">C-parameter,<a/>\n")
         elif(val=="Moment_S") :
             event.write("<div style=\"float:none; overflow:auto; width:100%\">\n<h3 id=\"m_S\">Sphericity</h3>\n")
             index.write(" <a href=\"event.html#m_S\">sphericity,<a/>\n")
         elif(val=="Moment_y") :
             event.write("<div style=\"float:none; overflow:auto; width:100%\">\n<h3 id=\"m_y\">$y_{23}$</h3>\n")
             index.write(" <a href=\"event.html#m_y\">$y_{23}$<a/>\n")
         writePlots(analyses["EventShapes"][val],event)
         event.write("</div>\n")
     # footer
     index.write(" </ul>\n")
     event.write("</body>\n</html>")
     event.close()
     
 def writeGluon(index) :
     index.write("<li> <a href=\"gluon.html\">Gluons</a>\n")
     gluon=open(os.path.join(directory,"gluon.html"),'w')
     gluon.write(header.format(title="Comparisions of Herwig7 and $e^+e^-$ Data on Gluon Jets"))
     index.write("<ul>\n")
     # charged particles dists
     gluon.write("<h2 id=\"multdist\">Charged Particle Multiplicity in Gluon Jets</h2>\n")
     index.write("<li> <a href=\"gluon.html#multdist\">Charged Particle Multiplicity</a> \n")
     gluon.write("<div style=\"float:none; overflow:auto; width:100%\">\n")
     writePlots(analyses["Charged"]["DistChargedMult"][21],gluon)
     gluon.write("</div>\n")
     # spectra
     index.write("<li> <a href=\"gluon.html#spectra\">Charged Spectra</a> \n")
     gluon.write("<h2 id=\"spectra\">Charged Particle Spectra for Gluon Jets</h2>\n")
     for val in ["x","p","xi"] :
         if(len(analyses["Charged"]["ChargedSpectrum"][21][val])==0) : continue
         if(val=="x") :
             gluon.write("<h4 id=\"spectra\">Scaled Momentum</h2>\n")
         elif(val=="p") :
             gluon.write("<h4 id=\"spectra\">Momentum</h2>\n")
         elif(val=="xi") :
             gluon.write("<h4 id=\"spectra\">Log of the Scaled Momentum</h2>\n")
         gluon.write("<div style=\"float:none; overflow:auto; width:100%\">\n")
         writePlots(analyses["Charged"]["ChargedSpectrum"][21][val],gluon)
         gluon.write("</div>\n")
     # footer
     index.write("</ul>\n")
     gluon.write("</body>\n</html>")
     gluon.close()
     
+# output the polarization plots
+def writePolarization(index) :
+    pol=open(os.path.join(directory,"polarization.html"),'w')
+    # header for page
+    pol.write(header.format(title="Comparisions of Herwig7 and $e^+e^-$ Polarization Observables"))
+    # # line for index
+    index.write("<li> <a href=\"polarization.html\">Polarization Measurements</a>\n")
+    index.write("<ul>\n")
+    # pol.write("<h2 id=\"MESONS\">Mesons</h2>\n")
+    # Light unflavoured mesons
+    pol.write("<h3 id=\"m_light\">Light, Unflavoured</h3>\n")
+    index.write("<li><a href=\"polarization.html#m_light\">Light unflavoured mesons:<a/>\n")
+    writePolar(mLight,index,pol)
+    # Strange mesons
+    pol.write("<h3 id=\"m_strange\">Strange</h3>\n")
+    index.write("<li><a href=\"polarization.html#m_strange\">Strange mesons:<a/>\n")
+    writePolar(mStrange,index,pol)
+    # charm mesons
+    pol.write("<h3 id=\"m_charm\">Charm</h3>\n")
+    index.write("<li><a href=\"polarization.html#m_charm\">Charm mesons:<a/>\n")
+    writePolar(mCharm,index,pol)
+    # charm mesons
+    pol.write("<h3 id=\"m_charm\">Bottom</h3>\n")
+    index.write("<li><a href=\"polarization.html#m_charm\">Bottom mesons:<a/>\n")
+    writePolar(mBottom,index,pol)
+    # # charmonium
+    # pol.write("<h3 id=\"m_charm\">Charmonium</h3>\n")
+    # index.write("<li><a href=\"polarization.html#m_charm\">Charmonium:<a/>\n")
+    # writePolar(mccbar,index,pol)
+    # Baryons
+    pol.write("<h2 id=\"BARYONS\">Baryons</h2>\n")
+    # # light baryons
+    # pol.write("<h3 id=\"b_light\">Light, Unflavoured</h3>\n")
+    # index.write("<li><a href=\"polarization.html#b_light\">Light unflavoured baryons:<a/>\n")
+    # writePolar(bLight,index,pol)
+    # hyperons
+    pol.write("<h3 id=\"b_strange\">Hyperons</h3>\n")
+    index.write("<li><a href=\"polarization.html#b_strange\">Hyperons:<a/>\n")
+    writePolar(bStrange,index,pol)
+    # # charm baryons
+    # pol.write("<h3 id=\"b_charm\">Charm Baryons</h3>\n")
+    # index.write("<li><a href=\"polarization.html#b_charm\">Charm baryons:<a/>\n")
+    # writePolar(bCharm,index,pol)
+    # bottom baryons
+    pol.write("<h3 id=\"b_bottom\">Bottom Baryons</h3>\n")
+    index.write("<li><a href=\"polarization.html#b_bottom\">Bottom baryons:<a/>\n")
+    # loop over particles
+    writePolar(bBottom,index,pol)
+    # footer
+    index.write(" </ul>\n")    
+    pol.write("</body>\n</html>")
+    pol.close()
+
 print 'Total no of figures',len(figures)
 index=open(os.path.join(directory,"herwig.html"),'w')
 index.write(header.format(title="Comparisions of Herwig7 and $e^+e^-$ Data"))
 # event shapes
 writeEventShapes(index)
 # charged particles
 writeCharged(index)
 # jets
 writeJets(index)
 # identified particle spectra
 writeIdentified(index)
 # identified particle multiplicity
 writeMult(index)
 # flavour
 writeFlavour(index)
 # gluons
 writeGluon(index)
+# polarization
+writePolarization(index)
 # QED
 writeQED(index)
 # tau decays
 writeTauDecays(index)
 # hadron decays
 writeDecays(index)
 # remaining plots
 if(len(figures)>0) :
     writeMisc(index)
 else :
     print 'All figures used'
 # footer
 index.write("</ul>\n")
 index.write("</body>\n</html>")
 index.close()
diff --git a/Tests/python/rivet_check.script b/Tests/python/rivet_check
old mode 100755
new mode 100644
rename from Tests/python/rivet_check.script
rename to Tests/python/rivet_check
--- a/Tests/python/rivet_check.script
+++ b/Tests/python/rivet_check
@@ -1,106 +1,124 @@
 #!/usr/bin/python
 import glob,subprocess,os,optparse
 
 op = optparse.OptionParser(usage=__doc__)
 op.add_option("--obsolete", dest="obsolete" , default=False, action="store_true" , help="Warn if obsolete analyses not included")
 op.add_option("--search", dest="search" , default=False, action="store_true" , help="Warn if search analyses not included")
 op.add_option("--heavy-ion", dest="heavy_ion" , default=False, action="store_true" , help="Warn if heavy ion analyses not included")
 op.add_option("--MC", dest="MC" , default=False, action="store_true" , help="Warn if MC analyses not included")
 op.add_option("--print-descriptions", dest="output" , default=False, action="store_true" , help="Print analysis descriptions")
 opts, args = op.parse_args()
 
 # analyses to skip
 skip = [ "ATLAS_2010_I849050", # alias
          "TOTEM_2012_002"    , # alias
          "TEST"              , # test analysis
+         "ATLAS_2015_I1351916", # same as _EL version
+         "ATLAS_2015_CONF_2015_041", # superseeded
         ]
-searches=["ALEPH_2016_I1492968"]
+searches=["ALEPH_2016_I1492968","ATLAS_2019_I1725190"]
 
 
 p=subprocess.Popen(["rivet","--list"],stdout=subprocess.PIPE)
 analyses={}
 for line in p.communicate()[0].split("\n") :
     line=line.strip()
     if(line=="") : continue
     temp =  line.split(None,1)
     if(len(temp)==2) :
         analyses[temp[0].strip()] = temp[1].strip()
     elif(len(temp)==1) :
         analyses[temp[0].strip()] = ""
     else :
         print line
         quit()
 
 # main line hw analyses at high energy
 hw_analyses={}
 files=[]
 for idir in glob.glob("Rivet/*") :
     if( "Powheg" in idir or "MCatNLO" in idir) : continue
     if ( not os.path.isdir(idir) ) : continue
     if ( "Templates" in idir ) : continue
     for ifile in glob.glob("%s/*.in" % idir) :
         fshort=ifile.split("/")[-1].replace(".in","")
         files.append(fshort)
         file=open(ifile)
         line=file.readline()
         while line:
             if("RivetAnalysis:Analyses" in line and line[0]!="#") :
                 line=line.strip().split()
                 anal = line[-1].strip().split(":")[0]
                 if(anal not in hw_analyses) :
                     hw_analyses[anal] = [fshort]
                 else :
                     hw_analyses[anal].append(fshort)
             line=file.readline()
+            
+# low energy herwig analysis
+p = subprocess.Popen(["./python/LowEnergy.py","--list","--process","All"],stdout=subprocess.PIPE)
+lowEnergy = p.communicate()[0]
+hw_low_energy_analyses=lowEnergy.strip().split()
+# R analyses
+p = subprocess.Popen(["./python/R.py","--list"],stdout=subprocess.PIPE)
+Rlist = p.communicate()[0]
+hw_R_analyses=Rlist.strip().split()
 
 anatohepmc = open("anatohepmc.txt",'w')
 hepmctoana = open("hepmctoana.txt",'w')
+
 not_in_rivet=[]
 for val in hw_analyses.keys() : not_in_rivet.append(val) 
 # check the analyses
 for analysis in sorted(analyses.keys()) :
     # we have it high energy
     if(analysis in hw_analyses) :
         anatohepmc.write("%s %s\n" % (analysis,' '.join(sorted(hw_analyses[analysis]))) )
         if("[OBSOLETE]" in analyses[analysis]) :
             print "WARNING Obsolete analysis %s included : %s" % (analysis,analyses[analysis])
         if(analysis in not_in_rivet) :
             not_in_rivet.remove(analysis)
+    # we have it low energy or R or skipping
+    elif (analysis in hw_low_energy_analyses or analysis in skip or
+          analysis in hw_R_analyses ) :
+        if(analysis in not_in_rivet) :
+            not_in_rivet.remove(analysis)
+        continue
     # obsolete
     elif("[OBSOLETE]" in analyses[analysis]) :
         if(opts.obsolete) : print "Obsolete analysis %s not included : %s" % (analysis,analyses[analysis])
     # searches
     elif("Search" in analyses[analysis] or "search" in analyses[analysis] or analysis in searches) :
         if(opts.search) : print "Search   analysis %s not included  : %s" % (analysis,analyses[analysis])
     # mc only
     elif(analysis[0:3]=="MC_") :
         if(opts.MC) : print "MC   analysis %s not included  : %s" % (analysis,analyses[analysis])
     # examples
-    elif("[EXAMPLE]" in analyses[analysis]) :
+    elif("EXAMPLE" in analyses[analysis]) or "EXAMPLE" in analysis:
         continue
     # we don't have it
     else :
         p=subprocess.Popen(["rivet","--show-analysis",analysis],stdout=subprocess.PIPE)
         desc=p.communicate()[0]
         beams=[]
         for line in desc.split("\n") :
             if("Beams:" in line) :
                 beams=line.replace("Beams:","").split()
         nHeavy = sum((part=="Pb" or part=="Au") for part in beams)
         if(nHeavy == len(beams) or nHeavy+1 == len(beams)) :
             if(opts.heavy_ion) : print "Heavy Ion analysis %s not included  : %s" % (analysis,analyses[analysis])
         else :
             print "MISSING ANALYSIS",analysis,analyses[analysis]
             if(opts.output) : print desc
 # outout analyses missing from rivet
 for val in not_in_rivet:
     print "NOT IN RIVET ",val
 # output second file for rivet
 anatohepmc.close()
 for fname in sorted(files) :
     anals=[]
     for anal in hw_analyses :
         if(fname in hw_analyses[anal]) :
             anals.append(anal)
     hepmctoana.write("%s %s\n" % (fname,' '.join(sorted(anals))) )
 hepmctoana.close()