[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/5493663e7cf8
branches:  multiweight
changeset: 6045:5493663e7cf8
user:      Chris Pollard <cspollard at gmail.com>
date:      Wed Sep 27 11:43:52 2017 +0200
description:
starting ATLAS

details:   https://rivet.hepforge.org/hg/rivet/rev/ffec8e8b7dc0
branches:  multiweight
changeset: 6046:ffec8e8b7dc0
user:      Chris Pollard <cspollard at gmail.com>
date:      Wed Sep 27 11:52:16 2017 +0200
description:
more ATLAS analyses

diffs (truncated from 1932 to 50 lines):

--- a/analyses/pluginATLAS/ATLAS_2010_CONF_2010_049.cc	Sun Sep 24 11:33:24 2017 +0100
+++ b/analyses/pluginATLAS/ATLAS_2010_CONF_2010_049.cc	Wed Sep 27 11:52:16 2017 +0200
@@ -24,23 +24,22 @@
       FastJets jetsproj4(cfs, FastJets::ANTIKT, 0.4);
       declare(jetsproj4, "Jets4");
 
+      // @todo tmp YOs
       for (size_t i=0 ; i<2 ; i++) {
         book(_h_xsec[i]       ,1+i, 1, 1);
         book(_h_frag_04_06[i] ,3+i, 1, 1);
         book(_h_frag_06_10[i] ,3+i, 2, 1);
         book(_h_frag_10_15[i] ,3+i, 3, 1);
         book(_h_frag_15_24[i] ,3+i, 4, 1);
-        _njets_04_06[i] = 0.0;
-        _njets_06_10[i] = 0.0;
-        _njets_10_15[i] = 0.0;
-        _njets_15_24[i] = 0.0;
+        book(_njets_04_06[i], "njets_04_06");
+        book(_njets_06_10[i], "njets_06_10");
+        book(_njets_10_15[i], "njets_10_15");
+        book(_njets_15_24[i], "njets_15_24");
       }
     }
 
 
     void analyze(const Event& event) {
-      const double weight = 1.0;
-
       const FastJets & jetsproj6 = apply<FastJets>(event, "Jets6");
       const FastJets & jetsproj4 = apply<FastJets>(event, "Jets4");
       Jets alljets[2];
@@ -59,35 +58,35 @@
         foreach (const Jet& jet, jets) {
           const double pTjet = jet.pT();
           const double pjet = jet.p3().mod();
-          _h_xsec[i]->fill(pTjet, weight);
+          _h_xsec[i]->fill(pTjet);
           if (pTjet > 24*GeV) continue;
           foreach (const Particle& p, jet.particles()) {
             double z = p.p3().mod()/pjet;
             if (z >= 1) z = 0.9999; // Make sure that z=1 doesn't go into overflow
             if (pTjet > 15*GeV) {
-              _h_frag_15_24[i]->fill(z, weight);
+              _h_frag_15_24[i]->fill(z);
             }
             else if (pTjet > 10*GeV) {
-              _h_frag_10_15[i]->fill(z, weight);
+              _h_frag_10_15[i]->fill(z);
             }
             else if (pTjet > 6*GeV) {