[Rivet-svn] rivet: 3 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/ccf3ab8ffee4
branches:  multiweight
changeset: 6033:ccf3ab8ffee4
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Sun Sep 24 10:56:25 2017 +0100
description:
Merge back of ptrfix branch

details:   https://rivet.hepforge.org/hg/rivet/rev/fa2cb70e1a35
branches:  multi-scatters
changeset: 6034:fa2cb70e1a35
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Sun Sep 24 10:57:45 2017 +0100
description:
close multi-scatters branch

details:   https://rivet.hepforge.org/hg/rivet/rev/af9e0ee9fa6e
branches:  multiweights-fixptrs
changeset: 6035:af9e0ee9fa6e
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Sun Sep 24 10:56:56 2017 +0100
description:
close fixptr branch

diffs (truncated from 11009 to 50 lines):

--- a/analyses/pluginALICE/ALICE_2010_S8624100.cc	Wed Sep 13 09:50:05 2017 +0100
+++ b/analyses/pluginALICE/ALICE_2010_S8624100.cc	Sun Sep 24 10:56:56 2017 +0100
@@ -49,15 +49,13 @@
 
     /// Perform the per-event analysis
     void analyze(const Event& event) {
-      const double weight = 1.0;
-
-      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());
     }
 
 
--- a/analyses/pluginALICE/ALICE_2010_S8625980.cc	Wed Sep 13 09:50:05 2017 +0100
+++ b/analyses/pluginALICE/ALICE_2010_S8625980.cc	Sun Sep 24 10:56:56 2017 +0100
@@ -13,8 +13,7 @@
 
     /// Constructor
     ALICE_2010_S8625980()
-      : Analysis("ALICE_2010_S8625980"),
-        _Nevt_after_cuts(0.0)
+      : Analysis("ALICE_2010_S8625980")
     {    }
 
     //@}
@@ -39,28 +38,27 @@
         book(_h_dN_deta    ,6, 1, 1);
         book(_h_dN_dNch    ,3, 1, 1);
       }
+      book(_Nevt_after_cuts, "Nevt_after_cuts");
 
     }
 
 
     /// Perform the per-event analysis
     void analyze(const Event& event) {
-      const double weight = 1.0;
-
       const ChargedFinalState& charged = apply<ChargedFinalState>(event, "CFS");
       if (charged.size() < 1) {
         vetoEvent;