[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/6051b96847d1
branches:  multiweight
changeset: 6060:6051b96847d1
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Mon Oct 02 11:44:27 2017 +0100
description:
Fix stringstream conversion issue on linux clang

details:   https://rivet.hepforge.org/hg/rivet/rev/fdd45162298a
branches:  multiweight
changeset: 6061:fdd45162298a
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Mon Oct 02 13:13:40 2017 +0100
description:
Merged from default

details:   https://rivet.hepforge.org/hg/rivet/rev/a783c48cb062
branches:  multiweight
changeset: 6062:a783c48cb062
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Mon Oct 02 13:15:53 2017 +0100
description:
Fix for using numEvents outside of event loops

details:   https://rivet.hepforge.org/hg/rivet/rev/a5b51ab2c363
branches:  multiweight
changeset: 6063:a5b51ab2c363
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Mon Oct 02 13:24:07 2017 +0100
description:
Cannot book in constructor

diffs (truncated from 149 to 50 lines):

--- a/analyses/Makefile.am	Mon Oct 02 11:49:27 2017 +0200
+++ b/analyses/Makefile.am	Mon Oct 02 13:24:07 2017 +0100
@@ -5,7 +5,7 @@
 PLUGIN_DIRS = $(shell ls -d $(srcdir)/plugin*)
 PLUGIN_NAMES = $(notdir $(subst plugin,,$(PLUGIN_DIRS)))
 PLUGIN_LIBS = $(patsubst %,Rivet%Analyses.so,$(PLUGIN_NAMES))
-PLUGIN_DATAFILES = $(shell ls $(srcdir)/plugin*/*.{info,plot,yoda})
+PLUGIN_DATAFILES = $(shell ls $(abs_srcdir)/plugin*/*.{info,plot,yoda})
 
 CLEANFILES = $(PLUGIN_LIBS)
 EXTRA_DIST = $(PLUGIN_DIRS)
@@ -31,7 +31,7 @@
 
 all-local: $(PLUGIN_LIBS) $(PLUGIN_DATAFILES)
 	mkdir -p $(builddir)/data
-	@for i in $(PLUGIN_DATAFILES); do $(LN_S) -f $$i $(builddir)/data; done
+	$(LN_S) -f $(abs_srcdir)/plugin*/*.{info,plot,yoda} $(builddir)/data
 
 clean-local:
 	rm -rf data
--- a/analyses/pluginATLAS/ATLAS_2011_I945498.cc	Mon Oct 02 11:49:27 2017 +0200
+++ b/analyses/pluginATLAS/ATLAS_2011_I945498.cc	Mon Oct 02 13:24:07 2017 +0100
@@ -29,11 +29,11 @@
       _isZeeSample = false;
       _isZmmSample = false;
       for (size_t chn = 0; chn < 3; ++chn) {
-        book(weights_nj0[chn], (ostringstream("weights_nj0_") << chn).str());
-        book(weights_nj1[chn], (ostringstream("weights_nj1_") << chn).str());
-        book(weights_nj2[chn], (ostringstream("weights_nj2_") << chn).str());
-        book(weights_nj3[chn], (ostringstream("weights_nj3_") << chn).str());
-        book(weights_nj4[chn], (ostringstream("weights_nj4_") << chn).str());
+        book(weights_nj0[chn], "weights_nj0_" + to_str(chn));
+        book(weights_nj1[chn], "weights_nj1_" + to_str(chn));
+        book(weights_nj2[chn], "weights_nj2_" + to_str(chn));
+        book(weights_nj3[chn], "weights_nj3_" + to_str(chn));
+        book(weights_nj4[chn], "weights_nj4_" + to_str(chn));
       }
 
       // Set up projections
--- a/analyses/pluginATLAS/ATLAS_2015_CONF_2015_041.cc	Mon Oct 02 11:49:27 2017 +0200
+++ b/analyses/pluginATLAS/ATLAS_2015_CONF_2015_041.cc	Mon Oct 02 13:24:07 2017 +0100
@@ -49,7 +49,7 @@
       book(_hNjetsRatio_comb ,2, 2, _mode + 1, true);
 
       for (size_t i = 0; i < 5; i++)
-          book(_weights[i], (ostringstream("_weights") << i).str());
+          book(_weights[i], "_weights" + to_str(i));
     }