[Yt-svn] yt-commit r936 - in branches/yt-non-3d/yt: extensions lagos raven reason
mturk at wrangler.dreamhost.com
mturk at wrangler.dreamhost.com
Sat Nov 15 15:17:15 PST 2008
Author: mturk
Date: Sat Nov 15 15:17:14 2008
New Revision: 936
URL: http://yt.spacepope.org/changeset/936
Log:
More fixes for the fieldInfo / FieldInfoContainer changeover. Next up: 2D and
1D field corrections.
Modified:
branches/yt-non-3d/yt/extensions/SpectralIntegrator.py
branches/yt-non-3d/yt/lagos/BaseGridType.py
branches/yt-non-3d/yt/lagos/ParallelTools.py
branches/yt-non-3d/yt/lagos/Profiles.py
branches/yt-non-3d/yt/lagos/UniversalFields.py
branches/yt-non-3d/yt/raven/PlotTypes.py
branches/yt-non-3d/yt/reason/Functions.py
Modified: branches/yt-non-3d/yt/extensions/SpectralIntegrator.py
==============================================================================
--- branches/yt-non-3d/yt/extensions/SpectralIntegrator.py (original)
+++ branches/yt-non-3d/yt/extensions/SpectralIntegrator.py Sat Nov 15 15:17:14 2008
@@ -57,7 +57,7 @@
def add_frequency_bin_field(self, ev_min, ev_max):
"""
- Add a new field to the global fieldInfo dictionary, which is an
+ Add a new field to the FieldInfoContainer, which is an
integrated bin from *ev_min* to *ev_max*.
Returns the name of the new field.
Modified: branches/yt-non-3d/yt/lagos/BaseGridType.py
==============================================================================
--- branches/yt-non-3d/yt/lagos/BaseGridType.py (original)
+++ branches/yt-non-3d/yt/lagos/BaseGridType.py Sat Nov 15 15:17:14 2008
@@ -58,20 +58,20 @@
return na.prod(self.ActiveDimensions)
def _generate_field(self, field):
- if fieldInfo.has_key(field):
+ if self.pf.field_info.has_key(field):
# First we check the validator
try:
- fieldInfo[field].check_available(self)
+ self.pf.field_info[field].check_available(self)
except NeedsGridType, ngt_exception:
# This is only going to be raised if n_gz > 0
n_gz = ngt_exception.ghost_zones
f_gz = ngt_exception.fields
gz_grid = self.retrieve_ghost_zones(n_gz, f_gz)
- temp_array = fieldInfo[field](gz_grid)
+ temp_array = self.pf.field_info[field](gz_grid)
sl = [slice(n_gz,-n_gz)] * 3
self[field] = temp_array[sl]
else:
- self[field] = fieldInfo[field](self)
+ self[field] = self.pf.field_info[field](self)
else: # Can't find the field, try as it might
raise exceptions.KeyError, field
@@ -82,8 +82,8 @@
if not self.data.has_key(field):
if field in self.hierarchy.field_list:
conv_factor = 1.0
- if fieldInfo.has_key(field):
- conv_factor = fieldInfo[field]._convert_function(self)
+ if self.pf.field_info.has_key(field):
+ conv_factor = self.pf.field_info[field]._convert_function(self)
try:
if hasattr(self.hierarchy, 'queue'):
temp = self.hierarchy.queue.pop(self, field)
@@ -91,10 +91,10 @@
temp = self.readDataFast(field)
self[field] = temp * conv_factor
except self._read_exception, exc:
- if field in fieldInfo:
- if fieldInfo[field].particle_type:
+ if field in self.pf.field_info:
+ if self.pf.field_info[field].particle_type:
self[field] = na.array([],dtype='int64')
- if fieldInfo[field].not_in_all:
+ if self.pf.field_info[field].not_in_all:
self[field] = na.zeros(self.ActiveDimensions, dtype='float64')
else: raise
else:
Modified: branches/yt-non-3d/yt/lagos/ParallelTools.py
==============================================================================
--- branches/yt-non-3d/yt/lagos/ParallelTools.py (original)
+++ branches/yt-non-3d/yt/lagos/ParallelTools.py Sat Nov 15 15:17:14 2008
@@ -255,6 +255,7 @@
def _get_dependencies(self, fields):
deps = []
+ fi = self.pf.field_info
for field in fields:
- deps += ensure_list(fieldInfo[field].get_dependencies().requested)
+ deps += ensure_list(fi[field].get_dependencies().requested)
return list(set(deps))
Modified: branches/yt-non-3d/yt/lagos/Profiles.py
==============================================================================
--- branches/yt-non-3d/yt/lagos/Profiles.py (original)
+++ branches/yt-non-3d/yt/lagos/Profiles.py Sat Nov 15 15:17:14 2008
@@ -144,7 +144,8 @@
data = []
for field in _field_mapping.get(field, (field,)):
if check_cut:
- if field in fieldInfo and fieldInfo[field].particle_type:
+ if field in self.pf.field_info \
+ and self.pf.field_info[field].particle_type:
pointI = self._data_source._get_particle_indices(source)
else:
pointI = self._data_source._get_point_indices(source)
Modified: branches/yt-non-3d/yt/lagos/UniversalFields.py
==============================================================================
--- branches/yt-non-3d/yt/lagos/UniversalFields.py (original)
+++ branches/yt-non-3d/yt/lagos/UniversalFields.py Sat Nov 15 15:17:14 2008
@@ -643,21 +643,3 @@
(data["Density"]**(-0.5)))
add_field("JeansMassMsun",function=_JeansMassMsun,
units=r"\rm{M_{\odot}}")
-
-#def _convertMomentum(data):
-# return data.convert("x-velocity")*data.convert("Density")*1e5 # want this in cm/s not km/s
-#for ax in ['x','y','z']:
-# f = fieldInfo["%s-momentum" % ax]
-# f._units = r"\rm{erg\ s}/\rm{cm^3}"
-# f._convert_function = _convertMomentum
-# f.take_log = False
-#
-#fieldInfo["Temperature"].units = r"K"
-#
-#if __name__ == "__main__":
-# k = fieldInfo.keys()
-# k.sort()
-# for f in k:
-# e = FieldDetector()
-# fieldInfo[f](e)
-# print f + ":", ", ".join(e.requested)
Modified: branches/yt-non-3d/yt/raven/PlotTypes.py
==============================================================================
--- branches/yt-non-3d/yt/raven/PlotTypes.py (original)
+++ branches/yt-non-3d/yt/raven/PlotTypes.py Sat Nov 15 15:17:14 2008
@@ -53,6 +53,7 @@
self.set_autoscale(True)
self.im = defaultdict(lambda: "")
self["ParameterFile"] = "%s" % self.data.pf
+ self.pf = self.data.pf
self.axis_names = {}
if not figure:
self._figure = matplotlib.figure.Figure(size)
@@ -196,7 +197,7 @@
def __setup_from_field(self, field):
self.set_log_field(field in lagos.log_fields
- or lagos.fieldInfo[field].take_log)
+ or self.pf.field_info[field].take_log)
self.axis_names["Z"] = field
def set_log_field(self, val):
@@ -343,7 +344,7 @@
def switch_z(self, field):
self.set_log_field(field in lagos.log_fields
- or lagos.fieldInfo[field].take_log)
+ or self.pf.field_info[field].take_log)
self.axis_names["Z"] = field
self._redraw_image()
@@ -367,11 +368,11 @@
return
field_name = self.axis_names["Z"]
data_label = r"$\rm{%s}" % field_name.replace("_","\hspace{0.5}")
- if lagos.fieldInfo.has_key(field_name):
+ if self.pf.field_info.has_key(field_name):
if self._projected:
- data_label += r"\/\/ (%s)" % (lagos.fieldInfo[field_name].get_projected_units())
+ data_label += r"\/\/ (%s)" % (self.pf.field_info[field_name].get_projected_units())
else:
- data_label += r"\/\/ (%s)" % (lagos.fieldInfo[field_name].get_units())
+ data_label += r"\/\/ (%s)" % (self.pf.field_info[field_name].get_units())
data_label += r"$"
if self.colorbar != None: self.colorbar.set_label(str(data_label))
@@ -394,8 +395,8 @@
return
field_name = self.axis_names["Z"]
data_label = r"$\rm{%s}" % field_name.replace("_","\hspace{0.5}")
- if lagos.fieldInfo.has_key(field_name):
- data_label += r"\/\/ (%s)" % (lagos.fieldInfo[field_name].get_units())
+ if self.pf.field_info.has_key(field_name):
+ data_label += r"\/\/ (%s)" % (self.pf.field_info[field_name].get_units())
data_label += r"$"
if self.colorbar != None: self.colorbar.set_label(str(data_label))
@@ -441,8 +442,8 @@
return
field_name = self.axis_names["Z"]
data_label = r"$\rm{%s}" % field_name.replace("_","\hspace{0.5}")
- if lagos.fieldInfo.has_key(field_name):
- data_label += r"\/\/ (%s)" % (lagos.fieldInfo[field_name].get_projected_units())
+ if self.pf.field_info.has_key(field_name):
+ data_label += r"\/\/ (%s)" % (self.pf.field_info[field_name].get_projected_units())
data_label += r"$"
if self.colorbar != None: self.colorbar.set_label(str(data_label))
@@ -558,7 +559,7 @@
class ProfilePlot(RavenPlot):
def setup_bins(self, field, func=None):
- if field in lagos.fieldInfo and lagos.fieldInfo[field].take_log:
+ if field in self.pf.field_info and self.pf.field_info[field].take_log:
log_field = True
if func: func('log')
else:
@@ -569,8 +570,8 @@
def autoset_label(self, field, func):
dataLabel = r"$\rm{%s}" % (field.replace("_","\hspace{0.5}"))
- if field in lagos.fieldInfo:
- dataLabel += r" (%s)" % (lagos.fieldInfo[field].get_units())
+ if field in self.pf.field_info:
+ dataLabel += r" (%s)" % (self.pf.field_info[field].get_units())
dataLabel += r"$"
func(str(dataLabel))
@@ -757,8 +758,8 @@
func(str(self.datalabel))
return
data_label = r"$\rm{%s}" % field_name.replace("_"," ")
- if field_name in lagos.fieldInfo:
- data_label += r"\/\/ (%s)" % (lagos.fieldInfo[field_name].get_units())
+ if field_name in self.pf.field_info:
+ data_label += r"\/\/ (%s)" % (self.pf.field_info[field_name].get_units())
data_label += r"$"
func(str(data_label))
Modified: branches/yt-non-3d/yt/reason/Functions.py
==============================================================================
--- branches/yt-non-3d/yt/reason/Functions.py (original)
+++ branches/yt-non-3d/yt/reason/Functions.py Sat Nov 15 15:17:14 2008
@@ -37,10 +37,11 @@
def QueryFields(outputfile, only_display_fields = False):
fields = []
for f in outputfile.hierarchy.derived_field_list:
- if f in lagos.fieldInfo and lagos.fieldInfo[f].particle_type: continue
+ if f in outputfile.field_info and
+ outputfile.field_info[f].particle_type: continue
if only_display_fields and \
- f in lagos.fieldInfo and \
- not lagos.fieldInfo[f].display_field: continue
+ f in outputfile.field_info[f] and \
+ not outputfile.field_info[f].display_field: continue
fields.append(f)
return sorted(fields)
More information about the yt-svn
mailing list