[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/209da1720146
branches:  multiweight
changeset: 5586:209da1720146
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Wed Oct 26 22:38:34 2016 +0100
description:
Converted all bookCounter() instances.

details:   https://rivet.hepforge.org/hg/rivet/rev/8238b081c4e3
branches:  multiweight
changeset: 5587:8238b081c4e3
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Wed Oct 26 23:32:08 2016 +0100
description:
Converted all buildable analyses to the new book() syntax. DELPHI_1996 generates plots. TODO: normalization not correct.

diffs (truncated from 10373 to 50 lines):

--- a/include/Rivet/Analysis.hh	Wed Oct 26 19:23:11 2016 +0100
+++ b/include/Rivet/Analysis.hh	Wed Oct 26 23:32:08 2016 +0100
@@ -375,14 +375,14 @@
     //@{
 
     /// Book a counter.
-    CounterPtr& bookCounter(const std::string& name,
+    void book(CounterPtr &, const std::string& name,
                            const std::string& title="");
                            // 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,
+    void book(CounterPtr &, unsigned int datasetId, unsigned int xAxisId, unsigned int yAxisId,
                            const std::string& title="");
                            // const std::string& valtitle=""
 
@@ -393,28 +393,28 @@
     //@{
 
     /// Book a 1D histogram with @a nbins uniformly distributed across the range @a lower - @a upper .
-    Histo1DPtr& bookHisto1D(const std::string& name,
+    void book(Histo1DPtr &,const std::string& name,
                            size_t nbins, double lower, double upper,
                            const std::string& title="",
                            const std::string& xtitle="",
                            const std::string& ytitle="");
 
     /// Book a 1D histogram with non-uniform bins defined by the vector of bin edges @a binedges .
-    Histo1DPtr& bookHisto1D(const std::string& name,
+    void book(Histo1DPtr &,const std::string& name,
                            const std::vector<double>& binedges,
                            const std::string& title="",
                            const std::string& xtitle="",
                            const std::string& ytitle="");
 
     /// Book a 1D histogram with binning from a reference scatter.
-    Histo1DPtr& bookHisto1D(const std::string& name,
+    void book(Histo1DPtr &,const std::string& name,
                            const Scatter2D& refscatter,
                            const std::string& title="",
                            const std::string& xtitle="",
                            const std::string& ytitle="");
 
     /// Book a 1D histogram, using the binnings in the reference data histogram.
-    Histo1DPtr& bookHisto1D(const std::string& name,
+    void book(Histo1DPtr &,const std::string& name,
                            const std::string& title="",