[Yt-svn] yt-commit r1270 - trunk/yt/lagos/fof

[sskory at wrangler.dreamhost.com]

Author: sskory
Date: Tue Apr 21 11:39:09 2009
New Revision: 1270
URL: http://yt.spacepope.org/changeset/1270

Log:
Adding the same halo sorting rule to FoF that I added to HOP.

Modified:
   trunk/yt/lagos/fof/FOF_Output.py

Modified: trunk/yt/lagos/fof/FOF_Output.py
==============================================================================
--- trunk/yt/lagos/fof/FOF_Output.py	(original)
+++ trunk/yt/lagos/fof/FOF_Output.py	Tue Apr 21 11:39:09 2009
@@ -302,7 +302,13 @@
                 halo._distributed = self._distributed
                 halo._owner = proc
                 id += 1
-        self._groups.sort(key = lambda h: -1 * h.get_size())
+        def haloCmp(h1,h2):
+            c = cmp(h1.get_size(),h2.get_size())
+            if c != 0:
+                return -1 * c
+            if c == 0:
+                return cmp(h1.center_of_mass()[0],h2.center_of_mass()[0])
+        self._groups.sort(haloCmp)
         for j,halo in enumerate(self._groups):
             halo.id = j