[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/5195f5facece
branches:  
changeset: 5741:5195f5facece
user:      Andy Buckley <andy at insectnation.org>
date:      Wed May 03 14:35:29 2017 +0100
description:
Correct constness of new data-preloading methods

details:   https://rivet.hepforge.org/hg/rivet/rev/9dcdc270ea77
branches:  
changeset: 5742:9dcdc270ea77
user:      Andy Buckley <andy at insectnation.org>
date:      Wed May 03 15:43:17 2017 +0100
description:
Correct bookHisto1D functions to avoid double-prepending the analysis name to the histo path

diffs (truncated from 189 to 50 lines):

--- a/include/Rivet/Analysis.hh	Tue May 02 16:18:56 2017 +0100
+++ b/include/Rivet/Analysis.hh	Wed May 03 15:43:17 2017 +0100
@@ -864,25 +864,25 @@
     }
 
 
-    // /// Get a named Histo2D object from the histogram system
-    // const Histo2DPtr getHisto2D(const std::string& name) const {
-    //   return getAnalysisObject<Histo2D>(name);
-    // }
+    /// Get a named Histo2D object from the histogram system
+    const Histo2DPtr getHisto2D(const std::string& name) const {
+      return getAnalysisObject<Histo2D>(name);
+    }
 
-    // /// Get a named Histo2D object from the histogram system (non-const)
-    // Histo2DPtr getHisto2D(const std::string& name) {
-    //   return getAnalysisObject<Histo2D>(name);
-    // }
+    /// Get a named Histo2D object from the histogram system (non-const)
+    Histo2DPtr getHisto2D(const std::string& name) {
+      return getAnalysisObject<Histo2D>(name);
+    }
 
-    // /// Get a Histo2D object from the histogram system by axis ID codes (non-const)
-    // const Histo2DPtr getHisto2D(unsigned int datasetId, unsigned int xAxisId, unsigned int yAxisId) const {
-    //   return getAnalysisObject<Histo2D>(makeAxisCode(datasetId, xAxisId, yAxisId));
-    // }
+    /// Get a Histo2D object from the histogram system by axis ID codes (non-const)
+    const Histo2DPtr getHisto2D(unsigned int datasetId, unsigned int xAxisId, unsigned int yAxisId) const {
+      return getAnalysisObject<Histo2D>(makeAxisCode(datasetId, xAxisId, yAxisId));
+    }
 
-    // /// Get a Histo2D object from the histogram system by axis ID codes (non-const)
-    // Histo2DPtr getHisto2D(unsigned int datasetId, unsigned int xAxisId, unsigned int yAxisId) {
-    //   return getAnalysisObject<Histo2D>(makeAxisCode(datasetId, xAxisId, yAxisId));
-    // }
+    /// Get a Histo2D object from the histogram system by axis ID codes (non-const)
+    Histo2DPtr getHisto2D(unsigned int datasetId, unsigned int xAxisId, unsigned int yAxisId) {
+      return getAnalysisObject<Histo2D>(makeAxisCode(datasetId, xAxisId, yAxisId));
+    }
 
 
     /// Get a named Profile1D object from the histogram system
@@ -906,25 +906,25 @@
     }
 
 
-    // /// Get a named Profile2D object from the histogram system
-    // const Profile2DPtr getProfile2D(const std::string& name) const {