[Yt-svn] yt: This makes the current branch work with identical results to...

[hg at spacepope.org]

hg Repository: yt
details:   yt/rev/fab318774483
changeset: 1514:fab318774483
user:      Matthew Turk <matthewturk at gmail.com>
date:
Thu Apr 01 22:30:30 2010 -0700
description:
This makes the current branch work with identical results to the old volume
rendering.  Still slower, however.

diffstat:

 yt/_amr_utils/VolumeIntegrator.pyx                 |  1 +
 yt/extensions/volume_rendering/TransferFunction.py |  7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 37368e122ba8 -r fab318774483 yt/_amr_utils/VolumeIntegrator.pyx
--- a/yt/_amr_utils/VolumeIntegrator.pyx	Thu Apr 01 14:44:36 2010 -0700
+++ b/yt/_amr_utils/VolumeIntegrator.pyx	Thu Apr 01 22:30:30 2010 -0700
@@ -146,6 +146,7 @@
         self.tf_obj = tf_obj
 
         self.n_field_tables = tf_obj.n_field_tables
+        for i in range(6): self.istorage[i] = 0.0
 
         self.my_field_tables = []
         for i in range(self.n_field_tables):
diff -r 37368e122ba8 -r fab318774483 yt/extensions/volume_rendering/TransferFunction.py
--- a/yt/extensions/volume_rendering/TransferFunction.py	Thu Apr 01 14:44:36 2010 -0700
+++ b/yt/extensions/volume_rendering/TransferFunction.py	Thu Apr 01 22:30:30 2010 -0700
@@ -116,12 +116,11 @@
 
         # Now we do the multivariate stuff
         # We assign to Density, but do not weight
-        for i,tf in enumerate(self.funcs):
+        for i,tf in enumerate(self.funcs[:3]):
             self.add_field_table(tf, 0, weight_table_id = 3)
             self.link_channels(i, i)
-
-        self.alpha_two = TransferFunction(x_bounds, nbins)
-        self.add_field_table(self.alpha_two, 0)
+        self.add_field_table(self.funcs[3], 0)
+        # We don't have a fifth table, so the value will *always* be zero.
         self.link_channels(4, [3,4,5])
 
     def add_gaussian(self, location, width, height):