diff --git a/Tests/Rivet/LHC/LHC-7-Jets-10.in b/Tests/Rivet/LHC/LHC-7-Jets-10.in --- a/Tests/Rivet/LHC/LHC-7-Jets-10.in +++ b/Tests/Rivet/LHC/LHC-7-Jets-10.in @@ -1,41 +1,41 @@ ################################################## # select the analyses ################################################## # ATLAS di-jet decorrelation insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8971293 # ATLAS jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936 # ATLAS dijet with veto insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9126244 # CMS jet cross section insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9086218 # CMS 3/2 jet cross section ratio insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9088458 # ATLAS track jet insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017 # CMS central and forward jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342 # ATLAS subjets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564 # CMS jet structure -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539_DIJET +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539:JMODE=DIJET # CMS 4-jet insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574 # ATLAS leading jet UE insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811 # ATLAS jet veto insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1307243 # ATLAS inclusive jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1325553 # CMS jet ratios insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1298810 # flavour composition of jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1188891 # CMS Jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923 # ATLAS Jet frag insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I929691 # CMS shapes etc insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1111014 diff --git a/Tests/Rivet/LHC/LHC-7-Jets-5.in b/Tests/Rivet/LHC/LHC-7-Jets-5.in --- a/Tests/Rivet/LHC/LHC-7-Jets-5.in +++ b/Tests/Rivet/LHC/LHC-7-Jets-5.in @@ -1,47 +1,47 @@ ################################################## # select the analyses ################################################## # ATLAS jet shapes insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8924791 # ATLAS di-jet decorrelation insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8971293 # ATLAS jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936 # CMS event shapes insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8957746 # ATLAS dijet with veto insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9126244 # CMS dijet decorrelation insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8950903 # CMS jet cross section insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9086218 # CMS 3/2 jet cross section ratio insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9088458 # ATLAS track jet insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017 # ATLAS subjets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564 # CMS jet structure -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539_DIJET +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539:JMODE=DIJET # CMS 4-jet insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574 # ATLAS leading jet UE insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811 # ATLAS jet veto insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1307243 # ATLAS inclusive jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1325553 # CMS jet ratios insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1298810 # flavour composition of jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1188891 # CMS Jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923 # CMS event shapes insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1305624 # ATLAS Jet frag insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I929691 # CMS shapes etc insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1111014 diff --git a/Tests/Rivet/LHC/LHC-7-Jets-6.in b/Tests/Rivet/LHC/LHC-7-Jets-6.in --- a/Tests/Rivet/LHC/LHC-7-Jets-6.in +++ b/Tests/Rivet/LHC/LHC-7-Jets-6.in @@ -1,51 +1,51 @@ ################################################## # select the analyses ################################################## # ATLAS jet shapes insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8924791 # ATLAS di-jet decorrelation insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8971293 # ATLAS jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936 # ATLAS dijet with veto insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9126244 # CMS dijet decorrelation insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8950903 # CMS jet cross section insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9086218 # CMS 3/2 jet cross section ratio insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9088458 # ATLAS track jet insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017 # CMS central and forward jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342 # ATLAS high pT jet shapes insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1119557 # ATLAS subjets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564 # CMS jet structure -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539_DIJET +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539:JMODE=DIJET # CMS 4-jet insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574 # ATLAS leading jet UE insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811 # ATLAS jet veto insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1307243 # ATLAS inclusive jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1325553 # CMS jet ratios insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1298810 # flavour composition of jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1188891 # ATLAS Jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1387176 # CMS Jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923 # CMS event shapes insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1305624 # ATLAS Jet frag insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I929691 # CMS shapes etc insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1111014 diff --git a/Tests/Rivet/LHC/LHC-7-Jets-7.in b/Tests/Rivet/LHC/LHC-7-Jets-7.in --- a/Tests/Rivet/LHC/LHC-7-Jets-7.in +++ b/Tests/Rivet/LHC/LHC-7-Jets-7.in @@ -1,45 +1,45 @@ ################################################## # select the analyses ################################################## # ATLAS jet shapes insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8924791 # ATLAS di-jet decorrelation insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8971293 # ATLAS jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936 # ATLAS dijet with veto insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9126244 # CMS jet cross section insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9086218 # CMS 3/2 jet cross section ratio insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9088458 # ATLAS track jet insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017 # CMS central and forward jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342 # ATLAS subjets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564 # CMS jet structure -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539_DIJET +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539:JMODE=DIJET # CMS 4-jet insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574 # ATLAS leading jet UE insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811 # ATLAS jet veto insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1307243 # ATLAS inclusive jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1325553 # CMS jet ratios insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1298810 # flavour composition of jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1188891 # CMS Jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923 # CMS event shapes insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1305624 # ATLAS Jet frag insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I929691 # CMS shapes etc insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1111014 diff --git a/Tests/Rivet/LHC/LHC-7-Jets-8.in b/Tests/Rivet/LHC/LHC-7-Jets-8.in --- a/Tests/Rivet/LHC/LHC-7-Jets-8.in +++ b/Tests/Rivet/LHC/LHC-7-Jets-8.in @@ -1,40 +1,40 @@ ################################################## # select the analyses ################################################## # ATLAS di-jet decorrelation insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8971293 # ATLAS jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936 # ATLAS dijet with veto insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9126244 # CMS jet cross section insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9086218 # CMS 3/2 jet cross section ratio insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9088458 # ATLAS track jet insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017 # CMS central and forward jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342 # ATLAS subjets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564 # CMS jet structure -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539_DIJET +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539:JMODE=DIJET # CMS 4-jet insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574 # ATLAS leading jet UE insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811 # ATLAS jet veto insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1307243 # ATLAS inclusive jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1325553 # CMS jet ratios insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1298810 # flavour composition of jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1188891 # CMS Jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923 # ATLAS Jet frag insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I929691 # CMS shapes etc insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1111014 diff --git a/Tests/Rivet/LHC/LHC-7-Jets-9.in b/Tests/Rivet/LHC/LHC-7-Jets-9.in --- a/Tests/Rivet/LHC/LHC-7-Jets-9.in +++ b/Tests/Rivet/LHC/LHC-7-Jets-9.in @@ -1,44 +1,44 @@ ################################################## # select the analyses ################################################## # ATLAS di-jet decorrelation insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8971293 # ATLAS jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936 # ATLAS dijet with veto insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9126244 # CMS jet cross section insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9086218 # CMS 3/2 jet cross section ratio insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9088458 # ATLAS track jet insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017 # CMS central and forward jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342 # ATLAS subjets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094564 # CMS jet structure -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539_DIJET +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539:JMODE=DIJET # CMS 4-jet insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1273574 # ATLAS leading jet UE insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811 # ATLAS jet veto insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1307243 # ATLAS inclusive jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1325553 # CMS jet ratios insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2014_I1298810 # flavour composition of jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1188891 # CMS Jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1208923 # ATLAS Jet frag insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I929691 # CMS shapes etc insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1111014 diff --git a/Tests/Rivet/LHC/LHC-7-W-Jet-e.in b/Tests/Rivet/LHC/LHC-7-W-Jet-e.in --- a/Tests/Rivet/LHC/LHC-7-W-Jet-e.in +++ b/Tests/Rivet/LHC/LHC-7-W-Jet-e.in @@ -1,5 +1,5 @@ ################################################## # select the analyses ################################################## # CMS jet mass -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539_WJET +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539:JMODE=W diff --git a/Tests/Rivet/LHC/LHC-7-Z-Jet-e.in b/Tests/Rivet/LHC/LHC-7-Z-Jet-e.in --- a/Tests/Rivet/LHC/LHC-7-Z-Jet-e.in +++ b/Tests/Rivet/LHC/LHC-7-Z-Jet-e.in @@ -1,7 +1,7 @@ ################################################## # select the analyses ################################################## # CMS jet mass -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539_ZJET +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1224539:JMODE=Z # CMS Z ang correlations and event shapes insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1209721 \ No newline at end of file