[Rivet-svn] r3376 - in trunk: include/Rivet/Projections src/Projections

[blackhole at projects.hepforge.org]

Author: richardn
Date: Thu Sep 22 07:53:52 2011
New Revision: 3376

Log:
fix to unused HadronicFinalState projection for current inheritance structure of Projections

Modified:
   trunk/include/Rivet/Projections/HadronicFinalState.hh
   trunk/src/Projections/HadronicFinalState.cc

Modified: trunk/include/Rivet/Projections/HadronicFinalState.hh
==============================================================================
--- trunk/include/Rivet/Projections/HadronicFinalState.hh	Mon Sep 19 16:28:16 2011	(r3375)
+++ trunk/include/Rivet/Projections/HadronicFinalState.hh	Thu Sep 22 07:53:52 2011	(r3376)
@@ -18,8 +18,7 @@
   public:
 
     /// Constructor: the supplied FinalState projection is assumed to live through the run.
-    HadronicFinalState(FinalState& fsp)
-      : FinalState(fsp)
+    HadronicFinalState(const FinalState& fsp)
     {
       setName("HadronicFinalState");
       addProjection(fsp, "FS");
@@ -28,7 +27,6 @@
     HadronicFinalState(double mineta = -MAXRAPIDITY,
                        double maxeta = MAXRAPIDITY,
                        double minpt = 0.0*GeV)
-      : FinalState(mineta, maxeta, minpt)
     {
       setName("HadronicFinalState");
       addProjection(FinalState(mineta, maxeta, minpt), "FS");

Modified: trunk/src/Projections/HadronicFinalState.cc
==============================================================================
--- trunk/src/Projections/HadronicFinalState.cc	Mon Sep 19 16:28:16 2011	(r3375)
+++ trunk/src/Projections/HadronicFinalState.cc	Thu Sep 22 07:53:52 2011	(r3376)
@@ -19,8 +19,7 @@
 
 
   void HadronicFinalState::project(const Event& e) {
-    FinalState fsp = static_cast<FinalState>(*this);
-    const FinalState& fs = applyProjection(e, fsp);
+    const FinalState& fs = applyProjection<FinalState>(e, "FS");
     _theParticles.clear();
     std::remove_copy_if(fs.particles().begin(), fs.particles().end(),
                         std::back_inserter(_theParticles), hadronFilter);