Page MenuHomeHEPForge
Files F8308961

No OneTemporary
Actions

View Options

diff --git a/Tests/Makefile.am b/Tests/Makefile.am
--- a/Tests/Makefile.am
+++ b/Tests/Makefile.am
@@ -1,397 +1,397 @@
AM_LDFLAGS += -module -avoid-version -rpath /dummy/path/not/used
EXTRA_DIST = Inputs python Rivet
EXTRA_LTLIBRARIES = LeptonTest.la GammaTest.la HadronTest.la DISTest.la
if WANT_LIBFASTJET
EXTRA_LTLIBRARIES += HadronJetTest.la LeptonJetTest.la
HadronJetTest_la_SOURCES = \
Hadron/VHTest.h Hadron/VHTest.cc\
Hadron/VTest.h Hadron/VTest.cc\
Hadron/HTest.h Hadron/HTest.cc
HadronJetTest_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
-I$(FASTJETPATH)
HadronJetTest_la_LIBADD = $(FASTJETLIBS)
LeptonJetTest_la_SOURCES = \
Lepton/TopDecay.h Lepton/TopDecay.cc
LeptonJetTest_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
-I$(FASTJETPATH)
LeptonJetTest_la_LIBADD = $(FASTJETLIBS)
endif
LeptonTest_la_SOURCES = \
Lepton/VVTest.h Lepton/VVTest.cc \
Lepton/VBFTest.h Lepton/VBFTest.cc \
Lepton/VHTest.h Lepton/VHTest.cc \
Lepton/FermionTest.h Lepton/FermionTest.cc
GammaTest_la_SOURCES = \
Gamma/GammaMETest.h Gamma/GammaMETest.cc \
Gamma/GammaPMETest.h Gamma/GammaPMETest.cc
DISTest_la_SOURCES = \
DIS/DISTest.h DIS/DISTest.cc
HadronTest_la_SOURCES = \
Hadron/HadronVVTest.h Hadron/HadronVVTest.cc\
Hadron/HadronVBFTest.h Hadron/HadronVBFTest.cc\
Hadron/WHTest.h Hadron/WHTest.cc\
Hadron/ZHTest.h Hadron/ZHTest.cc\
Hadron/VGammaTest.h Hadron/VGammaTest.cc\
Hadron/ZJetTest.h Hadron/ZJetTest.cc\
Hadron/WJetTest.h Hadron/WJetTest.cc\
Hadron/QQHTest.h Hadron/QQHTest.cc
REPO = $(top_builddir)/src/HerwigDefaults.rpo
HERWIG = $(top_builddir)/src/Herwig
HWREAD = $(HERWIG) read --repo $(REPO) -L $(builddir)/.libs -i $(top_builddir)/src
HWBUILD = $(HERWIG) build --repo $(REPO) -L $(builddir)/.libs -i $(top_builddir)/src
HWINTEGRATE = $(HERWIG) integrate
HWRUN = $(HERWIG) run -N $${NUMEVENTS:-10000}
tests : tests-LEP tests-DIS tests-LHC tests-Gamma
LEPDEPS = \
test-LEP-VV \
test-LEP-VH \
test-LEP-VBF \
test-LEP-BB \
test-LEP-Quarks \
test-LEP-Leptons
if WANT_LIBFASTJET
LEPDEPS += test-LEP-TopDecay
endif
tests-LEP : $(LEPDEPS)
tests-DIS : test-DIS-Charged test-DIS-Neutral
LHCDEPS = \
test-LHC-WW test-LHC-WZ test-LHC-ZZ \
test-LHC-ZGamma test-LHC-WGamma \
test-LHC-ZH test-LHC-WH \
test-LHC-ZJet test-LHC-WJet \
test-LHC-Z test-LHC-W \
test-LHC-ZZVBF test-LHC-VBF \
test-LHC-WWVBF \
test-LHC-bbH test-LHC-ttH \
test-LHC-GammaGamma test-LHC-GammaJet \
test-LHC-Higgs test-LHC-HiggsJet \
test-LHC-QCDFast test-LHC-QCD \
test-LHC-Top
if WANT_LIBFASTJET
LHCDEPS += \
test-LHC-Bottom \
test-LHC-WHJet test-LHC-ZHJet test-LHC-HJet \
test-LHC-ZShower test-LHC-WShower \
test-LHC-WHJet-Powheg test-LHC-ZHJet-Powheg test-LHC-HJet-Powheg \
test-LHC-ZShower-Powheg test-LHC-WShower-Powheg
endif
tests-LHC : $(LHCDEPS)
tests-Gamma : test-Gamma-FF test-Gamma-WW test-Gamma-P
LEPLIBS = LeptonTest.la
HADLIBS = HadronTest.la
if WANT_LIBFASTJET
LEPLIBS += LeptonJetTest.la
HADLIBS += HadronJetTest.la
endif
test-LEP-% : Inputs/LEP-%.in $(LEPLIBS)
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<))
test-Gamma-% : Inputs/Gamma-%.in GammaTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<))
test-DIS-% : Inputs/DIS-%.in DISTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<))
test-LHC-% : Inputs/LHC-%.in GammaTest.la $(HADLIBS)
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<))
tests-Rivet : Rivet-EE Rivet-DIS Rivet-Fixed \
Rivet-TVT-WZ Rivet-TVT-Photon Rivet-TVT-Jets \
Rivet-LHC-Jets Rivet-LHC-EW Rivet-LHC-Photon Rivet-LHC-Higgs
Rivet-%-UE-Cent.yoda : Rivet-%-UE-Cent.run Rivet-%-Cent.run
rm -rf $(subst .yoda,,$@)
mkdir $(subst .yoda,,$@)
mv $(subst .yoda,.run,$@) $(subst UE-,,$(subst .yoda,.run,$@)) $(subst .yoda,,$@)
cd $(subst .yoda,,$@); ../$(HWRUN) $(subst UE-,,$(subst .yoda,.run,$@)); mv $(subst UE-,,$@) ALICE_2015_CENT_PP.yoda
cd $(subst .yoda,,$@); export RIVET_ANALYSIS_PATH=`pwd`; ../$(HWRUN) $(subst .yoda,.run,$@)
mv $(subst .yoda,,$@)/$@ .
rm -rf $(subst .yoda,,$@)
Rivet-%.run : Rivet/%.in
$(HWBUILD) -c .cache/$(subst .run,,$@) $<
Rivet-Matchbox-%.yoda : Rivet-Matchbox-%.run
$(HWINTEGRATE) -c .cache/$(subst .run,,$<) $<
$(HWRUN) -c .cache/$(subst .run,,$<) $<
Rivet-%.yoda : Rivet-%.run
$(HWRUN) $<
Rivet/%.in :
python/make_input_files.py $(notdir $(subst .in,,$@))
Rivet-inputfiles: $(shell echo Rivet/EE{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{7.7,9.4,12,13,17,27.6,27.7,29,30.2,30.3,30.7,30.8,30,31.2,31.3,31.6,34,34.8,41,42.1,42.6,43.5,43.6,45,50,52,53.3,55,55.3,56,57,58,59.5,60.8,60,61.4,65.4,66,75.7,76,82,85,10,12.8,21.5,22,22.5,25,26.8,34.5,35,36.2,44,48.0,91,93.0,130,130.1,133,136,161,161.3,172,172.3,177,182.8,183,188.6,189,192,194.4,196,197,200,200.2,202,205,206,206.2,207,91-nopi}.in) \
$(shell echo Rivet/EE-{183,189}-WW.in) \
$(shell echo Rivet/EE{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Powheg,-Matchbox-Powheg}-{14,14.8}.in) \
$(shell echo Rivet/EE{,-Dipole}-{10.5,11.96,12.8,13.96,16.86,21.84,26.8,28.48,35.44,48.0,97.0}-gg.in) \
$(shell echo Rivet/EE{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg}-{2.2,2.6,3.0,3.2,4.17,4.3,4.41,5.0,5.2,4.6,4.8,5.8,6.2,6.5,6.6,7.0,7.4,3.63,4.03,4.5,8.8,9.27,9.46,9.51,10.52,10.52-sym,10.54,10.58,10.45,10.47,10.6}.in) \
$(shell echo Rivet/EE-{Upsilon,Upsilon2,Upsilon3,Upsilon4,Upsilon5,Upsilon4-asym,JPsi,Psi2S,Psi2S-All,Psi3770,Tau,Phi,Lambdac,Omega-Meson,Omega-Baryon,Eta,Xi0,Xic0,Xicp,Omegac0,Ds,Bc,Etac,Xim}.in) \
$(shell echo Rivet/DIS{,-NoME,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{225,251,300,318,318-CMS}-e+-{VeryLow,Low,Med,High}Q2.in) \
$(shell echo Rivet/DIS{,-NoME,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-318-{e+,e-}-CC-{VeryLow,Low,Med,High}Q2.in) \
$(shell echo Rivet/DIS{,-NoME,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{296,300,318}-e--{VeryLow,Low,Med,High}Q2.in) \
$(shell echo Rivet/TVT{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{Run-I-Z,Run-I-W,Run-I-WZ,Run-II-Z-e,Run-II-Z-{,LowMass-,HighMass-}mu,Run-II-W}.in) \
$(shell echo Rivet/TVT{,-Dipole}-Run-II-{DiPhoton-GammaGamma,DiPhoton-GammaJet,PromptPhoton}.in) \
$(shell echo Rivet/TVT-Powheg-Run-II-{DiPhoton-GammaGamma,DiPhoton-GammaJet}.in) \
$(shell echo Rivet/TVT{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-Run-{I,II}-{Jets-{1..6},DiJets-{1..4}}.in ) \
$(shell echo Rivet/TVT{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-{630-Jets-{1..3},300-Jets-1,900-Jets-1}.in ) \
$(shell echo Rivet/TVT{,-Dipole}-{Run-I,Run-II,300,630,900}-UE.in) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-7-DiJets-{1..7}-{A,B,C}.in ) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-13-DiJets-{{1..11}-A,{6..11}-B}.in ) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-{7,8,13}-Jets-{0..10}.in ) \
$(shell echo Rivet/LHC{,-Dipole}-{900,2360,2760,7,8,13}-UE.in ) \
$(shell echo Rivet/LHC{,-Dipole}-2760-Jets-{1..3}.in ) \
$(shell echo Rivet/LHC{,-Dipole}-{900,7,13}-UE-Long.in ) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-7-Charm-{0..5}.in) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-{5,13}-Charm-0.in) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-7-Bottom-{0..9}.in) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-13-Bottom-{0..6}.in) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-7-Top-{L,SL}.in) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-{8,13}-Top-{All,L,SL}.in) \
$(shell echo Rivet/Star{,-Dipole}-{UE,Jets-{1..4}}.in ) \
$(shell echo Rivet/SppS{,-Dipole}-{53,63,200,500,546,900}-UE.in ) \
- $(shell echo Rivet/LHC{,-Matchbox,-Matchbox-Powheg,-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-{{,8-}W-{e,mu},13-W-mu,{,8-,13-}Z-{e,mu}-Mass{1..5},13-Z-nu,Z-mu-SOPHTY,WZ,WW-{emu,ll},13-WW-ll,13-ZZ-ll,ZZ-{ll,lv},{8,13}-WZ,8-ZZ-lv,8-WW-ll,Z-mu-Short}.in) \
+ $(shell echo Rivet/LHC{,-Matchbox,-Matchbox-Powheg,-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-{{,8-}W-{e,mu},13-W-mu,{2760-,,8-,13-}Z-{e,mu}-Mass{1..5},13-Z-nu,Z-mu-SOPHTY,WZ,WW-{emu,ll},13-WW-ll,13-ZZ-ll,ZZ-{ll,lv},{8,13}-WZ,8-ZZ-lv,8-WW-ll,Z-mu-Short}.in) \
$(shell echo Rivet/LHC{,-Dipole}-7-{W,Z}Gamma-{e,mu}.in) \
$(shell echo Rivet/LHC{,-Dipole}-8-ZGamma-{e,mu}.in) \
$(shell echo Rivet/LHC{,-Matchbox,-Matchbox-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-{7-W-Jet-{1..3}-e,7-Z-Jet-{0..3}-e,7-Z-Jet-0-mu}.in) \
$(shell echo Rivet/LHC{-Matchbox,-Matchbox-Powheg,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-{Z-b,Z-bb,8-Z-b,8-Z-bb,13-Z-b,13-Z-bb,W-b,8-Z-jj}.in) \
$(shell echo Rivet/LHC{,-Dipole}-{7,8,13}-PromptPhoton-{1..5}.in) Rivet/LHC-GammaGamma-7.in \
$(shell echo Rivet/LHC{,-Powheg,-Dipole}-{7,8,13}-{DiPhoton-GammaGamma,DiPhoton-GammaJet}.in) \
$(shell echo Rivet/LHC{,-Powheg,-Matchbox,-Matchbox-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-{ggH,VBF,WH,ZH}.in) \
$(shell echo Rivet/LHC{,-Powheg,-Matchbox,-Matchbox-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-8-{{ggH,VBF,WH,ZH}{,-GammaGamma},ggH-WW}.in) \
$(shell echo Rivet/LHC{,-Matchbox,-Matchbox-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-ggHJet.in) \
$(shell echo Rivet/ISR{,-Dipole}-{{30,44,53,62}-UE,{44,62}-Z-mu}.in Rivet/EHS{,-Dipole}-UE.in) \
$(shell echo Rivet/SPS{,-Dipole}-{17.4-UE,200-Z-mu}.in ) \
$(shell echo Rivet/Fermilab{,-Dipole}-{27.4,38.8}-Z-mu.in )
#$(shell echo Rivet/LHC{,-Dipole}-{7,13}{,-UE}-Cent.in )
Rivet-GammaGamma: Rivet-GammaGamma/done
touch $@
Rivet-GammaGamma/done: $(shell echo Rivet-GammaGamma-mumu-{3.5,4.5,5.5,6.5,7.5,9.0,12.5,17.5,30.0}.yoda )
rm -rf Rivet-GammaGamma
python/merge-GammaGamma GammaGamma
rivet-mkhtml -o Rivet-GammaGamma GammaGamma.yoda:Hw
touch $@
Rivet-EE-Gamma: Rivet-EE-Gamma/done
touch $@
Rivet-EE-Gamma/done: $(shell echo Rivet-EE-Gamma-Direct-mumu-{161,172,183,189,196,206}.yoda ) \
$(shell echo Rivet-EE-Gamma-Direct-tautau-{189,196,206}.yoda ) \
- $(shell echo Rivet-EE-Gamma-{Direct,Single-Resolved,Double-Resolved}-Jets-{198,206}.yoda )
+ $(shell echo Rivet-EE-Gamma-{Direct,Single-Resolved,Double-Resolved}-Jets-{196,198,206}.yoda )
rm -rf Rivet-EE-Gamma
python/merge-EE-Gamma EE-Gamma
rivet-mkhtml -o Rivet-EE-Gamma EE-Gamma.yoda:Hw
touch $@
Rivet-EE : Rivet-EE/done
touch $@
Rivet-EE/done : $(shell echo Rivet{,-Powheg}-EE-{7.7,9.4,12,13,14,14.8,17,27.6,27.7,29,30.2,30.3,30.7,30.8,30,31.2,31.3,31.6,34,34.8,43.5,43.6,45,50,52,53.3,55,55.3,56,57,58,59.5,60.8,60,61.4,65.4,66,75.7,76,10,12.8,21.5,22,22.5,25,26.8,34.5,35,36.2,41,42.1,42.6,44,48.0,82,85,91,93.0,130,130.1,133,136,136.1,161,161.3,172,172.3,177,182.8,183,188.6,189,192,194.4,196,197,200,200.2,202,205,206,206.2,207,91-nopi}.yoda) \
$(shell echo Rivet-EE-{183,189}-WW.yoda) \
$(shell echo Rivet-EE-{10.5,11.96,12.8,13.96,16.86,21.84,26.8,28.48,35.44,48.0,97.0}-gg.yoda) \
$(shell echo Rivet-EE-{10.52,10.52-sym,10.6,2.2,2.6,3.0,3.2,4.6,4.8,5.8,6.2,6.5,6.6,7.0,7.4,3.63,4.03,4.17,4.3,4.41,5.0,5.2,4.5,8.8,9.27,9.46,9.51,10.54,10.58,10.45,10.47,Upsilon,Upsilon2,Upsilon3,Upsilon4,Upsilon5,Upsilon4-asym,Tau,Phi,Lambdac,Omega-Meson,Omega-Baryon,Eta,Xi0,Xic0,Xicp,Omegac0,Ds,Bc,Etac,Xim,JPsi,Psi2S,Psi2S-All,Psi3770}.yoda)
rm -rf Rivet-EE
python/merge-EE --with-gg --with-decay --with-WW EE
python/merge-EE Powheg-EE
rivet-mkhtml -o Rivet-EE EE.yoda:Hw Powheg-EE.yoda:Hw-Powheg
python/plot-EE Rivet-EE
touch $@
Rivet-LowEnergy-%.yoda:
$(HWBUILD) -c .cache/$(subst .yoda,,$@) Rivet/$(subst .yoda,.in,$@)
$(HWRUN) $(subst .yoda,.run,$@)
Rivet-LowEnergy-EE-%:
args="--process "$(word 1,$(subst -, ,$(subst Rivet-LowEnergy-EE-,,$@))); if [ -n "$(strip $(word 2,$(subst -, ,$(subst Rivet-LowEnergy-EE-,,$@))))" ]; then args+=" --flavour "$(word 2,$(subst -, ,$(subst Rivet-LowEnergy-EE-,,$@))); fi; OUTPUT=`python/LowEnergy-EE.py $$args --non-perturbative --perturbative`; $(MAKE) $$OUTPUT NUMEVENTS=$${NUMEVENTS:-10000};
args="--process "$(word 1,$(subst -, ,$(subst Rivet-LowEnergy-EE-,,$@))); plots=`python/LowEnergy-EE.py $$args --plots`; python/mergeLowEnergy.py $(subst Rivet-LowEnergy-,,$@) $$plots; if [ -e LowEnergy-NonPerturbative-EE-$(subst Rivet-LowEnergy-EE-,,$@).yoda ] && [ -e LowEnergy-Perturbative-EE-$(subst Rivet-LowEnergy-EE-,,$@).yoda ]; then rivet-mkhtml -o Rivet-LowEnergy-EE-$(subst Rivet-LowEnergy-EE-,,$@) LowEnergy-NonPerturbative-EE-$(subst Rivet-LowEnergy-EE-,,$@).yoda:"Non-Pert" LowEnergy-Perturbative-EE-$(subst Rivet-LowEnergy-EE-,,$@).yoda:"Pert" $$plots; elif [ -e LowEnergy-NonPerturbative-EE-$(subst Rivet-LowEnergy-EE-,,$@).yoda ]; then rivet-mkhtml -o Rivet-LowEnergy-EE-$(subst Rivet-LowEnergy-EE-,,$@) LowEnergy-NonPerturbative-EE-$(subst Rivet-LowEnergy-EE-,,$@).yoda:"Non-Pert" $$plots; elif [ -e LowEnergy-Perturbative-EE-$(subst Rivet-LowEnergy-EE-,,$@).yoda ]; then rivet-mkhtml -o Rivet-LowEnergy-EE-$(subst Rivet-LowEnergy-EE-,,$@) LowEnergy-Perturbative-EE-$(subst Rivet-LowEnergy-EE-,,$@).yoda:"Pert" $$plots; fi
Rivet-LowEnergy-Photon-%:
args="--process "$(word 1,$(subst -, ,$(subst Rivet-LowEnergy-Photon-,,$@))); OUTPUT=`python/LowEnergy-Photon.py $$args --non-perturbative`; $(MAKE) $$OUTPUT NUMEVENTS=$${NUMEVENTS:-10000};
args="--process "$(word 1,$(subst -, ,$(subst Rivet-LowEnergy-Photon-,,$@))); plots=`python/LowEnergy-Photon.py $$args --plots`; python/mergeLowEnergy.py $(subst Rivet-LowEnergy-Photon-,GammaGamma-,$@) $$plots; if [ -e LowEnergy-NonPerturbative-GammaGamma-$(subst Rivet-LowEnergy-Photon-,,$@).yoda ] && [ -e LowEnergy-Perturbative-GammaGamma-$(subst Rivet-LowEnergy-Photon-,,$@).yoda ]; then rivet-mkhtml -o Rivet-LowEnergy-Photon-$(subst Rivet-LowEnergy-Photon-,,$@) LowEnergy-NonPerturbative-GammaGamma-$(subst Rivet-LowEnergy-Photon-,,$@).yoda:"Non-Pert" LowEnergy-Perturbative-GammaGamma-$(subst Rivet-LowEnergy-Photon-,,$@).yoda:"Pert" $$plots; elif [ -e LowEnergy-NonPerturbative-GammaGamma-$(subst Rivet-LowEnergy-Photon-,,$@).yoda ]; then rivet-mkhtml -o Rivet-LowEnergy-Photon-$(subst Rivet-LowEnergy-Photon-,,$@) LowEnergy-NonPerturbative-GammaGamma-$(subst Rivet-LowEnergy-Photon-,,$@).yoda:"Non-Pert" $$plots; elif [ -e LowEnergy-Perturbative-GammaGamma-$(subst Rivet-LowEnergy-Photon-,,$@).yoda ]; then rivet-mkhtml -o Rivet-LowEnergy-Photon-$(subst Rivet-LowEnergy-Photon-,,$@) LowEnergy-Perturbative-GammaGamma-$(subst Rivet-LowEnergy-Photon-,,$@).yoda:"Pert" $$plots; fi
Rivet-R:
OUTPUT=`python/R.py --perturbative --non-perturbative`; $(MAKE) $$OUTPUT NUMEVENTS=$${NUMEVENTS:-10000};
plots=`python/R.py --perturbative --non-perturbative --plots`; python/mergeLowEnergy.py R $$plots; rivet-mkhtml -o Rivet-R LowEnergy-Perturbative-R.yoda:"Pert" LowEnergy-NonPerturbative-R.yoda:"Non-Pert" $$plots
Rivet-DIS : Rivet-DIS/done
touch $@
Rivet-DIS/done: $(shell echo Rivet{-DIS,-NoME-DIS,-Powheg-DIS}-{225,251,300,318,318-CMS}-e+-{VeryLow,Low,Med,High}Q2.yoda) \
$(shell echo Rivet{-DIS,-NoME-DIS,-Powheg-DIS}-{296,300,318}-e--{VeryLow,Low,Med,High}Q2.yoda) \
$(shell echo Rivet{-DIS,-NoME-DIS,-Powheg-DIS}-318-{e+,e-}-CC-{VeryLow,Low,Med,High}Q2.yoda)
rm -rf Rivet-DIS
python/merge-DIS DIS
python/merge-DIS Powheg-DIS
python/merge-DIS NoME-DIS
rivet-mkhtml -o Rivet-DIS DIS.yoda:Hw Powheg-DIS.yoda:Hw-Powheg NoME-DIS.yoda:Hw-NoME
touch $@
Rivet-TVT-EW : Rivet-TVT-EW/done
touch $@
Rivet-TVT-EW/done: $(shell echo Rivet{,-Powheg}-TVT-{Run-I-Z,Run-I-W,Run-I-WZ,Run-II-Z-{e,{,LowMass-,HighMass-}mu},Run-II-W}.yoda)
rm -rf Rivet-TVT-EW
python/merge-TVT-EW TVT
python/merge-TVT-EW Powheg-TVT
rivet-mkhtml -o Rivet-TVT-EW TVT-EW.yoda:Hw Powheg-TVT-EW.yoda:Hw-Powheg
touch $@
Rivet-TVT-Photon : Rivet-TVT-Photon/done
touch $@
Rivet-TVT-Photon/done: $(shell echo Rivet{,-Powheg}-TVT-Run-II-{DiPhoton-GammaGamma,DiPhoton-GammaJet}.yoda Rivet-TVT-Run-II-PromptPhoton.yoda)
rm -rf Rivet-TVT-Photon
python/merge-TVT-Photon TVT
python/merge-TVT-Photon Powheg-TVT
rivet-mkhtml -o Rivet-TVT-Photon TVT-Photon.yoda:Hw Powheg-TVT-Photon.yoda:Hw-Powheg
touch $@
Rivet-TVT-Jets : Rivet-TVT-Jets/done
touch $@
Rivet-TVT-Jets/done: $(shell echo Rivet-TVT-Run-{I,II}-{Jets-{1..6},DiJets-{1..4}}.yoda ) \
$(shell echo Rivet-TVT-{630-Jets-{1..3},300-Jets-1,900-Jets-1}.yoda ) \
$(shell echo Rivet-TVT-{Run-I,Run-II,300,630,900}-UE.yoda)
rm -rf Rivet-TVT-Jets
python/merge-TVT-Jets TVT
rivet-mkhtml -o Rivet-TVT-Jets TVT-Jets.yoda:Hw
touch $@
Rivet-Fixed : Rivet-Fixed/done
touch $@
Rivet-Fixed/done : $(shell echo Rivet-SppS-{53,63,200,500,546,900}-UE.yoda ) \
$(shell echo Rivet-ISR-{{30,44,53,62}-UE,{44,62}-Z-mu}.yoda ) Rivet-EHS-UE.yoda \
$(shell echo Rivet-Star-{UE,Jets-{1..4}}.yoda ) \
$(shell echo Rivet-SPS-{17.4-UE,200-Z-mu}.yoda ) \
$(shell echo Rivet-Fermilab-{27.4,38.8}-Z-mu.yoda )
rm -rf Rivet-Fixed
python/merge-Fixed Fixed
rivet-mkhtml -o Rivet-Fixed Fixed.yoda:Hw
touch $@
Rivet-LHC-Jets : Rivet-LHC-Jets/done
touch $@
Rivet-LHC-Jets/done : \
$(shell echo Rivet-LHC-7-DiJets-{1..7}-{A,B,C}.yoda ) \
$(shell echo Rivet-LHC-13-DiJets-{{1..11}-A,{6..11}-B}.yoda ) \
$(shell echo Rivet-LHC-{7,8,13}-Jets-{0..10}.yoda ) \
$(shell echo Rivet-LHC-2760-Jets-{1..3}.yoda ) \
$(shell echo Rivet-LHC-{900,2360,2760,7,8,13}-UE.yoda ) \
$(shell echo Rivet-LHC-{900,7,13}-UE-Long.yoda ) \
$(shell echo Rivet-LHC-7-Charm-{0..5}.yoda ) \
$(shell echo Rivet-LHC-{5,13}-Charm-0.yoda ) \
$(shell echo Rivet-LHC-7-Bottom-{0..9}.yoda ) \
$(shell echo Rivet-LHC-13-Bottom-{0..6}.yoda ) \
$(shell echo Rivet-LHC-{7,8,13}-Top-{L,SL}.yoda ) \
$(shell echo Rivet-LHC-{8,13}-Top-All.yoda )
# $(shell echo Rivet-LHC-{7,13}-UE-Cent.yoda )
rm -rf Rivet-LHC-Jets
python/merge-LHC-Jets LHC
rivet-mkhtml -o Rivet-LHC-Jets LHC-Jets.yoda:Hw
touch $@
Rivet-LHC-EW : Rivet-LHC-EW/done
touch $@
Rivet-LHC-EW/done: \
- $(shell echo Rivet{,-Powheg}-LHC-{{,8-}W-{e,mu},13-W-mu,{,8-,13-}Z-{e,mu}-Mass{1..5},13-Z-nu,Z-mu-SOPHTY,WZ,WW-{emu,ll},13-WW-ll,ZZ-{ll,lv},{8,13}-WZ,13-ZZ-ll,8-ZZ-lv,8-WW-ll,Z-mu-Short}.yoda) \
+ $(shell echo Rivet{,-Powheg}-LHC-{{,8-}W-{e,mu},13-W-mu,{2760-,,8-,13-}Z-{e,mu}-Mass{1..5},13-Z-nu,Z-mu-SOPHTY,WZ,WW-{emu,ll},13-WW-ll,ZZ-{ll,lv},{8,13}-WZ,13-ZZ-ll,8-ZZ-lv,8-WW-ll,Z-mu-Short}.yoda) \
$(shell echo Rivet-LHC-{7-W-Jet-{1..3}-e,7-Z-Jet-{0..3}-e,7-Z-Jet-0-mu}.yoda) \
$(shell echo Rivet-LHC-7-{W,Z}Gamma-{e,mu}.yoda) \
$(shell echo Rivet-LHC-8-ZGamma-{e,mu}.yoda)
rm -rf Rivet-LHC-EW;
python/merge-LHC-EW LHC
python/merge-LHC-EW Powheg-LHC
rivet-mkhtml -o Rivet-LHC-EW LHC-EW.yoda:Hw Powheg-LHC-EW.yoda:Hw-Powheg \
Rivet-LHC-Z-mu-SOPHTY.yoda:Hw Rivet-Powheg-LHC-Z-mu-SOPHTY.yoda:Hw-Powheg
touch $@
Rivet-LHC-Photon : Rivet-LHC-Photon/done
touch $@
Rivet-LHC-Photon/done: \
$(shell echo Rivet-LHC-{7,8,13}-PromptPhoton-{1..5}.yoda) \
Rivet-LHC-GammaGamma-7.yoda \
$(shell echo Rivet{,-Powheg}-LHC-{7,8,13}-{DiPhoton-GammaGamma,DiPhoton-GammaJet}.yoda)
rm -rf Rivet-LHC-Photon
python/merge-LHC-Photon LHC
python/merge-LHC-Photon Powheg-LHC
rivet-mkhtml -o Rivet-LHC-Photon LHC-Photon.yoda:Hw Powheg-LHC-Photon.yoda:Hw-Powheg
touch $@
Rivet-LHC-Higgs : Rivet-LHC-Higgs/done
touch $@
Rivet-LHC-Higgs/done: \
$(shell echo Rivet{,-Powheg}-LHC-{ggH,VBF,WH,ZH}.yoda) \
$(shell echo Rivet{,-Powheg}-LHC-8-{{ggH,VBF,WH,ZH}{,-GammaGamma},ggH-WW}.yoda) \
Rivet-LHC-ggHJet.yoda
rivet-merge Rivet-Powheg-LHC-8-{ggH{-GammaGamma,-WW,},{VBF,ZH,WH}{,-GammaGamma}}.yoda -o Powheg-LHC-Higgs.yoda
rivet-merge Rivet-LHC-8-{ggH{-GammaGamma,-WW,},{VBF,ZH,WH}{,-GammaGamma}}.yoda -o LHC-Higgs.yoda
rm -rf Rivet-LHC-Higgs
rivet-mkhtml -o Rivet-LHC-Higgs Powheg-LHC-Higgs.yoda:Hw-Powheg LHC-Higgs.yoda:Hw\
Rivet-Powheg-LHC-ggH.yoda:gg-Powheg Rivet-LHC-ggH.yoda:gg Rivet-LHC-ggHJet.yoda:HJet \
Rivet-Powheg-LHC-VBF.yoda:VBF-Powheg Rivet-LHC-VBF.yoda:VBF Rivet-LHC-WH.yoda:WH Rivet-LHC-ZH.yoda:ZH \
Rivet-Powheg-LHC-WH.yoda:WH-Powheg Rivet-Powheg-LHC-ZH.yoda:ZH-Powheg
touch $@
clean-local:
rm -f *.out *.log *.tex *.top *.run *.dump *.mult *.Bmult *.yoda Rivet/*.in anatohepmc.txt hepmctoana.txt
rm -rf Rivet-*
distclean-local:
rm -rf .cache
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-198.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-198.in
deleted file mode 100644
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-198.in
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- ThePEG-repository -*-
-##################################################
-# LEP physics parameters (override defaults)
-##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 198.
-##################################################
-# select the analyses
-##################################################
-# L3 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I661114
-# OPAL jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2003_I611415
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-206.in
deleted file mode 100644
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Double-Resolved-Jets-206.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- ThePEG-repository -*-
-##################################################
-# LEP physics parameters (override defaults)
-##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 206.
-##################################################
-# select the analyses
-##################################################
-# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2008_I754316
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-196.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-196.in
new file mode 100644
--- /dev/null
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-196.in
@@ -0,0 +1,10 @@
+# -*- ThePEG-repository -*-
+##################################################
+# LEP physics parameters (override defaults)
+##################################################
+set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 195.8.
+##################################################
+# select the analyses
+##################################################
+# OPAL charge particles
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2007_I734955
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-198.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-198.in
rename from Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-198.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Jets-198.in
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-206.in
rename from Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-206.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-Jets-206.in
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-Jets-206.in
+++ b/Tests/Rivet/EE-Gamma/EE-Gamma-Jets-206.in
@@ -1,10 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# LEP physics parameters (override defaults)
##################################################
set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 206.
##################################################
# select the analyses
##################################################
-# L3 mu+mu-
+# OPAL jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2008_I754316
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-198.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-198.in
deleted file mode 100644
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-198.in
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- ThePEG-repository -*-
-##################################################
-# LEP physics parameters (override defaults)
-##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 198.
-##################################################
-# select the analyses
-##################################################
-# L3 jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I661114
-# OPAL jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2003_I611415
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-206.in
deleted file mode 100644
--- a/Tests/Rivet/EE-Gamma/EE-Gamma-Single-Resolved-Jets-206.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- ThePEG-repository -*-
-##################################################
-# LEP physics parameters (override defaults)
-##################################################
-set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 206.
-##################################################
-# select the analyses
-##################################################
-# L3 mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2008_I754316
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-161.in b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-161.in
rename from Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-161.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-mumu-161.in
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-172.in b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-172.in
rename from Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-172.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-mumu-172.in
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-183.in b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-183.in
rename from Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-183.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-mumu-183.in
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-189.in b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-189.in
rename from Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-189.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-mumu-189.in
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-196.in b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-196.in
rename from Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-196.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-mumu-196.in
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-mumu-206.in
rename from Tests/Rivet/EE-Gamma/EE-Gamma-Direct-mumu-206.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-mumu-206.in
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-189.in b/Tests/Rivet/EE-Gamma/EE-Gamma-tautau-189.in
rename from Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-189.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-tautau-189.in
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-196.in b/Tests/Rivet/EE-Gamma/EE-Gamma-tautau-196.in
rename from Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-196.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-tautau-196.in
diff --git a/Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-206.in b/Tests/Rivet/EE-Gamma/EE-Gamma-tautau-206.in
rename from Tests/Rivet/EE-Gamma/EE-Gamma-Direct-tautau-206.in
rename to Tests/Rivet/EE-Gamma/EE-Gamma-tautau-206.in
diff --git a/Tests/Rivet/LHC/LHC-13-Top-L.in b/Tests/Rivet/LHC/LHC-13-Top-L.in
--- a/Tests/Rivet/LHC/LHC-13-Top-L.in
+++ b/Tests/Rivet/LHC/LHC-13-Top-L.in
@@ -1,19 +1,20 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS top
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1468168
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1495243
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1705857
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1759875
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1707015
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2023_I2648096
# ATLAS WWbb
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1677498
# CMS top
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1620050
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1703993
# LHCB top
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2018_I1662483
# ATLAS colour connections
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2022_I2152933
diff --git a/Tests/Rivet/LHC/LHC-13-Top-SL.in b/Tests/Rivet/LHC/LHC-13-Top-SL.in
--- a/Tests/Rivet/LHC/LHC-13-Top-SL.in
+++ b/Tests/Rivet/LHC/LHC-13-Top-SL.in
@@ -1,16 +1,18 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1491950
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1614149
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1662081
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1663958
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1656578
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1690148
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1705857
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1724098
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1764472
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1750330
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2021_I1941095
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2018_I1707015
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2021_I1901295
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2022_I2037744
diff --git a/Tests/Rivet/LHC/LHC-13-UE.in b/Tests/Rivet/LHC/LHC-13-UE.in
--- a/Tests/Rivet/LHC/LHC-13-UE.in
+++ b/Tests/Rivet/LHC/LHC-13-UE.in
@@ -1,24 +1,26 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1384119
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_PAS_FSQ_15_007
# ATLAS UE
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1419652
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1467230
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1509919
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1468167
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1511284
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1653948
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1680318
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1471287
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2018_I1518782
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2018_I1692008
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2020_I1783943
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2018_I1665223
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2018_I1708620
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1608166
# ALICE light hadrons
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2020_I1797443
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2021_I1889335
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2023_I2658888
diff --git a/Tests/Rivet/LHC/LHC-13-W-mu.in b/Tests/Rivet/LHC/LHC-13-W-mu.in
--- a/Tests/Rivet/LHC/LHC-13-W-mu.in
+++ b/Tests/Rivet/LHC/LHC-13-W-mu.in
@@ -1,8 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# CMS W+jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1610623
# CMS W+charm
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2019_I1705068
+# ATLAS W+charm
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2023_I2628732
diff --git a/Tests/Rivet/LHC/LHC-13-WZ.in b/Tests/Rivet/LHC/LHC-13-WZ.in
--- a/Tests/Rivet/LHC/LHC-13-WZ.in
+++ b/Tests/Rivet/LHC/LHC-13-WZ.in
@@ -1,6 +1,7 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# general analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1469071
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1720438
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-8-Z-e.in b/Tests/Rivet/LHC/LHC-8-Z-e.in
--- a/Tests/Rivet/LHC/LHC-8-Z-e.in
+++ b/Tests/Rivet/LHC/LHC-8-Z-e.in
@@ -1,16 +1,19 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS Z pT and phi*
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516:LMODE=EL
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1631985:LMODE=EL
# ATLAS high mass drell-yan
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1467454:LMODE=EL
# ATLAS splittings
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1589844:LMODE=EL
# CMS Z+b
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1499471
# ATLAS Z+jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2019_I1744201
# CMS Z + jets
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1497519
\ No newline at end of file
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1497519
+# CMS Z+ charm
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1634835
\ No newline at end of file
diff --git a/Tests/Rivet/LHC/LHC-8-Z-mu.in b/Tests/Rivet/LHC/LHC-8-Z-mu.in
--- a/Tests/Rivet/LHC/LHC-8-Z-mu.in
+++ b/Tests/Rivet/LHC/LHC-8-Z-mu.in
@@ -1,18 +1,21 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
# ATLAS Z + dijets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1279489
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1631985:LMODE=MU
# ATLAS Z pT and phi*
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516:LMODE=MU
# ATLAS high mass drell-yan
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1467454:LMODE=MU
# ATLAS splittings rivet problem with this at the moment)
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1589844:LMODE=MU
# LHCb W/Z analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2016_I1454404:MODE=ZJET
# LHC W/Z spectrum
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2016_I1471281
# CMS Z + jets
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1497519
+# CMS Z+ charm
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1634835
diff --git a/Tests/Rivet/Star/Star-UE.in b/Tests/Rivet/Star/Star-UE.in
--- a/Tests/Rivet/Star/Star-UE.in
+++ b/Tests/Rivet/Star/Star-UE.in
@@ -1,11 +1,10 @@
# -*- ThePEG-repository -*-
##################################################
# select the analyses
##################################################
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2006_I709170
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2006_I722757
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2006_I723509
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2008_I793126
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2009_UE_HELEN
-# this one is d-Au, supposed to be pp like but omit
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2008_S7993412
\ No newline at end of file
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 STAR_2014_I1253360
diff --git a/Tests/python/merge-EE-Gamma.in b/Tests/python/merge-EE-Gamma.in
--- a/Tests/python/merge-EE-Gamma.in
+++ b/Tests/python/merge-EE-Gamma.in
@@ -1,138 +1,138 @@
-#! @PYTHON@
+#! /usr/bin/python
# -*- mode: python -*-
from __future__ import print_function
import logging,sys, os, yoda, copy
if sys.version_info[:3] < (2,4,0):
print ("rivet scripts require Python version >= 2.4.0... exiting")
sys.exit(1)
#############################################
def fillAbove(desthisto, sourcehistosbysqrts):
if type(desthisto) is yoda.core.Scatter2D :
for sqrts in sorted(sourcehistosbysqrts.keys()) :
h=sourcehistosbysqrts[sqrts]
for i in range(0,h.numPoints()) :
if sqrts==h.points()[i].x() :
desthisto.addPoint(h.points()[i])
elif(type(desthisto)==yoda.core.Profile1D) :
for sqrts, h in sorted(sourcehistosbysqrts.items()) :
for i in range(0,h.numBins()) :
if(sqrts>=h.bins()[i].xMin() and \
sqrts<=h.bins()[i].xMax()) :
desthisto.bins()[i] += h.bins()[i]
break
else :
logging.error("Unknown analysis object" + desthisto.path)
sys.exit(1)
def merge(hpath):
global inhistos
global outhistos
try:
fillAbove(outhistos[hpath], inhistos[hpath])
except:
pass
def useOne(hpath, sqrts):
global inhistos
global outhistos
try:
outhistos[hpath] = inhistos[hpath][float(sqrts)]
except:
pass
if __name__ == "__main__":
import logging
from optparse import OptionParser, OptionGroup
parser = OptionParser(usage="%prog name")
verbgroup = OptionGroup(parser, "Verbosity control")
verbgroup.add_option("-v", "--verbose", action="store_const", const=logging.DEBUG, dest="LOGLEVEL",
default=logging.INFO, help="print debug (very verbose) messages")
verbgroup.add_option("-q", "--quiet", action="store_const", const=logging.WARNING, dest="LOGLEVEL",
default=logging.INFO, help="be very quiet")
parser.add_option_group(verbgroup)
(opts, args) = parser.parse_args()
logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
## Check args
if len(args) < 1:
logging.error("Must specify at least the name of the files")
sys.exit(1)
#######################################
yodafiles=["-Direct-mumu-161","-Direct-mumu-172","-Direct-mumu-183",
"-Direct-mumu-189","-Direct-mumu-196","-Direct-mumu-206",
"-Direct-tautau-189","-Direct-tautau-196","-Direct-tautau-206",
"-Direct-Jets-198","-Single-Resolved-Jets-198","-Double-Resolved-Jets-198",
- "-Direct-Jets-206","-Single-Resolved-Jets-206","-Double-Resolved-Jets-206",]
+ "-Direct-Jets-206","-Single-Resolved-Jets-206","-Double-Resolved-Jets-206"]
# Get histos
inhistos = {}
outhistos = {}
for f in yodafiles:
file = "Rivet-%s%s.yoda" % (args[0], f)
sqrts=float(f.split("-")[-1].replace(".yoda",""))
if not os.access(file, os.R_OK):
logging.error("%s cannot be read" % file)
continue
try:
aos = yoda.read(file)
except:
logging.error("%s cannot be parsed as yoda" % file)
continue
## Get histos from this YODA file
for aopath, ao in aos.items() :
if("RAW" in aopath or "_XSEC" in aopath or "_EVTCOUNT" in aopath ) :continue
# merge of different energy values
- if("L3_2004_I645127" in aopath) :
+ if "L3_2004_I645127" in aopath :
if(("d01" in aopath and "mu" in file) or
("d02" in aopath and "tau" in file)) :
if aopath not in inhistos :
inhistos[aopath] = {}
if sqrts not in inhistos[aopath]:
inhistos[aopath][sqrts] = ao
else:
raise Exception("A set with sqrts = %s already exists" % ( sqrts))
else :
if(aopath in outhistos) :
outhistos[aopath] += ao
else :
outhistos[aopath] = ao
## Make empty output histos if needed
for hpath,hsets in inhistos.items():
if("L3_2004_I645127" in hpath ) :
histo = list(hsets.values())[0]
if(type(histo)==yoda.core.Scatter2D) :
outhistos[hpath] = yoda.core.Scatter2D(histo.path(),
histo.title())
elif(type(histo)==yoda.core.Profile1D) :
outhistos[hpath] = yoda.core.Profile1D(histo.path(),
histo.title())
for i in range(0,histo.numBins) :
outhistos[hpath].addBin(histo.bins()[i].xMin(),
histo.bins()[i].xMax())
elif(type(histo)==yoda.core.Histo1D) :
outhistos[hpath] = yoda.core.Histo1D(histo.path(),
histo.title())
for i in range(0,histo.numBins) :
outhistos[hpath].addBin(histo.bins()[i].xMin(),
histo.bins()[i].xMax())
else :
logging.error("Histogram %s is of unknown type" % hpath)
sys.exit(1)
merge("/L3_2004_I645127/d01-x01-y01")
merge("/L3_2004_I645127/d01-x01-y02")
merge("/L3_2004_I645127/d02-x01-y01")
# Choose output file
name = args[0]+".yoda"
# output the yoda file
print ("Write yoda to ",name)
yoda.writeYODA(outhistos,name)
sys.exit(0)

File Metadata

Mime Type
text/x-diff
Expires
Sat, Dec 21, 1:44 PM (20 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4023011
Default Alt Text
(41 KB)

Event Timeline