[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/825ab3efbd72
branches:  
changeset: 6107:825ab3efbd72
user:      Jon Butterworth <j.butterworth at cern.ch>
date:      Thu Oct 26 16:51:46 2017 +0200
description:
make one html file per analysis

details:   https://rivet.hepforge.org/hg/rivet/rev/8dcad0c6413a
branches:  multiweight
changeset: 6108:8dcad0c6413a
user:      Chris Pollard <cspollard at gmail.com>
date:      Thu Oct 26 16:52:32 2017 +0200
description:
remove missing AnalysisHandler::setActiveWeight()

diffs (truncated from 44834 to 50 lines):

--- a/ChangeLog	Thu Oct 26 14:03:20 2017 +0200
+++ b/ChangeLog	Thu Oct 26 16:52:32 2017 +0200
@@ -1,3 +1,7 @@
+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	Thu Oct 26 14:03:20 2017 +0200
+++ b/analyses/pluginALICE/ALICE_2010_S8624100.cc	Thu Oct 26 16:52:32 2017 +0200
@@ -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);
+      _h_dN_dNch_05->fill(charged_05.size());
+      _h_dN_dNch_10->fill(charged_10.size());
+      _h_dN_dNch_13->fill(charged_13.size());
     }