[Rivet-svn] rivet: 3 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/e87c1f8347b3
branches:  
changeset: 6126:e87c1f8347b3
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Fri Nov 03 10:01:54 2017 +0000
description:
Merge from release-2-5-x

details:   https://rivet.hepforge.org/hg/rivet/rev/d4751a332d82
branches:  multiweight
changeset: 6127:d4751a332d82
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Fri Nov 03 10:07:56 2017 +0000
description:
Fixed ATLAS_2011_S9126244

details:   https://rivet.hepforge.org/hg/rivet/rev/b681550d0a55
branches:  multiweight
changeset: 6128:b681550d0a55
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Fri Nov 03 11:47:54 2017 +0000
description:
Merged from default. Readback of existing yoda files and MC_WEIGHTS currently disabled.

diffs (truncated from 43690 to 50 lines):

--- a/ChangeLog	Wed Nov 01 09:00:48 2017 +0100
+++ b/ChangeLog	Fri Nov 03 11:47:54 2017 +0000
@@ -5,6 +5,11 @@
 	* Add missing pT (rather than Et) functions to SmearedMET,
 	although they are just copies of the MET functions for now.
 
+2017-10-26  Chris Pollard  <cspollard at gmail.com>
+
+	* update the way crossSection() works; remove
+	setNeedsCrossSection()
+
 2017-10-09  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Embed zstr and enable transparent reading of gzipped HepMC streams.
--- a/analyses/pluginALICE/ALICE_2010_S8624100.cc	Wed Nov 01 09:00:48 2017 +0100
+++ b/analyses/pluginALICE/ALICE_2010_S8624100.cc	Fri Nov 03 11:47:54 2017 +0000
@@ -35,13 +35,13 @@
       declare(cfs13, "CFS13");
 
       if (fuzzyEquals(sqrtS()/GeV, 900, 1E-3)) {
-        _h_dN_dNch_05    = bookHisto1D(11, 1, 1);
-        _h_dN_dNch_10    = bookHisto1D(12, 1, 1);
-        _h_dN_dNch_13    = bookHisto1D(13, 1, 1);
+        book(_h_dN_dNch_05    ,11, 1, 1);
+        book(_h_dN_dNch_10    ,12, 1, 1);
+        book(_h_dN_dNch_13    ,13, 1, 1);
       } else if (fuzzyEquals(sqrtS()/GeV, 2360, 1E-3)) {
-        _h_dN_dNch_05    = bookHisto1D(17, 1, 1);
-        _h_dN_dNch_10    = bookHisto1D(18, 1, 1);
-        _h_dN_dNch_13    = bookHisto1D(19, 1, 1);
+        book(_h_dN_dNch_05    ,17, 1, 1);
+        book(_h_dN_dNch_10    ,18, 1, 1);
+        book(_h_dN_dNch_13    ,19, 1, 1);
       }
 
     }
@@ -49,15 +49,13 @@
 
     /// Perform the per-event analysis
     void analyze(const Event& event) {
-      const double weight = event.weight();
-
-      const ChargedFinalState& charged_05 = apply<ChargedFinalState>(event, "CFS05");
+       const ChargedFinalState& charged_05 = apply<ChargedFinalState>(event, "CFS05");
       const ChargedFinalState& charged_10 = apply<ChargedFinalState>(event, "CFS10");
       const ChargedFinalState& charged_13 = apply<ChargedFinalState>(event, "CFS13");
 
-      _h_dN_dNch_05->fill(charged_05.size(), weight);
-      _h_dN_dNch_10->fill(charged_10.size(), weight);
-      _h_dN_dNch_13->fill(charged_13.size(), weight);