[Rivet-svn] r1999 - in trunk: . src/Projections

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Wed Nov  4 14:23:34 2009
New Revision: 1999

Log:
Fixing compare() in NeutralFinalState projection

Modified:
   trunk/ChangeLog
   trunk/src/Projections/NeutralFinalState.cc

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Wed Nov  4 14:02:47 2009	(r1998)
+++ trunk/ChangeLog	Wed Nov  4 14:23:34 2009	(r1999)
@@ -4,6 +4,7 @@
 	in pp collisions at 200 GeV). It is still unclear if they used
 	a cut in rapidity or pseudorapidity, thus the analysis is declared
 	"UNDER DEVELOPMENT" and "DO NOT USE".
+	* Fixing compare() in NeutralFinalState projection
 
 2009-11-04  Andy Buckley  <andy at insectnation.org>
 

Modified: trunk/src/Projections/NeutralFinalState.cc
==============================================================================
--- trunk/src/Projections/NeutralFinalState.cc	Wed Nov  4 14:02:47 2009	(r1998)
+++ trunk/src/Projections/NeutralFinalState.cc	Wed Nov  4 14:23:34 2009	(r1999)
@@ -9,8 +9,8 @@
 
 
   int NeutralFinalState::compare(const Projection& p) const {
-    /// @todo: This needs to be fixed!! We can't just compare the FinalStates, we also have to check the Etmin!!
-    return mkNamedPCmp(p, "FS");
+    const NeutralFinalState& other = dynamic_cast<const NeutralFinalState&>(p);
+    return mkNamedPCmp(other, "FS") || cmp(_Etmin, other._Etmin);
   }