[Yt-svn] yt-commit r1668 - in trunk/yt: . data_objects

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Wed Mar 17 14:25:03 2010
New Revision: 1668
URL: http://yt.enzotools.org/changeset/1668

Log:
Some minor fixes to the time series analysis and adding data_objects as a
subpackage



Modified:
   trunk/yt/data_objects/analyzer_objects.py
   trunk/yt/data_objects/time_series.py
   trunk/yt/setup.py

Modified: trunk/yt/data_objects/analyzer_objects.py
==============================================================================
--- trunk/yt/data_objects/analyzer_objects.py	(original)
+++ trunk/yt/data_objects/analyzer_objects.py	Wed Mar 17 14:25:03 2010
@@ -33,7 +33,7 @@
         self.cast = cast
 
     def eval(self, pf):
-        return self.cast(pf.get_parameter(parameter))
+        return self.cast(pf.get_parameter(self.parameter))
 
 class CurrentTimeYears(AnalysisTask):
     _params = []

Modified: trunk/yt/data_objects/time_series.py
==============================================================================
--- trunk/yt/data_objects/time_series.py	(original)
+++ trunk/yt/data_objects/time_series.py	Wed Mar 17 14:25:03 2010
@@ -23,7 +23,7 @@
 
     def _populate_output_list(self, output_list):
         for output in output_list:
-            self._insert(EnzoStaticOutput(fn))
+            self._insert(EnzoStaticOutput(output))
 
     def _populate_output_log(self, output_log):
         for line in open(output_log):

Modified: trunk/yt/setup.py
==============================================================================
--- trunk/yt/setup.py	(original)
+++ trunk/yt/setup.py	Wed Mar 17 14:25:03 2010
@@ -10,6 +10,7 @@
     config.add_subpackage('reason')
     config.add_subpackage('extensions')
     config.add_subpackage('parallel_tools')
+    config.add_subpackage('data_objects')
     config.add_extension("amr_utils", 
         ["yt/amr_utils.c", "yt/_amr_utils/FixedInterpolator.c"], 
         include_dirs=["yt/_amr_utils/"],