[Rivet-svn] r3932 - trunk/src/Tools

[blackhole at projects.hepforge.org]

Author: dgrell
Date: Fri Sep 21 13:56:56 2012
New Revision: 3932

Log:
BinnedHistogram needs to get built to be used.

Modified:
   trunk/src/Tools/BinnedHistogram.cc
   trunk/src/Tools/Makefile.am

Modified: trunk/src/Tools/BinnedHistogram.cc
==============================================================================
--- trunk/src/Tools/BinnedHistogram.cc	Mon Sep 17 09:42:50 2012	(r3931)
+++ trunk/src/Tools/BinnedHistogram.cc	Fri Sep 21 13:56:56 2012	(r3932)
@@ -44,7 +44,7 @@
       _histosByUpperBound.upper_bound(bin);
     //check that the bin is not out of range
     if (histIt == _histosByUpperBound.end()) {
-      return 0;
+      return Histo1DPtr();
     }
  
     Histo1DPtr histo = histIt->second;
@@ -54,14 +54,14 @@
     // (given that upper bound > lower bound is checked)
     // Check it is not before the start of the map
     if (histIt == _histosByLowerBound.begin()) {
-      return 0;
+      return Histo1DPtr();
     }
     // By-lower-bound actually gives us the iterator one above the nearest element,
     // so decrement it. This is safe because we already checked we're not at the start!
     --histIt;
  
     if (histo != histIt->second) {
-      return 0;
+      return Histo1DPtr();
     }
     
     histo->fill(val, weight);

Modified: trunk/src/Tools/Makefile.am
==============================================================================
--- trunk/src/Tools/Makefile.am	Mon Sep 17 09:42:50 2012	(r3931)
+++ trunk/src/Tools/Makefile.am	Fri Sep 21 13:56:56 2012	(r3932)
@@ -12,8 +12,8 @@
   Utils.cc \
   ParticleIdUtils.cc \
   mt2_bisect.cc \
-  RivetMT2.cc
-##  BinnedHistogram.cc \
+  RivetMT2.cc \
+  BinnedHistogram.cc
 
 dist_noinst_HEADERS = binreloc.h mt2_bisect.hh