diff --git a/Tests/Makefile.am b/Tests/Makefile.am
--- a/Tests/Makefile.am
+++ b/Tests/Makefile.am
@@ -1,387 +1,387 @@
AM_LDFLAGS += -module -avoid-version -rpath /dummy/path/not/used
EXTRA_DIST = Inputs python Rivet
EXTRA_LTLIBRARIES = LeptonTest.la GammaTest.la HadronTest.la DISTest.la
if WANT_LIBFASTJET
EXTRA_LTLIBRARIES += HadronJetTest.la LeptonJetTest.la
HadronJetTest_la_SOURCES = \
Hadron/VHTest.h Hadron/VHTest.cc\
Hadron/VTest.h Hadron/VTest.cc\
Hadron/HTest.h Hadron/HTest.cc
HadronJetTest_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
-I$(FASTJETPATH)
HadronJetTest_la_LIBADD = $(FASTJETLIBS)
LeptonJetTest_la_SOURCES = \
Lepton/TopDecay.h Lepton/TopDecay.cc
LeptonJetTest_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
-I$(FASTJETPATH)
LeptonJetTest_la_LIBADD = $(FASTJETLIBS)
endif
LeptonTest_la_SOURCES = \
Lepton/VVTest.h Lepton/VVTest.cc \
Lepton/VBFTest.h Lepton/VBFTest.cc \
Lepton/VHTest.h Lepton/VHTest.cc \
Lepton/FermionTest.h Lepton/FermionTest.cc
GammaTest_la_SOURCES = \
Gamma/GammaMETest.h Gamma/GammaMETest.cc \
Gamma/GammaPMETest.h Gamma/GammaPMETest.cc
DISTest_la_SOURCES = \
DIS/DISTest.h DIS/DISTest.cc
HadronTest_la_SOURCES = \
Hadron/HadronVVTest.h Hadron/HadronVVTest.cc\
Hadron/HadronVBFTest.h Hadron/HadronVBFTest.cc\
Hadron/WHTest.h Hadron/WHTest.cc\
Hadron/ZHTest.h Hadron/ZHTest.cc\
Hadron/VGammaTest.h Hadron/VGammaTest.cc\
Hadron/ZJetTest.h Hadron/ZJetTest.cc\
Hadron/WJetTest.h Hadron/WJetTest.cc\
Hadron/QQHTest.h Hadron/QQHTest.cc
REPO = $(top_builddir)/src/HerwigDefaults.rpo
HERWIG = $(top_builddir)/src/Herwig
HWREAD = $(HERWIG) read --repo $(REPO) -L $(builddir)/.libs -i $(top_builddir)/src
HWBUILD = $(HERWIG) build --repo $(REPO) -L $(builddir)/.libs -i $(top_builddir)/src
HWINTEGRATE = $(HERWIG) integrate
HWRUN = $(HERWIG) run -N $${NUMEVENTS:-10000}
tests : tests-LEP tests-DIS tests-LHC tests-Gamma
LEPDEPS = \
test-LEP-VV \
test-LEP-VH \
test-LEP-VBF \
test-LEP-BB \
test-LEP-Quarks \
test-LEP-Leptons
if WANT_LIBFASTJET
LEPDEPS += test-LEP-TopDecay
endif
tests-LEP : $(LEPDEPS)
tests-DIS : test-DIS-Charged test-DIS-Neutral
LHCDEPS = \
test-LHC-WW test-LHC-WZ test-LHC-ZZ \
test-LHC-ZGamma test-LHC-WGamma \
test-LHC-ZH test-LHC-WH \
test-LHC-ZJet test-LHC-WJet \
test-LHC-Z test-LHC-W \
test-LHC-ZZVBF test-LHC-VBF \
test-LHC-WWVBF \
test-LHC-bbH test-LHC-ttH \
test-LHC-GammaGamma test-LHC-GammaJet \
test-LHC-Higgs test-LHC-HiggsJet \
test-LHC-QCDFast test-LHC-QCD \
test-LHC-Top
if WANT_LIBFASTJET
LHCDEPS += \
test-LHC-Bottom \
test-LHC-WHJet test-LHC-ZHJet test-LHC-HJet \
test-LHC-ZShower test-LHC-WShower \
test-LHC-WHJet-Powheg test-LHC-ZHJet-Powheg test-LHC-HJet-Powheg \
test-LHC-ZShower-Powheg test-LHC-WShower-Powheg
endif
tests-LHC : $(LHCDEPS)
tests-Gamma : test-Gamma-FF test-Gamma-WW test-Gamma-P
LEPLIBS = LeptonTest.la
HADLIBS = HadronTest.la
if WANT_LIBFASTJET
LEPLIBS += LeptonJetTest.la
HADLIBS += HadronJetTest.la
endif
test-LEP-% : Inputs/LEP-%.in $(LEPLIBS)
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<))
test-Gamma-% : Inputs/Gamma-%.in GammaTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<))
test-DIS-% : Inputs/DIS-%.in DISTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<))
test-LHC-% : Inputs/LHC-%.in GammaTest.la $(HADLIBS)
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<))
tests-Rivet : Rivet-EE Rivet-DIS Rivet-Fixed \
Rivet-TVT-WZ Rivet-TVT-Photon Rivet-TVT-Jets \
Rivet-LHC-Jets Rivet-LHC-EW Rivet-LHC-Photon Rivet-LHC-Higgs
Rivet-%-UE-Cent.yoda : Rivet-%-UE-Cent.run Rivet-%-Cent.run
rm -rf $(subst .yoda,,$@)
mkdir $(subst .yoda,,$@)
mv $(subst .yoda,.run,$@) $(subst UE-,,$(subst .yoda,.run,$@)) $(subst .yoda,,$@)
cd $(subst .yoda,,$@); ../$(HWRUN) $(subst UE-,,$(subst .yoda,.run,$@)); mv $(subst UE-,,$@) ALICE_2015_PPCentrality.yoda
cd $(subst .yoda,,$@); export RIVET_ANALYSIS_PATH=`pwd`; ../$(HWRUN) $(subst .yoda,.run,$@)
mv $(subst .yoda,,$@)/$@ .
rm -rf $(subst .yoda,,$@)
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,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) \
+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.3,30.7,30.8,30,31.2,31.3,31.6,34,34.8,41,42.1,42.6,43.5,43.6,45,50,52,53.3,55,55.3,56,57,58,59.5,60.8,60,61.4,65.4,66,75.7,76,82,85,10,12.8,21.5,22,25,26.8,34.5,35,36.2,44,48.0,91,93.0,130,130.1,133,136,161,161.3,172,172.3,177,182.8,183,188.6,189,192,194.4,196,197,200,200.2,202,205,206,206.2,207,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.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}-{460,575,820,920}-e+-{Low,Med,High}Q2.yoda) \
$(shell echo Rivet/DIS{,-NoME,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{920-e--{Low,Med,High},820-e--Low}Q2.yoda) \
$(shell echo Rivet/DIS{,-NoME,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-920-{e+,e-}-CC-{Low,Med,High}Q2.yoda) \
$(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}-{7,13}{,-UE}-Cent.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}-{{,8-}W-{e,mu},13-Z-{e,mu},Z-HighMass{1,2}-e,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},13-WW-emu,13-ZZ-ll,ZZ-{ll,lv},{8,13}-WZ,8-ZZ-lv,8-WW-ll,Z-mu-Short}.in) \
$(shell echo Rivet/LHC{,-Dipole}-7-{W,Z}Gamma-{e,mu}.in) \
$(shell echo Rivet/LHC{,-Dipole}-8-ZGamma-{e,mu}.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,{44,62}-Z-mu}.in Rivet/EHS{,-Dipole}-UE.in) \
$(shell echo Rivet/SPS{,-Dipole}-{17.4-UE,200-Z-mu}.in ) \
$(shell echo Rivet/Fermilab{,-Dipole}-{27.4,38.8}-Z-mu.in )
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,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) \
+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.3,30.7,30.8,30,31.2,31.3,31.6,34,34.8,43.5,43.6,45,50,52,53.3,55,55.3,56,57,58,59.5,60.8,60,61.4,65.4,66,75.7,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,130.1,133,136,136.1,161,161.3,172,172.3,177,182.8,183,188.6,189,192,194.4,196,197,200,200.2,202,205,206,206.2,207,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,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 --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-LowEnergy-%.yoda:
$(HWBUILD) -c .cache/$(subst .yoda,,$@) Rivet/$(subst .yoda,.in,$@)
$(HWRUN) $(subst .yoda,.run,$@)
Rivet-LowEnergy-%:
args="--process "$(word 1,$(subst -, ,$(subst Rivet-LowEnergy-,,$@))); if [ -n "$(strip $(word 2,$(subst -, ,$(subst Rivet-LowEnergy-,,$@))))" ]; then args+=" --flavour "$(word 2,$(subst -, ,$(subst Rivet-LowEnergy-,,$@))); fi; OUTPUT=`python/LowEnergy.py $$args --non-perturbative --perturbative`; $(MAKE) $$OUTPUT NUMEVENTS=$${NUMEVENTS:-10000};
args="--process "$(word 1,$(subst -, ,$(subst Rivet-LowEnergy-,,$@))); plots=`python/LowEnergy.py $$args --plots`; python/mergeLowEnergy.py $(subst Rivet-LowEnergy-,,$@) $$plots; if [ -e LowEnergy-EE-NonPerturbative-$(subst Rivet-LowEnergy-,,$@).yoda ] && [ -e LowEnergy-EE-Perturbative-$(subst Rivet-LowEnergy-,,$@).yoda ]; then rivet-mkhtml -o Rivet-LowEnergy-$(subst Rivet-LowEnergy-,,$@) LowEnergy-EE-NonPerturbative-$(subst Rivet-LowEnergy-,,$@).yoda:"Non-Pert" LowEnergy-EE-Perturbative-$(subst Rivet-LowEnergy-,,$@).yoda:"Pert" $$plots; elif [ -e LowEnergy-EE-NonPerturbative-$(subst Rivet-LowEnergy-,,$@).yoda ]; then rivet-mkhtml -o Rivet-LowEnergy-$(subst Rivet-LowEnergy-,,$@) LowEnergy-EE-NonPerturbative-$(subst Rivet-LowEnergy-,,$@).yoda:"Non-Pert" $$plots; elif [ -e LowEnergy-EE-Perturbative-$(subst Rivet-LowEnergy-,,$@).yoda ]; then rivet-mkhtml -o Rivet-LowEnergy-$(subst Rivet-LowEnergy-,,$@) LowEnergy-EE-Perturbative-$(subst Rivet-LowEnergy-,,$@).yoda:"Pert" $$plots; fi
Rivet-R:
OUTPUT=`python/R.py --perturbative --non-perturbative`; $(MAKE) $$OUTPUT NUMEVENTS=$${NUMEVENTS:-10000};
plots=`python/R.py --perturbative --non-perturbative --plots`; python/mergeLowEnergy.py R $$plots; rivet-mkhtml -o Rivet-R LowEnergy-EE-Perturbative-R.yoda:"Pert" LowEnergy-EE-NonPerturbative-R.yoda:"Non-Pert" $$plots
Rivet-DIS : Rivet-DIS/done
touch $@
Rivet-DIS/done: $(shell echo Rivet{-DIS,-NoME-DIS,-Powheg-DIS}-{460,575,820,920}-e+-{Low,Med,High}Q2.yoda) \
$(shell echo Rivet{-DIS,-NoME-DIS,-Powheg-DIS}-{920-e--{Low,Med,High},820-e--Low}Q2.yoda) \
$(shell echo Rivet{-DIS,-NoME-DIS,-Powheg-DIS}-920-{e+,e-}-CC-{Low,Med,High}Q2.yoda)
rm -rf Rivet-DIS
python/merge-DIS DIS
python/merge-DIS Powheg-DIS
python/merge-DIS NoME-DIS
rivet-mkhtml -o Rivet-DIS DIS.yoda:Hw Powheg-DIS.yoda:Hw-Powheg NoME-DIS.yoda:Hw-NoME
touch $@
Rivet-TVT-EW : Rivet-TVT-EW/done
touch $@
Rivet-TVT-EW/done: $(shell echo Rivet{,-Powheg}-TVT-{Run-I-Z,Run-I-W,Run-I-WZ,Run-II-Z-{e,{,LowMass-,HighMass-}mu},Run-II-W}.yoda)
rm -rf Rivet-TVT-EW
python/merge-TVT-EW TVT
python/merge-TVT-EW Powheg-TVT
rivet-mkhtml -o Rivet-TVT-EW TVT-EW.yoda:Hw Powheg-TVT-EW.yoda:Hw-Powheg
touch $@
Rivet-TVT-Photon : Rivet-TVT-Photon/done
touch $@
Rivet-TVT-Photon/done: $(shell echo Rivet{,-Powheg}-TVT-Run-II-{DiPhoton-GammaGamma,DiPhoton-GammaJet}.yoda Rivet-TVT-Run-II-PromptPhoton.yoda)
rm -rf Rivet-TVT-Photon
python/merge-TVT-Photon TVT
python/merge-TVT-Photon Powheg-TVT
rivet-mkhtml -o Rivet-TVT-Photon TVT-Photon.yoda:Hw Powheg-TVT-Photon.yoda:Hw-Powheg
touch $@
Rivet-TVT-Jets : Rivet-TVT-Jets/done
touch $@
Rivet-TVT-Jets/done: $(shell echo Rivet-TVT-{Run-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-Fixed : Rivet-Fixed/done
touch $@
Rivet-Fixed/done : $(shell echo Rivet-SppS-{53,63,200,500,546,900}-UE.yoda ) \
$(shell echo Rivet-ISR-{{30,44,53,62}-UE,{44,62}-Z-mu}.yoda ) Rivet-EHS-UE.yoda \
$(shell echo Rivet-Star-{UE,Jets-{1..4}}.yoda ) \
$(shell echo Rivet-SPS-{17.4-UE,200-Z-mu}.yoda ) \
$(shell echo Rivet-Fermilab-{27.4,38.8}-Z-mu.yoda )
rm -rf Rivet-Fixed
python/merge-Fixed Fixed
rivet-mkhtml -o Rivet-Fixed Fixed.yoda:Hw
touch $@
Rivet-LHC-Jets : Rivet-LHC-Jets/done
touch $@
Rivet-LHC-Jets/done : \
$(shell echo Rivet-LHC-7-DiJets-{1..7}-{A,B,C}.yoda ) \
$(shell echo Rivet-LHC-13-DiJets-{{1..11}-A,{6..11}-B}.yoda ) \
$(shell echo Rivet-LHC-{7,8,13}-Jets-{0..10}.yoda ) \
$(shell echo Rivet-LHC-2760-Jets-{1..3}.yoda ) \
$(shell echo Rivet-LHC-{900,2360,2760,7,8,13}-UE.yoda ) \
$(shell echo Rivet-LHC-{7,13}-UE-Cent.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},13-W-mu,Z-HighMass{1,2}-e,{8,13}-Z-Mass{1..4}-{e,mu},{,8-}W-{e,mu},Z-{e,mu,mu-SOPHTY},Z-LowMass-{e,mu},Z-MedMass-e,WZ,WW-{emu,ll},13-WW-emu,ZZ-{ll,lv},{8,13}-WZ,13-ZZ-ll,8-ZZ-lv,8-WW-ll,Z-mu-Short}.yoda) \
$(shell echo Rivet-LHC-{7-W-Jet-{1..3}-e,7-Z-Jet-{0..3}-e,7-Z-Jet-0-mu}.yoda) \
$(shell echo Rivet-LHC-7-{W,Z}Gamma-{e,mu}.yoda) \
$(shell echo Rivet-LHC-8-ZGamma-{e,mu}.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-130.in b/Tests/Rivet/EE/EE-130.1.in
copy from Tests/Rivet/EE/EE-130.in
copy to Tests/Rivet/EE/EE-130.1.in
--- a/Tests/Rivet/EE/EE-130.in
+++ b/Tests/Rivet/EE/EE-130.1.in
@@ -1,12 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 130.
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 130.1
##################################################
# select the analyses
##################################################
-# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_S5361494
# L3 event shapes etc for a wide range of CMS energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-130.in b/Tests/Rivet/EE/EE-130.in
--- a/Tests/Rivet/EE/EE-130.in
+++ b/Tests/Rivet/EE/EE-130.in
@@ -1,12 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 130.
##################################################
# select the analyses
##################################################
# OPAL b/c/light multiplicity
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_S5361494
-# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-136.in b/Tests/Rivet/EE/EE-136.1.in
copy from Tests/Rivet/EE/EE-136.in
copy to Tests/Rivet/EE/EE-136.1.in
--- a/Tests/Rivet/EE/EE-136.in
+++ b/Tests/Rivet/EE/EE-136.1.in
@@ -1,12 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 136.
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 136.1
##################################################
# select the analyses
##################################################
-# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_S5361494
# L3 event shapes etc for a wide range of CMS energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-136.in b/Tests/Rivet/EE/EE-136.in
--- a/Tests/Rivet/EE/EE-136.in
+++ b/Tests/Rivet/EE/EE-136.in
@@ -1,12 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 136.
##################################################
# select the analyses
##################################################
# OPAL b/c/light multiplicity
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_S5361494
-# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-161.in b/Tests/Rivet/EE/EE-161.3.in
copy from Tests/Rivet/EE/EE-161.in
copy to Tests/Rivet/EE/EE-161.3.in
--- a/Tests/Rivet/EE/EE-161.in
+++ b/Tests/Rivet/EE/EE-161.3.in
@@ -1,20 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 161.
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 161.3
##################################################
# 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
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
\ No newline at end of file
diff --git a/Tests/Rivet/EE/EE-161.in b/Tests/Rivet/EE/EE-161.in
--- a/Tests/Rivet/EE/EE-161.in
+++ b/Tests/Rivet/EE/EE-161.in
@@ -1,20 +1,18 @@
# -*- 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.3.in
copy from Tests/Rivet/EE/EE-172.in
copy to Tests/Rivet/EE/EE-172.3.in
--- a/Tests/Rivet/EE/EE-172.in
+++ b/Tests/Rivet/EE/EE-172.3.in
@@ -1,20 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 172.
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 172.3
##################################################
# 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-172.in b/Tests/Rivet/EE/EE-172.in
--- a/Tests/Rivet/EE/EE-172.in
+++ b/Tests/Rivet/EE/EE-172.in
@@ -1,20 +1,18 @@
# -*- 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-182.8.in
copy from Tests/Rivet/EE/EE-183.in
copy to Tests/Rivet/EE/EE-182.8.in
--- a/Tests/Rivet/EE/EE-183.in
+++ b/Tests/Rivet/EE/EE-182.8.in
@@ -1,24 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 183.
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 182.8
##################################################
# 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-183.in b/Tests/Rivet/EE/EE-183.in
--- a/Tests/Rivet/EE/EE-183.in
+++ b/Tests/Rivet/EE/EE-183.in
@@ -1,24 +1,22 @@
# -*- 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-188.6.in
copy from Tests/Rivet/EE/EE-189.in
copy to Tests/Rivet/EE/EE-188.6.in
--- a/Tests/Rivet/EE/EE-189.in
+++ b/Tests/Rivet/EE/EE-188.6.in
@@ -1,20 +1,7 @@
# -*- 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
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 188.6
# L3 event shapes etc for a wide range of CMS energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
-# delphi event shapes for a wide energy range
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
-
diff --git a/Tests/Rivet/EE/EE-189.in b/Tests/Rivet/EE/EE-189.in
--- a/Tests/Rivet/EE/EE-189.in
+++ b/Tests/Rivet/EE/EE-189.in
@@ -1,20 +1,18 @@
# -*- 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-196.in b/Tests/Rivet/EE/EE-194.4.in
copy from Tests/Rivet/EE/EE-196.in
copy to Tests/Rivet/EE/EE-194.4.in
--- a/Tests/Rivet/EE/EE-196.in
+++ b/Tests/Rivet/EE/EE-194.4.in
@@ -1,19 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 196.
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 194.4
##################################################
# select the analyses
##################################################
-# OPAL event shapes and multiplicities at different energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
-# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_S5361494
-# 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-196.in b/Tests/Rivet/EE/EE-196.in
--- a/Tests/Rivet/EE/EE-196.in
+++ b/Tests/Rivet/EE/EE-196.in
@@ -1,19 +1,17 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 196.
##################################################
# select the analyses
##################################################
# OPAL event shapes and multiplicities at different energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
# OPAL b/c/light multiplicity
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_S5361494
# 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-200.in b/Tests/Rivet/EE/EE-200.2.in
copy from Tests/Rivet/EE/EE-200.in
copy to Tests/Rivet/EE/EE-200.2.in
--- a/Tests/Rivet/EE/EE-200.in
+++ b/Tests/Rivet/EE/EE-200.2.in
@@ -1,19 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 200.
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 200.2
##################################################
# select the analyses
##################################################
-# ALEPH jet and event shapes at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
-# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_S5361494
-# 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-200.in b/Tests/Rivet/EE/EE-200.in
--- a/Tests/Rivet/EE/EE-200.in
+++ b/Tests/Rivet/EE/EE-200.in
@@ -1,19 +1,17 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 200.
##################################################
# select the analyses
##################################################
# ALEPH jet and event shapes at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
# OPAL b/c/light multiplicity
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_S5361494
# 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-206.in b/Tests/Rivet/EE/EE-206.2.in
copy from Tests/Rivet/EE/EE-206.in
copy to Tests/Rivet/EE/EE-206.2.in
--- a/Tests/Rivet/EE/EE-206.in
+++ b/Tests/Rivet/EE/EE-206.2.in
@@ -1,16 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 206.
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 206.2
##################################################
# select the analyses
##################################################
-# ALEPH jet and event shapes at many energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
-# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_S5361494
-# 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
diff --git a/Tests/Rivet/EE/EE-206.in b/Tests/Rivet/EE/EE-206.in
--- a/Tests/Rivet/EE/EE-206.in
+++ b/Tests/Rivet/EE/EE-206.in
@@ -1,16 +1,14 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 206.
##################################################
# select the analyses
##################################################
# ALEPH jet and event shapes at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
# OPAL b/c/light multiplicity
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_S5361494
# 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
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,27 +1,29 @@
# -*- 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
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HRS_1987_I250823
+# MARK II omega spectrum
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1987_I247900
\ No newline at end of file
diff --git a/Tests/Rivet/EE/EE-30.2.in b/Tests/Rivet/EE/EE-30.2.in
--- a/Tests/Rivet/EE/EE-30.2.in
+++ b/Tests/Rivet/EE/EE-30.2.in
@@ -1,15 +1,14 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.2
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
diff --git a/Tests/Rivet/EE/EE-30.2.in b/Tests/Rivet/EE/EE-30.3.in
copy from Tests/Rivet/EE/EE-30.2.in
copy to Tests/Rivet/EE/EE-30.3.in
--- a/Tests/Rivet/EE/EE-30.2.in
+++ b/Tests/Rivet/EE/EE-30.3.in
@@ -1,15 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.2
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.3
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
diff --git a/Tests/Rivet/EE/EE-30.7.in b/Tests/Rivet/EE/EE-30.7.in
--- a/Tests/Rivet/EE/EE-30.7.in
+++ b/Tests/Rivet/EE/EE-30.7.in
@@ -1,14 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.7
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
diff --git a/Tests/Rivet/EE/EE-30.7.in b/Tests/Rivet/EE/EE-30.8.in
copy from Tests/Rivet/EE/EE-30.7.in
copy to Tests/Rivet/EE/EE-30.8.in
--- a/Tests/Rivet/EE/EE-30.7.in
+++ b/Tests/Rivet/EE/EE-30.8.in
@@ -1,14 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.7
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 30.8
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I156315
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1983_I191161
diff --git a/Tests/Rivet/EE/EE-31.3.in b/Tests/Rivet/EE/EE-31.2.in
copy from Tests/Rivet/EE/EE-31.3.in
copy to Tests/Rivet/EE/EE-31.2.in
--- a/Tests/Rivet/EE/EE-31.3.in
+++ b/Tests/Rivet/EE/EE-31.2.in
@@ -1,14 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 31.3
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 31.2
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
diff --git a/Tests/Rivet/EE/EE-31.3.in b/Tests/Rivet/EE/EE-31.3.in
--- a/Tests/Rivet/EE/EE-31.3.in
+++ b/Tests/Rivet/EE/EE-31.3.in
@@ -1,14 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 31.3
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.0
##################################################
# select the analyses
##################################################
# Validated
##################################################
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1980_I154270
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1980_I143691
-
diff --git a/Tests/Rivet/EE/EE-34.8.in b/Tests/Rivet/EE/EE-34.8.in
--- a/Tests/Rivet/EE/EE-34.8.in
+++ b/Tests/Rivet/EE/EE-34.8.in
@@ -1,17 +1,18 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 34.8
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso charged mult
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I277658
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I202785
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1986_I230950
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1985_I215869
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I279165
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
# TASSO strange baryons
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I266893
diff --git a/Tests/Rivet/EE/EE-35.in b/Tests/Rivet/EE/EE-35.in
--- a/Tests/Rivet/EE/EE-35.in
+++ b/Tests/Rivet/EE/EE-35.in
@@ -1,28 +1,27 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 35.
##################################################
# select the analyses
##################################################
# OPAL/JADE jet rates at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
# 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
# PDG hadron multiplicities and ratios
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES_RATIOS
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1983_I190818
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1990_I283026
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CELLO_1989_I276764
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1984_I203145
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1982_I177174
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1990_I284251
## jade gamma,pi0 and eta spectra
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_1990_I282847
## TASSO event shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1988_I263859
diff --git a/Tests/Rivet/EE/EE-43.6.in b/Tests/Rivet/EE/EE-43.5.in
copy from Tests/Rivet/EE/EE-43.6.in
copy to Tests/Rivet/EE/EE-43.5.in
--- a/Tests/Rivet/EE/EE-43.6.in
+++ b/Tests/Rivet/EE/EE-43.5.in
@@ -1,14 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 43.6
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 43.5
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso charged mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I277658
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I279165
diff --git a/Tests/Rivet/EE/EE-43.6.in b/Tests/Rivet/EE/EE-43.6.in
--- a/Tests/Rivet/EE/EE-43.6.in
+++ b/Tests/Rivet/EE/EE-43.6.in
@@ -1,14 +1,12 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 43.6
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# tasso charged mult
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I277658
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1987_I248660
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TASSO_1989_I279165
diff --git a/Tests/Rivet/EE/EE-55.in b/Tests/Rivet/EE/EE-55.3.in
copy from Tests/Rivet/EE/EE-55.in
copy to Tests/Rivet/EE/EE-55.3.in
--- a/Tests/Rivet/EE/EE-55.in
+++ b/Tests/Rivet/EE/EE-55.3.in
@@ -1,15 +1,11 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 55.
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 55.3
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
-# AMY charged mult
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I295160
# L3 event shapes etc for a wide range of CMS energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
-# AMY event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I283337
diff --git a/Tests/Rivet/EE/EE-55.in b/Tests/Rivet/EE/EE-55.in
--- a/Tests/Rivet/EE/EE-55.in
+++ b/Tests/Rivet/EE/EE-55.in
@@ -1,15 +1,13 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 55.
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 13.*GeV
##################################################
# select the analyses
##################################################
# AMY charged mult
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I295160
-# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
# AMY event shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 AMY_1990_I283337
diff --git a/Tests/Rivet/EE/EE-66.in b/Tests/Rivet/EE/EE-65.4.in
copy from Tests/Rivet/EE/EE-66.in
copy to Tests/Rivet/EE/EE-65.4.in
--- a/Tests/Rivet/EE/EE-66.in
+++ b/Tests/Rivet/EE/EE-65.4.in
@@ -1,12 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 66.0
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 65.4
##################################################
# select the analyses
##################################################
-# DELPHI event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
# L3 event shapes etc for a wide range of CMS energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-66.in b/Tests/Rivet/EE/EE-66.in
--- a/Tests/Rivet/EE/EE-66.in
+++ b/Tests/Rivet/EE/EE-66.in
@@ -1,12 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 66.0
##################################################
# select the analyses
##################################################
# DELPHI event shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
-# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-76.in b/Tests/Rivet/EE/EE-75.7.in
copy from Tests/Rivet/EE/EE-76.in
copy to Tests/Rivet/EE/EE-75.7.in
--- a/Tests/Rivet/EE/EE-76.in
+++ b/Tests/Rivet/EE/EE-75.7.in
@@ -1,12 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 76.0
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 75.7
##################################################
# select the analyses
##################################################
-# DELPHI event shapes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
# L3 event shapes etc for a wide range of CMS energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
diff --git a/Tests/Rivet/EE/EE-76.in b/Tests/Rivet/EE/EE-76.in
--- a/Tests/Rivet/EE/EE-76.in
+++ b/Tests/Rivet/EE/EE-76.in
@@ -1,12 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 76.0
##################################################
# select the analyses
##################################################
# DELPHI event shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2003_I620250
-# L3 event shapes etc for a wide range of CMS energies
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683
diff --git a/Tests/python/merge-EE.in b/Tests/python/merge-EE.in
--- a/Tests/python/merge-EE.in
+++ b/Tests/python/merge-EE.in
@@ -1,1332 +1,1338 @@
#! @PYTHON@
from __future__ import print_function
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.items()) :
- 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
+ temp={}
+ for (key,val) in sourcehistosbysqrts.items():
+ if key=="U1" :
+ sqrts=9.46
+ if "LENA_1981_I164397" in desthisto.path() : sqrts=9.4624
+ elif key=="U2" :
+ sqrts=10.02
+ if "LENA_1981_I164397" in desthisto.path() : sqrts=10.0148
+ elif key=="U4" :
+ sqrts=10.58
else :
- sqrts2=float(sqrts)
- 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
+ sqrts=float(key)
+ if ("ARGUS_1989_I276860" in desthisto.path() and sqrts==10. ) : sqrts=9.98
+ elif ( "LENA_1981_I164397" in desthisto.path() and sqrts==10. ) : sqrts=9.9903
+ elif ( "LENA_1981_I164397" in desthisto.path() and sqrts==9.51) : sqrts=9.5149
+ temp[sqrts]=val
+ for sqrts,h in sorted(temp.items()) :
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) :
+ if(sqrts>=xmin and sqrts<=xmax) :
desthisto.addPoint(h.points()[i])
elif(type(desthisto)==yoda.core.Profile1D) :
for sqrts, h in sorted(sourcehistosbysqrts.items()) :
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 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",\
+yodafiles=["130","130.1","133","136","136.1","177","192",
+ "194.4","196","202","205","206","206.2","207","91" ,"91-nopi" ,\
+ "161","161.3","182.8","183","197","35" ,"36.2","172","172.3",\
+ "188.6","189","200","200.2","44","14","14.8","21.5","22","25","10",\
"12.8","26.8","48.0","93.0",\
- "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","2.2","2.6","3.0","3.2","4.6","4.8",
+ "12","13","17","27.6","27.7","29","30.2","30.3","34.5",\
+ "30.7","30.8","30","31.2","31.3","31.6","34","34.8","42.1","43.5","43.6","50","52","53.3",\
+ "55","55.3","56","57","58","59.5","60.8","60","61.4","7.7",
+ "9.4","45","65.4","66","75.7","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"]
# 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("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.items() :
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 aopath not in inhistos:
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 sqrts not in tmpE:
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 or "d04" in aopath) and sqrts==10.47) :
outhistos[aopath] = ao
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
+# Make empty output histos if needed
for hpath,hsets in inhistos.items():
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 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
+ if(hpath=="/PLUTO_1981_I165122/d01-x01-y01" or
+ hpath=="/PLUTO_1981_I165122/d03-x01-y01" ) : continue
title=""
path=""
histo = list(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","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 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) :
+if("/BABAR_2007_I722622/d03-x01-y01" in outhistos and
+ outhistos["/BABAR_2007_I722622/d03-x01-y01"].effNumEntries()!=0.) :
outhistos["/BABAR_2007_I722622/d03-x01-y01"].normalize()
-if("/BABAR_2007_I722622/d03-x01-y02" in outhistos) :
+if("/BABAR_2007_I722622/d03-x01-y02" in outhistos and
+ outhistos["/BABAR_2007_I722622/d03-x01-y02"].effNumEntries()!=0.) :
outhistos["/BABAR_2007_I722622/d03-x01-y02"].normalize()
-if("/BABAR_2007_I722622/d04-x01-y01" in outhistos) :
+if("/BABAR_2007_I722622/d04-x01-y01" in outhistos and
+ outhistos["/BABAR_2007_I722622/d04-x01-y01"].effNumEntries()!=0.) :
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)