[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/e9eb9d041a71
branches:  
changeset: 6130:e9eb9d041a71
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Nov 06 20:09:54 2017 +0000
description:
Extend AOPath regex to allow dots and underscores in weight names.

details:   https://rivet.hepforge.org/hg/rivet/rev/2ea28937082f
branches:  
changeset: 6131:2ea28937082f
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Nov 06 20:10:05 2017 +0000
description:
Remove accidental print

details:   https://rivet.hepforge.org/hg/rivet/rev/74176a99ef52
branches:  
changeset: 6132:74176a99ef52
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Nov 06 20:15:51 2017 +0000
description:
Tiny histo booking tweak

details:   https://rivet.hepforge.org/hg/rivet/rev/a95775e9f413
branches:  
changeset: 6133:a95775e9f413
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Nov 06 20:23:01 2017 +0000
description:
Tidy

diffs (truncated from 219 to 50 lines):

--- a/ChangeLog	Sat Oct 28 22:02:17 2017 +0100
+++ b/ChangeLog	Mon Nov 06 20:23:01 2017 +0000
@@ -1,3 +1,7 @@
+2017-11-06  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Extend AOPath regex to allow dots and underscores in weight names.
+
 2017-10-27  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add energy to the list of cuts (both as Cuts::E and Cuts::energy)
--- a/analyses/pluginATLAS/ATLAS_2014_I1288706.cc	Sat Oct 28 22:02:17 2017 +0100
+++ b/analyses/pluginATLAS/ATLAS_2014_I1288706.cc	Mon Nov 06 20:23:01 2017 +0000
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 #include "Rivet/Analysis.hh"
-#include "Rivet/Projections/FinalState.hh" 
+#include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/ZFinder.hh"
 #include "Rivet/Particle.fhh"
 
@@ -13,15 +13,13 @@
     /// Constructor
     ATLAS_2014_I1288706()
       : Analysis("ATLAS_2014_I1288706")
-    {   
-       _sumw_ext_mu_dressed = 0; 
+    {
+       _sumw_ext_mu_dressed = 0;
        _sumw_mu_dressed     = 0;
-       _sumw_el_dressed     = 0;     
+       _sumw_el_dressed     = 0;
      }
 
 
-  public:
-
     /// @name Analysis methods
     //@{
 
@@ -32,14 +30,14 @@
        FinalState fs;
 
        ZFinder zfinder_ext_dressed_mu(fs, Cuts::abseta<2.4 && Cuts::pT>6.0*GeV, PID::MUON, 12.0*GeV, 66.0*GeV, 0.1);
-       declare(zfinder_ext_dressed_mu, "ZFinder_ext_dressed_mu");       
-       
+       declare(zfinder_ext_dressed_mu, "ZFinder_ext_dressed_mu");
+
        ZFinder zfinder_dressed_mu(fs, Cuts::abseta<2.4 && Cuts::pT>12*GeV, PID::MUON, 26.0*GeV, 66.0*GeV, 0.1);
-       declare(zfinder_dressed_mu, "ZFinder_dressed_mu"); 
-