[Yt-svn] yt: 2 new changesets

[hg at spacepope.org]

hg Repository: yt
details:   yt/rev/cd2112cb31c7
changeset: 1678:cd2112cb31c7
user:      Matthew Turk <matthewturk at gmail.com>
date:
Tue May 18 09:20:50 2010 -0700
description:
Trying out changing the back end of the projection plane rather than the center
when making stereo pairs.

hg Repository: yt
details:   yt/rev/04be832f6138
changeset: 1679:04be832f6138
user:      Matthew Turk <matthewturk at gmail.com>
date:
Tue May 18 09:21:08 2010 -0700
description:
Merging

diffstat:

 yt/extensions/DualEPS.py                 |   5 ++++-
 yt/extensions/volume_rendering/camera.py |  11 ++++++-----
 yt/lagos/HaloFinding.py                  |   2 +-
 yt/raven/Callbacks.py                    |   2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diffs (62 lines):

diff -r 84955a16c71c -r 04be832f6138 yt/extensions/DualEPS.py
--- a/yt/extensions/DualEPS.py	Fri May 14 20:05:11 2010 -0700
+++ b/yt/extensions/DualEPS.py	Tue May 18 09:21:08 2010 -0700
@@ -395,9 +395,12 @@
             proj = "Proj" in plot._type_name and \
                    plot.data._weight is None
             _zlabel = plot.pf.field_info[plot.axis_names["Z"]].get_label(proj)
+            print _zlabel
+            _zlabel = _zlabel.replace("_","\;")
+            print _zlabel
             _zlog = plot.log_field
         else:
-            _zlabel = plot._z_label
+            _zlabel = plot._z_label.replace("_","\;")
             _zlog = plot._log_z
         _zrange = (plot.norm.vmin, plot.norm.vmax)
         self.colorbar(_cmap, zrange=_zrange, label=_zlabel, log=_zlog, **kwargs)
diff -r 84955a16c71c -r 04be832f6138 yt/extensions/volume_rendering/camera.py
--- a/yt/extensions/volume_rendering/camera.py	Fri May 14 20:05:11 2010 -0700
+++ b/yt/extensions/volume_rendering/camera.py	Tue May 18 09:21:08 2010 -0700
@@ -142,11 +142,12 @@
     def split(self):
         oc = self.original_camera
         uv = oc.unit_vectors
-        c = oc.center
-        wx = oc.width[0]
-        wy = oc.width[1]
-        left_center = c + uv[1] * 0.5*self.relative_separation * wx 
-        right_center = c - uv[1] * 0.5*self.relative_separation * wx
+        c = oc.back_center
+        wx, wy, wz = oc.width
+        left_center = c + uv[1] * 0.5*self.relative_separation * wx \
+                        + uv[2] * 0.5*wz
+        right_center = c - uv[1] * 0.5*self.relative_separation * wx \
+                        + uv[2] * 0.5*wz
         left_camera = Camera(left_center, uv[2], oc.width,
                              oc.resolution, oc.transfer_function, uv[0],
                              oc.volume, oc.fields, oc.log_fields,
diff -r 84955a16c71c -r 04be832f6138 yt/lagos/HaloFinding.py
--- a/yt/lagos/HaloFinding.py	Fri May 14 20:05:11 2010 -0700
+++ b/yt/lagos/HaloFinding.py	Tue May 18 09:21:08 2010 -0700
@@ -299,7 +299,7 @@
         Return the HOP-identified maximum density.
         """
         if self.max_dens_point is not None:
-            return self._max_dens[self.id][0]
+            return self.max_dens_point[0]
         max = self._mpi_allmax(self._max_dens[self.id][0])
         return max
 
diff -r 84955a16c71c -r 04be832f6138 yt/raven/Callbacks.py
--- a/yt/raven/Callbacks.py	Fri May 14 20:05:11 2010 -0700
+++ b/yt/raven/Callbacks.py	Tue May 18 09:21:08 2010 -0700
@@ -734,7 +734,7 @@
         dx = (plot.xlim[1] - plot.xlim[0])/nx
         dy = (plot.ylim[1] - plot.ylim[0])/ny
 
-        unit_conversion = plot.data.hierarchy[plot.im["Unit"]]
+        unit_conversion = plot.pf[plot.im["Unit"]]
         aspect = (plot.xlim[1]-plot.xlim[0])/(plot.ylim[1]-plot.ylim[0])
 
         print "aspect ratio = ", aspect