[Rivet-svn] rivet: merging multi-scatters back into multiweight

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/febba9b82879
branches:  multiweight
changeset: 5981:febba9b82879
user:      Chris Pollard <cspollard at gmail.com>
date:      Fri Aug 25 14:52:42 2017 +0200
description:
merging multi-scatters back into multiweight

diffs (truncated from 458 to 50 lines):

--- a/include/Rivet/Analysis.hh	Mon Jun 26 09:05:11 2017 +0100
+++ b/include/Rivet/Analysis.hh	Fri Aug 25 14:52:42 2017 +0200
@@ -597,7 +597,7 @@
     /// assuming that there is a reference histo with the same name: if there
     /// isn't, an exception will be thrown.
 
-    Scatter2DPtr& bookScatter2D(const std::string& name,
+    void book(Scatter2DPtr & s2d, const string& hname,
                                bool copy_pts=false,
                                const std::string& title="",
                                const std::string& xtitle="",
@@ -613,7 +613,7 @@
     /// meaningful and can't be extracted from the data, then set the @a
     /// copy_pts parameter to true. This creates points to match the reference
     /// data's x values and errors, but with the y values and errors zeroed.
-    Scatter2DPtr& bookScatter2D(unsigned int datasetId, unsigned int xAxisId, unsigned int yAxisId,
+    void book(Scatter2DPtr & s2d, unsigned int datasetId, unsigned int xAxisId, unsigned int yAxisId,
                                bool copy_pts=false,
                                const std::string& title="",
                                const std::string& xtitle="",
@@ -622,7 +622,7 @@
     /// @brief Book a 2-dimensional data point set with equally spaced x-points in a range.
     ///
     /// The y values and errors will be set to 0.
-    Scatter2DPtr& bookScatter2D(const std::string& name,
+    void book(Scatter2DPtr & s2d, const string& hname,
                                size_t npts, double lower, double upper,
                                const std::string& title="",
                                const std::string& xtitle="",
@@ -631,7 +631,7 @@
     /// @brief Book a 2-dimensional data point set based on provided contiguous "bin edges".
     ///
     /// The y values and errors will be set to 0.
-    Scatter2DPtr& bookScatter2D(const std::string& hname,
+    void book(Scatter2DPtr & s2d, const string& hname,
                                const std::vector<double>& binedges,
                                const std::string& title,
                                const std::string& xtitle,
--- a/include/Rivet/Tools/RivetYODA.hh	Mon Jun 26 09:05:11 2017 +0100
+++ b/include/Rivet/Tools/RivetYODA.hh	Fri Aug 25 14:52:42 2017 +0200
@@ -24,9 +24,9 @@
 
 namespace YODA {
     typedef std::shared_ptr<YODA::AnalysisObject> AnalysisObjectPtr;
-    typedef std::shared_ptr<YODA::Scatter1D> Scatter1DPtr;
-    typedef std::shared_ptr<YODA::Scatter2D> Scatter2DPtr;
-    typedef std::shared_ptr<YODA::Scatter3D> Scatter3DPtr;
+    // typedef std::shared_ptr<YODA::Scatter1D> Scatter1DPtr;
+    // typedef std::shared_ptr<YODA::Scatter2D> Scatter2DPtr;
+    // typedef std::shared_ptr<YODA::Scatter3D> Scatter3DPtr;