[Rivet-svn] rivet: Merge from default

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/e715fee9a00f
branches:  multiweight
changeset: 6090:e715fee9a00f
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Wed Oct 25 09:36:50 2017 +0100
description:
Merge from default

diffs (truncated from 4017 to 50 lines):

--- a/ChangeLog	Tue Oct 10 13:28:13 2017 +0100
+++ b/ChangeLog	Wed Oct 25 09:36:50 2017 +0100
@@ -1,3 +1,11 @@
+2017-10-09  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Embed zstr and enable transparent reading of gzipped HepMC streams.
+
+2017-10-03  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Use Lester MT2 bisection header, and expose a few more mT2 function signatures.
+
 2017-09-26  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Use generic YODA read and write functions -- enables zipped yoda.gz output.
--- a/analyses/pluginATLAS/ATLAS_2011_S8983313.cc	Tue Oct 10 13:28:13 2017 +0100
+++ b/analyses/pluginATLAS/ATLAS_2011_S8983313.cc	Wed Oct 25 09:36:50 2017 +0100
@@ -6,7 +6,6 @@
 #include "Rivet/Projections/VetoedFinalState.hh"
 #include "Rivet/Projections/IdentifiedFinalState.hh"
 #include "Rivet/Projections/FastJets.hh"
-#include "Rivet/Tools/RivetMT2.hh"
 
 namespace Rivet {
 
@@ -210,13 +209,10 @@
       FourMomentum a = recon_jets[0].momentum();
       FourMomentum b = recon_jets[1].momentum();
 
-      double m_T2 = mT2::mT2( a,
-                              b,
-                              pTmiss,
-                              0.0 ); // zero mass invisibles
+      double m_T2 = mT2( a, b, pTmiss, 0.0 ); // zero mass invisibles
 
 
-    // ==================== FILL ====================
+      // ==================== FILL ====================
 
       MSG_DEBUG( "Trying to fill "
                  << Njets << ' '
--- a/analyses/pluginATLAS/ATLAS_2012_I1126136.cc	Tue Oct 10 13:28:13 2017 +0100
+++ b/analyses/pluginATLAS/ATLAS_2012_I1126136.cc	Wed Oct 25 09:36:50 2017 +0100
@@ -6,7 +6,6 @@
 #include "Rivet/Projections/IdentifiedFinalState.hh"
 #include "Rivet/Projections/VetoedFinalState.hh"
 #include "Rivet/Projections/FastJets.hh"
-#include "Rivet/Tools/RivetMT2.hh"
 
 namespace Rivet {