[Rivet-svn] rivet: fixed bug causing multiple copies of event weight names i...

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/20dd821ca775
branches:  multiweight
changeset: 6117:20dd821ca775
user:      Chris Pollard <cspollard at gmail.com>
date:      Fri Oct 27 14:38:28 2017 +0200
description:
fixed bug causing multiple copies of event weight names in yoda files

diffs (truncated from 367 to 50 lines):

--- a/bin/rivet	Fri Oct 27 12:26:54 2017 +0200
+++ b/bin/rivet	Fri Oct 27 14:38:28 2017 +0200
@@ -646,12 +646,15 @@
 ## Print end-of-loop messages
 loopendtime = datetime.datetime.now().replace(microsecond=0)
 logging.info("Finished event loop at %s" % str(loopendtime))
-logging.info("Cross-section = %e pb" % ah.nominalCrossSection())
-print()
+logging.info("Generator provided cross-section = %e pb" % ah.nominalCrossSection())
 
 
 ## Finalize and write out data file
 run.finalize()
+
+logging.info("Applied cross-section = %e pb" % ah.nominalCrossSection())
+print()
+
 if opts.WRITE_DATA:
     ah.writeData(opts.HISTOFILE)
 print()
--- a/include/Rivet/AnalysisHandler.hh	Fri Oct 27 12:26:54 2017 +0200
+++ b/include/Rivet/AnalysisHandler.hh	Fri Oct 27 14:38:28 2017 +0200
@@ -68,6 +68,10 @@
         return _eventCounter->sumW();
     }
 
+    const vector<string>& weightNames() const {
+        return _weightNames;
+    }
+
     size_t numWeights() const {
         return _weightNames.size();
     }
--- a/include/Rivet/Tools/RivetYODA.hh	Fri Oct 27 12:26:54 2017 +0200
+++ b/include/Rivet/Tools/RivetYODA.hh	Fri Oct 27 14:38:28 2017 +0200
@@ -42,7 +42,7 @@
             virtual YODA::AnalysisObject* operator->() const = 0;
             virtual const YODA::AnalysisObject & operator*() const = 0;
 
-            /// @todo 
+            /// @todo
             /// rename to setActive(Idx)?
             virtual void setActiveWeightIdx(unsigned int iWeight) = 0;
 
@@ -153,7 +153,7 @@
     using Fills = multiset<Fill<T>>;
 
 
-// TODO TODO TODO 
+// TODO TODO TODO