[Rivet-svn] r3985 - branches/2012-06-aidarivet/src/Tools

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Nov 14 15:51:52 2012
New Revision: 3985

Log:
Merging changeset [3932] from trunk

Modified:
   branches/2012-06-aidarivet/src/Tools/BinnedHistogram.cc
   branches/2012-06-aidarivet/src/Tools/Makefile.am

Modified: branches/2012-06-aidarivet/src/Tools/BinnedHistogram.cc
==============================================================================
--- branches/2012-06-aidarivet/src/Tools/BinnedHistogram.cc	Wed Nov 14 15:43:50 2012	(r3984)
+++ branches/2012-06-aidarivet/src/Tools/BinnedHistogram.cc	Wed Nov 14 15:51:52 2012	(r3985)
@@ -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();
     }
  
     AIDA::IHistogram1D* 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: branches/2012-06-aidarivet/src/Tools/Makefile.am
==============================================================================
--- branches/2012-06-aidarivet/src/Tools/Makefile.am	Wed Nov 14 15:43:50 2012	(r3984)
+++ branches/2012-06-aidarivet/src/Tools/Makefile.am	Wed Nov 14 15:51:52 2012	(r3985)
@@ -16,7 +16,8 @@
   TinyXML/tinyxmlparser.cpp \
   BinnedHistogram.cc \
   mt2_bisect.cc \
-  RivetMT2.cc
+  RivetMT2.cc \
+  BinnedHistogram.cc
 
 dist_noinst_HEADERS = binreloc.h mt2_bisect.hh