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

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Wed Nov  4 14:39:27 2009
New Revision: 2000

Log:
Fixing compare() in MergedFinalState projection

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

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Wed Nov  4 14:23:34 2009	(r1999)
+++ trunk/ChangeLog	Wed Nov  4 14:39:27 2009	(r2000)
@@ -4,7 +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
+	* Fixing compare() in NeutralFinalState and MergedFinalState
 
 2009-11-04  Andy Buckley  <andy at insectnation.org>
 

Modified: trunk/src/Projections/MergedFinalState.cc
==============================================================================
--- trunk/src/Projections/MergedFinalState.cc	Wed Nov  4 14:23:34 2009	(r1999)
+++ trunk/src/Projections/MergedFinalState.cc	Wed Nov  4 14:39:27 2009	(r2000)
@@ -9,10 +9,8 @@
 
 
   int MergedFinalState::compare(const Projection& p) const {
-    /// @todo: This needs to be fixed!! We need to
-    //    - check if the size matches (if it doesn't, they are not equal)
-    //    - for equal sizes compare the elements (yuck!)
-    return mkNamedPCmp(p, "FSA");
+    /// @todo: Currently A+B is not recognised to be the same as B+A.
+    return mkNamedPCmp(p, "FSA") || mkNamedPCmp(p, "FSB");
   }