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

[blackhole at projects.hepforge.org]

Author: mkawalec
Date: Wed Aug 17 11:31:05 2011
New Revision: 257

Log:
Removed superflous include/namespace decalrations in 2D classes.

Modified:
   trunk/include/YODA/Axis2D.h
   trunk/include/YODA/Histo2D.h
   trunk/include/YODA/Scatter3D.h
   trunk/src/Bin2D.cc
   trunk/src/Histo2D.cc

Modified: trunk/include/YODA/Axis2D.h
==============================================================================
--- trunk/include/YODA/Axis2D.h	Wed Aug 17 11:22:00 2011	(r256)
+++ trunk/include/YODA/Axis2D.h	Wed Aug 17 11:31:05 2011	(r257)
@@ -8,15 +8,8 @@
 #include "YODA/Utils/MathUtils.h"
 #include "YODA/Dbn2D.h"
 
-#include <string>
-#include <cassert>
-#include <cmath>
 #include <algorithm>
 #include <limits>
-#include <sys/time.h>
-
-/// @todo Remove this: don't use namespace std in API headers since it pollutes users' namespace.
-using namespace std;
 
 namespace YODA {
 
@@ -815,7 +808,6 @@
         if (_bins[i].yMax() > highEdgeY) highEdgeY = _bins[i].yMax();
       }
 
-      // cout << "LowX: " << lowEdgeX << " LowY: " << lowEdgeY << " HighX: " << highEdgeX << " HighY: " << highEdgeY << endl;
       _lowEdgeX = lowEdgeX;
       _highEdgeX = highEdgeX;
       _lowEdgeY = lowEdgeY;

Modified: trunk/include/YODA/Histo2D.h
==============================================================================
--- trunk/include/YODA/Histo2D.h	Wed Aug 17 11:22:00 2011	(r256)
+++ trunk/include/YODA/Histo2D.h	Wed Aug 17 11:31:05 2011	(r257)
@@ -12,9 +12,8 @@
 #include "YODA/Axis2D.h"
 #include "YODA/Exceptions.h"
 #include "YODA/Histo1D.h"
+
 #include <vector>
-#include <string>
-#include <map>
 
 namespace YODA {
 

Modified: trunk/include/YODA/Scatter3D.h
==============================================================================
--- trunk/include/YODA/Scatter3D.h	Wed Aug 17 11:22:00 2011	(r256)
+++ trunk/include/YODA/Scatter3D.h	Wed Aug 17 11:31:05 2011	(r257)
@@ -10,9 +10,7 @@
 #include "YODA/Point3D.h"
 #include "YODA/Utils/sortedvector.h"
 #include "YODA/Histo2D.h"
-#include <vector>
-#include <set>
-#include <string>
+
 #include <utility>
 #include <cassert>
 

Modified: trunk/src/Bin2D.cc
==============================================================================
--- trunk/src/Bin2D.cc	Wed Aug 17 11:22:00 2011	(r256)
+++ trunk/src/Bin2D.cc	Wed Aug 17 11:31:05 2011	(r257)
@@ -6,8 +6,6 @@
 #include <cmath>
 #include <utility>
 #include <vector>
-#include <iostream>
-using namespace std;
 
 namespace YODA {
   typedef typename std::pair<double, double> Point;

Modified: trunk/src/Histo2D.cc
==============================================================================
--- trunk/src/Histo2D.cc	Wed Aug 17 11:22:00 2011	(r256)
+++ trunk/src/Histo2D.cc	Wed Aug 17 11:31:05 2011	(r257)
@@ -7,8 +7,6 @@
 #include "YODA/Scatter3D.h"
 
 #include <cmath>
-#include <iostream>
-using namespace std;
 
 namespace YODA {
 
@@ -115,7 +113,6 @@
 
       const double eyminus = y - b1.yMin();
       const double eyplus = bL.yMax() - y;
-      //cout << b1.xMin() << " " << b1.xMax() << " " << b1.yMin() << " " << b1.yMax() << " EMinus: " << exminus << " " << eyminus << " Focus: " << x << " " << y << endl;
 
       const double z = b1.height() / b2.height();
       const double ez = z * sqrt( sqr(b1.heightErr()/b1.height()) + sqr(b2.heightErr()/b2.height()) );