[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/f7d30accfbaf
branches:  release-2-5-x
changeset: 5712:f7d30accfbaf
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Mar 02 16:09:51 2017 +0000
description:
Jet finding patch from CMS

details:   https://rivet.hepforge.org/hg/rivet/rev/a9fb12482063
branches:  release-2-5-x
changeset: 5713:a9fb12482063
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Mar 02 16:11:07 2017 +0000
description:
Activate normalisation by default (patch from CMS)

details:   https://rivet.hepforge.org/hg/rivet/rev/078f58ffb488
branches:  release-2-5-x
changeset: 5714:078f58ffb488
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Mar 02 16:21:37 2017 +0000
description:
Patch from CMS to use partonic tops.

details:   https://rivet.hepforge.org/hg/rivet/rev/4a32bbd46102
branches:  release-2-5-x
changeset: 5715:4a32bbd46102
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Mar 02 16:28:35 2017 +0000
description:
Tidying

diffs (truncated from 229 to 50 lines):

--- a/ChangeLog	Wed Mar 01 21:57:18 2017 +0000
+++ b/ChangeLog	Thu Mar 02 16:28:35 2017 +0000
@@ -1,3 +1,9 @@
+2017-03-02  Andy Buckley  <andy.buckley at cern.ch>
+
+	* src/Analyses/CMS_2016_I1473674.cc: Patch from CMS to use partonic tops.
+
+	* src/Analyses/CMS_2015_I1370682.cc: Patch to inline jet finding from CMS.
+
 2017-03-01  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Convert DressedLeptons use of fromDecay to instead veto photons
--- a/data/anainfo/CMS_2016_I1473674.info	Wed Mar 01 21:57:18 2017 +0000
+++ b/data/anainfo/CMS_2016_I1473674.info	Thu Mar 02 16:28:35 2017 +0000
@@ -13,6 +13,7 @@
  - arXiv:1607.00837
 RunInfo:
   ttbar events at sqrt(s) = 8 TeV (inclusive or lepton+jets decay mode)
+  Top quarks are expected in the event record to identify the decay mode.
 Luminosity: 19.7 / fb
 Beams: [p+, p+]
 Energies: [8000]
--- a/src/Analyses/CMS_2015_I1370682.cc	Wed Mar 01 21:57:18 2017 +0000
+++ b/src/Analyses/CMS_2015_I1370682.cc	Thu Mar 02 16:28:35 2017 +0000
@@ -96,7 +96,7 @@
     CMS_2015_I1370682()
       : Analysis("CMS_2015_I1370682"),
         _applyCorrection(true),
-        _doShapeOnly(false)
+        _doShapeOnly(true)
     {    }
 
 
@@ -412,17 +412,13 @@
       sortByPt(neutrinos);
 
       // Proceed to lepton dressing
-      const PseudoJets lep_pjs = mkPseudoJets(pForLep);
-      const fastjet::JetDefinition lep_jdef(fastjet::antikt_algorithm, _lepR);
-      const Jets leps_all = mkJets(fastjet::ClusterSequence(lep_pjs, lep_jdef).inclusive_jets());
-      const Jets leps_sel = sortByPt(filterBy(leps_all, Cuts::pT > _lepMinPt));
-      // FastJets fjLep(FastJets::ANTIKT, _lepR);
-      // fjLep.calc(pForLep);
+      FastJets fjLep(FinalState(), FastJets::ANTIKT, _lepR);
+      fjLep.calc(pForLep);
 
       Jets leptons;
       vector<int> leptonsId;
       set<int> dressedIdxs;
-      for (const Jet& lep : leps_sel) {