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

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Wed Nov 14 19:08:55 2012
New Revision: 4017

Log:
revert accidental merge from YODA in c3985

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

Modified: branches/2012-06-aidarivet/src/Tools/BinnedHistogram.cc
==============================================================================
--- branches/2012-06-aidarivet/src/Tools/BinnedHistogram.cc	Wed Nov 14 19:06:44 2012	(r4016)
+++ branches/2012-06-aidarivet/src/Tools/BinnedHistogram.cc	Wed Nov 14 19:08:55 2012	(r4017)
@@ -44,7 +44,7 @@
       _histosByUpperBound.upper_bound(bin);
     //check that the bin is not out of range
     if (histIt == _histosByUpperBound.end()) {
-      return Histo1DPtr();
+      return 0;
     }
  
     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 Histo1DPtr();
+      return 0;
     }
     // 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 Histo1DPtr();
+      return 0;
     }
     
     histo->fill(val, weight);