[Rivet-svn] rivet: Rivet core compiles.

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/4047bf92cd09
branches:  multiweight
changeset: 5579:4047bf92cd09
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Wed Oct 26 11:15:31 2016 +0100
description:
Rivet core compiles.

diffs (truncated from 234 to 50 lines):

--- a/include/Rivet/Tools/RivetYODA.hh	Wed Oct 26 10:45:44 2016 +0100
+++ b/include/Rivet/Tools/RivetYODA.hh	Wed Oct 26 11:15:31 2016 +0100
@@ -141,9 +141,10 @@
     };
 
 
+using Weight = double;
 
 template <class T>
-    using Fill = pair<typename T::FillType, double>;
+    using Fill = pair<typename T::FillType, Weight>;
 
 template <class T>
     using Fills = multiset<Fill<T>>;
@@ -250,7 +251,7 @@
          */
 
         Wrapper(size_t len_of_weightvec, const T & p) {
-            for (size_t i = 0; i < len_of_weightvec; i++)
+            for (size_t m = 0; m < len_of_weightvec; ++m)
                 _persistent.push_back(make_shared<T>(p));
         }
 
@@ -396,14 +397,6 @@
     /// Get the file system path to the reference file for this paper.
     string getDatafilePath(const string& papername);
 
-    /// Return the integral over the histogram bins
-    /// @deprecated Prefer to directly use the histo's integral() method.
-    DEPRECATED("Prefer to directly use the histo's integral() method.")
-        inline double integral(Histo1DPtr histo) {
-            return histo->integral();
-        }
-
-
 }
 
 #endif
--- a/src/Analyses/Makefile.am	Wed Oct 26 10:45:44 2016 +0100
+++ b/src/Analyses/Makefile.am	Wed Oct 26 11:15:31 2016 +0100
@@ -2,16 +2,19 @@
 AM_LDFLAGS = $(LDFLAGS) -module -avoid-version -L$(FASTJETLIBPATH)
 LIBS = $(FASTJETCONFIGLIBADD)
 lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
 
-noinst_LTLIBRARIES = libRivetAnalysisTools.la
+
+
+if ENABLE_ANALYSES