[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/d0631f00f3c5
branches:  
changeset: 6223:d0631f00f3c5
user:      Jon Butterworth <j.butterworth at cern.ch>
date:      Sat Jan 27 16:15:17 2018 +0000
description:
stop duplicate projection for el and mu versions

details:   https://rivet.hepforge.org/hg/rivet/rev/976ca5d291f8
branches:  
changeset: 6224:976ca5d291f8
user:      Jon Butterworth <j.butterworth at cern.ch>
date:      Sat Jan 27 16:24:41 2018 +0000
description:
revert mistaken commit

diffs (43 lines):

--- a/analyses/pluginATLAS/ATLAS_2015_I1408516.cc	Fri Dec 22 14:53:18 2017 +0000
+++ b/analyses/pluginATLAS/ATLAS_2015_I1408516.cc	Sat Jan 27 16:24:41 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/configure.ac	Fri Dec 22 14:53:18 2017 +0000
+++ b/configure.ac	Sat Jan 27 16:24:41 2018 +0000
@@ -1,7 +1,7 @@
 ## Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([Rivet],[2.7.0-pre],[rivet at projects.hepforge.org],[Rivet])
+AC_INIT([Rivet],[2.6.0],[rivet at projects.hepforge.org],[Rivet])
 
 ## Check and block installation into the src/build dir
 if test "$prefix" = "$PWD"; then
@@ -300,7 +300,7 @@
 AC_CONFIG_FILES(pyext/Makefile pyext/rivet/Makefile pyext/setup.py)
 AC_CONFIG_FILES(data/Makefile data/texmf/Makefile)
 AC_CONFIG_FILES(doc/Makefile)
-AC_CONFIG_FILES(doc/rivetversion.sty doc/diffanas)
+AC_CONFIG_FILES(doc/rivetversion.sty)
 AC_CONFIG_FILES(bin/Makefile bin/rivet-config bin/rivet-buildplugin)
 AC_CONFIG_FILES(rivetenv.sh rivetenv.csh rivet.pc)