diff --git a/Tests/Rivet/LHC/LHC-8-Z-Mass1-e.in b/Tests/Rivet/LHC/LHC-8-Z-Mass1-e.in --- a/Tests/Rivet/LHC/LHC-8-Z-Mass1-e.in +++ b/Tests/Rivet/LHC/LHC-8-Z-Mass1-e.in @@ -1,5 +1,5 @@ ################################################## # select the analyses ################################################## # ATLAS Z pT and phi* -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516_EL +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516:LMODE=EL diff --git a/Tests/Rivet/LHC/LHC-8-Z-Mass1-mu.in b/Tests/Rivet/LHC/LHC-8-Z-Mass1-mu.in --- a/Tests/Rivet/LHC/LHC-8-Z-Mass1-mu.in +++ b/Tests/Rivet/LHC/LHC-8-Z-Mass1-mu.in @@ -1,5 +1,5 @@ ################################################## # select the analyses ################################################## # ATLAS Z pT and phi* -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516_MU +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516:LMODE=MU diff --git a/Tests/Rivet/LHC/LHC-8-Z-Mass2-e.in b/Tests/Rivet/LHC/LHC-8-Z-Mass2-e.in --- a/Tests/Rivet/LHC/LHC-8-Z-Mass2-e.in +++ b/Tests/Rivet/LHC/LHC-8-Z-Mass2-e.in @@ -1,5 +1,5 @@ ################################################## # select the analyses ################################################## # ATLAS Z pT and phi* -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516_EL +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516:LMODE=EL diff --git a/Tests/Rivet/LHC/LHC-8-Z-Mass2-mu.in b/Tests/Rivet/LHC/LHC-8-Z-Mass2-mu.in --- a/Tests/Rivet/LHC/LHC-8-Z-Mass2-mu.in +++ b/Tests/Rivet/LHC/LHC-8-Z-Mass2-mu.in @@ -1,5 +1,5 @@ ################################################## # select the analyses ################################################## # ATLAS Z pT and phi* -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516_MU +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516:LMODE=MU diff --git a/Tests/Rivet/LHC/LHC-8-Z-Mass3-e.in b/Tests/Rivet/LHC/LHC-8-Z-Mass3-e.in --- a/Tests/Rivet/LHC/LHC-8-Z-Mass3-e.in +++ b/Tests/Rivet/LHC/LHC-8-Z-Mass3-e.in @@ -1,11 +1,11 @@ ################################################## # select the analyses ################################################## # ATLAS Z pT and phi* -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516_EL +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516:LMODE=EL # ATLAS high mass drell-yan -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1467454_EL +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1467454:LMODE=EL # ATLAS splittings -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1589844_EL +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1589844:LMODE=EL # CMS Z+b insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2017_I1499471 \ No newline at end of file diff --git a/Tests/Rivet/LHC/LHC-8-Z-Mass3-mu.in b/Tests/Rivet/LHC/LHC-8-Z-Mass3-mu.in --- a/Tests/Rivet/LHC/LHC-8-Z-Mass3-mu.in +++ b/Tests/Rivet/LHC/LHC-8-Z-Mass3-mu.in @@ -1,11 +1,11 @@ ################################################## # select the analyses ################################################## # ATLAS Z + dijets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1279489 # ATLAS Z pT and phi* -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516_MU +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_MU +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_MU \ No newline at end of file +#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1589844:LMODE=MU \ No newline at end of file diff --git a/Tests/Rivet/LHC/LHC-8-Z-Mass4-e.in b/Tests/Rivet/LHC/LHC-8-Z-Mass4-e.in --- a/Tests/Rivet/LHC/LHC-8-Z-Mass4-e.in +++ b/Tests/Rivet/LHC/LHC-8-Z-Mass4-e.in @@ -1,8 +1,8 @@ ################################################## # select the analyses ################################################## # ATLAS Z pT and phi* -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516_EL +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516:LMODE=EL # ATLAS high mass drell-yan -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1467454_EL +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1467454:LMODE=EL diff --git a/Tests/Rivet/LHC/LHC-8-Z-Mass4-mu.in b/Tests/Rivet/LHC/LHC-8-Z-Mass4-mu.in --- a/Tests/Rivet/LHC/LHC-8-Z-Mass4-mu.in +++ b/Tests/Rivet/LHC/LHC-8-Z-Mass4-mu.in @@ -1,8 +1,8 @@ ################################################## # select the analyses ################################################## # ATLAS Z pT and phi* -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1408516_MU +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_MU +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1467454:LMODE=MU diff --git a/Tests/Rivet/LHC/LHC-W-e.in b/Tests/Rivet/LHC/LHC-W-e.in --- a/Tests/Rivet/LHC/LHC-W-e.in +++ b/Tests/Rivet/LHC/LHC-W-e.in @@ -1,25 +1,24 @@ ################################################## # select the analyses ################################################## # general analysis insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_WJETS insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_WPOL # ATLAS W+jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8919674 # ATLAS W pT insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I925932 # ATLAS W kT scales insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1217867 # W DPI insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1216670 # W +b -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1219109_EL +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1219109:LMODE=EL # ATLAS W insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I928289_W # ATLAS W+jets -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1319490 -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1319490_EL +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1319490:LMODE=EL # ATLAS W+charm insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1282447 # ATLAS W inclusive cross section -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620_W_EL \ No newline at end of file +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620:LMODE=WEL \ No newline at end of file diff --git a/Tests/Rivet/LHC/LHC-W-mu.in b/Tests/Rivet/LHC/LHC-W-mu.in --- a/Tests/Rivet/LHC/LHC-W-mu.in +++ b/Tests/Rivet/LHC/LHC-W-mu.in @@ -1,29 +1,29 @@ ################################################## # select the analyses ################################################## # ATLAS W asymetry insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9002537 # ATLAS W+jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8919674 # ATLAS W pT insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I925932 # ATLAS W+jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1083318 # ATLAS W kT scales insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1217867 # CMS double parton scattering insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1272853 # W DPI insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1216670 # CMS W+ jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1303894 # ATLAS W insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I928289_W # ATLAS W+jets -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1319490_MU +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1319490:LMODE=MU # W +b -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1219109_MU +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1219109:LMODE=MU # ATLAS W+charm insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1282447 # ATLAS W inclusive cross section -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620_W_MU +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620:LMODE=WMU diff --git a/Tests/Rivet/LHC/LHC-Z-e.in b/Tests/Rivet/LHC/LHC-Z-e.in --- a/Tests/Rivet/LHC/LHC-Z-e.in +++ b/Tests/Rivet/LHC/LHC-Z-e.in @@ -1,34 +1,34 @@ ################################################## # select the analyses ################################################## # General analysis insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZINC insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZJETS # ATLAS pT insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9131140 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1300647 # ATLAS Z+jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I945498 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1230812 # ATLAS phi* insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1204784 # CMS Z + b-hadron insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1256943 # CMS Z pt and y insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I941555 # ATLAS Z + bjets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1306294 # ATLAS Z insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I928289_Z # CMS Z AFB insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1122847 # CMS Z+jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1310737 # ATLAS event shapes in Z events insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1424838 # ATLAS forwrd backward insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1351916_EL # ATLAS forward backward insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1234228 # ATLAS Z inclusive cross section -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620_Z_EL \ No newline at end of file +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620:LMODE=ZEL \ No newline at end of file diff --git a/Tests/Rivet/LHC/LHC-Z-mu.in b/Tests/Rivet/LHC/LHC-Z-mu.in --- a/Tests/Rivet/LHC/LHC-Z-mu.in +++ b/Tests/Rivet/LHC/LHC-Z-mu.in @@ -1,35 +1,35 @@ ################################################## # select the analyses ################################################## # ATLAS Z pt insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9131140 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1300647 # ATLAS Z+jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I945498 # ATLAS phi* insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1204784 # Z and real photon + jet insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1258128 # CMS Z + b-hadron insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1256943 # CMS Z pt and y insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I941555 # ATLAS MPI in Z events insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1315949 # ATLAS Z insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I928289_Z # CMS Z AFB insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1122847 # CMS Z+jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1310737 # ATLAS event shapes in Z events insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1424838 # CMS photon radiation in Z decays insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1346843 # ATLAS forwrd backward insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1351916_MU # LHCB forward Z+jet insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2014_I1262703 # ATLAS Z inclusive cross section -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620_Z_MU +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620:LMODE=ZMU