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

[commits-noreply at bitbucket.org]

2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/0463e7741ba4/
Changeset:   0463e7741ba4
Branch:      yt-3.0
User:        brittonsmith
Date:        2014-07-14 21:05:38
Summary:     Stop-gap solution to fix field_cuts used in light cone projections.
Affected #:  1 file

diff -r 561d2e56371ca0053ee093df7968f59ae978481a -r 0463e7741ba48b72eacfd0fcb85d51ba71d4021e yt/analysis_modules/cosmological_observation/light_cone/light_cone_projection.py
--- a/yt/analysis_modules/cosmological_observation/light_cone/light_cone_projection.py
+++ b/yt/analysis_modules/cosmological_observation/light_cone/light_cone_projection.py
@@ -55,32 +55,37 @@
           my_slice["projection_center"][my_slice["projection_axis"]] \
             + 0.5 * my_slice["box_depth_fraction"]
         if (depthLeft < 0):
-            cut_mask = ("((grid[\"%s\"] + 0.5*grid[\"d%s\"] >= 0) & " + \
-              "(grid[\"%s\"] - 0.5*grid[\"d%s\"] <= %f)) | " + \
-              "((grid[\"%s\"] + 0.5*grid[\"d%s\"] >= %f) & " + \
-              "(grid[\"%s\"] - 0.5*grid[\"d%s\"] <= 1))") % \
+            cut_mask = ("((obj[\"%s\"] + 0.5*obj[\"d%s\"] >= 0) & " + \
+              "(obj[\"%s\"] - 0.5*obj[\"d%s\"] <= %f)) | " + \
+              "((obj[\"%s\"] + 0.5*obj[\"d%s\"] >= %f) & " + \
+              "(obj[\"%s\"] - 0.5*obj[\"d%s\"] <= 1))") % \
                 (axis, axis, axis, axis, depthRight, 
                  axis, axis, (depthLeft+1), axis, axis)
         elif (depthRight > 1):
-            cut_mask = ("((grid[\"%s\"] + 0.5*grid[\"d%s\"] >= 0) & " + \
-              "(grid[\"%s\"] - 0.5*grid[\"d%s\"] <= %f)) | " + \
-              "((grid[\"%s\"] + 0.5*grid[\"d%s\"] >= %f) & " + \
-              "(grid[\"%s\"] - 0.5*grid[\"d%s\"] <= 1))") % \
+            cut_mask = ("((obj[\"%s\"] + 0.5*obj[\"d%s\"] >= 0) & " + \
+              "(obj[\"%s\"] - 0.5*obj[\"d%s\"] <= %f)) | " + \
+              "((obj[\"%s\"] + 0.5*obj[\"d%s\"] >= %f) & " + \
+              "(obj[\"%s\"] - 0.5*obj[\"d%s\"] <= 1))") % \
                 (axis, axis, axis, axis, (depthRight-1),
                  axis, axis, depthLeft, axis, axis)
         else:
-            cut_mask = ("(grid[\"%s\"] + 0.5*grid[\"d%s\"] >= %f) & " + \
-              "(grid[\"%s\"] - 0.5*grid[\"%s\"] <= %f)") % \
+            cut_mask = ("(obj[\"%s\"] + 0.5*obj[\"d%s\"] >= %f) & " + \
+              "(obj[\"%s\"] - 0.5*obj[\"%s\"] <= %f)") % \
               (axis, axis, depthLeft, axis, axis, depthRight)
 
         these_field_cuts.append(cut_mask)
 
+    data_source = my_slice["object"].all_data()
+    cut_region = data_source.cut_region(these_field_cuts)
+        
     # Make projection.
     proj = my_slice["object"].proj(field, my_slice["projection_axis"], 
         weight_field, center=region_center,
-        field_parameters=dict(field_cuts=these_field_cuts))
+        data_source=cut_region)
     proj_field = proj.field[0]
 
+    del data_source, cut_region
+    
     # 2. The Tile Problem
     # Tile projection to specified width.
 


https://bitbucket.org/yt_analysis/yt/commits/2e2d9a9bc75a/
Changeset:   2e2d9a9bc75a
Branch:      yt-3.0
User:        MatthewTurk
Date:        2014-07-15 16:32:56
Summary:     Merged in brittonsmith/yt/yt-3.0 (pull request #1019)

Stop-gap solution to fix field_cuts used in light cone projections.
Affected #:  1 file

diff -r bebdc4a291f485ae7a31e34534635f6b35b59718 -r 2e2d9a9bc75add24c98e8fc13217e3033985e1f3 yt/analysis_modules/cosmological_observation/light_cone/light_cone_projection.py
--- a/yt/analysis_modules/cosmological_observation/light_cone/light_cone_projection.py
+++ b/yt/analysis_modules/cosmological_observation/light_cone/light_cone_projection.py
@@ -55,32 +55,37 @@
           my_slice["projection_center"][my_slice["projection_axis"]] \
             + 0.5 * my_slice["box_depth_fraction"]
         if (depthLeft < 0):
-            cut_mask = ("((grid[\"%s\"] + 0.5*grid[\"d%s\"] >= 0) & " + \
-              "(grid[\"%s\"] - 0.5*grid[\"d%s\"] <= %f)) | " + \
-              "((grid[\"%s\"] + 0.5*grid[\"d%s\"] >= %f) & " + \
-              "(grid[\"%s\"] - 0.5*grid[\"d%s\"] <= 1))") % \
+            cut_mask = ("((obj[\"%s\"] + 0.5*obj[\"d%s\"] >= 0) & " + \
+              "(obj[\"%s\"] - 0.5*obj[\"d%s\"] <= %f)) | " + \
+              "((obj[\"%s\"] + 0.5*obj[\"d%s\"] >= %f) & " + \
+              "(obj[\"%s\"] - 0.5*obj[\"d%s\"] <= 1))") % \
                 (axis, axis, axis, axis, depthRight, 
                  axis, axis, (depthLeft+1), axis, axis)
         elif (depthRight > 1):
-            cut_mask = ("((grid[\"%s\"] + 0.5*grid[\"d%s\"] >= 0) & " + \
-              "(grid[\"%s\"] - 0.5*grid[\"d%s\"] <= %f)) | " + \
-              "((grid[\"%s\"] + 0.5*grid[\"d%s\"] >= %f) & " + \
-              "(grid[\"%s\"] - 0.5*grid[\"d%s\"] <= 1))") % \
+            cut_mask = ("((obj[\"%s\"] + 0.5*obj[\"d%s\"] >= 0) & " + \
+              "(obj[\"%s\"] - 0.5*obj[\"d%s\"] <= %f)) | " + \
+              "((obj[\"%s\"] + 0.5*obj[\"d%s\"] >= %f) & " + \
+              "(obj[\"%s\"] - 0.5*obj[\"d%s\"] <= 1))") % \
                 (axis, axis, axis, axis, (depthRight-1),
                  axis, axis, depthLeft, axis, axis)
         else:
-            cut_mask = ("(grid[\"%s\"] + 0.5*grid[\"d%s\"] >= %f) & " + \
-              "(grid[\"%s\"] - 0.5*grid[\"%s\"] <= %f)") % \
+            cut_mask = ("(obj[\"%s\"] + 0.5*obj[\"d%s\"] >= %f) & " + \
+              "(obj[\"%s\"] - 0.5*obj[\"%s\"] <= %f)") % \
               (axis, axis, depthLeft, axis, axis, depthRight)
 
         these_field_cuts.append(cut_mask)
 
+    data_source = my_slice["object"].all_data()
+    cut_region = data_source.cut_region(these_field_cuts)
+        
     # Make projection.
     proj = my_slice["object"].proj(field, my_slice["projection_axis"], 
         weight_field, center=region_center,
-        field_parameters=dict(field_cuts=these_field_cuts))
+        data_source=cut_region)
     proj_field = proj.field[0]
 
+    del data_source, cut_region
+    
     # 2. The Tile Problem
     # Tile projection to specified width.

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.