[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/92badadb25d1
branches:  
changeset: 5952:92badadb25d1
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Jul 18 22:38:22 2017 +0100
description:
Remove IsRef annotation from autobooked histogram objects.  Enable methods for booking of Histo2D and Profile2D from Scatter3D reference data.

details:   https://rivet.hepforge.org/hg/rivet/rev/ef6ed554d678
branches:  
changeset: 5953:ef6ed554d678
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Jul 18 22:38:45 2017 +0100
description:
Oops, missed ChangeLog save

diffs (truncated from 315 to 50 lines):

--- a/ChangeLog	Mon Jul 17 16:31:15 2017 +0100
+++ b/ChangeLog	Tue Jul 18 22:38:45 2017 +0100
@@ -1,3 +1,9 @@
+2017-07-18  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Enable methods for booking of Histo2D and Profile2D from Scatter3D reference data.
+
+	* Remove IsRef annotation from autobooked histogram objects.
+
 2017-07-17  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add pair-smearing to SmearedJets.
--- a/include/Rivet/Analysis.hh	Mon Jul 17 16:31:15 2017 +0100
+++ b/include/Rivet/Analysis.hh	Tue Jul 18 22:38:45 2017 +0100
@@ -451,29 +451,29 @@
                            const std::string& ytitle="",
                            const std::string& ztitle="");
 
-    // /// Book a 2D histogram with binning from a reference scatter.
-    // Histo2DPtr bookHisto2D(const std::string& name,
-    //                        const Scatter3D& refscatter,
-    //                        const std::string& title="",
-    //                        const std::string& xtitle="",
-    //                        const std::string& ytitle="",
-    //                        const std::string& ztitle="");
+    /// Book a 2D histogram with binning from a reference scatter.
+    Histo2DPtr bookHisto2D(const std::string& name,
+                           const Scatter3D& refscatter,
+                           const std::string& title="",
+                           const std::string& xtitle="",
+                           const std::string& ytitle="",
+                           const std::string& ztitle="");
 
-    // /// Book a 2D histogram, using the binnings in the reference data histogram.
-    // Histo2DPtr bookHisto2D(const std::string& name,
-    //                        const std::string& title="",
-    //                        const std::string& xtitle="",
-    //                        const std::string& ytitle="",
-    //                        const std::string& ztitle="");
+    /// Book a 2D histogram, using the binnings in the reference data histogram.
+    Histo2DPtr bookHisto2D(const std::string& name,
+                           const std::string& title="",
+                           const std::string& xtitle="",
+                           const std::string& ytitle="",
+                           const std::string& ztitle="");
 
-    // /// Book a 2D histogram, using the binnings in the reference data histogram.
-    // ///
-    // /// The paper, dataset and x/y-axis IDs will be used to build the histo name in the HepData standard way.
-    // Histo2DPtr bookHisto2D(unsigned int datasetId, unsigned int xAxisId, unsigned int yAxisId,