[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/4c9539157073
branches:  
changeset: 6084:4c9539157073
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Oct 09 19:34:00 2017 +0100
description:
Fix mT2 ambiguity (and remove unnecessary sub-namespace)

details:   https://rivet.hepforge.org/hg/rivet/rev/d5dcb0f016fe
branches:  
changeset: 6085:d5dcb0f016fe
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Oct 09 19:35:00 2017 +0100
description:
Embed zstr and enable transparent reading of gzipped HepMC streams.

diffs (truncated from 1081 to 50 lines):

--- a/ChangeLog	Tue Oct 03 23:04:52 2017 +0100
+++ b/ChangeLog	Mon Oct 09 19:35:00 2017 +0100
@@ -1,3 +1,7 @@
+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.
--- a/analyses/pluginATLAS/ATLAS_2011_S8983313.cc	Tue Oct 03 23:04:52 2017 +0100
+++ b/analyses/pluginATLAS/ATLAS_2011_S8983313.cc	Mon Oct 09 19:35:00 2017 +0100
@@ -1,13 +1,11 @@
 // -*- C++ -*-
 #include "Rivet/Analysis.hh"
-#include "Rivet/Tools/BinnedHistogram.hh"
 #include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/ChargedFinalState.hh"
 #include "Rivet/Projections/VisibleFinalState.hh"
 #include "Rivet/Projections/VetoedFinalState.hh"
 #include "Rivet/Projections/IdentifiedFinalState.hh"
 #include "Rivet/Projections/FastJets.hh"
-#include "Rivet/Tools/RivetMT2.hh"
 
 namespace Rivet {
 
@@ -211,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 03 23:04:52 2017 +0100
+++ b/analyses/pluginATLAS/ATLAS_2012_I1126136.cc	Mon Oct 09 19:35:00 2017 +0100
@@ -1,13 +1,11 @@
 // -*- C++ -*-
 #include "Rivet/Analysis.hh"
-#include "Rivet/Tools/BinnedHistogram.hh"
 #include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/ChargedFinalState.hh"