[Yt-svn] yt-commit r1741 - in trunk/yt: lagos raven

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Sun Jun  6 15:44:50 2010
New Revision: 1741
URL: http://yt.enzotools.org/changeset/1741

Log:
Added detection of ParticleFileName when guessing at data_style, in the case of
N-body only runs where the run has been moved to a different place than it was
originally generated.

Renaming:

  yt/lagos/ObjectFindingMixin.py => yt/lagos/object_finding_mixin.py
  yt/lagos/FieldInfoContainer.py => yt/lagos/field_info_container.py
  yt/raven/PlotCollection.py => yt/raven/plot_collection.py

Removing:

  yt/raven/PlotConfig.py (no longer used)
  yt/raven/Plot3DInterface.py (not good code)




Added:
   trunk/yt/lagos/field_info_container.py
      - copied unchanged from r1735, /trunk/yt/lagos/FieldInfoContainer.py
   trunk/yt/lagos/object_finding_mixin.py
      - copied unchanged from r1735, /trunk/yt/lagos/ObjectFindingMixin.py
   trunk/yt/raven/plot_collection.py
      - copied unchanged from r1735, /trunk/yt/raven/PlotCollection.py
Removed:
   trunk/yt/lagos/FieldInfoContainer.py
   trunk/yt/lagos/ObjectFindingMixin.py
   trunk/yt/raven/Plot3DInterface.py
   trunk/yt/raven/PlotCollection.py
   trunk/yt/raven/PlotConfig.py
Modified:
   trunk/yt/lagos/HierarchyType.py
   trunk/yt/lagos/__init__.py
   trunk/yt/raven/__init__.py

Modified: trunk/yt/lagos/HierarchyType.py
==============================================================================
--- trunk/yt/lagos/HierarchyType.py	(original)
+++ trunk/yt/lagos/HierarchyType.py	Sun Jun  6 15:44:50 2010
@@ -385,6 +385,7 @@
         self.num_stars = 0
         for line in rlines(open(self.hierarchy_filename, "rb")):
             if line.startswith("BaryonFileName") or \
+               line.startswith("ParticleFileName") or \
                line.startswith("FileName "):
                 test_grid = line.split("=")[-1].strip().rstrip()
             if line.startswith("NumberOfStarParticles"):

Modified: trunk/yt/lagos/__init__.py
==============================================================================
--- trunk/yt/lagos/__init__.py	(original)
+++ trunk/yt/lagos/__init__.py	Sun Jun  6 15:44:50 2010
@@ -71,7 +71,7 @@
 from ParallelTools import *
 # Now our fields
 #from DerivedFields import *
-from FieldInfoContainer import *
+from field_info_container import *
 from UniversalFields import *
 from EnzoFields import *
 from OrionFields import *
@@ -93,7 +93,7 @@
 from BaseDataTypes import *
 from BaseGridType import *
 from EnzoRateData import *
-from ObjectFindingMixin import *
+from object_finding_mixin import *
 from HierarchyType import *
 from OutputTypes import *
 from Profiles import *

Modified: trunk/yt/raven/__init__.py
==============================================================================
--- trunk/yt/raven/__init__.py	(original)
+++ trunk/yt/raven/__init__.py	Sun Jun  6 15:44:50 2010
@@ -71,13 +71,4 @@
     mylog.debug("Setting default colormap to %s", default_cmap)
     matplotlib.rc('image', cmap=default_cmap)
 
-from PlotCollection import *
-try:
-    from PlotConfig import *
-except ImportError:
-    mylog.warn("No automated plotting.  Thanks, elementtree!")
-
-try:
-    from Plot3DInterface import *
-except ImportError:
-    mylog.debug("S2PLOT interface not available")
+from plot_collection import *