[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/8df7b183e4dc
branches:  multiweight
changeset: 6047:8df7b183e4dc
user:      Chris Pollard <cspollard at gmail.com>
date:      Wed Sep 27 13:08:13 2017 +0200
description:
converted up to analyses/pluginATLAS/ATLAS_2011_S9035664.cc

details:   https://rivet.hepforge.org/hg/rivet/rev/d1c6ca56bde1
branches:  multiweight
changeset: 6048:d1c6ca56bde1
user:      Chris Pollard <cspollard at gmail.com>
date:      Wed Sep 27 13:29:04 2017 +0200
description:
more ATLAS analyses.....

details:   https://rivet.hepforge.org/hg/rivet/rev/eadea598762d
branches:  multiweight
changeset: 6049:eadea598762d
user:      Chris Pollard <cspollard at gmail.com>
date:      Wed Sep 27 13:56:57 2017 +0200
description:
up to analyses/pluginATLAS/ATLAS_2012_I1204447.cc

details:   https://rivet.hepforge.org/hg/rivet/rev/b3de40956a7e
branches:  multiweight
changeset: 6050:b3de40956a7e
user:      Chris Pollard <cspollard at gmail.com>
date:      Wed Sep 27 14:07:01 2017 +0200
description:
up to analyses/pluginATLAS/ATLAS_2014_I1288706.cc

diffs (truncated from 2635 to 50 lines):

--- a/analyses/pluginATLAS/ATLAS_2011_I945498.cc	Wed Sep 27 11:52:16 2017 +0200
+++ b/analyses/pluginATLAS/ATLAS_2011_I945498.cc	Wed Sep 27 14:07:01 2017 +0200
@@ -29,11 +29,11 @@
       _isZeeSample = false;
       _isZmmSample = false;
       for (size_t chn = 0; chn < 3; ++chn) {
-        weights_nj0[chn] = 0;
-        weights_nj1[chn] = 0;
-        weights_nj2[chn] = 0;
-        weights_nj3[chn] = 0;
-        weights_nj4[chn] = 0;
+        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());
       }
 
       // Set up projections
@@ -105,8 +105,6 @@
 
     /// Perform the per-event analysis
     void analyze(const Event& event) {
-      const double weight = 1.0;
-
       vector<const ZFinder*> zfs;
       zfs.push_back(& (apply<ZFinder>(event, "ZFinder_el")));
       zfs.push_back(& (apply<ZFinder>(event, "ZFinder_mu")));
@@ -154,29 +152,29 @@
 
         switch (jets.size()) {
         case 0:
-          weights_nj0[chn] += weight;
+          weights_nj0[chn]->fill();
           break;
         case 1:
-          weights_nj0[chn] += weight;
-          weights_nj1[chn] += weight;
+          weights_nj0[chn]->fill();
+          weights_nj1[chn]->fill();
           break;
         case 2:
-          weights_nj0[chn] += weight;
-          weights_nj1[chn] += weight;
-          weights_nj2[chn] += weight;
+          weights_nj0[chn]->fill();
+          weights_nj1[chn]->fill();
+          weights_nj2[chn]->fill();
           break;
         case 3: