diff --git a/Tests/Makefile.am b/Tests/Makefile.am
--- a/Tests/Makefile.am
+++ b/Tests/Makefile.am
@@ -1,389 +1,389 @@
AM_LDFLAGS += -module -avoid-version -rpath /dummy/path/not/used
EXTRA_DIST = Inputs python Rivet
EXTRA_LTLIBRARIES = LeptonTest.la GammaTest.la HadronTest.la DISTest.la
if WANT_LIBFASTJET
EXTRA_LTLIBRARIES += HadronJetTest.la LeptonJetTest.la
HadronJetTest_la_SOURCES = \
Hadron/VHTest.h Hadron/VHTest.cc\
Hadron/VTest.h Hadron/VTest.cc\
Hadron/HTest.h Hadron/HTest.cc
HadronJetTest_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
-I$(FASTJETPATH)
HadronJetTest_la_LIBADD = $(FASTJETLIBS)
LeptonJetTest_la_SOURCES = \
Lepton/TopDecay.h Lepton/TopDecay.cc
LeptonJetTest_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
-I$(FASTJETPATH)
LeptonJetTest_la_LIBADD = $(FASTJETLIBS)
endif
LeptonTest_la_SOURCES = \
Lepton/VVTest.h Lepton/VVTest.cc \
Lepton/VBFTest.h Lepton/VBFTest.cc \
Lepton/VHTest.h Lepton/VHTest.cc \
Lepton/FermionTest.h Lepton/FermionTest.cc
GammaTest_la_SOURCES = \
Gamma/GammaMETest.h Gamma/GammaMETest.cc \
Gamma/GammaPMETest.h Gamma/GammaPMETest.cc
DISTest_la_SOURCES = \
DIS/DISTest.h DIS/DISTest.cc
HadronTest_la_SOURCES = \
Hadron/HadronVVTest.h Hadron/HadronVVTest.cc\
Hadron/HadronVBFTest.h Hadron/HadronVBFTest.cc\
Hadron/WHTest.h Hadron/WHTest.cc\
Hadron/ZHTest.h Hadron/ZHTest.cc\
Hadron/VGammaTest.h Hadron/VGammaTest.cc\
Hadron/ZJetTest.h Hadron/ZJetTest.cc\
Hadron/WJetTest.h Hadron/WJetTest.cc\
Hadron/QQHTest.h Hadron/QQHTest.cc
REPO = $(top_builddir)/src/HerwigDefaults.rpo
HERWIG = $(top_builddir)/src/Herwig
HWREAD = $(HERWIG) read --repo $(REPO) -L $(builddir)/.libs -i $(top_builddir)/src
HWBUILD = $(HERWIG) build --repo $(REPO) -L $(builddir)/.libs -i $(top_builddir)/src
HWINTEGRATE = $(HERWIG) integrate
HWRUN = $(HERWIG) run -N $${NUMEVENTS:-10000}
tests : tests-LEP tests-DIS tests-LHC tests-Gamma
LEPDEPS = \
test-LEP-VV \
test-LEP-VH \
test-LEP-VBF \
test-LEP-BB \
test-LEP-Quarks \
test-LEP-Leptons
if WANT_LIBFASTJET
LEPDEPS += test-LEP-TopDecay
endif
tests-LEP : $(LEPDEPS)
tests-DIS : test-DIS-Charged test-DIS-Neutral
LHCDEPS = \
test-LHC-WW test-LHC-WZ test-LHC-ZZ \
test-LHC-ZGamma test-LHC-WGamma \
test-LHC-ZH test-LHC-WH \
test-LHC-ZJet test-LHC-WJet \
test-LHC-Z test-LHC-W \
test-LHC-ZZVBF test-LHC-VBF \
test-LHC-WWVBF \
test-LHC-bbH test-LHC-ttH \
test-LHC-GammaGamma test-LHC-GammaJet \
test-LHC-Higgs test-LHC-HiggsJet \
test-LHC-QCDFast test-LHC-QCD \
test-LHC-Top
if WANT_LIBFASTJET
LHCDEPS += \
test-LHC-Bottom \
test-LHC-WHJet test-LHC-ZHJet test-LHC-HJet \
test-LHC-ZShower test-LHC-WShower \
test-LHC-WHJet-Powheg test-LHC-ZHJet-Powheg test-LHC-HJet-Powheg \
test-LHC-ZShower-Powheg test-LHC-WShower-Powheg
endif
tests-LHC : $(LHCDEPS)
tests-Gamma : test-Gamma-FF test-Gamma-WW test-Gamma-P
LEPLIBS = LeptonTest.la
HADLIBS = HadronTest.la
if WANT_LIBFASTJET
LEPLIBS += LeptonJetTest.la
HADLIBS += HadronJetTest.la
endif
test-LEP-% : Inputs/LEP-%.in $(LEPLIBS)
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<))
test-Gamma-% : Inputs/Gamma-%.in GammaTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<))
test-DIS-% : Inputs/DIS-%.in DISTest.la
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<))
test-LHC-% : Inputs/LHC-%.in GammaTest.la $(HADLIBS)
$(HWREAD) $<
$(HWRUN) $(notdir $(subst .in,.run,$<))
tests-Rivet : Rivet-EE Rivet-DIS Rivet-Fixed \
Rivet-TVT-WZ Rivet-TVT-Photon Rivet-TVT-Jets \
Rivet-LHC-Jets Rivet-LHC-EW Rivet-LHC-Photon Rivet-LHC-Higgs
Rivet-%-UE-Cent.yoda : Rivet-%-UE-Cent.run Rivet-%-Cent.run
rm -rf $(subst .yoda,,$@)
mkdir $(subst .yoda,,$@)
mv $(subst .yoda,.run,$@) $(subst UE-,,$(subst .yoda,.run,$@)) $(subst .yoda,,$@)
cd $(subst .yoda,,$@); ../$(HWRUN) $(subst UE-,,$(subst .yoda,.run,$@)); mv $(subst UE-,,$@) ALICE_2015_PPCentrality.yoda
cd $(subst .yoda,,$@); export RIVET_ANALYSIS_PATH=`pwd`; ../$(HWRUN) $(subst .yoda,.run,$@)
mv $(subst .yoda,,$@)/$@ .
rm -rf $(subst .yoda,,$@)
Rivet-%.run : Rivet/%.in
$(HWBUILD) -c .cache/$(subst .run,,$@) $<
Rivet-Matchbox-%.yoda : Rivet-Matchbox-%.run
$(HWINTEGRATE) -c .cache/$(subst .run,,$<) $<
$(HWRUN) -c .cache/$(subst .run,,$<) $<
Rivet-%.yoda : Rivet-%.run
$(HWRUN) $<
Rivet/%.in :
python/make_input_files.py $(notdir $(subst .in,,$@))
Rivet-inputfiles: $(shell echo Rivet/EE{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{7.7,9.4,12,13,17,27.6,27.7,29,30.2,30.3,30.7,30.8,30,31.2,31.3,31.6,34,34.8,41,42.1,42.6,43.5,43.6,45,50,52,53.3,55,55.3,56,57,58,59.5,60.8,60,61.4,65.4,66,75.7,76,82,85,10,12.8,21.5,22,25,26.8,34.5,35,36.2,44,48.0,91,93.0,130,130.1,133,136,161,161.3,172,172.3,177,182.8,183,188.6,189,192,194.4,196,197,200,200.2,202,205,206,206.2,207,91-nopi}.in) \
$(shell echo Rivet/EE{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Powheg,-Matchbox-Powheg}-{14,14.8}.in) \
$(shell echo Rivet/EE{,-Dipole}-{10.5,11.96,12.8,13.96,16.86,21.84,26.8,28.48,35.44,48.0,97.0}-gg.in) \
$(shell echo Rivet/EE{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg}-{2.2,2.6,3.0,3.2,4.17,4.3,4.41,5.0,5.2,4.6,4.8,5.8,6.2,6.6,7.0,7.4,3.63,4.03,4.5,8.8,9.27,9.46,9.51,10.52,10.52-sym,10.54,10.58,10.45,10.47,10.6}.in) \
$(shell echo Rivet/EE-{Upsilon,Upsilon2,Upsilon3,Upsilon4,Upsilon4-asym,JPsi,Psi2S,Psi3770,Tau,Phi,Lambdac,Omega-Meson,Omega-Baryon,Eta,Xi0,Xic0,Xicp,Omegac0,Xim}.in) \
- $(shell echo Rivet/DIS{,-NoME,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{460,575,820,920}-e+-{Low,Med,High}Q2.yoda) \
- $(shell echo Rivet/DIS{,-NoME,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{920-e--{Low,Med,High,All},820-e--Low,920-e+-All}Q2.yoda) \
- $(shell echo Rivet/DIS{,-NoME,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-920-{e+,e-}-CC-{Low,Med,High}Q2.yoda) \
+ $(shell echo Rivet/DIS{,-NoME,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{460,575,820,920}-e+-{VeryLow,Low,Med,High}Q2.yoda) \
+ $(shell echo Rivet/DIS{,-NoME,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-920-{e+,e-}-CC-{VeryLow,Low,Med,High}Q2.yoda) \
+ $(shell echo Rivet/DIS{,-NoME,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{820,920}-e--{VeryLow,Low,Med,High}Q2.yoda) \
$(shell echo Rivet/TVT{,-Powheg,-Matchbox,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox-Powheg,-Merging}-{Run-I-Z,Run-I-W,Run-I-WZ,Run-II-Z-e,Run-II-Z-{,LowMass-,HighMass-}mu,Run-II-W}.in) \
$(shell echo Rivet/TVT{,-Dipole}-Run-II-{DiPhoton-GammaGamma,DiPhoton-GammaJet,PromptPhoton}.in) \
$(shell echo Rivet/TVT-Powheg-Run-II-{DiPhoton-GammaGamma,DiPhoton-GammaJet}.in) \
$(shell echo Rivet/TVT{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-{Run-II-Jets-{0..11},Run-I-Jets-{1..8}}.in ) \
$(shell echo Rivet/TVT{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-{630-Jets-{1..3},300-Jets-1,900-Jets-1}.in ) \
$(shell echo Rivet/TVT{,-Dipole}-{Run-I,Run-II,300,630,900}-UE.in) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-7-DiJets-{1..7}-{A,B,C}.in ) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-13-DiJets-{{1..11}-A,{6..11}-B}.in ) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-{7,8,13}-Jets-{0..10}.in ) \
$(shell echo Rivet/LHC{,-Dipole}-{900,2360,2760,7,8,13}-UE.in ) \
$(shell echo Rivet/LHC{,-Dipole}-{7,13}{,-UE}-Cent.in ) \
$(shell echo Rivet/LHC{,-Dipole}-2760-Jets-{1..3}.in ) \
$(shell echo Rivet/LHC{,-Dipole}-{900,7,13}-UE-Long.in ) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-7-Charm-{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}-7-Top-{L,SL}.in) \
$(shell echo Rivet/LHC{,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Matchbox,-Matchbox-Powheg,-Merging}-{8,13}-Top-{All,L,SL}.in) \
$(shell echo Rivet/Star{,-Dipole}-{UE,Jets-{1..4}}.in ) \
$(shell echo Rivet/SppS{,-Dipole}-{53,63,200,500,546,900}-UE.in ) \
$(shell echo Rivet/LHC{,-Matchbox,-Matchbox-Powheg,-Powheg,-Dipole,-Dipole-MCatNLO,-Dipole-Matchbox-Powheg,-Merging}-{{,8-}W-{e,mu},13-Z-{e,mu,nu},Z-HighMass{1,2}-e,13-W-mu,{8,13}-Z-Mass{1..4}-{e,mu},Z-{e,mu,mu-SOPHTY},Z-LowMass-{e,mu},Z-MedMass-e,WZ,WW-{emu,ll},13-WW-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,W-b,8-Z-jj}.in) \
$(shell echo Rivet/LHC{,-Dipole}-{7,8,13}-PromptPhoton-{1..4}.in) Rivet/LHC-GammaGamma-7.in \
$(shell echo Rivet/LHC{,-Powheg,-Dipole}-{7,8,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 )
Rivet-GammaGamma: Rivet-GammaGamma/done
touch $@
Rivet-GammaGamma/done: $(shell echo Rivet-GammaGamma-mumu-{3.5,4.5,5.5,6.5,7.5,9.0,12.5,17.5,30.0}.yoda )
rm -rf Rivet-GammaGamma
python/merge-GammaGamma GammaGamma
rivet-mkhtml -o Rivet-GammaGamma GammaGamma.yoda:Hw
touch $@
Rivet-EE-Gamma: Rivet-EE-Gamma/done
touch $@
Rivet-EE-Gamma/done: $(shell echo Rivet-EE-Gamma-Direct-mumu-{161,172,183,189,196,206}.yoda ) \
$(shell echo Rivet-EE-Gamma-Direct-tautau-{189,196,206}.yoda ) \
$(shell echo Rivet-EE-Gamma-{Direct,Single-Resolved,Double-Resolved}-Jets-{198,206}.yoda )
rm -rf Rivet-EE-Gamma
python/merge-EE-Gamma EE-Gamma
rivet-mkhtml -o Rivet-EE-Gamma EE-Gamma.yoda:Hw
touch $@
Rivet-EE : Rivet-EE/done
touch $@
Rivet-EE/done : $(shell echo Rivet{,-Powheg}-EE-{7.7,9.4,12,13,14,14.8,17,27.6,27.7,29,30.2,30.3,30.7,30.8,30,31.2,31.3,31.6,34,34.8,43.5,43.6,45,50,52,53.3,55,55.3,56,57,58,59.5,60.8,60,61.4,65.4,66,75.7,76,10,12.8,21.5,22,25,26.8,34.5,35,36.2,41,42.1,42.6,44,48.0,82,85,91,93.0,130,130.1,133,136,136.1,161,161.3,172,172.3,177,182.8,183,188.6,189,192,194.4,196,197,200,200.2,202,205,206,206.2,207,91-nopi}.yoda) \
$(shell echo Rivet-EE-{10.5,11.96,12.8,13.96,16.86,21.84,26.8,28.48,35.44,48.0,97.0}-gg.yoda) \
$(shell echo Rivet-EE-{10.52,10.52-sym,10.6,2.2,2.6,3.0,3.2,4.6,4.8,5.8,6.2,6.6,7.0,7.4,3.63,4.03,4.17,4.3,4.41,5.0,5.2,4.5,8.8,9.27,9.46,9.51,10.54,10.58,10.45,10.47,Upsilon,Upsilon2,Upsilon3,Upsilon4,Upsilon4-asym,Tau,Phi,Lambdac,Omega-Meson,Omega-Baryon,Eta,Xi0,Xic0,Xicp,Omegac0,Xim,JPsi,Psi2S,Psi3770}.yoda)
rm -rf Rivet-EE
python/merge-EE --with-gg --with-decay EE
python/merge-EE Powheg-EE
rivet-mkhtml -o Rivet-EE EE.yoda:Hw Powheg-EE.yoda:Hw-Powheg
python/plot-EE Rivet-EE
touch $@
Rivet-LowEnergy-%.yoda:
$(HWBUILD) -c .cache/$(subst .yoda,,$@) Rivet/$(subst .yoda,.in,$@)
$(HWRUN) $(subst .yoda,.run,$@)
Rivet-LowEnergy-%:
args="--process "$(word 1,$(subst -, ,$(subst Rivet-LowEnergy-,,$@))); if [ -n "$(strip $(word 2,$(subst -, ,$(subst Rivet-LowEnergy-,,$@))))" ]; then args+=" --flavour "$(word 2,$(subst -, ,$(subst Rivet-LowEnergy-,,$@))); fi; OUTPUT=`python/LowEnergy.py $$args --non-perturbative --perturbative`; $(MAKE) $$OUTPUT NUMEVENTS=$${NUMEVENTS:-10000};
args="--process "$(word 1,$(subst -, ,$(subst Rivet-LowEnergy-,,$@))); plots=`python/LowEnergy.py $$args --plots`; python/mergeLowEnergy.py $(subst Rivet-LowEnergy-,,$@) $$plots; if [ -e LowEnergy-EE-NonPerturbative-$(subst Rivet-LowEnergy-,,$@).yoda ] && [ -e LowEnergy-EE-Perturbative-$(subst Rivet-LowEnergy-,,$@).yoda ]; then rivet-mkhtml -o Rivet-LowEnergy-$(subst Rivet-LowEnergy-,,$@) LowEnergy-EE-NonPerturbative-$(subst Rivet-LowEnergy-,,$@).yoda:"Non-Pert" LowEnergy-EE-Perturbative-$(subst Rivet-LowEnergy-,,$@).yoda:"Pert" $$plots; elif [ -e LowEnergy-EE-NonPerturbative-$(subst Rivet-LowEnergy-,,$@).yoda ]; then rivet-mkhtml -o Rivet-LowEnergy-$(subst Rivet-LowEnergy-,,$@) LowEnergy-EE-NonPerturbative-$(subst Rivet-LowEnergy-,,$@).yoda:"Non-Pert" $$plots; elif [ -e LowEnergy-EE-Perturbative-$(subst Rivet-LowEnergy-,,$@).yoda ]; then rivet-mkhtml -o Rivet-LowEnergy-$(subst Rivet-LowEnergy-,,$@) LowEnergy-EE-Perturbative-$(subst Rivet-LowEnergy-,,$@).yoda:"Pert" $$plots; fi
Rivet-R:
OUTPUT=`python/R.py --perturbative --non-perturbative`; $(MAKE) $$OUTPUT NUMEVENTS=$${NUMEVENTS:-10000};
plots=`python/R.py --perturbative --non-perturbative --plots`; python/mergeLowEnergy.py R $$plots; rivet-mkhtml -o Rivet-R LowEnergy-EE-Perturbative-R.yoda:"Pert" LowEnergy-EE-NonPerturbative-R.yoda:"Non-Pert" $$plots
Rivet-DIS : Rivet-DIS/done
touch $@
-Rivet-DIS/done: $(shell echo Rivet{-DIS,-NoME-DIS,-Powheg-DIS}-{460,575,820,920}-e+-{Low,Med,High}Q2.yoda) \
- $(shell echo Rivet{-DIS,-NoME-DIS,-Powheg-DIS}-{920-e--{Low,Med,High,All},820-e--Low,920-e+-All}Q2.yoda) \
- $(shell echo Rivet{-DIS,-NoME-DIS,-Powheg-DIS}-920-{e+,e-}-CC-{Low,Med,High}Q2.yoda)
+Rivet-DIS/done: $(shell echo Rivet{-DIS,-NoME-DIS,-Powheg-DIS}-{460,575,820,920}-e+-{VeryLow,Low,Med,High}Q2.yoda) \
+ $(shell echo Rivet{-DIS,-NoME-DIS,-Powheg-DIS}-{820,920}-e--{VeryLow,Low,Med,High}Q2.yoda) \
+ $(shell echo Rivet{-DIS,-NoME-DIS,-Powheg-DIS}-920-{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-II-Jets-{0..11},Run-I-Jets-{1..8}}.yoda ) \
$(shell echo Rivet-TVT-{630-Jets-{1..3},300-Jets-1,900-Jets-1}.yoda ) \
$(shell echo Rivet-TVT-{Run-I,Run-II,300,630,900}-UE.yoda)
rm -rf Rivet-TVT-Jets
python/merge-TVT-Jets TVT
rivet-mkhtml -o Rivet-TVT-Jets TVT-Jets.yoda:Hw
touch $@
Rivet-Fixed : Rivet-Fixed/done
touch $@
Rivet-Fixed/done : $(shell echo Rivet-SppS-{53,63,200,500,546,900}-UE.yoda ) \
$(shell echo Rivet-ISR-{{30,44,53,62}-UE,{44,62}-Z-mu}.yoda ) Rivet-EHS-UE.yoda \
$(shell echo Rivet-Star-{UE,Jets-{1..4}}.yoda ) \
$(shell echo Rivet-SPS-{17.4-UE,200-Z-mu}.yoda ) \
$(shell echo Rivet-Fermilab-{27.4,38.8}-Z-mu.yoda )
rm -rf Rivet-Fixed
python/merge-Fixed Fixed
rivet-mkhtml -o Rivet-Fixed Fixed.yoda:Hw
touch $@
Rivet-LHC-Jets : Rivet-LHC-Jets/done
touch $@
Rivet-LHC-Jets/done : \
$(shell echo Rivet-LHC-7-DiJets-{1..7}-{A,B,C}.yoda ) \
$(shell echo Rivet-LHC-13-DiJets-{{1..11}-A,{6..11}-B}.yoda ) \
$(shell echo Rivet-LHC-{7,8,13}-Jets-{0..10}.yoda ) \
$(shell echo Rivet-LHC-2760-Jets-{1..3}.yoda ) \
$(shell echo Rivet-LHC-{900,2360,2760,7,8,13}-UE.yoda ) \
$(shell echo Rivet-LHC-{7,13}-UE-Cent.yoda ) \
$(shell echo Rivet-LHC-{900,7,13}-UE-Long.yoda ) \
$(shell echo Rivet-LHC-7-Charm-{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-{7,8,13}-Top-{L,SL}.yoda ) \
$(shell echo Rivet-LHC-{8,13}-Top-All.yoda )
rm -rf Rivet-LHC-Jets
python/merge-LHC-Jets LHC
rivet-mkhtml -o Rivet-LHC-Jets LHC-Jets.yoda:Hw
touch $@
Rivet-LHC-EW : Rivet-LHC-EW/done
touch $@
Rivet-LHC-EW/done: \
$(shell echo Rivet{,-Powheg}-LHC-{13-Z-{e,mu,nu},13-W-mu,Z-HighMass{1,2}-e,{8,13}-Z-Mass{1..4}-{e,mu},{,8-}W-{e,mu},Z-{e,mu,mu-SOPHTY},Z-LowMass-{e,mu},Z-MedMass-e,WZ,WW-{emu,ll},13-WW-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..4}.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
yodamerge --add Rivet-Powheg-LHC-8-{ggH{-GammaGamma,-WW,},{VBF,ZH,WH}{,-GammaGamma}}.yoda -o Powheg-LHC-Higgs.yoda
yodamerge --add Rivet-LHC-8-{ggH{-GammaGamma,-WW,},{VBF,ZH,WH}{,-GammaGamma}}.yoda -o LHC-Higgs.yoda
rm -rf Rivet-LHC-Higgs
rivet-mkhtml -o Rivet-LHC-Higgs Powheg-LHC-Higgs.yoda:Hw-Powheg LHC-Higgs.yoda:Hw\
Rivet-Powheg-LHC-ggH.yoda:gg-Powheg Rivet-LHC-ggH.yoda:gg Rivet-LHC-ggHJet.yoda:HJet \
Rivet-Powheg-LHC-VBF.yoda:VBF-Powheg Rivet-LHC-VBF.yoda:VBF Rivet-LHC-WH.yoda:WH Rivet-LHC-ZH.yoda:ZH \
Rivet-Powheg-LHC-WH.yoda:WH-Powheg Rivet-Powheg-LHC-ZH.yoda:ZH-Powheg
touch $@
clean-local:
rm -f *.out *.log *.tex *.top *.run *.dump *.mult *.Bmult *.yoda Rivet/*.in anatohepmc.txt hepmctoana.txt
rm -rf Rivet-*
distclean-local:
rm -rf .cache
diff --git a/Tests/Rivet/DIS/DIS-460-e+-HighQ2.in b/Tests/Rivet/DIS/DIS-460-e+-HighQ2.in
--- a/Tests/Rivet/DIS/DIS-460-e+-HighQ2.in
+++ b/Tests/Rivet/DIS/DIS-460-e+-HighQ2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 460.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 1000000.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 900.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1000.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-460-e+-LowQ2.in b/Tests/Rivet/DIS/DIS-460-e+-LowQ2.in
--- a/Tests/Rivet/DIS/DIS-460-e+-LowQ2.in
+++ b/Tests/Rivet/DIS/DIS-460-e+-LowQ2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 460.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 60.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.5
+set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 100.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 20
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-460-e+-MedQ2.in b/Tests/Rivet/DIS/DIS-460-e+-MedQ2.in
--- a/Tests/Rivet/DIS/DIS-460-e+-MedQ2.in
+++ b/Tests/Rivet/DIS/DIS-460-e+-MedQ2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 460.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 1000.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 40.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 100.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-460-e+-LowQ2.in b/Tests/Rivet/DIS/DIS-460-e+-VeryLowQ2.in
copy from Tests/Rivet/DIS/DIS-460-e+-LowQ2.in
copy to Tests/Rivet/DIS/DIS-460-e+-VeryLowQ2.in
--- a/Tests/Rivet/DIS/DIS-460-e+-LowQ2.in
+++ b/Tests/Rivet/DIS/DIS-460-e+-VeryLowQ2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 460.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 60.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.5
+set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 20.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.0
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-575-e+-HighQ2.in b/Tests/Rivet/DIS/DIS-575-e+-HighQ2.in
--- a/Tests/Rivet/DIS/DIS-575-e+-HighQ2.in
+++ b/Tests/Rivet/DIS/DIS-575-e+-HighQ2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 575.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 1000000.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 900.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1000.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-575-e+-LowQ2.in b/Tests/Rivet/DIS/DIS-575-e+-LowQ2.in
--- a/Tests/Rivet/DIS/DIS-575-e+-LowQ2.in
+++ b/Tests/Rivet/DIS/DIS-575-e+-LowQ2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 575.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 60.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.5
+set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 100.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 20
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-575-e+-MedQ2.in b/Tests/Rivet/DIS/DIS-575-e+-MedQ2.in
--- a/Tests/Rivet/DIS/DIS-575-e+-MedQ2.in
+++ b/Tests/Rivet/DIS/DIS-575-e+-MedQ2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 575.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 1000.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 40.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 100.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-575-e+-LowQ2.in b/Tests/Rivet/DIS/DIS-575-e+-VeryLowQ2.in
copy from Tests/Rivet/DIS/DIS-575-e+-LowQ2.in
copy to Tests/Rivet/DIS/DIS-575-e+-VeryLowQ2.in
--- a/Tests/Rivet/DIS/DIS-575-e+-LowQ2.in
+++ b/Tests/Rivet/DIS/DIS-575-e+-VeryLowQ2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 575.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 60.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.5
+set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 20.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.0
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-820-e+-HighQ2.in b/Tests/Rivet/DIS/DIS-820-e+-HighQ2.in
--- a/Tests/Rivet/DIS/DIS-820-e+-HighQ2.in
+++ b/Tests/Rivet/DIS/DIS-820-e+-HighQ2.in
@@ -1,19 +1,19 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 820.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 1000000.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 900.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1000.
set /Herwig/Cuts/Cuts:MHatMin 0.
# H1 energy flow analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_2000_S4129130
# ZEUS jets analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2010_I875006
# ZEUS F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_1996_I420332
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-820-e+-LowQ2.in b/Tests/Rivet/DIS/DIS-820-e+-LowQ2.in
--- a/Tests/Rivet/DIS/DIS-820-e+-LowQ2.in
+++ b/Tests/Rivet/DIS/DIS-820-e+-LowQ2.in
@@ -1,17 +1,17 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 820.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 60.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.5
+set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 100.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 20.
set /Herwig/Cuts/Cuts:MHatMin 0.
# H1 energy flow analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_2000_S4129130
# ZEUS F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_1996_I420332
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-820-e+-MedQ2.in b/Tests/Rivet/DIS/DIS-820-e+-MedQ2.in
--- a/Tests/Rivet/DIS/DIS-820-e+-MedQ2.in
+++ b/Tests/Rivet/DIS/DIS-820-e+-MedQ2.in
@@ -1,19 +1,19 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 820.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 1000000.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 40.
+set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 1000.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 100.
set /Herwig/Cuts/Cuts:MHatMin 0.
# H1 energy flow analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_2000_S4129130
# ZEUS jets analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2010_I875006
# ZEUS F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_1996_I420332
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-820-e+-LowQ2.in b/Tests/Rivet/DIS/DIS-820-e+-VeryLowQ2.in
copy from Tests/Rivet/DIS/DIS-820-e+-LowQ2.in
copy to Tests/Rivet/DIS/DIS-820-e+-VeryLowQ2.in
--- a/Tests/Rivet/DIS/DIS-820-e+-LowQ2.in
+++ b/Tests/Rivet/DIS/DIS-820-e+-VeryLowQ2.in
@@ -1,17 +1,17 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 820.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 60.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.5
+set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 20.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.
set /Herwig/Cuts/Cuts:MHatMin 0.
# H1 energy flow analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_2000_S4129130
# ZEUS F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_1996_I420332
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-820-e--LowQ2.in b/Tests/Rivet/DIS/DIS-820-e--HighQ2.in
copy from Tests/Rivet/DIS/DIS-820-e--LowQ2.in
copy to Tests/Rivet/DIS/DIS-820-e--HighQ2.in
--- a/Tests/Rivet/DIS/DIS-820-e--LowQ2.in
+++ b/Tests/Rivet/DIS/DIS-820-e--HighQ2.in
@@ -1,14 +1,15 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 820.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e-
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 26.7*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 60.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.5
+set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 1000000.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1000.
set /Herwig/Cuts/Cuts:MHatMin 0.
# H1 energy flow analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1994_S2919893
#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1995_S3167097
+
diff --git a/Tests/Rivet/DIS/DIS-820-e--LowQ2.in b/Tests/Rivet/DIS/DIS-820-e--LowQ2.in
--- a/Tests/Rivet/DIS/DIS-820-e--LowQ2.in
+++ b/Tests/Rivet/DIS/DIS-820-e--LowQ2.in
@@ -1,14 +1,15 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 820.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e-
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 26.7*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 60.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.5
+set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 100.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 20.
set /Herwig/Cuts/Cuts:MHatMin 0.
# H1 energy flow analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1994_S2919893
#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1995_S3167097
+
diff --git a/Tests/Rivet/DIS/DIS-820-e--LowQ2.in b/Tests/Rivet/DIS/DIS-820-e--MedQ2.in
copy from Tests/Rivet/DIS/DIS-820-e--LowQ2.in
copy to Tests/Rivet/DIS/DIS-820-e--MedQ2.in
--- a/Tests/Rivet/DIS/DIS-820-e--LowQ2.in
+++ b/Tests/Rivet/DIS/DIS-820-e--MedQ2.in
@@ -1,14 +1,15 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 820.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e-
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 26.7*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 60.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.5
+set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 1000.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 100.
set /Herwig/Cuts/Cuts:MHatMin 0.
# H1 energy flow analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1994_S2919893
#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1995_S3167097
+
diff --git a/Tests/Rivet/DIS/DIS-820-e--LowQ2.in b/Tests/Rivet/DIS/DIS-820-e--VeryLowQ2.in
copy from Tests/Rivet/DIS/DIS-820-e--LowQ2.in
copy to Tests/Rivet/DIS/DIS-820-e--VeryLowQ2.in
--- a/Tests/Rivet/DIS/DIS-820-e--LowQ2.in
+++ b/Tests/Rivet/DIS/DIS-820-e--VeryLowQ2.in
@@ -1,14 +1,15 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 820.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e-
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 26.7*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 60.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.5
+set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 20.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.
set /Herwig/Cuts/Cuts:MHatMin 0.
# H1 energy flow analysis
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1994_S2919893
#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_1995_S3167097
+
diff --git a/Tests/Rivet/DIS/DIS-920-e+-CC-HighQ2.in b/Tests/Rivet/DIS/DIS-920-e+-CC-HighQ2.in
--- a/Tests/Rivet/DIS/DIS-920-e+-CC-HighQ2.in
+++ b/Tests/Rivet/DIS/DIS-920-e+-CC-HighQ2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/ChargedCurrentCut:MinW2 0.
set /Herwig/Cuts/ChargedCurrentCut:MaxW2 1e10
set /Herwig/Cuts/ChargedCurrentCut:MaxQ2 1000000.
-set /Herwig/Cuts/ChargedCurrentCut:MinQ2 900.
+set /Herwig/Cuts/ChargedCurrentCut:MinQ2 1000.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-920-e+-CC-LowQ2.in b/Tests/Rivet/DIS/DIS-920-e+-CC-LowQ2.in
--- a/Tests/Rivet/DIS/DIS-920-e+-CC-LowQ2.in
+++ b/Tests/Rivet/DIS/DIS-920-e+-CC-LowQ2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/ChargedCurrentCut:MinW2 0.
set /Herwig/Cuts/ChargedCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/ChargedCurrentCut:MaxQ2 110.
-set /Herwig/Cuts/ChargedCurrentCut:MinQ2 1.5
+set /Herwig/Cuts/ChargedCurrentCut:MaxQ2 100.
+set /Herwig/Cuts/ChargedCurrentCut:MinQ2 20.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-920-e+-CC-MedQ2.in b/Tests/Rivet/DIS/DIS-920-e+-CC-MedQ2.in
--- a/Tests/Rivet/DIS/DIS-920-e+-CC-MedQ2.in
+++ b/Tests/Rivet/DIS/DIS-920-e+-CC-MedQ2.in
@@ -1,14 +1,14 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/ChargedCurrentCut:MinW2 0.
set /Herwig/Cuts/ChargedCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/ChargedCurrentCut:MaxQ2 1000000.
-set /Herwig/Cuts/ChargedCurrentCut:MinQ2 40.
+set /Herwig/Cuts/ChargedCurrentCut:MaxQ2 1000.
+set /Herwig/Cuts/ChargedCurrentCut:MinQ2 100.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-920-e+-CC-LowQ2.in b/Tests/Rivet/DIS/DIS-920-e+-CC-VeryLowQ2.in
copy from Tests/Rivet/DIS/DIS-920-e+-CC-LowQ2.in
copy to Tests/Rivet/DIS/DIS-920-e+-CC-VeryLowQ2.in
--- a/Tests/Rivet/DIS/DIS-920-e+-CC-LowQ2.in
+++ b/Tests/Rivet/DIS/DIS-920-e+-CC-VeryLowQ2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/ChargedCurrentCut:MinW2 0.
set /Herwig/Cuts/ChargedCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/ChargedCurrentCut:MaxQ2 110.
-set /Herwig/Cuts/ChargedCurrentCut:MinQ2 1.5
+set /Herwig/Cuts/ChargedCurrentCut:MaxQ2 20.
+set /Herwig/Cuts/ChargedCurrentCut:MinQ2 1.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-920-e+-HighQ2.in b/Tests/Rivet/DIS/DIS-920-e+-HighQ2.in
--- a/Tests/Rivet/DIS/DIS-920-e+-HighQ2.in
+++ b/Tests/Rivet/DIS/DIS-920-e+-HighQ2.in
@@ -1,13 +1,17 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 1000000.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 900.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1000.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
+# H1 charged particle
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_2013_I1217865
+# ZEUS D meson
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2008_I810112
diff --git a/Tests/Rivet/DIS/DIS-920-e+-LowQ2.in b/Tests/Rivet/DIS/DIS-920-e+-LowQ2.in
--- a/Tests/Rivet/DIS/DIS-920-e+-LowQ2.in
+++ b/Tests/Rivet/DIS/DIS-920-e+-LowQ2.in
@@ -1,15 +1,17 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 110.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.5
+set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 100.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 20
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
# H1 charged particle
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_2013_I1217865
+# ZEUS D meson
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2008_I810112
diff --git a/Tests/Rivet/DIS/DIS-920-e+-MedQ2.in b/Tests/Rivet/DIS/DIS-920-e+-MedQ2.in
--- a/Tests/Rivet/DIS/DIS-920-e+-MedQ2.in
+++ b/Tests/Rivet/DIS/DIS-920-e+-MedQ2.in
@@ -1,14 +1,18 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 1000000.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 40.
+set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 1000.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 100.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
+# H1 charged particle
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_2013_I1217865
+# ZEUS D meson
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2008_I810112
diff --git a/Tests/Rivet/DIS/DIS-920-e+-AllQ2.in b/Tests/Rivet/DIS/DIS-920-e+-VeryLowQ2.in
rename from Tests/Rivet/DIS/DIS-920-e+-AllQ2.in
rename to Tests/Rivet/DIS/DIS-920-e+-VeryLowQ2.in
--- a/Tests/Rivet/DIS/DIS-920-e+-AllQ2.in
+++ b/Tests/Rivet/DIS/DIS-920-e+-VeryLowQ2.in
@@ -1,13 +1,17 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 159.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 159.*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 1000.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 2.5
+set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 20.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
+# H1 charged particle
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 H1_2013_I1217865
+# ZEUS D meson
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2008_I810112
diff --git a/Tests/Rivet/DIS/DIS-920-e--CC-HighQ2.in b/Tests/Rivet/DIS/DIS-920-e--CC-HighQ2.in
--- a/Tests/Rivet/DIS/DIS-920-e--CC-HighQ2.in
+++ b/Tests/Rivet/DIS/DIS-920-e--CC-HighQ2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e-
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/ChargedCurrentCut:MinW2 0.
set /Herwig/Cuts/ChargedCurrentCut:MaxW2 1e10
set /Herwig/Cuts/ChargedCurrentCut:MaxQ2 1000000.
-set /Herwig/Cuts/ChargedCurrentCut:MinQ2 900.
+set /Herwig/Cuts/ChargedCurrentCut:MinQ2 1000.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-920-e--CC-LowQ2.in b/Tests/Rivet/DIS/DIS-920-e--CC-LowQ2.in
--- a/Tests/Rivet/DIS/DIS-920-e--CC-LowQ2.in
+++ b/Tests/Rivet/DIS/DIS-920-e--CC-LowQ2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e-
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/ChargedCurrentCut:MinW2 0.
set /Herwig/Cuts/ChargedCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/ChargedCurrentCut:MaxQ2 60.
-set /Herwig/Cuts/ChargedCurrentCut:MinQ2 1.5
+set /Herwig/Cuts/ChargedCurrentCut:MaxQ2 100.
+set /Herwig/Cuts/ChargedCurrentCut:MinQ2 10.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-920-e--CC-MedQ2.in b/Tests/Rivet/DIS/DIS-920-e--CC-MedQ2.in
--- a/Tests/Rivet/DIS/DIS-920-e--CC-MedQ2.in
+++ b/Tests/Rivet/DIS/DIS-920-e--CC-MedQ2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e-
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/ChargedCurrentCut:MinW2 0.
set /Herwig/Cuts/ChargedCurrentCut:MaxW2 1e10
set /Herwig/Cuts/ChargedCurrentCut:MaxQ2 1000.
-set /Herwig/Cuts/ChargedCurrentCut:MinQ2 40.
+set /Herwig/Cuts/ChargedCurrentCut:MinQ2 100.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-920-e--CC-LowQ2.in b/Tests/Rivet/DIS/DIS-920-e--CC-VeryLowQ2.in
copy from Tests/Rivet/DIS/DIS-920-e--CC-LowQ2.in
copy to Tests/Rivet/DIS/DIS-920-e--CC-VeryLowQ2.in
--- a/Tests/Rivet/DIS/DIS-920-e--CC-LowQ2.in
+++ b/Tests/Rivet/DIS/DIS-920-e--CC-VeryLowQ2.in
@@ -1,13 +1,13 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e-
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/ChargedCurrentCut:MinW2 0.
set /Herwig/Cuts/ChargedCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/ChargedCurrentCut:MaxQ2 60.
-set /Herwig/Cuts/ChargedCurrentCut:MinQ2 1.5
+set /Herwig/Cuts/ChargedCurrentCut:MaxQ2 20.
+set /Herwig/Cuts/ChargedCurrentCut:MinQ2 1.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
diff --git a/Tests/Rivet/DIS/DIS-920-e--HighQ2.in b/Tests/Rivet/DIS/DIS-920-e--HighQ2.in
--- a/Tests/Rivet/DIS/DIS-920-e--HighQ2.in
+++ b/Tests/Rivet/DIS/DIS-920-e--HighQ2.in
@@ -1,13 +1,15 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e-
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 1000000.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 900.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1000.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
+# ZEUS D production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2008_I810112
diff --git a/Tests/Rivet/DIS/DIS-920-e--LowQ2.in b/Tests/Rivet/DIS/DIS-920-e--LowQ2.in
--- a/Tests/Rivet/DIS/DIS-920-e--LowQ2.in
+++ b/Tests/Rivet/DIS/DIS-920-e--LowQ2.in
@@ -1,13 +1,15 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e-
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 60.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.5
+set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 100.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 20.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
+# ZEUS D production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2008_I810112
diff --git a/Tests/Rivet/DIS/DIS-920-e--MedQ2.in b/Tests/Rivet/DIS/DIS-920-e--MedQ2.in
--- a/Tests/Rivet/DIS/DIS-920-e--MedQ2.in
+++ b/Tests/Rivet/DIS/DIS-920-e--MedQ2.in
@@ -1,13 +1,15 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e-
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 1000.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 40.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 100.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
+# ZEUS D production
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2008_I810112
diff --git a/Tests/Rivet/DIS/DIS-920-e--AllQ2.in b/Tests/Rivet/DIS/DIS-920-e--VeryLowQ2.in
rename from Tests/Rivet/DIS/DIS-920-e--AllQ2.in
rename to Tests/Rivet/DIS/DIS-920-e--VeryLowQ2.in
--- a/Tests/Rivet/DIS/DIS-920-e--AllQ2.in
+++ b/Tests/Rivet/DIS/DIS-920-e--VeryLowQ2.in
@@ -1,13 +1,15 @@
# -*- ThePEG-repository -*-
cd /Herwig/Generators
set EventGenerator:EventHandler:BeamB /Herwig/Particles/p+
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxB 920.*GeV
set EventGenerator:EventHandler:BeamA /Herwig/Particles/e-
set EventGenerator:EventHandler:LuminosityFunction:BeamEMaxA 27.5*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0.
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
-set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 1000.
-set /Herwig/Cuts/NeutralCurrentCut:MinQ2 2.5
+set /Herwig/Cuts/NeutralCurrentCut:MaxQ2 20.
+set /Herwig/Cuts/NeutralCurrentCut:MinQ2 1.
set /Herwig/Cuts/Cuts:MHatMin 0.
# HERA F2
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 HERA_2015_I1377206
+# ZEUS D production
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ZEUS_2008_I810112
diff --git a/Tests/python/merge-DIS.in b/Tests/python/merge-DIS.in
--- a/Tests/python/merge-DIS.in
+++ b/Tests/python/merge-DIS.in
@@ -1,224 +1,84 @@
#! @PYTHON@
from __future__ import print_function
-import logging, sys
+import logging, sys,subprocess
if sys.version_info[:3] < (2,4,0):
print ("rivet scripts require Python version >= 2.4.0... exiting")
sys.exit(1)
import os, yoda
# #############################################
-
-def fillAbove(desthisto, sourcehistosbyq2):
- q2high=1e100
- q2low=-1e100
- for q2,h in sorted(sourcehistosbyq2.items(),reverse=True) :
- q2low=q2
- for i in range(0,h.numBins()) :
- if(h.bins()[i].xMin() >= q2low and
- h.bins()[i].xMin() < q2high ) :
- desthisto.bins()[i] += h.bins()[i]
- q2high=q2
-
-def merge(hpath, beam, energy):
- global inhistos
- global outhistos
- try:
- fillAbove(outhistos[hpath], inhistos[hpath][beam][energy])
- except:
- pass
-
-def useOne(hpath, beam, energy, q2):
- global inhistos
- global outhistos
- try:
- outhistos[hpath] = inhistos[hpath][beam][energy][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")
## Check args
if len(args) < 1:
logging.error("Must specify at least the name of the files")
sys.exit(1)
# #######################################
-yodafiles=["-820-e--LowQ2","-920-e--AllQ2","-920-e+-AllQ2"]
+yodafiles=[]
+sqrts={460:225,575:251,820:300,920:318}
for energy in [460,575,820,920] :
- for q2 in ["Low","Med","High"] :
- yodafiles.append("-%s-e+-%sQ2" % (energy,q2))
- if energy==920 :
- yodafiles.append("-%s-e--%sQ2" % (energy,q2))
- yodafiles.append("-%s-e+-CC-%sQ2" % (energy,q2))
- yodafiles.append("-%s-e--CC-%sQ2" % (energy,q2))
+ for process in ["e+","e-","e+-CC","e--CC"] :
+ mergeargs=["rivet-merge"]
+ for q2 in ["VeryLow","Low","Med","High"] :
+ fname = "Rivet-%s-%s-%s-%sQ2.yoda" % (args[0], energy ,process,q2)
+ if(os.path.isfile(fname)) :
+ mergeargs.append(fname)
+ if len(mergeargs)==1 : continue
+ if "e+" in process : beam="EPLUS"
+ else : beam="EMINUS"
+ mergeargs.append("-a")
+ mergeargs.append("HERA_2015_I1377206:ENERGY=%s"%sqrts[energy])
+ mergeargs.append("-a")
+ mergeargs.append("HERA_2015_I1377206:BEAM=%s" %beam)
+ fname = "Rivet-%s-%s-%s.yoda"% (args[0], energy ,process)
+ mergeargs.append("-o")
+ mergeargs.append(fname)
+ yodafiles.append(fname)
+ p = subprocess.Popen(mergeargs)
## Get histos
inhistos = {}
outhistos={}
weights = {}
for f in yodafiles:
- file = "Rivet-%s%s.yoda" % (args[0], f)
- # energy and beam
- temp=f.split("-")
- energy = int(temp[1])
- beam = temp[2]
- if(beam=="e") : beam="e-"
- # Q2 range
- if("Low" in file) :
- q2=2
- elif("Med" in file) :
- q2=50
- elif("High" in file) :
- q2=1000
-
- if not os.access(file, os.R_OK):
+ if not os.access(f, os.R_OK):
logging.error("%s can not be read" % file)
continue
try:
- aos = yoda.read(file)
+ aos = yoda.read(f)
except:
logging.error("%s can not be parsed as YODA" % file)
continue
## Get histos from this YODA file
for aopath, ao in aos.items() :
- if "HERA_2015_I1377206" in aopath:
- if "d06" in aopath or "d07" in aopath :
- if "CC" not in f : continue
- else :
- if "CC" in f : continue
if("RAW" in aopath) : continue
- if("4129130" in aopath or "420332" in aopath or "1377206" in aopath or "I875006" in aopath) :
- if aopath not in inhistos:
- inhistos[aopath] = {}
- tmpE = inhistos[aopath]
- if beam not in tmpE :
- tmpE[beam] = {}
- if energy not in tmpE[beam] :
- tmpE[beam][energy] = {}
- if q2 not in tmpE[beam][energy]:
- tmpE[beam][energy][q2] = ao
- else:
- raise Exception("A set with q2 = %s already exists" % ( q2 ))
- elif("2919893" in aopath or "I1217865" in aopath or "I810112" in aopath or
- "1353667" in aopath) :
- outhistos[aopath] = ao
elif(aopath.find("_XSEC")>=0 or aopath.find("_EVTCOUNT")>=0) :
continue
+ elif "HERA_2015_I1377206" in aopath :
+ path=aopath.split(":")
+ ao.setPath(path[0]+"/"+path[2].split("/")[1])
+ if "d06" in aopath or "d07" in aopath :
+ if "CC" in f : outhistos[aopath] = ao
+ else :
+ if "CC" not in f : outhistos[aopath] = ao
else :
- logging.error("Analysis %s is unknown" % aopath)
- sys.exit(1)
-
-## Make empty output histos if needed
-for hpath,hsets in inhistos.items():
- if( ("4129130" in hpath and ("d33" in hpath or "d34" in hpath ) ) or
- ("875006" in hpath and "d01" in hpath ) ) :
- title=""
- path=""
- histo = list(list(list(hsets.values())[0].values())[0].values())[0]
- if hasattr(histo, 'title'):
- title=histo.title()
- if hasattr(histo, 'path'):
- path=histo.path()
- if(type(histo)==yoda.core.Scatter2D) :
- outhistos[hpath] = yoda.core.Scatter2D(path,title)
- elif(type(histo)==yoda.core.Profile1D) :
- outhistos[hpath] = yoda.core.Profile1D(path,title)
- for i in range(0,histo.numBins()) :
- outhistos[hpath].addBin(histo.bins()[i].xMin(),histo.bins()[i].xMax())
- elif(type(histo)==yoda.core.Histo1D) :
- outhistos[hpath] = yoda.core.Histo1D(path,title)
- for i in range(0,histo.numBins()) :
- outhistos[hpath].addBin(histo.bins()[i].xMin(),
- histo.bins()[i].xMax())
- else :
- logging.error("Histogram %s is of unknown type %s" % (hpath,type(histo)))
- sys.exit(1)
-# H1 transverse energy
-for i in range(1,16) :
- useOne("/H1_2000_S4129130/d%02d-x01-y01" % i,"e+",820,"2")
-for i in range(16,24) :
- useOne("/H1_2000_S4129130/d%02d-x01-y01" % i,"e+",820,"50")
-useOne("/H1_2000_S4129130/d24-x01-y01","e+",820,"1000")
-for i in range(25,29) :
- useOne("/H1_2000_S4129130/d%02d-x01-y01" % i,"e+",820,"2")
-for i in range(29,32) :
- useOne("/H1_2000_S4129130/d%02d-x01-y01" % i,"e+",820,"50")
-useOne("/H1_2000_S4129130/d32-x01-y01","e+",820,"1000")
-merge("/H1_2000_S4129130/d33-x01-y01","e+",820)
-merge("/H1_2000_S4129130/d34-x01-y01","e+",820)
-# ZEUS di-jet
-merge("/ZEUS_2010_I875006/d01-x01-y01","e+",820)
-for i in range(2,10) :
- useOne("/ZEUS_2010_I875006/d%02d-x01-y01" % i,"e+",820,"50")
-for i in range(10,13) :
- useOne("/ZEUS_2010_I875006/d%02d-x01-y01" % i,"e+",820,"1000")
-for i in range(13,16) :
- useOne("/ZEUS_2010_I875006/d%02d-x01-y01" % i,"e+",820,"50")
-for i in range(16,19) :
- useOne("/ZEUS_2010_I875006/d%02d-x01-y01" % i,"e+",820,"1000")
-# ZEUS F2
-for i in range(1,18) :
- if(i== 4 or i== 7 or i==10 or
- i==12 or i==14 or i==16) : continue
- useOne("/ZEUS_1996_I420332/d%02d-x01-y01" % i,"e+",820,"2")
-for i in range(18,29) :
- useOne("/ZEUS_1996_I420332/d%02d-x01-y01" % i,"e+",820,"50")
-for i in range(29,34) :
- useOne("/ZEUS_1996_I420332/d%02d-x01-y01" % i,"e+",820,"1000")
-# HERA F2
-# e+ 920
-for i in range(11,25) :
- useOne("/HERA_2015_I1377206/d01-x01-y%02d" % i,"e+",920,"2")
-for i in range(25,37) :
- useOne("/HERA_2015_I1377206/d01-x01-y%02d" % i,"e+",920,"50")
-for i in range(37,46) :
- useOne("/HERA_2015_I1377206/d01-x01-y%02d" % i,"e+",920,"1000")
-for i in range(1,3) :
- useOne("/HERA_2015_I1377206/d06-x01-y%02d" % i,"e+",920,"50")
-for i in range(3,11) :
- useOne("/HERA_2015_I1377206/d06-x01-y%02d" % i,"e+",920,"1000")
-# e+ 820
-for i in range(16,29) :
- useOne("/HERA_2015_I1377206/d02-x01-y%02d" % i,"e+",820,"2")
-for i in range(29,41) :
- useOne("/HERA_2015_I1377206/d02-x01-y%02d" % i,"e+",820,"50")
-for i in range(41,51) :
- useOne("/HERA_2015_I1377206/d02-x01-y%02d" % i,"e+",820,"1000")
-# e+ 575
-for i in range(3,14) :
- useOne("/HERA_2015_I1377206/d03-x01-y%02d" % i,"e+",575,"2")
-for i in range(14,25) :
- useOne("/HERA_2015_I1377206/d03-x01-y%02d" % i,"e+",575,"50")
-# e+ 460
-for i in range(3,14) :
- useOne("/HERA_2015_I1377206/d04-x01-y%02d" % i,"e+",460,"2")
-for i in range(14,25) :
- useOne("/HERA_2015_I1377206/d04-x01-y%02d" % i,"e+",460,"50")
-# e- 920
-for i in range(1,12) :
- useOne("/HERA_2015_I1377206/d05-x01-y%02d" % i,"e-",920,"50")
-for i in range(12,23) :
- useOne("/HERA_2015_I1377206/d05-x01-y%02d" % i,"e-",920,"1000")
-for i in range(1,3) :
- useOne("/HERA_2015_I1377206/d07-x01-y%02d" % i,"e-",920,"50")
-for i in range(3,11) :
- useOne("/HERA_2015_I1377206/d07-x01-y%02d" % i,"e-",920,"1000")
-
+ outhistos[aopath] = ao
# Choose output file
name = args[0]+".yoda"
# output the yoda file
yoda.writeYODA(outhistos,name)
sys.exit(0)