[Rivet-svn] r3581 - in trunk: include/Rivet src/Core

[blackhole at projects.hepforge.org]

Author: buckley
Date: Sun Feb 26 20:14:05 2012
New Revision: 3581

Log:
src/Core/Analysis.cc, include/Rivet/Analysis.hh: Add a numeric-arg version of histoPath().

Modified:
   trunk/include/Rivet/Analysis.hh
   trunk/src/Core/Analysis.cc

Modified: trunk/include/Rivet/Analysis.hh
==============================================================================
--- trunk/include/Rivet/Analysis.hh	Fri Feb 24 14:25:11 2012	(r3580)
+++ trunk/include/Rivet/Analysis.hh	Sun Feb 26 20:14:05 2012	(r3581)
@@ -374,6 +374,9 @@
     /// Get the canonical histogram path for the named histogram in this analysis.
     const std::string histoPath(const std::string& hname) const;
 
+    /// Get the canonical histogram path for the numbered histogram in this analysis.
+    const std::string histoPath(size_t datasetId, size_t xAxisId, size_t yAxisId) const;
+
     /// Get the internal histogram name for given d, x and y (cf. HepData)
     const std::string makeAxisCode(size_t datasetId, size_t xAxisId, size_t yAxisId) const;
 

Modified: trunk/src/Core/Analysis.cc
==============================================================================
--- trunk/src/Core/Analysis.cc	Fri Feb 24 14:25:11 2012	(r3580)
+++ trunk/src/Core/Analysis.cc	Sun Feb 26 20:14:05 2012	(r3581)
@@ -79,6 +79,11 @@
   }
 
 
+  const string Analysis::histoPath(size_t datasetId, size_t xAxisId, size_t yAxisId) const {
+    return histoDir() + "/" + makeAxisCode(datasetId, xAxisId, yAxisId);
+  }
+
+
   const string Analysis::makeAxisCode(size_t datasetId, size_t xAxisId, size_t yAxisId) const {
     stringstream axisCode;
     axisCode << "d";