[yoda-svn] r266 - trunk/include/YODA

[blackhole at projects.hepforge.org]

Author: mkawalec
Date: Wed Aug 17 15:32:00 2011
New Revision: 266

Log:
Made scaling scale outflows properly. Also removed the remains of under/over flows in the code.

Modified:
   trunk/include/YODA/Axis2D.h

Modified: trunk/include/YODA/Axis2D.h
==============================================================================
--- trunk/include/YODA/Axis2D.h	Wed Aug 17 15:23:26 2011	(r265)
+++ trunk/include/YODA/Axis2D.h	Wed Aug 17 15:32:00 2011	(r266)
@@ -339,32 +339,6 @@
       return _dbn;
     }
 
-
-    // /// Get the overflow distribution (non-const version)
-    // Dbn2D& overflow()
-    // {
-    //   return _overflow;
-    // }
-
-    // /// Get the overflow distribution (const version)
-    // const Dbn2D& overflow() const
-    // {
-    //   return _overflow;
-    // }
-
-    // /// Get the underflow distribution (non-const version)
-    // Dbn2D& underflow()
-    // {
-    //   return _underflow;
-    // }
-
-    // /// Get the underflow distribution (const version)
-    // const Dbn2D& underflow() const
-    // {
-    //   return _underflow;
-    // }
-
-
     /// Get bin index from external classes
     int getBinIndex(double coordX, double coordY) const
     {
@@ -375,8 +349,6 @@
     void reset()
     {
       _dbn.reset();
-      // _underflow.reset();
-      // _overflow.reset();
       for (size_t i = 0; i < _bins.size(); ++i) {
         _bins[i].reset();
       }
@@ -412,9 +384,13 @@
       for (size_t i = 0; i < _bins.size(); ++i) {
         _bins[i].scaleXY(scaleX, scaleY);
       }
+      
       _dbn.scaleXY(scaleX, scaleY);
-      // _underflow.scaleXY(scaleX, scaleY);
-      // _overflow.scaleXY(scaleX, scaleY);
+      for(size_t i = 0; i < _outflows.size(); ++i) {
+        for(size_t j =0; j < _outflows[i].size(); ++j) {
+          _outflows[i][j].scaleXY(scaleX, scaleY);
+        }
+      }
 
       // Making sure that we have correct boundaries set after rescaling
       _regenDelimiters();
@@ -424,8 +400,12 @@
     /// Scales the bin weights
     void scaleW(double scalefactor) {
       _dbn.scaleW(scalefactor);
-      // _underflow.scaleW(scalefactor);
-      // _overflow.scaleW(scalefactor);
+      for(size_t i = 0; i < _outflows.size(); ++i) {
+        for(size_t j = 0; j < _outflows[i].size(); ++j) {
+          _outflows[i][j].scaleW(scalefactor);
+        }
+      }
+
       for (size_t i = 0; i < _bins.size(); ++i) {
         _bins[i].scaleW(scalefactor);
       }
@@ -457,8 +437,6 @@
         bins().at(i) += toAdd.bins().at(i);
       }
       _dbn += toAdd._dbn;
-      // _underflow += toAdd._underflow;
-      // _overflow += toAdd._overflow;
       return *this;
     }
 
@@ -475,8 +453,6 @@
         bins().at(i) -= toSubtract.bins().at(i);
       }
       _dbn -= toSubtract._dbn;
-      // _underflow -= toSubtract._underflow;
-      // _overflow -= toSubtract._overflow;
       return *this;
     }
 
@@ -841,9 +817,6 @@
     Bins _bins;
 
     /// Underflow distribution
-    // /// @todo Need many (binned?) outflows instead. This can't work at the moment.
-    // Dbn2D _underflow;
-    // Dbn2D _overflow;
     vector<vector<Dbn2D> > _outflows;
 
     /// The total distribution