[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/cdcfd0072fac
branches:  multiweight
changeset: 5581:cdcfd0072fac
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Wed Oct 26 11:56:22 2016 +0100
description:
Start to fix analyses

details:   https://rivet.hepforge.org/hg/rivet/rev/2a7cd74e4540
branches:  multiweight
changeset: 5582:2a7cd74e4540
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Wed Oct 26 12:58:44 2016 +0100
description:
Comment out analyses that don't work yet in Makefile.am.

diffs (truncated from 3818 to 50 lines):

--- a/configure.ac	Wed Oct 26 11:15:31 2016 +0100
+++ b/configure.ac	Wed Oct 26 12:58:44 2016 +0100
@@ -39,7 +39,7 @@
 ## Compiler setup
 AC_LANG(C++)
 AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
+AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory])
 
 ## Store and propagate the compiler identity and flags
 RIVETCXX="$CXX"
--- a/include/Rivet/Event.hh	Wed Oct 26 11:15:31 2016 +0100
+++ b/include/Rivet/Event.hh	Wed Oct 26 12:58:44 2016 +0100
@@ -89,6 +89,10 @@
     /// support NLO counter-events and weight vectors.
     std::vector<double> weights() const;
 
+    /// @brief Obsolete weight method. Always returns 1 now.
+    [[deprecated("Event weight does not need to be included anymore. For compatibility, it's always == 1 now.")]]
+    double weight() const { return 1.0; }
+
     //@}
 
 
--- a/include/Rivet/Tools/RivetYODA.hh	Wed Oct 26 11:15:31 2016 +0100
+++ b/include/Rivet/Tools/RivetYODA.hh	Wed Oct 26 12:58:44 2016 +0100
@@ -255,6 +255,8 @@
                 _persistent.push_back(make_shared<T>(p));
         }
 
+        Wrapper() : _persistent(), _evgroup(), _active() {}
+
         typename T::Ptr active() const { return _active; }
 
         /* @todo this probably need to loop over all? */
--- a/src/Analyses/ALEPH_1995_I382179.cc	Wed Oct 26 11:15:31 2016 +0100
+++ b/src/Analyses/ALEPH_1995_I382179.cc	Wed Oct 26 12:58:44 2016 +0100
@@ -45,7 +45,7 @@
       MSG_DEBUG("Passed ncharged cut");
 
       // Get event weight for histo filling
-      const double weight = event.weight();
+      const double weight = 1.0;
 
       // Get beams and average beam momentum
       const ParticlePair& beams = apply<Beam>(event, "Beams").beams();
--- a/src/Analyses/ALEPH_1996_S3196992.cc	Wed Oct 26 11:15:31 2016 +0100
+++ b/src/Analyses/ALEPH_1996_S3196992.cc	Wed Oct 26 12:58:44 2016 +0100
@@ -62,7 +62,7 @@
       const FastJets& durjet = apply<FastJets>(event, "DurhamJets");