[Rivet-svn] r4327 - trunk/src/Core

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed May 29 17:36:01 2013
New Revision: 4327

Log:
Putting placeholder Histo2D stuff in place (currently commented since types inconsistent)

Modified:
   trunk/src/Core/Analysis.cc

Modified: trunk/src/Core/Analysis.cc
==============================================================================
--- trunk/src/Core/Analysis.cc	Wed May 29 17:03:35 2013	(r4326)
+++ trunk/src/Core/Analysis.cc	Wed May 29 17:36:01 2013	(r4327)
@@ -248,39 +248,76 @@
     return hist;
   }
 
-  // IHistogram2D*
-  // Analysis::bookHistogram2D(const string& hname,
-  //                size_t nxbins, double xlower, double xupper,
-  //                size_t nybins, double ylower, double yupper,
-  //                const string& title, const string& xtitle,
-  //                const string& ytitle, const string& ztitle) {
-  //   _makeHistoDir();
+
+  /////////////////
+
+
+  // Histo2DPtr Analysis::bookHisto2D(size_t datasetId, size_t xAxisId, size_t yAxisId,
+  //                                  const string& title,
+  //                                  const string& xtitle,
+  //                                  const string& ytitle,
+  //                                  const string& ztitle)
+  // {
+  //   const string axisCode = makeAxisCode(datasetId, xAxisId, yAxisId);
+  //   return bookHisto2D(axisCode, title, xtitle, ytitle);
+  // }
+
+
+  // Histo1DPtr Analysis::bookHisto1D(const string& hname,
+  //                                  const string& title,
+  //                                  const string& xtitle,
+  //                                  const string& ytitle,
+  //                                  const string& ztitle)
+  // {
+  //   const Scatter3D & refdata = refData(hname);
+  //   const string path = histoPath(hname);
+  //   Histo2DPtr hist( new Histo2D(refdata, path) );
+  //   addPlot(hist);
+  //   MSG_TRACE("Made histogram " << hname <<  " for " << name());
+  //   hist->setTitle(title);
+  //   hist->setAnnotation("XLabel", xtitle);
+  //   hist->setAnnotation("YLabel", ytitle);
+  //   hist->setAnnotation("ZLabel", ztitle);
+  //   return hist;
+  // }
+
+
+  // Histo2DPtr Analysis::bookHisto2D(const string& hname,
+  //                                  size_t nxbins, double xlower, double xupper,
+  //                                  size_t nybins, double ylower, double yupper,
+  //                                  const string& title,
+  //                                  const string& xtitle,
+  //                                  const string& ytitle,
+  //                                  const string& ztitle)
+  // {
   //   const string path = histoPath(hname);
-  //   IHistogram2D* hist =
-  //     histogramFactory().createHistogram2D(path, title, nxbins, xlower, xupper,
-  //                       nybins, ylower, yupper);
-  //   MSG_TRACE("Made 2D histogram " << hname <<  " for " << name());
-  //   hist->setXTitle(xtitle);
-  //   hist->setYTitle(ytitle);
-  //   hist->setZTitle(ztitle);
+  //   Histo2DPtr hist( new Histo2D(path, nxbins, xlower, xupper, nybins, ylower, yupper) );
+  //   addPlot(hist);
+  //   MSG_TRACE("Made histogram " << hname <<  " for " << name());
+  //   hist->setTitle(title);
+  //   hist->setAnnotation("XLabel", xtitle);
+  //   hist->setAnnotation("YLabel", ytitle);
+  //   hist->setAnnotation("ZLabel", ztitle);
   //   return hist;
   // }
 
 
-  // IHistogram2D*
-  // Analysis::bookHistogram2D(const string& hname,
-  //                const vector<double>& xbinedges,
-  //                const vector<double>& ybinedges,
-  //                const string& title, const string& xtitle,
-  //                const string& ytitle, const string& ztitle) {
-  //   _makeHistoDir();
+  // Histo2DPtr Analysis::bookHisto2D(const string& hname,
+  //                                  const vector<double>& xbinedges,
+  //                                  const vector<double>& ybinedges,
+  //                                  const string& title,
+  //                                  const string& xtitle,
+  //                                  const string& ytitle,
+  //                                  const string& ztitle)
+  // {
   //   const string path = histoPath(hname);
-  //   IHistogram2D* hist =
-  //     histogramFactory().createHistogram2D(path, title, xbinedges, ybinedges);
-  //   MSG_TRACE("Made 2D histogram " << hname <<  " for " << name());
-  //   hist->setXTitle(xtitle);
-  //   hist->setYTitle(ytitle);
-  //   hist->setZTitle(ztitle);
+  //   Histo2DPtr hist( new Histo2D(path, xbinedges, ybinedges) );
+  //   addPlot(hist);
+  //   MSG_TRACE("Made histogram " << hname <<  " for " << name());
+  //   hist->setTitle(title);
+  //   hist->setAnnotation("XLabel", xtitle);
+  //   hist->setAnnotation("YLabel", ytitle);
+  //   hist->setAnnotation("ZLabel", ztitle);
   //   return hist;
   // }