[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/76b87352fc5f
branches:  
changeset: 5070:76b87352fc5f
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Mar 28 11:43:53 2016 +0100
description:
Yay for constructor delegation!

details:   https://rivet.hepforge.org/hg/rivet/rev/cc4eec9db0b0
branches:  
changeset: 5071:cc4eec9db0b0
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Mar 28 11:45:09 2016 +0100
description:
More constructor delegation

diffs (truncated from 65 to 50 lines):

--- a/include/Rivet/Projections/SmearedJets.hh	Sun Mar 27 21:42:44 2016 +0100
+++ b/include/Rivet/Projections/SmearedJets.hh	Mon Mar 28 11:45:09 2016 +0100
@@ -25,11 +25,8 @@
     template <typename J2JFN>
     SmearedJets(const JetAlg& ja,
                 const J2JFN& jetSmearFn)
-      : _jetEffFn(JET_EFF_ONE), _bTagEffFn(JET_BTAG_PERFECT), _cTagEffFn(JET_CTAG_PERFECT), _jetSmearFn(jetSmearFn)
-    {
-      setName("SmearedJets");
-      addProjection(ja, "TruthJets");
-    }
+      : SmearedJets(ja, jetSmearFn, JET_BTAG_PERFECT, JET_CTAG_PERFECT, JET_EFF_ONE)
+    {    }
 
 
     /// @brief Constructor with efficiency and smearing function args
@@ -38,11 +35,8 @@
     SmearedJets(const JetAlg& ja,
                 const J2JFN& jetSmearFn,
                 const J2DFN& bTagEffFn)
-      : _jetEffFn(JET_EFF_ONE), _bTagEffFn(bTagEffFn), _cTagEffFn(JET_CTAG_PERFECT), _jetSmearFn(jetSmearFn)
-    {
-      setName("SmearedJets");
-      addProjection(ja, "TruthJets");
-    }
+      : SmearedJets(ja, jetSmearFn, bTagEffFn, JET_CTAG_PERFECT, JET_EFF_ONE)
+    {    }
 
 
     /// @brief Constructor with efficiency and smearing function args
@@ -52,11 +46,8 @@
                 const J2JFN& jetSmearFn,
                 const J2DFNa& bTagEffFn,
                 const J2DFNb& cTagEffFn)
-      : _jetEffFn(JET_EFF_ONE), _bTagEffFn(bTagEffFn), _cTagEffFn(cTagEffFn), _jetSmearFn(jetSmearFn)
-    {
-      setName("SmearedJets");
-      addProjection(ja, "TruthJets");
-    }
+      : SmearedJets(ja, jetSmearFn, bTagEffFn, cTagEffFn, JET_EFF_ONE)
+    {    }
 
 
     /// @brief Constructor with efficiency and smearing function args
--- a/include/Rivet/Projections/SmearedParticles.hh	Sun Mar 27 21:42:44 2016 +0100
+++ b/include/Rivet/Projections/SmearedParticles.hh	Mon Mar 28 11:45:09 2016 +0100
@@ -23,15 +23,11 @@
     SmearedParticles(const ParticleFinder& pf,
                      const P2DFN& effFn,
                      const Cut& c=Cuts::open())