[Rivet-svn] rivet: Enable ParticleBaseUtils.hh inclusion in ParticleUtils.hh...

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/2a690ba30627
branches:  release-2-5-x
changeset: 5353:2a690ba30627
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Jul 26 12:00:49 2016 +0100
description:
Enable ParticleBaseUtils.hh inclusion in ParticleUtils.hh and JetUtils.hh, and fix a few typos and consequences of the new pT(ParticleBase) function

diffs (truncated from 620 to 50 lines):

--- a/include/Rivet/Tools/JetUtils.hh	Tue Jul 26 08:59:21 2016 +0100
+++ b/include/Rivet/Tools/JetUtils.hh	Tue Jul 26 12:00:49 2016 +0100
@@ -2,6 +2,7 @@
 #define RIVET_JETUTILS_HH
 
 #include "Rivet/Jet.hh"
+#include "Rivet/Tools/ParticleBaseUtils.hh"
 
 namespace Rivet {
 
--- a/include/Rivet/Tools/ParticleBaseUtils.hh	Tue Jul 26 08:59:21 2016 +0100
+++ b/include/Rivet/Tools/ParticleBaseUtils.hh	Tue Jul 26 12:00:49 2016 +0100
@@ -64,7 +64,7 @@
     bool operator()(const ParticleBase& p) const { return p.abseta() < absetacut; }
     double absetacut;
   };
-  using AbsEtaGtr = absetaGtr;
+  using AbsEtaLess = absetaLess;
 
 
   /// Rapidity greater-than functor
--- a/include/Rivet/Tools/ParticleUtils.hh	Tue Jul 26 08:59:21 2016 +0100
+++ b/include/Rivet/Tools/ParticleUtils.hh	Tue Jul 26 12:00:49 2016 +0100
@@ -2,6 +2,7 @@
 #define RIVET_PARTICLEUTILS_HH
 
 #include "Rivet/Particle.hh"
+#include "Rivet/Tools/ParticleBaseUtils.hh"
 #include "Rivet/Tools/ParticleIdUtils.hh"
 
 // Macros to map Rivet::Particle functions to PID:: functions of the same name
--- a/src/Analyses/ATLAS_2011_I928289_W.cc	Tue Jul 26 08:59:21 2016 +0100
+++ b/src/Analyses/ATLAS_2011_I928289_W.cc	Tue Jul 26 12:00:49 2016 +0100
@@ -1,15 +1,10 @@
 // -*- C++ -*-
-#include <cmath>
-
 #include "Rivet/Analysis.hh"
 #include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/WFinder.hh"
 
-
 namespace Rivet {
 
-  using namespace Cuts;
-
 
   class ATLAS_2011_I928289_W : public Analysis {
   public:
@@ -22,18 +17,16 @@