[Rivet-svn] rivet: merge from default to get py3 and crash fixes

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/082a39353a81
branches:  multiweight
changeset: 6151:082a39353a81
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Mon Nov 20 20:54:31 2017 +0000
description:
merge from default to get py3 and crash fixes

diffs (truncated from 2017 to 50 lines):

--- a/ChangeLog	Fri Nov 03 11:47:54 2017 +0000
+++ b/ChangeLog	Mon Nov 20 20:54:31 2017 +0000
@@ -1,3 +1,11 @@
+2017-11-17  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Various improvements to DISKinematics, DISLepton, and the ZEUS 2001 analysis.
+
+2017-11-06  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Extend AOPath regex to allow dots and underscores in weight names.
+
 2017-10-27  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add energy to the list of cuts (both as Cuts::E and Cuts::energy)
--- a/analyses/pluginATLAS/ATLAS_2010_S8919674.cc	Fri Nov 03 11:47:54 2017 +0000
+++ b/analyses/pluginATLAS/ATLAS_2010_S8919674.cc	Mon Nov 20 20:54:31 2017 +0000
@@ -63,11 +63,11 @@
 
       const WFinder& We = apply<WFinder>(event, "W_e");
       if (We.bosons().size() == 1) {
-        const FourMomentum& p_miss = We.constituentNeutrinos()[0].momentum();
-        const FourMomentum& p_lept = We.constituentLeptons()[0].momentum();
+        const FourMomentum p_miss = We.constituentNeutrinos()[0];
+        const FourMomentum p_lept = We.constituentLeptons()[0];
         if (p_miss.Et() > 25*GeV && We.mT() > 40*GeV) {
           Jets js;
-          foreach (const Jet& j, jets) {
+          for (const Jet& j : jets) {
             if (j.abseta() < 2.8 && deltaR(p_lept, j.momentum()) > 0.5)
               js.push_back(j);
           }
@@ -88,11 +88,11 @@
 
       const WFinder& Wm = apply<WFinder>(event, "W_mu");
       if (Wm.bosons().size() == 1) {
-        const FourMomentum& p_miss = Wm.constituentNeutrinos()[0].momentum();
-        const FourMomentum& p_lept = Wm.constituentLeptons()[0].momentum();
+        const FourMomentum p_miss = Wm.constituentNeutrinos()[0];
+        const FourMomentum p_lept = Wm.constituentLeptons()[0];
         if (p_miss.Et() > 25*GeV && Wm.mT() > 40*GeV) {
           Jets js;
-          foreach (const Jet& j, jets) {
+          for (const Jet& j : jets) {
             if (j.abseta() < 2.8 && deltaR(p_lept, j.momentum()) > 0.5)
               js.push_back(j);
           }
--- a/analyses/pluginATLAS/ATLAS_2011_I925932.cc	Fri Nov 03 11:47:54 2017 +0000
+++ b/analyses/pluginATLAS/ATLAS_2011_I925932.cc	Mon Nov 20 20:54:31 2017 +0000
@@ -1,17 +1,16 @@
 // -*- C++ -*-