[Yt-svn] yt: 2 new changesets

[hg at spacepope.org]

hg Repository: yt
details:   yt/rev/acdd845dfd43
changeset: 3364:acdd845dfd43
user:      Britton Smith <brittonsmith at gmail.com>
date:
Wed Sep 01 23:17:48 2010 -0400
description:
Fixed light cone and light ray imports.

hg Repository: yt
details:   yt/rev/08c621951f4d
changeset: 3365:08c621951f4d
user:      Britton Smith <brittonsmith at gmail.com>
date:
Wed Sep 01 23:22:39 2010 -0400
description:
Fixed light cone imports.

diffstat:

 yt/analysis_modules/api.py                                               |  14 +++----
 yt/analysis_modules/light_cone/api.py                                    |   4 --
 yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py |   6 +-
 3 files changed, 9 insertions(+), 15 deletions(-)

diffs (65 lines):

diff -r e4784f55e29e -r 08c621951f4d yt/analysis_modules/api.py
--- a/yt/analysis_modules/api.py	Wed Sep 01 12:25:47 2010 -0700
+++ b/yt/analysis_modules/api.py	Wed Sep 01 23:22:39 2010 -0400
@@ -91,17 +91,15 @@
     recursive_bottom_clumps, \
     clump_list_sort
 
-#from .light_ray.api import \
-#    LightRay
+from .light_ray.api import \
+    LightRay
 
 from .light_cone.api import \
-    commonNVolume, \
-    commonSegment, \
+    LightCone, \
     light_cone_halo_mask, \
     light_cone_halo_map, \
-    light_cone_projection, \
-    project_unique_light_cones, \
-    find_unique_solutions
+    find_unique_solutions, \
+    project_unique_light_cones
 
 from .simulation_handler.api import \
     EnzoSimulation
@@ -110,7 +108,7 @@
     SpectralFrequencyIntegrator, \
     create_table_from_textfiles
 
-from .sfr_spectrum.api import \
+from .star_analysis.api import \
     StarFormationRate, \
     SpectrumBuilder
 
diff -r e4784f55e29e -r 08c621951f4d yt/analysis_modules/light_cone/api.py
--- a/yt/analysis_modules/light_cone/api.py	Wed Sep 01 12:25:47 2010 -0700
+++ b/yt/analysis_modules/light_cone/api.py	Wed Sep 01 23:22:39 2010 -0400
@@ -28,10 +28,6 @@
 
 """
 
-from .common_n_volume import \
-    commonNVolume, \
-    commonSegment
-
 from .halo_mask import \
     light_cone_halo_mask, \
     light_cone_halo_map
diff -r e4784f55e29e -r 08c621951f4d yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py
--- a/yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py	Wed Sep 01 12:25:47 2010 -0700
+++ b/yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py	Wed Sep 01 23:22:39 2010 -0400
@@ -26,9 +26,9 @@
 
 from yt.funcs import *
 from yt.utilities.linear_interpolators import \
-    UnilinearInterpolator, \
-    BilinearInterpolator, \
-    TrilinearInterpolator
+    UnilinearFieldInterpolator, \
+    BilinearFieldInterpolator, \
+    TrilinearFieldInterpolator
 
 class SpectralFrequencyIntegrator(object):
     def __init__(self, table, field_names,