[Rivet-svn] rivet: continuing validation.

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/c43ac34abb12
branches:  multiweight
changeset: 5646:c43ac34abb12
user:      Chris Pollard <cspollard at gmail.com>
date:      Mon Dec 12 14:14:38 2016 +0000
description:
continuing validation.

diffs (truncated from 102 to 50 lines):

--- a/configure.ac	Fri Dec 09 10:18:33 2016 +0000
+++ b/configure.ac	Mon Dec 12 14:14:38 2016 +0000
@@ -213,9 +213,9 @@
 
 ## Cython checks
 if test x$enable_pyext == xyes; then
-  AM_CHECK_CYTHON([0.23.5], [:], [:])
+  AM_CHECK_CYTHON([0.24.0], [:], [:])
   if test x$CYTHON_FOUND = xyes; then
-    AC_MSG_NOTICE([Cython >= 0.23.5 found: Python extension source can be rebuilt (for developers)])
+    AC_MSG_NOTICE([Cython >= 0.24.0 found: Python extension source can be rebuilt (for developers)])
   fi
 
   AC_CHECK_FILE([pyext/rivet/core.cpp],
--- a/src/Analyses/ALEPH_1991_S2435284.cc	Fri Dec 09 10:18:33 2016 +0000
+++ b/src/Analyses/ALEPH_1991_S2435284.cc	Mon Dec 12 14:14:38 2016 +0000
@@ -33,7 +33,7 @@
     void analyze(const Event& event) {
       const FinalState& cfs = apply<FinalState>(event, "CFS");
       MSG_DEBUG("Total charged multiplicity = " << cfs.size());
-      _histChTot->fill(cfs.size(), event.weight());
+      _histChTot->fill(cfs.size());
     }
 
 
--- a/src/Core/AnalysisHandler.cc	Fri Dec 09 10:18:33 2016 +0000
+++ b/src/Core/AnalysisHandler.cc	Mon Dec 12 14:14:38 2016 +0000
@@ -173,6 +173,7 @@
         /// @todo
         /// can we get away with not passing a matrix?
 
+        MSG_TRACE("Pushing analysis objects to persistent.");
         // if this is indeed a new event, push the temporary
         // histograms and reset
         for (const AnaHandle& a : _analyses) {
@@ -181,6 +182,7 @@
             }
         }
 
+        MSG_TRACE("Pushing eventCounter to persistent.");
         _eventCounter.pushToPersistent(_subEventWeights);
 
         _eventNumber = ge.event_number();
@@ -190,14 +192,14 @@
         _subEventWeights.clear();
     }
 
+
+    _eventCounter.newSubEvent();
     for (const AnaHandle& a : _analyses) {