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

[blackhole at projects.hepforge.org]

Author: mkawalec
Date: Thu Aug 25 10:11:15 2011
New Revision: 359

Log:
Removed couts from Histo2D. Also fixed Histo2D division. TODO comments.

Modified:
   trunk/TODO
   trunk/include/YODA/Histo2D.h
   trunk/src/Histo2D.cc

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	Thu Aug 25 09:58:47 2011	(r358)
+++ trunk/TODO	Thu Aug 25 10:11:15 2011	(r359)
@@ -12,6 +12,7 @@
   functions that manipulate them. (MK)
 
 * Fix failing Histo2D test and remove cout printout from Histo2D.h (MK)
+  MK: Cout removed.
 
 * Improve tests Makefile setup to work out the path to the Python build dir. (AB)
 

Modified: trunk/include/YODA/Histo2D.h
==============================================================================
--- trunk/include/YODA/Histo2D.h	Thu Aug 25 09:58:47 2011	(r358)
+++ trunk/include/YODA/Histo2D.h	Thu Aug 25 10:11:15 2011	(r359)
@@ -66,10 +66,6 @@
     Histo2D(const Histo2D& h, const std::string& path="")
       : AnalysisObject("Histo2D", (path.size() == 0) ? h.path() : path, h, h.title())
     {
-      /// @todo Clean... avoid committing this sort of thing if possible!
-      std::cout << "lsadlksdjflksdhkjf" << std::endl;
-      if (_axis.outflows().size() == h._axis.outflows().size()) std::cout << "equals" << std::endl;
-      else std::cout << "non" << std::endl;
       _axis = h._axis;
     }
 

Modified: trunk/src/Histo2D.cc
==============================================================================
--- trunk/src/Histo2D.cc	Thu Aug 25 09:58:47 2011	(r358)
+++ trunk/src/Histo2D.cc	Thu Aug 25 10:11:15 2011	(r359)
@@ -214,7 +214,7 @@
     Scatter3D tmp;
     for (size_t i = 0; i < numer.numBinsTotal(); ++i) {
       const HistoBin2D& b1 = numer.bin(i);
-      const HistoBin2D& b2 = denom.bin(i);
+      const HistoBin2D& b2 = denom.binByCoord(b1.midpoint().first, b1.midpoint().second);
       const HistoBin2D& bL = b1 + b2;
       assert(fuzzyEquals(b1.midpoint().first, b2.midpoint().first));
       assert(fuzzyEquals(b1.midpoint().second, b2.midpoint().second));