Page MenuHomeHEPForge
Files F8723621

No OneTemporary
Actions

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.
diff --git a/Tests/Makefile.am b/Tests/Makefile.am
--- a/Tests/Makefile.am
+++ b/Tests/Makefile.am
@@ -1,330 +1,321 @@
AUTOMAKE_OPTIONS = -Wno-portability
AM_LDFLAGS += -module -avoid-version -rpath /dummy/path/not/used
EXTRA_DIST = Inputs python Rivet
dist-hook:
rm -rf $(distdir)/Inputs/.svn
rm -rf $(distdir)/python/.svn
rm -rf $(distdir)/Rivet/.svn
EXTRA_LTLIBRARIES = LeptonTest.la GammaTest.la HadronTest.la DISTest.la
if WANT_LIBFASTJET
EXTRA_LTLIBRARIES += HadronJetTest.la LeptonJetTest.la
HadronJetTest_la_SOURCES = \
Hadron/VHTest.h Hadron/VHTest.cc\
Hadron/VTest.h Hadron/VTest.cc\
Hadron/HTest.h Hadron/HTest.cc
HadronJetTest_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
-I$(FASTJETPATH)
HadronJetTest_la_LIBADD = $(FASTJETLIBS)
LeptonJetTest_la_SOURCES = \
Lepton/TopDecay.h Lepton/TopDecay.cc
LeptonJetTest_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
-I$(FASTJETPATH)
LeptonJetTest_la_LIBADD = $(FASTJETLIBS)
endif
LeptonTest_la_SOURCES = \
Lepton/VVTest.h Lepton/VVTest.cc \
Lepton/VBFTest.h Lepton/VBFTest.cc \
Lepton/VHTest.h Lepton/VHTest.cc \
Lepton/FermionTest.h Lepton/FermionTest.cc
GammaTest_la_SOURCES = \
Gamma/GammaMETest.h Gamma/GammaMETest.cc \
Gamma/GammaPMETest.h Gamma/GammaPMETest.cc
DISTest_la_SOURCES = \
DIS/DISTest.h DIS/DISTest.cc
HadronTest_la_SOURCES = \
Hadron/HadronVVTest.h Hadron/HadronVVTest.cc\
Hadron/HadronVBFTest.h Hadron/HadronVBFTest.cc\
Hadron/WHTest.h Hadron/WHTest.cc\
Hadron/ZHTest.h Hadron/ZHTest.cc\
Hadron/VGammaTest.h Hadron/VGammaTest.cc\
Hadron/ZJetTest.h Hadron/ZJetTest.cc\
Hadron/WJetTest.h Hadron/WJetTest.cc\
Hadron/QQHTest.h Hadron/QQHTest.cc
REPO = $(top_builddir)/src/HerwigDefaults.rpo
HERWIG = $(top_builddir)/src/Herwig++
HWREAD = $(HERWIG) read --repo $(REPO) -L $(builddir)/.libs
HWRUN = $(HERWIG) run
tests : tests-LEP tests-DIS tests-LHC tests-Gamma
if WANT_LIBFASTJET
tests-LEP : test-LEP-VV test-LEP-VH test-LEP-VBF test-LEP-BB test-LEP-Quarks test-LEP-Leptons \
test-LEP-default test-LEP-Powheg test-LEP-TopDecay
else
tests-LEP : test-LEP-VV test-LEP-VH test-LEP-VBF test-LEP-BB test-LEP-Quarks test-LEP-Leptons
endif
tests-DIS : test-DIS-Charged test-DIS-Neutral
if WANT_LIBFASTJET
tests-LHC : test-LHC-WW test-LHC-WZ test-LHC-ZZ test-LHC-ZGamma test-LHC-WGamma \
test-LHC-ZH test-LHC-WH test-LHC-ZJet test-LHC-WJet test-LHC-Z test-LHC-W test-LHC-ZZVBF test-LHC-VBF \
test-LHC-WWVBF test-LHC-bbH test-LHC-ttH test-LHC-GammaGamma test-LHC-GammaJet test-LHC-Higgs \
test-LHC-HiggsJet test-LHC-QCDFast test-LHC-QCD test-LHC-Top test-LHC-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
else
tests-LHC : 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
endif
tests-Gamma : test-Gamma-FF test-Gamma-WW test-Gamma-P
if WANT_LIBFASTJET
test-LEP-% : Inputs/LEP-%.in LeptonTest.la LeptonJetTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
else
test-LEP-% : Inputs/LEP-%.in LeptonTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
endif
Rivet-LEP-% : Rivet/LEP-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-BFactory-% : Rivet/BFactory-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-TVT-% : Rivet/TVT-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-DIS-% : Rivet/DIS-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-LHC-% : Rivet/LHC-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-Star-% : Rivet/Star-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-SppS-% : Rivet/SppS-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-ISR-% : Rivet/ISR-%.in
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
Rivet-LEP: Rivet-LEP-22 Rivet-LEP-35 Rivet-LEP-44 Rivet-LEP-91 \
Rivet-LEP-130 Rivet-LEP-133 Rivet-LEP-136 Rivet-LEP-161 \
Rivet-LEP-172 Rivet-LEP-177 Rivet-LEP-183 Rivet-LEP-189 \
Rivet-LEP-192 Rivet-LEP-196 Rivet-LEP-197 Rivet-LEP-200 \
Rivet-LEP-202 Rivet-LEP-206 Rivet-LEP-14 Rivet-LEP-10\
Rivet-LEP-91-nopi \
Rivet-LEP-Powheg-14 Rivet-LEP-Powheg-22 \
Rivet-LEP-Powheg-35 Rivet-LEP-Powheg-44 \
Rivet-LEP-Powheg-91 Rivet-LEP-Powheg-130 \
Rivet-LEP-Powheg-133 Rivet-LEP-Powheg-136 \
Rivet-LEP-Powheg-161 Rivet-LEP-Powheg-172 \
Rivet-LEP-Powheg-177 Rivet-LEP-Powheg-183 \
Rivet-LEP-Powheg-189 Rivet-LEP-Powheg-192 \
Rivet-LEP-Powheg-196 Rivet-LEP-Powheg-197 \
Rivet-LEP-Powheg-200 Rivet-LEP-Powheg-202 \
Rivet-LEP-Powheg-206 Rivet-LEP-Powheg-10 \
Rivet-LEP-Powheg-91-nopi
- for i in LEP-*.aida; do rivet-rmgaps $$i; done;
rm -rf Rivet-LEP
python/merge-LEP LEP
python/merge-LEP LEP-Powheg
- rivet-mkhtml -o Rivet-LEP LEP.aida:Hw++ LEP-Powheg.aida:Hw++-Powheg
+ rivet-mkhtml -o Rivet-LEP LEP.yoda:Hw++ LEP-Powheg.yoda:Hw++-Powheg
Rivet-BFactory: Rivet-BFactory-10.52 Rivet-BFactory-Powheg-10.52 \
Rivet-BFactory-10.52-sym Rivet-BFactory-Powheg-10.52-sym \
Rivet-BFactory-10.54 Rivet-BFactory-Powheg-10.54 \
Rivet-BFactory-10.45 Rivet-BFactory-Powheg-10.45 \
Rivet-BFactory-10.58 Rivet-BFactory-Powheg-10.58 \
Rivet-BFactory-Upsilon Rivet-BFactory-Upsilon2 Rivet-BFactory-Upsilon4 \
Rivet-BFactory-Tau
- for i in BFactory-*.aida; do rivet-rmgaps $$i; done;
rm -rf Rivet-BFactory
python/merge-BFactory BFactory
python/merge-BFactory BFactory-Powheg
- rivet-mkhtml -o Rivet-BFactory BFactory.aida:Hw++ BFactory-Powheg.aida:Hw++-Powheg
+ rivet-mkhtml -o Rivet-BFactory BFactory.yoda:Hw++ BFactory-Powheg.yoda:Hw++-Powheg
Rivet-DIS: Rivet-DIS-e--LowQ2 \
Rivet-DIS-e+-LowQ2 Rivet-DIS-e+-HighQ2\
Rivet-DIS-Powheg-e--LowQ2 \
Rivet-DIS-Powheg-e+-LowQ2 Rivet-DIS-Powheg-e+-HighQ2\
Rivet-DIS-NoME-e--LowQ2 \
Rivet-DIS-NoME-e+-LowQ2 Rivet-DIS-NoME-e+-HighQ2
- rivet-rmgaps DIS-e+-LowQ2.aida
- rivet-rmgaps DIS-e--LowQ2.aida
- rivet-rmgaps DIS-e+-HighQ2.aida
- rivet-rmgaps DIS-Powheg-e+-LowQ2.aida
- rivet-rmgaps DIS-Powheg-e--LowQ2.aida
- rivet-rmgaps DIS-Powheg-e+-HighQ2.aida
- rivet-rmgaps DIS-NoME-e+-LowQ2.aida
- rivet-rmgaps DIS-NoME-e--LowQ2.aida
- rivet-rmgaps DIS-NoME-e+-HighQ2.aida
+ rm -rf Rivet-DIS
python/merge-DIS DIS
python/merge-DIS DIS-Powheg
python/merge-DIS DIS-NoME
- rivet-mkhtml -o Rivet-DIS DIS.aida:Hw++ DIS-Powheg.aida:Hw++-Powheg DIS-NoME.aida:Hw++-NoME
+ rivet-mkhtml -o Rivet-DIS DIS.yoda:Hw++ DIS-Powheg.yoda:Hw++-Powheg DIS-NoME.yoda:Hw++-NoME
Rivet-TVT-WZ: Rivet-TVT-Run-I-Z Rivet-TVT-Powheg-Run-I-Z \
Rivet-TVT-Run-I-W Rivet-TVT-Powheg-Run-I-W \
Rivet-TVT-Run-I-WZ Rivet-TVT-Powheg-Run-I-WZ\
Rivet-TVT-Run-II-Z-e Rivet-TVT-Powheg-Run-II-Z-e \
Rivet-TVT-Run-II-Z-mu Rivet-TVT-Powheg-Run-II-Z-mu \
Rivet-TVT-Run-II-W Rivet-TVT-Powheg-Run-II-W
- rivet-rmgaps TVT-Run-II-Z-e.aida;
- rivet-rmgaps TVT-Powheg-Run-II-Z-e.aida;
rm -rf Rivet-TVT-WZ
- python/merge-TVT-EW TVT-Run-II-W.aida TVT-Run-II-Z-{e,mu}.aida\
- TVT-Run-I-{W,Z,WZ}.aida -o TVT-WZ.aida
- python/merge-TVT-EW TVT-Powheg-Run-II-W.aida TVT-Powheg-Run-II-Z-{e,mu}.aida\
- TVT-Powheg-Run-I-{W,Z,WZ}.aida -o TVT-Powheg-WZ.aida
- rivet-mkhtml -o Rivet-TVT-WZ TVT-WZ.aida:Hw++ TVT-Powheg-WZ.aida:Hw++-Powheg
+ python/merge-TVT-EW TVT-Run-II-W.yoda TVT-Run-II-Z-{e,mu}.yoda\
+ TVT-Run-I-{W,Z,WZ}.yoda -o TVT-WZ.yoda
+ python/merge-TVT-EW TVT-Powheg-Run-II-W.yoda TVT-Powheg-Run-II-Z-{e,mu}.yoda\
+ TVT-Powheg-Run-I-{W,Z,WZ}.yoda -o TVT-Powheg-WZ.yoda
+ rivet-mkhtml -o Rivet-TVT-WZ TVT-WZ.yoda:Hw++ TVT-Powheg-WZ.yoda:Hw++-Powheg
Rivet-TVT-Photon: Rivet-TVT-Run-II-PromptPhoton \
Rivet-TVT-Run-II-DiPhoton-GammaGamma Rivet-TVT-Run-II-DiPhoton-GammaJet \
Rivet-TVT-Powheg-Run-II-DiPhoton-GammaGamma Rivet-TVT-Powheg-Run-II-DiPhoton-GammaJet
# Rivet-TVT-Run-I-PromptPhoton
rm -rf Rivet-TVT-Photon
- python/add-aida Rivet-TVT-Run-II-DiPhoton-GammaGamma Rivet-TVT-Run-II-DiPhoton-GammaJet --add -o TVT-Run-II-DiPhoton.aida
- python/add-aida Rivet-TVT-Powheg-Run-II-DiPhoton-GammaGamma Rivet-TVT-Powheg-Run-II-DiPhoton-GammaJet --add -o TVT-Powheg-Run-II-DiPhoton.aida
- python/merge-aida TVT-Run-II-DiPhoton.aida TVT-Run-II-PromptPhoton.aida\
- -o TVT-Photon.aida
- rivet-mkhtml -o Rivet-TVT-Photon TVT-Photon.aida:Hw++
- rivet-mkhtml -o Rivet-TVT-Photon TVT-Photon.aida:Hw++ TVT-Powheg-Run-II-DiPhoton.aida:Hw++-Powheg
+ yodamerge Rivet-TVT-Run-II-DiPhoton-GammaGamma Rivet-TVT-Run-II-DiPhoton-GammaJet --add -o TVT-Run-II-DiPhoton.aida
+ yodamerge Rivet-TVT-Powheg-Run-II-DiPhoton-GammaGamma Rivet-TVT-Powheg-Run-II-DiPhoton-GammaJet --add -o TVT-Powheg-Run-II-DiPhoton.aida
+ yodamerge TVT-Run-II-DiPhoton.yoda TVT-Run-II-PromptPhoton.yoda\
+ -o TVT-Photon.yoda
+ rivet-mkhtml -o Rivet-TVT-Photon TVT-Photon.yoda:Hw++ TVT-Powheg-Run-II-DiPhoton.aida:Hw++-Powheg
Rivet-TVT-Jets: Rivet-TVT-Run-II-Jets-1 Rivet-TVT-Run-II-Jets-2 \
Rivet-TVT-Run-II-Jets-3 Rivet-TVT-Run-II-Jets-4 \
Rivet-TVT-Run-II-Jets-5 Rivet-TVT-Run-II-Jets-6 \
Rivet-TVT-Run-II-Jets-7 Rivet-TVT-Run-II-Jets-8 \
Rivet-TVT-Run-II-Jets-9 Rivet-TVT-Run-II-Jets-10\
Rivet-TVT-Run-II-Jets-11 Rivet-TVT-Run-II-UE \
Rivet-TVT-Run-I-Jets-1 Rivet-TVT-Run-I-Jets-2 \
Rivet-TVT-Run-I-Jets-3 Rivet-TVT-Run-I-Jets-4 \
Rivet-TVT-Run-I-Jets-5 Rivet-TVT-Run-I-Jets-6 \
Rivet-TVT-Run-I-Jets-7 Rivet-TVT-Run-I-Jets-8\
Rivet-TVT-Run-I-UE Rivet-TVT-Run-II-Jets-0\
Rivet-TVT-630-UE Rivet-TVT-630-Jets-1 \
Rivet-TVT-630-Jets-2 Rivet-TVT-630-Jets-3 \
Rivet-TVT-300-UE Rivet-TVT-300-Jets-1 \
Rivet-TVT-900-UE Rivet-TVT-900-Jets-1
- rivet-rmgaps TVT-Run-I-Jets-4.aida
python/merge-TVT-Energy TVT
- rivet-merge-CDF_2012_NOTE10874 TVT-300-Energy.aida TVT-900-Energy.aida TVT-1960-Energy.aida
- flat2aida RatioPlots.dat -o TVT-RatioPlots.aida
+ rivet-merge-CDF_2012_NOTE10874 TVT-300-Energy.yoda TVT-900-Energy.yoda TVT-1960-Energy.yoda
+ flat2yoda RatioPlots.dat -o TVT-RatioPlots.yoda
rm -rf Rivet-TVT-Jets
python/merge-TVT-Jets TVT
- rivet-mkhtml -o Rivet-TVT-Jets TVT-Jets.aida:Hw++
+ rivet-mkhtml -o Rivet-TVT-Jets TVT-Jets.yoda:Hw++
Rivet-LHC-Jets: Rivet-LHC-7-Jets-0 Rivet-LHC-7-Jets-1 Rivet-LHC-7-Jets-2 \
Rivet-LHC-7-Jets-3 Rivet-LHC-7-Jets-4 \
Rivet-LHC-7-Jets-5 Rivet-LHC-7-Jets-6 \
Rivet-LHC-7-Jets-7 Rivet-LHC-7-Jets-8 \
Rivet-LHC-7-Jets-9 Rivet-LHC-7-Jets-10 \
Rivet-LHC-7-Jets-11 Rivet-LHC-7-Jets-12 \
Rivet-LHC-7-Jets-13 Rivet-LHC-7-UE \
Rivet-LHC-2360-UE Rivet-LHC-900-UE Rivet-LHC-2760-UE \
Rivet-LHC-7-Heavy-0 \
Rivet-LHC-7-Heavy-1 Rivet-LHC-7-Heavy-2 \
Rivet-LHC-7-Heavy-3 Rivet-LHC-7-Heavy-4 \
Rivet-LHC-7-Heavy-5 Rivet-LHC-7-Heavy-6 \
Rivet-LHC-7-Heavy-7 Rivet-LHC-7-Heavy-8
Rivet-LHC-7-Top-L Rivet-LHC-7-Top-SL \
Rivet-LHC-7-UE-Long Rivet-LHC-900-UE-Long \
Rivet-LHC-7-Jets-All-1 Rivet-LHC-7-Jets-All-2 \
Rivet-LHC-7-Jets-All-3 Rivet-LHC-7-Jets-All-4 \
Rivet-LHC-7-Jets-All-5
rm -rf Rivet-LHC-Jets
python/merge-LHC-Jets
- rivet-rmgaps LHC-Jets.aida
- rivet-mkhtml -o Rivet-LHC-Jets LHC-Jets.aida:Hw++
+ rivet-mkhtml -o Rivet-LHC-Jets LHC-Jets.yoda:Hw++
Rivet-Star: Rivet-Star-UE Rivet-Star-Jets-1 \
Rivet-Star-Jets-2 Rivet-Star-Jets-3 \
Rivet-Star-Jets-4
rm -rf Rivet-Star
- rivet-rmgaps Star-UE.aida
python/merge-Star Star
- rivet-mkhtml -o Rivet-Star Star.aida
+ rivet-mkhtml -o Rivet-Star Star.yoda
Rivet-SppS: Rivet-ISR-44-UE Rivet-ISR-63-UE \
Rivet-SppS-63-UE Rivet-ISR-30-UE \
Rivet-ISR-53-UE Rivet-SppS-200-UE \
Rivet-SppS-500-UE Rivet-SppS-900-UE \
Rivet-SppS-546-UE Rivet-SppS-53-UE
rm -rf Rivet-SppS
- python/merge-aida ISR-44-UE.aida ISR-63-UE.aida SppS-63-UE.aida ISR-30-UE.aida \
- ISR-53-UE.aida SppS-200-UE.aida SppS-500-UE.aida SppS-900-UE.aida \
- SppS-546-UE.aida SppS-53-UE.aida -o SppS.aida
- rivet-mkhtml -o Rivet-SppS SppS.aida
+ python/merge-SppS SppS
+ rivet-mkhtml -o Rivet-SppS SppS.yoda
-Rivet-LHC-EW: Rivet-LHC-W-e Rivet-LHC-Powheg-W-e \
- Rivet-LHC-W-mu Rivet-LHC-Powheg-W-mu \
- Rivet-LHC-Z-e Rivet-LHC-Powheg-Z-e \
- Rivet-LHC-Z-mu Rivet-LHC-Powheg-Z-mu \
- Rivet-LHC-WZ Rivet-LHC-Powheg-WZ\
- Rivet-LHC-WW Rivet-LHC-Powheg-WW\
- Rivet-LHC-ZZ Rivet-LHC-Powheg-ZZ\
+Rivet-LHC-EW: Rivet-LHC-W-e Rivet-LHC-Powheg-W-e \
+ Rivet-LHC-W-mu Rivet-LHC-Powheg-W-mu \
+ Rivet-LHC-Z-e Rivet-LHC-Powheg-Z-e \
+ Rivet-LHC-Z-mu Rivet-LHC-Powheg-Z-mu \
+ Rivet-LHC-WZ Rivet-LHC-Powheg-WZ\
+ Rivet-LHC-WW-emu Rivet-LHC-Powheg-WW-emu\
+ Rivet-LHC-WW-ll Rivet-LHC-Powheg-WW-ll\
+ Rivet-LHC-ZZ-ll Rivet-LHC-Powheg-ZZ-ll\
+ Rivet-LHC-ZZ-lv Rivet-LHC-Powheg-ZZ-lv\
Rivet-LHC-7-W-Jet-1-e Rivet-LHC-7-W-Jet-2-e\
Rivet-LHC-7-W-Jet-3-e Rivet-LHC-7-Z-Jet-1-e\
Rivet-LHC-7-Z-Jet-2-e Rivet-LHC-7-Z-Jet-3-e
rm -rf Rivet-LHC-EW;
- python/merge-LHC-EW LHC-{W-e,W-mu,Z-e,Z-mu,WW,WZ,ZZ}.aida LHC-7-{W,Z}-Jet-{1,2,3}-e.aida -o LHC-EW.aida;
- python/merge-LHC-EW LHC-Powheg-{W-e,W-mu,Z-e,Z-mu,WW,WZ,ZZ}.aida -o LHC-Powheg-EW.aida;
- rivet-mkhtml -o Rivet-LHC-EW LHC-EW.aida:Hw++ LHC-Powheg-EW.aida:Hw++-Powheg;
+ python/merge-LHC-EW LHC-{W-e,W-mu,Z-e,Z-mu,WW-emu,WW-ll,WZ,ZZ-ll,ZZ-lv}.yoda LHC-7-{W,Z}-Jet-{1,2,3}-e.yoda -o LHC-EW.yoda;
+ python/merge-LHC-EW LHC-Powheg-{W-e,W-mu,Z-e,Z-mu,WW-emu,WW-ll,WZ,ZZ-ll,ZZ-lv}.yoda -o LHC-Powheg-EW.yoda;
+ rivet-mkhtml -o Rivet-LHC-EW LHC-EW.yoda:Hw++ LHC-Powheg-EW.yoda:Hw++-Powheg;
+<<<<<<< local
Rivet-LHC-Photon: Rivet-LHC-7-PromptPhoton \
Rivet-LHC-7-DiPhoton-GammaGamma Rivet-LHC-7-DiPhoton-GammaJet \
Rivet-LHC-Powheg-7-DiPhoton-GammaGamma Rivet-LHC-Powheg-7-DiPhoton-GammaJet
rm -rf Rivet-LHC-Photon
python/add-aida LHC-7-DiPhoton-GammaGamma.aida LHC-7-DiPhoton-GammaJet.aida --add -o LHC-7-DiPhoton.aida
python/add-aida LHC-Powheg-7-DiPhoton-GammaGamma.aida LHC-7-Powheg-DiPhoton-GammaJet.aida --add -o LHC-Powheg-7-DiPhoton.aida
python/merge-aida LHC-7-PromptPhoton.aida LHC-7-DiPhoton.aida -o LHC-Photon.aida
rivet-mkhtml -o Rivet-LHC-Photon LHC-Photon.aida:Hw++ LHC-Powheg-7-DiPhoton.aida:Hw++-Powheg
+=======
+Rivet-LHC-Photon: Rivet-LHC-7-PromptPhoton Rivet-LHC-7-DiPhoton Rivet-LHC-7-GammaGamma
+ rm -rf Rivet-LHC-Photon
+ python/merge-LHC-Photon LHC-7-PromptPhoton.yoda LHC-7-DiPhoton.yoda LHC-7-GammaGamma.yoda -o LHC-Photon.yoda
+ rivet-mkhtml -o Rivet-LHC-Photon LHC-Photon.yoda:Hw++
+>>>>>>> other
Rivet-LHC-Higgs: Rivet-LHC-Powheg-ggH Rivet-LHC-ggH Rivet-LHC-ggHJet \
Rivet-LHC-Powheg-VBF Rivet-LHC-VBF Rivet-LHC-WH Rivet-LHC-ZH \
Rivet-LHC-Powheg-WH Rivet-LHC-Powheg-ZH
rm -rf Rivet-LHC-Higgs
- rivet-mkhtml -o Rivet-LHC-Higgs LHC-Powheg-ggH.aida:gg-Powheg LHC-ggH.aida:gg LHC-ggHJet.aida:HJet \
- LHC-Powheg-VBF.aida:VBF-Powheg LHC-VBF.aida:VBF LHC-WH.aida:WH LHC-ZH.aida:ZH \
- LHC-Powheg-WH.aida:WH-Powheg LHC-Powheg-ZH.aida:ZH-Powheg
+ rivet-mkhtml -o Rivet-LHC-Higgs LHC-Powheg-ggH.yoda:gg-Powheg LHC-ggH.yoda:gg LHC-ggHJet.yoda:HJet \
+ LHC-Powheg-VBF.yoda:VBF-Powheg LHC-VBF.yoda:VBF LHC-WH.yoda:WH LHC-ZH.yoda:ZH \
+ LHC-Powheg-WH.yoda:WH-Powheg LHC-Powheg-ZH.yoda:ZH-Powheg
tests-Rivet : Rivet-LEP Rivet-BFactory Rivet-DIS Rivet-TVT-WZ Rivet-TVT-Photon Rivet-TVT-Jets Rivet-LHC-Jets Rivet-Star Rivet-SppS Rivet-LHC-EW Rivet-LHC-Photon
test-Gamma-% : Inputs/Gamma-%.in GammaTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
test-DIS-% : Inputs/DIS-%.in DISTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
if WANT_LIBFASTJET
test-LHC-% : Inputs/LHC-%.in HadronTest.la GammaTest.la HadronJetTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
else
test-LHC-% : Inputs/LHC-%.in HadronTest.la GammaTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<)) -N $${NUMEVENTS:-10000}
endif
clean-local:
- rm -f *.out *.log *.tex *.top *.run *.dump *.mult *.Bmult *.aida
+ rm -f *.out *.log *.tex *.top *.run *.dump *.mult *.Bmult *.yoda
diff --git a/Tests/Rivet/BFactory-10.52.in b/Tests/Rivet/BFactory-10.52.in
--- a/Tests/Rivet/BFactory-10.52.in
+++ b/Tests/Rivet/BFactory-10.52.in
@@ -1,31 +1,32 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase.in
create ThePEG::LuminosityFunction BFactoryLuminosity
set BFactoryLuminosity:BeamEMaxA 3.5*GeV
set BFactoryLuminosity:BeamEMaxB 7.91*GeV
set /Herwig/Cuts/EECuts:MHatMin 9.99
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/EventHandlers/LEPHandler:LuminosityFunction BFactoryLuminosity
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set /Herwig/MatrixElements/MEee2gZ2qq:MinimumFlavour 1
set /Herwig/MatrixElements/MEee2gZ2qq:MaximumFlavour 4
##################################################
# select the analyses
##################################################
# BELLE charm hadron production
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2006_S6265367
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2013_I1216515
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun BFactory-10.52 LEPGenerator
diff --git a/Tests/Rivet/BFactory-10.54.in b/Tests/Rivet/BFactory-10.54.in
--- a/Tests/Rivet/BFactory-10.54.in
+++ b/Tests/Rivet/BFactory-10.54.in
@@ -1,32 +1,33 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase.in
create ThePEG::LuminosityFunction BFactoryLuminosity
set BFactoryLuminosity:BeamEMaxA 3.5*GeV
set BFactoryLuminosity:BeamEMaxB 7.94*GeV
set /Herwig/Cuts/EECuts:MHatMin 9.99
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/EventHandlers/LEPHandler:LuminosityFunction BFactoryLuminosity
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set /Herwig/MatrixElements/MEee2gZ2qq:MinimumFlavour 1
set /Herwig/MatrixElements/MEee2gZ2qq:MaximumFlavour 4
##################################################
# select the analyses
##################################################
# BELLE charm hadron production
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2005_S6181155
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_S6895344
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2013_I1238276
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun BFactory-10.54 LEPGenerator
diff --git a/Tests/Rivet/BFactory-Powheg-10.52.in b/Tests/Rivet/BFactory-Powheg-10.52.in
--- a/Tests/Rivet/BFactory-Powheg-10.52.in
+++ b/Tests/Rivet/BFactory-Powheg-10.52.in
@@ -1,31 +1,32 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase-Powheg.in
create ThePEG::LuminosityFunction BFactoryLuminosity
set BFactoryLuminosity:BeamEMaxA 3.5*GeV
set BFactoryLuminosity:BeamEMaxB 7.91*GeV
set /Herwig/Cuts/EECuts:MHatMin 9.99
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/EventHandlers/LEPHandler:LuminosityFunction BFactoryLuminosity
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set /Herwig/MatrixElements/PowhegMEee2gZ2qq:MinimumFlavour 1
set /Herwig/MatrixElements/PowhegMEee2gZ2qq:MaximumFlavour 4
##################################################
# select the analyses
##################################################
# BELLE charm hadron production
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2006_S6265367
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2013_I1216515
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun BFactory-Powheg-10.52 LEPGenerator
diff --git a/Tests/Rivet/BFactory-Powheg-10.54.in b/Tests/Rivet/BFactory-Powheg-10.54.in
--- a/Tests/Rivet/BFactory-Powheg-10.54.in
+++ b/Tests/Rivet/BFactory-Powheg-10.54.in
@@ -1,32 +1,34 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase-Powheg.in
create ThePEG::LuminosityFunction BFactoryLuminosity
set BFactoryLuminosity:BeamEMaxA 3.5*GeV
set BFactoryLuminosity:BeamEMaxB 7.94*GeV
set /Herwig/Cuts/EECuts:MHatMin 9.99
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/EventHandlers/LEPHandler:LuminosityFunction BFactoryLuminosity
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set /Herwig/MatrixElements/PowhegMEee2gZ2qq:MinimumFlavour 1
set /Herwig/MatrixElements/PowhegMEee2gZ2qq:MaximumFlavour 4
##################################################
# select the analyses
##################################################
# BELLE charm hadron production
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2005_S6181155
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_S6895344
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2013_I1238276
+
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun BFactory-Powheg-10.54 LEPGenerator
diff --git a/Tests/Rivet/BFactory-Tau.in b/Tests/Rivet/BFactory-Tau.in
--- a/Tests/Rivet/BFactory-Tau.in
+++ b/Tests/Rivet/BFactory-Tau.in
@@ -1,34 +1,35 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase.in
erase /Herwig/EventHandlers/LEPHandler:PostSubProcessHandlers 0
create ThePEG::LuminosityFunction BFactoryLuminosity
set BFactoryLuminosity:BeamEMaxA 3.5*GeV
set BFactoryLuminosity:BeamEMaxB 8.*GeV
set /Herwig/Cuts/EECuts:MHatMin 10.58299
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
set /Herwig/EventHandlers/LEPHandler:LuminosityFunction BFactoryLuminosity
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/MatrixElements
set /Herwig/MatrixElements/SimpleEE:MatrixElements 0 /Herwig/MatrixElements/MEee2gZ2ll
set /Herwig/MatrixElements/MEee2gZ2ll:Allowed Tau
cd /Herwig/Generators
##################################################
# select the analyses
##################################################
# BELLE charm hadron production
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_S7266081
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2008_I786560
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun BFactory-Tau LEPGenerator
diff --git a/Tests/Rivet/LEP-Powheg-133.in b/Tests/Rivet/LEP-Powheg-133.in
--- a/Tests/Rivet/LEP-Powheg-133.in
+++ b/Tests/Rivet/LEP-Powheg-133.in
@@ -1,29 +1,27 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LEPBase-Powheg.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LEPGenerator:EventHandler:LuminosityFunction:Energy 133.
##################################################
# select the analyses
##################################################
# OPAL event shapes and multiplicities at different energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_S6132243
# ALEPH jet and event shapes at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862
# OPAL/JADE jet rates at many energies
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807
-# OPAL b/c/light multiplicity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2002_S5361494
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LEP-Powheg-133 LEPGenerator
diff --git a/Tests/Rivet/LHC-2760-UE.in b/Tests/Rivet/LHC-2760-UE.in
--- a/Tests/Rivet/LHC-2760-UE.in
+++ b/Tests/Rivet/LHC-2760-UE.in
@@ -1,42 +1,42 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
# override the beam energy
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 2760.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# min bias
insert SimpleQCD:MatrixElements[0] MEMinBias
# same as ue process
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
# min ibas cuts
set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
set /Herwig/Cuts/QCDCuts:MHatMin 0.0*GeV
set /Herwig/Cuts/QCDCuts:X1Min 0.01
set /Herwig/Cuts/QCDCuts:X2Min 0.01
##################################################
# select the analyses
##################################################
# underlying event forward rapidities
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_PAS_FWD_11_003
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1218372
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
# get the cross section right
create Herwig::MPIXSecReweighter MPIXSecReweighter
insert LHCGenerator:EventHandler:PostSubProcessHandlers 0 MPIXSecReweighter
saverun LHC-2760-UE LHCGenerator
diff --git a/Tests/Rivet/LHC-7-DiPhoton-GammaGamma.in b/Tests/Rivet/LHC-7-DiPhoton-GammaGamma.in
--- a/Tests/Rivet/LHC-7-DiPhoton-GammaGamma.in
+++ b/Tests/Rivet/LHC-7-DiPhoton-GammaGamma.in
@@ -1,33 +1,35 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
set /Herwig/EventHandlers/LHCHandler:StatLevel 4
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# diphoton
insert SimpleQCD:MatrixElements[0] MEGammaGamma
# photon cuts
set /Herwig/Cuts/PhotonKtCut:MinKT 5.
# No QED radiation (YFS)
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS diphoton
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9120807
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1199269
+
# MC diphoton
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_DIPHOTON
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-DiPhoton-GammaGamma LHCGenerator
diff --git a/Tests/Rivet/LHC-7-DiPhoton-GammaJet.in b/Tests/Rivet/LHC-7-DiPhoton-GammaJet.in
--- a/Tests/Rivet/LHC-7-DiPhoton-GammaJet.in
+++ b/Tests/Rivet/LHC-7-DiPhoton-GammaJet.in
@@ -1,36 +1,38 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# diphoton
insert SimpleQCD:MatrixElements[0] MEGammaJet
# switch QED on (shower)
set /Herwig/Shower/Evolver:Interactions BothAtOnce
# photon cuts
set /Herwig/Cuts/PhotonKtCut:MinKT 5.
set /Herwig/Cuts/JetKtCut:MinKT 5.
# No QED radiation (YFS)
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS diphoton
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9120807
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1199269
+
# MC diphoton
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_DIPHOTON
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-DiPhoton-GammaJet LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Heavy-0.in b/Tests/Rivet/LHC-7-Heavy-0.in
--- a/Tests/Rivet/LHC-7-Heavy-0.in
+++ b/Tests/Rivet/LHC-7-Heavy-0.in
@@ -1,35 +1,39 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
cp MEHeavyQuark MEBottom
set MEBottom:QuarkType Bottom
set MEBottom:Process Pair
insert SimpleQCD:MatrixElements[0] MEBottom
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 0.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# forward B production
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2010_I867355
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I9035664
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9035664
# b-jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I930220
+# ATLAS inclusive lepton
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I926145
+# CMS inclusive lepton
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8941262
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Heavy-0 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Heavy-1.in b/Tests/Rivet/LHC-7-Heavy-1.in
--- a/Tests/Rivet/LHC-7-Heavy-1.in
+++ b/Tests/Rivet/LHC-7-Heavy-1.in
@@ -1,41 +1,43 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
cp MEHeavyQuark MEBottom
set MEBottom:QuarkType Bottom
cp MEHeavyQuark MECharm
set MECharm:QuarkType Charm
insert SimpleQCD:MatrixElements[0] MEBottom
insert SimpleQCD:MatrixElements[0] MECharm
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 5.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS inclusive lepton
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I926145
# CMS inclusive lepton
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8941262
# b-hadron cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1118269
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I9035664
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9035664
# b-jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I930220
+# charm production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2013_I1218996
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Heavy-1 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Heavy-2.in b/Tests/Rivet/LHC-7-Heavy-2.in
--- a/Tests/Rivet/LHC-7-Heavy-2.in
+++ b/Tests/Rivet/LHC-7-Heavy-2.in
@@ -1,41 +1,41 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
cp MEHeavyQuark MEBottom
set MEBottom:QuarkType Bottom
cp MEHeavyQuark MECharm
set MECharm:QuarkType Charm
insert SimpleQCD:MatrixElements[0] MEBottom
insert SimpleQCD:MatrixElements[0] MECharm
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 20.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS inclusive lepton
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I926145
# CMS inclusive lepton
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8941262
# b-hadron cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1118269
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I9035664
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9035664
# b-jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I930220
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Heavy-2 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Heavy-3.in b/Tests/Rivet/LHC-7-Heavy-3.in
--- a/Tests/Rivet/LHC-7-Heavy-3.in
+++ b/Tests/Rivet/LHC-7-Heavy-3.in
@@ -1,42 +1,42 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
cp MEHeavyQuark MEBottom
set MEBottom:QuarkType Bottom
cp MEHeavyQuark MECharm
set MECharm:QuarkType Charm
insert SimpleQCD:MatrixElements[0] MEBottom
insert SimpleQCD:MatrixElements[0] MECharm
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 50.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS inclusive lepton
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I926145
# CMS inclusive lepton
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8941262
# CMS displaced vertex
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8973270
# b-hadron cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1118269
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I9035664
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9035664
# b-jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I930220
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Heavy-3 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Heavy-4.in b/Tests/Rivet/LHC-7-Heavy-4.in
--- a/Tests/Rivet/LHC-7-Heavy-4.in
+++ b/Tests/Rivet/LHC-7-Heavy-4.in
@@ -1,38 +1,38 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
cp MEHeavyQuark MEBottom
set MEBottom:QuarkType Bottom
cp MEHeavyQuark MECharm
set MECharm:QuarkType Charm
insert SimpleQCD:MatrixElements[0] MEBottom
insert SimpleQCD:MatrixElements[0] MECharm
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 80.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# CMS displaced vertex
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8973270
# b-hadron cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1118269
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I9035664
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9035664
# b-jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I930220
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Heavy-4 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Heavy-5.in b/Tests/Rivet/LHC-7-Heavy-5.in
--- a/Tests/Rivet/LHC-7-Heavy-5.in
+++ b/Tests/Rivet/LHC-7-Heavy-5.in
@@ -1,38 +1,38 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
cp MEHeavyQuark MEBottom
set MEBottom:QuarkType Bottom
cp MEHeavyQuark MECharm
set MECharm:QuarkType Charm
insert SimpleQCD:MatrixElements[0] MEBottom
insert SimpleQCD:MatrixElements[0] MECharm
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 110.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# CMS displaced vertex
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8973270
# b-hadron cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1118269
# J/Psi production
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I9035664
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9035664
# b-jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I930220
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Heavy-5 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Jets-0.in b/Tests/Rivet/LHC-7-Jets-0.in
--- a/Tests/Rivet/LHC-7-Jets-0.in
+++ b/Tests/Rivet/LHC-7-Jets-0.in
@@ -1,36 +1,38 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 5.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# CMS jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9086218
# ATLAS track jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
# CMS central and forward jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
# CMS dijet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1184941
# ATLAS charged particle in min bias
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1125575
+# CMS Jet/UE properties
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1261026
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Jets-0 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Jets-10.in b/Tests/Rivet/LHC-7-Jets-10.in
--- a/Tests/Rivet/LHC-7-Jets-10.in
+++ b/Tests/Rivet/LHC-7-Jets-10.in
@@ -1,37 +1,38 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 20.
set /Herwig/Cuts/QCDCuts:MHatMin 200.*GeV
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
# CMS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8968497
# CMS central and forward jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
# CMS dijet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1184941
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1090423
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Jets-10 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Jets-11.in b/Tests/Rivet/LHC-7-Jets-11.in
--- a/Tests/Rivet/LHC-7-Jets-11.in
+++ b/Tests/Rivet/LHC-7-Jets-11.in
@@ -1,37 +1,38 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 20.
set /Herwig/Cuts/QCDCuts:MHatMin 600.*GeV
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
# CMS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8968497
# CMS central and forward jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
# CMS dijet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1184941
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1090423
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Jets-11 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Jets-12.in b/Tests/Rivet/LHC-7-Jets-12.in
--- a/Tests/Rivet/LHC-7-Jets-12.in
+++ b/Tests/Rivet/LHC-7-Jets-12.in
@@ -1,37 +1,38 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 20.
set /Herwig/Cuts/QCDCuts:MHatMin 1000.*GeV
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
# CMS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8968497
# CMS central and forward jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
# CMS dijet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1184941
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1090423
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Jets-12 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Jets-13.in b/Tests/Rivet/LHC-7-Jets-13.in
--- a/Tests/Rivet/LHC-7-Jets-13.in
+++ b/Tests/Rivet/LHC-7-Jets-13.in
@@ -1,37 +1,38 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 20.
set /Herwig/Cuts/QCDCuts:MHatMin 1800.*GeV
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
# CMS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8968497
# CMS central and forward jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
# CMS dijet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1184941
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1090423
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Jets-13 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Jets-3.in b/Tests/Rivet/LHC-7-Jets-3.in
--- a/Tests/Rivet/LHC-7-Jets-3.in
+++ b/Tests/Rivet/LHC-7-Jets-3.in
@@ -1,53 +1,55 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 40.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8924791
# ATLAS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
# CMS event shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8957746
# ATLAS dijet with veto
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9126244
# CMS dijet decorrelation
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8950903
# CMS jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9086218
# CMS 3/2 jet cross section ratio
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9088458
# ATLAS track jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
# CMS UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9120041
# CMS central and forward jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
# CMS dijet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1184941
# strange particles in underlying event
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_PAS_QCD_11_010
# ATLAS charged particle in min bias
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1125575
+# CMS 4-jet
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Jets-3 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Jets-4.in b/Tests/Rivet/LHC-7-Jets-4.in
--- a/Tests/Rivet/LHC-7-Jets-4.in
+++ b/Tests/Rivet/LHC-7-Jets-4.in
@@ -1,55 +1,59 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 70.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8924791
# ATLAS di-jet decorrelation
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8971293
# ATLAS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
# CMS event shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8957746
# ATLAS multijet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9128077
# ATLAS dijet with veto
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9126244
# CMS dijet decorrelation
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8950903
# CMS jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9086218
# CMS 3/2 jet cross section ratio
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9088458
# ATLAS track jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
# CMS UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9120041
# CMS central and forward jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
# CMS dijet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1184941
# ATLAS subjets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564
+# CMS 4-jet
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574
+# CMS colour coherence
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1265659
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Jets-4 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Jets-5.in b/Tests/Rivet/LHC-7-Jets-5.in
--- a/Tests/Rivet/LHC-7-Jets-5.in
+++ b/Tests/Rivet/LHC-7-Jets-5.in
@@ -1,49 +1,51 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 150.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8924791
# ATLAS di-jet decorrelation
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8971293
# ATLAS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
# CMS event shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8957746
# ATLAS dijet with veto
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9126244
# CMS dijet decorrelation
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8950903
# CMS jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9086218
# CMS 3/2 jet cross section ratio
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9088458
# ATLAS track jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
# ATLAS subjets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564
# CMS jet structure
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539_DIJET
+# CMS 4-jet
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Jets-5 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Jets-6.in b/Tests/Rivet/LHC-7-Jets-6.in
--- a/Tests/Rivet/LHC-7-Jets-6.in
+++ b/Tests/Rivet/LHC-7-Jets-6.in
@@ -1,53 +1,55 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 200.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8924791
# ATLAS di-jet decorrelation
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8971293
# ATLAS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
# ATLAS dijet with veto
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9126244
# CMS dijet decorrelation
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8950903
# CMS jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9086218
# CMS 3/2 jet cross section ratio
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9088458
# ATLAS track jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
# CMS central and forward jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
# CMS dijet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1184941
# ATLAS high pT jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1119557
# ATLAS subjets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564
# CMS jet structure
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539_DIJET
+# CMS 4-jet
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Jets-6 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Jets-7.in b/Tests/Rivet/LHC-7-Jets-7.in
--- a/Tests/Rivet/LHC-7-Jets-7.in
+++ b/Tests/Rivet/LHC-7-Jets-7.in
@@ -1,49 +1,51 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 300.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8924791
# ATLAS di-jet decorrelation
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8971293
# ATLAS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
# ATLAS dijet with veto
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9126244
# CMS jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9086218
# CMS 3/2 jet cross section ratio
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9088458
# ATLAS track jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
# CMS central and forward jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
# CMS dijet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1184941
# ATLAS subjets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564
# CMS jet structure
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539_DIJET
+# CMS 4-jet
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Jets-7 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Jets-8.in b/Tests/Rivet/LHC-7-Jets-8.in
--- a/Tests/Rivet/LHC-7-Jets-8.in
+++ b/Tests/Rivet/LHC-7-Jets-8.in
@@ -1,47 +1,49 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 500.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS di-jet decorrelation
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8971293
# ATLAS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
# ATLAS dijet with veto
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9126244
# CMS jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9086218
# CMS 3/2 jet cross section ratio
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9088458
# ATLAS track jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
# CMS central and forward jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
# CMS dijet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1184941
# ATLAS subjets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564
# CMS jet structure
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539_DIJET
+# CMS 4-jet
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Jets-8 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-Jets-9.in b/Tests/Rivet/LHC-7-Jets-9.in
--- a/Tests/Rivet/LHC-7-Jets-9.in
+++ b/Tests/Rivet/LHC-7-Jets-9.in
@@ -1,37 +1,39 @@
###################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 20.
set /Herwig/Cuts/QCDCuts:MHatMin 90.*GeV
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
# CMS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8968497
# CMS central and forward jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
# CMS dijet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1184941
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1090423
+
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-7-Jets-9 LHCGenerator
diff --git a/Tests/Rivet/LHC-7-UE.in b/Tests/Rivet/LHC-7-UE.in
--- a/Tests/Rivet/LHC-7-UE.in
+++ b/Tests/Rivet/LHC-7-UE.in
@@ -1,98 +1,104 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# min bias
insert SimpleQCD:MatrixElements[0] MEMinBias
# same as ue process
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
# min ibas cuts
set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
set /Herwig/Cuts/QCDCuts:MHatMin 0.0*GeV
set /Herwig/Cuts/QCDCuts:X1Min 0.01
set /Herwig/Cuts/QCDCuts:X2Min 0.01
##################################################
# select the analyses
##################################################
# ATLAS jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8924791
# ATLAS jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
# ATLAS UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8994773
# ATLAS UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8894728
# ATLAS fragmentation function
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_CONF_2010_049
# ATLAS UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8918562
# ALICE charged particles
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2010_S8625980
# CMS particle spectra
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8978280
# CMS charged particle multiplicity
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8884919
# CMS charged particle pT and rapidity
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2010_S8656010
# CMS UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9120041
# ATLAS track jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
# LHCB phi production
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2011_I919315
# LHCB promt hadron productiom
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2012_I1119400
# ATLAS rap gap
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1084540
# CMS forward energy flow
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9215166
# CMS charged particle rapidity
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_QCD_10_024
# LHC K0s/Lambda
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2011_I917009
# TOTEM at large rapidity
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOTEM_2012_I1115294
# ATLAS Azimuthal ordering of charged hadrons
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1091481
# ALICE single/double diffractive and inelastic sigma
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2012_I1181770
# ATLAS inelastic cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I894867
# CMS inelastic cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1193338
# total transverse energy
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1183818
# underlying event forward rapidities
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_PAS_FWD_11_003
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1218372
# strange particles in underlying event
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_PAS_QCD_11_010
# CMS central and forward jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
# CMS dijet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1184941
# ATLAS charged particle in min bias
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1125575
# ATLAS two particle correlation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094061
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094061
# ATLAS correlations
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1093734
# LHCB energy flow
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2013_I1208105
+# ATLAS charged particle event shapes
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1124167
+# CMS Jet/UE properties
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1261026
+
+
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
# get the cross section right
create Herwig::MPIXSecReweighter MPIXSecReweighter
insert LHCGenerator:EventHandler:PostSubProcessHandlers 0 MPIXSecReweighter
saverun LHC-7-UE LHCGenerator
diff --git a/Tests/Rivet/LHC-900-UE.in b/Tests/Rivet/LHC-900-UE.in
--- a/Tests/Rivet/LHC-900-UE.in
+++ b/Tests/Rivet/LHC-900-UE.in
@@ -1,86 +1,86 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
# override the beam energy
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 900.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# min bias
insert SimpleQCD:MatrixElements[0] MEMinBias
# same as ue process
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
# min ibas cuts
set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
set /Herwig/Cuts/QCDCuts:MHatMin 0.0*GeV
set /Herwig/Cuts/QCDCuts:X1Min 0.01
set /Herwig/Cuts/QCDCuts:X2Min 0.01
##################################################
# select the analyses
##################################################
# ATLAS UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8994773
# ATLAS UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8918562
# ATLAS UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8894728
# ATLAS charged particles
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8591806
# ALICE charged particles
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2010_S8706239
# ALICE charged particles
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2010_S8625980
# ALICE charged particles
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2010_S8624100
# ALICE particle spectra
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2011_S8945144
# ALICE strange particle production
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2011_S8909580
# CMS particle spectra
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8978280
# CMS charged particle multiplicity
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8884919
# CMS charged particle pT and rapidity
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2010_S8547297
# CMS UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9120041
# LHCB k_s0
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2010_S8758301
# LHCB promt hadron production
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2012_I1119400
# CMS forward energy flow
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9215166
# CMS charged particle rapidity
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_QCD_10_024
# LHC K0s/Lambda
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2011_I917009
# ATLAS Azimuthal ordering of charged hadrons
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1091481
# ALICE single/double diffractive and inelastic sigma
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2012_I1181770
# ATLAS inelastic cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I894867
# underlying event forward rapidities
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_PAS_FWD_11_003
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1218372
# ATLAS two particle correlation
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094061
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094061
# ATLAS correlations
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1093734
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
# get the cross section right
create Herwig::MPIXSecReweighter MPIXSecReweighter
insert LHCGenerator:EventHandler:PostSubProcessHandlers 0 MPIXSecReweighter
saverun LHC-900-UE LHCGenerator
diff --git a/Tests/Rivet/LHC-Powheg-7-DiPhoton-GammaGamma.in b/Tests/Rivet/LHC-Powheg-7-DiPhoton-GammaGamma.in
--- a/Tests/Rivet/LHC-Powheg-7-DiPhoton-GammaGamma.in
+++ b/Tests/Rivet/LHC-Powheg-7-DiPhoton-GammaGamma.in
@@ -1,40 +1,42 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase-Powheg.in
set /Herwig/EventHandlers/LHCHandler:StatLevel 4
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# diphoton
insert SimpleQCD:MatrixElements[0] MEGammaGammaPowheg
set MEGammaGammaPowheg:Process GammaGamma
insert SimpleQCD:MatrixElements[0] MEGammaGamma
set MEGammaGamma:Process gg
# switch QED on (shower)
set /Herwig/Shower/Evolver:Interactions BothAtOnce
# photon cuts
set /Herwig/Cuts/PhotonKtCut:MinKT 5.
set /Herwig/Cuts/JetKtCut:MinKT 5.
# No QED radiation (YFS)
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS diphoton
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9120807
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1199269
+
# MC diphoton
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_DIPHOTON
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-Powheg-7-DiPhoton-GammaGamma LHCGenerator
diff --git a/Tests/Rivet/LHC-Powheg-7-DiPhoton-GammaJet.in b/Tests/Rivet/LHC-Powheg-7-DiPhoton-GammaJet.in
--- a/Tests/Rivet/LHC-Powheg-7-DiPhoton-GammaJet.in
+++ b/Tests/Rivet/LHC-Powheg-7-DiPhoton-GammaJet.in
@@ -1,38 +1,40 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase-Powheg.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# diphoton
insert SimpleQCD:MatrixElements[0] MEGammaGammaPowheg
set MEGammaGammaPowheg:Process VJet
# switch QED on (shower)
set /Herwig/Shower/Evolver:Interactions BothAtOnce
# photon cuts
set /Herwig/Cuts/PhotonKtCut:MinKT 5.
set /Herwig/Cuts/JetKtCut:MinKT 5.
# No QED radiation (YFS)
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS diphoton
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9120807
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1199269
+
# MC diphoton
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_DIPHOTON
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-Powheg-7-DiPhoton-GammaJet LHCGenerator
diff --git a/Tests/Rivet/LHC-Powheg-W-mu.in b/Tests/Rivet/LHC-Powheg-W-mu.in
--- a/Tests/Rivet/LHC-Powheg-W-mu.in
+++ b/Tests/Rivet/LHC-Powheg-W-mu.in
@@ -1,36 +1,38 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase-Powheg.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# Drell-Yan Z/gamma
insert SimpleQCD:MatrixElements[0] PowhegMEqq2W2ff
set PowhegMEqq2W2ff:Process Muon
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS W asymetry
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9002537
# ATLAS W+jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8919674
# ATLAS W pT
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I925932
# ATLAS W+jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1083318
# ATLAS W kT scales
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1217867
+# CMS double parton scattering
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1272853
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-Powheg-W-mu LHCGenerator
diff --git a/Tests/Rivet/LHC-Powheg-WW.in b/Tests/Rivet/LHC-Powheg-WW-emu.in
rename from Tests/Rivet/LHC-Powheg-WW.in
rename to Tests/Rivet/LHC-Powheg-WW-emu.in
--- a/Tests/Rivet/LHC-Powheg-WW.in
+++ b/Tests/Rivet/LHC-Powheg-WW-emu.in
@@ -1,33 +1,37 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase-Powheg.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# Drell-Yan Z/gamma
insert SimpleQCD:MatrixElements[0] PowhegMEPP2VV
set PowhegMEPP2VV:Process WW
set /Herwig/Particles/W+:Synchronized 0
set /Herwig/Particles/W-:Synchronized 0
do /Herwig/Particles/W+:SelectDecayModes /Herwig/Particles/W+/W+->nu_e,e+;
do /Herwig/Particles/W-:SelectDecayModes /Herwig/Particles/W-/W-->nu_mubar,mu-;
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+# put BR's into cross section
+create Herwig::BranchingRatioReweighter /Herwig/Generators/BRReweighter
+insert /Herwig/EventHandlers/LHCHandler:PostHadronizationHandlers 0 /Herwig/Generators/BRReweighter
+
##################################################
# select the analyses
##################################################
# general analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_WWJETS
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LHC-Powheg-WW LHCGenerator
+saverun LHC-Powheg-WW-emu LHCGenerator
diff --git a/Tests/Rivet/LHC-Powheg-WW.in b/Tests/Rivet/LHC-Powheg-WW-ll.in
copy from Tests/Rivet/LHC-Powheg-WW.in
copy to Tests/Rivet/LHC-Powheg-WW-ll.in
--- a/Tests/Rivet/LHC-Powheg-WW.in
+++ b/Tests/Rivet/LHC-Powheg-WW-ll.in
@@ -1,33 +1,34 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase-Powheg.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# Drell-Yan Z/gamma
insert SimpleQCD:MatrixElements[0] PowhegMEPP2VV
set PowhegMEPP2VV:Process WW
-set /Herwig/Particles/W+:Synchronized 0
-set /Herwig/Particles/W-:Synchronized 0
-do /Herwig/Particles/W+:SelectDecayModes /Herwig/Particles/W+/W+->nu_e,e+;
-do /Herwig/Particles/W-:SelectDecayModes /Herwig/Particles/W-/W-->nu_mubar,mu-;
+do /Herwig/Particles/W+:SelectDecayModes /Herwig/Particles/W+/W+->nu_e,e+; /Herwig/Particles/W+/W+->nu_mu,mu+; /Herwig/Particles/W+/W+->nu_tau,tau+;
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+# put BR's into cross section
+create Herwig::BranchingRatioReweighter /Herwig/Generators/BRReweighter
+insert /Herwig/EventHandlers/LHCHandler:PostHadronizationHandlers 0 /Herwig/Generators/BRReweighter
+
##################################################
# select the analyses
##################################################
# general analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_WWJETS
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1190187
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LHC-Powheg-WW LHCGenerator
+saverun LHC-Powheg-WW-ll LHCGenerator
diff --git a/Tests/Rivet/LHC-Powheg-Z-e.in b/Tests/Rivet/LHC-Powheg-Z-e.in
--- a/Tests/Rivet/LHC-Powheg-Z-e.in
+++ b/Tests/Rivet/LHC-Powheg-Z-e.in
@@ -1,40 +1,46 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase-Powheg.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# Drell-Yan Z/gamma
insert SimpleQCD:MatrixElements[0] PowhegMEqq2gZ2ff
set PowhegMEqq2gZ2ff:Process Electron
# No QED radiation
#erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# General analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZJETS
# ATLAS pT
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9131140
# ATLAS Z+jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I945498
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1230812
# ATLAS phi*
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1204784
+# CMS Z + b-hadron
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1256943
+# CMS Z ang correlations and event shapes
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1209721
+# CMS Z pt and y
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I941555
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-Powheg-Z-e LHCGenerator
diff --git a/Tests/Rivet/LHC-Powheg-Z-mu.in b/Tests/Rivet/LHC-Powheg-Z-mu.in
--- a/Tests/Rivet/LHC-Powheg-Z-mu.in
+++ b/Tests/Rivet/LHC-Powheg-Z-mu.in
@@ -1,40 +1,46 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase-Powheg.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# Drell-Yan Z/gamma
insert SimpleQCD:MatrixElements[0] PowhegMEqq2gZ2ff
set PowhegMEqq2gZ2ff:Process Muon
# No QED radiation
#erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS pT
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9131140
# ATLAS Z+jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I945498
# CMS underlying event in Z events
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1107658
# ATLAS phi*
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1204784
# Z and real photon + jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1258128
+# CMS Z + b-hadron
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1256943
+# CMS Z ang correlations and event shapes
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1209721
+# CMS Z pt and y
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I941555
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-Powheg-Z-mu LHCGenerator
diff --git a/Tests/Rivet/LHC-Powheg-ZZ.in b/Tests/Rivet/LHC-Powheg-ZZ-ll.in
rename from Tests/Rivet/LHC-Powheg-ZZ.in
rename to Tests/Rivet/LHC-Powheg-ZZ-ll.in
--- a/Tests/Rivet/LHC-Powheg-ZZ.in
+++ b/Tests/Rivet/LHC-Powheg-ZZ-ll.in
@@ -1,30 +1,34 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase-Powheg.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# ZZ
insert SimpleQCD:MatrixElements[0] PowhegMEPP2VV
set PowhegMEPP2VV:Process ZZ
-do /Herwig/Particles/Z0:SelectDecayModes /Herwig/Particles/Z0/Z0->e-,e+; /Herwig/Particles/Z0/Z0->mu-,mu+;
+do /Herwig/Particles/Z0:SelectDecayModes /Herwig/Particles/Z0/Z0->e-,e+; /Herwig/Particles/Z0/Z0->mu-,mu+; /Herwig/Particles/Z0/Z0->tau-,tau+;
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+# put BR's into cross section
+create Herwig::BranchingRatioReweighter /Herwig/Generators/BRReweighter
+insert /Herwig/EventHandlers/LHCHandler:PostHadronizationHandlers 0 /Herwig/Generators/BRReweighter
+
##################################################
# select the analyses
##################################################
# general analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZZJETS
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LHC-Powheg-ZZ LHCGenerator
+saverun LHC-Powheg-ZZ-ll LHCGenerator
diff --git a/Tests/Rivet/LHC-Powheg-ZZ.in b/Tests/Rivet/LHC-Powheg-ZZ-lv.in
copy from Tests/Rivet/LHC-Powheg-ZZ.in
copy to Tests/Rivet/LHC-Powheg-ZZ-lv.in
--- a/Tests/Rivet/LHC-Powheg-ZZ.in
+++ b/Tests/Rivet/LHC-Powheg-ZZ-lv.in
@@ -1,30 +1,34 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase-Powheg.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# ZZ
insert SimpleQCD:MatrixElements[0] PowhegMEPP2VV
set PowhegMEPP2VV:Process ZZ
-do /Herwig/Particles/Z0:SelectDecayModes /Herwig/Particles/Z0/Z0->e-,e+; /Herwig/Particles/Z0/Z0->mu-,mu+;
+do /Herwig/Particles/Z0:SelectDecayModes /Herwig/Particles/Z0/Z0->e-,e+; /Herwig/Particles/Z0/Z0->mu-,mu+; /Herwig/Particles/Z0/Z0->tau-,tau+; /Herwig/Particles/Z0/Z0->nu_e,nu_ebar; /Herwig/Particles/Z0/Z0->nu_mu,nu_mubar; /Herwig/Particles/Z0/Z0->nu_tau,nu_taubar;
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# general analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZZJETS
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1203852
+
+# put BR's into cross section
+create Herwig::BranchingRatioReweighter /Herwig/Generators/BRReweighter
+insert /Herwig/EventHandlers/LHCHandler:PostHadronizationHandlers 0 /Herwig/Generators/BRReweighter
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LHC-Powheg-ZZ LHCGenerator
+saverun LHC-Powheg-ZZ-lv LHCGenerator
diff --git a/Tests/Rivet/LHC-W-mu.in b/Tests/Rivet/LHC-W-mu.in
--- a/Tests/Rivet/LHC-W-mu.in
+++ b/Tests/Rivet/LHC-W-mu.in
@@ -1,37 +1,40 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# Drell-Yan Z/gamma
insert SimpleQCD:MatrixElements[0] MEqq2W2ff
set MEqq2W2ff:Process Muon
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# ATLAS W asymetry
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9002537
# ATLAS W+jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8919674
# ATLAS W pT
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I925932
# ATLAS W+jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1083318
# ATLAS W kT scales
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1217867
+# CMS double parton scattering
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1272853
+
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-W-mu LHCGenerator
diff --git a/Tests/Rivet/LHC-WW.in b/Tests/Rivet/LHC-WW-emu.in
rename from Tests/Rivet/LHC-WW.in
rename to Tests/Rivet/LHC-WW-emu.in
--- a/Tests/Rivet/LHC-WW.in
+++ b/Tests/Rivet/LHC-WW-emu.in
@@ -1,33 +1,37 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# Drell-Yan Z/gamma
insert SimpleQCD:MatrixElements[0] MEPP2VV
set MEPP2VV:Process WW
set /Herwig/Particles/W+:Synchronized 0
set /Herwig/Particles/W-:Synchronized 0
do /Herwig/Particles/W+:SelectDecayModes /Herwig/Particles/W+/W+->nu_e,e+;
do /Herwig/Particles/W-:SelectDecayModes /Herwig/Particles/W-/W-->nu_mubar,mu-;
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+# put BR's into cross section
+create Herwig::BranchingRatioReweighter /Herwig/Generators/BRReweighter
+insert /Herwig/EventHandlers/LHCHandler:PostHadronizationHandlers 0 /Herwig/Generators/BRReweighter
+
##################################################
# select the analyses
##################################################
# general analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_WWJETS
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LHC-WW LHCGenerator
+saverun LHC-WW-emu LHCGenerator
diff --git a/Tests/Rivet/LHC-WW.in b/Tests/Rivet/LHC-WW-ll.in
copy from Tests/Rivet/LHC-WW.in
copy to Tests/Rivet/LHC-WW-ll.in
--- a/Tests/Rivet/LHC-WW.in
+++ b/Tests/Rivet/LHC-WW-ll.in
@@ -1,33 +1,34 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# Drell-Yan Z/gamma
insert SimpleQCD:MatrixElements[0] MEPP2VV
set MEPP2VV:Process WW
-set /Herwig/Particles/W+:Synchronized 0
-set /Herwig/Particles/W-:Synchronized 0
-do /Herwig/Particles/W+:SelectDecayModes /Herwig/Particles/W+/W+->nu_e,e+;
-do /Herwig/Particles/W-:SelectDecayModes /Herwig/Particles/W-/W-->nu_mubar,mu-;
+do /Herwig/Particles/W+:SelectDecayModes /Herwig/Particles/W+/W+->nu_e,e+; /Herwig/Particles/W+/W+->nu_mu,mu+; /Herwig/Particles/W+/W+->nu_tau,tau+;
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# general analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_WWJETS
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1190187
+
+# put BR's into cross section
+create Herwig::BranchingRatioReweighter /Herwig/Generators/BRReweighter
+insert /Herwig/EventHandlers/LHCHandler:PostHadronizationHandlers 0 /Herwig/Generators/BRReweighter
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LHC-WW LHCGenerator
+saverun LHC-WW-ll LHCGenerator
diff --git a/Tests/Rivet/LHC-Z-e.in b/Tests/Rivet/LHC-Z-e.in
--- a/Tests/Rivet/LHC-Z-e.in
+++ b/Tests/Rivet/LHC-Z-e.in
@@ -1,40 +1,45 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# Drell-Yan Z/gamma
insert SimpleQCD:MatrixElements[0] MEqq2gZ2ff
set MEqq2gZ2ff:Process Electron
# No QED radiation
#erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# General analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZJETS
# ATLAS pT
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9131140
# ATLAS Z+jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I945498
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1230812
# ATLAS phi*
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1204784
-
+# CMS Z + b-hadron
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1256943
+# CMS Z ang correlations and event shapes
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1209721
+# CMS Z pt and y
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I941555
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-Z-e LHCGenerator
diff --git a/Tests/Rivet/LHC-Z-mu.in b/Tests/Rivet/LHC-Z-mu.in
--- a/Tests/Rivet/LHC-Z-mu.in
+++ b/Tests/Rivet/LHC-Z-mu.in
@@ -1,40 +1,46 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# Drell-Yan Z/gamma
insert SimpleQCD:MatrixElements[0] MEqq2gZ2ff
set MEqq2gZ2ff:Process Muon
# No QED radiation
#erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# General analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9131140
# ATLAS Z+jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I945498
# CMS underlying event in Z events
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1107658
# ATLAS phi*
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1204784
# Z and real photon + jet
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1258128
+# CMS Z + b-hadron
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1256943
+# CMS Z ang correlations and event shapes
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1209721
+# CMS Z pt and y
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I941555
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun LHC-Z-mu LHCGenerator
diff --git a/Tests/Rivet/LHC-ZZ.in b/Tests/Rivet/LHC-ZZ-ll.in
rename from Tests/Rivet/LHC-ZZ.in
rename to Tests/Rivet/LHC-ZZ-ll.in
--- a/Tests/Rivet/LHC-ZZ.in
+++ b/Tests/Rivet/LHC-ZZ-ll.in
@@ -1,30 +1,34 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# ZZ
insert SimpleQCD:MatrixElements[0] MEPP2VV
set MEPP2VV:Process ZZ
-do /Herwig/Particles/Z0:SelectDecayModes /Herwig/Particles/Z0/Z0->e-,e+; /Herwig/Particles/Z0/Z0->mu-,mu+;
+do /Herwig/Particles/Z0:SelectDecayModes /Herwig/Particles/Z0/Z0->e-,e+; /Herwig/Particles/Z0/Z0->mu-,mu+; /Herwig/Particles/Z0/Z0->tau-,tau+;
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+# put BR's into cross section
+create Herwig::BranchingRatioReweighter /Herwig/Generators/BRReweighter
+insert /Herwig/EventHandlers/LHCHandler:PostHadronizationHandlers 0 /Herwig/Generators/BRReweighter
+
##################################################
# select the analyses
##################################################
# general analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZZJETS
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LHC-ZZ LHCGenerator
+saverun LHC-ZZ-ll LHCGenerator
diff --git a/Tests/Rivet/LHC-ZZ.in b/Tests/Rivet/LHC-ZZ-lv.in
copy from Tests/Rivet/LHC-ZZ.in
copy to Tests/Rivet/LHC-ZZ-lv.in
--- a/Tests/Rivet/LHC-ZZ.in
+++ b/Tests/Rivet/LHC-ZZ-lv.in
@@ -1,30 +1,35 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read LHCBase.in
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# ZZ
insert SimpleQCD:MatrixElements[0] MEPP2VV
set MEPP2VV:Process ZZ
-do /Herwig/Particles/Z0:SelectDecayModes /Herwig/Particles/Z0/Z0->e-,e+; /Herwig/Particles/Z0/Z0->mu-,mu+;
+do /Herwig/Particles/Z0:SelectDecayModes /Herwig/Particles/Z0/Z0->e-,e+; /Herwig/Particles/Z0/Z0->mu-,mu+; /Herwig/Particles/Z0/Z0->tau-,tau+; /Herwig/Particles/Z0/Z0->nu_e,nu_ebar; /Herwig/Particles/Z0/Z0->nu_mu,nu_mubar; /Herwig/Particles/Z0/Z0->nu_tau,nu_taubar;
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
+# put BR's into cross section
+create Herwig::BranchingRatioReweighter /Herwig/Generators/BRReweighter
+insert /Herwig/EventHandlers/LHCHandler:PostHadronizationHandlers 0 /Herwig/Generators/BRReweighter
+
##################################################
# select the analyses
##################################################
# general analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZZJETS
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1203852
+
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
-saverun LHC-ZZ LHCGenerator
+saverun LHC-ZZ-lv LHCGenerator
diff --git a/Tests/Rivet/TVT-Powheg-Run-II-Z-mu.in b/Tests/Rivet/TVT-Powheg-Run-II-Z-mu.in
--- a/Tests/Rivet/TVT-Powheg-Run-II-Z-mu.in
+++ b/Tests/Rivet/TVT-Powheg-Run-II-Z-mu.in
@@ -1,47 +1,47 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase-Powheg.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# Drell-Yan Z/gamma
insert SimpleQCD:MatrixElements[0] PowhegMEqq2gZ2ff
set PowhegMEqq2gZ2ff:Process Muon
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# D0 run II Z pT
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2010_S8671338
# CDF Z+b jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S8095620
# CDF Z+b jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_S6653332
# CDF underlying event
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_NOTE_9351
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_NOTE_9351
# D0 Run II
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2009_S8349509
# D0 Run II
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7863608
# D0 run II
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2010_S8821313
# D0 run II UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2010_S8591881_DY
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Powheg-Run-II-Z-mu LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Jets-1.in b/Tests/Rivet/TVT-Run-II-Jets-1.in
--- a/Tests/Rivet/TVT-Run-II-Jets-1.in
+++ b/Tests/Rivet/TVT-Run-II-Jets-1.in
@@ -1,43 +1,43 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 25.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# CDF jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2005_S6217184
# not ready
# insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_S8057893
# CDF inclusive jet kt
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2007_S7057202
# run II UE analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2010_S8591881_QCD
# inclusive jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7662670
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-II-Jets-1 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Jets-2.in b/Tests/Rivet/TVT-Run-II-Jets-2.in
--- a/Tests/Rivet/TVT-Run-II-Jets-2.in
+++ b/Tests/Rivet/TVT-Run-II-Jets-2.in
@@ -1,46 +1,46 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 40.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# CDF jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2005_S6217184
# not ready
# insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_S8057893
# CDF inclusive jet kt
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2007_S7057202
# CDF inclusive jet cone
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_S6450792
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S7828950
# run II UE analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2010_S8591881_QCD
# inclusive jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7662670
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-II-Jets-2 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Jets-3.in b/Tests/Rivet/TVT-Run-II-Jets-3.in
--- a/Tests/Rivet/TVT-Run-II-Jets-3.in
+++ b/Tests/Rivet/TVT-Run-II-Jets-3.in
@@ -1,48 +1,48 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 60.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# CDF jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2005_S6217184
# not ready
# insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_S8057893
# CDF inclusive jet kt
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2007_S7057202
# CDF inclusive jet cone
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_S6450792
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S7828950
# run II UE analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2010_S8591881_QCD
# dijet decorrelations
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2004_S5992206
# inclusive jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7662670
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-II-Jets-3 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Jets-4.in b/Tests/Rivet/TVT-Run-II-Jets-4.in
--- a/Tests/Rivet/TVT-Run-II-Jets-4.in
+++ b/Tests/Rivet/TVT-Run-II-Jets-4.in
@@ -1,48 +1,48 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 85.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# CDF jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2005_S6217184
# not ready
# insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_S8057893
# CDF inclusive jet kt
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2007_S7057202
# CDF inclusive jet cone
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_S6450792
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S7828950
# run II UE analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2010_S8591881_QCD
# dijet decorrelations
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2004_S5992206
# inclusive jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7662670
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-II-Jets-4 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Jets-5.in b/Tests/Rivet/TVT-Run-II-Jets-5.in
--- a/Tests/Rivet/TVT-Run-II-Jets-5.in
+++ b/Tests/Rivet/TVT-Run-II-Jets-5.in
@@ -1,50 +1,50 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 110.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# CDF jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2005_S6217184
# not ready
# insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_S8057893
# CDF inclusive jet kt
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2007_S7057202
# CDF inclusive jet cone
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_S6450792
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S7828950
# run II UE analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2010_S8591881_QCD
# dijet decorrelations
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2004_S5992206
# inclusive jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7662670
# D0 three-jets analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2011_I895662
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-II-Jets-5 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Jets-6.in b/Tests/Rivet/TVT-Run-II-Jets-6.in
--- a/Tests/Rivet/TVT-Run-II-Jets-6.in
+++ b/Tests/Rivet/TVT-Run-II-Jets-6.in
@@ -1,48 +1,48 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 160.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# CDF jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2005_S6217184
# not ready
# insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_S8057893
# CDF inclusive jet kt
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2007_S7057202
# CDF inclusive jet cone
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_S6450792
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S7828950
# run II UE analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2010_S8591881_QCD
# dijet decorrelations
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2004_S5992206
# inclusive jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7662670
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-II-Jets-6 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Jets-7.in b/Tests/Rivet/TVT-Run-II-Jets-7.in
--- a/Tests/Rivet/TVT-Run-II-Jets-7.in
+++ b/Tests/Rivet/TVT-Run-II-Jets-7.in
@@ -1,46 +1,46 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
insert SimpleQCD:MatrixElements[0] MEQCD2to2
set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
set /Herwig/Cuts/JetKtCut:MinKT 250.
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# CDF jet shapes
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2005_S6217184
# not ready
# insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_S8057893
# CDF inclusive jet kt
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2007_S7057202
# CDF inclusive jet cone
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_S6450792
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S7828950
# run II UE analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2010_S8591881_QCD
# inclusive jet cross section
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7662670
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-II-Jets-7 LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-UE.in b/Tests/Rivet/TVT-Run-II-UE.in
--- a/Tests/Rivet/TVT-Run-II-UE.in
+++ b/Tests/Rivet/TVT-Run-II-UE.in
@@ -1,45 +1,45 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVT-UEBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# min bias
insert SimpleQCD:MatrixElements[0] MEMinBias
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
# min ibas cuts
set /Herwig/Cuts/JetKtCut:MinKT 0.0*GeV
set /Herwig/Cuts/QCDCuts:MHatMin 0.0*GeV
set /Herwig/Cuts/QCDCuts:X1Min 0.01
set /Herwig/Cuts/QCDCuts:X2Min 0.01
##################################################
# select the analyses
##################################################
# run II UE analysis
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_LEADINGJETS
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2010_S8591881_QCD
# run II charged multiplicity
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_NOTE_9936
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2009_S8233977
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2012_NOTE10874
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
# get the cross section right
create Herwig::MPIXSecReweighter MPIXSecReweighter
insert LHCGenerator:EventHandler:PostSubProcessHandlers 0 MPIXSecReweighter
saverun TVT-Run-II-UE LHCGenerator
diff --git a/Tests/Rivet/TVT-Run-II-Z-mu.in b/Tests/Rivet/TVT-Run-II-Z-mu.in
--- a/Tests/Rivet/TVT-Run-II-Z-mu.in
+++ b/Tests/Rivet/TVT-Run-II-Z-mu.in
@@ -1,47 +1,47 @@
##################################################
# Rivet analyses at the Z pole
##################################################
read TVTBase.in
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set LHCGenerator:EventHandler:LuminosityFunction:Energy 1960.0
##################################################
# Use the q qbar matrix element
##################################################
cd /Herwig/MatrixElements
# Drell-Yan Z/gamma
insert SimpleQCD:MatrixElements[0] MEqq2gZ2ff
set MEqq2gZ2ff:Process Muon
# No QED radiation
erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers 0
##################################################
# select the analyses
##################################################
# D0 run II Z pT
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2010_S8671338
# CDF Z+b jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_S8095620
# CDF Z+b jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2006_S6653332
# CDF underlying event
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_NOTE_9351
+#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2008_NOTE_9351
# D0 Run II
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2009_S8349509
# D0 Run II
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2008_S7863608
# D0 run II
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 D0_2010_S8821313
# D0 run II UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CDF_2010_S8591881_DY
##################################################
# Save run for later usage with 'Herwig++ run'
##################################################
cd /Herwig/Generators
saverun TVT-Run-II-Z-mu LHCGenerator
diff --git a/Tests/python/merge-BFactory b/Tests/python/merge-BFactory
--- a/Tests/python/merge-BFactory
+++ b/Tests/python/merge-BFactory
@@ -1,248 +1,211 @@
#! /usr/bin/env python
-import lighthisto
import logging
import sys
if sys.version_info[:3] < (2,4,0):
print "rivet scripts require Python version >= 2.4.0... exiting"
sys.exit(1)
-import os, copy, re
-from math import sqrt
-
-## Try to load faster but non-standard cElementTree module
-try:
- import xml.etree.cElementTree as ET
-except ImportError:
- try:
- import cElementTree as ET
- except ImportError:
- try:
- import xml.etree.ElementTree as ET
- except:
- sys.stderr.write("Can't load the ElementTree XML parser: please install it!\n")
- sys.exit(1)
-
-
+import os, yoda
# #############################################
-def fillAbove(desthisto, sourcehistosbyptmin):
- for i,b in enumerate(desthisto.getBins()):
- ## Fill bins with pT-ordered histos (so that 'highest always wins')
- for ptmin, h in sorted(sourcehistosbyptmin.iteritems()):
- newb = h.getBin(i)
- if newb.xlow <= float(ptmin) and newb.xhigh >=float(ptmin):
- b.val = newb.val
- b.errplus = newb.errplus
- b.errminus = newb.errminus
- b._focus= newb._focus
+def fillAbove(desthisto, sourcehistosbysqrts):
+ for sqrts, h in sorted(sourcehistosbysqrts.iteritems()) :
+ for i in range(0,h.numPoints) :
+ if(h.points[i].x-0.01<sqrts and
+ h.points[i].x+0.01>sqrts) :
+ desthisto.addPoint(h.points[i])
def merge(hpath):
global inhistos
global outhistos
try:
fillAbove(outhistos[hpath], inhistos[hpath])
except:
- pass
+ logging.error("Unknown analysis object" + hpath)
+ sys.exit(1)
def useOne(hpath, sqrts):
global inhistos
global outhistos
try:
outhistos[hpath] = inhistos[hpath][float(sqrts)]
except:
pass
+
if __name__ == "__main__":
import logging
from optparse import OptionParser, OptionGroup
parser = OptionParser(usage="%prog name")
verbgroup = OptionGroup(parser, "Verbosity control")
verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
default=logging.INFO, help="print debug (very verbose) messages")
verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
default=logging.INFO, help="be very quiet")
parser.add_option_group(verbgroup)
(opts, args) = parser.parse_args()
logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
-
- ## Prefix used in dat file headers
- headerprefix = "# "
-
-
## Check args
if len(args) < 1:
logging.error("Must specify at least the name of the files")
sys.exit(1)
# #######################################
-aidafiles=["-10.52.aida","-10.52-sym.aida","-10.54.aida","-10.58.aida","-Upsilon.aida",
- "-Upsilon2.aida","-Upsilon4.aida","-10.45.aida","-Tau.aida"]
+yodafiles=["-10.52.yoda","-10.52-sym.yoda","-10.54.yoda","-10.58.yoda","-Upsilon.yoda",
+ "-Upsilon2.yoda","-Upsilon4.yoda","-10.45.yoda","-Tau.yoda"]
## Get histos
inhistos = {}
outhistos={}
weights = {}
-for f in aidafiles:
+for f in yodafiles:
file = args[0]+f
if(file.find("10.45")>0) :
sqrts=10.45
elif(file.find("10.52")>0) :
sqrts=10.52
elif(file.find("10.54")>0) :
sqrts=10.54
elif(file.find("10.58")>0) :
sqrts=10.58
elif(file.find("Tau")>0) :
sqrts=10.58
elif(file.find("Upsilon4")>0) :
sqrts=10.58
elif(file.find("Upsilon2")>0) :
sqrts=10.02
elif(file.find("Upsilon")>0) :
sqrts=9.46
if not os.access(file, os.R_OK):
if(file.find("Upsilon")>=0 or file.find("Tau")>=0) : continue
logging.error("%s can not be read" % file)
break
try:
- tree = ET.parse(file)
+ aos = yoda.read(file)
except:
- logging.error("%s can not be parsed as XML" % file)
+ logging.error("%s can not be parsed as yoda" % file)
break
- tree = ET.parse(file)
- ## Get histos from this AIDA file
- for dps in tree.findall("dataPointSet"):
- h = lighthisto.Histo.fromDPS(dps)
+ ## Get histos from this YODA file
+ for aopath, ao in aos.iteritems() :
# jet shapes
- if(h.fullPath().find("6265367")>0 or h.fullPath().find("6895344")>0 or
- h.fullPath().find("6181155")>0 or h.fullPath().find("2789213")>0 or
- h.fullPath().find("2669951")>0) :
- if not inhistos.has_key(h.fullPath()):
- inhistos[h.fullPath()] = {}
- tmpE = inhistos[h.fullPath()]
+ if(aopath.find("6265367")>0 or aopath.find("6895344")>0 or
+ aopath.find("6181155")>0 or aopath.find("2789213")>0 or
+ aopath.find("2669951")>0) :
+ if not inhistos.has_key(aopath):
+ inhistos[aopath] = {}
+ tmpE = inhistos[aopath]
sqrttemp=sqrts
- if(h.fullPath().find("2669951")>0 and h.fullPath().find("d01")>0 and sqrts==10.45) :
+ if(aopath.find("2669951")>0 and aopath.find("d01")>0 and
+ sqrts==10.45) :
sqrts=9.9
if not tmpE.has_key(sqrts):
- tmpE[sqrts] = h
+ tmpE[sqrts] = ao
else:
raise Exception("A set with sqrts = %s already exists" % ( sqrts))
sqrts=sqrttemp
else :
- outhistos[h.fullPath()] = h
+ outhistos[aopath] = ao
## Make empty output histos if needed
for hpath,hsets in inhistos.iteritems():
if( hpath.find("2669951")>0) :
- workhisto = copy.deepcopy(hsets.values()[0])
- outhistos[hpath] = workhisto
- ## Empty the bin set for histos which we're going to merge
- for b in outhistos[hpath]:
- b.val = 0
- b.errplus = 0
- b.errminus = 0
- b._focus= None
+ if(type(hsets.values()[0])==yoda.core.Scatter2D) :
+ outhistos[hpath] = yoda.core.Scatter2D(hsets.values()[0].path,hsets.values()[0].title)
+ else :
+ outhistos[hpath] = hsets.values()[0]
# BELLE
useOne("/BELLE_2006_S6265367/d01-x01-y01","10.52")
useOne("/BELLE_2006_S6265367/d01-x01-y02","10.52")
useOne("/BELLE_2006_S6265367/d01-x01-y03","10.52")
useOne("/BELLE_2006_S6265367/d01-x01-y04","10.52")
useOne("/BELLE_2006_S6265367/d01-x01-y05","10.52")
useOne("/BELLE_2006_S6265367/d01-x01-y06","10.52")
useOne("/BELLE_2006_S6265367/d01-x01-y07","10.52")
useOne("/BELLE_2006_S6265367/d01-x01-y08","10.52")
useOne("/BELLE_2006_S6265367/d02-x01-y01","10.52")
useOne("/BELLE_2006_S6265367/d02-x01-y02","10.52")
useOne("/BELLE_2006_S6265367/d03-x01-y01","10.52")
useOne("/BELLE_2006_S6265367/d03-x01-y02","10.52")
useOne("/BELLE_2006_S6265367/d04-x01-y01","10.52")
useOne("/BELLE_2006_S6265367/d04-x01-y02","10.52")
useOne("/BELLE_2006_S6265367/d05-x01-y01","10.52")
useOne("/BELLE_2006_S6265367/d05-x01-y02","10.52")
useOne("/BELLE_2006_S6265367/d06-x01-y01","10.52")
useOne("/BELLE_2006_S6265367/d06-x01-y02","10.52")
useOne("/BELLE_2006_S6265367/d07-x01-y01","10.52")
useOne("/BELLE_2006_S6265367/d07-x01-y02","10.52")
useOne("/BELLE_2006_S6265367/d08-x01-y01","10.52")
useOne("/BELLE_2006_S6265367/d08-x01-y02","10.52")
useOne("/BELLE_2006_S6265367/d09-x01-y01","10.58")
useOne("/BELLE_2006_S6265367/d09-x01-y02","10.58")
useOne("/BELLE_2006_S6265367/d10-x01-y01","10.58")
useOne("/BELLE_2006_S6265367/d10-x01-y02","10.58")
useOne("/BELLE_2006_S6265367/d11-x01-y01","10.58")
useOne("/BELLE_2006_S6265367/d11-x01-y02","10.58")
useOne("/BELLE_2006_S6265367/d12-x01-y01","10.58")
useOne("/BELLE_2006_S6265367/d12-x01-y02","10.58")
useOne("/BELLE_2006_S6265367/d13-x01-y01","10.58")
useOne("/BELLE_2006_S6265367/d13-x01-y02","10.58")
useOne("/BELLE_2006_S6265367/d14-x01-y01","10.58")
useOne("/BELLE_2006_S6265367/d14-x01-y02","10.58")
useOne("/BELLE_2006_S6265367/d15-x01-y01","10.58")
useOne("/BELLE_2006_S6265367/d15-x01-y02","10.58")
# BABAR
useOne("/BABAR_2007_S6895344/d01-x01-y01","10.54")
useOne("/BABAR_2007_S6895344/d02-x01-y01","10.54")
useOne("/BABAR_2007_S6895344/d03-x01-y01","10.58")
useOne("/BABAR_2007_S6895344/d04-x01-y01","10.58")
# BABAR
useOne("/BABAR_2005_S6181155/d01-x01-y01","10.58")
useOne("/BABAR_2005_S6181155/d02-x01-y01","10.58")
useOne("/BABAR_2005_S6181155/d02-x01-y02","10.54")
useOne("/BABAR_2005_S6181155/d03-x01-y01","10.54")
useOne("/BABAR_2005_S6181155/d04-x01-y01","10.58")
useOne("/BABAR_2005_S6181155/d05-x01-y01","10.58")
useOne("/BABAR_2005_S6181155/d05-x01-y02","10.54")
# ARGUS
useOne("/ARGUS_1993_S2789213/d01-x01-y01","10.45")
useOne("/ARGUS_1993_S2789213/d01-x01-y02","10.45")
useOne("/ARGUS_1993_S2789213/d01-x01-y03","10.45")
useOne("/ARGUS_1993_S2789213/d01-x01-y04","10.45")
useOne("/ARGUS_1993_S2789213/d01-x01-y05","10.45")
useOne("/ARGUS_1993_S2789213/d02-x01-y01", "9.46")
useOne("/ARGUS_1993_S2789213/d02-x01-y02", "9.46")
useOne("/ARGUS_1993_S2789213/d02-x01-y03", "9.46")
useOne("/ARGUS_1993_S2789213/d02-x01-y04", "9.46")
useOne("/ARGUS_1993_S2789213/d02-x01-y05", "9.46")
useOne("/ARGUS_1993_S2789213/d03-x01-y01","10.58")
useOne("/ARGUS_1993_S2789213/d03-x01-y02","10.58")
useOne("/ARGUS_1993_S2789213/d03-x01-y03","10.58")
useOne("/ARGUS_1993_S2789213/d03-x01-y04","10.58")
useOne("/ARGUS_1993_S2789213/d03-x01-y05","10.58")
useOne("/ARGUS_1993_S2789213/d04-x01-y01","10.45")
useOne("/ARGUS_1993_S2789213/d05-x01-y01", "9.46")
useOne("/ARGUS_1993_S2789213/d06-x01-y01","10.58")
useOne("/ARGUS_1993_S2789213/d07-x01-y01","10.45")
useOne("/ARGUS_1993_S2789213/d08-x01-y01", "9.46")
useOne("/ARGUS_1993_S2789213/d09-x01-y01","10.58")
useOne("/ARGUS_1993_S2789213/d10-x01-y01","10.45")
useOne("/ARGUS_1993_S2789213/d11-x01-y01", "9.46")
useOne("/ARGUS_1993_S2789213/d12-x01-y01","10.58")
useOne("/ARGUS_1993_S2789213/d13-x01-y01","10.45")
useOne("/ARGUS_1993_S2789213/d14-x01-y01", "9.46")
useOne("/ARGUS_1993_S2789213/d15-x01-y01","10.58")
useOne("/ARGUS_1993_S2669951/d02-x01-y01","10.45")
useOne("/ARGUS_1993_S2669951/d03-x01-y01","9.46")
useOne("/ARGUS_1993_S2669951/d04-x01-y01","10.02")
merge("/ARGUS_1993_S2669951/d01-x01-y01")
merge("/ARGUS_1993_S2669951/d01-x01-y02")
merge("/ARGUS_1993_S2669951/d05-x01-y01")
+
# Choose output file
-name = args[0]+".aida"
-out = open(name, "w")
-## Write out merged histos
-out.write('<?xml version="1.0" encoding="ISO-8859-1" ?>\n')
-out.write('<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">\n')
-out.write('<aida version="3.3">\n')
-out.write(' <implementation version="1.1" package="FreeHEP"/>\n')
-for hpath, h in sorted(outhistos.iteritems()):
- logging.debug("hpath = %s" % hpath)
- out.write(h.asAIDA() + "\n\n")
-out.write('</aida>\n')
-
+name = args[0]+".yoda"
+# output the yoda file
+yoda.writeYODA(outhistos,name)
sys.exit(0)
diff --git a/Tests/python/merge-DIS b/Tests/python/merge-DIS
--- a/Tests/python/merge-DIS
+++ b/Tests/python/merge-DIS
@@ -1,183 +1,152 @@
#! /usr/bin/env python
-import lighthisto
import logging
import sys
if sys.version_info[:3] < (2,4,0):
print "rivet scripts require Python version >= 2.4.0... exiting"
sys.exit(1)
-import os, copy, re
-from math import sqrt
-
-## Try to load faster but non-standard cElementTree module
-try:
- import xml.etree.cElementTree as ET
-except ImportError:
- try:
- import cElementTree as ET
- except ImportError:
- try:
- import xml.etree.ElementTree as ET
- except:
- sys.stderr.write("Can't load the ElementTree XML parser: please install it!\n")
- sys.exit(1)
-
-
+import os, yoda
# #############################################
-def fillAbove(desthisto, sourcehistosbyptmin):
- for i,b in enumerate(desthisto.getBins()):
- ## Fill bins with pT-ordered histos (so that 'highest always wins')
- for ptmin, h in sorted(sourcehistosbyptmin.iteritems()):
- newb = h.getBin(i)
- if b.xlow >= float(ptmin) :
- b.val = newb.val
- b.errplus = newb.errplus
- b.errminus = newb.errminus
- b._focus= newb._focus
+def fillAbove(desthisto, sourcehistosbyq2):
+ q2high=1e100
+ q2low=-1e100
+ for q2,h in sorted(sourcehistosbyq2.iteritems(),reverse=True) :
+ q2low=q2
+ for i in range(0,h.numBins) :
+ if(h.bins[i].lowEdge >= q2low and
+ h.bins[i].lowEdge < q2high ) :
+ desthisto.bins[i] += h.bins[i]
+ q2high=q2
def merge(hpath):
global inhistos
global outhistos
try:
fillAbove(outhistos[hpath], inhistos[hpath])
except:
pass
-def useOne(hpath, sqrts):
+def useOne(hpath, q2):
global inhistos
global outhistos
try:
- outhistos[hpath] = inhistos[hpath][float(sqrts)]
+ outhistos[hpath] = inhistos[hpath][float(q2)]
except:
pass
+
if __name__ == "__main__":
import logging
from optparse import OptionParser, OptionGroup
parser = OptionParser(usage="%prog name")
verbgroup = OptionGroup(parser, "Verbosity control")
verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
default=logging.INFO, help="print debug (very verbose) messages")
verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
default=logging.INFO, help="be very quiet")
parser.add_option_group(verbgroup)
(opts, args) = parser.parse_args()
logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
-
- ## Prefix used in dat file headers
- headerprefix = "# "
-
-
## Check args
if len(args) < 1:
logging.error("Must specify at least the name of the files")
sys.exit(1)
# #######################################
-aidafiles=["-e--LowQ2.aida","-e+-LowQ2.aida","-e+-HighQ2.aida"]
+yodafiles=["-e--LowQ2.yoda","-e+-LowQ2.yoda","-e+-HighQ2.yoda"]
## Get histos
inhistos = {}
outhistos={}
weights = {}
-for f in aidafiles:
+for f in yodafiles:
file = args[0]+f
if(file.find("Low")> 0) :
q2=0
elif(file.find("High")>0) :
q2=50
if not os.access(file, os.R_OK):
logging.error("%s can not be read" % file)
break
try:
- tree = ET.parse(file)
+ aos = yoda.read(file)
except:
- logging.error("%s can not be parsed as XML" % file)
+ logging.error("%s can not be parsed as YODA" % file)
break
- tree = ET.parse(file)
- ## Get histos from this AIDA file
- for dps in tree.findall("dataPointSet"):
- h = lighthisto.Histo.fromDPS(dps)
- # di-jet decorrelations
- # jet shapes
- if(h.fullPath().find("4129130")>0 ) :
- if not inhistos.has_key(h.fullPath()):
- inhistos[h.fullPath()] = {}
- tmpE = inhistos[h.fullPath()]
+ ## Get histos from this YODA file
+ for aopath, ao in aos.iteritems() :
+ if(aopath.find("4129130")>0 ) :
+ if not inhistos.has_key(aopath):
+ inhistos[aopath] = {}
+ tmpE = inhistos[aopath]
if not tmpE.has_key(q2):
- tmpE[q2] = h
+ tmpE[q2] = ao
else:
raise Exception("A set with q2 = %s already exists" % ( q2 ))
- elif(h.fullPath().find("2919893")>0 ) :
- outhistos[h.fullPath()] = h
+ elif(aopath.find("2919893")>0 ) :
+ outhistos[aopath] = ao
else :
- print '!!!!! DIDNT FIND',h.fullPath()
+ logging.error("Analysis %s is unknown" % aopath)
+ sys.exit(1)
## Make empty output histos if needed
for hpath,hsets in inhistos.iteritems():
- if( hpath.find("4129130")>0) :
- outhistos[hpath] = copy.deepcopy(hsets.values()[0])
- ## Empty the bin set for histos which we're going to merge
- for i,b in enumerate(outhistos[hpath].getBins()):
- b.val = 0
- b.errplus = 0
- b.errminus = 0
- b._focus= None
+ if( hpath.find("4129130")>0 and (hpath.find("d33")>0 or hpath.find("d34")>0)) :
+ if(type(hsets.values()[0])==yoda.core.Scatter2D) :
+ outhistos[hpath] = yoda.core.Scatter2D(hsets.values()[0].path,hsets.values()[0].title)
+ elif(type(hsets.values()[0])==yoda.core.Profile1D) :
+ outhistos[hpath] = yoda.core.Profile1D(hsets.values()[0].path,hsets.values()[0].title)
+ for i in range(0,hsets.values()[0].numBins) :
+ outhistos[hpath].addBin(hsets.values()[0].bins[i].lowEdge,hsets.values()[0].bins[i].highEdge)
+ else :
+ logging.error("Histogram %s is of unknown type" % hpath)
+ sys.exit(1)
# H1 transverse energy
useOne("/H1_2000_S4129130/d01-x01-y01","0")
useOne("/H1_2000_S4129130/d02-x01-y01","0")
useOne("/H1_2000_S4129130/d03-x01-y01","0")
useOne("/H1_2000_S4129130/d04-x01-y01","0")
useOne("/H1_2000_S4129130/d05-x01-y01","0")
useOne("/H1_2000_S4129130/d06-x01-y01","0")
useOne("/H1_2000_S4129130/d07-x01-y01","0")
useOne("/H1_2000_S4129130/d08-x01-y01","0")
useOne("/H1_2000_S4129130/d09-x01-y01","0")
useOne("/H1_2000_S4129130/d10-x01-y01","0")
useOne("/H1_2000_S4129130/d11-x01-y01","0")
useOne("/H1_2000_S4129130/d12-x01-y01","0")
useOne("/H1_2000_S4129130/d13-x01-y01","0")
useOne("/H1_2000_S4129130/d14-x01-y01","0")
useOne("/H1_2000_S4129130/d15-x01-y01","0")
useOne("/H1_2000_S4129130/d16-x01-y01","50")
useOne("/H1_2000_S4129130/d17-x01-y01","50")
useOne("/H1_2000_S4129130/d18-x01-y01","50")
useOne("/H1_2000_S4129130/d19-x01-y01","50")
useOne("/H1_2000_S4129130/d20-x01-y01","50")
useOne("/H1_2000_S4129130/d21-x01-y01","50")
useOne("/H1_2000_S4129130/d22-x01-y01","50")
useOne("/H1_2000_S4129130/d23-x01-y01","50")
useOne("/H1_2000_S4129130/d24-x01-y01","50")
useOne("/H1_2000_S4129130/d25-x01-y01","0")
useOne("/H1_2000_S4129130/d26-x01-y01","0")
useOne("/H1_2000_S4129130/d27-x01-y01","0")
useOne("/H1_2000_S4129130/d28-x01-y01","0")
useOne("/H1_2000_S4129130/d29-x01-y01","50")
useOne("/H1_2000_S4129130/d30-x01-y01","50")
useOne("/H1_2000_S4129130/d31-x01-y01","50")
useOne("/H1_2000_S4129130/d32-x01-y01","50")
merge("/H1_2000_S4129130/d33-x01-y01")
merge("/H1_2000_S4129130/d34-x01-y01")
# Choose output file
-name = args[0]+".aida"
-out = open(name, "w")
-## Write out merged histos
-out.write('<?xml version="1.0" encoding="ISO-8859-1" ?>\n')
-out.write('<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">\n')
-out.write('<aida version="3.3">\n')
-out.write(' <implementation version="1.1" package="FreeHEP"/>\n')
-for hpath, h in sorted(outhistos.iteritems()):
- logging.debug("hpath = %s" % hpath)
- out.write(h.asAIDA() + "\n\n")
-out.write('</aida>\n')
-
+name = args[0]+".yoda"
+# output the yoda file
+yoda.writeYODA(outhistos,name)
sys.exit(0)
diff --git a/Tests/python/merge-LEP b/Tests/python/merge-LEP
--- a/Tests/python/merge-LEP
+++ b/Tests/python/merge-LEP
@@ -1,902 +1,871 @@
#! /usr/bin/env python
-import lighthisto
+# import lighthisto
import logging
import sys
if sys.version_info[:3] < (2,4,0):
print "rivet scripts require Python version >= 2.4.0... exiting"
sys.exit(1)
-import os, copy, re
-from math import sqrt
+import os, yoda, copy
-## Try to load faster but non-standard cElementTree module
-try:
- import xml.etree.cElementTree as ET
-except ImportError:
- try:
- import cElementTree as ET
- except ImportError:
- try:
- import xml.etree.ElementTree as ET
- except:
- sys.stderr.write("Can't load the ElementTree XML parser: please install it!\n")
+# # #############################################
+
+def fillAbove(desthisto, sourcehistosbysqrts):
+ if type(desthisto) is yoda.core.Scatter2D :
+ if(desthisto.numPoints!=1) :
+ print desthisto.numPoints
+ logging.error("Must have one bin for a specific sqrt(s) for %s" % desthisto.path)
sys.exit(1)
-
-
-
-# #############################################
-
-def fillAbove(desthisto, sourcehistosbyptmin):
- for i,b in enumerate(desthisto.getBins()):
- ## Fill bins with pT-ordered histos (so that 'highest always wins')
- for ptmin, h in sorted(sourcehistosbyptmin.iteritems()):
- newb = h.getBin(i)
- if newb.xlow <= float(ptmin) and newb.xhigh >=float(ptmin):
- b.val = newb.val
- b.errplus = newb.errplus
- b.errminus = newb.errminus
- b._focus= newb._focus
+ for sqrts, h in sorted(sourcehistosbysqrts.iteritems()) :
+ if(h.numPoints!=1) :
+ continue
+ if(desthisto.points[0].x != h.points[0].x) :
+ desthisto.addPoint(h.points[0])
+ else :
+ logging.error("Unknown analysis object" + desthisto.path)
+ sys.exit(1)
def merge(hpath):
global inhistos
global outhistos
try:
fillAbove(outhistos[hpath], inhistos[hpath])
except:
pass
def useOne(hpath, sqrts):
global inhistos
global outhistos
try:
outhistos[hpath] = inhistos[hpath][float(sqrts)]
except:
pass
+
if __name__ == "__main__":
import logging
from optparse import OptionParser, OptionGroup
parser = OptionParser(usage="%prog name")
verbgroup = OptionGroup(parser, "Verbosity control")
verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
default=logging.INFO, help="print debug (very verbose) messages")
verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
default=logging.INFO, help="be very quiet")
parser.add_option_group(verbgroup)
(opts, args) = parser.parse_args()
logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
-
- ## Prefix used in dat file headers
- headerprefix = "# "
-
-
## Check args
if len(args) < 1:
logging.error("Must specify at least the name of the files")
sys.exit(1)
-# #######################################
+#######################################
-aidafiles=["-130.aida","-133.aida","-136.aida","-177.aida","-192.aida",
- "-196.aida","-202.aida","-206.aida","-91.aida" ,"-91-nopi.aida" ,\
- "-161.aida","-183.aida","-197.aida","-35.aida" ,"-172.aida",\
- "-189.aida","-200.aida","-44.aida","-14.aida","-22.aida","-10.aida" ]
-
+yodafiles=["-130.yoda","-133.yoda","-136.yoda","-177.yoda","-192.yoda",
+ "-196.yoda","-202.yoda","-206.yoda","-91.yoda" ,"-91-nopi.yoda" ,\
+ "-161.yoda","-183.yoda","-197.yoda","-35.yoda" ,"-172.yoda",\
+ "-189.yoda","-200.yoda","-44.yoda","-14.yoda","-22.yoda","-10.yoda" ]
+
## Get histos
inhistos = {}
outhistos={}
-weights = {}
-for f in aidafiles:
+for f in yodafiles:
file = args[0]+f
if(file.find("10")>0) :
sqrts=10
elif(file.find("14")>0) :
sqrts=14
elif(file.find("22")>0) :
sqrts=22
elif(file.find("35")>0) :
sqrts=35
elif(file.find("44")>0) :
sqrts=44
elif(file.find("91")>0) :
sqrts=91
elif(file.find("130")>0) :
sqrts=130
elif(file.find("133")>0) :
sqrts=133
elif(file.find("136")>0) :
sqrts=136
elif(file.find("161")>0) :
sqrts=161
elif(file.find("172")>0) :
sqrts=172
elif(file.find("177")>0) :
sqrts=177
elif(file.find("183")>0) :
sqrts=183
elif(file.find("189")>0) :
sqrts=189
elif(file.find("192")>0) :
sqrts=192
elif(file.find("196")>0) :
sqrts=196
elif(file.find("197")>0) :
sqrts=197
elif(file.find("200")>0) :
sqrts=200
elif(file.find("202")>0) :
sqrts=202
elif(file.find("206")>0) :
sqrts=206
if not os.access(file, os.R_OK):
logging.error("%s can not be read" % file)
break
try:
- tree = ET.parse(file)
+ aos = yoda.read(file)
except:
- logging.error("%s can not be parsed as XML" % file)
+ logging.error("%s can not be parsed as yoda" % file)
break
- tree = ET.parse(file)
- ## Get histos from this AIDA file
- for dps in tree.findall("dataPointSet"):
- h = lighthisto.Histo.fromDPS(dps)
+ ## Get histos from this YODA file
+ for aopath, ao in aos.iteritems() :
# jet shapes
- if(h.fullPath().find("4300807")>0 or h.fullPath().find("6132243")>0 or
- h.fullPath().find("5765862")>0 or h.fullPath().find("3612880")>0 or
- h.fullPath().find("4328825")>0 or h.fullPath().find("5361494")>0 or
- h.fullPath().find("2148048")>0 or h.fullPath().find("MULTIPLICITIES")>0 ) :
- if not inhistos.has_key(h.fullPath()):
- inhistos[h.fullPath()] = {}
- if not inhistos[h.fullPath()].has_key(sqrts):
- inhistos[h.fullPath()][sqrts] = h
- else:
+ 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("MULTIPLICITIES")>0 ) :
+ if not inhistos.has_key(aopath):
+ inhistos[aopath] = {}
+ if not inhistos[aopath].has_key(sqrts):
+ inhistos[aopath][sqrts] = ao
+ else:
raise Exception("A set with sqrts = %s already exists" % ( sqrts))
else :
- outhistos[h.fullPath()] = h
+ outhistos[aopath] = ao
-## Make empty output histos if needed
+# ## Make empty output histos if needed
for hpath,hsets in inhistos.iteritems():
- if( hpath.find("4300807")>0 or hpath.find("6132243")>0 or hpath.find("5765862")>0 or
+ if( hpath.find("4300807")>0 or hpath.find("6132243")>0 or
+ hpath.find("5765862")>0 or
hpath.find("4328825")>0 or hpath.find("5361494")>0) :
- workhisto = copy.deepcopy(hsets.values()[0])
- outhistos[hpath] = workhisto
- ## Empty the bin set for histos which we're going to merge
- for b in outhistos[hpath]:
- b.val = 0
- b.errplus = 0
- b.errminus = 0
- b._focus= None
+ # workhisto = copy.deepcopy(hsets.values()[0])
+ # outhistos[hpath] = workhisto
+ outhistos[hpath] = hsets.values()[0]
+
# tasso
useOne("/TASSO_1990_S2148048/d06-x01-y01","14")
useOne("/TASSO_1990_S2148048/d07-x01-y01","14")
useOne("/TASSO_1990_S2148048/d08-x01-y01","14")
useOne("/TASSO_1990_S2148048/d06-x01-y02","22")
useOne("/TASSO_1990_S2148048/d07-x01-y02","22")
useOne("/TASSO_1990_S2148048/d08-x01-y02","22")
useOne("/TASSO_1990_S2148048/d06-x01-y03","35")
useOne("/TASSO_1990_S2148048/d07-x01-y03","35")
useOne("/TASSO_1990_S2148048/d08-x01-y03","35")
useOne("/TASSO_1990_S2148048/d06-x01-y04","44")
useOne("/TASSO_1990_S2148048/d07-x01-y04","44")
useOne("/TASSO_1990_S2148048/d08-x01-y04","44")
# jade
useOne("/JADE_1998_S3612880/d02-x01-y01","44")
useOne("/JADE_1998_S3612880/d03-x01-y01","44")
useOne("/JADE_1998_S3612880/d04-x01-y01","44")
useOne("/JADE_1998_S3612880/d05-x01-y01","44")
useOne("/JADE_1998_S3612880/d06-x01-y01","35")
useOne("/JADE_1998_S3612880/d07-x01-y01","35")
useOne("/JADE_1998_S3612880/d08-x01-y01","35")
useOne("/JADE_1998_S3612880/d09-x01-y01","35")
useOne("/JADE_1998_S3612880/d10-x01-y01","44")
useOne("/JADE_1998_S3612880/d11-x01-y01","35")
useOne("/JADE_1998_S3612880/d12-x01-y01","22")
# opal/jade
useOne("/JADE_OPAL_2000_S4300807/d07-x01-y01","35")
useOne("/JADE_OPAL_2000_S4300807/d07-x01-y02","35")
useOne("/JADE_OPAL_2000_S4300807/d07-x01-y03","35")
useOne("/JADE_OPAL_2000_S4300807/d07-x01-y04","35")
useOne("/JADE_OPAL_2000_S4300807/d07-x01-y05","35")
useOne("/JADE_OPAL_2000_S4300807/d08-x01-y01","44")
useOne("/JADE_OPAL_2000_S4300807/d08-x01-y02","44")
useOne("/JADE_OPAL_2000_S4300807/d08-x01-y03","44")
useOne("/JADE_OPAL_2000_S4300807/d08-x01-y04","44")
useOne("/JADE_OPAL_2000_S4300807/d08-x01-y05","44")
useOne("/JADE_OPAL_2000_S4300807/d09-x01-y01","91")
useOne("/JADE_OPAL_2000_S4300807/d09-x01-y02","91")
useOne("/JADE_OPAL_2000_S4300807/d09-x01-y03","91")
useOne("/JADE_OPAL_2000_S4300807/d09-x01-y04","91")
useOne("/JADE_OPAL_2000_S4300807/d09-x01-y05","91")
useOne("/JADE_OPAL_2000_S4300807/d10-x01-y01","133")
useOne("/JADE_OPAL_2000_S4300807/d10-x01-y02","133")
useOne("/JADE_OPAL_2000_S4300807/d10-x01-y03","133")
useOne("/JADE_OPAL_2000_S4300807/d10-x01-y04","133")
useOne("/JADE_OPAL_2000_S4300807/d10-x01-y05","133")
useOne("/JADE_OPAL_2000_S4300807/d11-x01-y01","161")
useOne("/JADE_OPAL_2000_S4300807/d11-x01-y02","161")
useOne("/JADE_OPAL_2000_S4300807/d11-x01-y03","161")
useOne("/JADE_OPAL_2000_S4300807/d11-x01-y04","161")
useOne("/JADE_OPAL_2000_S4300807/d11-x01-y05","161")
useOne("/JADE_OPAL_2000_S4300807/d12-x01-y01","172")
useOne("/JADE_OPAL_2000_S4300807/d12-x01-y02","172")
useOne("/JADE_OPAL_2000_S4300807/d12-x01-y03","172")
useOne("/JADE_OPAL_2000_S4300807/d12-x01-y04","172")
useOne("/JADE_OPAL_2000_S4300807/d12-x01-y05","172")
useOne("/JADE_OPAL_2000_S4300807/d13-x01-y01","183")
useOne("/JADE_OPAL_2000_S4300807/d13-x01-y02","183")
useOne("/JADE_OPAL_2000_S4300807/d13-x01-y03","183")
useOne("/JADE_OPAL_2000_S4300807/d13-x01-y04","183")
useOne("/JADE_OPAL_2000_S4300807/d13-x01-y05","183")
useOne("/JADE_OPAL_2000_S4300807/d14-x01-y01","189")
useOne("/JADE_OPAL_2000_S4300807/d14-x01-y02","189")
useOne("/JADE_OPAL_2000_S4300807/d14-x01-y03","189")
useOne("/JADE_OPAL_2000_S4300807/d14-x01-y04","189")
useOne("/JADE_OPAL_2000_S4300807/d14-x01-y05","189")
useOne("/JADE_OPAL_2000_S4300807/d16-x01-y01","35")
useOne("/JADE_OPAL_2000_S4300807/d16-x01-y02","35")
useOne("/JADE_OPAL_2000_S4300807/d16-x01-y03","35")
useOne("/JADE_OPAL_2000_S4300807/d16-x01-y04","35")
useOne("/JADE_OPAL_2000_S4300807/d16-x01-y05","35")
useOne("/JADE_OPAL_2000_S4300807/d17-x01-y01","44")
useOne("/JADE_OPAL_2000_S4300807/d17-x01-y02","44")
useOne("/JADE_OPAL_2000_S4300807/d17-x01-y03","44")
useOne("/JADE_OPAL_2000_S4300807/d17-x01-y04","44")
useOne("/JADE_OPAL_2000_S4300807/d17-x01-y05","44")
useOne("/JADE_OPAL_2000_S4300807/d18-x01-y01","91")
useOne("/JADE_OPAL_2000_S4300807/d18-x01-y02","91")
useOne("/JADE_OPAL_2000_S4300807/d18-x01-y03","91")
useOne("/JADE_OPAL_2000_S4300807/d18-x01-y04","91")
useOne("/JADE_OPAL_2000_S4300807/d18-x01-y05","91")
useOne("/JADE_OPAL_2000_S4300807/d19-x01-y01","133")
useOne("/JADE_OPAL_2000_S4300807/d19-x01-y02","133")
useOne("/JADE_OPAL_2000_S4300807/d19-x01-y03","133")
useOne("/JADE_OPAL_2000_S4300807/d19-x01-y04","133")
useOne("/JADE_OPAL_2000_S4300807/d19-x01-y05","133")
useOne("/JADE_OPAL_2000_S4300807/d20-x01-y01","161")
useOne("/JADE_OPAL_2000_S4300807/d20-x01-y02","161")
useOne("/JADE_OPAL_2000_S4300807/d20-x01-y03","161")
useOne("/JADE_OPAL_2000_S4300807/d20-x01-y04","161")
useOne("/JADE_OPAL_2000_S4300807/d20-x01-y05","161")
useOne("/JADE_OPAL_2000_S4300807/d21-x01-y01","172")
useOne("/JADE_OPAL_2000_S4300807/d21-x01-y02","172")
useOne("/JADE_OPAL_2000_S4300807/d21-x01-y03","172")
useOne("/JADE_OPAL_2000_S4300807/d21-x01-y04","172")
useOne("/JADE_OPAL_2000_S4300807/d21-x01-y05","172")
useOne("/JADE_OPAL_2000_S4300807/d22-x01-y01","183")
useOne("/JADE_OPAL_2000_S4300807/d22-x01-y02","183")
useOne("/JADE_OPAL_2000_S4300807/d22-x01-y03","183")
useOne("/JADE_OPAL_2000_S4300807/d22-x01-y04","183")
useOne("/JADE_OPAL_2000_S4300807/d22-x01-y05","183")
useOne("/JADE_OPAL_2000_S4300807/d23-x01-y01","189")
useOne("/JADE_OPAL_2000_S4300807/d23-x01-y02","189")
useOne("/JADE_OPAL_2000_S4300807/d23-x01-y03","189")
useOne("/JADE_OPAL_2000_S4300807/d23-x01-y04","189")
useOne("/JADE_OPAL_2000_S4300807/d23-x01-y05","189")
useOne("/JADE_OPAL_2000_S4300807/d24-x01-y01","35")
useOne("/JADE_OPAL_2000_S4300807/d24-x01-y02","35")
useOne("/JADE_OPAL_2000_S4300807/d24-x01-y03","35")
useOne("/JADE_OPAL_2000_S4300807/d24-x01-y04","35")
useOne("/JADE_OPAL_2000_S4300807/d25-x01-y01","44")
useOne("/JADE_OPAL_2000_S4300807/d25-x01-y02","44")
useOne("/JADE_OPAL_2000_S4300807/d25-x01-y03","44")
useOne("/JADE_OPAL_2000_S4300807/d25-x01-y04","44")
useOne("/JADE_OPAL_2000_S4300807/d26-x01-y01","91")
useOne("/JADE_OPAL_2000_S4300807/d26-x01-y02","91")
useOne("/JADE_OPAL_2000_S4300807/d26-x01-y03","91")
useOne("/JADE_OPAL_2000_S4300807/d26-x01-y04","91")
useOne("/JADE_OPAL_2000_S4300807/d27-x01-y01","133")
useOne("/JADE_OPAL_2000_S4300807/d27-x01-y02","133")
useOne("/JADE_OPAL_2000_S4300807/d27-x01-y03","133")
useOne("/JADE_OPAL_2000_S4300807/d27-x01-y04","133")
useOne("/JADE_OPAL_2000_S4300807/d28-x01-y01","161")
useOne("/JADE_OPAL_2000_S4300807/d28-x01-y02","161")
useOne("/JADE_OPAL_2000_S4300807/d28-x01-y03","161")
useOne("/JADE_OPAL_2000_S4300807/d28-x01-y04","161")
useOne("/JADE_OPAL_2000_S4300807/d29-x01-y01","172")
useOne("/JADE_OPAL_2000_S4300807/d29-x01-y02","172")
useOne("/JADE_OPAL_2000_S4300807/d29-x01-y03","172")
useOne("/JADE_OPAL_2000_S4300807/d29-x01-y04","172")
useOne("/JADE_OPAL_2000_S4300807/d30-x01-y01","183")
useOne("/JADE_OPAL_2000_S4300807/d30-x01-y02","183")
useOne("/JADE_OPAL_2000_S4300807/d30-x01-y03","183")
useOne("/JADE_OPAL_2000_S4300807/d30-x01-y04","183")
useOne("/JADE_OPAL_2000_S4300807/d31-x01-y01","189")
useOne("/JADE_OPAL_2000_S4300807/d31-x01-y02","189")
useOne("/JADE_OPAL_2000_S4300807/d31-x01-y03","189")
useOne("/JADE_OPAL_2000_S4300807/d31-x01-y04","189")
useOne("/OPAL_2004_S6132243/d01-x01-y01","91")
useOne("/OPAL_2004_S6132243/d01-x01-y02","133")
useOne("/OPAL_2004_S6132243/d01-x01-y03","177")
useOne("/OPAL_2004_S6132243/d01-x01-y04","197")
useOne("/OPAL_2004_S6132243/d02-x01-y01","91")
useOne("/OPAL_2004_S6132243/d02-x01-y02","133")
useOne("/OPAL_2004_S6132243/d02-x01-y03","177")
useOne("/OPAL_2004_S6132243/d02-x01-y04","197")
useOne("/OPAL_2004_S6132243/d03-x01-y01","91")
useOne("/OPAL_2004_S6132243/d03-x01-y02","133")
useOne("/OPAL_2004_S6132243/d03-x01-y03","177")
useOne("/OPAL_2004_S6132243/d03-x01-y04","197")
useOne("/OPAL_2004_S6132243/d04-x01-y01","91")
useOne("/OPAL_2004_S6132243/d04-x01-y02","133")
useOne("/OPAL_2004_S6132243/d04-x01-y03","177")
useOne("/OPAL_2004_S6132243/d04-x01-y04","197")
useOne("/OPAL_2004_S6132243/d05-x01-y01","91")
useOne("/OPAL_2004_S6132243/d05-x01-y02","133")
useOne("/OPAL_2004_S6132243/d05-x01-y03","177")
useOne("/OPAL_2004_S6132243/d05-x01-y04","197")
useOne("/OPAL_2004_S6132243/d06-x01-y01","91")
useOne("/OPAL_2004_S6132243/d06-x01-y02","133")
useOne("/OPAL_2004_S6132243/d06-x01-y03","177")
useOne("/OPAL_2004_S6132243/d06-x01-y04","197")
useOne("/OPAL_2004_S6132243/d07-x01-y01","91")
useOne("/OPAL_2004_S6132243/d07-x01-y02","133")
useOne("/OPAL_2004_S6132243/d07-x01-y03","177")
useOne("/OPAL_2004_S6132243/d07-x01-y04","197")
useOne("/OPAL_2004_S6132243/d08-x01-y01","91")
useOne("/OPAL_2004_S6132243/d08-x01-y02","133")
useOne("/OPAL_2004_S6132243/d08-x01-y03","177")
useOne("/OPAL_2004_S6132243/d08-x01-y04","197")
useOne("/OPAL_2004_S6132243/d09-x01-y01","91")
useOne("/OPAL_2004_S6132243/d09-x01-y02","133")
useOne("/OPAL_2004_S6132243/d09-x01-y03","177")
useOne("/OPAL_2004_S6132243/d09-x01-y04","197")
useOne("/OPAL_2004_S6132243/d10-x01-y01","91")
useOne("/OPAL_2004_S6132243/d10-x01-y02","133")
useOne("/OPAL_2004_S6132243/d10-x01-y03","177")
useOne("/OPAL_2004_S6132243/d10-x01-y04","197")
useOne("/OPAL_2004_S6132243/d11-x01-y01","91")
useOne("/OPAL_2004_S6132243/d11-x01-y02","133")
useOne("/OPAL_2004_S6132243/d11-x01-y03","177")
useOne("/OPAL_2004_S6132243/d11-x01-y04","197")
useOne("/OPAL_2004_S6132243/d12-x01-y01","91")
useOne("/OPAL_2004_S6132243/d12-x01-y02","133")
useOne("/OPAL_2004_S6132243/d12-x01-y03","177")
useOne("/OPAL_2004_S6132243/d12-x01-y04","197")
useOne("/OPAL_2004_S6132243/d13-x01-y01","91")
useOne("/OPAL_2004_S6132243/d13-x01-y02","133")
useOne("/OPAL_2004_S6132243/d13-x01-y03","177")
useOne("/OPAL_2004_S6132243/d13-x01-y04","197")
useOne("/OPAL_2004_S6132243/d14-x01-y01","91")
useOne("/OPAL_2004_S6132243/d14-x01-y02","133")
useOne("/OPAL_2004_S6132243/d14-x01-y03","177")
useOne("/OPAL_2004_S6132243/d14-x01-y04","197")
useOne("/OPAL_2004_S6132243/d15-x01-y01","91")
useOne("/OPAL_2004_S6132243/d15-x01-y02","133")
useOne("/OPAL_2004_S6132243/d15-x01-y03","177")
useOne("/OPAL_2004_S6132243/d15-x01-y04","197")
useOne("/OPAL_2004_S6132243/d16-x01-y01","91")
useOne("/OPAL_2004_S6132243/d16-x01-y02","133")
useOne("/OPAL_2004_S6132243/d16-x01-y03","177")
useOne("/OPAL_2004_S6132243/d16-x01-y04","197")
useOne("/OPAL_2004_S6132243/d17-x01-y01","91")
useOne("/OPAL_2004_S6132243/d17-x01-y02","133")
useOne("/OPAL_2004_S6132243/d17-x01-y03","177")
useOne("/OPAL_2004_S6132243/d17-x01-y04","197")
useOne("/OPAL_2004_S6132243/d18-x01-y01","91")
useOne("/OPAL_2004_S6132243/d18-x01-y02","133")
useOne("/OPAL_2004_S6132243/d18-x01-y03","177")
useOne("/OPAL_2004_S6132243/d18-x01-y04","197")
useOne("/OPAL_2004_S6132243/d19-x01-y01","91")
useOne("/OPAL_2004_S6132243/d19-x01-y02","133")
useOne("/OPAL_2004_S6132243/d19-x01-y03","177")
useOne("/OPAL_2004_S6132243/d19-x01-y04","197")
useOne("/OPAL_2004_S6132243/d20-x01-y01","91")
useOne("/OPAL_2004_S6132243/d20-x01-y02","133")
useOne("/OPAL_2004_S6132243/d20-x01-y03","177")
useOne("/OPAL_2004_S6132243/d20-x01-y04","197")
useOne("/OPAL_2004_S6132243/d21-x01-y01","91")
useOne("/OPAL_2004_S6132243/d21-x01-y02","133")
useOne("/OPAL_2004_S6132243/d21-x01-y03","177")
useOne("/OPAL_2004_S6132243/d21-x01-y04","197")
useOne("/OPAL_2004_S6132243/d22-x01-y01","91")
useOne("/OPAL_2004_S6132243/d22-x01-y02","133")
useOne("/OPAL_2004_S6132243/d22-x01-y03","177")
useOne("/OPAL_2004_S6132243/d22-x01-y04","197")
useOne("/OPAL_2004_S6132243/d23-x01-y01","91")
useOne("/OPAL_2004_S6132243/d23-x01-y02","133")
useOne("/OPAL_2004_S6132243/d23-x01-y03","177")
useOne("/OPAL_2004_S6132243/d23-x01-y04","197")
useOne("/OPAL_2004_S6132243/d24-x01-y01","91")
useOne("/OPAL_2004_S6132243/d24-x01-y02","133")
useOne("/OPAL_2004_S6132243/d24-x01-y03","177")
useOne("/OPAL_2004_S6132243/d24-x01-y04","197")
useOne("/OPAL_2004_S6132243/d25-x01-y01","91")
useOne("/OPAL_2004_S6132243/d25-x01-y02","133")
useOne("/OPAL_2004_S6132243/d25-x01-y03","177")
useOne("/OPAL_2004_S6132243/d25-x01-y04","197")
useOne("/OPAL_2004_S6132243/d26-x01-y01","91")
useOne("/OPAL_2004_S6132243/d26-x01-y02","133")
useOne("/OPAL_2004_S6132243/d26-x01-y03","177")
useOne("/OPAL_2004_S6132243/d26-x01-y04","197")
merge( "/OPAL_2002_S5361494/d01-x01-y01")
merge( "/OPAL_2002_S5361494/d01-x01-y02")
merge( "/OPAL_2002_S5361494/d01-x01-y03")
merge( "/OPAL_2002_S5361494/d01-x01-y04")
merge("/DELPHI_2000_S4328825/d01-x01-y01")
merge("/DELPHI_2000_S4328825/d01-x01-y02")
merge("/DELPHI_2000_S4328825/d01-x01-y03")
merge("/DELPHI_2000_S4328825/d01-x01-y04")
merge("/ALEPH_2004_S5765862/d01-x01-y01")
useOne("/ALEPH_2004_S5765862/d02-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d03-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d04-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d05-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d06-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d07-x01-y01","196")
useOne("/ALEPH_2004_S5765862/d08-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d09-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d11-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d12-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d13-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d14-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d15-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d16-x01-y01","196")
useOne("/ALEPH_2004_S5765862/d17-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d18-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d19-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d20-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d21-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d22-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d23-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d24-x01-y01","196")
useOne("/ALEPH_2004_S5765862/d25-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d26-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d27-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d28-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d29-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d30-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d31-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d32-x01-y01","196")
useOne("/ALEPH_2004_S5765862/d33-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d34-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d35-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d36-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d37-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d38-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d39-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d40-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d41-x01-y01","196")
useOne("/ALEPH_2004_S5765862/d42-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d43-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d44-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d45-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d46-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d47-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d48-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d49-x01-y01","196")
useOne("/ALEPH_2004_S5765862/d50-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d51-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d54-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d55-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d56-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d57-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d58-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d59-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d60-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d61-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d62-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d63-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d64-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d65-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d66-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d67-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d68-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d69-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d70-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d71-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d72-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d73-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d74-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d75-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d76-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d77-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d78-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d79-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d80-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d81-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d82-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d83-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d84-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d85-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d86-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d87-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d88-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d89-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d90-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d91-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d92-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d93-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d94-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d95-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d96-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d97-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d98-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d99-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d100-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d101-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d102-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d103-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d104-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d105-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d106-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d107-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d108-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d109-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d110-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d111-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d112-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d113-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d114-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d115-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d116-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d117-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d118-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d119-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d120-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d121-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d122-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d123-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d124-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d125-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d126-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d127-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d128-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d129-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d130-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d131-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d132-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d133-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d134-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d135-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d136-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d137-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d138-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d139-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d140-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d141-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d142-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d143-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d144-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d145-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d146-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d147-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d148-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d149-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d150-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d151-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d152-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d153-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d154-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d155-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d156-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d157-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d158-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d159-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d160-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d161-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d162-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d163-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d164-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d165-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d166-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d167-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d168-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d169-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d170-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d172-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d173-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d174-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d175-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d176-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d177-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d178-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d179-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d180-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d181-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d182-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d183-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d184-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d185-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d186-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d187-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d188-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d189-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d190-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d191-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d192-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d193-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d194-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d195-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d196-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d197-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d198-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d199-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d200-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d201-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d202-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d203-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d204-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d205-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d206-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d207-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d208-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d209-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d210-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d211-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d212-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d213-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d214-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d215-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d216-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d217-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d218-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d219-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d220-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d221-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d222-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d223-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d224-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d225-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d226-x01-y01","206")
useOne("/ALEPH_2004_S5765862/d227-x01-y01","91")
useOne("/ALEPH_2004_S5765862/d228-x01-y01","133")
useOne("/ALEPH_2004_S5765862/d229-x01-y01","161")
useOne("/ALEPH_2004_S5765862/d230-x01-y01","172")
useOne("/ALEPH_2004_S5765862/d231-x01-y01","183")
useOne("/ALEPH_2004_S5765862/d232-x01-y01","189")
useOne("/ALEPH_2004_S5765862/d233-x01-y01","200")
useOne("/ALEPH_2004_S5765862/d234-x01-y01","206")
# hadron multiplicities
useOne("/PDG_HADRON_MULTIPLICITIES/d01-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d02-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d03-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d04-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d05-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d06-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d07-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d08-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d09-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d13-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d15-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d17-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d18-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d19-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d20-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d21-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d22-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d23-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d25-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d31-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d38-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d39-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d40-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d44-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d45-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d46-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d47-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d48-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d49-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d50-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d51-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d53-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d54-x01-y01","10")
useOne("/PDG_HADRON_MULTIPLICITIES/d01-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d02-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d03-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d04-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d05-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d06-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d07-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d08-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d09-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d13-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d15-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d18-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d19-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d20-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d21-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d22-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d31-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d33-x01-y01","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d34-x01-y01","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d38-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d39-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d44-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d46-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d47-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d48-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d50-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d51-x01-y02","35")
useOne("/PDG_HADRON_MULTIPLICITIES/d01-x01-y03","91")
useOne("/PDG_HADRON_MULTIPLICITIES/d02-x01-y03","91")
useOne("/PDG_HADRON_MULTIPLICITIES/d03-x01-y03","91")
useOne("/PDG_HADRON_MULTIPLICITIES/d04-x01-y03","91")
useOne("/PDG_HADRON_MULTIPLICITIES/d05-x01-y03","91")
useOne("/PDG_HADRON_MULTIPLICITIES/d06-x01-y03","91")
useOne("/PDG_HADRON_MULTIPLICITIES/d07-x01-y03","91")
useOne("/PDG_HADRON_MULTIPLICITIES/d08-x01-y03","91")
useOne("/PDG_HADRON_MULTIPLICITIES/d09-x01-y03","91")
useOne("/PDG_HADRON_MULTIPLICITIES/d10-x01-y03","91")
useOne("/PDG_HADRON_MULTIPLICITIES/d11-x01-y03","91")
useOne("/PDG_HADRON_MULTIPLICITIES/d12-x01-y03","91")
useOne("/PDG_HADRON_MULTIPLICITIES/d13-x01-y03","91")
useOne("/PDG_HADRON_MULTIPLICITIES/d14-x01-y03","91")
useOne("/PDG_HADRON_MULTIPLICITIES/d15-x01-y03","91")
useOne("/PDG_HADRON_MULTIPLICITIES/d16-x01-y03","91")
useOne("/PDG_HADRON_MULTIPLICITIES/d17-x01-y03","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-y01","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")
# Choose output file
-name = args[0]+".aida"
-out = open(name, "w")
-## Write out merged histos
-out.write('<?xml version="1.0" encoding="ISO-8859-1" ?>\n')
-out.write('<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">\n')
-out.write('<aida version="3.3">\n')
-out.write(' <implementation version="1.1" package="FreeHEP"/>\n')
-for hpath, h in sorted(outhistos.iteritems()):
- logging.debug("hpath = %s" % hpath)
- out.write(h.asAIDA() + "\n\n")
-out.write('</aida>\n')
-
+name = args[0]+".yoda"
+# output the yoda file
+yoda.writeYODA(outhistos,name)
sys.exit(0)
diff --git a/Tests/python/merge-LHC-EW b/Tests/python/merge-LHC-EW
--- a/Tests/python/merge-LHC-EW
+++ b/Tests/python/merge-LHC-EW
@@ -1,158 +1,115 @@
#! /usr/bin/env python
-import lighthisto
import logging
import sys
-import os, copy, re
+import os, yoda
"""%prog
Script for merging aida files
"""
import sys
if sys.version_info[:3] < (2,4,0):
print "rivet scripts require Python version >= 2.4.0... exiting"
sys.exit(1)
-## Try to load faster but non-standard cElementTree module
-try:
- import xml.etree.cElementTree as ET
-except ImportError:
- try:
- import cElementTree as ET
- except ImportError:
- try:
- import xml.etree.ElementTree as ET
- except:
- sys.stderr.write("Can't load the ElementTree XML parser: please install it!\n")
- sys.exit(1)
-
if __name__ == "__main__":
import logging
from optparse import OptionParser, OptionGroup
parser = OptionParser(usage="%prog aidafile aidafile2 [...]")
parser.add_option("-o", "--out", dest="OUTFILE", default="-")
- parser.add_option("--append", dest="APPEND_OUTPUT", action="store_true", default=False)
verbgroup = OptionGroup(parser, "Verbosity control")
verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
default=logging.INFO, help="print debug (very verbose) messages")
verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
default=logging.INFO, help="be very quiet")
parser.add_option_group(verbgroup)
(opts, args) = parser.parse_args()
logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
- ## Prefix used in dat file headers
- headerprefix = "# "
-
## Check args
if len(args) < 1:
logging.error("Must specify at least one AIDA histogram file")
sys.exit(1)
## Get histos
outhistos={}
for file in args:
if not os.access(file, os.R_OK):
logging.error("%s can not be read" % file)
break
try:
- tree = ET.parse(file)
+ aos = yoda.read(file)
except:
logging.error("%s can not be parsed as XML" % file)
break
- tree = ET.parse(file)
- ## Get histos from this AIDA file
- for dps in tree.findall("dataPointSet"):
- h = lighthisto.Histo.fromDPS(dps)
- if(h.fullPath().find("ATLAS_2010_S8919674")>0) :
- if((h.fullPath().find("d01")>0 or h.fullPath().find("d05")>0 or
- h.fullPath().find("d07")>0) and file.find("-e")>0) :
- outhistos[h.fullPath()] = h
- elif((h.fullPath().find("d02")>0 or h.fullPath().find("d06")>0 or
- h.fullPath().find("d08")>0) and file.find("-mu")>0) :
- outhistos[h.fullPath()] = h
- elif (h.fullPath().find("ATLAS_2011_S9131140")>0) :
- if(h.fullPath().find("d01")>0 and file.find("-e")>0) :
- outhistos[h.fullPath()] = h
- elif(h.fullPath().find("d02")>0 and file.find("-mu")>0) :
- outhistos[h.fullPath()] = h
- elif (h.fullPath().find("ATLAS_2011_I925932")>0) :
- if(h.fullPath().find("d01")>0 and file.find("-e")>0) :
- outhistos[h.fullPath()] = h
- elif(h.fullPath().find("d02")>0 and file.find("-mu")>0) :
- outhistos[h.fullPath()] = h
- elif (h.fullPath().find("ATLAS_2011_I945498")>0) :
- if(h.fullPath().find("y01")>0 and file.find("-e")>0) :
- outhistos[h.fullPath()] = h
- elif(h.fullPath().find("y02")>0 and file.find("-mu")>0) :
- outhistos[h.fullPath()] = h
- elif(h.fullPath().find("y03")>0 and file.find("-mu")>0) :
- outhistos[h.fullPath()] = h
- elif (h.fullPath().find("ATLAS_2013_I1217867")>0) :
- if(h.fullPath().find("y01")>0 and file.find("-e")>0) :
- outhistos[h.fullPath()] = h
- elif(h.fullPath().find("y02")>0 and file.find("-mu")>0) :
- outhistos[h.fullPath()] = h
- elif (h.fullPath().find("ATLAS_2012_I1204784" )>0) :
+ ## Get histos from this YODA file
+ for aopath, ao in aos.iteritems() :
+ if(aopath.find("ATLAS_2010_S8919674")>0) :
+ if((aopath.find("d01")>0 or aopath.find("d05")>0 or
+ aopath.find("d07")>0) and file.find("-e")>0) :
+ outhistos[aopath] = ao
+ elif((aopath.find("d02")>0 or aopath.find("d06")>0 or
+ aopath.find("d08")>0) and file.find("-mu")>0) :
+ outhistos[aopath] = ao
+ elif (aopath.find("ATLAS_2011_S9131140")>0) :
+ if(aopath.find("d01")>0 and file.find("-e")>0) :
+ outhistos[aopath] = ao
+ elif(aopath.find("d02")>0 and file.find("-mu")>0) :
+ outhistos[aopath] = ao
+ elif (aopath.find("ATLAS_2011_I925932")>0) :
+ if(aopath.find("d01")>0 and file.find("-e")>0) :
+ outhistos[aopath] = ao
+ elif(aopath.find("d02")>0 and file.find("-mu")>0) :
+ outhistos[aopath] = ao
+ elif (aopath.find("ATLAS_2011_I945498")>0) :
+ if(aopath.find("y01")>0 and file.find("-e")>0) :
+ outhistos[aopath] = ao
+ elif(aopath.find("y02")>0 and file.find("-mu")>0) :
+ outhistos[aopath] = ao
+ elif(aopath.find("y03")>0 and file.find("-mu")>0) :
+ outhistos[aopath] = ao
+ elif (aopath.find("ATLAS_2013_I1217867")>0) :
+ if(aopath.find("y01")>0 and file.find("-e")>0) :
+ outhistos[aopath] = ao
+ elif(aopath.find("y02")>0 and file.find("-mu")>0) :
+ outhistos[aopath] = ao
+ elif (aopath.find("CMS_2012_I941555")>0) :
+ if((aopath.find("y01")>0 or aopath.find("y03")>0 ) and file.find("-mu")>0) :
+ outhistos[aopath] = ao
+ elif(aopath.find("y02")>0 and file.find("-e")>0) :
+ outhistos[aopath] = ao
+ elif (aopath.find("ATLAS_2012_I1204784" )>0) :
if( file.find("-e")>0 and
- ( h.fullPath().find("d03")>0 or
- ((h.fullPath().find("d01")>0 or h.fullPath().find("d02")>0) and h.fullPath().find("y01")>0))) :
- outhistos[h.fullPath()] = h
+ ( aopath.find("d03")>0 or
+ ((aopath.find("d01")>0 or aopath.find("d02")>0) and aopath.find("y01")>0))) :
+ outhistos[aopath] = ao
elif(file.find("-mu")>0 and
- ( h.fullPath().find("d04")>0 or
- ((h.fullPath().find("d01")>0 or h.fullPath().find("d02")>0) and h.fullPath().find("y02")>0))) :
- outhistos[h.fullPath()] = h
- elif (h.fullPath().find("CMS_2013_I1224539_WJET" )>0) :
- if(file.find("-1-e")>0 and (h.fullPath().find("d52")>0 or h.fullPath().find("d53")>0 or h.fullPath().find("d56")>0 or h.fullPath().find("d57")>0 or h.fullPath().find("d60")>0 or h.fullPath().find("d61")>0 or h.fullPath().find("d64")>0 or h.fullPath().find("d65")>0 or h.fullPath().find("d68")>0 or h.fullPath().find("d69")>0 or h.fullPath().find("d72")>0)) :
- outhistos[h.fullPath()] = h
- elif(file.find("-2-e")>0 and (h.fullPath().find("d54")>0 or h.fullPath().find("d58")>0 or h.fullPath().find("d62")>0 or h.fullPath().find("d66")>0 or h.fullPath().find("d70")>0 or h.fullPath().find("d73")>0)) :
- outhistos[h.fullPath()] = h
- elif(file.find("-3-e")>0 and (h.fullPath().find("d55")>0 or h.fullPath().find("d59")>0 or h.fullPath().find("d63")>0 or h.fullPath().find("d67")>0 or h.fullPath().find("d71")>0 or h.fullPath().find("d74")>0)) :
- outhistos[h.fullPath()] = h
- elif (h.fullPath().find("CMS_2013_I1224539_ZJET" )>0) :
- if(file.find("-1-e")>0 and (h.fullPath().find("d29")>0 or h.fullPath().find("d30")>0 or h.fullPath().find("d33")>0 or h.fullPath().find("d34")>0 or h.fullPath().find("d37")>0 or h.fullPath().find("d38")>0 or h.fullPath().find("d41")>0 or h.fullPath().find("d42")>0 or h.fullPath().find("d45")>0 or h.fullPath().find("d46")>0 or h.fullPath().find("d49")>0)) :
- outhistos[h.fullPath()] = h
- elif(file.find("-2-e")>0 and (h.fullPath().find("d31")>0 or h.fullPath().find("d35")>0 or h.fullPath().find("d39")>0 or h.fullPath().find("d43")>0 or h.fullPath().find("d47")>0 or h.fullPath().find("d50")>0)) :
- outhistos[h.fullPath()] = h
- elif(file.find("-3-e")>0 and (h.fullPath().find("d32")>0 or h.fullPath().find("d36")>0 or h.fullPath().find("d40")>0 or h.fullPath().find("d44")>0 or h.fullPath().find("d48")>0 or h.fullPath().find("d51")>0)) :
- outhistos[h.fullPath()] = h
- elif (h.fullPath().find("CMS_2013_I1258128")>0) :
- if(h.fullPath().find("d01")>0 or h.fullPath().find("d02")>0 or
- h.fullPath().find("d03")>0 or h.fullPath().find("d04")>0) :
- outhistos[h.fullPath()] = h
+ ( aopath.find("d04")>0 or
+ ((aopath.find("d01")>0 or aopath.find("d02")>0) and aopath.find("y02")>0))) :
+ outhistos[aopath] = ao
+ elif (aopath.find("CMS_2013_I1224539_WJET" )>0) :
+ if(file.find("-1-e")>0 and (aopath.find("d52")>0 or aopath.find("d53")>0 or aopath.find("d56")>0 or aopath.find("d57")>0 or aopath.find("d60")>0 or aopath.find("d61")>0 or aopath.find("d64")>0 or aopath.find("d65")>0 or aopath.find("d68")>0 or aopath.find("d69")>0 or aopath.find("d72")>0)) :
+ outhistos[aopath] = ao
+ elif(file.find("-2-e")>0 and (aopath.find("d54")>0 or aopath.find("d58")>0 or aopath.find("d62")>0 or aopath.find("d66")>0 or aopath.find("d70")>0 or aopath.find("d73")>0)) :
+ outhistos[aopath] = ao
+ elif(file.find("-3-e")>0 and (aopath.find("d55")>0 or aopath.find("d59")>0 or aopath.find("d63")>0 or aopath.find("d67")>0 or aopath.find("d71")>0 or aopath.find("d74")>0)) :
+ outhistos[aopath] = ao
+ elif (aopath.find("CMS_2013_I1224539_ZJET" )>0) :
+ if(file.find("-1-e")>0 and (aopath.find("d29")>0 or aopath.find("d30")>0 or aopath.find("d33")>0 or aopath.find("d34")>0 or aopath.find("d37")>0 or aopath.find("d38")>0 or aopath.find("d41")>0 or aopath.find("d42")>0 or aopath.find("d45")>0 or aopath.find("d46")>0 or aopath.find("d49")>0)) :
+ outhistos[aopath] = ao
+ elif(file.find("-2-e")>0 and (aopath.find("d31")>0 or aopath.find("d35")>0 or aopath.find("d39")>0 or aopath.find("d43")>0 or aopath.find("d47")>0 or aopath.find("d50")>0)) :
+ outhistos[aopath] = ao
+ elif(file.find("-3-e")>0 and (aopath.find("d32")>0 or aopath.find("d36")>0 or aopath.find("d40")>0 or aopath.find("d44")>0 or aopath.find("d48")>0 or aopath.find("d51")>0)) :
+ outhistos[aopath] = ao
+ elif (aopath.find("CMS_2013_I1258128")>0) :
+ if(aopath.find("d01")>0 or aopath.find("d02")>0 or
+ aopath.find("d03")>0 or aopath.find("d04")>0) :
+ outhistos[aopath] = ao
else :
- outhistos[h.fullPath()] = h
+ outhistos[aopath] = ao
- ## Choose output file
- out = None
- if opts.OUTFILE == "-":
- out = sys.stdout
- else:
- if opts.APPEND_OUTPUT:
- out = open(opts.OUTFILE, "a")
- else:
- out = open(opts.OUTFILE, "w")
-
-
- # Choose output file
- out = None
- if opts.OUTFILE == "-":
- out = sys.stdout
- else:
- if opts.APPEND_OUTPUT:
- out = open(opts.OUTFILE, "a")
- else:
- out = open(opts.OUTFILE, "w")
- ## Write out merged histos
- out.write('<?xml version="1.0" encoding="ISO-8859-1" ?>\n')
- out.write('<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">\n')
- out.write('<aida version="3.3">\n')
- out.write(' <implementation version="1.1" package="FreeHEP"/>\n')
- for hpath, h in sorted(outhistos.iteritems()):
- logging.debug("hpath = %s" % hpath)
- out.write(h.asAIDA() + "\n\n")
- out.write('</aida>\n')
-
+ # Choose output file
+ yoda.writeYODA(outhistos,opts.OUTFILE)
sys.exit(0)
diff --git a/Tests/python/merge-LHC-Jets b/Tests/python/merge-LHC-Jets
--- a/Tests/python/merge-LHC-Jets
+++ b/Tests/python/merge-LHC-Jets
@@ -1,1529 +1,1503 @@
#! /usr/bin/env python
-import lighthisto
import logging
import sys
if sys.version_info[:3] < (2,4,0):
print "rivet scripts require Python version >= 2.4.0... exiting"
sys.exit(1)
-import os, copy, re
-from math import sqrt
-
-## Try to load faster but non-standard cElementTree module
-try:
- import xml.etree.cElementTree as ET
-except ImportError:
- try:
- import cElementTree as ET
- except ImportError:
- try:
- import xml.etree.ElementTree as ET
- except:
- sys.stderr.write("Can't load the ElementTree XML parser: please install it!\n")
- sys.exit(1)
+import os, yoda
# #############################################
-def fillAbove(desthisto, sourcehistosbyptmin):
- for i,b in enumerate(desthisto.getBins()):
- ## Fill bins with pT-ordered histos (so that 'highest always wins')
- for ptmin, h in sorted(sourcehistosbyptmin.iteritems()):
- newb = h.getBin(i)
- if newb.xlow >= ptmin:
- b.val = newb.val
- b.errplus = newb.errplus
- b.errminus = newb.errminus
- b._focus= newb._focus
-def fillAboveTeV(desthisto, sourcehistosbyptmin):
- for i,b in enumerate(desthisto.getBins()):
- ## Fill bins with pT-ordered histos (so that 'highest always wins')
- for ptmin, h in sorted(sourcehistosbyptmin.iteritems()):
- newb = h.getBin(i)
- if newb.xlow*500. >= ptmin:
- b.val = newb.val
- b.errplus = newb.errplus
- b.errminus = newb.errminus
- b._focus= newb._focus
+def fillAbove(scale,desthisto, sourcehistosbyptmin):
+ pthigh= 1e100
+ ptlow =-1e100
+ for pt, h in sorted(sourcehistosbyptmin.iteritems(),reverse=True):
+ ptlow=pt
+ if(type(desthisto)==yoda.core.Scatter2D) :
+ for i in range(0,h.numPoints) :
+ lowEdge = h.points[i].x-h.points[i].xErrs.minus
+ if( lowEdge*scale >= ptlow and
+ lowEdge*scale < pthigh ) :
+ desthisto.addPoint(h.points[i])
+ elif(type(desthisto)==yoda.core.Profile1D) :
+ for i in range(0,h.numBins) :
+ if(h.bins[i].lowEdge*scale >= ptlow and
+ h.bins[i].lowEdge*scale < pthigh ) :
+ desthisto.bins[i] += h.bins[i]
+ elif(type(desthisto)==yoda.core.Histo1D) :
+ for i in range(0,h.numBins) :
+ if(h.bins[i].lowEdge*scale >= ptlow and
+ h.bins[i].lowEdge*scale < pthigh ) :
+ desthisto.bins[i] += h.bins[i]
+ else :
+ logging.error("Can't merge %s, unknown type" % desthisto.path)
+ sys.exit(1)
+ pthigh=pt
-def mergeByPt(hpath, sqrts):
+def mergeByPt(hpath, sqrts, scale=1.):
global inhistos_pt
global outhistos
try:
- fillAbove(outhistos[hpath], inhistos_pt[hpath][float(sqrts)])
+ fillAbove(scale,outhistos[hpath], inhistos_pt[hpath][float(sqrts)])
except:
pass
-def mergeByPtTeV(hpath, sqrts):
- global inhistos_pt
- global outhistos
- try:
- fillAboveTeV(outhistos[hpath], inhistos_pt[hpath][float(sqrts)])
- except:
- pass
-
-def mergeByMass(hpath, sqrts):
+def mergeByMass(hpath, sqrts, scale=1.):
global inhistos_mass
global outhistos
try:
- fillAbove(outhistos[hpath], inhistos_mass[hpath][float(sqrts)])
- except:
- pass
-
-def mergeByMassTeV(hpath, sqrts):
- global inhistos_mass
- global outhistos
- try:
- fillAboveTeV(outhistos[hpath], inhistos_mass[hpath][float(sqrts)])
+ fillAbove(scale,outhistos[hpath], inhistos_mass[hpath][float(sqrts)])
except:
pass
def useOnePt(hpath, sqrts, ptmin):
global inhistos_pt
global outhistos
try:
## Find best pT_min match
ptmins = inhistos_pt[hpath][float(sqrts)].keys()
closest_ptmin = None
for ptm in ptmins:
if closest_ptmin is None or \
abs(ptm-float(ptmin)) < abs(closest_ptmin-float(ptmin)):
closest_ptmin = ptm
if closest_ptmin != float(ptmin):
logging.warning("Inexact match for requested pTmin=%s: " % ptmin + \
"using pTmin=%e instead" % closest_ptmin)
outhistos[hpath] = inhistos_pt[hpath][float(sqrts)][closest_ptmin]
except:
pass
def useOneMass(hpath, sqrts, ptmin):
global inhistos_pt
global outhistos
try:
## Find best pT_min match
ptmins = inhistos_mass[hpath][float(sqrts)].keys()
closest_ptmin = None
for ptm in ptmins:
if closest_ptmin is None or \
abs(ptm-float(ptmin)) < abs(closest_ptmin-float(ptmin)):
closest_ptmin = ptm
if closest_ptmin != float(ptmin):
logging.warning("Inexact match for requested pTmin=%s: " % ptmin + \
"using pTmin=%e instead" % closest_ptmin)
outhistos[hpath] = inhistos_mass[hpath][float(sqrts)][closest_ptmin]
except:
pass
# #######################################
if __name__ == "__main__":
import logging
from optparse import OptionParser, OptionGroup
parser = OptionParser(usage="%prog name")
verbgroup = OptionGroup(parser, "Verbosity control")
verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
default=logging.INFO, help="print debug (very verbose) messages")
verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
default=logging.INFO, help="be very quiet")
parser.add_option_group(verbgroup)
(opts, args) = parser.parse_args()
logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
## Prefix used in dat file headers
- headerprefix = "# "
-
-aidafiles=["-900-UE.aida" ,"-2360-UE.aida" ,"-2760-UE.aida" ,
- "-7-UE.aida" ,"-900-UE-Long.aida",
- "-7-UE-Long.aida","-7-Jets-0.aida",
- "-7-Jets-All-1.aida","-7-Jets-All-2.aida",
- "-7-Jets-All-3.aida","-7-Jets-All-4.aida","-7-Jets-All-5.aida",
- "-7-Jets-1.aida","-7-Jets-2.aida",
- "-7-Jets-3.aida","-7-Jets-4.aida","-7-Jets-5.aida",
- "-7-Jets-6.aida","-7-Jets-7.aida","-7-Jets-8.aida",
- "-7-Heavy-0.aida","-7-Heavy-1.aida","-7-Heavy-2.aida",
- "-7-Heavy-3.aida","-7-Heavy-4.aida","-7-Heavy-5.aida",
- "-7-Top-SL.aida","-7-Top-L.aida"]
+ headerprefix = "# "
+yodafiles=["-900-UE.yoda" ,"-2360-UE.yoda" ,"-2760-UE.yoda" ,
+ "-7-UE.yoda" ,"-900-UE-Long.yoda",
+ "-7-UE-Long.yoda","-7-Jets-0.yoda",
+ "-7-Jets-All-1.yoda","-7-Jets-All-2.yoda",
+ "-7-Jets-All-3.yoda","-7-Jets-All-4.yoda","-7-Jets-All-5.yoda",
+ "-7-Jets-1.yoda","-7-Jets-2.yoda",
+ "-7-Jets-3.yoda","-7-Jets-4.yoda","-7-Jets-5.yoda",
+ "-7-Jets-6.yoda","-7-Jets-7.yoda","-7-Jets-8.yoda",
+ "-7-Heavy-0.yoda","-7-Heavy-1.yoda","-7-Heavy-2.yoda",
+ "-7-Heavy-3.yoda","-7-Heavy-4.yoda","-7-Heavy-5.yoda",
+ "-7-Top-SL.yoda","-7-Top-L.yoda"]
## Get histos
inhistos_pt = {}
inhistos_mass = {}
outhistos={}
weights = {}
-for f in aidafiles:
+for f in yodafiles:
file="LHC"+f
sqrts=7000
if(file.find("-900-UE")>0) :
sqrts=900
ptmin=0.
elif(file.find("-2360-UE")>0) :
sqrts=2360
ptmin=0.
elif(file.find("-2760-UE")>0) :
sqrts=2760
ptmin=0.
elif(file.find("-7-UE")>0) :
ptmin=0.
elif(file.find("-7-Jets-0")>0) :
ptmin=4.
elif(file.find("-7-Jets-1")>0) :
ptmin=30.
elif(file.find("-7-Jets-2")>0) :
ptmin=40.
elif(file.find("-7-Jets-3")>0) :
ptmin=80.
elif(file.find("-7-Jets-4")>0) :
ptmin=110.
elif(file.find("-7-Jets-5")>0) :
ptmin=210.
elif(file.find("-7-Jets-6")>0) :
ptmin=260.
elif(file.find("-7-Jets-7")>0) :
ptmin=400.
elif(file.find("-7-Jets-8")>0) :
ptmin=600.
- elif(file.find("-7-Heavy-0.aida")>0) :
+ elif(file.find("-7-Heavy-0.yoda")>0) :
ptmin=0.
- elif(file.find("-7-Heavy-1.aida")>0) :
+ elif(file.find("-7-Heavy-1.yoda")>0) :
ptmin=10.
- elif(file.find("-7-Heavy-2.aida")>0) :
+ elif(file.find("-7-Heavy-2.yoda")>0) :
ptmin=30.
- elif(file.find("-7-Heavy-3.aida")>0) :
+ elif(file.find("-7-Heavy-3.yoda")>0) :
ptmin=70.
- elif(file.find("-7-Heavy-4.aida")>0) :
+ elif(file.find("-7-Heavy-4.yoda")>0) :
ptmin=100.
- elif(file.find("-7-Heavy-5.aida")>0) :
+ elif(file.find("-7-Heavy-5.yoda")>0) :
ptmin=130.
- elif(file.find("-7-Top-SL.aida")>0 or file.find("-7-Top-L.aida")>0):
+ elif(file.find("-7-Top-SL.yoda")>0 or file.find("-7-Top-L.yoda")>0):
ptmin=0.
elif(file.find("-7-Jets-All-1")>0) :
ptmin=25.
elif(file.find("-7-Jets-All-2")>0) :
ptmin=50.
elif(file.find("-7-Jets-All-3")>0) :
ptmin=100.
elif(file.find("-7-Jets-All-4")>0) :
ptmin=170.
elif(file.find("-7-Jets-All-5")>0) :
ptmin=320.
if not os.access(file, os.R_OK):
logging.error("%s can not be read" % file)
break
try:
- tree = ET.parse(file)
+ aos = yoda.read(file)
except:
- logging.error("%s can not be parsed as XML" % file)
+ logging.error("%s can not be parsed as YODA" % file)
break
- tree = ET.parse(file)
- ## Get histos from this AIDA file
- for dps in tree.findall("dataPointSet"):
- h = lighthisto.Histo.fromDPS(dps)
- if(h.fullPath().find("S8924791")>0 or
- h.fullPath().find("S8971293")>0 or
- h.fullPath().find("S8817804")>0 or
- h.fullPath().find("I1082936")>0 or
- h.fullPath().find("S8994773")>0 or
- h.fullPath().find("S8918562")>0 or
- h.fullPath().find("S8624100")>0 or
- h.fullPath().find("S8625980")>0 or
- h.fullPath().find("S8894728")>0 or
- h.fullPath().find("S8957746")>0 or
- h.fullPath().find("S9126244")>0 or
- h.fullPath().find("S9120041")>0 or
- h.fullPath().find("S8950903")>0 or
- h.fullPath().find("S9086218")>0 or
- h.fullPath().find("S9088458")>0 or
- h.fullPath().find("I919017" )>0 or
- h.fullPath().find("I926145" )>0 or
- h.fullPath().find("S8941262")>0 or
- h.fullPath().find("S8973270")>0 or
- h.fullPath().find("I1118269")>0 or
- h.fullPath().find("I1188891")>0 or
- h.fullPath().find("I1082009")>0 or
- h.fullPath().find("I1087342")>0 or
- h.fullPath().find("I9035664")>0 or
- h.fullPath().find("I1125575")>0 or
- h.fullPath().find("I1094564")>0 or
- h.fullPath().find("I930220")>0 or
- h.fullPath().find("I1224539")>0 or
- h.fullPath().find("CMS_2012_PAS_QCD_11_010")>0) :
- if not inhistos_pt.has_key(h.fullPath()):
- inhistos_pt[h.fullPath()] = {}
- tmpE = inhistos_pt[h.fullPath()]
+ ## Get histos from this YODA file
+ for aopath, ao in aos.iteritems() :
+ if(aopath.find("S8924791")>0 or
+ aopath.find("S8971293")>0 or
+ aopath.find("S8817804")>0 or
+ aopath.find("I1082936")>0 or
+ aopath.find("S8994773")>0 or
+ aopath.find("S8918562")>0 or
+ aopath.find("S8624100")>0 or
+ aopath.find("S8625980")>0 or
+ aopath.find("S8894728")>0 or
+ aopath.find("S8957746")>0 or
+ aopath.find("S9126244")>0 or
+ aopath.find("S9120041")>0 or
+ aopath.find("S8950903")>0 or
+ aopath.find("S9086218")>0 or
+ aopath.find("S9088458")>0 or
+ aopath.find("I919017" )>0 or
+ aopath.find("I926145" )>0 or
+ aopath.find("S8941262")>0 or
+ aopath.find("S8973270")>0 or
+ aopath.find("I1118269")>0 or
+ aopath.find("I1188891")>0 or
+ aopath.find("I1082009")>0 or
+ aopath.find("I1087342")>0 or
+ aopath.find("S9035664")>0 or
+ aopath.find("I1125575")>0 or
+ aopath.find("I1094564")>0 or
+ aopath.find("I930220")>0 or
+ aopath.find("I1224539")>0 or
+ aopath.find("CMS_2012_PAS_QCD_11_010")>0) :
+ if not inhistos_pt.has_key(aopath):
+ inhistos_pt[aopath] = {}
+ tmpE = inhistos_pt[aopath]
if not tmpE.has_key(sqrts):
tmpE[sqrts] = {}
if not tmpE[sqrts].has_key(ptmin):
- tmpE[sqrts][ptmin] = h
+ tmpE[sqrts][ptmin] = ao
else:
raise Exception("A set with ptmin = %s already exists" % ( ptmin))
else :
- if(h.fullPath().find("I1243871")>0) :
- if(h.fullPath().find("x01")>0 and file.find("-7-Top-L.aida")>0 ) :
- outhistos[h.fullPath()] = h
- elif(h.fullPath().find("x02")>0 and file.find("-7-Top-SL.aida")>0 ) :
- outhistos[h.fullPath()] = h
+ if(aopath.find("I1243871")>0) :
+ if(aopath.find("x01")>0 and file.find("-7-Top-L.yoda")>0 ) :
+ outhistos[aopath] = ao
+ elif(aopath.find("x02")>0 and file.find("-7-Top-SL.yoda")>0 ) :
+ outhistos[aopath] = ao
else :
- outhistos[h.fullPath()] = h
+ outhistos[aopath] = ao
-aidafiles=["-7-Jets-9.aida" ,"-7-Jets-10.aida",
- "-7-Jets-11.aida","-7-Jets-12.aida","-7-Jets-13.aida",
- "-7-Heavy-6.aida","-7-Heavy-7.aida","-7-Heavy-8.aida"]
+yodafiles=["-7-Jets-1.yoda" ,"-7-Jets-9.yoda" ,"-7-Jets-10.yoda",
+ "-7-Jets-11.yoda","-7-Jets-12.yoda","-7-Jets-13.yoda",
+ "-7-Heavy-6.yoda","-7-Heavy-7.yoda","-7-Heavy-8.yoda"]
-for f in aidafiles:
+for f in yodafiles:
file="LHC"+f
- if(file.find("-7-Jets-9.aida")>0) :
+ if(file.find("-7-Jets-1.yoda")>0) :
+ sqrts=7000
+ mass=0
+ if(file.find("-7-Jets-9.yoda")>0) :
+ sqrts=7000
+ mass=100
+ elif(file.find("-7-Jets-10.yoda")>0) :
+ sqrts=7000
+ mass=300
+ elif(file.find("-7-Jets-11.yoda")>0) :
+ sqrts=7000
+ mass=800
+ elif(file.find("-7-Jets-12.yoda")>0) :
+ sqrts=7000
+ mass=1200
+ elif(file.find("-7-Jets-13.yoda")>0) :
+ sqrts=7000
+ mass=2000
+ elif(file.find("-7-Heavy-6.yoda")>0) :
sqrts=7000
mass=110
- elif(file.find("-7-Jets-10.aida")>0) :
- sqrts=7000
- mass=300
- elif(file.find("-7-Jets-11.aida")>0) :
- sqrts=7000
- mass=800
- elif(file.find("-7-Jets-12.aida")>0) :
- sqrts=7000
- mass=1200
- elif(file.find("-7-Jets-13.aida")>0) :
- sqrts=7000
- mass=2000
- elif(file.find("-7-Heavy-6.aida")>0) :
- sqrts=7000
- mass=110
- elif(file.find("-7-Heavy-7.aida")>0) :
+ elif(file.find("-7-Heavy-7.yoda")>0) :
sqrts=7000
mass=370
- elif(file.find("-7-Heavy-8.aida")>0) :
+ elif(file.find("-7-Heavy-8.yoda")>0) :
sqrts=7000
mass=550
if not os.access(file, os.R_OK):
logging.error("%s can not be read" % file)
break
try:
- tree = ET.parse(file)
+ aos = yoda.read(file)
except:
- logging.error("%s can not be parsed as XML" % file)
+ logging.error("%s can not be parsed as YODA" % file)
break
- tree = ET.parse(file)
- ## Get histos from this AIDA file
- for dps in tree.findall("dataPointSet"):
- h = lighthisto.Histo.fromDPS(dps)
- if(h.fullPath().find("8817804")>0 or
- h.fullPath().find("1082936")>0 or
- h.fullPath().find("I930220")>0 or
- h.fullPath().find("8968497")>0) :
- if not inhistos_mass.has_key(h.fullPath()):
- inhistos_mass[h.fullPath()] = {}
- tmpE = inhistos_mass[h.fullPath()]
+ ## Get histos from this YODA file
+ for aopath, ao in aos.iteritems() :
+ if(aopath.find("8817804")>0 or
+ aopath.find("1082936")>0 or
+ aopath.find("I930220")>0 or
+ aopath.find("8968497")>0) :
+ if not inhistos_mass.has_key(aopath):
+ inhistos_mass[aopath] = {}
+ tmpE = inhistos_mass[aopath]
if not tmpE.has_key(sqrts):
tmpE[sqrts] = {}
tmpP = tmpE[sqrts]
if not tmpP.has_key(mass):
- tmpP[mass] = h
+ tmpP[mass] = ao
else:
raise Exception("A set with mass = %s already exists" % ( mass))
## Make empty output histos if needed
for hpath,hsets in inhistos_pt.iteritems():
if( hpath.find("8924791")>0 or
hpath.find("8971293")>0 or
hpath.find("8817804")>0 or
hpath.find("8968497")>0 or
hpath.find("9120041")>0 or
hpath.find("9126244")>0 or
hpath.find("926145") >0 or
hpath.find("9086218")>0 or
hpath.find("1082936")>0 or
hpath.find("8941262")>0 or
hpath.find("1118269")>0 or
hpath.find("1087342")>0 or
hpath.find("1188891")>0 or
hpath.find("919017")>0 or
hpath.find("9035664")>0 or
hpath.find("1125575")>0 or
hpath.find("1094564")>0 or
hpath.find("I930220")>0 or
+ hpath.find("S9088458")>0 or
hpath.find("CMS_2012_PAS_QCD_11_010")>0) :
- workhisto = copy.deepcopy(hsets.values()[0].values()[0])
- outhistos[hpath] = workhisto
- ## Empty the bin set for histos which we're going to merge
- for b in outhistos[hpath]:
- b.val = 0
- b.errplus = 0
- b.errminus = 0
- b._focus= None
+ if(type(hsets.values()[0].values()[0])==yoda.core.Scatter2D) :
+ outhistos[hpath] = yoda.core.Scatter2D(hsets.values()[0].values()[0].path,
+ hsets.values()[0].values()[0].title)
+ elif(type(hsets.values()[0].values()[0])==yoda.core.Profile1D) :
+ outhistos[hpath] = yoda.core.Profile1D(hsets.values()[0].values()[0].path,
+ hsets.values()[0].values()[0].title)
+ for i in range(0,hsets.values()[0].values()[0].numBins) :
+ outhistos[hpath].addBin(hsets.values()[0].values()[0].bins[i].lowEdge,
+ hsets.values()[0].values()[0].bins[i].highEdge)
+ elif(type(hsets.values()[0].values()[0])==yoda.core.Histo1D) :
+ outhistos[hpath] = yoda.core.Histo1D(hsets.values()[0].values()[0].path,
+ hsets.values()[0].values()[0].title)
+ for i in range(0,hsets.values()[0].values()[0].numBins) :
+ outhistos[hpath].addBin(hsets.values()[0].values()[0].bins[i].lowEdge,
+ hsets.values()[0].values()[0].bins[i].highEdge)
+ else :
+ logging.error("Histogram %s is of unknown type" % hpath)
+ print hpath,type(hsets.values()[0].values()[0])
+ sys.exit(1)
logging.info("Processing CMS_2011_S8957746")
useOnePt("/CMS_2011_S8957746/d01-x01-y01", "7000", "80" )
useOnePt("/CMS_2011_S8957746/d02-x01-y01", "7000", "80" )
useOnePt("/CMS_2011_S8957746/d03-x01-y01", "7000", "110" )
useOnePt("/CMS_2011_S8957746/d04-x01-y01", "7000", "110" )
useOnePt("/CMS_2011_S8957746/d05-x01-y01", "7000", "210" )
useOnePt("/CMS_2011_S8957746/d06-x01-y01", "7000", "210" )
logging.info("Processing ATLAS_2010_S8894728")
useOnePt("/ATLAS_2010_S8894728/d01-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d01-x01-y02", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d01-x01-y03", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d02-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d02-x01-y02", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d02-x01-y03", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d03-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d03-x01-y02", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d03-x01-y03", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d04-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d04-x01-y02", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d04-x01-y03", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d05-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d06-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d07-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d08-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d09-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d09-x01-y02", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d09-x01-y03", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d10-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d10-x01-y02", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d10-x01-y03", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d11-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d11-x01-y02", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d11-x01-y03", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d12-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d12-x01-y02", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d12-x01-y03", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d13-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d13-x01-y02", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d13-x01-y03", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d13-x01-y04", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d14-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d14-x01-y02", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d14-x01-y03", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d14-x01-y04", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d15-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d15-x01-y02", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d15-x01-y03", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d15-x01-y04", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d16-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d16-x01-y02", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d16-x01-y03", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d16-x01-y04", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d17-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d17-x01-y02", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d17-x01-y03", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d18-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d18-x01-y02", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d18-x01-y03", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d19-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d19-x01-y02", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d19-x01-y03", "900", "0" )
useOnePt("/ATLAS_2010_S8894728/d20-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d20-x01-y02", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d20-x01-y03", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d21-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8894728/d22-x01-y01", "7000", "0" )
logging.info("Processing ATLAS_2011_S8994773")
useOnePt("/ATLAS_2011_S8994773/d01-x01-y01", "900", "0" )
useOnePt("/ATLAS_2011_S8994773/d02-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2011_S8994773/d03-x01-y01", "900", "0" )
useOnePt("/ATLAS_2011_S8994773/d04-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2011_S8994773/d13-x01-y01", "900", "0" )
useOnePt("/ATLAS_2011_S8994773/d13-x01-y02", "900", "0" )
useOnePt("/ATLAS_2011_S8994773/d13-x01-y03", "900", "0" )
useOnePt("/ATLAS_2011_S8994773/d14-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2011_S8994773/d14-x01-y02", "7000", "0" )
useOnePt("/ATLAS_2011_S8994773/d14-x01-y03", "7000", "0" )
logging.info("Processing ALICE_2010_S8624100")
useOnePt("/ALICE_2010_S8624100/d11-x01-y01", "900", "0" )
useOnePt("/ALICE_2010_S8624100/d12-x01-y01", "900", "0" )
useOnePt("/ALICE_2010_S8624100/d13-x01-y01", "900", "0" )
useOnePt("/ALICE_2010_S8624100/d17-x01-y01","2360", "0" )
useOnePt("/ALICE_2010_S8624100/d18-x01-y01","2360", "0" )
useOnePt("/ALICE_2010_S8624100/d19-x01-y01","2360", "0" )
logging.info("Processing ALICE_2010_S8625980")
useOnePt("/ALICE_2010_S8625980/d03-x01-y01", "7000", "0" )
useOnePt("/ALICE_2010_S8625980/d04-x01-y01", "900", "0" )
useOnePt("/ALICE_2010_S8625980/d05-x01-y01", "2360", "0" )
useOnePt("/ALICE_2010_S8625980/d06-x01-y01", "7000", "0" )
logging.info("Processing ATLAS_2010_S8918562")
useOnePt("/ATLAS_2010_S8918562/d01-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d02-x01-y01", "2360", "0" )
useOnePt("/ATLAS_2010_S8918562/d03-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d04-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d05-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d06-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d07-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d08-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d09-x01-y01", "2360", "0" )
useOnePt("/ATLAS_2010_S8918562/d10-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d11-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d12-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d13-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d14-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d15-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d16-x01-y01", "2360", "0" )
useOnePt("/ATLAS_2010_S8918562/d17-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d18-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d19-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d20-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d21-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d22-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d23-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d24-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d25-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d26-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d27-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d28-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d29-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d30-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d31-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d32-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d33-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d34-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d35-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d36-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d37-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2010_S8918562/d38-x01-y01", "900", "0" )
useOnePt("/ATLAS_2010_S8918562/d39-x01-y01", "7000", "0" )
logging.info("Processing ATLAS_2011_S8971293")
useOnePt("/ATLAS_2011_S8971293/d01-x01-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S8971293/d01-x01-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S8971293/d01-x01-y03", "7000", "210" )
useOnePt("/ATLAS_2011_S8971293/d01-x01-y04", "7000", "260" )
useOnePt("/ATLAS_2011_S8971293/d01-x01-y05", "7000", "260" )
useOnePt("/ATLAS_2011_S8971293/d01-x01-y06", "7000", "400" )
useOnePt("/ATLAS_2011_S8971293/d01-x01-y07", "7000", "400" )
useOnePt("/ATLAS_2011_S8971293/d01-x01-y08", "7000", "600" )
useOnePt("/ATLAS_2011_S8971293/d01-x01-y09", "7000", "600" )
logging.info("Processing ATLAS_2011_S8924791")
useOnePt("/ATLAS_2011_S8924791/d01-x01-y01", "7000", "30" )
useOnePt("/ATLAS_2011_S8924791/d01-x01-y02", "7000", "30" )
useOnePt("/ATLAS_2011_S8924791/d01-x02-y01", "7000", "30" )
useOnePt("/ATLAS_2011_S8924791/d01-x02-y02", "7000", "30" )
useOnePt("/ATLAS_2011_S8924791/d01-x03-y01", "7000", "30" )
useOnePt("/ATLAS_2011_S8924791/d01-x03-y02", "7000", "30" )
useOnePt("/ATLAS_2011_S8924791/d01-x04-y01", "7000", "30" )
useOnePt("/ATLAS_2011_S8924791/d01-x04-y02", "7000", "30" )
useOnePt("/ATLAS_2011_S8924791/d01-x05-y01", "7000", "30" )
useOnePt("/ATLAS_2011_S8924791/d01-x05-y02", "7000", "30" )
useOnePt("/ATLAS_2011_S8924791/d01-x06-y01", "7000", "30" )
useOnePt("/ATLAS_2011_S8924791/d01-x06-y02", "7000", "30" )
useOnePt("/ATLAS_2011_S8924791/d02-x01-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d02-x01-y02", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d02-x02-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d02-x02-y02", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d02-x03-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d02-x03-y02", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d02-x04-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d02-x04-y02", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d02-x05-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d02-x05-y02", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d02-x06-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d02-x06-y02", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d03-x01-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d03-x01-y02", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d03-x02-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d03-x02-y02", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d03-x03-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d03-x03-y02", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d03-x04-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d03-x04-y02", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d03-x05-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d03-x05-y02", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d03-x06-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d03-x06-y02", "7000", "40" )
useOnePt("/ATLAS_2011_S8924791/d04-x01-y01", "7000", "80" )
useOnePt("/ATLAS_2011_S8924791/d04-x01-y02", "7000", "80" )
useOnePt("/ATLAS_2011_S8924791/d04-x02-y01", "7000", "80" )
useOnePt("/ATLAS_2011_S8924791/d04-x02-y02", "7000", "80" )
useOnePt("/ATLAS_2011_S8924791/d04-x03-y01", "7000", "80" )
useOnePt("/ATLAS_2011_S8924791/d04-x03-y02", "7000", "80" )
useOnePt("/ATLAS_2011_S8924791/d04-x04-y01", "7000", "80" )
useOnePt("/ATLAS_2011_S8924791/d04-x04-y02", "7000", "80" )
useOnePt("/ATLAS_2011_S8924791/d04-x05-y01", "7000", "80" )
useOnePt("/ATLAS_2011_S8924791/d04-x05-y02", "7000", "80" )
useOnePt("/ATLAS_2011_S8924791/d04-x06-y01", "7000", "80" )
useOnePt("/ATLAS_2011_S8924791/d04-x06-y02", "7000", "80" )
useOnePt("/ATLAS_2011_S8924791/d05-x01-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d05-x01-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d05-x02-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d05-x02-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d05-x03-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d05-x03-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d05-x04-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d05-x04-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d05-x05-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d05-x05-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d05-x06-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d05-x06-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d06-x01-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d06-x01-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d06-x02-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d06-x02-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d06-x03-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d06-x03-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d06-x04-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d06-x04-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d06-x05-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d06-x05-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d06-x06-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d06-x06-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S8924791/d07-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2011_S8924791/d07-x01-y02", "7000", "210" )
useOnePt("/ATLAS_2011_S8924791/d07-x02-y01", "7000", "210" )
useOnePt("/ATLAS_2011_S8924791/d07-x02-y02", "7000", "210" )
useOnePt("/ATLAS_2011_S8924791/d07-x03-y01", "7000", "210" )
useOnePt("/ATLAS_2011_S8924791/d07-x03-y02", "7000", "210" )
useOnePt("/ATLAS_2011_S8924791/d07-x04-y01", "7000", "210" )
useOnePt("/ATLAS_2011_S8924791/d07-x04-y02", "7000", "210" )
useOnePt("/ATLAS_2011_S8924791/d07-x05-y01", "7000", "210" )
useOnePt("/ATLAS_2011_S8924791/d07-x05-y02", "7000", "210" )
useOnePt("/ATLAS_2011_S8924791/d07-x06-y01", "7000", "210" )
useOnePt("/ATLAS_2011_S8924791/d07-x06-y02", "7000", "210" )
useOnePt("/ATLAS_2011_S8924791/d08-x01-y01", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d08-x01-y02", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d08-x02-y01", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d08-x02-y02", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d08-x03-y01", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d08-x03-y02", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d08-x04-y01", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d08-x04-y02", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d08-x05-y01", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d08-x05-y02", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d08-x06-y01", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d08-x06-y02", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d09-x01-y01", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d09-x01-y02", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d09-x02-y01", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d09-x02-y02", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d09-x03-y01", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d09-x03-y02", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d09-x04-y01", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d09-x04-y02", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d09-x05-y01", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d09-x05-y02", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d09-x06-y01", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d09-x06-y02", "7000", "260" )
useOnePt("/ATLAS_2011_S8924791/d10-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d10-x01-y02", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d10-x02-y01", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d10-x02-y02", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d10-x03-y01", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d10-x03-y02", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d10-x04-y01", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d10-x04-y02", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d10-x05-y01", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d10-x05-y02", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d10-x06-y01", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d10-x06-y02", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d11-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d11-x01-y02", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d11-x02-y01", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d11-x02-y02", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d11-x03-y01", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d11-x03-y02", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d11-x04-y01", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d11-x04-y02", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d11-x05-y01", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d11-x05-y02", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d11-x06-y01", "7000", "400" )
useOnePt("/ATLAS_2011_S8924791/d11-x06-y02", "7000", "400" )
logging.info("Processing ATLAS_2010_S8817804")
mergeByPt("/ATLAS_2010_S8817804/d01-x01-y01", "7000")
mergeByPt("/ATLAS_2010_S8817804/d02-x01-y01", "7000")
mergeByPt("/ATLAS_2010_S8817804/d03-x01-y01", "7000")
mergeByPt("/ATLAS_2010_S8817804/d04-x01-y01", "7000")
mergeByPt("/ATLAS_2010_S8817804/d05-x01-y01", "7000")
mergeByPt("/ATLAS_2010_S8817804/d06-x01-y01", "7000")
mergeByPt("/ATLAS_2010_S8817804/d07-x01-y01", "7000")
mergeByPt("/ATLAS_2010_S8817804/d08-x01-y01", "7000")
mergeByPt("/ATLAS_2010_S8817804/d09-x01-y01", "7000")
mergeByPt("/ATLAS_2010_S8817804/d10-x01-y01", "7000")
mergeByMass("/ATLAS_2010_S8817804/d11-x01-y01", "7000")
mergeByMass("/ATLAS_2010_S8817804/d12-x01-y01", "7000")
mergeByMass("/ATLAS_2010_S8817804/d13-x01-y01", "7000")
mergeByMass("/ATLAS_2010_S8817804/d14-x01-y01", "7000")
mergeByMass("/ATLAS_2010_S8817804/d15-x01-y01", "7000")
mergeByMass("/ATLAS_2010_S8817804/d16-x01-y01", "7000")
mergeByMass("/ATLAS_2010_S8817804/d17-x01-y01", "7000")
mergeByMass("/ATLAS_2010_S8817804/d18-x01-y01", "7000")
mergeByMass("/ATLAS_2010_S8817804/d19-x01-y01", "7000")
mergeByMass("/ATLAS_2010_S8817804/d20-x01-y01", "7000")
useOneMass("/ATLAS_2010_S8817804/d21-x01-y01", "7000", "300" )
useOneMass("/ATLAS_2010_S8817804/d22-x01-y01", "7000", "300" )
useOneMass("/ATLAS_2010_S8817804/d23-x01-y01", "7000", "800" )
useOneMass("/ATLAS_2010_S8817804/d24-x01-y01", "7000", "300" )
useOneMass("/ATLAS_2010_S8817804/d25-x01-y01", "7000", "300" )
useOneMass("/ATLAS_2010_S8817804/d26-x01-y01", "7000", "800" )
logging.info("Processing ATLAS_2011_I930220")
mergeByPt("/ATLAS_2011_I930220/d01-x01-y01", "7000" )
mergeByPt("/ATLAS_2011_I930220/d02-x01-y01", "7000" )
mergeByPt("/ATLAS_2011_I930220/d03-x01-y01", "7000" )
mergeByPt("/ATLAS_2011_I930220/d04-x01-y01", "7000" )
mergeByPt("/ATLAS_2011_I930220/d05-x01-y01", "7000" )
mergeByPt("/ATLAS_2011_I930220/d06-x01-y01", "7000" )
mergeByMass("/ATLAS_2011_I930220/d07-x01-y01", "7000")
useOneMass("/ATLAS_2011_I930220/d08-x01-y01", "7000", "110" )
useOneMass("/ATLAS_2011_I930220/d09-x01-y01", "7000", "110" )
useOneMass("/ATLAS_2011_I930220/d10-x01-y01", "7000", "370" )
logging.info("Processing ATLAS_2012_I1082936")
mergeByPt("/ATLAS_2012_I1082936/d01-x01-y01", "7000")
mergeByPt("/ATLAS_2012_I1082936/d01-x01-y02", "7000")
mergeByPt("/ATLAS_2012_I1082936/d01-x01-y03", "7000")
mergeByPt("/ATLAS_2012_I1082936/d01-x01-y04", "7000")
mergeByPt("/ATLAS_2012_I1082936/d01-x01-y05", "7000")
mergeByPt("/ATLAS_2012_I1082936/d01-x01-y06", "7000")
mergeByPt("/ATLAS_2012_I1082936/d01-x01-y07", "7000")
mergeByPt("/ATLAS_2012_I1082936/d02-x01-y01", "7000")
mergeByPt("/ATLAS_2012_I1082936/d02-x01-y02", "7000")
mergeByPt("/ATLAS_2012_I1082936/d02-x01-y03", "7000")
mergeByPt("/ATLAS_2012_I1082936/d02-x01-y04", "7000")
mergeByPt("/ATLAS_2012_I1082936/d02-x01-y05", "7000")
mergeByPt("/ATLAS_2012_I1082936/d02-x01-y06", "7000")
mergeByPt("/ATLAS_2012_I1082936/d02-x01-y07", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d03-x01-y01", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d03-x01-y02", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d03-x01-y03", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d03-x01-y04", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d03-x01-y05", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d03-x01-y06", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d03-x01-y07", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d03-x01-y08", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d03-x01-y09", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d04-x01-y01", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d04-x01-y02", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d04-x01-y03", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d04-x01-y04", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d04-x01-y05", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d04-x01-y06", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d04-x01-y07", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d04-x01-y08", "7000")
-mergeByMassTeV("/ATLAS_2012_I1082936/d04-x01-y09", "7000")
+mergeByMass("/ATLAS_2012_I1082936/d03-x01-y01", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d03-x01-y02", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d03-x01-y03", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d03-x01-y04", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d03-x01-y05", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d03-x01-y06", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d03-x01-y07", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d03-x01-y08", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d03-x01-y09", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d04-x01-y01", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d04-x01-y02", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d04-x01-y03", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d04-x01-y04", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d04-x01-y05", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d04-x01-y06", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d04-x01-y07", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d04-x01-y08", "7000", 1000.)
+mergeByMass("/ATLAS_2012_I1082936/d04-x01-y09", "7000", 1000.)
logging.info("Processing CMS_2011_S8968497")
useOneMass("/CMS_2011_S8968497/d01-x01-y01", "7000", "2000" )
useOneMass("/CMS_2011_S8968497/d02-x01-y01", "7000", "1200" )
useOneMass("/CMS_2011_S8968497/d03-x01-y01", "7000", "1200" )
useOneMass("/CMS_2011_S8968497/d04-x01-y01", "7000", "800" )
useOneMass("/CMS_2011_S8968497/d05-x01-y01", "7000", "800" )
useOneMass("/CMS_2011_S8968497/d06-x01-y01", "7000", "300" )
useOneMass("/CMS_2011_S8968497/d07-x01-y01", "7000", "300" )
useOneMass("/CMS_2011_S8968497/d08-x01-y01", "7000", "300" )
-useOneMass("/CMS_2011_S8968497/d09-x01-y01", "7000", "110" )
+useOneMass("/CMS_2011_S8968497/d09-x01-y01", "7000", "100" )
logging.info("Processing ATLAS_2011_S9126244")
mergeByPt("/ATLAS_2011_S9126244/d01-x01-y01", "7000")
mergeByPt("/ATLAS_2011_S9126244/d01-x01-y02", "7000")
mergeByPt("/ATLAS_2011_S9126244/d02-x01-y01", "7000")
mergeByPt("/ATLAS_2011_S9126244/d02-x01-y02", "7000")
mergeByPt("/ATLAS_2011_S9126244/d03-x01-y01", "7000")
mergeByPt("/ATLAS_2011_S9126244/d03-x01-y02", "7000")
mergeByPt("/ATLAS_2011_S9126244/d04-x01-y01", "7000")
mergeByPt("/ATLAS_2011_S9126244/d04-x01-y02", "7000")
mergeByPt("/ATLAS_2011_S9126244/d05-x01-y01", "7000")
mergeByPt("/ATLAS_2011_S9126244/d05-x01-y02", "7000")
useOnePt("/ATLAS_2011_S9126244/d06-x01-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S9126244/d06-x01-y02", "7000", "40" )
useOnePt("/ATLAS_2011_S9126244/d07-x01-y01", "7000", "80" )
useOnePt("/ATLAS_2011_S9126244/d07-x01-y02", "7000", "80" )
useOnePt("/ATLAS_2011_S9126244/d08-x01-y01", "7000", "80" )
useOnePt("/ATLAS_2011_S9126244/d08-x01-y02", "7000", "80" )
useOnePt("/ATLAS_2011_S9126244/d09-x01-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d09-x01-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d10-x01-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d10-x01-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d11-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2011_S9126244/d11-x01-y02", "7000", "210" )
useOnePt("/ATLAS_2011_S9126244/d12-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2011_S9126244/d12-x01-y02", "7000", "210" )
useOnePt("/ATLAS_2011_S9126244/d13-x01-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S9126244/d13-x01-y02", "7000", "40" )
useOnePt("/ATLAS_2011_S9126244/d14-x01-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S9126244/d14-x01-y02", "7000", "40" )
useOnePt("/ATLAS_2011_S9126244/d15-x01-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d15-x01-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d16-x01-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d16-x01-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d17-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2011_S9126244/d17-x01-y02", "7000", "210" )
useOnePt("/ATLAS_2011_S9126244/d18-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2011_S9126244/d18-x01-y02", "7000", "210" )
useOnePt("/ATLAS_2011_S9126244/d19-x01-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S9126244/d20-x01-y01", "7000", "80" )
useOnePt("/ATLAS_2011_S9126244/d21-x01-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d22-x01-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d23-x01-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d24-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2011_S9126244/d25-x01-y01", "7000", "210" )
mergeByPt("/ATLAS_2011_S9126244/d26-x01-y01", "7000")
mergeByPt("/ATLAS_2011_S9126244/d26-x01-y02", "7000")
mergeByPt("/ATLAS_2011_S9126244/d27-x01-y01", "7000")
mergeByPt("/ATLAS_2011_S9126244/d27-x01-y02", "7000")
mergeByPt("/ATLAS_2011_S9126244/d28-x01-y01", "7000")
mergeByPt("/ATLAS_2011_S9126244/d28-x01-y02", "7000")
mergeByPt("/ATLAS_2011_S9126244/d29-x01-y01", "7000")
mergeByPt("/ATLAS_2011_S9126244/d29-x01-y02", "7000")
useOnePt("/ATLAS_2011_S9126244/d30-x01-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S9126244/d31-x01-y01", "7000", "80" )
useOnePt("/ATLAS_2011_S9126244/d32-x01-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d33-x01-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d34-x01-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d35-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2011_S9126244/d36-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2011_S9126244/d37-x01-y01", "7000", "40" )
useOnePt("/ATLAS_2011_S9126244/d37-x01-y02", "7000", "40" )
useOnePt("/ATLAS_2011_S9126244/d38-x01-y01", "7000", "80" )
useOnePt("/ATLAS_2011_S9126244/d38-x01-y02", "7000", "80" )
useOnePt("/ATLAS_2011_S9126244/d39-x01-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d39-x01-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d40-x01-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d40-x01-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d41-x01-y01", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d41-x01-y02", "7000", "110" )
useOnePt("/ATLAS_2011_S9126244/d42-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2011_S9126244/d42-x01-y02", "7000", "210" )
useOnePt("/ATLAS_2011_S9126244/d43-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2011_S9126244/d43-x01-y02", "7000", "210" )
# CMS_2011_S9120041 UE analysis
logging.info("Processing CMS_2011_S9120041")
mergeByPt("/CMS_2011_S9120041/d01-x01-y01", "7000")
mergeByPt("/CMS_2011_S9120041/d02-x01-y01", "7000")
useOnePt("/CMS_2011_S9120041/d03-x01-y01", "900", "0" )
useOnePt("/CMS_2011_S9120041/d04-x01-y01", "900", "0" )
useOnePt("/CMS_2011_S9120041/d05-x01-y01", "7000", "0" )
useOnePt("/CMS_2011_S9120041/d06-x01-y01", "7000", "0" )
useOnePt("/CMS_2011_S9120041/d07-x01-y01", "7000", "0" )
useOnePt("/CMS_2011_S9120041/d08-x01-y01", "7000", "0" )
useOnePt("/CMS_2011_S9120041/d09-x01-y01", "7000", "0" )
useOnePt("/CMS_2011_S9120041/d10-x01-y01", "7000", "0" )
useOnePt("/CMS_2011_S9120041/d11-x01-y01", "900", "0" )
useOnePt("/CMS_2011_S9120041/d12-x01-y01", "900", "0" )
useOnePt("/CMS_2011_S9120041/d13-x01-y01", "900", "0" )
# CMS dijet decorrelation
logging.info("Processing CMS_2011_S8950903")
useOnePt("/CMS_2011_S8950903/d01-x01-y01", "7000", "80" )
useOnePt("/CMS_2011_S8950903/d02-x01-y01", "7000", "110" )
useOnePt("/CMS_2011_S8950903/d03-x01-y01", "7000", "110" )
useOnePt("/CMS_2011_S8950903/d04-x01-y01", "7000", "210" )
useOnePt("/CMS_2011_S8950903/d05-x01-y01", "7000", "260" )
# CMS jet cross section
logging.info("Processing CMS_2011_S9086218")
mergeByPt("/CMS_2011_S9086218/d01-x01-y01", "7000")
mergeByPt("/CMS_2011_S9086218/d02-x01-y01", "7000")
mergeByPt("/CMS_2011_S9086218/d03-x01-y01", "7000")
mergeByPt("/CMS_2011_S9086218/d04-x01-y01", "7000")
mergeByPt("/CMS_2011_S9086218/d05-x01-y01", "7000")
mergeByPt("/CMS_2011_S9086218/d06-x01-y01", "7000")
# CMS 2/3 jet cross section ratio
logging.info("Processing CMS_2011_S9086218")
-mergeByPtTeV("/CMS_2011_S9088458/d01-x01-y01", "7000")
+mergeByPt("/CMS_2011_S9088458/d01-x01-y01", "7000",500.)
# ATLAS track jet
logging.info("Processing ATLAS_2011_I919017")
mergeByPt("/ATLAS_2011_I919017/d01-x01-y01", "7000")
mergeByPt("/ATLAS_2011_I919017/d01-x01-y02", "7000")
mergeByPt("/ATLAS_2011_I919017/d01-x01-y03", "7000")
mergeByPt("/ATLAS_2011_I919017/d01-x01-y04", "7000")
useOnePt("/ATLAS_2011_I919017/d01-x02-y01", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y02", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y03", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y04", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y05", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y06", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y07", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y08", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y09", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y10", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y11", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y12", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y13", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y14", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y15", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y16", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y17", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y18", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y19", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y20", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y21", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y22", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y23", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y24", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x02-y25", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y01", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y02", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y03", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y04", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y05", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y06", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y07", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y08", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y09", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y10", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y11", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y12", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y13", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y14", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y15", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y16", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y17", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y18", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y19", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y20", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y21", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y22", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y23", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y24", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x03-y25", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y01", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y02", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y03", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y04", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y05", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y06", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y07", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y08", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y09", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y10", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y11", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y12", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y13", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y14", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y15", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y16", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y17", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y18", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y19", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y20", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y21", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y22", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y23", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y24", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x04-y25", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y01", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y02", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y03", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y04", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y05", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y06", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y07", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y08", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y09", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y10", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y11", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y12", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y13", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y14", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y15", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y16", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y17", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y18", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y19", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y20", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y21", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y22", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y23", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y24", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d01-x05-y25", "7000", "30" )
mergeByPt("/ATLAS_2011_I919017/d02-x01-y01", "7000")
mergeByPt("/ATLAS_2011_I919017/d02-x01-y02", "7000")
mergeByPt("/ATLAS_2011_I919017/d02-x01-y03", "7000")
mergeByPt("/ATLAS_2011_I919017/d02-x01-y04", "7000")
useOnePt("/ATLAS_2011_I919017/d02-x02-y01", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y02", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y03", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y04", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y05", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y06", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y07", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y08", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y09", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y10", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y11", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y12", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y13", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y14", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y15", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y16", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y17", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y18", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y19", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y20", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y21", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y22", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y23", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y24", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x02-y25", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y01", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y02", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y03", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y04", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y05", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y06", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y07", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y08", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y09", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y10", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y11", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y12", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y13", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y14", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y15", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y16", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y17", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y18", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y19", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y20", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y21", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y22", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y23", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y24", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x03-y25", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y01", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y02", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y03", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y04", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y05", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y06", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y07", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y08", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y09", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y10", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y11", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y12", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y13", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y14", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y15", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y16", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y17", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y18", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y19", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y20", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y21", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y22", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y23", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y24", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x04-y25", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y01", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y02", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y03", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y04", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y05", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y06", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y07", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y08", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y09", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y10", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y11", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y12", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y13", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y14", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y15", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y16", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y17", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y18", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y19", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y20", "7000", "30" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y21", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y22", "7000", "0" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y23", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y24", "7000", "4" )
useOnePt("/ATLAS_2011_I919017/d02-x05-y25", "7000", "30" )
logging.info("Processing ATLAS_2011_I926145")
-mergeByPt("/ATLAS_2011_I926145/d01-x01-y01", "7000")
-mergeByPt("/ATLAS_2011_I926145/d02-x01-y01", "7000")
-mergeByPt("/ATLAS_2011_I926145/d03-x01-y01", "7000")
+mergeByPt("/ATLAS_2011_I926145/d01-x01-y01", "7000",1.5)
+mergeByPt("/ATLAS_2011_I926145/d02-x01-y01", "7000",1.5)
+mergeByPt("/ATLAS_2011_I926145/d03-x01-y01", "7000",1.5)
logging.info("Processing CMS_2011_S8941262")
useOnePt("/CMS_2011_S8941262/d01-x01-y01", "7000", "10" )
useOnePt("/CMS_2011_S8941262/d03-x01-y01", "7000", "10" )
-mergeByPt("/CMS_2011_S8941262/d02-x01-y01", "7000")
+mergeByPt("/CMS_2011_S8941262/d02-x01-y01", "7000",1.5)
logging.info("Processing CMS_2011_S8973270")
useOnePt("/CMS_2011_S8973270/d01-x01-y01", "7000", "70" )
useOnePt("/CMS_2011_S8973270/d02-x01-y01", "7000", "100" )
useOnePt("/CMS_2011_S8973270/d03-x01-y01", "7000", "130" )
useOnePt("/CMS_2011_S8973270/d04-x01-y01", "7000", "70" )
useOnePt("/CMS_2011_S8973270/d05-x01-y01", "7000", "100" )
useOnePt("/CMS_2011_S8973270/d06-x01-y01", "7000", "130" )
logging.info("Processing ATLAS_2012_I1082009")
useOnePt("/ATLAS_2012_I1082009/d08-x01-y01", "7000", "25" )
useOnePt("/ATLAS_2012_I1082009/d09-x01-y01", "7000", "25" )
useOnePt("/ATLAS_2012_I1082009/d10-x01-y01", "7000", "25" )
useOnePt("/ATLAS_2012_I1082009/d11-x01-y01", "7000", "50" )
useOnePt("/ATLAS_2012_I1082009/d12-x01-y01", "7000", "50" )
useOnePt("/ATLAS_2012_I1082009/d13-x01-y01", "7000", "25" )
logging.info("Processing ATLAS_2012_I1118269")
mergeByPt("/ATLAS_2012_I1118269/d01-x01-y01", "7000")
useOnePt("/ATLAS_2012_I1118269/d02-x01-y01", "7000", "10" )
logging.info("Processing ATLAS_2012_I1188891")
mergeByPt("/ATLAS_2012_I1188891/d01-x01-y01", "7000")
mergeByPt("/ATLAS_2012_I1188891/d02-x01-y01", "7000")
mergeByPt("/ATLAS_2012_I1188891/d03-x01-y01", "7000")
mergeByPt("/ATLAS_2012_I1188891/d04-x01-y01", "7000")
mergeByPt("/ATLAS_2012_I1188891/d05-x01-y01", "7000")
mergeByPt("/ATLAS_2012_I1188891/d06-x01-y01", "7000")
logging.info("Processing CMS_2012_I1087342")
mergeByPt("/CMS_2012_I1087342/d01-x01-y01", "7000")
mergeByPt("/CMS_2012_I1087342/d02-x01-y01", "7000")
mergeByPt("/CMS_2012_I1087342/d03-x01-y01", "7000")
logging.info("Processing CMS_2012_PAS_QCD_11_010")
mergeByPt("/CMS_2012_PAS_QCD_11_010/d01-x01-y01", "7000")
mergeByPt("/CMS_2012_PAS_QCD_11_010/d02-x01-y01", "7000")
mergeByPt("/CMS_2012_PAS_QCD_11_010/d03-x01-y01", "7000")
mergeByPt("/CMS_2012_PAS_QCD_11_010/d04-x01-y01", "7000")
-logging.info("Processing ATLAS_2011_I9035664")
-mergeByPt("/ATLAS_2011_I9035664/d11-x01-y01", "7000")
-mergeByPt("/ATLAS_2011_I9035664/d12-x01-y01", "7000")
-mergeByPt("/ATLAS_2011_I9035664/d13-x01-y01", "7000")
-mergeByPt("/ATLAS_2011_I9035664/d14-x01-y01", "7000")
-mergeByPt("/ATLAS_2011_I9035664/d15-x01-y01", "7000")
-mergeByPt("/ATLAS_2011_I9035664/d16-x01-y01", "7000")
-mergeByPt("/ATLAS_2011_I9035664/d17-x01-y01", "7000")
-mergeByPt("/ATLAS_2011_I9035664/d18-x01-y01", "7000")
-mergeByPt("/ATLAS_2011_I9035664/d20-x01-y01", "7000")
-mergeByPt("/ATLAS_2011_I9035664/d21-x01-y01", "7000")
-mergeByPt("/ATLAS_2011_I9035664/d22-x01-y01", "7000")
-mergeByPt("/ATLAS_2011_I9035664/d23-x01-y01", "7000")
+logging.info("Processing ATLAS_2011_S9035664")
+mergeByPt("/ATLAS_2011_S9035664/d11-x01-y01", "7000")
+mergeByPt("/ATLAS_2011_S9035664/d12-x01-y01", "7000")
+mergeByPt("/ATLAS_2011_S9035664/d13-x01-y01", "7000")
+mergeByPt("/ATLAS_2011_S9035664/d14-x01-y01", "7000")
+mergeByPt("/ATLAS_2011_S9035664/d15-x01-y01", "7000")
+mergeByPt("/ATLAS_2011_S9035664/d16-x01-y01", "7000")
+mergeByPt("/ATLAS_2011_S9035664/d17-x01-y01", "7000")
+mergeByPt("/ATLAS_2011_S9035664/d18-x01-y01", "7000")
+mergeByPt("/ATLAS_2011_S9035664/d20-x01-y01", "7000")
+mergeByPt("/ATLAS_2011_S9035664/d21-x01-y01", "7000")
+mergeByPt("/ATLAS_2011_S9035664/d22-x01-y01", "7000")
+mergeByPt("/ATLAS_2011_S9035664/d23-x01-y01", "7000")
logging.info("Processing ATLAS_2012_I1125575")
mergeByPt("/ATLAS_2012_I1125575/d01-x01-y01", "7000")
mergeByPt("/ATLAS_2012_I1125575/d01-x01-y02", "7000")
mergeByPt("/ATLAS_2012_I1125575/d01-x02-y01", "7000")
mergeByPt("/ATLAS_2012_I1125575/d01-x02-y02", "7000")
mergeByPt("/ATLAS_2012_I1125575/d01-x03-y01", "7000")
mergeByPt("/ATLAS_2012_I1125575/d01-x03-y02", "7000")
mergeByPt("/ATLAS_2012_I1125575/d01-x04-y01", "7000")
mergeByPt("/ATLAS_2012_I1125575/d01-x04-y02", "7000")
mergeByPt("/ATLAS_2012_I1125575/d01-x05-y01", "7000")
mergeByPt("/ATLAS_2012_I1125575/d01-x05-y02", "7000")
mergeByPt("/ATLAS_2012_I1125575/d02-x01-y01", "7000")
mergeByPt("/ATLAS_2012_I1125575/d02-x01-y02", "7000")
mergeByPt("/ATLAS_2012_I1125575/d02-x02-y01", "7000")
mergeByPt("/ATLAS_2012_I1125575/d02-x02-y02", "7000")
mergeByPt("/ATLAS_2012_I1125575/d02-x03-y01", "7000")
mergeByPt("/ATLAS_2012_I1125575/d02-x03-y02", "7000")
mergeByPt("/ATLAS_2012_I1125575/d02-x04-y01", "7000")
mergeByPt("/ATLAS_2012_I1125575/d02-x04-y02", "7000")
mergeByPt("/ATLAS_2012_I1125575/d02-x05-y01", "7000")
mergeByPt("/ATLAS_2012_I1125575/d02-x05-y02", "7000")
mergeByPt("/ATLAS_2012_I1125575/d03-x01-y01", "7000")
mergeByPt("/ATLAS_2012_I1125575/d03-x01-y02", "7000")
mergeByPt("/ATLAS_2012_I1125575/d03-x02-y01", "7000")
mergeByPt("/ATLAS_2012_I1125575/d03-x02-y02", "7000")
mergeByPt("/ATLAS_2012_I1125575/d03-x03-y01", "7000")
mergeByPt("/ATLAS_2012_I1125575/d03-x03-y02", "7000")
mergeByPt("/ATLAS_2012_I1125575/d03-x04-y01", "7000")
mergeByPt("/ATLAS_2012_I1125575/d03-x04-y02", "7000")
mergeByPt("/ATLAS_2012_I1125575/d03-x05-y01", "7000")
mergeByPt("/ATLAS_2012_I1125575/d03-x05-y02", "7000")
useOnePt("/ATLAS_2012_I1125575/d04-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y02", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y03", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y04", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y05", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y06", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y07", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y08", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y09", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y10", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y11", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y12", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y13", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y14", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y15", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y16", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y17", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y18", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y19", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d04-x01-y20", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y01", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y02", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y03", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y04", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y05", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y06", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y07", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y08", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y09", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y10", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y11", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y12", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y13", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y14", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y15", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y16", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y17", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y18", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y19", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d04-x02-y20", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y01", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y02", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y03", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y04", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y05", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y06", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y07", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y08", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y09", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y10", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y11", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y12", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y13", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y14", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y15", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y16", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y17", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y18", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y19", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d04-x03-y20", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y01", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y02", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y03", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y04", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y05", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y06", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y07", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y08", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y09", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y10", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y11", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y12", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y13", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y14", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y15", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y16", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y17", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y18", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y19", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d04-x04-y20", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y01", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y02", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y03", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y04", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y05", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y06", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y07", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y08", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y09", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y10", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y11", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y12", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y13", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y14", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y15", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y16", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y17", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y18", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y19", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d04-x05-y20", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y02", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y03", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y04", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y05", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y06", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y07", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y08", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y09", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y10", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y11", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y12", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y13", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y14", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y15", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y16", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y17", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y18", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y19", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d05-x01-y20", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y01", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y02", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y03", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y04", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y05", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y06", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y07", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y08", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y09", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y10", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y11", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y12", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y13", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y14", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y15", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y16", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y17", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y18", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y19", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d05-x02-y20", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y01", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y02", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y03", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y04", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y05", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y06", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y07", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y08", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y09", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y10", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y11", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y12", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y13", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y14", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y15", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y16", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y17", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y18", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y19", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d05-x03-y20", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y01", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y02", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y03", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y04", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y05", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y06", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y07", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y08", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y09", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y10", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y11", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y12", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y13", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y14", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y15", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y16", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y17", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y18", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y19", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d05-x04-y20", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y01", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y02", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y03", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y04", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y05", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y06", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y07", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y08", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y09", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y10", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y11", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y12", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y13", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y14", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y15", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y16", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y17", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y18", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y19", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d05-x05-y20", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y01", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y02", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y03", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y04", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y05", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y06", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y07", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y08", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y09", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y10", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y11", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y12", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y13", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y14", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y15", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y16", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y17", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y18", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y19", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d06-x01-y20", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y01", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y02", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y03", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y04", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y05", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y06", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y07", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y08", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y09", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y10", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y11", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y12", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y13", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y14", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y15", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y16", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y17", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y18", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y19", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d06-x02-y20", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y01", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y02", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y03", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y04", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y05", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y06", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y07", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y08", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y09", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y10", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y11", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y12", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y13", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y14", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y15", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y16", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y17", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y18", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y19", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d06-x03-y20", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y01", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y02", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y03", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y04", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y05", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y06", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y07", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y08", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y09", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y10", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y11", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y12", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y13", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y14", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y15", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y16", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y17", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y18", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y19", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d06-x04-y20", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y01", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y02", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y03", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y04", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y05", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y06", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y07", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y08", "7000", "0" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y09", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y10", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y11", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y12", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y13", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y14", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y15", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y16", "7000", "4" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y17", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y18", "7000", "30" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y19", "7000", "40" )
useOnePt("/ATLAS_2012_I1125575/d06-x05-y20", "7000", "40" )
# ATLAS_2012_I1094564
useOnePt("/ATLAS_2012_I1094564/d01-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2012_I1094564/d02-x01-y01", "7000", "260" )
useOnePt("/ATLAS_2012_I1094564/d03-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d04-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d05-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2012_I1094564/d06-x01-y01", "7000", "260" )
useOnePt("/ATLAS_2012_I1094564/d07-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d08-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d09-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2012_I1094564/d10-x01-y01", "7000", "260" )
useOnePt("/ATLAS_2012_I1094564/d11-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d12-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d13-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2012_I1094564/d14-x01-y01", "7000", "260" )
useOnePt("/ATLAS_2012_I1094564/d15-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d16-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d17-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2012_I1094564/d18-x01-y01", "7000", "260" )
useOnePt("/ATLAS_2012_I1094564/d19-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d20-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d21-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2012_I1094564/d22-x01-y01", "7000", "260" )
useOnePt("/ATLAS_2012_I1094564/d23-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d24-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d25-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2012_I1094564/d26-x01-y01", "7000", "260" )
useOnePt("/ATLAS_2012_I1094564/d27-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d28-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d29-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2012_I1094564/d30-x01-y01", "7000", "260" )
useOnePt("/ATLAS_2012_I1094564/d31-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d32-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d33-x01-y01", "7000", "210" )
useOnePt("/ATLAS_2012_I1094564/d34-x01-y01", "7000", "260" )
useOnePt("/ATLAS_2012_I1094564/d35-x01-y01", "7000", "400" )
useOnePt("/ATLAS_2012_I1094564/d36-x01-y01", "7000", "400" )
logging.info("Processing CMS_2013_I1224539_DIJET")
useOnePt("/CMS_2013_I1224539_DIJET/d01-x01-y01", "7000", "210" )
useOnePt("/CMS_2013_I1224539_DIJET/d02-x01-y01", "7000", "260" )
useOnePt("/CMS_2013_I1224539_DIJET/d03-x01-y01", "7000", "400" )
useOnePt("/CMS_2013_I1224539_DIJET/d04-x01-y01", "7000", "400" )
useOnePt("/CMS_2013_I1224539_DIJET/d05-x01-y01", "7000", "600" )
useOnePt("/CMS_2013_I1224539_DIJET/d06-x01-y01", "7000", "600" )
useOnePt("/CMS_2013_I1224539_DIJET/d07-x01-y01", "7000", "600" )
useOnePt("/CMS_2013_I1224539_DIJET/d08-x01-y01", "7000", "210" )
useOnePt("/CMS_2013_I1224539_DIJET/d09-x01-y01", "7000", "260" )
useOnePt("/CMS_2013_I1224539_DIJET/d10-x01-y01", "7000", "400" )
useOnePt("/CMS_2013_I1224539_DIJET/d11-x01-y01", "7000", "400" )
useOnePt("/CMS_2013_I1224539_DIJET/d12-x01-y01", "7000", "600" )
useOnePt("/CMS_2013_I1224539_DIJET/d13-x01-y01", "7000", "600" )
useOnePt("/CMS_2013_I1224539_DIJET/d14-x01-y01", "7000", "600" )
useOnePt("/CMS_2013_I1224539_DIJET/d15-x01-y01", "7000", "210" )
useOnePt("/CMS_2013_I1224539_DIJET/d16-x01-y01", "7000", "260" )
useOnePt("/CMS_2013_I1224539_DIJET/d17-x01-y01", "7000", "400" )
useOnePt("/CMS_2013_I1224539_DIJET/d18-x01-y01", "7000", "400" )
useOnePt("/CMS_2013_I1224539_DIJET/d19-x01-y01", "7000", "600" )
useOnePt("/CMS_2013_I1224539_DIJET/d20-x01-y01", "7000", "600" )
useOnePt("/CMS_2013_I1224539_DIJET/d21-x01-y01", "7000", "600" )
useOnePt("/CMS_2013_I1224539_DIJET/d22-x01-y01", "7000", "210" )
useOnePt("/CMS_2013_I1224539_DIJET/d23-x01-y01", "7000", "260" )
useOnePt("/CMS_2013_I1224539_DIJET/d24-x01-y01", "7000", "400" )
useOnePt("/CMS_2013_I1224539_DIJET/d25-x01-y01", "7000", "600" )
useOnePt("/CMS_2013_I1224539_DIJET/d26-x01-y01", "7000", "600" )
useOnePt("/CMS_2013_I1224539_DIJET/d27-x01-y01", "7000", "600" )
useOnePt("/CMS_2013_I1224539_DIJET/d28-x01-y01", "7000", "600" )
# Choose output file
-name = "LHC"+"-Jets.aida"
-out = open(name, "w")
-## Write out merged histos
-out.write('<?xml version="1.0" encoding="ISO-8859-1" ?>\n')
-out.write('<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">\n')
-out.write('<aida version="3.3">\n')
-out.write(' <implementation version="1.1" package="FreeHEP"/>\n')
-for hpath, h in sorted(outhistos.iteritems()):
- logging.debug("hpath = %s" % hpath)
- out.write(h.asAIDA() + "\n\n")
-out.write('</aida>\n')
-
+name = "LHC"+"-Jets.yoda"
+yoda.writeYODA(outhistos,name)
sys.exit(0)
diff --git a/Tests/python/merge-LHC-EW b/Tests/python/merge-LHC-Photon
copy from Tests/python/merge-LHC-EW
copy to Tests/python/merge-LHC-Photon
--- a/Tests/python/merge-LHC-EW
+++ b/Tests/python/merge-LHC-Photon
@@ -1,158 +1,58 @@
#! /usr/bin/env python
-import lighthisto
import logging
import sys
-import os, copy, re
+import os, yoda
"""%prog
Script for merging aida files
"""
import sys
if sys.version_info[:3] < (2,4,0):
print "rivet scripts require Python version >= 2.4.0... exiting"
sys.exit(1)
-## Try to load faster but non-standard cElementTree module
-try:
- import xml.etree.cElementTree as ET
-except ImportError:
- try:
- import cElementTree as ET
- except ImportError:
- try:
- import xml.etree.ElementTree as ET
- except:
- sys.stderr.write("Can't load the ElementTree XML parser: please install it!\n")
- sys.exit(1)
-
if __name__ == "__main__":
import logging
from optparse import OptionParser, OptionGroup
parser = OptionParser(usage="%prog aidafile aidafile2 [...]")
parser.add_option("-o", "--out", dest="OUTFILE", default="-")
- parser.add_option("--append", dest="APPEND_OUTPUT", action="store_true", default=False)
verbgroup = OptionGroup(parser, "Verbosity control")
verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
default=logging.INFO, help="print debug (very verbose) messages")
verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
default=logging.INFO, help="be very quiet")
parser.add_option_group(verbgroup)
(opts, args) = parser.parse_args()
logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
- ## Prefix used in dat file headers
- headerprefix = "# "
-
## Check args
if len(args) < 1:
logging.error("Must specify at least one AIDA histogram file")
sys.exit(1)
## Get histos
outhistos={}
for file in args:
if not os.access(file, os.R_OK):
logging.error("%s can not be read" % file)
break
try:
- tree = ET.parse(file)
+ aos = yoda.read(file)
except:
logging.error("%s can not be parsed as XML" % file)
break
- tree = ET.parse(file)
- ## Get histos from this AIDA file
- for dps in tree.findall("dataPointSet"):
- h = lighthisto.Histo.fromDPS(dps)
- if(h.fullPath().find("ATLAS_2010_S8919674")>0) :
- if((h.fullPath().find("d01")>0 or h.fullPath().find("d05")>0 or
- h.fullPath().find("d07")>0) and file.find("-e")>0) :
- outhistos[h.fullPath()] = h
- elif((h.fullPath().find("d02")>0 or h.fullPath().find("d06")>0 or
- h.fullPath().find("d08")>0) and file.find("-mu")>0) :
- outhistos[h.fullPath()] = h
- elif (h.fullPath().find("ATLAS_2011_S9131140")>0) :
- if(h.fullPath().find("d01")>0 and file.find("-e")>0) :
- outhistos[h.fullPath()] = h
- elif(h.fullPath().find("d02")>0 and file.find("-mu")>0) :
- outhistos[h.fullPath()] = h
- elif (h.fullPath().find("ATLAS_2011_I925932")>0) :
- if(h.fullPath().find("d01")>0 and file.find("-e")>0) :
- outhistos[h.fullPath()] = h
- elif(h.fullPath().find("d02")>0 and file.find("-mu")>0) :
- outhistos[h.fullPath()] = h
- elif (h.fullPath().find("ATLAS_2011_I945498")>0) :
- if(h.fullPath().find("y01")>0 and file.find("-e")>0) :
- outhistos[h.fullPath()] = h
- elif(h.fullPath().find("y02")>0 and file.find("-mu")>0) :
- outhistos[h.fullPath()] = h
- elif(h.fullPath().find("y03")>0 and file.find("-mu")>0) :
- outhistos[h.fullPath()] = h
- elif (h.fullPath().find("ATLAS_2013_I1217867")>0) :
- if(h.fullPath().find("y01")>0 and file.find("-e")>0) :
- outhistos[h.fullPath()] = h
- elif(h.fullPath().find("y02")>0 and file.find("-mu")>0) :
- outhistos[h.fullPath()] = h
- elif (h.fullPath().find("ATLAS_2012_I1204784" )>0) :
- if( file.find("-e")>0 and
- ( h.fullPath().find("d03")>0 or
- ((h.fullPath().find("d01")>0 or h.fullPath().find("d02")>0) and h.fullPath().find("y01")>0))) :
- outhistos[h.fullPath()] = h
- elif(file.find("-mu")>0 and
- ( h.fullPath().find("d04")>0 or
- ((h.fullPath().find("d01")>0 or h.fullPath().find("d02")>0) and h.fullPath().find("y02")>0))) :
- outhistos[h.fullPath()] = h
- elif (h.fullPath().find("CMS_2013_I1224539_WJET" )>0) :
- if(file.find("-1-e")>0 and (h.fullPath().find("d52")>0 or h.fullPath().find("d53")>0 or h.fullPath().find("d56")>0 or h.fullPath().find("d57")>0 or h.fullPath().find("d60")>0 or h.fullPath().find("d61")>0 or h.fullPath().find("d64")>0 or h.fullPath().find("d65")>0 or h.fullPath().find("d68")>0 or h.fullPath().find("d69")>0 or h.fullPath().find("d72")>0)) :
- outhistos[h.fullPath()] = h
- elif(file.find("-2-e")>0 and (h.fullPath().find("d54")>0 or h.fullPath().find("d58")>0 or h.fullPath().find("d62")>0 or h.fullPath().find("d66")>0 or h.fullPath().find("d70")>0 or h.fullPath().find("d73")>0)) :
- outhistos[h.fullPath()] = h
- elif(file.find("-3-e")>0 and (h.fullPath().find("d55")>0 or h.fullPath().find("d59")>0 or h.fullPath().find("d63")>0 or h.fullPath().find("d67")>0 or h.fullPath().find("d71")>0 or h.fullPath().find("d74")>0)) :
- outhistos[h.fullPath()] = h
- elif (h.fullPath().find("CMS_2013_I1224539_ZJET" )>0) :
- if(file.find("-1-e")>0 and (h.fullPath().find("d29")>0 or h.fullPath().find("d30")>0 or h.fullPath().find("d33")>0 or h.fullPath().find("d34")>0 or h.fullPath().find("d37")>0 or h.fullPath().find("d38")>0 or h.fullPath().find("d41")>0 or h.fullPath().find("d42")>0 or h.fullPath().find("d45")>0 or h.fullPath().find("d46")>0 or h.fullPath().find("d49")>0)) :
- outhistos[h.fullPath()] = h
- elif(file.find("-2-e")>0 and (h.fullPath().find("d31")>0 or h.fullPath().find("d35")>0 or h.fullPath().find("d39")>0 or h.fullPath().find("d43")>0 or h.fullPath().find("d47")>0 or h.fullPath().find("d50")>0)) :
- outhistos[h.fullPath()] = h
- elif(file.find("-3-e")>0 and (h.fullPath().find("d32")>0 or h.fullPath().find("d36")>0 or h.fullPath().find("d40")>0 or h.fullPath().find("d44")>0 or h.fullPath().find("d48")>0 or h.fullPath().find("d51")>0)) :
- outhistos[h.fullPath()] = h
- elif (h.fullPath().find("CMS_2013_I1258128")>0) :
- if(h.fullPath().find("d01")>0 or h.fullPath().find("d02")>0 or
- h.fullPath().find("d03")>0 or h.fullPath().find("d04")>0) :
- outhistos[h.fullPath()] = h
+ ## Get histos from this YODA file
+ for aopath, ao in aos.iteritems() :
+ if (aopath.find("CMS_2013_I1258128")>0) :
+ if(aopath.find("d05")>0 or aopath.find("d06")>0 or
+ aopath.find("d07")>0 or aopath.find("d08")>0) :
+ outhistos[aopath] = ao
else :
- outhistos[h.fullPath()] = h
+ outhistos[aopath] = ao
- ## Choose output file
- out = None
- if opts.OUTFILE == "-":
- out = sys.stdout
- else:
- if opts.APPEND_OUTPUT:
- out = open(opts.OUTFILE, "a")
- else:
- out = open(opts.OUTFILE, "w")
-
-
- # Choose output file
- out = None
- if opts.OUTFILE == "-":
- out = sys.stdout
- else:
- if opts.APPEND_OUTPUT:
- out = open(opts.OUTFILE, "a")
- else:
- out = open(opts.OUTFILE, "w")
- ## Write out merged histos
- out.write('<?xml version="1.0" encoding="ISO-8859-1" ?>\n')
- out.write('<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">\n')
- out.write('<aida version="3.3">\n')
- out.write(' <implementation version="1.1" package="FreeHEP"/>\n')
- for hpath, h in sorted(outhistos.iteritems()):
- logging.debug("hpath = %s" % hpath)
- out.write(h.asAIDA() + "\n\n")
- out.write('</aida>\n')
-
+ # Choose output file
+ yoda.writeYODA(outhistos,opts.OUTFILE)
sys.exit(0)
diff --git a/Tests/python/merge-LEP b/Tests/python/merge-SppS
copy from Tests/python/merge-LEP
copy to Tests/python/merge-SppS
--- a/Tests/python/merge-LEP
+++ b/Tests/python/merge-SppS
@@ -1,902 +1,163 @@
#! /usr/bin/env python
-import lighthisto
+# import lighthisto
import logging
import sys
if sys.version_info[:3] < (2,4,0):
print "rivet scripts require Python version >= 2.4.0... exiting"
sys.exit(1)
-import os, copy, re
-from math import sqrt
+import os, yoda, copy
-## Try to load faster but non-standard cElementTree module
-try:
- import xml.etree.cElementTree as ET
-except ImportError:
- try:
- import cElementTree as ET
- except ImportError:
- try:
- import xml.etree.ElementTree as ET
- except:
- sys.stderr.write("Can't load the ElementTree XML parser: please install it!\n")
- sys.exit(1)
-
-
-
-# #############################################
-
-def fillAbove(desthisto, sourcehistosbyptmin):
- for i,b in enumerate(desthisto.getBins()):
- ## Fill bins with pT-ordered histos (so that 'highest always wins')
- for ptmin, h in sorted(sourcehistosbyptmin.iteritems()):
- newb = h.getBin(i)
- if newb.xlow <= float(ptmin) and newb.xhigh >=float(ptmin):
- b.val = newb.val
- b.errplus = newb.errplus
- b.errminus = newb.errminus
- b._focus= newb._focus
-
-def merge(hpath):
- global inhistos
- global outhistos
- try:
- fillAbove(outhistos[hpath], inhistos[hpath])
- except:
- pass
+# # #############################################
def useOne(hpath, sqrts):
global inhistos
global outhistos
try:
outhistos[hpath] = inhistos[hpath][float(sqrts)]
except:
pass
+
if __name__ == "__main__":
import logging
from optparse import OptionParser, OptionGroup
parser = OptionParser(usage="%prog name")
verbgroup = OptionGroup(parser, "Verbosity control")
verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
default=logging.INFO, help="print debug (very verbose) messages")
verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
default=logging.INFO, help="be very quiet")
parser.add_option_group(verbgroup)
(opts, args) = parser.parse_args()
logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
-
- ## Prefix used in dat file headers
- headerprefix = "# "
-
-
## Check args
if len(args) < 1:
logging.error("Must specify at least the name of the files")
sys.exit(1)
-# #######################################
+#######################################
-aidafiles=["-130.aida","-133.aida","-136.aida","-177.aida","-192.aida",
- "-196.aida","-202.aida","-206.aida","-91.aida" ,"-91-nopi.aida" ,\
- "-161.aida","-183.aida","-197.aida","-35.aida" ,"-172.aida",\
- "-189.aida","-200.aida","-44.aida","-14.aida","-22.aida","-10.aida" ]
-
+yodafiles=["ISR-44-UE.yoda","ISR-63-UE.yoda","SppS-63-UE.yoda","ISR-30-UE.yoda", \
+ "ISR-53-UE.yoda","SppS-200-UE.yoda","SppS-500-UE.yoda","SppS-900-UE.yoda", \
+ "SppS-546-UE.yoda","SppS-53-UE.yoda"]
+
## Get histos
inhistos = {}
outhistos={}
-weights = {}
-for f in aidafiles:
- file = args[0]+f
- if(file.find("10")>0) :
- sqrts=10
- elif(file.find("14")>0) :
- sqrts=14
- elif(file.find("22")>0) :
- sqrts=22
- elif(file.find("35")>0) :
- sqrts=35
- elif(file.find("44")>0) :
+for file in yodafiles:
+ if(file.find("44")>0) :
sqrts=44
- elif(file.find("91")>0) :
- sqrts=91
- elif(file.find("130")>0) :
- sqrts=130
- elif(file.find("133")>0) :
- sqrts=133
- elif(file.find("136")>0) :
- sqrts=136
- elif(file.find("161")>0) :
- sqrts=161
- elif(file.find("172")>0) :
- sqrts=172
- elif(file.find("177")>0) :
- sqrts=177
- elif(file.find("183")>0) :
- sqrts=183
- elif(file.find("189")>0) :
- sqrts=189
- elif(file.find("192")>0) :
- sqrts=192
- elif(file.find("196")>0) :
- sqrts=196
- elif(file.find("197")>0) :
- sqrts=197
+ elif(file.find("63")>0) :
+ sqrts=63
+ elif(file.find("30")>0) :
+ sqrts=30
+ elif(file.find("53")>0) :
+ sqrts=53
elif(file.find("200")>0) :
sqrts=200
- elif(file.find("202")>0) :
- sqrts=202
- elif(file.find("206")>0) :
- sqrts=206
+ elif(file.find("500")>0) :
+ sqrts=500
+ elif(file.find("900")>0) :
+ sqrts=900
+ elif(file.find("546")>0) :
+ sqrts=546
+ elif(file.find("53")>0) :
+ sqrts=53
if not os.access(file, os.R_OK):
logging.error("%s can not be read" % file)
break
try:
- tree = ET.parse(file)
+ aos = yoda.read(file)
except:
- logging.error("%s can not be parsed as XML" % file)
+ logging.error("%s can not be parsed as yoda" % file)
break
- tree = ET.parse(file)
- ## Get histos from this AIDA file
- for dps in tree.findall("dataPointSet"):
- h = lighthisto.Histo.fromDPS(dps)
- # jet shapes
- if(h.fullPath().find("4300807")>0 or h.fullPath().find("6132243")>0 or
- h.fullPath().find("5765862")>0 or h.fullPath().find("3612880")>0 or
- h.fullPath().find("4328825")>0 or h.fullPath().find("5361494")>0 or
- h.fullPath().find("2148048")>0 or h.fullPath().find("MULTIPLICITIES")>0 ) :
- if not inhistos.has_key(h.fullPath()):
- inhistos[h.fullPath()] = {}
- if not inhistos[h.fullPath()].has_key(sqrts):
- inhistos[h.fullPath()][sqrts] = h
- else:
+ ## Get histos from this YODA file
+ for aopath, ao in aos.iteritems() :
+ if(aopath.find("1926373")>0 or aopath.find("1867512")>0 or
+ aopath.find("1583476")>0 or aopath.find("2044935")>0 or
+ aopath.find("1178091")>0 ) :
+ if not inhistos.has_key(aopath):
+ inhistos[aopath] = {}
+ if not inhistos[aopath].has_key(sqrts):
+ inhistos[aopath][sqrts] = ao
+ else:
raise Exception("A set with sqrts = %s already exists" % ( sqrts))
else :
- outhistos[h.fullPath()] = h
+ outhistos[aopath] = ao
-## Make empty output histos if needed
-for hpath,hsets in inhistos.iteritems():
- if( hpath.find("4300807")>0 or hpath.find("6132243")>0 or hpath.find("5765862")>0 or
- hpath.find("4328825")>0 or hpath.find("5361494")>0) :
- workhisto = copy.deepcopy(hsets.values()[0])
- outhistos[hpath] = workhisto
- ## Empty the bin set for histos which we're going to merge
- for b in outhistos[hpath]:
- b.val = 0
- b.errplus = 0
- b.errminus = 0
- b._focus= None
-# tasso
-useOne("/TASSO_1990_S2148048/d06-x01-y01","14")
-useOne("/TASSO_1990_S2148048/d07-x01-y01","14")
-useOne("/TASSO_1990_S2148048/d08-x01-y01","14")
-useOne("/TASSO_1990_S2148048/d06-x01-y02","22")
-useOne("/TASSO_1990_S2148048/d07-x01-y02","22")
-useOne("/TASSO_1990_S2148048/d08-x01-y02","22")
-useOne("/TASSO_1990_S2148048/d06-x01-y03","35")
-useOne("/TASSO_1990_S2148048/d07-x01-y03","35")
-useOne("/TASSO_1990_S2148048/d08-x01-y03","35")
-useOne("/TASSO_1990_S2148048/d06-x01-y04","44")
-useOne("/TASSO_1990_S2148048/d07-x01-y04","44")
-useOne("/TASSO_1990_S2148048/d08-x01-y04","44")
-# jade
-useOne("/JADE_1998_S3612880/d02-x01-y01","44")
-useOne("/JADE_1998_S3612880/d03-x01-y01","44")
-useOne("/JADE_1998_S3612880/d04-x01-y01","44")
-useOne("/JADE_1998_S3612880/d05-x01-y01","44")
-useOne("/JADE_1998_S3612880/d06-x01-y01","35")
-useOne("/JADE_1998_S3612880/d07-x01-y01","35")
-useOne("/JADE_1998_S3612880/d08-x01-y01","35")
-useOne("/JADE_1998_S3612880/d09-x01-y01","35")
-useOne("/JADE_1998_S3612880/d10-x01-y01","44")
-useOne("/JADE_1998_S3612880/d11-x01-y01","35")
-useOne("/JADE_1998_S3612880/d12-x01-y01","22")
-# opal/jade
-useOne("/JADE_OPAL_2000_S4300807/d07-x01-y01","35")
-useOne("/JADE_OPAL_2000_S4300807/d07-x01-y02","35")
-useOne("/JADE_OPAL_2000_S4300807/d07-x01-y03","35")
-useOne("/JADE_OPAL_2000_S4300807/d07-x01-y04","35")
-useOne("/JADE_OPAL_2000_S4300807/d07-x01-y05","35")
-useOne("/JADE_OPAL_2000_S4300807/d08-x01-y01","44")
-useOne("/JADE_OPAL_2000_S4300807/d08-x01-y02","44")
-useOne("/JADE_OPAL_2000_S4300807/d08-x01-y03","44")
-useOne("/JADE_OPAL_2000_S4300807/d08-x01-y04","44")
-useOne("/JADE_OPAL_2000_S4300807/d08-x01-y05","44")
-useOne("/JADE_OPAL_2000_S4300807/d09-x01-y01","91")
-useOne("/JADE_OPAL_2000_S4300807/d09-x01-y02","91")
-useOne("/JADE_OPAL_2000_S4300807/d09-x01-y03","91")
-useOne("/JADE_OPAL_2000_S4300807/d09-x01-y04","91")
-useOne("/JADE_OPAL_2000_S4300807/d09-x01-y05","91")
-useOne("/JADE_OPAL_2000_S4300807/d10-x01-y01","133")
-useOne("/JADE_OPAL_2000_S4300807/d10-x01-y02","133")
-useOne("/JADE_OPAL_2000_S4300807/d10-x01-y03","133")
-useOne("/JADE_OPAL_2000_S4300807/d10-x01-y04","133")
-useOne("/JADE_OPAL_2000_S4300807/d10-x01-y05","133")
-useOne("/JADE_OPAL_2000_S4300807/d11-x01-y01","161")
-useOne("/JADE_OPAL_2000_S4300807/d11-x01-y02","161")
-useOne("/JADE_OPAL_2000_S4300807/d11-x01-y03","161")
-useOne("/JADE_OPAL_2000_S4300807/d11-x01-y04","161")
-useOne("/JADE_OPAL_2000_S4300807/d11-x01-y05","161")
-useOne("/JADE_OPAL_2000_S4300807/d12-x01-y01","172")
-useOne("/JADE_OPAL_2000_S4300807/d12-x01-y02","172")
-useOne("/JADE_OPAL_2000_S4300807/d12-x01-y03","172")
-useOne("/JADE_OPAL_2000_S4300807/d12-x01-y04","172")
-useOne("/JADE_OPAL_2000_S4300807/d12-x01-y05","172")
-useOne("/JADE_OPAL_2000_S4300807/d13-x01-y01","183")
-useOne("/JADE_OPAL_2000_S4300807/d13-x01-y02","183")
-useOne("/JADE_OPAL_2000_S4300807/d13-x01-y03","183")
-useOne("/JADE_OPAL_2000_S4300807/d13-x01-y04","183")
-useOne("/JADE_OPAL_2000_S4300807/d13-x01-y05","183")
-useOne("/JADE_OPAL_2000_S4300807/d14-x01-y01","189")
-useOne("/JADE_OPAL_2000_S4300807/d14-x01-y02","189")
-useOne("/JADE_OPAL_2000_S4300807/d14-x01-y03","189")
-useOne("/JADE_OPAL_2000_S4300807/d14-x01-y04","189")
-useOne("/JADE_OPAL_2000_S4300807/d14-x01-y05","189")
-useOne("/JADE_OPAL_2000_S4300807/d16-x01-y01","35")
-useOne("/JADE_OPAL_2000_S4300807/d16-x01-y02","35")
-useOne("/JADE_OPAL_2000_S4300807/d16-x01-y03","35")
-useOne("/JADE_OPAL_2000_S4300807/d16-x01-y04","35")
-useOne("/JADE_OPAL_2000_S4300807/d16-x01-y05","35")
-useOne("/JADE_OPAL_2000_S4300807/d17-x01-y01","44")
-useOne("/JADE_OPAL_2000_S4300807/d17-x01-y02","44")
-useOne("/JADE_OPAL_2000_S4300807/d17-x01-y03","44")
-useOne("/JADE_OPAL_2000_S4300807/d17-x01-y04","44")
-useOne("/JADE_OPAL_2000_S4300807/d17-x01-y05","44")
-useOne("/JADE_OPAL_2000_S4300807/d18-x01-y01","91")
-useOne("/JADE_OPAL_2000_S4300807/d18-x01-y02","91")
-useOne("/JADE_OPAL_2000_S4300807/d18-x01-y03","91")
-useOne("/JADE_OPAL_2000_S4300807/d18-x01-y04","91")
-useOne("/JADE_OPAL_2000_S4300807/d18-x01-y05","91")
-useOne("/JADE_OPAL_2000_S4300807/d19-x01-y01","133")
-useOne("/JADE_OPAL_2000_S4300807/d19-x01-y02","133")
-useOne("/JADE_OPAL_2000_S4300807/d19-x01-y03","133")
-useOne("/JADE_OPAL_2000_S4300807/d19-x01-y04","133")
-useOne("/JADE_OPAL_2000_S4300807/d19-x01-y05","133")
-useOne("/JADE_OPAL_2000_S4300807/d20-x01-y01","161")
-useOne("/JADE_OPAL_2000_S4300807/d20-x01-y02","161")
-useOne("/JADE_OPAL_2000_S4300807/d20-x01-y03","161")
-useOne("/JADE_OPAL_2000_S4300807/d20-x01-y04","161")
-useOne("/JADE_OPAL_2000_S4300807/d20-x01-y05","161")
-useOne("/JADE_OPAL_2000_S4300807/d21-x01-y01","172")
-useOne("/JADE_OPAL_2000_S4300807/d21-x01-y02","172")
-useOne("/JADE_OPAL_2000_S4300807/d21-x01-y03","172")
-useOne("/JADE_OPAL_2000_S4300807/d21-x01-y04","172")
-useOne("/JADE_OPAL_2000_S4300807/d21-x01-y05","172")
-useOne("/JADE_OPAL_2000_S4300807/d22-x01-y01","183")
-useOne("/JADE_OPAL_2000_S4300807/d22-x01-y02","183")
-useOne("/JADE_OPAL_2000_S4300807/d22-x01-y03","183")
-useOne("/JADE_OPAL_2000_S4300807/d22-x01-y04","183")
-useOne("/JADE_OPAL_2000_S4300807/d22-x01-y05","183")
-useOne("/JADE_OPAL_2000_S4300807/d23-x01-y01","189")
-useOne("/JADE_OPAL_2000_S4300807/d23-x01-y02","189")
-useOne("/JADE_OPAL_2000_S4300807/d23-x01-y03","189")
-useOne("/JADE_OPAL_2000_S4300807/d23-x01-y04","189")
-useOne("/JADE_OPAL_2000_S4300807/d23-x01-y05","189")
-useOne("/JADE_OPAL_2000_S4300807/d24-x01-y01","35")
-useOne("/JADE_OPAL_2000_S4300807/d24-x01-y02","35")
-useOne("/JADE_OPAL_2000_S4300807/d24-x01-y03","35")
-useOne("/JADE_OPAL_2000_S4300807/d24-x01-y04","35")
-useOne("/JADE_OPAL_2000_S4300807/d25-x01-y01","44")
-useOne("/JADE_OPAL_2000_S4300807/d25-x01-y02","44")
-useOne("/JADE_OPAL_2000_S4300807/d25-x01-y03","44")
-useOne("/JADE_OPAL_2000_S4300807/d25-x01-y04","44")
-useOne("/JADE_OPAL_2000_S4300807/d26-x01-y01","91")
-useOne("/JADE_OPAL_2000_S4300807/d26-x01-y02","91")
-useOne("/JADE_OPAL_2000_S4300807/d26-x01-y03","91")
-useOne("/JADE_OPAL_2000_S4300807/d26-x01-y04","91")
-useOne("/JADE_OPAL_2000_S4300807/d27-x01-y01","133")
-useOne("/JADE_OPAL_2000_S4300807/d27-x01-y02","133")
-useOne("/JADE_OPAL_2000_S4300807/d27-x01-y03","133")
-useOne("/JADE_OPAL_2000_S4300807/d27-x01-y04","133")
-useOne("/JADE_OPAL_2000_S4300807/d28-x01-y01","161")
-useOne("/JADE_OPAL_2000_S4300807/d28-x01-y02","161")
-useOne("/JADE_OPAL_2000_S4300807/d28-x01-y03","161")
-useOne("/JADE_OPAL_2000_S4300807/d28-x01-y04","161")
-useOne("/JADE_OPAL_2000_S4300807/d29-x01-y01","172")
-useOne("/JADE_OPAL_2000_S4300807/d29-x01-y02","172")
-useOne("/JADE_OPAL_2000_S4300807/d29-x01-y03","172")
-useOne("/JADE_OPAL_2000_S4300807/d29-x01-y04","172")
-useOne("/JADE_OPAL_2000_S4300807/d30-x01-y01","183")
-useOne("/JADE_OPAL_2000_S4300807/d30-x01-y02","183")
-useOne("/JADE_OPAL_2000_S4300807/d30-x01-y03","183")
-useOne("/JADE_OPAL_2000_S4300807/d30-x01-y04","183")
-useOne("/JADE_OPAL_2000_S4300807/d31-x01-y01","189")
-useOne("/JADE_OPAL_2000_S4300807/d31-x01-y02","189")
-useOne("/JADE_OPAL_2000_S4300807/d31-x01-y03","189")
-useOne("/JADE_OPAL_2000_S4300807/d31-x01-y04","189")
-
-useOne("/OPAL_2004_S6132243/d01-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d01-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d01-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d01-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d02-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d02-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d02-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d02-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d03-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d03-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d03-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d03-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d04-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d04-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d04-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d04-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d05-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d05-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d05-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d05-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d06-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d06-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d06-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d06-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d07-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d07-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d07-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d07-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d08-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d08-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d08-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d08-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d09-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d09-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d09-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d09-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d10-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d10-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d10-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d10-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d11-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d11-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d11-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d11-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d12-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d12-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d12-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d12-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d13-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d13-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d13-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d13-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d14-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d14-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d14-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d14-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d15-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d15-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d15-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d15-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d16-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d16-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d16-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d16-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d17-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d17-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d17-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d17-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d18-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d18-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d18-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d18-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d19-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d19-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d19-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d19-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d20-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d20-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d20-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d20-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d21-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d21-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d21-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d21-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d22-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d22-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d22-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d22-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d23-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d23-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d23-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d23-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d24-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d24-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d24-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d24-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d25-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d25-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d25-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d25-x01-y04","197")
-useOne("/OPAL_2004_S6132243/d26-x01-y01","91")
-useOne("/OPAL_2004_S6132243/d26-x01-y02","133")
-useOne("/OPAL_2004_S6132243/d26-x01-y03","177")
-useOne("/OPAL_2004_S6132243/d26-x01-y04","197")
-
-merge( "/OPAL_2002_S5361494/d01-x01-y01")
-merge( "/OPAL_2002_S5361494/d01-x01-y02")
-merge( "/OPAL_2002_S5361494/d01-x01-y03")
-merge( "/OPAL_2002_S5361494/d01-x01-y04")
-merge("/DELPHI_2000_S4328825/d01-x01-y01")
-merge("/DELPHI_2000_S4328825/d01-x01-y02")
-merge("/DELPHI_2000_S4328825/d01-x01-y03")
-merge("/DELPHI_2000_S4328825/d01-x01-y04")
-merge("/ALEPH_2004_S5765862/d01-x01-y01")
-useOne("/ALEPH_2004_S5765862/d02-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d03-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d04-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d05-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d06-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d07-x01-y01","196")
-useOne("/ALEPH_2004_S5765862/d08-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d09-x01-y01","206")
-
-useOne("/ALEPH_2004_S5765862/d11-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d12-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d13-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d14-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d15-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d16-x01-y01","196")
-useOne("/ALEPH_2004_S5765862/d17-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d18-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d19-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d20-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d21-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d22-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d23-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d24-x01-y01","196")
-useOne("/ALEPH_2004_S5765862/d25-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d26-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d27-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d28-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d29-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d30-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d31-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d32-x01-y01","196")
-useOne("/ALEPH_2004_S5765862/d33-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d34-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d35-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d36-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d37-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d38-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d39-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d40-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d41-x01-y01","196")
-useOne("/ALEPH_2004_S5765862/d42-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d43-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d44-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d45-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d46-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d47-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d48-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d49-x01-y01","196")
-useOne("/ALEPH_2004_S5765862/d50-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d51-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d54-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d55-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d56-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d57-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d58-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d59-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d60-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d61-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d62-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d63-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d64-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d65-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d66-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d67-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d68-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d69-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d70-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d71-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d72-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d73-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d74-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d75-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d76-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d77-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d78-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d79-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d80-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d81-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d82-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d83-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d84-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d85-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d86-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d87-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d88-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d89-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d90-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d91-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d92-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d93-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d94-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d95-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d96-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d97-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d98-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d99-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d100-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d101-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d102-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d103-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d104-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d105-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d106-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d107-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d108-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d109-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d110-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d111-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d112-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d113-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d114-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d115-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d116-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d117-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d118-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d119-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d120-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d121-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d122-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d123-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d124-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d125-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d126-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d127-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d128-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d129-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d130-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d131-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d132-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d133-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d134-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d135-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d136-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d137-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d138-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d139-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d140-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d141-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d142-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d143-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d144-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d145-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d146-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d147-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d148-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d149-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d150-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d151-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d152-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d153-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d154-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d155-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d156-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d157-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d158-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d159-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d160-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d161-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d162-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d163-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d164-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d165-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d166-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d167-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d168-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d169-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d170-x01-y01","189")
-
-useOne("/ALEPH_2004_S5765862/d172-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d173-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d174-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d175-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d176-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d177-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d178-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d179-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d180-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d181-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d182-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d183-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d184-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d185-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d186-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d187-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d188-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d189-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d190-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d191-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d192-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d193-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d194-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d195-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d196-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d197-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d198-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d199-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d200-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d201-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d202-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d203-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d204-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d205-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d206-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d207-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d208-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d209-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d210-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d211-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d212-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d213-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d214-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d215-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d216-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d217-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d218-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d219-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d220-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d221-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d222-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d223-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d224-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d225-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d226-x01-y01","206")
-useOne("/ALEPH_2004_S5765862/d227-x01-y01","91")
-useOne("/ALEPH_2004_S5765862/d228-x01-y01","133")
-useOne("/ALEPH_2004_S5765862/d229-x01-y01","161")
-useOne("/ALEPH_2004_S5765862/d230-x01-y01","172")
-useOne("/ALEPH_2004_S5765862/d231-x01-y01","183")
-useOne("/ALEPH_2004_S5765862/d232-x01-y01","189")
-useOne("/ALEPH_2004_S5765862/d233-x01-y01","200")
-useOne("/ALEPH_2004_S5765862/d234-x01-y01","206")
-
-# hadron multiplicities
-useOne("/PDG_HADRON_MULTIPLICITIES/d01-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d02-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d03-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d04-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d05-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d06-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d07-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d08-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d09-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d13-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d15-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d17-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d18-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d19-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d20-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d21-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d22-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d23-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d25-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d31-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d38-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d39-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d40-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d44-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d45-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d46-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d47-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d48-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d49-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d50-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d51-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d53-x01-y01","10")
-useOne("/PDG_HADRON_MULTIPLICITIES/d54-x01-y01","10")
-
-useOne("/PDG_HADRON_MULTIPLICITIES/d01-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d02-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d03-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d04-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d05-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d06-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d07-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d08-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d09-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d13-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d15-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d18-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d19-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d20-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d21-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d22-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d31-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d33-x01-y01","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d34-x01-y01","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d38-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d39-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d44-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d46-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d47-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d48-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d50-x01-y02","35")
-useOne("/PDG_HADRON_MULTIPLICITIES/d51-x01-y02","35")
-
-useOne("/PDG_HADRON_MULTIPLICITIES/d01-x01-y03","91")
-useOne("/PDG_HADRON_MULTIPLICITIES/d02-x01-y03","91")
-useOne("/PDG_HADRON_MULTIPLICITIES/d03-x01-y03","91")
-useOne("/PDG_HADRON_MULTIPLICITIES/d04-x01-y03","91")
-useOne("/PDG_HADRON_MULTIPLICITIES/d05-x01-y03","91")
-useOne("/PDG_HADRON_MULTIPLICITIES/d06-x01-y03","91")
-useOne("/PDG_HADRON_MULTIPLICITIES/d07-x01-y03","91")
-useOne("/PDG_HADRON_MULTIPLICITIES/d08-x01-y03","91")
-useOne("/PDG_HADRON_MULTIPLICITIES/d09-x01-y03","91")
-useOne("/PDG_HADRON_MULTIPLICITIES/d10-x01-y03","91")
-useOne("/PDG_HADRON_MULTIPLICITIES/d11-x01-y03","91")
-useOne("/PDG_HADRON_MULTIPLICITIES/d12-x01-y03","91")
-useOne("/PDG_HADRON_MULTIPLICITIES/d13-x01-y03","91")
-useOne("/PDG_HADRON_MULTIPLICITIES/d14-x01-y03","91")
-useOne("/PDG_HADRON_MULTIPLICITIES/d15-x01-y03","91")
-useOne("/PDG_HADRON_MULTIPLICITIES/d16-x01-y03","91")
-useOne("/PDG_HADRON_MULTIPLICITIES/d17-x01-y03","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-y01","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")
-
+# UA5_1989_S1926373
+useOne("/UA5_1989_S1926373/d01-x01-y01","200")
+useOne("/UA5_1989_S1926373/d02-x01-y01","900")
+useOne("/UA5_1989_S1926373/d03-x01-y01","200")
+useOne("/UA5_1989_S1926373/d04-x01-y01","200")
+useOne("/UA5_1989_S1926373/d05-x01-y01","200")
+useOne("/UA5_1989_S1926373/d06-x01-y01","200")
+useOne("/UA5_1989_S1926373/d07-x01-y01","900")
+useOne("/UA5_1989_S1926373/d08-x01-y01","900")
+useOne("/UA5_1989_S1926373/d09-x01-y01","900")
+useOne("/UA5_1989_S1926373/d10-x01-y01","900")
+useOne("/UA5_1989_S1926373/d11-x01-y01","200")
+useOne("/UA5_1989_S1926373/d12-x01-y01","900")
+# UA5_1988_S1867512
+useOne("/UA5_1988_S1867512/d02-x01-y01","200")
+useOne("/UA5_1988_S1867512/d02-x01-y02","546")
+useOne("/UA5_1988_S1867512/d02-x01-y03","900")
+useOne("/UA5_1988_S1867512/d03-x01-y01","200")
+useOne("/UA5_1988_S1867512/d03-x01-y02","546")
+useOne("/UA5_1988_S1867512/d03-x01-y03","900")
+# UA5_1986_S1583476
+useOne("/UA5_1986_S1583476/d01-x01-y01","200")
+useOne("/UA5_1986_S1583476/d01-x01-y02","200")
+useOne("/UA5_1986_S1583476/d01-x01-y03","900")
+useOne("/UA5_1986_S1583476/d01-x01-y04","900")
+useOne("/UA5_1986_S1583476/d02-x01-y01","200")
+useOne("/UA5_1986_S1583476/d02-x01-y02","200")
+useOne("/UA5_1986_S1583476/d02-x01-y03","200")
+useOne("/UA5_1986_S1583476/d02-x01-y04","200")
+useOne("/UA5_1986_S1583476/d02-x01-y05","200")
+useOne("/UA5_1986_S1583476/d02-x01-y06","200")
+useOne("/UA5_1986_S1583476/d03-x01-y01","900")
+useOne("/UA5_1986_S1583476/d03-x01-y02","900")
+useOne("/UA5_1986_S1583476/d03-x01-y03","900")
+useOne("/UA5_1986_S1583476/d03-x01-y04","900")
+useOne("/UA5_1986_S1583476/d03-x01-y05","900")
+useOne("/UA5_1986_S1583476/d03-x01-y06","900")
+useOne("/UA5_1986_S1583476/d03-x01-y07","900")
+useOne("/UA5_1986_S1583476/d03-x01-y08","900")
+useOne("/UA5_1986_S1583476/d03-x01-y09","900")
+# UA1_1990_S2044935
+useOne("/UA1_1990_S2044935/d01-x01-y01","200")
+useOne("/UA1_1990_S2044935/d01-x01-y02","500")
+useOne("/UA1_1990_S2044935/d01-x01-y03","900")
+useOne("/UA1_1990_S2044935/d02-x01-y01","200")
+useOne("/UA1_1990_S2044935/d02-x01-y02","500")
+useOne("/UA1_1990_S2044935/d02-x01-y03","900")
+useOne("/UA1_1990_S2044935/d03-x01-y01","900")
+useOne("/UA1_1990_S2044935/d04-x01-y01","900")
+useOne("/UA1_1990_S2044935/d05-x01-y01","900")
+useOne("/UA1_1990_S2044935/d06-x01-y01","200")
+useOne("/UA1_1990_S2044935/d07-x01-y01","900")
+useOne("/UA1_1990_S2044935/d08-x01-y01","63")
+useOne("/UA1_1990_S2044935/d09-x01-y01","200")
+useOne("/UA1_1990_S2044935/d10-x01-y01","500")
+useOne("/UA1_1990_S2044935/d11-x01-y01","900")
+useOne("/UA1_1990_S2044935/d12-x01-y01","200")
+useOne("/UA1_1990_S2044935/d12-x01-y02","500")
+useOne("/UA1_1990_S2044935/d12-x01-y03","900")
+# SFM_1984_S1178091
+useOne("/SFM_1984_S1178091/d01-x01-y01","30")
+useOne("/SFM_1984_S1178091/d01-x01-y02","44")
+useOne("/SFM_1984_S1178091/d01-x01-y03","53")
+useOne("/SFM_1984_S1178091/d01-x01-y04","63")
+useOne("/SFM_1984_S1178091/d02-x01-y01","30")
+useOne("/SFM_1984_S1178091/d02-x01-y02","44")
+useOne("/SFM_1984_S1178091/d02-x01-y03","53")
+useOne("/SFM_1984_S1178091/d02-x01-y04","63")
# Choose output file
-name = args[0]+".aida"
-out = open(name, "w")
-## Write out merged histos
-out.write('<?xml version="1.0" encoding="ISO-8859-1" ?>\n')
-out.write('<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">\n')
-out.write('<aida version="3.3">\n')
-out.write(' <implementation version="1.1" package="FreeHEP"/>\n')
-for hpath, h in sorted(outhistos.iteritems()):
- logging.debug("hpath = %s" % hpath)
- out.write(h.asAIDA() + "\n\n")
-out.write('</aida>\n')
-
+name = args[0]+".yoda"
+# output the yoda file
+yoda.writeYODA(outhistos,name)
sys.exit(0)
diff --git a/Tests/python/merge-Star b/Tests/python/merge-Star
--- a/Tests/python/merge-Star
+++ b/Tests/python/merge-Star
@@ -1,237 +1,167 @@
#! /usr/bin/env python
-import lighthisto
import logging
import sys
if sys.version_info[:3] < (2,4,0):
print "rivet scripts require Python version >= 2.4.0... exiting"
sys.exit(1)
-import os, copy, re
-from math import sqrt
-
-## Try to load faster but non-standard cElementTree module
-try:
- import xml.etree.cElementTree as ET
-except ImportError:
- try:
- import cElementTree as ET
- except ImportError:
- try:
- import xml.etree.ElementTree as ET
- except:
- sys.stderr.write("Can't load the ElementTree XML parser: please install it!\n")
- sys.exit(1)
+import os, yoda
# #############################################
def fillAbove(desthisto, sourcehistosbyptmin):
- for i,b in enumerate(desthisto.getBins()):
- ## Fill bins with pT-ordered histos (so that 'highest always wins')
- for ptmin, h in sorted(sourcehistosbyptmin.iteritems()):
- newb = h.getBin(i)
- if newb.xlow >= ptmin:
- b.val = newb.val
- b.errplus = newb.errplus
- b.errminus = newb.errminus
- b._focus= newb._focus
+ pthigh= 1e100
+ ptlow =-1e100
+ for pt, h in sorted(sourcehistosbyptmin.iteritems(),reverse=True):
+ ptlow=pt
+ if(type(desthisto)==yoda.core.Scatter2D) :
+ for i in range(0,h.numPoints) :
+ lowEdge = h.points[i].x-h.points[i].xErrs.minus
+ if( lowEdge >= ptlow and
+ lowEdge < pthigh ) :
+ desthisto.addPoint(h.points[i])
+ elif(type(desthisto)==yoda.core.Profile1D) :
+ for i in range(0,h.numBins) :
+ if(h.bins[i].lowEdge >= ptlow and
+ h.bins[i].lowEdge < pthigh ) :
+ desthisto.bins[i] += h.bins[i]
+ elif(type(desthisto)==yoda.core.Histo1D) :
+ for i in range(0,h.numBins) :
+ if(h.bins[i].lowEdge >= ptlow and
+ h.bins[i].lowEdge < pthigh ) :
+ desthisto.bins[i] += h.bins[i]
+ else :
+ logging.error("Can't merge %s, unknown type" % desthisto.path)
+ sys.exit(1)
+ pthigh=pt
def mergeByPt(hpath, sqrts):
global inhistos
global outhistos
try:
fillAbove(outhistos[hpath], inhistos[hpath][float(sqrts)])
except:
pass
def useOnePt(hpath, sqrts, ptmin):
global inhistos
global outhistos
try:
## Find best pT_min match
ptmins = inhistos[hpath][float(sqrts)].keys()
closest_ptmin = None
for ptm in ptmins:
if closest_ptmin is None or \
abs(ptm-float(ptmin)) < abs(closest_ptmin-float(ptmin)):
closest_ptmin = ptm
if closest_ptmin != float(ptmin):
logging.warning("Inexact match for requested pTmin=%s: " % ptmin + \
"using pTmin=%e instead" % closest_ptmin)
outhistos[hpath] = inhistos[hpath][float(sqrts)][closest_ptmin]
except:
pass
# #######################################
if __name__ == "__main__":
import logging
from optparse import OptionParser, OptionGroup
parser = OptionParser(usage="%prog name")
verbgroup = OptionGroup(parser, "Verbosity control")
verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
default=logging.INFO, help="print debug (very verbose) messages")
verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
default=logging.INFO, help="be very quiet")
parser.add_option_group(verbgroup)
(opts, args) = parser.parse_args()
logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
-
- ## Prefix used in dat file headers
- headerprefix = "# "
-
-
## Check args
if len(args) < 1:
logging.error("Must specify at least the name of the files")
sys.exit(1)
-aidafiles=["-UE.aida","-Jets-1.aida","-Jets-2.aida","-Jets-3.aida","-Jets-4.aida"]
+yodafiles=["-UE.yoda","-Jets-1.yoda","-Jets-2.yoda","-Jets-3.yoda","-Jets-4.yoda"]
## Get histos
inhistos = {}
outhistos={}
weights = {}
-for f in aidafiles:
+for f in yodafiles:
file=args[0]+f
if(file.find("-UE")>0) :
sqrts=200
ptmin=0.
elif(file.find("-Jets-1")>0) :
sqrts=200
ptmin=2.
elif(file.find("-Jets-2")>0) :
sqrts=200
ptmin=5.
elif(file.find("-Jets-3")>0) :
sqrts=200
ptmin=26.
elif(file.find("-Jets-4")>0) :
sqrts=200
ptmin=15.
if not os.access(file, os.R_OK):
logging.error("%s can not be read" % file)
break
try:
- tree = ET.parse(file)
+ aos = yoda.read(file)
except:
- logging.error("%s can not be parsed as XML" % file)
+ logging.error("%s can not be parsed as YODA" % file)
break
- tree = ET.parse(file)
- ## Get histos from this AIDA file
- for dps in tree.findall("dataPointSet"):
- h = lighthisto.Histo.fromDPS(dps)
- if(h.fullPath().find("6870392")>0 or h.fullPath().find("HELEN")>0) :
- if not inhistos.has_key(h.fullPath()):
- inhistos[h.fullPath()] = {}
- tmpE = inhistos[h.fullPath()]
+ ## Get histos from this YODA file
+ for aopath, ao in aos.iteritems() :
+ if(aopath.find("6870392")>0 or aopath.find("HELEN")>0) :
+ if not inhistos.has_key(aopath):
+ inhistos[aopath] = {}
+ tmpE = inhistos[aopath]
if not tmpE.has_key(sqrts):
tmpE[sqrts] = {}
tmpP = tmpE[sqrts]
if not tmpP.has_key(ptmin):
- tmpP[ptmin] = h
+ tmpP[ptmin] = ao
else:
raise Exception("A set with ptmin = %s already exists" % ( ptmin))
else :
- outhistos[h.fullPath()] = h
-
-# aidafiles=["-Run-II-Jets-8.aida","-Run-II-Jets-9.aida","-Run-II-Jets-10.aida",\
-# "-Run-I-Jets-6.aida","-Run-I-Jets-7.aida","-Run-I-Jets-8.aida"]
-
-# for f in aidafiles:
-# file=args[0]+f
-# if(file.find("Run-II-Jets-8")>0) :
-# sqrts=1960
-# ptmin=0.150
-# elif(file.find("Run-II-Jets-9")>0) :
-# sqrts=1960
-# ptmin=0.600
-# elif(file.find("Run-II-Jets-10")>0) :
-# sqrts=1960
-# ptmin=1.000
-# elif(file.find("Run-I-Jets-6")>0) :
-# sqrts=1800
-# ptmin=0.150
-# elif(file.find("Run-I-Jets-7")>0) :
-# sqrts=1800
-# ptmin=0.5
-# elif(file.find("Run-I-Jets-8")>0) :
-# sqrts=1800
-# ptmin=0.8
-# if not os.access(file, os.R_OK):
-# logging.error("%s can not be read" % file)
-# break
-# try:
-# tree = ET.parse(file)
-# except:
-# logging.error("%s can not be parsed as XML" % file)
-# break
-# tree = ET.parse(file)
-# ## Get histos from this AIDA file
-# for dps in tree.findall("dataPointSet"):
-# h = lighthisto.Histo.fromDPS(dps)
-# if(h.fullPath().find("8566488")>0 or h.fullPath().find("8320160")>0) :
-# if not inhistos.has_key(h.fullPath()):
-# inhistos[h.fullPath()] = {}
-# tmpE = inhistos[h.fullPath()]
-# if not tmpE.has_key(sqrts):
-# tmpE[sqrts] = {}
-# tmpP = tmpE[sqrts]
-# if not tmpP.has_key(ptmin):
-# tmpP[ptmin] = h
-# else:
-# raise Exception("A set with ptmin = %s already exists" % ( ptmin))
-# elif(h.fullPath().find("8093652")>0 or h.fullPath().find("3418421")>0 or
-# h.fullPath().find("4266730")>0) :
-# if not inhistos.has_key(h.fullPath()):
-# inhistos[h.fullPath()] = {}
-# tmpE = inhistos[h.fullPath()]
-# if not tmpE.has_key(sqrts):
-# tmpE[sqrts] = {}
-# tmpP = tmpE[sqrts]
-# if not tmpP.has_key(1000.*ptmin):
-# tmpP[1000.*ptmin] = h
-# else:
-# raise Exception("A set with ptmin = %s already exists" % ( 1000.*ptmin))
-
-
-
-
+ outhistos[aopath] = ao
## Make empty output histos if needed
for hpath,hsets in inhistos.iteritems():
if( (hpath.find("6870392")>0 and hpath.find("d02-x01-y01" )>0 ) or
hpath.find("HELEN")>0 ) :
- workhisto = copy.deepcopy(hsets.values()[0].values()[0])
- outhistos[hpath] = workhisto
- ## Empty the bin set for histos which we're going to merge
- for b in outhistos[hpath]:
- b.val = 0
- b.errplus = 0
- b.errminus = 0
- b._focus= None
-
+ if(type(hsets.values()[0].values()[0])==yoda.core.Scatter2D) :
+ outhistos[hpath] = yoda.core.Scatter2D(hsets.values()[0].values()[0].path,
+ hsets.values()[0].values()[0].title)
+ elif(type(hsets.values()[0].values()[0])==yoda.core.Profile1D) :
+ outhistos[hpath] = yoda.core.Profile1D(hsets.values()[0].values()[0].path,
+ hsets.values()[0].values()[0].title)
+ for i in range(0,hsets.values()[0].values()[0].numBins) :
+ outhistos[hpath].addBin(hsets.values()[0].values()[0].bins[i].lowEdge,
+ hsets.values()[0].values()[0].bins[i].highEdge)
+ elif(type(hsets.values()[0].values()[0])==yoda.core.Histo1D) :
+ outhistos[hpath] = yoda.core.Histo1D(hsets.values()[0].values()[0].path,
+ hsets.values()[0].values()[0].title)
+ for i in range(0,hsets.values()[0].values()[0].numBins) :
+ outhistos[hpath].addBin(hsets.values()[0].values()[0].bins[i].lowEdge,
+ hsets.values()[0].values()[0].bins[i].highEdge)
+ else :
+ logging.error("Histogram %s is of unknown type" % hpath)
+ print hpath,type(hsets.values()[0].values()[0])
+ sys.exit(1)
useOnePt("/STAR_2006_S6870392/d01-x01-y01","200","2")
mergeByPt("/STAR_2006_S6870392/d02-x01-y01","200")
mergeByPt("/STAR_2009_UE_HELEN/d01-x01-y01","200")
mergeByPt("/STAR_2009_UE_HELEN/d02-x01-y01","200")
mergeByPt("/STAR_2009_UE_HELEN/d03-x01-y01","200")
-
# Choose output file
-name = args[0]+".aida"
-out = open(name, "w")
-## Write out merged histos
-out.write('<?xml version="1.0" encoding="ISO-8859-1" ?>\n')
-out.write('<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">\n')
-out.write('<aida version="3.3">\n')
-out.write(' <implementation version="1.1" package="FreeHEP"/>\n')
-for hpath, h in sorted(outhistos.iteritems()):
- logging.debug("hpath = %s" % hpath)
- out.write(h.asAIDA() + "\n\n")
-out.write('</aida>\n')
-
+name = args[0]+".yoda"
+print "write to ",name
+yoda.writeYODA(outhistos,name)
sys.exit(0)
diff --git a/Tests/python/merge-TVT-EW b/Tests/python/merge-TVT-EW
--- a/Tests/python/merge-TVT-EW
+++ b/Tests/python/merge-TVT-EW
@@ -1,107 +1,59 @@
#! /usr/bin/env python
-import lighthisto
import logging
import sys
-import os, copy, re
+import os, yoda
"""%prog
-Script for merging aida files
+Script for merging yoda files
"""
import sys
if sys.version_info[:3] < (2,4,0):
print "rivet scripts require Python version >= 2.4.0... exiting"
sys.exit(1)
-## Try to load faster but non-standard cElementTree module
-try:
- import xml.etree.cElementTree as ET
-except ImportError:
- try:
- import cElementTree as ET
- except ImportError:
- try:
- import xml.etree.ElementTree as ET
- except:
- sys.stderr.write("Can't load the ElementTree XML parser: please install it!\n")
- sys.exit(1)
-
if __name__ == "__main__":
import logging
from optparse import OptionParser, OptionGroup
parser = OptionParser(usage="%prog aidafile aidafile2 [...]")
parser.add_option("-o", "--out", dest="OUTFILE", default="-")
- parser.add_option("--append", dest="APPEND_OUTPUT", action="store_true", default=False)
verbgroup = OptionGroup(parser, "Verbosity control")
verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
default=logging.INFO, help="print debug (very verbose) messages")
verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
default=logging.INFO, help="be very quiet")
parser.add_option_group(verbgroup)
(opts, args) = parser.parse_args()
logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
- ## Prefix used in dat file headers
- headerprefix = "# "
-
## Check args
if len(args) < 1:
logging.error("Must specify at least one AIDA histogram file")
sys.exit(1)
## Get histos
outhistos={}
for file in args:
if not os.access(file, os.R_OK):
logging.error("%s can not be read" % file)
break
try:
- tree = ET.parse(file)
+ aos = yoda.read(file)
except:
- logging.error("%s can not be parsed as XML" % file)
+ logging.error("%s can not be parsed as yoda" % file)
break
- tree = ET.parse(file)
- ## Get histos from this AIDA file
- for dps in tree.findall("dataPointSet"):
- h = lighthisto.Histo.fromDPS(dps)
- if(h.fullPath().find("D0_2010_S8821313")>0) :
- if(h.fullPath().find("d01")>0 and file.find("-e")>0) :
- outhistos[h.fullPath()] = h
- elif(h.fullPath().find("d02")>0 and file.find("-mu")>0) :
- outhistos[h.fullPath()] = h
+ ## Get histos from this YODA file
+ for aopath, ao in aos.iteritems() :
+ if(aopath.find("D0_2010_S8821313")>0) :
+ if(aopath.find("d01")>0 and file.find("-e")>0) :
+ outhistos[aopath] = ao
+ elif(aopath.find("d02")>0 and file.find("-mu")>0) :
+ outhistos[aopath] = ao
else :
- outhistos[h.fullPath()] = h
+ outhistos[aopath] = ao
- ## Choose output file
- out = None
- if opts.OUTFILE == "-":
- out = sys.stdout
- else:
- if opts.APPEND_OUTPUT:
- out = open(opts.OUTFILE, "a")
- else:
- out = open(opts.OUTFILE, "w")
-
-
- # Choose output file
- out = None
- if opts.OUTFILE == "-":
- out = sys.stdout
- else:
- if opts.APPEND_OUTPUT:
- out = open(opts.OUTFILE, "a")
- else:
- out = open(opts.OUTFILE, "w")
- ## Write out merged histos
- out.write('<?xml version="1.0" encoding="ISO-8859-1" ?>\n')
- out.write('<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">\n')
- out.write('<aida version="3.3">\n')
- out.write(' <implementation version="1.1" package="FreeHEP"/>\n')
- for hpath, h in sorted(outhistos.iteritems()):
- logging.debug("hpath = %s" % hpath)
- out.write(h.asAIDA() + "\n\n")
- out.write('</aida>\n')
-
+ # output the yoda file
+ yoda.writeYODA(outhistos,opts.OUTFILE)
sys.exit(0)
diff --git a/Tests/python/merge-TVT-Energy b/Tests/python/merge-TVT-Energy
--- a/Tests/python/merge-TVT-Energy
+++ b/Tests/python/merge-TVT-Energy
@@ -1,188 +1,144 @@
#! /usr/bin/env python
-import lighthisto
import logging
import sys
if sys.version_info[:3] < (2,4,0):
print "rivet scripts require Python version >= 2.4.0... exiting"
sys.exit(1)
-import os, copy, re
-from math import sqrt
-
-## Try to load faster but non-standard cElementTree module
-try:
- import xml.etree.cElementTree as ET
-except ImportError:
- try:
- import cElementTree as ET
- except ImportError:
- try:
- import xml.etree.ElementTree as ET
- except:
- sys.stderr.write("Can't load the ElementTree XML parser: please install it!\n")
- sys.exit(1)
+import os, yoda
# #############################################
def fillAbove(desthisto, sourcehistosbyptmin):
- for i,b in enumerate(desthisto.getBins()):
- ## Fill bins with pT-ordered histos (so that 'highest always wins')
- for ptmin, h in sorted(sourcehistosbyptmin.iteritems()):
- newb = h.getBin(i)
- if newb.xlow >= ptmin:
- b.val = newb.val
- b.errplus = newb.errplus
- b.errminus = newb.errminus
- b._focus= newb._focus
+ pthigh= 1e100
+ ptlow =-1e100
+ for pt, h in sorted(sourcehistosbyptmin.iteritems(),reverse=True):
+ ptlow=pt
+ for i in range(0,h.numBins) :
+ if(h.bins[i].lowEdge >= ptlow and
+ h.bins[i].lowEdge < pthigh ) :
+ desthisto.bins[i] += h.bins[i]
+ pthigh=pt
def mergeByPt(hpath, sqrts):
global inhistos
global outhistos
try:
fillAbove(outhistos[hpath], inhistos[hpath][float(sqrts)])
except:
pass
-def useOnePt(hpath, sqrts, ptmin):
- global inhistos
- global outhistos
- try:
- ## Find best pT_min match
- ptmins = inhistos[hpath][float(sqrts)].keys()
- closest_ptmin = None
- for ptm in ptmins:
- if closest_ptmin is None or \
- abs(ptm-float(ptmin)) < abs(closest_ptmin-float(ptmin)):
- closest_ptmin = ptm
- if closest_ptmin != float(ptmin):
- logging.warning("Inexact match for requested pTmin=%s: " % ptmin + \
- "using pTmin=%e instead" % closest_ptmin)
- outhistos[hpath] = inhistos[hpath][float(sqrts)][closest_ptmin]
- except:
- pass
-
# #######################################
if __name__ == "__main__":
import logging
from optparse import OptionParser, OptionGroup
parser = OptionParser(usage="%prog name")
verbgroup = OptionGroup(parser, "Verbosity control")
verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
default=logging.INFO, help="print debug (very verbose) messages")
verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
default=logging.INFO, help="be very quiet")
parser.add_option_group(verbgroup)
(opts, args) = parser.parse_args()
logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
-
- ## Prefix used in dat file headers
- headerprefix = "# "
-
-
## Check args
if len(args) < 1:
logging.error("Must specify at least the name of the files")
sys.exit(1)
-aidafiles=["-Run-II-UE.aida","-Run-II-Jets-0.aida",
- "-300-UE.aida" ,"-300-Jets-1.aida" ,
- "-900-UE.aida" ,"-900-Jets-1.aida" ]
+yodafiles=["-Run-II-UE.yoda","-Run-II-Jets-0.yoda",
+ "-300-UE.yoda" ,"-300-Jets-1.yoda" ,
+ "-900-UE.yoda" ,"-900-Jets-1.yoda" ]
## Get histos
inhistos = {}
outhistos={}
weights = {}
-for f in aidafiles:
+for f in yodafiles:
file=args[0]+f
if(file.find("Run-II-UE")>0) :
sqrts=1960
ptmin=0.
elif(file.find("Run-II-Jets-0")>0) :
sqrts=1960
ptmin=15
elif(file.find("300-UE")>0) :
sqrts=300
ptmin=0.
elif(file.find("300-Jets-1")>0) :
sqrts=300
ptmin=6.
elif(file.find("900-UE")>0) :
sqrts=900
ptmin=0.
elif(file.find("900-Jets-1")>0) :
sqrts=900
ptmin=10.
if not os.access(file, os.R_OK):
logging.error("%s can not be read" % file)
break
try:
- tree = ET.parse(file)
+ aos = yoda.read(file)
except:
- logging.error("%s can not be parsed as XML" % file)
+ logging.error("%s can not be parsed as YODA" % file)
break
- tree = ET.parse(file)
- ## Get histos from this AIDA file
- for dps in tree.findall("dataPointSet"):
- h = lighthisto.Histo.fromDPS(dps)
- # di-jet decorrelations
- # jet shapes
- if(h.fullPath().find("NOTE10874")<0) : continue
- if not inhistos.has_key(h.fullPath()):
- inhistos[h.fullPath()] = {}
- tmpE = inhistos[h.fullPath()]
+ ## Get histos from this YODA file
+ for aopath, ao in aos.iteritems() :
+ if(aopath.find("NOTE10874")<0) : continue
+ if not inhistos.has_key(aopath):
+ inhistos[aopath] = {}
+ tmpE = inhistos[aopath]
if not tmpE.has_key(sqrts):
tmpE[sqrts] = {}
tmpP = tmpE[sqrts]
if not tmpP.has_key(ptmin):
- tmpP[ptmin] = h
+ tmpP[ptmin] = ao
else:
raise Exception("A set with ptmin = %s already exists" % ( ptmin))
## Make empty output histos if needed
for hpath,hsets in inhistos.iteritems():
- workhisto = copy.deepcopy(hsets.values()[0].values()[0])
- outhistos[hpath] = workhisto
- ## Empty the bin set for histos which we're going to merge
- for b in outhistos[hpath]:
- b.val = 0
- b.errplus = 0
- b.errminus = 0
- b._focus= None
+ if(type(hsets.values()[0].values()[0])==yoda.core.Scatter2D) :
+ outhistos[hpath] = yoda.core.Scatter2D(hsets.values()[0].values()[0].path,
+ hsets.values()[0].values()[0].title)
+ elif(type(hsets.values()[0].values()[0])==yoda.core.Profile1D) :
+ outhistos[hpath] = yoda.core.Profile1D(hsets.values()[0].values()[0].path,
+ hsets.values()[0].values()[0].title)
+ for i in range(0,hsets.values()[0].values()[0].numBins) :
+ outhistos[hpath].addBin(hsets.values()[0].values()[0].bins[i].lowEdge,
+ hsets.values()[0].values()[0].bins[i].highEdge)
+ else :
+ logging.error("Histogram %s is of unknown type" % hpath)
+ sys.exit(1)
## Field analysis
logging.info("Processing CDF_2012_NOTE10874")
## Angular distributions in different pT bins
mergeByPt("/CDF_2012_NOTE10874/d01-x01-y01", "300")
mergeByPt("/CDF_2012_NOTE10874/d01-x01-y02", "900")
mergeByPt("/CDF_2012_NOTE10874/d01-x01-y03","1960")
mergeByPt("/CDF_2012_NOTE10874/d02-x01-y01", "300")
mergeByPt("/CDF_2012_NOTE10874/d02-x01-y02", "900")
mergeByPt("/CDF_2012_NOTE10874/d02-x01-y03","1960")
mergeByPt("/CDF_2012_NOTE10874/d03-x01-y01", "300")
mergeByPt("/CDF_2012_NOTE10874/d03-x01-y02", "900")
mergeByPt("/CDF_2012_NOTE10874/d03-x01-y03","1960")
# Choose output file
for i in range(1,4) :
if(i==1) :
- name = args[0]+"-300-Energy.aida"
+ name = args[0]+"-300-Energy.yoda"
elif(i==2) :
- name = args[0]+"-900-Energy.aida"
+ name = args[0]+"-900-Energy.yoda"
elif(i==3) :
- name = args[0]+"-1960-Energy.aida"
- out = open(name, "w")
- ## Write out merged histos
- out.write('<?xml version="1.0" encoding="ISO-8859-1" ?>\n')
- out.write('<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">\n')
- out.write('<aida version="3.3">\n')
- out.write(' <implementation version="1.1" package="FreeHEP"/>\n')
+ name = args[0]+"-1960-Energy.yoda"
+ temphistos={}
for hpath, h in sorted(outhistos.iteritems()):
if(hpath.find("y0"+str(i))>0) :
- logging.debug("hpath = %s" % hpath)
- out.write(h.asAIDA() + "\n\n")
- out.write('</aida>\n')
+ temphistos[hpath] = h
+ yoda.writeYODA(temphistos,name)
sys.exit(0)
diff --git a/Tests/python/merge-TVT-Jets b/Tests/python/merge-TVT-Jets
--- a/Tests/python/merge-TVT-Jets
+++ b/Tests/python/merge-TVT-Jets
@@ -1,515 +1,505 @@
#! /usr/bin/env python
-import lighthisto
import logging
import sys
if sys.version_info[:3] < (2,4,0):
print "rivet scripts require Python version >= 2.4.0... exiting"
sys.exit(1)
-import os, copy, re
-from math import sqrt
-
-## Try to load faster but non-standard cElementTree module
-try:
- import xml.etree.cElementTree as ET
-except ImportError:
- try:
- import cElementTree as ET
- except ImportError:
- try:
- import xml.etree.ElementTree as ET
- except:
- sys.stderr.write("Can't load the ElementTree XML parser: please install it!\n")
- sys.exit(1)
+import os, yoda
# #############################################
def fillAbove(desthisto, sourcehistosbyptmin):
- for i,b in enumerate(desthisto.getBins()):
- ## Fill bins with pT-ordered histos (so that 'highest always wins')
- for ptmin, h in sorted(sourcehistosbyptmin.iteritems()):
- newb = h.getBin(i)
- if newb.xlow >= ptmin:
- b.val = newb.val
- b.errplus = newb.errplus
- b.errminus = newb.errminus
- b._focus= newb._focus
+ pthigh= 1e100
+ ptlow =-1e100
+ for pt, h in sorted(sourcehistosbyptmin.iteritems(),reverse=True):
+ ptlow=pt
+ if(type(desthisto)==yoda.core.Scatter2D) :
+ for i in range(0,h.numPoints) :
+ lowEdge = h.points[i].x-h.points[i].xErrs.minus
+ if( lowEdge >= ptlow and
+ lowEdge < pthigh ) :
+ desthisto.addPoint(h.points[i])
+ elif(type(desthisto)==yoda.core.Profile1D) :
+ for i in range(0,h.numBins) :
+ if(h.bins[i].lowEdge >= ptlow and
+ h.bins[i].lowEdge < pthigh ) :
+ desthisto.bins[i] += h.bins[i]
+ elif(type(desthisto)==yoda.core.Histo1D) :
+ for i in range(0,h.numBins) :
+ if(h.bins[i].lowEdge >= ptlow and
+ h.bins[i].lowEdge < pthigh ) :
+ desthisto.bins[i] += h.bins[i]
+ else :
+ logging.error("Can't merge %s, unknown type" % desthisto.path)
+ sys.exit(1)
+ pthigh=pt
def mergeByPt(hpath, sqrts):
global inhistos
global outhistos
try:
fillAbove(outhistos[hpath], inhistos[hpath][float(sqrts)])
except:
pass
def useOnePt(hpath, sqrts, ptmin):
global inhistos
global outhistos
try:
## Find best pT_min match
ptmins = inhistos[hpath][float(sqrts)].keys()
closest_ptmin = None
for ptm in ptmins:
if closest_ptmin is None or \
abs(ptm-float(ptmin)) < abs(closest_ptmin-float(ptmin)):
closest_ptmin = ptm
if closest_ptmin != float(ptmin):
logging.warning("Inexact match for requested pTmin=%s: " % ptmin + \
"using pTmin=%e instead" % closest_ptmin)
outhistos[hpath] = inhistos[hpath][float(sqrts)][closest_ptmin]
except:
pass
# #######################################
if __name__ == "__main__":
import logging
from optparse import OptionParser, OptionGroup
parser = OptionParser(usage="%prog name")
verbgroup = OptionGroup(parser, "Verbosity control")
verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
default=logging.INFO, help="print debug (very verbose) messages")
verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
default=logging.INFO, help="be very quiet")
parser.add_option_group(verbgroup)
(opts, args) = parser.parse_args()
logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
-
- ## Prefix used in dat file headers
- headerprefix = "# "
-
-
## Check args
if len(args) < 1:
logging.error("Must specify at least the name of the files")
sys.exit(1)
-aidafiles=["-Run-II-UE.aida" ,"-Run-II-Jets-1.aida","-Run-II-Jets-2.aida",\
- "-Run-II-Jets-3.aida","-Run-II-Jets-4.aida","-Run-II-Jets-5.aida",\
- "-Run-II-Jets-6.aida","-Run-II-Jets-7.aida",\
- "-Run-I-UE.aida" ,"-Run-I-Jets-1.aida","-Run-I-Jets-2.aida",\
- "-Run-I-Jets-3.aida","-Run-I-Jets-4.aida","-Run-I-Jets-5.aida",\
- "-630-UE.aida" ,"-630-Jets-1.aida" ,"-630-Jets-2.aida" ,\
- "-630-Jets-3.aida", "-300-Energy.aida", "-900-Energy.aida", "-1960-Energy.aida",
- "-RatioPlots.aida"]
+yodafiles=["-Run-II-UE.yoda" ,"-Run-II-Jets-1.yoda","-Run-II-Jets-2.yoda",\
+ "-Run-II-Jets-3.yoda","-Run-II-Jets-4.yoda","-Run-II-Jets-5.yoda",\
+ "-Run-II-Jets-6.yoda","-Run-II-Jets-7.yoda",\
+ "-Run-I-UE.yoda" ,"-Run-I-Jets-1.yoda","-Run-I-Jets-2.yoda",\
+ "-Run-I-Jets-3.yoda","-Run-I-Jets-4.yoda","-Run-I-Jets-5.yoda",\
+ "-630-UE.yoda" ,"-630-Jets-1.yoda" ,"-630-Jets-2.yoda" ,\
+ "-630-Jets-3.yoda", "-300-Energy.yoda", "-900-Energy.yoda", "-1960-Energy.yoda",
+# "-RatioPlots.yoda"
+ ]
## Get histos
inhistos = {}
outhistos={}
-weights = {}
-for f in aidafiles:
+for f in yodafiles:
file=args[0]+f
if(file.find("Run-II-UE")>0) :
sqrts=1960
ptmin=0.
elif(file.find("Run-II-Jets-1")>0) :
sqrts=1960
ptmin=36.
elif(file.find("Run-II-Jets-2")>0) :
sqrts=1960
ptmin=55.
elif(file.find("Run-II-Jets-3")>0) :
sqrts=1960
ptmin=75.
elif(file.find("Run-II-Jets-4")>0) :
sqrts=1960
ptmin=100.
elif(file.find("Run-II-Jets-5")>0) :
sqrts=1960
ptmin=125.
elif(file.find("Run-II-Jets-6")>0) :
ptmin=175.
sqrts=1960
elif(file.find("Run-II-Jets-7")>0) :
sqrts=1960
ptmin=265.
elif(file.find("630-UE")>0) :
sqrts=630
ptmin=0.
elif(file.find("630-Jets-1")>0) :
sqrts=630
ptmin=30.
elif(file.find("630-Jets-2")>0) :
sqrts=630
ptmin=55.
elif(file.find("630-Jets-3")>0) :
sqrts=630
ptmin=90.
elif(file.find("Run-I-UE")>0) :
sqrts=1800
ptmin=0.
elif(file.find("Run-I-Jets-1")>0) :
sqrts=1800
ptmin=30.
elif(file.find("Run-I-Jets-2")>0) :
sqrts=1800
ptmin=55.
elif(file.find("Run-I-Jets-3")>0) :
sqrts=1800
ptmin=80.
elif(file.find("Run-I-Jets-4")>0) :
sqrts=1800
ptmin=105.
elif(file.find("Run-I-Jets-5")>0) :
sqrts=1800
ptmin=175.
if not os.access(file, os.R_OK):
logging.error("%s can not be read" % file)
break
try:
- tree = ET.parse(file)
+ aos = yoda.read(file)
except:
- logging.error("%s can not be parsed as XML" % file)
+ logging.error("%s can not be parsed as YODA" % file)
break
- tree = ET.parse(file)
- ## Get histos from this AIDA file
- for dps in tree.findall("dataPointSet"):
- h = lighthisto.Histo.fromDPS(dps)
+ ## Get histos from this YODA file
+ for aopath, ao in aos.iteritems() :
# di-jet decorrelations
# jet shapes
- if(h.fullPath().find("5992206")>0 or h.fullPath().find("6217184")>0 or
- h.fullPath().find("LEADINGJETS")>0 or h.fullPath().find("7662670")>0 or
- h.fullPath().find("7057202")>0 or h.fullPath().find("6450792")>0 or
- h.fullPath().find("7828950")>0 or h.fullPath().find("4751469")>0 or
- h.fullPath().find("5839831")>0 or h.fullPath().find("4563131")>0 or
- h.fullPath().find("4517016")>0 or h.fullPath().find("3618439")>0 or
- h.fullPath().find("8591881")>0) :
- if not inhistos.has_key(h.fullPath()):
- inhistos[h.fullPath()] = {}
- tmpE = inhistos[h.fullPath()]
+ if(aopath.find("5992206")>0 or aopath.find("6217184")>0 or
+ aopath.find("LEADINGJETS")>0 or aopath.find("7662670")>0 or
+ aopath.find("7057202")>0 or aopath.find("6450792")>0 or
+ aopath.find("7828950")>0 or aopath.find("4751469")>0 or
+ aopath.find("5839831")>0 or aopath.find("4563131")>0 or
+ aopath.find("4517016")>0 or aopath.find("3618439")>0 or
+ aopath.find("8591881")>0) :
+ if not inhistos.has_key(aopath):
+ inhistos[aopath] = {}
+ tmpE = inhistos[aopath]
if not tmpE.has_key(sqrts):
tmpE[sqrts] = {}
tmpP = tmpE[sqrts]
if not tmpP.has_key(ptmin):
- tmpP[ptmin] = h
+ tmpP[ptmin] = ao
else:
raise Exception("A set with ptmin = %s already exists" % ( ptmin))
- elif(h.fullPath().find("8233977")>0 or h.fullPath().find("NOTE_9936")>0 or
- h.fullPath().find("3905616")>0 or h.fullPath().find("3324664")>0 or
- h.fullPath().find("4796047")>0 or h.fullPath().find("1865951")>0 or
- h.fullPath().find("2089246")>0 or h.fullPath().find("3108457")>0 or
- h.fullPath().find("3349578")>0 or h.fullPath().find("3541940")>0 or
- h.fullPath().find("3214044")>0 or h.fullPath().find("2952106")>0 or
- h.fullPath().find("NOTE10874")>0 or h.fullPath().find("895662")>0 ) :
- outhistos[h.fullPath()] = h
+ elif(aopath.find("8233977")>0 or aopath.find("NOTE_9936")>0 or
+ aopath.find("3905616")>0 or aopath.find("3324664")>0 or
+ aopath.find("4796047")>0 or aopath.find("1865951")>0 or
+ aopath.find("2089246")>0 or aopath.find("3108457")>0 or
+ aopath.find("3349578")>0 or aopath.find("3541940")>0 or
+ aopath.find("3214044")>0 or aopath.find("2952106")>0 or
+ aopath.find("NOTE10874")>0 or aopath.find("895662")>0 ) :
+ outhistos[aopath] = ao
+ else :
+ print aopath
+ quit()
-aidafiles=["-Run-II-Jets-8.aida","-Run-II-Jets-9.aida","-Run-II-Jets-10.aida","-Run-II-Jets-11.aida",\
- "-Run-I-Jets-6.aida","-Run-I-Jets-7.aida","-Run-I-Jets-8.aida"]
+yodafiles=["-Run-II-Jets-8.yoda","-Run-II-Jets-9.yoda","-Run-II-Jets-10.yoda","-Run-II-Jets-11.yoda",\
+ "-Run-I-Jets-6.yoda","-Run-I-Jets-7.yoda","-Run-I-Jets-8.yoda"]
-for f in aidafiles:
+for f in yodafiles:
file=args[0]+f
if(file.find("Run-II-Jets-8")>0) :
sqrts=1960
ptmin=0.150
elif(file.find("Run-II-Jets-9")>0) :
sqrts=1960
ptmin=0.400
elif(file.find("Run-II-Jets-10")>0) :
sqrts=1960
ptmin=0.600
elif(file.find("Run-II-Jets-11")>0) :
sqrts=1960
ptmin=1.000
elif(file.find("Run-I-Jets-6")>0) :
sqrts=1800
ptmin=0.150
elif(file.find("Run-I-Jets-7")>0) :
sqrts=1800
ptmin=0.5
elif(file.find("Run-I-Jets-8")>0) :
sqrts=1800
ptmin=0.8
if not os.access(file, os.R_OK):
logging.error("%s can not be read" % file)
break
try:
- tree = ET.parse(file)
+ aos = yoda.read(file)
except:
- logging.error("%s can not be parsed as XML" % file)
+ logging.error("%s can not be parsed as YODA" % file)
break
- tree = ET.parse(file)
## Get histos from this AIDA file
- for dps in tree.findall("dataPointSet"):
- h = lighthisto.Histo.fromDPS(dps)
- if(h.fullPath().find("8566488")>0 or h.fullPath().find("8320160")>0) :
- if not inhistos.has_key(h.fullPath()):
- inhistos[h.fullPath()] = {}
- tmpE = inhistos[h.fullPath()]
+ for aopath, ao in aos.iteritems() :
+ if(aopath.find("8566488")>0 or aopath.find("8320160")>0) :
+ if not inhistos.has_key(aopath):
+ inhistos[aopath] = {}
+ tmpE = inhistos[aopath]
if not tmpE.has_key(sqrts):
tmpE[sqrts] = {}
tmpP = tmpE[sqrts]
if not tmpP.has_key(ptmin):
- tmpP[ptmin] = h
+ tmpP[ptmin] = ao
else:
raise Exception("A set with ptmin = %s already exists" % ( ptmin))
- elif(h.fullPath().find("8093652")>0 or h.fullPath().find("3418421")>0 or
- h.fullPath().find("4266730")>0) :
- if not inhistos.has_key(h.fullPath()):
- inhistos[h.fullPath()] = {}
- tmpE = inhistos[h.fullPath()]
+ elif(aopath.find("8093652")>0 or aopath.find("3418421")>0 or
+ aopath.find("4266730")>0) :
+ if not inhistos.has_key(aopath):
+ inhistos[aopath] = {}
+ tmpE = inhistos[aopath]
if not tmpE.has_key(sqrts):
tmpE[sqrts] = {}
tmpP = tmpE[sqrts]
if not tmpP.has_key(1000.*ptmin):
- tmpP[1000.*ptmin] = h
+ tmpP[1000.*ptmin] = ao
else:
raise Exception("A set with ptmin = %s already exists" % ( 1000.*ptmin))
## Make empty output histos if needed
for hpath,hsets in inhistos.iteritems():
if( (hpath.find("6217184")>0 and hpath.find("d13-x01-y01")>0 ) or
hpath.find("LEADINGJETS")>0 or hpath.find("7662670")>0 or
hpath.find("7057202")>0 or hpath.find("6450792")>0 or
hpath.find("7828950")>0 or hpath.find("8566488")>0 or
hpath.find("8320160")>0 or hpath.find("8093652")>0 or
hpath.find("4751469")>0 or hpath.find("5839831")>0 or
hpath.find("4563131")>0 or hpath.find("4517016")>0 or
hpath.find("3618439")>0 or hpath.find("4266730")>0 or
hpath.find("3418421")>0 or hpath.find("8591881")>0) :
- workhisto = copy.deepcopy(hsets.values()[0].values()[0])
- outhistos[hpath] = workhisto
- ## Empty the bin set for histos which we're going to merge
- for b in outhistos[hpath]:
- b.val = 0
- b.errplus = 0
- b.errminus = 0
- b._focus= None
-
+ if(type(hsets.values()[0].values()[0])==yoda.core.Scatter2D) :
+ outhistos[hpath] = yoda.core.Scatter2D(hsets.values()[0].values()[0].path,
+ hsets.values()[0].values()[0].title)
+ elif(type(hsets.values()[0].values()[0])==yoda.core.Profile1D) :
+ outhistos[hpath] = yoda.core.Profile1D(hsets.values()[0].values()[0].path,
+ hsets.values()[0].values()[0].title)
+ for i in range(0,hsets.values()[0].values()[0].numBins) :
+ outhistos[hpath].addBin(hsets.values()[0].values()[0].bins[i].lowEdge,
+ hsets.values()[0].values()[0].bins[i].highEdge)
+ elif(type(hsets.values()[0].values()[0])==yoda.core.Histo1D) :
+ outhistos[hpath] = yoda.core.Histo1D(hsets.values()[0].values()[0].path,
+ hsets.values()[0].values()[0].title)
+ for i in range(0,hsets.values()[0].values()[0].numBins) :
+ outhistos[hpath].addBin(hsets.values()[0].values()[0].bins[i].lowEdge,
+ hsets.values()[0].values()[0].bins[i].highEdge)
+ else :
+ logging.error("Histogram %s is of unknown type" % hpath)
+ print hpath,type(hsets.values()[0].values()[0])
+ sys.exit(1)
## Field analysis
logging.info("Processing CDF_2001_S4751469")
## Angular distributions in different pT bins
useOnePt("/CDF_2001_S4751469/d01-x01-y01", "1800", "0")
useOnePt("/CDF_2001_S4751469/d01-x01-y02", "1800", "0")
useOnePt("/CDF_2001_S4751469/d01-x01-y03", "1800", "30")
useOnePt("/CDF_2001_S4751469/d02-x01-y01", "1800", "0")
useOnePt("/CDF_2001_S4751469/d02-x01-y02", "1800", "0")
useOnePt("/CDF_2001_S4751469/d02-x01-y03", "1800", "30")
## Number, profile in pT_lead (True?)
useOnePt("/CDF_2001_S4751469/d03-x01-y01", "1800", "0")
useOnePt("/CDF_2001_S4751469/d03-x01-y02", "1800", "0")
useOnePt("/CDF_2001_S4751469/d03-x01-y03", "1800", "0")
#mergeByPt("/CDF_2001_S4751469/d04-x01-y01", "1800")
#mergeByPt("/CDF_2001_S4751469/d04-x01-y02", "1800")
#mergeByPt("/CDF_2001_S4751469/d04-x01-y03", "1800")
useOnePt("/CDF_2001_S4751469/d04-x01-y01", "1800", "30")
useOnePt("/CDF_2001_S4751469/d04-x01-y02", "1800", "30")
useOnePt("/CDF_2001_S4751469/d04-x01-y03", "1800", "30")
## pT sums, profile in pT_lead (True?)
useOnePt("/CDF_2001_S4751469/d05-x01-y01", "1800", "0")
useOnePt("/CDF_2001_S4751469/d05-x01-y02", "1800", "0")
useOnePt("/CDF_2001_S4751469/d05-x01-y03", "1800", "0")
# mergeByPt("/CDF_2001_S4751469/d06-x01-y01", "1800")
# mergeByPt("/CDF_2001_S4751469/d06-x01-y02", "1800")
# mergeByPt("/CDF_2001_S4751469/d06-x01-y03", "1800")
useOnePt("/CDF_2001_S4751469/d06-x01-y01", "1800", "30")
useOnePt("/CDF_2001_S4751469/d06-x01-y02", "1800", "30")
useOnePt("/CDF_2001_S4751469/d06-x01-y03", "1800", "30")
## pT distributions (use a specific pT cut run?)
useOnePt("/CDF_2001_S4751469/d07-x01-y01", "1800", "0")
useOnePt("/CDF_2001_S4751469/d07-x01-y02", "1800", "0")
useOnePt("/CDF_2001_S4751469/d07-x01-y03", "1800", "30")
## Acosta analysis
logging.info("Processing CDF_2004_S5839831")
## Mean pT, profile in ET_lead
mergeByPt("/CDF_2004_S5839831/d01-x01-y01", "1800")
mergeByPt("/CDF_2004_S5839831/d01-x01-y02", "1800")
## pT_max,min, profiles in ET_lead
mergeByPt("/CDF_2004_S5839831/d02-x01-y01", "1800")
mergeByPt("/CDF_2004_S5839831/d02-x01-y02", "1800")
mergeByPt("/CDF_2004_S5839831/d02-x01-y03", "1800")
## pT distributions (want to use a specific pT cut run)
useOnePt("/CDF_2004_S5839831/d03-x01-y01", "1800", "30")
useOnePt("/CDF_2004_S5839831/d03-x01-y02", "1800", "80")
useOnePt("/CDF_2004_S5839831/d03-x01-y03", "1800", "105")
useOnePt("/CDF_2004_S5839831/d03-x01-y04", "1800", "105")
useOnePt("/CDF_2004_S5839831/d03-x01-y05", "1800", "175")
## N_max,min, profiles in ET_lead
mergeByPt("/CDF_2004_S5839831/d04-x01-y01", "1800")
mergeByPt("/CDF_2004_S5839831/d04-x01-y02", "1800")
## Min bias dbs (want to use min bias pT cut)
useOnePt("/CDF_2004_S5839831/d05-x01-y01", "1800", "0")
useOnePt("/CDF_2004_S5839831/d06-x01-y01", "1800", "0")
## Swiss Cheese, profile in ET_lead
mergeByPt("/CDF_2004_S5839831/d07-x01-y01", "1800")
mergeByPt("/CDF_2004_S5839831/d07-x01-y02", "1800")
## pT_max,min, profiles in ET_lead
mergeByPt("/CDF_2004_S5839831/d08-x01-y01", "630")
mergeByPt("/CDF_2004_S5839831/d08-x01-y02", "630")
mergeByPt("/CDF_2004_S5839831/d08-x01-y03", "630")
## Swiss Cheese, profile in ET_lead
mergeByPt("/CDF_2004_S5839831/d09-x01-y01", "630")
mergeByPt("/CDF_2004_S5839831/d09-x01-y02", "630")
## Min bias dbs (want to use min bias pT cut)
useOnePt("/CDF_2004_S5839831/d10-x01-y01", "630", "0")
useOnePt("/CDF_2004_S5839831/d11-x01-y01", "630", "0")
## CDF jet shape analysis
logging.info("Processing CDF_2005_S6217184")
useOnePt("/CDF_2005_S6217184/d01-x01-y01", "1960", "36" )
useOnePt("/CDF_2005_S6217184/d01-x01-y02", "1960", "36" )
useOnePt("/CDF_2005_S6217184/d01-x01-y03", "1960", "55" )
useOnePt("/CDF_2005_S6217184/d02-x01-y01", "1960", "55" )
useOnePt("/CDF_2005_S6217184/d02-x01-y02", "1960", "55" )
useOnePt("/CDF_2005_S6217184/d02-x01-y03", "1960", "75" )
useOnePt("/CDF_2005_S6217184/d03-x01-y01", "1960", "75" )
useOnePt("/CDF_2005_S6217184/d03-x01-y02", "1960", "100")
useOnePt("/CDF_2005_S6217184/d03-x01-y03", "1960", "100")
useOnePt("/CDF_2005_S6217184/d04-x01-y01", "1960", "125")
useOnePt("/CDF_2005_S6217184/d04-x01-y02", "1960", "125")
useOnePt("/CDF_2005_S6217184/d04-x01-y03", "1960", "175")
useOnePt("/CDF_2005_S6217184/d05-x01-y01", "1960", "175")
useOnePt("/CDF_2005_S6217184/d05-x01-y02", "1960", "175")
useOnePt("/CDF_2005_S6217184/d05-x01-y03", "1960", "175")
useOnePt("/CDF_2005_S6217184/d06-x01-y01", "1960", "265")
useOnePt("/CDF_2005_S6217184/d06-x01-y02", "1960", "265")
useOnePt("/CDF_2005_S6217184/d06-x01-y03", "1960", "265")
useOnePt("/CDF_2005_S6217184/d07-x01-y01", "1960", "36" )
useOnePt("/CDF_2005_S6217184/d07-x01-y02", "1960", "36" )
useOnePt("/CDF_2005_S6217184/d07-x01-y03", "1960", "55" )
useOnePt("/CDF_2005_S6217184/d08-x01-y01", "1960", "55" )
useOnePt("/CDF_2005_S6217184/d08-x01-y02", "1960", "55" )
useOnePt("/CDF_2005_S6217184/d08-x01-y03", "1960", "75" )
useOnePt("/CDF_2005_S6217184/d09-x01-y01", "1960", "75" )
useOnePt("/CDF_2005_S6217184/d09-x01-y02", "1960", "100")
useOnePt("/CDF_2005_S6217184/d09-x01-y03", "1960", "100")
useOnePt("/CDF_2005_S6217184/d10-x01-y01", "1960", "125")
useOnePt("/CDF_2005_S6217184/d10-x01-y02", "1960", "125")
useOnePt("/CDF_2005_S6217184/d10-x01-y03", "1960", "175")
useOnePt("/CDF_2005_S6217184/d11-x01-y01", "1960", "175")
useOnePt("/CDF_2005_S6217184/d11-x01-y02", "1960", "175")
useOnePt("/CDF_2005_S6217184/d11-x01-y03", "1960", "175")
useOnePt("/CDF_2005_S6217184/d12-x01-y01", "1960", "265")
useOnePt("/CDF_2005_S6217184/d12-x01-y02", "1960", "265")
useOnePt("/CDF_2005_S6217184/d12-x01-y03", "1960", "265")
mergeByPt("/CDF_2005_S6217184/d13-x01-y01", "1960")
# ## CDF dijet mass spectrum
mergeByPt("/CDF_2008_S8093652/d01-x01-y01", "1960")
-## Rick Field Run-II Leading Jets analysis
-logging.info("Processing CDF_2008_LEADINGJETS")
-## charged particle density
-mergeByPt("/CDF_2008_LEADINGJETS/d01-x01-y01", "1960")
-mergeByPt("/CDF_2008_LEADINGJETS/d02-x01-y01", "1960")
-mergeByPt("/CDF_2008_LEADINGJETS/d03-x01-y01", "1960")
-mergeByPt("/CDF_2008_LEADINGJETS/d04-x01-y01", "1960")
-## pT sum density
-mergeByPt("/CDF_2008_LEADINGJETS/d05-x01-y01", "1960")
-mergeByPt("/CDF_2008_LEADINGJETS/d06-x01-y01", "1960")
-mergeByPt("/CDF_2008_LEADINGJETS/d07-x01-y01", "1960")
-mergeByPt("/CDF_2008_LEADINGJETS/d08-x01-y01", "1960")
-## mean pT
-mergeByPt("/CDF_2008_LEADINGJETS/d09-x01-y01", "1960")
+# ## Rick Field Run-II Leading Jets analysis
+# logging.info("Processing CDF_2008_LEADINGJETS")
+# ## charged particle density
+# mergeByPt("/CDF_2008_LEADINGJETS/d01-x01-y01", "1960")
+# mergeByPt("/CDF_2008_LEADINGJETS/d02-x01-y01", "1960")
+# mergeByPt("/CDF_2008_LEADINGJETS/d03-x01-y01", "1960")
+# mergeByPt("/CDF_2008_LEADINGJETS/d04-x01-y01", "1960")
+# ## pT sum density
+# mergeByPt("/CDF_2008_LEADINGJETS/d05-x01-y01", "1960")
+# mergeByPt("/CDF_2008_LEADINGJETS/d06-x01-y01", "1960")
+# mergeByPt("/CDF_2008_LEADINGJETS/d07-x01-y01", "1960")
+# mergeByPt("/CDF_2008_LEADINGJETS/d08-x01-y01", "1960")
+# ## mean pT
+# mergeByPt("/CDF_2008_LEADINGJETS/d09-x01-y01", "1960")
## newer version
logging.info("Processing CDF_2010_S8591881_QCD")
mergeByPt("/CDF_2010_S8591881_QCD/d10-x01-y01", "1960")
mergeByPt("/CDF_2010_S8591881_QCD/d10-x01-y02", "1960")
mergeByPt("/CDF_2010_S8591881_QCD/d10-x01-y03", "1960")
mergeByPt("/CDF_2010_S8591881_QCD/d11-x01-y01", "1960")
mergeByPt("/CDF_2010_S8591881_QCD/d11-x01-y02", "1960")
mergeByPt("/CDF_2010_S8591881_QCD/d11-x01-y03", "1960")
mergeByPt("/CDF_2010_S8591881_QCD/d12-x01-y01", "1960")
mergeByPt("/CDF_2010_S8591881_QCD/d12-x01-y02", "1960")
mergeByPt("/CDF_2010_S8591881_QCD/d12-x01-y03", "1960")
mergeByPt("/CDF_2010_S8591881_QCD/d13-x01-y01", "1960")
mergeByPt("/CDF_2010_S8591881_QCD/d13-x01-y02", "1960")
mergeByPt("/CDF_2010_S8591881_QCD/d13-x01-y03", "1960")
mergeByPt("/CDF_2010_S8591881_QCD/d14-x01-y01", "1960")
mergeByPt("/CDF_2010_S8591881_QCD/d15-x01-y01", "1960")
-
-
## D0 dijet correlation analysis
logging.info("Processing D0_2004_S5992206")
useOnePt("/D0_2004_S5992206/d01-x02-y01", "1960", "75")
useOnePt("/D0_2004_S5992206/d02-x02-y01", "1960", "100")
useOnePt("/D0_2004_S5992206/d03-x02-y01", "1960", "125")
useOnePt("/D0_2004_S5992206/d04-x02-y01", "1960", "175")
## D0 incl jet cross-section analysis
logging.info("Processing D0_2008_S7662670")
mergeByPt("/D0_2008_S7662670/d01-x01-y01", "1960")
mergeByPt("/D0_2008_S7662670/d02-x01-y01", "1960")
mergeByPt("/D0_2008_S7662670/d03-x01-y01", "1960")
mergeByPt("/D0_2008_S7662670/d04-x01-y01", "1960")
mergeByPt("/D0_2008_S7662670/d05-x01-y01", "1960")
mergeByPt("/D0_2008_S7662670/d06-x01-y01", "1960")
mergeByPt("/D0_2010_S8566488/d01-x01-y01", "1960")
mergeByPt("/D0_2010_S8566488/d02-x01-y01", "1960")
mergeByPt("/D0_2010_S8566488/d03-x01-y01", "1960")
mergeByPt("/D0_2010_S8566488/d04-x01-y01", "1960")
mergeByPt("/D0_2010_S8566488/d05-x01-y01", "1960")
mergeByPt("/D0_2010_S8566488/d06-x01-y01", "1960")
# CDF jet cross section
mergeByPt("/CDF_2001_S4563131/d01-x01-y01", "1800")
mergeByPt("/CDF_2001_S4517016/d01-x01-y01", "1800")
mergeByPt("/CDF_2001_S4517016/d02-x01-y01", "1800")
mergeByPt("/CDF_2001_S4517016/d03-x01-y01", "1800")
mergeByPt("/CDF_2001_S4517016/d04-x01-y01", "1800")
-
useOnePt("/CDF_1998_S3618439/d01-x01-y01", "1800","105")
useOnePt("/CDF_1998_S3618439/d01-x01-y02", "1800","105")
mergeByPt("/CDF_2008_S7828950/d01-x01-y01", "1960")
mergeByPt("/CDF_2008_S7828950/d02-x01-y01", "1960")
mergeByPt("/CDF_2008_S7828950/d03-x01-y01", "1960")
mergeByPt("/CDF_2008_S7828950/d04-x01-y01", "1960")
mergeByPt("/CDF_2008_S7828950/d05-x01-y01", "1960")
mergeByPt("/CDF_2007_S7057202/d01-x01-y01", "1960")
mergeByPt("/CDF_2007_S7057202/d02-x01-y01", "1960")
mergeByPt("/CDF_2007_S7057202/d03-x01-y01", "1960")
mergeByPt("/CDF_2007_S7057202/d04-x01-y01", "1960")
mergeByPt("/CDF_2007_S7057202/d05-x01-y01", "1960")
mergeByPt("/CDF_2007_S7057202/d06-x01-y01", "1960")
mergeByPt("/CDF_2007_S7057202/d07-x01-y01", "1960")
mergeByPt("/CDF_2006_S6450792/d01-x01-y01", "1960")
mergeByPt("/CDF_2000_S4266730/d01-x01-y01", "1800")
-
useOnePt("/CDF_1996_S3418421/d01-x01-y01","1800","150")
useOnePt("/CDF_1996_S3418421/d01-x01-y02","1800","150")
useOnePt("/CDF_1996_S3418421/d01-x01-y03","1800","150")
useOnePt("/CDF_1996_S3418421/d01-x01-y04","1800","500")
useOnePt("/CDF_1996_S3418421/d01-x01-y05","1800","500")
mergeByPt("/CDF_1996_S3418421/d02-x01-y01","1800")
useOnePt("/D0_2009_S8320160/d01-x01-y01", "1960", "0.15" )
useOnePt("/D0_2009_S8320160/d02-x01-y01", "1960", "0.15" )
useOnePt("/D0_2009_S8320160/d03-x01-y01", "1960", "0.4" )
useOnePt("/D0_2009_S8320160/d04-x01-y01", "1960", "0.4" )
useOnePt("/D0_2009_S8320160/d05-x01-y01", "1960", "0.6" )
useOnePt("/D0_2009_S8320160/d06-x01-y01", "1960", "0.6" )
useOnePt("/D0_2009_S8320160/d07-x01-y01", "1960", "0.6" )
useOnePt("/D0_2009_S8320160/d08-x01-y01", "1960", "0.6" )
useOnePt("/D0_2009_S8320160/d09-x01-y01", "1960", "1.0" )
useOnePt("/D0_2009_S8320160/d10-x01-y01", "1960", "1.0" )
# Choose output file
-name = args[0]+"-Jets.aida"
-out = open(name, "w")
-## Write out merged histos
-out.write('<?xml version="1.0" encoding="ISO-8859-1" ?>\n')
-out.write('<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">\n')
-out.write('<aida version="3.3">\n')
-out.write(' <implementation version="1.1" package="FreeHEP"/>\n')
-for hpath, h in sorted(outhistos.iteritems()):
- logging.debug("hpath = %s" % hpath)
- out.write(h.asAIDA() + "\n\n")
-out.write('</aida>\n')
-
+name = args[0]+"-Jets.yoda"
+yoda.writeYODA(outhistos,name)
sys.exit(0)
diff --git a/Tests/python/merge-aida b/Tests/python/merge-aida
deleted file mode 100755
--- a/Tests/python/merge-aida
+++ /dev/null
@@ -1,106 +0,0 @@
-#! /usr/bin/env python
-import lighthisto
-import logging
-import sys
-import os, copy, re
-
-"""%prog
-
-Script for merging aida files
-
-"""
-
-import sys
-if sys.version_info[:3] < (2,4,0):
- print "rivet scripts require Python version >= 2.4.0... exiting"
- sys.exit(1)
-
-## Try to load faster but non-standard cElementTree module
-try:
- import xml.etree.cElementTree as ET
-except ImportError:
- try:
- import cElementTree as ET
- except ImportError:
- try:
- import xml.etree.ElementTree as ET
- except:
- sys.stderr.write("Can't load the ElementTree XML parser: please install it!\n")
- sys.exit(1)
-
-if __name__ == "__main__":
- import logging
- from optparse import OptionParser, OptionGroup
- parser = OptionParser(usage="%prog aidafile aidafile2 [...]")
- parser.add_option("-o", "--out", dest="OUTFILE", default="-")
- parser.add_option("--append", dest="APPEND_OUTPUT", action="store_true", default=False)
- verbgroup = OptionGroup(parser, "Verbosity control")
- verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
- default=logging.INFO, help="print debug (very verbose) messages")
- verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
- default=logging.INFO, help="be very quiet")
- parser.add_option_group(verbgroup)
- (opts, args) = parser.parse_args()
- logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
-
- ## Prefix used in dat file headers
- headerprefix = "# "
-
- ## Check args
- if len(args) < 1:
- logging.error("Must specify at least one AIDA histogram file")
- sys.exit(1)
-
- ## Get histos
- outhistos={}
- for file in args:
- if not os.access(file, os.R_OK):
- logging.error("%s can not be read" % file)
- break
- try:
- tree = ET.parse(file)
- except:
- logging.error("%s can not be parsed as XML" % file)
- break
- tree = ET.parse(file)
- ## Get histos from this AIDA file
- for dps in tree.findall("dataPointSet"):
- h = lighthisto.Histo.fromDPS(dps)
- if (h.fullPath().find("CMS_2013_I1258128")>0) :
- if(h.fullPath().find("d05")>0 or h.fullPath().find("d06")>0 or
- h.fullPath().find("d07")>0 or h.fullPath().find("d08")>0) :
- outhistos[h.fullPath()] = h
- else :
- outhistos[h.fullPath()] = h
-
- ## Choose output file
- out = None
- if opts.OUTFILE == "-":
- out = sys.stdout
- else:
- if opts.APPEND_OUTPUT:
- out = open(opts.OUTFILE, "a")
- else:
- out = open(opts.OUTFILE, "w")
-
-
- # Choose output file
- out = None
- if opts.OUTFILE == "-":
- out = sys.stdout
- else:
- if opts.APPEND_OUTPUT:
- out = open(opts.OUTFILE, "a")
- else:
- out = open(opts.OUTFILE, "w")
- ## Write out merged histos
- out.write('<?xml version="1.0" encoding="ISO-8859-1" ?>\n')
- out.write('<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">\n')
- out.write('<aida version="3.3">\n')
- out.write(' <implementation version="1.1" package="FreeHEP"/>\n')
- for hpath, h in sorted(outhistos.iteritems()):
- logging.debug("hpath = %s" % hpath)
- out.write(h.asAIDA() + "\n\n")
- out.write('</aida>\n')
-
- sys.exit(0)

File Metadata

Mime Type
text/x-diff
Expires
Mon, Jan 20, 8:58 PM (23 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4242359
Default Alt Text
(394 KB)

Event Timeline