[yt-svn] commit/yt: 2 new changesets

[Bitbucket]

2 new commits in yt:


https://bitbucket.org/yt_analysis/yt/changeset/e08c15b9ef01/
changeset:   e08c15b9ef01
branch:      yt
user:        ngoldbaum
date:        2012-03-22 21:41:32
summary:     Fixes the command line 'yt load' in ipython 0.11/0.12
affected #:  1 file

diff -r 563e21122c81adb1aaa6939c5c9ed2cde18359ce -r e08c15b9ef014ccfb62ce558ff5442ba01612e8c yt/utilities/command_line.py
--- a/yt/utilities/command_line.py
+++ b/yt/utilities/command_line.py
@@ -1011,11 +1011,7 @@
         else:
             from IPython.config.loader import Config
             cfg = Config()
-            cfg.InteractiveShellEmbed.local_ns = local_ns
-            IPython.embed(config=cfg)
-            from IPython.frontend.terminal.embed import InteractiveShellEmbed
-            ipshell = InteractiveShellEmbed(config=cfg)
-
+            IPython.embed(config=cfg,user_ns=local_ns)
 
 class YTMapserverCmd(YTCommand):
     args = ("proj", "field", "weight",



https://bitbucket.org/yt_analysis/yt/changeset/7ff85b5c7dcc/
changeset:   7ff85b5c7dcc
branch:      yt
user:        MatthewTurk
date:        2012-03-22 21:51:23
summary:     Merging
affected #:  3 files

diff -r e08c15b9ef014ccfb62ce558ff5442ba01612e8c -r 7ff85b5c7dccb9b03225e13658d85209ea07bbc7 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -3355,7 +3355,7 @@
         """
         AMR3DData.__init__(self, center=kwargs.pop("center", None),
                            fields=fields, pf=pf, **kwargs)
-        self.left_edge = na.array(left_edge, dtype="int32")
+        self.left_edge = na.array(left_edge)
         self.level = level
         self.dds = self.pf.h.select_grids(self.level)[0].dds.copy()
         self.ActiveDimensions = na.array(dims,dtype='int32')


diff -r e08c15b9ef014ccfb62ce558ff5442ba01612e8c -r 7ff85b5c7dccb9b03225e13658d85209ea07bbc7 yt/data_objects/object_finding_mixin.py
--- a/yt/data_objects/object_finding_mixin.py
+++ b/yt/data_objects/object_finding_mixin.py
@@ -212,7 +212,7 @@
         get_box_grids_below_level(left_edge, right_edge,
                             level,
                             self.grid_left_edge, self.grid_right_edge,
-                            self.grid_levels, mask, min_level)
+                            self.grid_levels.astype("int32"), mask, min_level)
         mask = mask.astype("bool")
         return self.grids[mask], na.where(mask)
 


diff -r e08c15b9ef014ccfb62ce558ff5442ba01612e8c -r 7ff85b5c7dccb9b03225e13658d85209ea07bbc7 yt/visualization/volume_rendering/camera.py
--- a/yt/visualization/volume_rendering/camera.py
+++ b/yt/visualization/volume_rendering/camera.py
@@ -680,7 +680,7 @@
         self.use_kd = isinstance(volume, AMRKDTree)
         self.volume = volume
 
-    def snapshot(self, fn = None):
+    def snapshot(self, fn = None, clim = None):
         nv = 12*self.nside**2
         image = na.zeros((nv,1,3), dtype='float64', order='C')
         vs = arr_pix2vec_nest(self.nside, na.arange(nv))
@@ -718,6 +718,7 @@
             implot = ax.imshow(img, extent=(-pi,pi,-pi/2,pi/2), clip_on=False, aspect=0.5)
             cb = fig.colorbar(implot, orientation='horizontal')
             cb.set_label(r"$\mathrm{log}\/\mathrm{Column}\/\mathrm{Density}\/[\mathrm{g}/\mathrm{cm}^2]$")
+            if clim is not None: cb.set_clim(*clim)
             ax.xaxis.set_ticks(())
             ax.yaxis.set_ticks(())
             canvas = matplotlib.backends.backend_agg.FigureCanvasAgg(fig)

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.