[Yt-svn] yt-commit r366 - trunk/yt/lagos

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Fri Jan 18 18:26:26 2008
New Revision: 366
URL: http://yt.spacepope.org/changeset/366

Log:
A couple more fixes, but nothing big this time.



Modified:
   trunk/yt/lagos/Profiles.py

Modified: trunk/yt/lagos/Profiles.py
==============================================================================
--- trunk/yt/lagos/Profiles.py	(original)
+++ trunk/yt/lagos/Profiles.py	Fri Jan 18 18:26:26 2008
@@ -55,8 +55,9 @@
             for field in fields:
                 f, w, u = self._bin_field(self._data_source, field, weight,
                                           accumulation, self._args, check_cut = False)
+                ub = na.where(u)
                 if weight:
-                    f /= w
+                    f[ub] /= w[ub]
                 self[field] = f
             self["UsedBins"] = u
         else:
@@ -79,6 +80,7 @@
                     used = (used | u)
                 grid.clear_data()
             ub = na.where(used)
+            print ub
             for field in fields:
                 if weight:
                     data[field][ub] /= weight_data[field][ub]
@@ -127,7 +129,7 @@
             source_data = source[field]
             if weight: weight_data = source[weight]
         binned_field = self._get_empty_field()
-        weight_field = self._get_empty_field() + 1.0
+        weight_field = self._get_empty_field()
         used_field = na.ones(weight_field.shape, dtype='bool')
         for bin in inv_bin_indices.keys():
             temp_field = source_data[inv_bin_indices[bin]]
@@ -137,7 +139,7 @@
             binned_field[bin] = temp_field.sum()
         if accumulation: # Fix for laziness
             binned_field = na.add.accumulate(binned_field)
-        return binned_field, weight_field, True
+        return binned_field, weight_field, na.ones(binned_field.shape,dtype='bool')
 
     @preserve_source_parameters
     def _get_bins(self, source, check_cut=False):
@@ -189,7 +191,6 @@
     @preserve_source_parameters
     def _bin_field(self, source, field, weight, accumulation,
                    args, check_cut=False):
-        #mylog.debug("Binning %s", field)
         if check_cut:
             pointI = self._data_source._get_point_indices(source)
             source_data = source[field][pointI].ravel()