[Yt-svn] yt-commit r1606 - trunk/yt/extensions

[sskory at wrangler.dreamhost.com]

Author: sskory
Date: Wed Feb  3 15:50:21 2010
New Revision: 1606
URL: http://yt.enzotools.org/changeset/1606

Log:
The Halo Mass Function will ignore an arbitrary number of commented lines at the top of the halos file now.

Modified:
   trunk/yt/extensions/EnzoSimulation.py
   trunk/yt/extensions/HaloMassFcn.py

Modified: trunk/yt/extensions/EnzoSimulation.py
==============================================================================
--- trunk/yt/extensions/EnzoSimulation.py	(original)
+++ trunk/yt/extensions/EnzoSimulation.py	Wed Feb  3 15:50:21 2010
@@ -151,7 +151,13 @@
         if self.enzoParameters['ComovingCoordinates'] and self.get_redshift_outputs:
             self._CalculateRedshiftDumpTimes()
 
-        self.allOutputs = self.redshiftOutputs + self.timeOutputs
+        if self.get_time_outputs and self.get_redshift_outputs:
+            self.allOutputs = self.redshiftOutputs + self.timeOutputs
+        elif self.get_time_outputs and not self.get_redshift_outputs:
+            self.allOutputs = self.timeOutputs
+        elif not self.get_time_outputs and self.get_redshift_outputs:
+            self.allOutputs = self.redshiftOutputs
+
         self.allOutputs.sort(key=lambda obj:obj['time'])
 
         start_index = None
@@ -235,7 +241,7 @@
         self.enzoParameters['GlobalDir'] = "."
         self.enzoParameters['RedshiftDumpName'] = "RD"
         self.enzoParameters['RedshiftDumpDir'] = "RD"
-        self.enzoParameters['DataDumpName'] = "DD"
+        self.enzoParameters['DataDumpName'] = "data"
         self.enzoParameters['DataDumpDir'] = "DD"
         self.enzoParameters['ComovingCoordinates'] = 0
 

Modified: trunk/yt/extensions/HaloMassFcn.py
==============================================================================
--- trunk/yt/extensions/HaloMassFcn.py	(original)
+++ trunk/yt/extensions/HaloMassFcn.py	Wed Feb  3 15:50:21 2010
@@ -178,8 +178,9 @@
         """
         mylog.info("Reading halo masses from %s" % self.halo_file)
         f = open(self.halo_file,'r')
-        line = f.readline() # burn the top header line.
         line = f.readline()
+        while line[0] == '#':
+            line = f.readline()
         self.haloes = []
         while line:
             line = line.split()