[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/83cf14d9a0fb
branches:  
changeset: 4839:83cf14d9a0fb
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Aug 17 22:59:43 2015 +0100
description:
Require YODA 1.5.0 to use several recently added features

details:   https://rivet.hepforge.org/hg/rivet/rev/f5b1fec94f79
branches:  
changeset: 4840:f5b1fec94f79
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Aug 17 22:59:47 2015 +0100
description:
Add writing out of cross-section and total event counter by default. Need to add some name protection to avoid them being plotted.

diffs (truncated from 132 to 50 lines):

--- a/ChangeLog	Sun Aug 16 21:55:52 2015 +0100
+++ b/ChangeLog	Mon Aug 17 22:59:47 2015 +0100
@@ -1,3 +1,9 @@
+2015-08-17  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add writing out of cross-section and total event counter by
+	default. Need to add some name protection to avoid them being
+	plotted.
+
 2015-08-16  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add templated versions of Analysis::refData() to use data types
--- a/configure.ac	Sun Aug 16 21:55:52 2015 +0100
+++ b/configure.ac	Mon Aug 17 22:59:47 2015 +0100
@@ -87,8 +87,8 @@
   YODA_VERSION2=[`echo $YODA_VERSION | cut -d. -f2 | sed -e 's/\([0-9]*\).*/\1/g'`]
   YODA_VERSION3=[`echo $YODA_VERSION | cut -d. -f3 | sed -e 's/\([0-9]*\).*/\1/g'`]
   let YODA_VERSION_INT=YODA_VERSION1*10000+YODA_VERSION2*100+YODA_VERSION3
-  if test $YODA_VERSION_INT -lt 10400; then
-    AC_MSG_ERROR([YODA version isn't sufficient: at least version 1.4.0 required])
+  if test $YODA_VERSION_INT -lt 10500; then
+    AC_MSG_ERROR([YODA version isn't sufficient: at least version 1.5.0 required])
   fi
   AC_MSG_CHECKING([YODA Python path using yoda-config])
   YODA_PYTHONPATH=`$YODACONFIG --pythonpath`
--- a/include/Rivet/AnalysisHandler.hh	Sun Aug 16 21:55:52 2015 +0100
+++ b/include/Rivet/AnalysisHandler.hh	Mon Aug 17 22:59:47 2015 +0100
@@ -190,13 +190,14 @@
     std::string _runname;
 
     /// Number of events seen.
+    /// @todo Replace by a counter
     unsigned int _numEvents;
-
     /// Sum of event weights seen.
-    double _sumOfWeights;
+    /// @todo Replace by a counter
+    double _sumOfWeights, _sumOfWeightsSq;
 
     /// Cross-section known to AH
-    double _xs;
+    double _xs, _xserr;
 
     /// Beams used by this run.
     ParticlePair _beams;
--- a/src/Core/AnalysisHandler.cc	Sun Aug 16 21:55:52 2015 +0100
+++ b/src/Core/AnalysisHandler.cc	Mon Aug 17 22:59:47 2015 +0100
@@ -11,6 +11,7 @@
 namespace Rivet {