[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/03a928c5cc5a
branches:  multiweight
changeset: 6302:03a928c5cc5a
user:      cspollard
date:      Wed May 23 12:44:46 2018 +0100
description:
cross section calculation was missing the final event weight.

details:   https://rivet.hepforge.org/hg/rivet/rev/5164e8a80152
branches:  multiweight
changeset: 6303:5164e8a80152
user:      cspollard
date:      Wed May 23 12:48:36 2018 +0100
description:
trivial merge

diffs (truncated from 118 to 50 lines):

--- a/doc/mk-analysis-html	Tue May 22 17:25:56 2018 +0100
+++ b/doc/mk-analysis-html	Wed May 23 12:48:36 2018 +0100
@@ -190,7 +190,8 @@
             page += "<b><kbd>%s</kbd></b>\n" % os.path.basename(cc)
             with open(cc, 'r') as f:
                 src = f.read()
-                src = src.decode("UTF-8")
+                if type(u'') != str:
+                    src = src.decode("UTF-8")
             try:
                 import pygments
                 from pygments.lexers import get_lexer_by_name
--- a/include/Rivet/AnalysisHandler.hh	Tue May 22 17:25:56 2018 +0100
+++ b/include/Rivet/AnalysisHandler.hh	Wed May 23 12:48:36 2018 +0100
@@ -78,6 +78,7 @@
 
     /// Set the cross-section for the process being generated.
     AnalysisHandler& setCrossSection(double xs, double xserr);
+    AnalysisHandler& scaleCrossSections();
 
     /// Get the cross-section known to the handler.
     Scatter1DPtr crossSection() const {
@@ -244,6 +245,7 @@
 
     /// Cross-section known to AH
     Scatter1DPtr _xs;
+    double _xstmp, _xstmperr;
 
     /// Beams used by this run.
     ParticlePair _beams;
--- a/src/Core/AnalysisHandler.cc	Tue May 22 17:25:56 2018 +0100
+++ b/src/Core/AnalysisHandler.cc	Wed May 23 12:48:36 2018 +0100
@@ -85,8 +85,9 @@
 
     // set the cross section based on what is reported by this event.
     // if no cross section
+    MSG_TRACE("getting cross section.");
     if (ge.cross_section()) {
-      MSG_TRACE("getting cross section.");
+      MSG_TRACE("getting cross section from GenEvent.");
       double xs = ge.cross_section()->cross_section();
       double xserr = ge.cross_section()->cross_section_error();
       setCrossSection(xs, xserr);
@@ -196,16 +197,6 @@
     /// @todo Filter/normalize the event here
     Event event(ge);
 
-    // set the cross section based on what is reported by this event.
-    // if no cross section
-    MSG_TRACE("getting cross section.");