[Rivet-svn] r3429 - branches/2011-07-aida2yoda/include/Rivet/Projections

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Thu Oct  6 22:31:08 2011
New Revision: 3429

Log:
merge r3401 from trunk. We still need to check all analyses that use jetsBySomething.

Modified:
   branches/2011-07-aida2yoda/include/Rivet/Projections/JetAlg.hh

Modified: branches/2011-07-aida2yoda/include/Rivet/Projections/JetAlg.hh
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/Projections/JetAlg.hh	Thu Oct  6 22:30:21 2011	(r3428)
+++ branches/2011-07-aida2yoda/include/Rivet/Projections/JetAlg.hh	Thu Oct  6 22:31:08 2011	(r3429)
@@ -107,10 +107,10 @@
     /// Get the jets, ordered by supplied sorting function object, with optional cuts on \f$ p_\perp \f$ and rapidity.
     /// @todo Introduce MomentumFilter objects for pT, ET, eta, y, etc. filtering, to avoid double-arg ambiguities
     template <typename F>
-    Jets jets(F sorter, double ptmin, double,
-              double, double,
-              RapScheme) const {
-      Jets js = jets(ptmin);
+    Jets jets(F sorter, double ptmin, double ptmax,
+              double rapmin, double rapmax,
+              RapScheme rapscheme) const {
+      Jets js = jets(ptmin, ptmax, rapmin, rapmax, rapscheme);
       if (sorter != 0) {
         std::sort(js.begin(), js.end(), sorter);
       }
@@ -156,7 +156,7 @@
     /// An optional cut on min \f$ p_\perp \f$ is applied in this function, since that is
     /// directly supported by FastJet and it seems a shame to not make use of that. But
     /// all other jet cuts are applied at the @c ::jets() function level.
-    virtual Jets _jets(double ptmin=0.0) const = 0;
+    virtual Jets _jets(double ptmin) const = 0;
 
 
   public: