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

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Nov 25 16:13:54 2010
New Revision: 2769

Log:
Comment/doc tweak and extra cut in comparison method

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

Modified: trunk/include/Rivet/Projections/JetShape.hh
==============================================================================
--- trunk/include/Rivet/Projections/JetShape.hh	Thu Nov 25 15:42:55 2010	(r2768)
+++ trunk/include/Rivet/Projections/JetShape.hh	Thu Nov 25 16:13:54 2010	(r2769)
@@ -40,9 +40,7 @@
      \f]
      with \f$ 0 \le r \le R \f$ and \f$ P_\perp(r_1, r_2) = \sum_{\in [r_1, r_2)} p_\perp \f$.
 
-     The constructor expects also the equidistant binning in radius \f$ r \f$ to produce the
-     jet shape of all bins in a vector and this separately for each jet to allow
-     post-selection.
+     The constructor expects also the binning in radius \f$ r \f$ to be supplied.
   */
   class JetShape : public Projection {
   public:

Modified: trunk/src/Projections/JetShape.cc
==============================================================================
--- trunk/src/Projections/JetShape.cc	Thu Nov 25 15:42:55 2010	(r2768)
+++ trunk/src/Projections/JetShape.cc	Thu Nov 25 16:13:54 2010	(r2769)
@@ -42,6 +42,8 @@
     const JetShape& other = pcast<JetShape>(p);
     const int ptcmp = cmp(ptMin(), other.ptMin()) || cmp(ptMax(), other.ptMax());
     if (ptcmp != EQUIVALENT) return ptcmp;
+    const int rapcmp = cmp(_rapcuts.first, other._rapcuts.first) || cmp(_rapcuts.second, other._rapcuts.second);
+    if (rapcmp != EQUIVALENT) return rapcmp;
     int bincmp = cmp(numBins(), other.numBins());
     if (bincmp != EQUIVALENT) return bincmp;
     for (size_t i = 0; i < _binedges.size(); ++i) {