[yoda-svn] r260 - in trunk: include/YODA src

[blackhole at projects.hepforge.org]

Author: mkawalec
Date: Wed Aug 17 12:13:30 2011
New Revision: 260

Log:
Some additions to mkScatter

Modified:
   trunk/include/YODA/Scatter3D.h
   trunk/src/Scatter3D.cc

Modified: trunk/include/YODA/Scatter3D.h
==============================================================================
--- trunk/include/YODA/Scatter3D.h	Wed Aug 17 12:06:17 2011	(r259)
+++ trunk/include/YODA/Scatter3D.h	Wed Aug 17 12:13:30 2011	(r260)
@@ -236,9 +236,10 @@
   //@{
 
   /// Make a Scatter3D representation of a Histo2D
-  /// @todo Implement!
   inline Scatter3D mkScatter(const Histo2D& h) {
     Scatter3D ret;
+    ret.setAnnotations(h.annotations());
+    ret.setAnnotation("Type", h.type());
     for(size_t i = 0; i < h.numBinsTotal(); ++i) {
       const HistoBin2D& bin = h.bin(i);
 

Modified: trunk/src/Scatter3D.cc
==============================================================================
--- trunk/src/Scatter3D.cc	Wed Aug 17 12:06:17 2011	(r259)
+++ trunk/src/Scatter3D.cc	Wed Aug 17 12:13:30 2011	(r260)
@@ -4,30 +4,6 @@
 namespace YODA {
 
 
-  // /// Make a Scatter3D representation of a Histo2D
-  // Scatter3D mkScatter(const Histo2D& h) {
-  //   Scatter3D rtn;
-  //   rtn.setAnnotations(h.annotations());
-  //   rtn.setAnnotation("Type", h.type());
-  //   foreach (const HistoBin2D& b, h.bins()) {
-  //     const double x = b.focus().first;
-  //     const double ex_m = b.focus().first - b.lowEdgeX();
-  //     const double ex_p = b.highEdgeX() - b.focus().first;
-
-  //     const double y = b.focus().second;
-  //     const double ey_m = b.focus().second - b.lowEdgeY();
-  //     const double ey_p = b.highEdgeY() - b.focus().second;
-
-  //     const double z = b.height();
-  //     const double ez = b.heightErr();
-  //     const Point3D pt(x, ex_m, ex_p, y, ey_m, ey_p, z, ez, ez);
-  //     rtn.addPoint(pt);
-  //   }
-  //   //assert(h.numBins() == rtn.numPoints());
-  //   return rtn;
-  // }
-
-
   /// Subtract two scatters
   Scatter3D operator + (const Scatter3D& first, const Scatter3D& second) {
     /// @todo Implement