[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/1268ed43f24b
branches:  release-2-5-x
changeset: 5423:1268ed43f24b
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Aug 23 20:08:18 2016 +0100
description:
Improve container utils functions, and provide combined remove_if+erase filter_* functions for both select- and discard-type selector functions.

details:   https://rivet.hepforge.org/hg/rivet/rev/0fc2e6746cc4
branches:  release-2-5-x
changeset: 5424:0fc2e6746cc4
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Aug 23 21:04:46 2016 +0100
description:
Reworking of Jets and Particles filtering functions, preferring the new filter_select and filter_discard names and using the filterBy names as aliases

details:   https://rivet.hepforge.org/hg/rivet/rev/fad19bec18f2
branches:  release-2-5-x
changeset: 5425:fad19bec18f2
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Aug 23 21:12:17 2016 +0100
description:
Provide an Analysis::bookCounter(d,x,y, title) function, for convenience and making the mkanalysis template valid.

details:   https://rivet.hepforge.org/hg/rivet/rev/507b7f6feae2
branches:  release-2-5-x
changeset: 5426:507b7f6feae2
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Aug 23 22:52:42 2016 +0100
description:
Merge

diffs (truncated from 438 to 50 lines):

--- a/ChangeLog	Tue Aug 23 11:27:20 2016 +0100
+++ b/ChangeLog	Tue Aug 23 22:52:42 2016 +0100
@@ -1,3 +1,18 @@
+2016-08-23  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Provide an Analysis::bookCounter(d,x,y, title) function, for
+	convenience and making the mkanalysis template valid.
+
+	* Improve container utils functions, and provide combined
+	remove_if+erase filter_* functions for both select- and
+	discard-type selector functions.
+
+2016-08-22  Holger Schulz  <holger.schulz at cern.ch>
+
+	* Bugfix in rivet-mkhtml (NoneType: ana.spiresID() --> spiresid)
+
+	* Added <numeric> include to Rivet/Tools/Utils.h to make gcc6 happy
+
 2016-08-22  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add efffilt() functions and Particle/JetEffFilt functors to SmearingFunctions.hh
--- a/bin/rivet-mkhtml	Tue Aug 23 11:27:20 2016 +0100
+++ b/bin/rivet-mkhtml	Tue Aug 23 22:52:42 2016 +0100
@@ -365,7 +365,8 @@
         if inspireid:
             reflist.append('<a href="http://inspire-hep.net/record/%s">Inspire</a>' % inspireid)
             reflist.append('<a href="http://hepdata.cedar.ac.uk/view/ins%s">HepData</a>' % inspireid)
-        elif ana.spiresId():
+        elif spiresid:
+        # elif ana.spiresId():
             reflist.append('<a href="http://inspire-hep.net/search?p=find+key+%s">Inspire</a>' % spiresid)
             reflist.append('<a href="http://hepdata.cedar.ac.uk/view/irn%s">HepData</a>' % spiresid)
         reflist += references
--- a/include/Rivet/Analysis.hh	Tue Aug 23 11:27:20 2016 +0100
+++ b/include/Rivet/Analysis.hh	Tue Aug 23 22:52:42 2016 +0100
@@ -377,8 +377,14 @@
     /// Book a counter.
     CounterPtr bookCounter(const std::string& name,
                            const std::string& title="");
-                           // const std::string& xtitle="",
-                           // const std::string& ytitle="");
+                           // const std::string& valtitle=""
+
+    /// Book a counter, using a path generated from the dataset and axis ID codes
+    ///
+    /// The paper, dataset and x/y-axis IDs will be used to build the histo name in the HepData standard way.
+    CounterPtr bookCounter(unsigned int datasetId, unsigned int xAxisId, unsigned int yAxisId,
+                           const std::string& title="");
+                           // const std::string& valtitle=""