[Rivet-svn] r3234 - in branches/2011-07-aida2yoda/include: Rivet YODA

[blackhole at projects.hepforge.org]

Author: dgrell
Date: Thu Jul 21 20:49:10 2011
New Revision: 3234

Log:
undo back to r3227

Deleted:
   branches/2011-07-aida2yoda/include/YODA/
Modified:
   branches/2011-07-aida2yoda/include/Rivet/RivetYODA.hh

Modified: branches/2011-07-aida2yoda/include/Rivet/RivetYODA.hh
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/RivetYODA.hh	Thu Jul 21 18:04:58 2011	(r3233)
+++ branches/2011-07-aida2yoda/include/Rivet/RivetYODA.hh	Thu Jul 21 20:49:10 2011	(r3234)
@@ -17,36 +17,6 @@
 #include "YODA/Point2D.h"
 #include "YODA/ReaderAIDA.h"
 
-// Yoda ones:
-#include "YODA/AnalysisObject.h"
-#include "YODA/Axis1D.h"
-#include "YODA/Bin1D.h"
-#include "YODA/Bin.h"
-#include "YODA/Dbn1D.h"
-#include "YODA/Exceptions.h"
-#include "YODA/Histo1D.h"
-#include "YODA/HistoBin1D.h"
-#include "YODA/Point2D.h"
-#include "YODA/Profile1D.h"
-#include "YODA/ProfileBin1D.h"
-#include "YODA/ReaderAIDA.h"
-#include "YODA/Reader.h"
-#include "YODA/ReaderYODA.h"
-#include "YODA/Scatter2D.h"
-#include "YODA/WriterAIDA.h"
-#include "YODA/Writer.h"
-#include "YODA/WriterYODA.h"
-
-//And second dimension goes here:
-#include "YODA/Axis2D.h"
-#include "YODA/Bin2D.h"
-#include "YODA/Dbn2D.h"
-#include "YODA/Histo2D.h"
-#include "YODA/HistoBin2D.h"
-#include "YODA/Point3D.h"
-#include "YODA/Scatter3D.h"
-
-
 namespace Rivet {
 
   /// Function to get a map of all the bin edge vectors in a paper with the
@@ -64,7 +34,7 @@
 
   /// Return the integral over the histogram bins
   inline double integral(Histo1DPtr histo) {
-    double intg = 0.0;
+    double intg = 0.;
     for ( size_t i = 0; i < histo->numBins(); ++i ) {
       intg += histo->bin(i).area();
     }