[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/1d456ba1708a
branches:  release-2-6-x
changeset: 6236:1d456ba1708a
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Feb 01 20:10:01 2018 +0000
description:
Fix SmearedMET::compare() in the case of two non-functions

details:   https://rivet.hepforge.org/hg/rivet/rev/8a193bfc1530
branches:  release-2-6-x
changeset: 6237:8a193bfc1530
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Feb 01 20:12:29 2018 +0000
description:
Fixes merged from trunk

diffs (truncated from 512 to 50 lines):

--- a/analyses/pluginATLAS/ATLAS_2015_I1408516.cc	Thu Feb 01 18:08:54 2018 +0000
+++ b/analyses/pluginATLAS/ATLAS_2015_I1408516.cc	Thu Feb 01 20:12:29 2018 +0000
@@ -23,9 +23,9 @@
       // Configure projections
       FinalState fs;
       Cut cuts = Cuts::abseta < 2.4 && Cuts::pT > 20*GeV;
-      ZFinder zfinder_el(fs, cuts, (_mode ? PID::MUON : PID::ELECTRON),
+      ZFinder zfinder(fs, cuts, (_mode ? PID::MUON : PID::ELECTRON),
                          12*GeV, 150*GeV, 0.1, ZFinder::CLUSTERNODECAY, ZFinder::NOTRACK);
-      declare(zfinder_el, "ZFinder");
+      declare(zfinder, _mode ? "ZFinder_mu" : "ZFinder_el");
 
       // Book histograms
       const size_t offset = _mode ? 4 : 1;
@@ -85,7 +85,7 @@
     void analyze(const Event& event) {
 
       // Get leptonic Z boson
-      const ZFinder& zfinder = apply<ZFinder>(event, "ZFinder");
+      const ZFinder& zfinder = apply<ZFinder>(event, _mode ? "ZFinder_mu" : "ZFinder_el");
       if (zfinder.bosons().size() != 1 ) vetoEvent;
       const Particle& Zboson = zfinder.boson();
 
--- a/analyses/pluginCMS/CMS_2016_I1491953.yoda	Thu Feb 01 18:08:54 2018 +0000
+++ b/analyses/pluginCMS/CMS_2016_I1491953.yoda	Thu Feb 01 20:12:29 2018 +0000
@@ -1,6 +1,6 @@
-BEGIN YODA_SCATTER2D_V2 /CMS_2016_I1491953/d01-x01-y01
+BEGIN YODA_SCATTER2D_V2 /REF/CMS_2016_I1491953/d01-x01-y01
 IsRef: 1
-Path: /CMS_2016_I1491953/d01-x01-y01
+Path: /REF/CMS_2016_I1491953/d01-x01-y01
 Title: doi:10.17182/hepdata.76995.v1/t1
 Type: Scatter2D
 ---
@@ -15,9 +15,9 @@
 7.000000e+00	5.000000e-01	5.000000e-01	1.527000e-02	1.338000e-02	1.864000e-02
 END YODA_SCATTER2D_V2
 
-BEGIN YODA_SCATTER2D_V2 /CMS_2016_I1491953/d02-x01-y01
+BEGIN YODA_SCATTER2D_V2 /REF/CMS_2016_I1491953/d02-x01-y01
 IsRef: 1
-Path: /CMS_2016_I1491953/d02-x01-y01
+Path: /REF/CMS_2016_I1491953/d02-x01-y01
 Title: doi:10.17182/hepdata.76995.v1/t2
 Type: Scatter2D
 ---
@@ -32,9 +32,9 @@
 7.000000e+00	5.000000e-01	5.000000e-01	1.527000e-02	1.338000e-02	1.864000e-02
 END YODA_SCATTER2D_V2